@postxl/generator 0.71.1 → 0.71.2

package/dist/generators/indices/import/service.generator.js

@@ -26,9 +26,11 @@ function generateImportService({ models, meta }) {
         [meta.actions.execution.interfaceLocation.import]: [meta.actions.execution.interface],
         [meta.actions.dispatcher.classLocation.import]: [meta.actions.dispatcher.class],
         [types.location.path]: [
+            (0, types_1.toAnnotatedTypeName)(delta),
             (0, types_1.toAnnotatedTypeName)(delta_Fields),
             (0, types_1.toAnnotatedTypeName)(delta_Model.type),
-            (0, types_1.toAnnotatedTypeName)(delta),
+            (0, types_1.toAnnotatedTypeName)(delta_Model.errors.invalidReference.type),
+            (0, types_1.toAnnotatedTypeName)(delta_Model.errors.isRequiredDependency.type),
         ],
         [decoder.location.path]: [(0, types_1.toAnnotatedTypeName)(decoder.decodedPXLModelDataTypeName)],
         [converterFunctions.location.path]: [converterFunctions.deltaToBulkMutations],
@@ -266,10 +268,10 @@ export class ${meta.import.importService.name} {
   /**
    * Internal helper function that removes undefined values from an array.
    */
-  private keepErrors<ModelErrors>(errors: (ModelErrors | undefined)[]): ModelErrors[] {
-    return errors.filter((error) => error !== undefined) as ModelErrors[]
+  private keepErrors<O, I extends O | undefined>(errors: I[]): O[] {
+    return errors.filter((error) => error !== undefined) as O[]
   }
-
+  
   private validateRequiredFields<
     Model extends ${dto.genericModel}<ID>, 
     ID extends ${dto.idType}, 
@@ -492,10 +494,6 @@ function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imp
         }
         else if (field.kind === 'relation') {
             const relatedModelMeta = (0, meta_1.getModelMetadata)({ model: field.relationToModel });
-            imports.addTypeImport({
-                from: schemaMeta.import.types.location.path,
-                items: [delta_Model.errors.invalidReference.type],
-            });
             sharedValidations.push(`this.validateReferenceField({
           item,
           fieldName: '${fieldName}',
@@ -515,10 +513,6 @@ function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imp
                 !relatedField.isRequired) {
                 continue;
             }
-            imports.addTypeImport({
-                from: schemaMeta.import.types.location.path,
-                items: [delta_Model.errors.isRequiredDependency.type],
-            });
             const relatedModelMeta = (0, meta_1.getModelMetadata)({ model: relatedModel });
             const relatedFieldName = (0, string_1.toPascalCase)(relatedField.name);
             deleteValidations.push(`
@@ -566,12 +560,13 @@ private async detect${modelMeta.internalSingularNameCapitalized}Delta(
           existingItem,
           properties: [${fieldNames.join(',')}],
         }),
-      validateCreate: async ({ item }) =>
+      validateCreate: async ({ item }): Promise<${modelMeta.import.delta_Model_Errors}[]> =>
         this.keepErrors([
           ${requiredFieldsValidation}
           ...(await sharedValidations(item)),
         ]),
-      validateUpdate: async ({ item }) => this.keepErrors(await sharedValidations(item)),
+      validateUpdate: async ({ item }): Promise<${modelMeta.import.delta_Model_Errors}[]> => 
+        this.keepErrors(await sharedValidations(item)),
       validateDelete: ${validateDelete},
     })
 }`;

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

@@ -831,7 +831,7 @@ function generateValidationBlocks({ model }) {
 function generateIndexBlocks({ model, imports }) {
     const indexes = model.attributes.index ? [getIndexDefinition({ fieldNames: model.attributes.index, model })] : [];
     if (indexes.length > 0) {
-        imports.addTypeImport({ from: (0, types_1.toPackageName)('@postxl/runtime'), items: [(0, types_1.toTypeName)('NestedMap')] });
+        imports.addImport({ items: [(0, types_1.toClassName)('NestedMap')], from: (0, types_1.toPackageName)('@postxl/runtime') });
     }
     const result = {
         nestedMapDeclarations: [],

package/dist/prisma/parse.js

@@ -241,6 +241,9 @@ function parseModel({ dmmfModel, enums, models, config, }) {
                 validation = { type: 'float' };
             }
             const _field = Object.assign(Object.assign({ kind: 'scalar', validation }, shared), { isUnique: isUniqueField(dmmfField), isGenerated: isAutoIncrementField(dmmfField), tsTypeName: getTsTypeForScalar(dmmfField) });
+            if (_field.tsTypeName === 'boolean' && !_field.isRequired) {
+                (0, error_1.throwError)(`${(0, logger_1.highlight)(`${dmmfModel.name}.${fieldName}`)}: Boolean fields cannot be nullable!`);
+            }
             return _field;
         }
         if (dmmfField.kind === 'enum') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.71.1",
+  "version": "0.71.2",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {
@@ -44,7 +44,8 @@
     "autoDetect": true
   },
   "scripts": {
-    "test:generators": "./scripts/test.sh",
+    "test:generators": "./scripts/test-generators.sh",
+    "test:setup": "./scripts/test-setup.sh",
     "test:jest": "jest",
     "test:watch": "jest --watch",
     "test:types": "tsc --noEmit"