@postxl/generator 0.47.2 → 0.49.0

package/dist/generator.js

@@ -77,6 +77,7 @@ 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");
@@ -165,7 +166,9 @@ 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, models }));
+            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 }));
+            }
             // 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 }));
@@ -179,8 +182,15 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             // Routes
             generated.write(`/${meta.trpc.routerFilePath}.ts`, (0, route_generator_1.generateRoute)({ model, meta }));
             // React
-            yield generated.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
-            logger.log(`- ${model.name} processed`);
+            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(', ')})`);
+            }
         }
         // Generate Enums
         for (const enumerator of enums.values()) {

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/indices/seed-migration.generator.js

@@ -3,6 +3,7 @@ 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.
  */
@@ -10,6 +11,9 @@ 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/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/attributes.d.ts

@@ -1,3 +1,4 @@
+import { GeneratorName } from './skip-generator';
 export type AttributeValue = unknown;
 export type Attributes = Record<string, AttributeValue>;
 export type ModelAttributes = {
@@ -36,6 +37,11 @@ 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/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/dist/lib/skip-generator.d.ts

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,41 @@
+"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;

package/dist/prisma/attributes.js

@@ -5,6 +5,7 @@ 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.
@@ -74,6 +75,7 @@ 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))
@@ -85,6 +87,7 @@ 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.47.2",
+  "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