@postxl/generator 0.10.0 → 0.12.0

package/dist/generator.d.ts

@@ -4,10 +4,10 @@ import { Logger } from './lib/utils/logger';
 /**
  * Generates PXL files and flushes them to disk.
  */
-export declare const generate: ({ models, enums, config, prismaClientPath, logger, }: {
+export declare function generate({ models, enums, config, prismaClientPath, logger, }: {
     models: Schema.Model[];
     enums: Schema.Enum[];
     config: Schema.SchemaConfig;
     prismaClientPath: string;
     logger: Logger;
-}) => Promise<void>;
+}): Promise<void>;

package/dist/generator.js

@@ -61,7 +61,7 @@ const meta_1 = require("./lib/meta");
 const types_1 = require("./lib/schema/types");
 const client_path_1 = require("./prisma/client-path");
 const parse_1 = require("./prisma/parse");
-const configDecoder = zod_1.z
+const CONFIG_SCHEMA = zod_1.z
     .object({
     project: zod_1.z.string(),
     pathToTypes: zod_1.z.string().optional(),
@@ -113,7 +113,7 @@ const configDecoder = zod_1.z
     onGenerate: ({ generator, otherGenerators, dmmf }) => __awaiter(void 0, void 0, void 0, function* () {
         internals_1.logger.info(`PXL started generating code...`);
         const prismaClientPath = (0, client_path_1.getClientImportPath)(otherGenerators);
-        const decodedConfig = configDecoder.safeParse(generator.config);
+        const decodedConfig = CONFIG_SCHEMA.safeParse(generator.config);
         if (!decodedConfig.success) {
             throw new Error(`Invalid generator config: ${decodedConfig.error.message}`);
         }
@@ -121,92 +121,94 @@ const configDecoder = zod_1.z
         internals_1.logger.log(`Parsing DMMF...`);
         const { models, enums } = (0, parse_1.parsePrismaSchema)({ datamodel: dmmf.datamodel, config });
         internals_1.logger.log(`Generating...`);
-        yield (0, exports.generate)({ models, enums, config, prismaClientPath, logger: internals_1.logger });
+        yield generate({ models, enums, config, prismaClientPath, logger: internals_1.logger });
         internals_1.logger.info(`PXL finished!`);
     }),
 });
 /**
  * Generates PXL files and flushes them to disk.
  */
-const generate = ({ models, enums, config, prismaClientPath, logger, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const root = yield lock_1.LockUtils.findProjectRoot();
-    if (root == undefined) {
-        throw new Error(`Could not find lock file. Make sure you are running the generator in a project folder.`);
-    }
-    faker_1.faker.seed(config.randomSeed);
-    const vfs = yield lock_1.VirtualFS.fromLockFile(root);
-    const generated = new lock_1.VirtualFS();
-    // Generate Models
-    for (const model of models) {
-        const meta = (0, meta_1.getModelMetadata)({ model });
-        // Types
-        if (!config.disableGenerators.types) {
-            generated.write(`/${meta.types.filePath}.ts`, (0, types_generator_3.generateModelTypes)({ model, meta }));
+function generate({ models, enums, config, prismaClientPath, logger, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const root = yield lock_1.LockUtils.findProjectRoot();
+        if (root == undefined) {
+            throw new Error(`Could not find lock file. Make sure you are running the generator in a project folder.`);
         }
-        // Seed
-        if (!config.disableGenerators.seed) {
-            generated.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_2.generateSeedModel)({ model, itemCount: 5, meta }));
+        faker_1.faker.seed(config.randomSeed);
+        const vfs = yield lock_1.VirtualFS.fromLockFile(root);
+        const generated = new lock_1.VirtualFS();
+        // Generate Models
+        for (const model of models) {
+            const meta = (0, meta_1.getModelMetadata)({ model });
+            // Types
+            if (!config.disableGenerators.types) {
+                generated.write(`/${meta.types.filePath}.ts`, (0, types_generator_3.generateModelTypes)({ model, meta }));
+            }
+            // Seed
+            if (!config.disableGenerators.seed) {
+                generated.write(`/${meta.seed.filePath}.ts`, (0, seed_generator_2.generateSeedModel)({ model, itemCount: 5, meta }));
+            }
+            // Generate Repositories
+            if (!config.disableGenerators.data) {
+                generated.write(`/${meta.data.stubFilePath}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
+                generated.write(`/${meta.data.repoFilePath}.ts`, (0, repository_generator_1.generateRepository)({ model, meta }));
+                generated.write(`/${meta.data.mockRepoFilePath}.ts`, (0, repository_generator_1.generateMockRepository)({ model, meta }));
+            }
+            // Routes
+            if (!config.disableGenerators.trpc) {
+                generated.write(`/${meta.trpc.routerFilePath}.ts`, (0, route_generator_1.generateRoute)({ model, meta }));
+            }
+            // React
+            if (!config.disableGenerators.react) {
+                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()) {
+            const meta = (0, meta_1.getEnumMetadata)({ enumerator });
+            if (!config.disableGenerators.types) {
+                generated.write(`/${meta.types.filePath}.ts`, (0, types_generator_1.generateEnumType)({ enumerator, prismaClientPath, meta }));
+            }
+            if (!config.disableGenerators.react) {
+                generated.copy((0, react_generator_1.generateEnumReactComponents)({ enumerator, meta }), meta.react.folderPath);
+            }
         }
-        // Generate Repositories
+        // Generate Index Files and Services
+        const meta = (0, meta_1.getSchemaMetadata)({ config });
         if (!config.disableGenerators.data) {
-            generated.write(`/${meta.data.stubFilePath}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
-            generated.write(`/${meta.data.repoFilePath}.ts`, (0, repository_generator_1.generateRepository)({ model, meta }));
-            generated.write(`/${meta.data.mockRepoFilePath}.ts`, (0, repository_generator_1.generateMockRepository)({ model, meta }));
+            generated.write(`/${meta.data.dataMockModuleFilePath}.ts`, (0, datamockmodule_generator_1.generateDataMockModule)({ models, meta }));
+            generated.write(`/${meta.data.dataModuleFilePath}.ts`, (0, datamodule_generator_1.generateDataModule)({ models, meta }));
+            generated.write(`/${meta.data.dataServiceFilePath}.ts`, (0, dataservice_generator_1.generateDataService)({ models, meta }));
+            generated.write(`/${meta.data.testDataServiceFilePath}.ts`, (0, testdataservice_generator_1.generateTestDataService)({ models, meta }));
+            generated.write(`/${meta.data.repositoriesConstFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesArray)({ models, meta }));
+            generated.write(`/${meta.data.repositoriesIndexFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesIndex)({ models, meta }));
+            generated.write(`/${meta.data.stubIndexFilePath}.ts`, (0, stubs_generator_1.generateStubsIndex)({ models, meta }));
+            generated.write(`/${meta.migrationsPath}/emptyDatabase.template.sql`, (0, emptydatabasemigration_generator_1.generateEmptyDatabaseStoredProcedure)({ models, meta }));
         }
-        // Routes
-        if (!config.disableGenerators.trpc) {
-            generated.write(`/${meta.trpc.routerFilePath}.ts`, (0, route_generator_1.generateRoute)({ model, meta }));
+        if (!config.disableGenerators.seed) {
+            generated.write(`/${meta.seed.indexFilePath}.ts`, (0, seed_generator_1.generateSeedIndex)({ models, meta }));
         }
-        // React
-        if (!config.disableGenerators.react) {
-            generated.copy((0, react_generator_2.generateReactComponentsForModel)({ model, meta }), meta.react.folderPath);
+        if (!config.disableGenerators.trpc) {
+            generated.write(`/${meta.trpc.routesFilePath}.ts`, (0, route_generator_1.generateRoutesIndex)({ models, meta }));
         }
-        logger.log(`- ${model.name} processed`);
-    }
-    // Generate Enums
-    for (const enumerator of enums.values()) {
-        const meta = (0, meta_1.getEnumMetadata)({ enumerator });
         if (!config.disableGenerators.types) {
-            generated.write(`/${meta.types.filePath}.ts`, (0, types_generator_1.generateEnumType)({ enumerator, prismaClientPath, meta }));
+            generated.write(`/${meta.types.indexFilePath}.ts`, (0, types_generator_2.generateTypesIndex)({ models, enums, meta }));
         }
-        if (!config.disableGenerators.react) {
-            generated.copy((0, react_generator_1.generateEnumReactComponents)({ enumerator, meta }), meta.react.folderPath);
-        }
-    }
-    // Generate Index Files and Services
-    const meta = (0, meta_1.getSchemaMetadata)({ config });
-    if (!config.disableGenerators.data) {
-        generated.write(`/${meta.data.dataMockModuleFilePath}.ts`, (0, datamockmodule_generator_1.generateDataMockModule)({ models, meta }));
-        generated.write(`/${meta.data.dataModuleFilePath}.ts`, (0, datamodule_generator_1.generateDataModule)({ models, meta }));
-        generated.write(`/${meta.data.dataServiceFilePath}.ts`, (0, dataservice_generator_1.generateDataService)({ models, meta }));
-        generated.write(`/${meta.data.testDataServiceFilePath}.ts`, (0, testdataservice_generator_1.generateTestDataService)({ models, meta }));
-        generated.write(`/${meta.data.repositoriesConstFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesArray)({ models, meta }));
-        generated.write(`/${meta.data.repositoriesIndexFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesIndex)({ models, meta }));
-        generated.write(`/${meta.data.stubIndexFilePath}.ts`, (0, stubs_generator_1.generateStubsIndex)({ models, meta }));
-        generated.write(`/${meta.migrationsPath}/emptyDatabase.template.sql`, (0, emptydatabasemigration_generator_1.generateEmptyDatabaseStoredProcedure)({ models, meta }));
-    }
-    if (!config.disableGenerators.seed) {
-        generated.write(`/${meta.seed.indexFilePath}.ts`, (0, seed_generator_1.generateSeedIndex)({ models, meta }));
-    }
-    if (!config.disableGenerators.trpc) {
-        generated.write(`/${meta.trpc.routesFilePath}.ts`, (0, route_generator_1.generateRoutesIndex)({ models, meta }));
-    }
-    if (!config.disableGenerators.types) {
-        generated.write(`/${meta.types.indexFilePath}.ts`, (0, types_generator_2.generateTypesIndex)({ models, enums, meta }));
-    }
-    // -------------------------------------------------------------------------
-    // Add disclaimer and format.
-    const prettierConfig = yield prettier.resolveConfig(process.cwd());
-    generated.transformUTF8Files((path, content) => `${DISCLAIMER}\n${content}`);
-    generated.format(prettierConfig);
-    // -------------------------------------------------------------------------
-    // Merge with existing files.
-    vfs.copy(generated, './');
-    // Flush to disk.
-    const changes = yield vfs.flush(process.cwd(), { force: config.force });
-    const log = lock_1.ConsoleUtils.getFilesChangelog(changes);
-    console.info(log);
-});
+        // -------------------------------------------------------------------------
+        // Add disclaimer and format.
+        const prettierConfig = yield prettier.resolveConfig(process.cwd());
+        generated.transformUTF8Files((path, content) => `${DISCLAIMER}\n${content}`);
+        generated.formatUTF8Files(prettierConfig);
+        // -------------------------------------------------------------------------
+        // Merge with existing files.
+        vfs.copy(generated, './');
+        // Flush to disk.
+        const changes = yield vfs.flush(process.cwd(), { force: config.force });
+        const log = lock_1.ConsoleUtils.getFilesChangelog(changes.filter((c) => !c.static));
+        console.info(log);
+    });
+}
 exports.generate = generate;
 const DISCLAIMER = `
 /**

package/dist/generators/indices/dataservice.generator.js

@@ -18,7 +18,7 @@ function generateDataService({ models, meta }) {
     const constructor = mm
         .map(({ meta }) => `public ${meta.data.dataServiceName} :${meta.data.repositoryClassName}`)
         .join(',\n');
-    const initializer = mm.map(({ meta }) => `await this.${meta.data.dataServiceName}.init()`).join(',\n');
+    const initializer = mm.map(({ meta }) => `this.${meta.data.dataServiceName}.init()`).join(',\n');
     const excelExports = mm
         .map(({ meta }) => `${meta.data.excelExportTableName}: mapValues(this.${meta.data.dataServiceName}.getAll()),`)
         .join('\n');
@@ -40,7 +40,7 @@ export class DataService {
   }
 
   public async init(): Promise<void> {
-    ${initializer}
+    await Promise.all([${initializer}])
   }
 
   public isEmpty(): boolean {

package/dist/generators/indices/emptydatabasemigration.generator.d.ts

@@ -3,7 +3,7 @@ import { Model } from '../../lib/schema/schema';
 /**
  * Generates a data module class.
  */
-export declare function generateEmptyDatabaseStoredProcedure({ models, meta, }: {
+export declare function generateEmptyDatabaseStoredProcedure({ models }: {
     models: Model[];
     meta: SchemaMetaData;
 }): string;

package/dist/generators/indices/emptydatabasemigration.generator.js

@@ -4,14 +4,16 @@ exports.generateEmptyDatabaseStoredProcedure = void 0;
 /**
  * Generates a data module class.
  */
-function generateEmptyDatabaseStoredProcedure({ models, meta, }) {
+function generateEmptyDatabaseStoredProcedure({ models }) {
     const tables = models
         .map((model) => `\t${model.sourceSchemaName !== undefined ? `"${model.sourceSchemaName}".` : ''}"${model.sourceName}"`)
         .join(',\n');
+    const useSchemas = models.some((model) => model.sourceSchemaName !== undefined);
+    const configTableName = useSchemas ? ' "Configuration"."Config"' : '"Config"';
     return `
 CREATE OR REPLACE PROCEDURE "emptyDatabase"() AS $BODY$ BEGIN IF EXISTS (
     SELECT
-    FROM "Configuration"."Config"
+    FROM ${configTableName}
     WHERE NOT "isTest"
 ) THEN RETURN;
 END IF;

package/dist/generators/models/react.generator/modals.generator.js

@@ -76,7 +76,7 @@ export const ${modals.createComponentName} = ({ show, onHide }: { show: boolean;
                 },
                 {
                   async onSuccess() {
-                    await cache.${trpc.getMap.reactQueryMethod}.invalidate()
+                    await cache.${trpc.routerName}.invalidate()
                   },
                 },
               ),

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

@@ -75,7 +75,7 @@ function generateRepository({ model, meta }) {
     return `
 import { Injectable, Logger } from '@nestjs/common'
 import { DbService, ${model.sourceName} as DbType } from '@${model.schemaConfig.project}/db'
-import { format, pluralize, NestedMap } from '@pxl/common'
+import { format, pluralize ${indexes.length === 0 ? '' : ', NestedMap'} } from '@pxl/common'
 
 ${imports.generate()}
 
@@ -140,8 +140,6 @@ export class ${meta.data.repositoryClassName} implements Repository<
       this.set(item)
 
       ${model.defaultField ? defaultValueInitFn : ''}
-      ${uniqueStringFields.map((f) => `this.uniqueIds.${f.name}.set(item.${f.name}, item)`).join('\n')}
-      ${indexes.map((i) => `this.${i.name}.set(item)`).join('\n')}
     }
 
     ${isGenerated ? idIntInitFn : ''}
@@ -173,6 +171,15 @@ export class ${meta.data.repositoryClassName} implements Repository<
     `}
   }
 
+  public async deleteAll(): Promise<void> {
+    ${model.attributes.inMemoryOnly
+        ? ''
+        : `
+    await this.db.runOnlyOnTestDb(() => this.db.$executeRaw\`DELETE FROM ${model.sourceSchemaName !== undefined ? `"${model.sourceSchemaName}".` : ''}"${model.sourceName}"\`)
+    `}
+    return this.init()
+  }
+
   public get(id: ${model.brandedIdType} | null): ${model.typeName} | null {
     if (id === null) { 
       return null

package/dist/prisma/attributes.js

@@ -79,7 +79,7 @@ function getModelAttributes(model) {
         skipDelete: obj.skipDelete || obj.customDelete,
         inMemoryOnly: obj.inMemoryOnly,
         description: obj.description,
-        schema: obj.schema,
+        databaseSchema: obj.schema,
         index: obj.index,
     }));
     const result = decoder.safeParse(attributes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {
@@ -21,7 +21,7 @@
     "prettier": "^2.8.7",
     "remeda": "1.9.4",
     "zod": "3.21.4",
-    "@postxl/lock": "0.2.4"
+    "@postxl/lock": "0.3.0"
   },
   "devDependencies": {
     "@prisma/client": "4.12.0",