@postxl/generator 0.56.0 → 0.56.2

package/dist/generators/models/businesslogic-update.generator.js

@@ -24,6 +24,7 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         [meta.businessLogic.view.serviceFilePath]: [meta.businessLogic.view.serviceClassName],
         [schemaMeta.actions.importPath]: [
             schemaMeta.actions.actionExecution.interface,
+            schemaMeta.actions.dispatcher.result,
             schemaMeta.actions.dispatcher.interface,
             schemaMeta.actions.dispatcher.actionMethod,
         ],
@@ -54,6 +55,12 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         `@Inject(forwardRef(() => ${schemaMeta.businessLogic.view.serviceClassName})) private readonly viewService: ${schemaMeta.businessLogic.view.serviceClassName}`,
     ];
     const { zodCreateObject, zodUpdateObject, zodUpsertObject } = meta.businessLogic.update;
+    /**
+     * A return value of the dispatcher.
+     *
+     * NOTE: We need to cast to the return value every time so that the function correctly determines the return type.
+     */
+    const dispatcherReturnValue = `Promise<${schemaMeta.actions.dispatcher.result}<Actions, AM>>`;
     return /* ts */ `
     import { Inject, Injectable, forwardRef } from '@nestjs/common'
     import { ExhaustiveSwitchCheck, UnionOmit } from '@backend/common'
@@ -154,37 +161,37 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
       /**
        * Dispatches an action to the appropriate method of the repository.
        */
-      public async dispatch<A extends ${dispatcher.actionMethod}<Scope, Actions>>({
+      public async dispatch<AM extends ${dispatcher.actionMethod}<Scope, Actions>>({
         action,
         execution,
       }: {
-        action: UnionOmit<A, 'result'>
+        action: UnionOmit<AM, 'result'>
         execution: ${schemaMeta.actions.actionExecution.interface}
-      }): Promise<A['result']> {
+      }): ${dispatcherReturnValue} {
         switch (action.type) {
           case 'create':
-            return this.data.create({ item: action.payload, execution })
+            return this.data.create({ item: action.payload, execution }) as ${dispatcherReturnValue}
 
           case 'createMany':
-            return this.data.createMany({ items: action.payload, execution })
+            return this.data.createMany({ items: action.payload, execution }) as ${dispatcherReturnValue}
 
           case 'update':
-            return this.data.update({ item: action.payload, execution })
+            return this.data.update({ item: action.payload, execution }) as ${dispatcherReturnValue}
 
           case 'updateMany':
-            return this.data.updateMany({ items: action.payload, execution })
+            return this.data.updateMany({ items: action.payload, execution }) as ${dispatcherReturnValue}
 
           case 'upsert':
-            return this.data.upsert({ item: action.payload, execution })
+            return this.data.upsert({ item: action.payload, execution }) as ${dispatcherReturnValue}
 
           case 'upsertMany':
-            return this.data.upsertMany({ items: action.payload, execution })
+            return this.data.upsertMany({ items: action.payload, execution }) as ${dispatcherReturnValue}
 
           case 'delete':
-            return this.data.delete({ id: action.payload, execution })
+            return this.data.delete({ id: action.payload, execution }) as ${dispatcherReturnValue}
 
           case 'deleteMany':
-            return this.data.deleteMany({ ids: action.payload, execution })
+            return this.data.deleteMany({ ids: action.payload, execution }) as ${dispatcherReturnValue}
           
           default: 
             throw new ExhaustiveSwitchCheck(action)

package/dist/generators/models/businesslogic-view.generator.js

@@ -59,17 +59,18 @@ function generateModelBusinessLogicView({ model, meta }) {
             variableDefinition: `const ${relationVariableName} = ${relationVariableDefinition}`,
         });
         if (relation.relationToModel.typeName !== model.typeName) {
-            imports.addImport({
-                items: [refMeta.types.toBrandedIdTypeFnName],
-                from: refMeta.types.filePath,
-            });
-            imports.addTypeImport({
-                items: [refModel.brandedIdType, refMeta.types.typeName],
-                from: refMeta.types.filePath,
-            });
+            imports.addImport({ from: refMeta.types.filePath, items: [refMeta.types.toBrandedIdTypeFnName] });
+            imports.addTypeImport({ from: refMeta.types.filePath, items: [refModel.brandedIdType, refMeta.types.typeName] });
         }
     }
     const hasLinkedItems = variables.size > 0;
+    if (hasLinkedItems) {
+        // NOTE: If we need to generate the linked item type, we need to import the enum types.
+        for (const enumField of (0, fields_1.getEnumFields)(model)) {
+            const enumMeta = (0, meta_1.getEnumMetadata)(enumField);
+            imports.addTypeImport({ from: enumMeta.types.filePath, items: [enumField.typeName] });
+        }
+    }
     const linkedItemsGetterFn = `
     /**
      * Returns the linked ${meta.userFriendlyName} with the given id or null if it does not exist.

package/dist/lib/meta.d.ts

@@ -124,6 +124,10 @@ export type SchemaMetaData = {
              * The name of a util type that is used to create a dictionary of action payloads and results from the action descriptions.
              */
             actionMethod: Types.TypeName;
+            /**
+             * The name of the type that represents the result of the action method.
+             */
+            result: Types.TypeName;
         };
     };
     /**

package/dist/lib/meta.js

@@ -91,6 +91,7 @@ function getSchemaMetadata({ config }) {
                 class: Types.toClassName(`DispatcherService`),
                 interface: Types.toClassName(`IDispatcher`),
                 actionMethod: Types.toTypeName(`ActionMethod`),
+                result: Types.toTypeName(`ActionMethodResult`),
             },
         },
         businessLogic: {

package/package.json

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