@postxl/generator 0.48.0 → 0.49.0

package/dist/generators/indices/dispatcher-service.generator.js

@@ -56,7 +56,7 @@ export class ${meta.actions.dispatcherService.class} {
     try {
       const result = await (this.execute({ action, execution }) as Promise<ResultOfAction<A>>)
 
-      await execution.success()
+      await execution.success(result)
 
       return result
     } catch (e) {

package/dist/generators/models/importexport-decoder.generator.js

@@ -54,7 +54,7 @@ const blank${singularCapitalized}ExcelRowImportDecoderInput = z
  * The decoder for an Excel table that contains ${userFriendly} entries
  */
 export const ${tableImportDecoder} = z
-  .array(${singular}ExcelRowImportDecoder.or(blank${singularCapitalized}ExcelRowImportDecoderInput))
+  .array(blank${singularCapitalized}ExcelRowImportDecoderInput.or(${singular}ExcelRowImportDecoder))
   .transform((items) => items.filter(Boolean) as ${model.typeName}[])
 
 /**
@@ -74,7 +74,8 @@ function generateFieldDecoders({ model, meta, schemaMeta, imports, }) {
     const blankFieldDecoders = [];
     for (const field of model.fields) {
         const fieldMeta = (0, meta_1.getFieldMetadata)({ field });
-        blankFieldDecoders.push(`${fieldMeta.excelColumnName}: nullOrBlankDecoder`);
+        const optionalModifier = field.attributes.isUpdatedAt || field.attributes.isCreatedAt ? '.optional()' : '';
+        blankFieldDecoders.push(`${fieldMeta.excelColumnName}: nullOrBlankDecoder${optionalModifier}`);
         switch (field.kind) {
             case 'id': {
                 imports.addImport({ items: [meta.types.toBrandedIdTypeFnName], from: meta.types.importPath });
@@ -94,7 +95,7 @@ function generateFieldDecoders({ model, meta, schemaMeta, imports, }) {
                     nullable: !field.isRequired,
                     imports,
                     schemaMeta,
-                })}`);
+                })}${optionalModifier}`);
                 break;
             }
             case 'relation': {
@@ -117,7 +118,7 @@ function generateFieldDecoders({ model, meta, schemaMeta, imports, }) {
             case 'enum': {
                 fieldDecoders.push(`${fieldMeta.excelColumnName}: z.enum([
             ${field.enumerator.values.map((v) => `'${v}'`).join(', ')}
-          ])${field.isRequired ? '' : '.nullable()'}`);
+          ])${field.isRequired ? '' : '.nullable()'}${optionalModifier}`);
                 break;
             }
             default: {
@@ -127,7 +128,10 @@ function generateFieldDecoders({ model, meta, schemaMeta, imports, }) {
     }
     return { fieldDecoders, blankFieldDecoders };
 }
-function toExcelDecoder({ tsTypeName, dbTypeName: typeName, nullable, imports, schemaMeta, }) {
+function toExcelDecoder({ tsTypeName, 
+// We will use the DB type later when extending the number decoder
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+dbTypeName, nullable, imports, schemaMeta, }) {
     switch (tsTypeName) {
         case 'string': {
             const decoder = schemaMeta.backendModules.common.functions[nullable ? 'excelStringNullableDecoder' : 'excelStringDecoder'];
@@ -143,14 +147,28 @@ function toExcelDecoder({ tsTypeName, dbTypeName: typeName, nullable, imports, s
                 from: schemaMeta.backendModules.common.importPath,
             });
             return 'excelBooleanDecoder';
-        case 'number':
-            switch (typeName) {
+        case 'number': {
+            let decoder;
+            switch (dbTypeName) {
                 case 'Int':
+                    decoder =
+                        schemaMeta.backendModules.common.functions[nullable ? 'excelNumberNullableDecoder' : 'excelNumberDecoder'];
+                    break;
                 case 'BigInt':
-                    return `z.number().int()${nullable ? '.nullable()' : ''}`;
+                    decoder =
+                        schemaMeta.backendModules.common.functions[nullable ? 'excelNumberNullableDecoder' : 'excelNumberDecoder'];
+                    break;
                 default:
-                    return `z.number()${nullable ? '.nullable()' : ''}`;
+                    decoder =
+                        schemaMeta.backendModules.common.functions[nullable ? 'excelNumberNullableDecoder' : 'excelNumberDecoder'];
+                    break;
             }
+            imports.addImport({
+                items: [decoder],
+                from: schemaMeta.backendModules.common.importPath,
+            });
+            return decoder;
+        }
         case 'Date': {
             const decoder = schemaMeta.backendModules.common.functions[nullable ? 'excelDateNullableDecoder' : 'excelDateDecoder'];
             imports.addImport({

package/dist/lib/meta.d.ts

@@ -24,6 +24,12 @@ export type SchemaMetaData = {
                 nullOrBlankDecoder: Types.FunctionName;
                 excelStringNullableDecoder: Types.FunctionName;
                 excelStringDecoder: Types.FunctionName;
+                excelNumberNullableDecoder: Types.FunctionName;
+                excelNumberDecoder: Types.FunctionName;
+                excelIntDecoder: Types.FunctionName;
+                excelIntNullableDecoder: Types.FunctionName;
+                excelBigIntDecoder: Types.FunctionName;
+                excelBigIntNullableDecoder: Types.FunctionName;
                 excelDateNullableDecoder: Types.FunctionName;
                 excelDateDecoder: Types.FunctionName;
                 excelBooleanDecoder: Types.FunctionName;

package/dist/lib/meta.js

@@ -42,6 +42,12 @@ function getSchemaMetadata({ config }) {
                     nullOrBlankDecoder: Types.toFunctionName(`nullOrBlankDecoder`),
                     excelStringNullableDecoder: Types.toFunctionName(`excelStringNullableDecoder`),
                     excelStringDecoder: Types.toFunctionName(`excelStringDecoder`),
+                    excelNumberNullableDecoder: Types.toFunctionName(`excelNumberNullableDecoder`),
+                    excelNumberDecoder: Types.toFunctionName(`excelNumberDecoder`),
+                    excelIntDecoder: Types.toFunctionName(`excelIntDecoder`),
+                    excelIntNullableDecoder: Types.toFunctionName(`excelIntNullableDecoder`),
+                    excelBigIntDecoder: Types.toFunctionName(`excelBigIntDecoder`),
+                    excelBigIntNullableDecoder: Types.toFunctionName(`excelBigIntNullableDecoder`),
                     excelDateNullableDecoder: Types.toFunctionName(`excelDateNullableDecoder`),
                     excelDateDecoder: Types.toFunctionName(`excelDateDecoder`),
                     excelBooleanDecoder: Types.toFunctionName(`excelBooleanDecoder`),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@faker-js/faker": "7.6.0",
-    "@prisma/generator-helper": "^5.6.0",
-    "@prisma/internals": "^5.6.0",
+    "@prisma/generator-helper": "^5.8.0",
+    "@prisma/internals": "^5.8.0",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",
     "@typescript-eslint/utils": "^6.10.0",
@@ -30,12 +30,12 @@
     "@postxl/lock": "1.1.0"
   },
   "devDependencies": {
-    "@prisma/client": "^5.6.0",
+    "@prisma/client": "^5.8.0",
     "@types/eslint": "^8.44.7",
     "@types/jest": "^29.5.0",
     "@types/node": "18.15.10",
     "jest": "29.7.0",
-    "prisma": "5.6.0",
+    "prisma": "5.8.0",
     "ts-jest": "29.0.5",
     "ts-node": "10.9.1",
     "ts-toolbelt": "^9.6.0",
@@ -43,7 +43,7 @@
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "prisma": "5.6.0"
+    "prisma": "5.8.0"
   },
   "wallaby": {
     "autoDetect": true