@postxl/generator 0.67.0 → 0.69.0

package/dist/generator.js

@@ -47,12 +47,9 @@ const businesslogic_update_service_generator_1 = require("./generators/indices/b
 const businesslogic_view_module_generator_1 = require("./generators/indices/businesslogic-view-module.generator");
 const businesslogic_view_service_generator_1 = require("./generators/indices/businesslogic-view-service.generator");
 const data_types_generator_1 = require("./generators/indices/data-types.generator");
-const datamock_module_generator_1 = require("./generators/indices/datamock-module.generator");
-const datamocker_generator_1 = require("./generators/indices/datamocker.generator");
 const datamodule_generator_1 = require("./generators/indices/datamodule.generator");
 const dataservice_generator_1 = require("./generators/indices/dataservice.generator");
 const dispatcher_service_generator_1 = require("./generators/indices/dispatcher-service.generator");
-const emptydatabasemigration_generator_1 = require("./generators/indices/emptydatabasemigration.generator");
 const importexport_convert_import_functions_generator_1 = require("./generators/indices/importexport-convert-import-functions.generator");
 const importexport_exporter_class_generator_1 = require("./generators/indices/importexport-exporter-class.generator");
 const importexport_import_service_generator_1 = require("./generators/indices/importexport-import-service.generator");
@@ -61,7 +58,6 @@ const repositories_generator_1 = require("./generators/indices/repositories.gene
 const routes_index_generator_1 = require("./generators/indices/routes-index.generator");
 const seed_migration_generator_1 = require("./generators/indices/seed-migration.generator");
 const seed_template_generator_1 = require("./generators/indices/seed-template.generator");
-const testdata_service_generator_1 = require("./generators/indices/testdata-service.generator");
 const testids_generator_1 = require("./generators/indices/testids.generator");
 const types_generator_2 = require("./generators/indices/types.generator");
 const admin_page_generator_1 = require("./generators/models/admin.page.generator");
@@ -175,8 +171,6 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             // Data
             generated.write(`/${meta.data.stubLocation.path}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
             generated.write(`/${meta.data.repository.location.path}.ts`, (0, repository_generator_1.generateRepository)({ model, meta }));
-            generated.write(`/${meta.data.mockRepository.location.path}.ts`, (0, repository_generator_1.generateMockRepository)({ model, meta }));
-            generated.write(`/${meta.e2e.stubLocation.path}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
             // Import-Export
             generated.write(`/${meta.importExport.decoder.filePath}.ts`, (0, importexport_decoder_generator_1.generateModelImportExportDecoder)({ model, meta, schemaMeta: (0, meta_1.getSchemaMetadata)({ config }) }));
             // Business Logic
@@ -199,12 +193,8 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
         // Generate Index Files and Services
         const meta = (0, meta_1.getSchemaMetadata)({ config });
         // Data
-        generated.write(`/${meta.data.mockModule.location.path}.ts`, (0, datamock_module_generator_1.generateDataMockModule)({ models, meta }));
         generated.write(`/${meta.data.moduleLocation.path}.ts`, (0, datamodule_generator_1.generateDataModule)({ models, meta }));
-        generated.write(`/${meta.data.emptyDbCommandFilePath}.ts`, (0, emptydatabasemigration_generator_1.generateEmptyDatabaseCommand)({ models, meta }));
         generated.write(`/${meta.data.dataService.location.path}.ts`, (0, dataservice_generator_1.generateDataService)({ models, meta }));
-        generated.write(`/${meta.data.testDataServiceFilePath}.ts`, (0, testdata_service_generator_1.generateTestDataService)({ models, meta }));
-        generated.write(`/${meta.e2e.dataMockerLocation.path}.ts`, (0, datamocker_generator_1.generateDataMocker)({ models, meta }));
         generated.write(`/${meta.e2e.testIdsFilePath}.ts`, (0, testids_generator_1.generateTestIds)());
         generated.write(`/${meta.data.repository.constFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesArray)({ models, meta }));
         generated.write(`/${meta.data.types.location.path}.ts`, (0, data_types_generator_1.generateDataTypes)({ models, meta }));

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

@@ -45,7 +45,7 @@ function generateDataService({ models, meta }) {
     return /* ts */ `
 import { Injectable, Logger } from '@nestjs/common'
 
-import { format, mapValues, pluralize } from '@backend/common'
+import { format, mapValues, pluralize } from '@postxl/runtime'
 
 ${imports.generate()}
 

package/dist/generators/indices/dispatcher-service.generator.js

@@ -24,7 +24,7 @@ function generateActionsDispatcherService({ models, meta }) {
     return /* ts */ `
   import { Injectable } from '@nestjs/common'
 
-import { ExhaustiveSwitchCheck } from '@backend/common'
+import { ExhaustiveSwitchCheck } from '@postxl/runtime'
 
 ${imports.generate()}
 

package/dist/generators/indices/importexport-convert-import-functions.generator.js

@@ -22,7 +22,6 @@ function generateImportExportConvertImportFunctions({ models, meta, }) {
             (0, types_1.toAnnotatedTypeName)(meta.data.types.bulkMutation),
             (0, types_1.toAnnotatedTypeName)(meta.data.types.bulkMutationForModel),
         ],
-        [meta.data.mockModule.location.import]: [(0, types_1.toAnnotatedTypeName)(meta.data.dataMockDataType)],
         [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(dto.genericModel), (0, types_1.toAnnotatedTypeName)(dto.idType)],
         [types.location.path]: [(0, types_1.toAnnotatedTypeName)(types.delta), (0, types_1.toAnnotatedTypeName)(types.delta_Model.type)],
     });
@@ -42,7 +41,7 @@ function generateImportExportConvertImportFunctions({ models, meta, }) {
         // logState({ state, nextStep, lastStep: 'updateModelState' })
     }
     return /* ts */ `
-import { ExhaustiveSwitchCheck } from '@backend/common'
+import { ExhaustiveSwitchCheck } from '@postxl/runtime'
 ${imports.generate()}
 
 /**
@@ -120,8 +119,6 @@ function deltaModelTo${meta.data.types.bulkMutation}<
 
   return _removeBlank${meta.data.types.bulkMutation}(result)
 }
-
-${generateMockDataToBulkFunction({ models, meta })}
 `;
 }
 exports.generateImportExportConvertImportFunctions = generateImportExportConvertImportFunctions;
@@ -512,22 +509,3 @@ function generateFieldAssignmentBlocks({ fieldsGrouped, }) {
     }
     return result;
 }
-function generateMockDataToBulkFunction({ models, meta }) {
-    const mockConverters = [];
-    for (const model of models) {
-        const modelMeta = (0, meta_1.getModelMetadata)({ model });
-        mockConverters.push(`${modelMeta.seed.constantName}: { create: data.${modelMeta.seed.constantName} }`);
-    }
-    return /* ts */ `
-/**
- * Converts MockData from the DataMocker to ${meta.data.types.bulkMutation}, so it can be
- * imported during the E2E seed process.
- */
-export function ${meta.importExport.converterFunctions.mockDataToBulkMutations}(
-  data: ${meta.data.dataMockDataType}
-): ${meta.data.types.bulkMutation} {
-  return {
-    ${mockConverters.join(',\n')}
-  }
-}`;
-}

package/dist/generators/indices/importexport-exporter-class.generator.js

@@ -95,7 +95,7 @@ function generateImportExportExporterClass({ models, meta }) {
 
 import { Logger } from '@nestjs/common'
 
-import { mapValues } from '@backend/common'
+import { mapValues } from '@postxl/runtime'
 ${imports.generate()}
 
 /**

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

@@ -46,7 +46,7 @@ function generateImportExportImportService({ models, meta }) {
     }
     return /* ts */ `
 import { Injectable } from '@nestjs/common'
-import { ExhaustiveSwitchCheck } from '@backend/common'
+import { ExhaustiveSwitchCheck } from '@postxl/runtime'
 
 ${imports.generate()}
 

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

@@ -42,12 +42,6 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         iExecution: schemaMeta.actions.execution.interface,
         typeName: meta.types.typeName,
         brandedId: model.brandedIdType,
-        decoders: {
-            name: meta.update.decoders.name,
-            createType: `Create${meta.internalSingularNameCapitalized}`,
-            updateType: `Update${meta.internalSingularNameCapitalized}`,
-            upsertType: `Upsert${meta.internalSingularNameCapitalized}`,
-        },
     };
     const imports = imports_1.ImportsGenerator.from(meta.update.serviceClassLocation.path);
     imports.addImports({
@@ -96,7 +90,6 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         `@Inject(forwardRef(() => ${schemaMeta.update.serviceClassName})) private readonly updateService: ${schemaMeta.update.serviceClassName}`,
         `@Inject(forwardRef(() => ${schemaMeta.view.serviceClassName})) private readonly viewService: ${schemaMeta.view.serviceClassName}`,
     ];
-    const decoders = meta.update.decoders;
     const { view, update } = meta;
     const deleteFn = generateDeleteFn({ model, meta, m });
     const deleteManyFn = generateDeleteManyFn({ imports, model, meta, m });
@@ -113,19 +106,19 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
     export type Actions = {
       ${(0, jsdoc_1.toJsDocComment)([`Creates a new ${meta.userFriendlyName} and returns it.`])}
       create: {
-        payload: ${m.decoders.createType}
+        payload: CreatePayload
         result: ${m.typeName}
       }
 
       ${(0, jsdoc_1.toJsDocComment)([`Updates a ${meta.userFriendlyName} and returns it.`])}
       update: {
-        payload: ${m.decoders.updateType}
+        payload: UpdatePayload
         result: ${m.typeName}
       }
 
       ${(0, jsdoc_1.toJsDocComment)([`Creates or updates a ${meta.userFriendlyName} and returns it.`])}
       upsert: {
-        payload: ${m.decoders.upsertType}
+        payload: UpsertPayload
         result: ${m.typeName}
       }
 
@@ -139,40 +132,34 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
     /**
      * Zod decoder for validating the create input of a ${meta.userFriendlyName}.
      */
-    export const ${decoders.create} = z.object({
+    export const ${meta.update.createInputDecoder} = z.object({
       ${model.fields
         .filter((f) => !f.attributes.isReadonly)
         .map((f) => `${f.name}: z.${(0, zod_1.getZodDecoderDefinition)({ field: f })}`)
         .join(',')}
     })
 
-    type ${m.decoders.createType} = z.infer<typeof ${decoders.create}>
+    type CreatePayload = z.infer<typeof ${meta.update.createInputDecoder}>
 
     /**
      * Zod decoder for validating the update input of a ${meta.userFriendlyName} .
      */
-    export const ${decoders.update} = z.object({
+    export const ${meta.update.updateInputDecoder} = z.object({
       ${model.fields
         .filter((f) => !f.attributes.isReadonly || f.kind === 'id')
         .map((f) => `${f.name}: z.${(0, zod_1.getZodDecoderDefinition)({ field: f, allowAnyOptionalField: f.kind !== 'id' })}`)
         .join(',')}
     })
 
-    type ${m.decoders.updateType} = z.infer<typeof ${decoders.update}>
+    type UpdatePayload = z.infer<typeof ${meta.update.updateInputDecoder}>
 
     /**
      * Zod decoder for validating the upsert input of a ${meta.userFriendlyName} .
      */
-    export const ${decoders.upsert} = z.union([${decoders.update}, ${decoders.create}])
+    export const ${meta.update.upsertInputDecoder} = z.union([${meta.update.updateInputDecoder}, ${meta.update.createInputDecoder}])
     
-    type ${m.decoders.upsertType} = z.infer<typeof ${decoders.upsert}>
+    type UpsertPayload = z.infer<typeof ${meta.update.upsertInputDecoder}>
 
-    export const ${decoders.name} = {
-      create: ${decoders.create},
-      update: ${decoders.update},
-      upsert: ${decoders.upsert},
-    }
-    
     export type ${update.serviceInterfaceName} = ${schemaMeta.actions.dispatcher.definition}<Actions>
 
     @Injectable()
@@ -188,17 +175,17 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
       }
 
       ${(0, jsdoc_1.toJsDocComment)([`Creates a new ${meta.userFriendlyName} and returns it.`])}
-      public async create({ data, execution }: { data: ${m.decoders.createType}; execution: ${m.iExecution} }): Promise<${m.typeName}> {
+      public async create({ data, execution }: { data: CreatePayload; execution: ${m.iExecution} }): Promise<${m.typeName}> {
         return this.data.create({ item: data, execution })
       }
 
       ${(0, jsdoc_1.toJsDocComment)([`Updates a ${meta.userFriendlyName} and returns it.`])}
-      public async update({ data, execution }: { data: ${m.decoders.updateType}; execution: ${m.iExecution} }): Promise<${m.typeName}> {
+      public async update({ data, execution }: { data: UpdatePayload; execution: ${m.iExecution} }): Promise<${m.typeName}> {
         return this.data.update({ item: data, execution })
       }
 
       ${(0, jsdoc_1.toJsDocComment)([`Creates or updates a ${meta.userFriendlyName} and returns it.`])}
-      public async upsert({ data, execution }: { data: ${m.decoders.upsertType}; execution: ${m.iExecution} }): Promise<${m.typeName}> {
+      public async upsert({ data, execution }: { data: UpsertPayload; execution: ${m.iExecution} }): Promise<${m.typeName}> {
         return this.data.upsert({ item: data, execution })
       }
 

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

@@ -113,13 +113,41 @@ function generateModelBusinessLogicView({ model, meta }) {
   `;
     return /* ts */ `
 /* eslint-disable @typescript-eslint/no-unused-vars */
+import z from 'zod'
+
 import { Inject, Injectable, forwardRef } from '@nestjs/common'
-import { FilterOperator } from '@backend/common'
 
 ${imports.generate()}
 
 ${hasLinkedItems ? linkedTypeDefinition : ''}
 
+/**
+ * Cursor decoder.
+ */
+export const ${meta.view.cursorDecoder} = z.object({ startRow: z.number(), endRow: z.number() })
+
+type Cursor = z.infer<typeof ${meta.view.cursorDecoder}>
+
+/**
+ * Filter operator decoder.
+ */
+export const ${meta.view.filterOperatorDecoder} = z.enum([
+  'eq',
+  'neq',
+  'gt',
+  'gte',
+  'lt',
+  'lte',
+  'in',
+  'nin',
+  'contains',
+  'ncontains',
+  'starts',
+  'ends',
+])
+
+type FilterOperator = z.infer<typeof ${meta.view.filterOperatorDecoder}>
+
 @Injectable()
 export class ${meta.view.serviceClassName} {
   constructor(${constructorParameters.join(',\n')}) {}
@@ -151,7 +179,7 @@ export class ${meta.view.serviceClassName} {
   }: {
     filter?: { field: keyof ${model.typeName}; operator: FilterOperator; value: string | number }
     sort?: { field: keyof ${model.typeName}; ascending: boolean }
-    cursor?: { startRow: number; endRow: number }
+    cursor?: Cursor
   }) {
     const items = await this.${modelRepositoryVariableName}.getAllAsArray()
     const filtered = !filter

package/dist/generators/models/importexport-decoder.generator.js

@@ -10,19 +10,17 @@ const types_2 = require("../../lib/types");
  */
 function generateModelImportExportDecoder({ model, meta, schemaMeta, }) {
     const { filePath: decoderFilePath, itemEncoderFunctionName: rowExportFunctionName, encodedExcelType: excelType, arrayEncoderFunctionName: tableExportFunctionName, tableDecoder: tableImportDecoder, } = meta.importExport.decoder;
-    const imports = imports_1.ImportsGenerator.from(decoderFilePath);
-    imports.addImports({
-        [schemaMeta.backendModules.common.importPath]: [
-            schemaMeta.backendModules.common.functions.uncapitalizeKeys,
-            schemaMeta.backendModules.common.functions.capitalizeKeys,
-            schemaMeta.backendModules.common.functions.nullOrBlankDecoder,
-        ],
+    const imports = imports_1.ImportsGenerator.from(decoderFilePath).addImports({
+        [schemaMeta.backendModules.common.importPath]: [schemaMeta.backendModules.common.functions.excelNullOrBlankDecoder],
         [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(meta.types.typeName)],
     });
     const { userFriendlyName: userFriendly, userFriendlyNamePlural: userFriendlyPlural, internalSingularName: singular, internalSingularNameCapitalized: singularCapitalized, } = meta;
     const { fieldDecoders, blankFieldDecoders } = generateFieldDecoders({ model, meta, schemaMeta, imports });
     return `
 import * as z from 'zod'
+
+import { uncapitalizeKeys, capitalizeKeys } from '@postxl/runtime'
+
 ${imports.generate()}
 
 /**
@@ -80,7 +78,7 @@ function generateFieldDecoders({ model, meta, schemaMeta, imports, }) {
     for (const field of model.fields) {
         const fieldMeta = (0, meta_1.getFieldMetadata)({ field });
         const optionalModifier = field.attributes.isUpdatedAt || field.attributes.isCreatedAt ? '.optional()' : '';
-        blankFieldDecoders.push(`${fieldMeta.excelColumnName}: nullOrBlankDecoder${optionalModifier}`);
+        blankFieldDecoders.push(`${fieldMeta.excelColumnName}: excelNullOrBlankDecoder${optionalModifier}`);
         switch (field.kind) {
             case 'id': {
                 imports.addImport({ items: [meta.types.toBrandedIdTypeFnName], from: meta.types.importPath });
@@ -140,10 +138,7 @@ dbTypeName, nullable, imports, schemaMeta, }) {
     switch (tsTypeName) {
         case 'string': {
             const decoder = schemaMeta.backendModules.common.functions[nullable ? 'excelStringNullableDecoder' : 'excelStringDecoder'];
-            imports.addImport({
-                items: [decoder],
-                from: schemaMeta.backendModules.common.importPath,
-            });
+            imports.addImport({ items: [decoder], from: schemaMeta.backendModules.common.importPath });
             return decoder;
         }
         case 'boolean':
@@ -192,9 +187,6 @@ dbTypeName, nullable, imports, schemaMeta, }) {
 function generateImportExportDecoder({ models, meta }) {
     const { decodedPXLModelDataTypeName, encodedExcelDataTypeName, fullDecoderName, fullEncoderFunctionName } = meta.importExport.decoder;
     const imports = imports_1.ImportsGenerator.from(meta.importExport.decoder.location.path);
-    imports.addImports({
-        [meta.backendModules.common.importPath]: (0, types_1.toFunctionName)('uncapitalizeKeys'),
-    });
     const importTypes = [];
     const decoderEntries = [];
     const exportFields = [];
@@ -217,6 +209,9 @@ function generateImportExportDecoder({ models, meta }) {
     }
     return `
 import * as z from 'zod'
+
+import { uncapitalizeKeys } from '@postxl/runtime'
+
 ${imports.generate()}
 
 export type ${encodedExcelDataTypeName} = {

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

@@ -18,7 +18,7 @@ function generateModelContext({ model, meta }) {
 import React, { useMemo } from 'react'
 
 import { trpc } from '@lib/trpc'
-import { filterMap, mapMap } from '@lib/utils'
+import { filterMap, mapMap } from '@postxl/runtime'
 
 ${imports.generate()}
 

package/dist/generators/models/repository.generator.d.ts

@@ -7,13 +7,6 @@ export declare function generateRepository({ model, meta }: {
     model: Model;
     meta: ModelMetaData;
 }): string;
-/**
- * Generates a mock repository data structure for a given model: same a repository, but in memory only.
- */
-export declare function generateMockRepository({ model: modelSource, meta: metaSource, }: {
-    model: Model;
-    meta: ModelMetaData;
-}): string;
 type FnSignature = {
     /**
      * A list of ordered TypeScript types where the first type in the list corresponds to the type of the