@postxl/generator 0.44.4 → 0.44.5

package/dist/generators/models/react.generator/index.js

@@ -23,14 +23,8 @@ function generateReactComponentsForModel({ model, meta }) {
     vfs.write(`/EditModal.tsx`, (0, modals_generator_1.generateEditModalModelComponent)({ model, meta }));
     vfs.write(`/DeleteModal.tsx`, (0, modals_generator_1.generateDeleteModalModelComponent)({ model, meta }));
     vfs.write(`/Form.tsx`, (0, lookup_generator_1.generateModelLookupComponents)({ model, meta }));
-    // NOTE: library generator expects that the model has a `name` field.
-    //        Make sure that you don't make a dependency on this
-    //        component without checking that a model has a name field.
-    const hasNameField = model.nameField != null;
-    if (hasNameField) {
-        vfs.write(`/Library.tsx`, (0, library_generator_1.generateModelLibraryComponents)({ model, meta }));
-        exports.exportEverythingFromFile('./Library');
-    }
+    vfs.write(`/Library.tsx`, (0, library_generator_1.generateModelLibraryComponents)({ model, meta }));
+    exports.exportEverythingFromFile('./Library');
     vfs.write(`/index.ts`, exports.generate());
     return vfs;
 }

package/dist/generators/models/react.generator/library.generator.d.ts

@@ -3,8 +3,6 @@ import { Model } from '../../../lib/schema/schema';
 /**
  * Generates components that may be used to list all entries of a given data type.
  *
- * NOTE: Library expects that the model has a `name` field. Make sure that you don't make a dependency on
- *      this component without checking that a model has a name field.
  */
 export declare function generateModelLibraryComponents({ model, meta }: {
     model: Model;

package/dist/generators/models/react.generator/library.generator.js

@@ -6,8 +6,6 @@ const imports_1 = require("../../../lib/imports");
 /**
  * Generates components that may be used to list all entries of a given data type.
  *
- * NOTE: Library expects that the model has a `name` field. Make sure that you don't make a dependency on
- *      this component without checking that a model has a name field.
  */
 function generateModelLibraryComponents({ model, meta }) {
     const { react: { context, components }, } = meta;
@@ -21,7 +19,7 @@ function generateModelLibraryComponents({ model, meta }) {
         items: [context.hookFnName, components.modals.editComponentName, components.modals.deleteComponentName],
         from: meta.react.folderPath,
     });
-    return `
+    return /* ts */ `
     import React, { useState } from 'react'
 
     import { Card } from '@components/atoms/Card'
@@ -54,7 +52,7 @@ function generateModelLibraryComponents({ model, meta }) {
           <>
             <Card
               ref={forwardedRef}
-              title={item.name}
+              title={item.${model.nameField.name}}
               actions={[
                 {
                   label: 'Edit',

package/dist/generators/models/react.generator/lookup.generator.js

@@ -17,11 +17,8 @@ function generateModelLookupComponents({ model, meta }) {
         from: meta.types.importPath,
     });
     const typeName = model.typeName;
-    // NOTE: Depending on the model definition - whether it has a `name` field or not - we'll either
-    //        auto-populate the `label` property or not.
-    const hasNameField = model.nameField != null;
-    const tsOmittedFields = hasNameField ? `'label' | 'options' | 'loading'` : `'options' | 'loading'`;
-    const reactLabelField = hasNameField ? `label={(l) => l.name}` : '';
+    const tsOmittedFields = `'label' | 'options' | 'loading'`;
+    const reactLabelField = `label={(l) => l.${model.nameField.name}}`;
     let description = '';
     if (model.description) {
         description = `

package/dist/lib/schema/schema.d.ts

@@ -192,9 +192,10 @@ export type ModelFields = {
     /**
      * The property of the model that is used to define the name/label
      *
-     * By default, this is maps to the `name` field - but using the `@label` attribute, other fields can be used.
+     * By default, this is maps to the `name` field (with `id` field used as fallback in case no `name` field exists).
+     * Using the `@@Label()` attribute, other fields can be used.
      */
-    nameField?: FieldScalar;
+    nameField: Field;
     /**
      * All fields of the model
      */

package/dist/prisma/parse.js

@@ -180,17 +180,18 @@ function parseModel({ dmmfModel, enums, models, config, }) {
  * Checks that there is exactly one id field and that there is at most one default field.
  */
 function validateFields({ fields, model: { name } }) {
+    var _a;
     let idField = undefined;
     let createdAtField = undefined;
     let updatedAtField = undefined;
+    let labelField = undefined;
     let nameField = undefined;
-    let nameFieldFallback = undefined;
     let defaultField = undefined;
     for (const field of fields) {
         switch (field.kind) {
             case 'scalar':
                 if (field.name === 'name') {
-                    nameFieldFallback = field;
+                    nameField = field;
                 }
                 if (field.attributes.isCreatedAt) {
                     if (createdAtField) {
@@ -224,20 +225,17 @@ function validateFields({ fields, model: { name } }) {
             defaultField = field;
         }
         //handle name field
-        if (field.attributes.isLabel && field.kind === 'scalar') {
-            if (nameField !== undefined) {
+        if (field.attributes.isLabel) {
+            if (labelField !== undefined) {
                 throw new Error(`❌❌❌ Model ${name} has multiple name fields`);
             }
-            nameField = field;
+            labelField = field;
         }
     }
     if (!idField) {
         throw new Error(`❌❌❌ Model ${name} does not have an id field`);
     }
-    if (!nameField && nameFieldFallback) {
-        nameField = nameFieldFallback;
-    }
-    return { idField, defaultField, nameField, createdAtField, updatedAtField };
+    return { idField, defaultField, nameField: (_a = labelField !== null && labelField !== void 0 ? labelField : nameField) !== null && _a !== void 0 ? _a : idField, createdAtField, updatedAtField };
 }
 function isAutoIncrementField(fieldDmmf) {
     if (fieldDmmf.default === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.44.4",
+  "version": "0.44.5",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {