@postxl/generator 0.52.1 → 0.53.1

package/dist/generator.js

@@ -77,7 +77,6 @@ const stub_generator_1 = require("./generators/models/stub.generator");
 const types_generator_3 = require("./generators/models/types.generator");
 const meta_1 = require("./lib/meta");
 const types_1 = require("./lib/schema/types");
-const skip_generator_1 = require("./lib/skip-generator");
 const vfs_1 = require("./lib/vfs");
 const client_path_1 = require("./prisma/client-path");
 const parse_1 = require("./prisma/parse");
@@ -168,9 +167,7 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             // Types
             generated.write(`/${meta.types.filePath}.ts`, (0, types_generator_3.generateModelTypes)({ model, meta }));
             // Seed
-            if (!(0, skip_generator_1.skipDecoder)({ model, generatorName: 'seed' })) {
-                generated.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_1.generateSeedModel)({ model, itemCount: 5, meta, models }));
-            }
+            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 }));
@@ -184,15 +181,8 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             // Routes
             generated.write(`/${meta.trpc.routerFilePath}.ts`, (0, route_generator_1.generateRoute)({ model, meta }));
             // React
-            if (!(0, skip_generator_1.skipDecoder)({ model, generatorName: 'react' })) {
-                yield generated.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
-            }
-            if (model.attributes.skipGenerators.size === 0) {
-                logger.log(`- ${model.name} processed`);
-            }
-            else {
-                logger.log(`- ${model.name} processed (skipped generators for: ${[...model.attributes.skipGenerators].join(', ')})`);
-            }
+            yield generated.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
+            logger.log(`- ${model.name} processed`);
         }
         // Generate Enums
         for (const enumerator of enums.values()) {

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

@@ -145,26 +145,26 @@ export class ${meta.importExport.importService.name} {
     getDelta: ({ item, existingItem }: { item: Model; existingItem: Model }) => ${delta_Fields}<Model, ID>
   }): Promise<Delta_Result<Model, ID>> {
     if (item.id === undefined || item.id === '') {
-      return Promise.resolve({ type: '${create.discriminant}' })
+      return { type: '${create.discriminant}' }
     }
     const existingItem = await getId(item.id)
 
     if (!existingItem) {
-      return Promise.resolve({ type: '${create.discriminant}' })
+      return { type: '${create.discriminant}' }
     }
 
     const delta = getDelta({ item, existingItem })
 
     if (Object.keys(delta).length > 0) {
-      return Promise.resolve({ type: '${update.discriminant}', delta, existingItem })
+      return { type: '${update.discriminant}', delta, existingItem }
     }
 
     // We do not have a default logic to identify deletions. Implement it here, e.g. using a
     // custom "Action" field in the Excel table. If it is set to "Delete", we can handle the delete here.
-    // return Promise.resolve({type: '${delta_Model.delete.discriminant}', existingItem})
+    // return {type: '${delta_Model.delete.discriminant}', existingItem}
 
     // If we reach this point, we assume the item has not changed
-    return Promise.resolve({ type: '${unchanged.discriminant}' })
+    return { type: '${unchanged.discriminant}' }
   }
 
   private getDelta<Model extends ${dto.genericModel}<ID>, ID extends ${dto.idType}>({
@@ -206,7 +206,7 @@ export class ${meta.importExport.importService.name} {
     const upsertResult: Delta_Model<Model, ID, ModelErrors>[] = []
 
     if (items === undefined || items.length === 0) {
-      return Promise.resolve(upsertResult)
+      return upsertResult
     }
 
     for (const item of items) {
@@ -258,7 +258,7 @@ export class ${meta.importExport.importService.name} {
       }
     }
 
-    return Promise.resolve(upsertResult)
+    return upsertResult
   }
 
   /**
@@ -565,13 +565,11 @@ private async detect${modelMeta.internalSingularNameCapitalized}Delta(
           properties: [${fieldNames.join(',')}],
         }),
       validateCreate: async ({ item }) =>
-        Promise.resolve(
-          this.keepErrors([
-            ${requiredFieldsValidation}
-            ...(await sharedValidations(item)),
-          ]),
-        ),
-      validateUpdate: async ({ item }) => Promise.resolve(this.keepErrors(await sharedValidations(item))),
+        this.keepErrors([
+          ${requiredFieldsValidation}
+          ...(await sharedValidations(item)),
+        ]),
+      validateUpdate: async ({ item }) => this.keepErrors(await sharedValidations(item)),
       validateDelete: ${validateDelete},
     })
 }`;

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSeedMigration = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
-const skip_generator_1 = require("../../lib/skip-generator");
 /**
  * Generates the initial migration based on the generated seed data.
  */
@@ -11,9 +10,6 @@ function generateSeedMigration({ models, meta }) {
     const imports = imports_1.ImportsGenerator.from(meta.seedData.initialMigrationFilePath);
     const modelTypes = [];
     for (const model of models) {
-        if ((0, skip_generator_1.skipDecoder)({ model, generatorName: 'seed' })) {
-            continue;
-        }
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
         imports.addImports({
             [modelMeta.seed.filePath]: [modelMeta.seed.constantName],

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

@@ -17,6 +17,7 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         [meta.data.importPath]: meta.data.repository.className,
         [schemaMeta.actions.importPath]: schemaMeta.actions.actionExecution.interface,
         [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(model.brandedIdType), (0, types_1.toAnnotatedTypeName)(meta.types.typeName)],
+        [meta.businessLogic.view.serviceFilePath]: [meta.businessLogic.view.serviceClassName],
         [schemaMeta.businessLogic.update.serviceFilePath]: schemaMeta.businessLogic.update.serviceClassName,
         [schemaMeta.businessLogic.view.serviceFilePath]: schemaMeta.businessLogic.view.serviceClassName,
         [meta.data.importPath]: [meta.data.repository.className],
@@ -56,7 +57,15 @@ ${actionBlocks.typeDefinitionWithCreateFunction}
 
 @Injectable()
 export class ${meta.businessLogic.update.serviceClassName} {
-  constructor(${constructorParameters.join(',\n')}) {}
+  
+  /**
+   * Instance of the ${meta.userFriendlyName} view service for convenience.
+   */
+  private view: ${meta.businessLogic.view.serviceClassName}
+
+  constructor(${constructorParameters.join(',\n')}) {
+    this.view = this.${viewServiceClassName}.${meta.businessLogic.view.serviceVariableName}
+  }
 
   ${actionBlocks.dispatcher}
   

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

@@ -120,19 +120,25 @@ export class ${meta.data.repository.className} implements Repository<${model.typ
 
   ${mainBlocks.userRepositorySpecificBlocks.rootUserInitializeBlock}
 
+  // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+  // eslint-disable-next-line @typescript-eslint/require-await
   public async get(id: ${model.brandedIdType} | null): Promise<${model.typeName} | null> {
     if (id === null) { 
-      return Promise.resolve(null)
+      return null
     }
-    return Promise.resolve(this.data.get(id) ?? null)
+    return this.data.get(id) ?? null
   }
 
+  // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+  // eslint-disable-next-line @typescript-eslint/require-await
   public async getAll(): Promise<Map<${model.brandedIdType}, ${model.typeName}>> {
-    return Promise.resolve(new Map(this.data))
+    return new Map(this.data)
   }
 
+  // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+  // eslint-disable-next-line @typescript-eslint/require-await
   public async getAllAsArray(): Promise<${model.typeName}[]> {
-    return Promise.resolve(Array.from(this.data.values()))
+    return Array.from(this.data.values())
   }
 
   ${indexBlocks.getterFunctions.join('\n')}
@@ -147,8 +153,10 @@ export class ${meta.data.repository.className} implements Repository<${model.typ
     return (await this.getAllAsArray()).find(predicate) ?? null
   }
 
+  // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+  // eslint-disable-next-line @typescript-eslint/require-await
   public async count(): Promise<number> {
-    return Promise.resolve(this.data.size)
+    return this.data.size
   }
   
   ${mainBlocks.createCode}
@@ -229,6 +237,8 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, schemaMeta, imp
         constructorCode: '',
         userRepositorySpecificBlocks,
         initCode: `
+      // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+      // eslint-disable-next-line @typescript-eslint/require-await
       public async init() {
         this.data.clear()
         
@@ -238,8 +248,6 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, schemaMeta, imp
         ${blocks.indexBlocks.initCode.join('\n')}
     
         ${userRepositorySpecificBlocks.initCall}
-
-        return Promise.resolve()
       }`,
         reInitCode: `
       public async reInit({items, execution}: ${methodTypeSignatures.createMany.parameters[0]}): Promise<void> {
@@ -291,7 +299,7 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, schemaMeta, imp
         })
 
         try {
-          const newItem = await Promise.resolve(this.verifyItem(item))
+          const newItem = this.verifyItem(item)
       
           this.set(newItem)
           await execution.finishCreateMutation({ mutationId, createdObject: newItem, entityId: newItem.id })
@@ -314,8 +322,6 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, schemaMeta, imp
         try {
           const newItems = items.map((item) => this.verifyItem(item))
           
-          await Promise.resolve()
-
           for (const item of newItems) {
             this.set(item)
           }
@@ -352,7 +358,7 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, schemaMeta, imp
       
           ${blocks.uniqueStringFieldsBlocks.updateCode.join('\n')}
           
-          const newItem = await Promise.resolve({ ...existingItem, ...removeUndefinedProperties(item) })
+          const newItem = { ...existingItem, ...removeUndefinedProperties(item) }
           ${model.updatedAtField ? `newItem.${model.updatedAtField.name} = new Date()` : ''}
   
           this.remove(existingItem)
@@ -424,8 +430,6 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, schemaMeta, imp
           sourceObject: existingItem,
         })
         try {
-          await Promise.resolve()
-        
           this.remove(existingItem)
           await execution.finishDeleteMutation({ mutationId })
           return id
@@ -1159,8 +1163,10 @@ function generateUniqueFieldsBlocks({ model }) {
     for (const f of fields) {
         result.mapDeclarations.push(`'${f.name}': new Map<string, ${model.typeName}>()`);
         result.getByFunctions.push(`
+      // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+      // eslint-disable-next-line @typescript-eslint/require-await
       public async getBy${(0, string_1.toPascalCase)(f.name)}(${f.name}: string): Promise<${model.typeName} | undefined> { 
-        return Promise.resolve(this.uniqueIds.${f.name}.get(${(0, string_1.toCamelCase)(f.name)}))
+        return this.uniqueIds.${f.name}.get(${(0, string_1.toCamelCase)(f.name)})
       }`);
         result.clearCode.push(`this.uniqueIds.${f.name}.clear()`);
         result.verifyCode.push(`this.${getEnsureUniqueFnName(f)}(item)`);
@@ -1336,28 +1342,32 @@ function generateRelationsBlocks({ model, imports, }) {
       /** 
        * Function to retrieve all ${(0, string_1.pluralize)(model.name)} that are related to a ${r.name}
        */
+      // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+      // eslint-disable-next-line @typescript-eslint/require-await
       public async ${fieldMeta.getByForeignKeyMethodFnName}(
         id: ${relationModelMeta.types.brandedIdType}
       ): Promise<Map<${model.brandedIdType}, ${model.typeName}>> {
         const result = this.${r.name}Map.get(id)
         if (!result) {
-          return Promise.resolve(new Map<${model.brandedIdType}, ${model.typeName}>())
+          return new Map<${model.brandedIdType}, ${model.typeName}>()
         }
-        return Promise.resolve(new Map(result))
+        return new Map(result)
       }
 
       /** 
        * Function to retrieve all ${model.brandedIdType}s that are related to a ${r.name}
        */
+      // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
+      // eslint-disable-next-line @typescript-eslint/require-await
       public async ${fieldMeta.getByForeignKeyIdsMethodFnName}(
         id: ${relationModelMeta.types.brandedIdType}
       ): Promise<${model.brandedIdType}[]> {
         const s = this.${r.name}Map.get(id)
         if (!s) {
-          return Promise.resolve([])
+          return []
         }
         
-        return Promise.resolve(Array.from(s.keys()))
+        return Array.from(s.keys())
       }`);
         result.setCode.push(`
       ${!r.isRequired ? `if (item.${r.name}) {` : ''}

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

@@ -131,7 +131,7 @@ export type ${meta.types.dto.create} = ${schemaMeta.types.dto.create}<${meta.typ
 export type ${meta.types.dto.update} = ${schemaMeta.types.dto.update}<${meta.types.typeName}, ${model.brandedIdType}>
 
 /**
- * Data transfer object for upserting an existing ${meta.userFriendlyName} instance.
+ * Data transfer object for upserting a new or existing ${meta.userFriendlyName} instance.
  */
 export type ${meta.types.dto.upsert} = ${schemaMeta.types.dto.upsert}<${meta.types.typeName}, ${model.brandedIdType}>
 `;

package/dist/lib/attributes.d.ts

@@ -1,4 +1,3 @@
-import { GeneratorName } from './skip-generator';
 export type AttributeValue = unknown;
 export type Attributes = Record<string, AttributeValue>;
 export type ModelAttributes = {
@@ -37,11 +36,6 @@ export type ModelAttributes = {
      * The user that is used for system actions.
      */
     systemUser?: object;
-    /**
-     * Set of generators that should be skipped for this model.
-     * Schema tag: ´@@Skip("seed", "react")`
-     */
-    skipGenerators: Set<GeneratorName>;
 };
 export type FieldAttributes = {
     /**

package/dist/prisma/attributes.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFieldAttributes = exports.getEnumAttributes = exports.getModelAttributes = exports.parseArgumentToStringOrStringArray = exports.parseAttributesFromDocumentation = void 0;
 const zod_1 = __importDefault(require("zod"));
-const skip_generator_1 = require("../lib/skip-generator");
 const string_1 = require("../lib/utils/string");
 /**
  * Parses attributes from a given string using provided prefix.
@@ -75,7 +74,6 @@ function getModelAttributes(model) {
         schema: zod_1.default.string().optional(),
         index: zod_1.default.array(zod_1.default.string()).optional(),
         seed: zod_1.default.string().optional(),
-        skip: skip_generator_1.skipAttributeDecoder,
         systemUser: zod_1.default
             .string()
             .transform((t) => JSON.parse(t))
@@ -87,7 +85,6 @@ function getModelAttributes(model) {
         description: obj.description,
         databaseSchema: obj.schema,
         index: obj.index,
-        skipGenerators: obj.skip,
         systemUser: obj.systemUser,
         randomSeed: obj.seed !== undefined ? parseInt(obj.seed, 10) : undefined,
     }));

package/package.json

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

package/dist/lib/skip-generator.d.ts

@@ -1,18 +0,0 @@
-import * as z from 'zod';
-import { ModelCore } from './schema/schema';
-/**
- * Identifiers of generators that can be skipped.
- */
-export type GeneratorName = 'seed' | 'react';
-/**
- * Decoder to convert a list of generator names to a Set of generator names.
- */
-export declare const skipAttributeDecoder: z.ZodEffects<z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"seed">, z.ZodLiteral<"react">]>, "many">>, Set<"seed" | "react">, ("seed" | "react")[] | undefined>;
-export type SkipAttribute = z.infer<typeof skipAttributeDecoder>;
-/**
- * Returns true if the given generator should be skipped.
- */
-export declare function skipDecoder({ model, generatorName }: {
-    model: ModelCore;
-    generatorName: GeneratorName;
-}): boolean;

package/dist/lib/skip-generator.js

@@ -1,41 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipDecoder = exports.skipAttributeDecoder = void 0;
-const z = __importStar(require("zod"));
-/**
- * Decoder to convert a list of generator names to a Set of generator names.
- */
-exports.skipAttributeDecoder = z
-    .array(z.union([z.literal('seed'), z.literal('react')]))
-    .optional()
-    .transform((t) => new Set(t));
-/**
- * Returns true if the given generator should be skipped.
- */
-function skipDecoder({ model, generatorName }) {
-    return model.attributes.skipGenerators.has(generatorName);
-}
-exports.skipDecoder = skipDecoder;