@postxl/generator 0.47.0 → 0.47.2

package/dist/generator.js

@@ -165,7 +165,7 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             // Types
             generated.write(`/${meta.types.filePath}.ts`, (0, types_generator_3.generateModelTypes)({ model, meta }));
             // Seed
-            generated.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_1.generateSeedModel)({ model, itemCount: 5, meta }));
+            generated.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_1.generateSeedModel)({ model, itemCount: 5, meta, models }));
             // Data
             generated.write(`/${meta.data.stubFilePath}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
             generated.write(`/${meta.data.repository.filePath}.ts`, (0, repository_generator_1.generateRepository)({ model, meta }));

package/dist/generators/indices/seed-migration.generator.js

@@ -11,11 +11,11 @@ function generateSeedMigration({ models, meta }) {
     const modelTypes = [];
     for (const model of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
-        imports.addImport({
-            items: [modelMeta.seed.constantName],
-            from: modelMeta.seed.filePath,
+        imports.addImports({
+            [modelMeta.seed.filePath]: [modelMeta.seed.constantName],
+            [meta.importExport.importPath]: [meta.importExport.converterFunctions.importedDataToBulkMutations],
         });
-        modelTypes.push(`${modelMeta.seed.constantName}: { create: ${modelMeta.seed.constantName} }`);
+        modelTypes.push(`${modelMeta.seed.constantName}`);
     }
     return /* ts */ `
 import { createActionSeedData } from '${meta.seed.importPath}'
@@ -24,11 +24,10 @@ ${imports.generate()}
 export const MIGRATION_001_BASEDATA = createActionSeedData({
   name: 'Base data',
   order: 1,
-  data: [
-    {
+  data: ${meta.importExport.converterFunctions.importedDataToBulkMutations}({
       ${modelTypes.join(',\n')}
     },
-  ],
+  ),
 })
 `;
 }

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

@@ -10,6 +10,9 @@ const imports_1 = require("../../../lib/imports");
 function generateModelLibraryComponents({ model, meta }) {
     const { react: { context, components }, } = meta;
     const selectorCollector = id_collector_1.SelectorCollector.from(meta.seed.constantName + '-card');
+    const titleProp = model.nameField.isRequired
+        ? `title={item.${model.nameField.name}}`
+        : `title={item.${model.nameField.name} ?? item.${model.idField.name}}`;
     const imports = imports_1.ImportsGenerator.from(meta.react.folderPath)
         .addTypeImport({
         items: [model.typeName],
@@ -52,7 +55,7 @@ function generateModelLibraryComponents({ model, meta }) {
           <>
             <Card
               ref={forwardedRef}
-              title={item.${model.nameField.name}}
+              ${titleProp}
               actions={[
                 {
                   label: 'Edit',

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

@@ -20,7 +20,9 @@ function generateModelLookupComponents({ model, meta }) {
     });
     const typeName = model.typeName;
     const tsOmittedFields = `'label' | 'options' | 'loading'`;
-    const reactLabelField = `label={(l) => l.${model.nameField.name}}`;
+    const labelProp = model.nameField.isRequired
+        ? `label={(l) => l.${model.nameField.name}}`
+        : `label={(l) => l.${model.nameField.name} ?? l.${model.idField.name}}`;
     let description = '';
     if (model.description) {
         description = `
@@ -50,7 +52,7 @@ export const ${components.forms.selectInputName} = ({
   const { list, ready } = ${context.hookFnName}()
   return <SelectInput<${typeName}> 
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_field_selector__={
         delegated.__cypress_field_selector__ 
@@ -67,7 +69,7 @@ export const ${components.forms.selectFieldName} = ({
   const { list, ready } = ${context.hookFnName}()
   return <SelectField<${typeName}> 
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_field_selector__={
       delegated.__cypress_field_selector__ 
@@ -86,7 +88,7 @@ export const ${components.forms.menuSelectInputName} = ({
 	const { list, ready } = ${context.hookFnName}()
 	return <MenuSelectInput<${typeName}>
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_options_selector__={
       delegated.__cypress_options_selector__ 
@@ -103,7 +105,7 @@ export const ${components.forms.menuSelectFieldName} = ({
 	const { list, ready } = ${context.hookFnName}()
 	return <MenuSelectField<${typeName}>
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_options_selector__={
       delegated.__cypress_options_selector__ 
@@ -122,7 +124,7 @@ export const ${components.forms.searchInputName} = ({
 	const { list, ready } = ${context.hookFnName}()
 	return <SearchInput<${typeName}>
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_combobox_selector__={
       delegated.__cypress_combobox_selector__ 
@@ -143,7 +145,7 @@ export const ${components.forms.searchFieldName} = ({
   const { list, ready } = ${context.hookFnName}()
   return <SearchField<${typeName}>
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_combobox_selector__={
       delegated.__cypress_combobox_selector__ 
@@ -165,7 +167,7 @@ export const ${components.forms.tableSelectInputName} = ({
 	const { list, ready } = ${context.hookFnName}()
 	return <TableSelectInput<${typeName}>
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_input_field_selector__={
       delegated.__cypress_input_field_selector__
@@ -182,7 +184,7 @@ export const ${components.forms.tableSelectFieldName} = ({
 	const { list, ready } = ${context.hookFnName}()
 	return <TableSelectField<${typeName}>
     options={list}
-    ${reactLabelField}
+    ${labelProp}
     loading={!ready} 
     __cypress_input_field_selector__={
       delegated.__cypress_input_field_selector__ 

package/dist/generators/models/seed.generator.d.ts

@@ -3,10 +3,11 @@ import { Model, SchemaConfig } from '../../lib/schema/schema';
 /**
  * Creates a seed file for a given model.
  */
-export declare function generateSeedModel({ model, itemCount, meta, }: {
+export declare function generateSeedModel({ model, itemCount, meta, models, }: {
     model: Model;
     itemCount: number;
     meta: ModelMetaData;
+    models: Model[];
 }): string;
 /**
  * Creates the seed file that exposes all seed data as single object.

package/dist/generators/models/seed.generator.js

@@ -12,11 +12,15 @@ const string_1 = require("../../lib/utils/string");
 /**
  * Creates a seed file for a given model.
  */
-function generateSeedModel({ model, itemCount, meta, }) {
+function generateSeedModel({ model, itemCount, meta, models, }) {
     var _a;
     // NOTE: We seed `faker` independently for each model.
     //       This way changes to another model or to the ordering of models in the schema doesn't impact the generated values.
     faker_1.faker.seed((_a = model.attributes.randomSeed) !== null && _a !== void 0 ? _a : 0);
+    const modelMap = new Map();
+    for (const model of models) {
+        modelMap.set(model.name, model);
+    }
     const imports = imports_1.ImportsGenerator.from(meta.seed.filePath).addImport({
         items: [(0, types_1.toAnnotatedTypeName)(model.typeName), meta.types.toBrandedIdTypeFnName],
         from: meta.types.importPath,
@@ -33,7 +37,7 @@ function generateSeedModel({ model, itemCount, meta, }) {
     const mode = getExampleMode({ model, maxItemCount: itemCount });
     const examples = [];
     for (let i = 1; i <= mode.itemCount; i++) {
-        examples.push(generateExample({ model, index: i, mode }));
+        examples.push(generateExample({ model, index: i, mode, models: modelMap }));
     }
     return `
     ${imports.generate()}
@@ -57,7 +61,7 @@ function getExampleMode({ model, maxItemCount }) {
             field.attributes.examples.length > 0) {
             if (numberOfExamplesPerField === undefined) {
                 numberOfExamplesPerField = field.attributes.examples.length;
-                numberOfAllPossiblePermutations = 1;
+                numberOfAllPossiblePermutations = field.attributes.examples.length;
             }
             else if (numberOfExamplesPerField !== field.attributes.examples.length) {
                 sameNumberOfExamplesPerField = false;
@@ -73,23 +77,23 @@ function getExampleMode({ model, maxItemCount }) {
     }
     return { kind: 'Permutations', itemCount: Math.min(numberOfAllPossiblePermutations, maxItemCount) };
 }
-function generateExample({ model, index, mode }) {
+function generateExample({ model, index, mode, models, }) {
     const data = new serializer_1.Serializer();
     data.append('{');
     for (const field of model.fields.values()) {
-        data.append(`${field.name}: ${generateFieldData({ field, model, index, mode })},`);
+        data.append(`${field.name}: ${generateFieldData({ field, model, index, mode, models })},`);
     }
     data.append('}');
     return data.print();
 }
-function generateFieldData({ field, model, index, mode, }) {
+function generateFieldData({ field, model, index, mode, models, }) {
     switch (field.kind) {
         case 'id':
             return generateIdFieldExample({ field, model, index, mode });
         case 'scalar':
             return generateScalarFieldExample({ field, model, index, mode });
         case 'relation':
-            return generateRelationFieldExample({ field, model, index, mode });
+            return generateRelationFieldExample({ field, model, index, mode, models });
         case 'enum':
             return generateEnumFieldExample({ field, mode, index });
         default:
@@ -215,14 +219,24 @@ function generateMockDate() {
     d.setUTCHours(0, 0, 0, 0);
     return `new Date('${d.toISOString()}')`;
 }
-function generateRelationFieldExample({ field, index, model, mode, }) {
+function generateRelationFieldExample({ field, index, model, mode, models, }) {
     if (!field.isRequired) {
         return 'null';
     }
-    const referenceId = faker_1.faker.datatype.number({ min: 1, max: mode.itemCount });
-    const refModelMeta = (0, meta_1.getModelMetadata)({ model: field.relationToModel });
+    const refModel = models.get(field.relationToModel.name);
+    if (!refModel) {
+        throw new Error(`Could not find model ${field.relationToModel.name}`);
+    }
+    const refModelMeta = (0, meta_1.getModelMetadata)({ model: refModel });
+    const refModelExampleMode = getExampleMode({ model: refModel, maxItemCount: mode.itemCount });
+    const referenceId = faker_1.faker.datatype.number({ min: 1, max: refModelExampleMode.itemCount });
     const brandingFn = refModelMeta.types.toBrandedIdTypeFnName;
-    const { hasExample, example } = generateFieldExample({ field, model, index, mode });
+    const { hasExample, example } = generateFieldExample({
+        field: refModel.idField,
+        model: refModel,
+        index,
+        mode: refModelExampleMode,
+    });
     if (field.unbrandedTypeName === 'string') {
         if (hasExample && typeof example === 'string') {
             return `${brandingFn}('${quoteSingleQuote(example)}')`;

package/dist/prisma/parse.js

@@ -158,6 +158,8 @@ function parseModel({ dmmfModel, enums, models, config, }) {
         if (dmmfField.relationOnDelete && dmmfField.relationOnDelete !== 'NoAction') {
             (0, error_1.throwError)(`Investigate model ${highlight(dmmfModel.name)}: "onDelete" attribute for relationship ${highlight(dmmfField.relationName)} must be "NoAction": any deletes must be handled in the application layer, e.g. to update repository and search caches!`);
         }
+        // Note: At this point, we only have the `ModelCore`. After all models are parsed, we need to updated
+        //       the relations with the full `Model`. This is done in the `linkModels` function.
         relations[dmmfField.relationFromFields[0]] = referencedModel;
     }
     const relationFields = dmmfModel.fields

package/package.json

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