@postxl/generator 0.1.1 → 0.2.0

package/dist/src/generator.d.ts

@@ -1,5 +1,6 @@
-import { Logger } from './lib/utils/logger';
+#! /usr/bin/env node
 import * as Schema from './lib/schema/schema';
+import { Logger } from './lib/utils/logger';
 /**
  * Generates PXL files and flushes them to disk.
  */

package/dist/src/generator.js

@@ -1,3 +1,4 @@
+#! /usr/bin/env node
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -33,32 +34,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
+const faker_1 = require("@faker-js/faker");
 const generator_helper_1 = require("@prisma/generator-helper");
 const internals_1 = require("@prisma/internals");
 const prettier = __importStar(require("prettier"));
-const client_path_1 = require("./prisma/client-path");
-const parse_1 = require("./prisma/parse");
-const meta_1 = require("./lib/meta");
-const vfs_1 = require("./lib/vfs");
-const route_generator_1 = require("./generators/models/route.generator");
-const repository_generator_1 = require("./generators/models/repository.generator");
-const stub_generator_1 = require("./generators/models/stub.generator");
-const seed_generator_1 = require("./generators/models/seed.generator");
-const react_generator_1 = require("./generators/models/react.generator");
-const types_generator_1 = require("./generators/models/types.generator");
-const types_generator_2 = require("./generators/enums/types.generator");
-const react_generator_2 = require("./generators/enums/react.generator");
+const zod_1 = require("zod");
+const react_generator_1 = require("./generators/enums/react.generator");
+const types_generator_1 = require("./generators/enums/types.generator");
 const datamockmodule_generator_1 = require("./generators/indices/datamockmodule.generator");
-const dataservice_generator_1 = require("./generators/indices/dataservice.generator");
 const datamodule_generator_1 = require("./generators/indices/datamodule.generator");
-const types_1 = require("./lib/schema/types");
-const faker_1 = require("@faker-js/faker");
+const dataservice_generator_1 = require("./generators/indices/dataservice.generator");
 const repositories_generator_1 = require("./generators/indices/repositories.generator");
+const seed_generator_1 = require("./generators/indices/seed.generator");
 const stubs_generator_1 = require("./generators/indices/stubs.generator");
-const seed_generator_2 = require("./generators/indices/seed.generator");
-const types_generator_3 = require("./generators/indices/types.generator");
 const testdataservice_generator_1 = require("./generators/indices/testdataservice.generator");
-const zod_1 = require("zod");
+const types_generator_2 = require("./generators/indices/types.generator");
+const react_generator_2 = require("./generators/models/react.generator");
+const repository_generator_1 = require("./generators/models/repository.generator");
+const route_generator_1 = require("./generators/models/route.generator");
+const seed_generator_2 = require("./generators/models/seed.generator");
+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 vfs_1 = require("./lib/vfs");
+const client_path_1 = require("./prisma/client-path");
+const parse_1 = require("./prisma/parse");
 const configDecoder = zod_1.z
     .object({
     project: zod_1.z.string(),
@@ -132,11 +133,11 @@ const generate = ({ models, enums, config, prismaClientPath, logger, }) => __awa
         const meta = (0, meta_1.getModelMetadata)({ model });
         // Types
         if (!config.disableGenerators.types) {
-            vfs.write(`/${meta.types.filePath}.ts`, (0, types_generator_1.generateModelTypes)({ model, meta }));
+            vfs.write(`/${meta.types.filePath}.ts`, (0, types_generator_3.generateModelTypes)({ model, meta }));
         }
         // Seed
         if (!config.disableGenerators.seed) {
-            vfs.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_1.generateSeedModel)({ model, itemCount: 5, meta }));
+            vfs.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_2.generateSeedModel)({ model, itemCount: 5, meta }));
         }
         // Generate Repositories
         if (!config.disableGenerators.data) {
@@ -149,7 +150,7 @@ const generate = ({ models, enums, config, prismaClientPath, logger, }) => __awa
         }
         // React
         if (!config.disableGenerators.react) {
-            vfs.copy((0, react_generator_1.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
+            vfs.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
         }
         logger.log(`✅ ${model.name} generated!`);
     }
@@ -157,10 +158,10 @@ const generate = ({ models, enums, config, prismaClientPath, logger, }) => __awa
     for (const enumerator of enums.values()) {
         const meta = (0, meta_1.getEnumMetadata)({ enumerator });
         if (!config.disableGenerators.types) {
-            vfs.write(`/${meta.types.filePath}.ts`, (0, types_generator_2.generateEnumType)({ enumerator, prismaClientPath, meta }));
+            vfs.write(`/${meta.types.filePath}.ts`, (0, types_generator_1.generateEnumType)({ enumerator, prismaClientPath, meta }));
         }
         if (!config.disableGenerators.react) {
-            vfs.copy((0, react_generator_2.generateEnumReactComponents)({ enumerator, meta }), meta.react.folderPath);
+            vfs.copy((0, react_generator_1.generateEnumReactComponents)({ enumerator, meta }), meta.react.folderPath);
         }
     }
     // Generate Index Files and Services
@@ -175,13 +176,13 @@ const generate = ({ models, enums, config, prismaClientPath, logger, }) => __awa
         vfs.write(`/${meta.data.stubIndexFilePath}.ts`, (0, stubs_generator_1.generateStubsIndex)({ models, meta }));
     }
     if (!config.disableGenerators.seed) {
-        vfs.write(`/${meta.seed.indexFilePath}.ts`, (0, seed_generator_2.generateSeedIndex)({ models, meta }));
+        vfs.write(`/${meta.seed.indexFilePath}.ts`, (0, seed_generator_1.generateSeedIndex)({ models, meta }));
     }
     if (!config.disableGenerators.trpc) {
         vfs.write(`/${meta.trpc.routesFilePath}.ts`, (0, route_generator_1.generateRoutesIndex)({ models, meta }));
     }
     if (!config.disableGenerators.types) {
-        vfs.write(`/${meta.types.indexFilePath}.ts`, (0, types_generator_3.generateTypesIndex)({ models, enums, meta }));
+        vfs.write(`/${meta.types.indexFilePath}.ts`, (0, types_generator_2.generateTypesIndex)({ models, enums, meta }));
     }
     // -------------------------------------------------------------------------
     // Add disclaimer and format.

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

@@ -35,7 +35,7 @@ function generateRepository({ model, meta }) {
         .addImport({ items: [meta.types.zodDecoderFnName], from: meta.types.importPath });
     return `
 import { Injectable, Logger } from '@nestjs/common'
-import { DbService } from '@${model.schemaConfig.project}/db'
+import { DbService, ${model.sourceName} as DbType } from '@${model.schemaConfig.project}/db'
 
 import { Repository } from '../repository.type'
 
@@ -52,7 +52,15 @@ export class ${meta.data.repositoryClassName} implements Repository<
 
   ${model.defaultField ? `public defaultValue!: ${model.typeName}` : ''}
 
-  ${isGenerated ? `protected currentMaxId = 0\n` : ''}
+  ${isGenerated
+        ? `
+  
+  protected currentMaxId = 0\n
+  public get nextId(): ${model.brandedIdType} {
+    return ${meta.types.toBrandedIdTypeFnName}(this.currentMaxId + 1)
+  }
+  `
+        : ''}
 
   protected uniqueIds = {
 		${uniqueStringFields.map((f) => `'${f.name}': new Map<string, ${model.typeName}>()`).join(',\n')}
@@ -96,8 +104,10 @@ export class ${meta.data.repositoryClassName} implements Repository<
   }
 
   public get(id: ${model.brandedIdType} | null): ${model.typeName} | null {
-    if (id === null) return null
-    return this.data.get(${meta.types.toBrandedIdTypeFnName}(id)) ?? null
+    if (id === null) { 
+      return null
+    }
+    return this.data.get(id) ?? null
   }
 
   public getAll(): Map<${model.brandedIdType}, ${model.typeName}> {
@@ -279,10 +289,12 @@ export class ${meta.data.repositoryClassName} implements Repository<
     /**
      * Utility function that converts a given Database object to a TypeScript model instance
      */
-    private ${decoder}(item: unknown): ${model.typeName} {
-      return ${meta.types.zodDecoderFnName}.parse(item)
+    private ${decoder}(item: DbType): ${model.typeName} {
+      return ${meta.types.zodDecoderFnName}.parse({
+        ${[...model.fields.values()].map((f) => `${f.name}: item.${f.sourceName}`).join(',\n')}
+      })
     }
-}
+  }
 `;
 }
 exports.generateRepository = generateRepository;

package/dist/src/generators/models/seed.generator.js

@@ -65,7 +65,7 @@ function getExampleMode({ model, maxItemCount }) {
     else if (sameNumberOfExamplesPerField) {
         return {
             mode: 'Tuples',
-            itemCount: numberOfExamplesPerField < maxItemCount ? numberOfExamplesPerField : maxItemCount,
+            itemCount: numberOfExamplesPerField,
         };
     }
     else {
@@ -127,7 +127,7 @@ function getFieldExample({ field, model, index, exampleMode, }) {
             return { hasExample: true, example };
         }
         case 'Tuples': {
-            const example = field.attributes.examples[index % field.attributes.examples.length];
+            const example = field.attributes.examples[(index - 1) % field.attributes.examples.length];
             return { hasExample: true, example };
         }
         default:

package/dist/src/prisma/attributes.js

@@ -31,15 +31,16 @@ function parseArgumentToStringOrStringArray(str) {
     try {
         return JSON.parse(str);
     }
-    catch (_a) {
-        try {
-            return JSON.parse(`[${str}]`);
-        }
-        catch (_b) {
-            console.log(str);
-            return JSON.parse(`"${str}"`);
-        }
+    catch (_a) { }
+    try {
+        return JSON.parse(`[${str}]`);
+    }
+    catch (_b) { }
+    try {
+        return JSON.parse(`"${str}"`);
     }
+    catch (_c) { }
+    throw new Error(`Could not parse attribute argument: ${str}`);
 }
 exports.parseArgumentToStringOrStringArray = parseArgumentToStringOrStringArray;
 /**

package/dist/src/prisma/parse.js

@@ -107,6 +107,9 @@ function parseModel({ dmmfModel, enums, models, config, }) {
         }
         if (dmmfField.kind === 'scalar') {
             let validation = undefined;
+            if (dmmfField.isList) {
+                (0, error_1.throwError)(`Array fields with scalars (e.g. String[]) aren't supported! Use a relation instead. Field: ${dmmfModel.name}.${dmmfField.name}`);
+            }
             if (dmmfField.type === 'Int') {
                 validation = { type: 'int' };
             }