@postxl/generator 0.60.7 → 0.62.0

package/dist/generator.js

@@ -43,10 +43,8 @@ const react_generator_1 = require("./generators/enums/react.generator");
 const types_generator_1 = require("./generators/enums/types.generator");
 const businesslogic_actiontypes_generator_1 = require("./generators/indices/businesslogic-actiontypes.generator");
 const businesslogic_update_clonecontext_generator_1 = require("./generators/indices/businesslogic-update-clonecontext.generator");
-const businesslogic_update_index_generator_1 = require("./generators/indices/businesslogic-update-index.generator");
 const businesslogic_update_module_generator_1 = require("./generators/indices/businesslogic-update-module.generator");
 const businesslogic_update_service_generator_1 = require("./generators/indices/businesslogic-update-service.generator");
-const businesslogic_view_index_generator_1 = require("./generators/indices/businesslogic-view-index.generator");
 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");
@@ -65,7 +63,6 @@ const routes_index_generator_1 = require("./generators/indices/routes-index.gene
 const seed_migration_generator_1 = require("./generators/indices/seed-migration.generator");
 const seed_template_generator_1 = require("./generators/indices/seed-template.generator");
 const selectors_generator_1 = require("./generators/indices/selectors.generator");
-const stubs_generator_1 = require("./generators/indices/stubs.generator");
 const testdata_service_generator_1 = require("./generators/indices/testdata-service.generator");
 const types_generator_2 = require("./generators/indices/types.generator");
 const admin_page_generator_1 = require("./generators/models/admin.page.generator");
@@ -93,7 +90,8 @@ const CONFIG_SCHEMA = zod_1.z
     pathToE2ELib: zod_1.z.string().optional(),
     pathToImportExport: zod_1.z.string().optional(),
     pathToActions: zod_1.z.string().optional(),
-    pathToBusinessLogic: zod_1.z.string().optional(),
+    pathToBusinessViewLogic: zod_1.z.string().optional(),
+    pathToBusinessUpdateLogic: zod_1.z.string().optional(),
     pathToSeedData: zod_1.z.string().optional(),
     pathToSeedLib: zod_1.z.string().optional(),
     pathToTypes: zod_1.z.string().optional(),
@@ -119,7 +117,8 @@ const CONFIG_SCHEMA = zod_1.z
             e2eLibPath: (0, types_1.toPath)(s.pathToE2ELib || './backend/libs/e2e/src/'),
             importExportPath: (0, types_1.toPath)(s.pathToImportExport || './backend/libs/import-export/src/'),
             actionsPath: (0, types_1.toPath)(s.pathToActions || './backend/libs/actions/src/'),
-            businessLogicPath: (0, types_1.toPath)(s.pathToBusinessLogic || './backend/libs/business-logic/src/'),
+            businessViewLogicPath: (0, types_1.toPath)(s.pathToBusinessViewLogic || './backend/libs/view/src/'),
+            businessUpdateLogicPath: (0, types_1.toPath)(s.pathToBusinessUpdateLogic || './backend/libs/update/src/'),
             prismaMigrationsFolderPath: (0, types_1.toPath)(s.prismaMigrationsFolder || './migrations'),
             modelTypeDefinitionsPath: (0, types_1.toPath)(s.pathToTypes || './backend/libs/types/src/'),
             reactFolderPath: (0, types_1.toPath)(s.reactFolderOutput || './web/src/components/'),
@@ -181,17 +180,17 @@ 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 }));
+            generated.write(`/${meta.seed.location.path}.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 }));
-            generated.write(`/${meta.data.mockRepository.filePath}.ts`, (0, repository_generator_1.generateMockRepository)({ model, meta }));
-            generated.write(`/${meta.e2e.dataMockerStubFilePath}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
+            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
-            generated.write(`/${meta.businessLogic.view.serviceFilePath}.ts`, (0, businesslogic_view_generator_1.generateModelBusinessLogicView)({ model, meta }));
-            generated.write(`/${meta.businessLogic.update.serviceFilePath}.ts`, (0, businesslogic_update_generator_1.generateModelBusinessLogicUpdate)({ model, meta }));
+            generated.write(`/${meta.view.serviceLocation.path}.ts`, (0, businesslogic_view_generator_1.generateModelBusinessLogicView)({ model, meta }));
+            generated.write(`/${meta.update.serviceClassLocation.path}.ts`, (0, businesslogic_update_generator_1.generateModelBusinessLogicUpdate)({ model, meta }));
             // Routes
             generated.write(`/${meta.trpc.routerFilePath}.ts`, (0, route_generator_1.generateRoute)({ model, meta }));
             // React
@@ -209,38 +208,32 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
         // Generate Index Files and Services
         const meta = (0, meta_1.getSchemaMetadata)({ config });
         // Data
-        generated.write(`/${meta.data.dataMockModuleFilePath}.ts`, (0, datamock_module_generator_1.generateDataMockModule)({ models, meta }));
-        generated.write(`/${meta.data.dataModuleFilePath}.ts`, (0, datamodule_generator_1.generateDataModule)({ models, meta }));
+        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.filePath}.ts`, (0, dataservice_generator_1.generateDataService)({ 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.dataMocker.filePath}.ts`, (0, datamocker_generator_1.generateDataMocker)({ models, meta }));
+        generated.write(`/${meta.e2e.dataMockerLocation.path}.ts`, (0, datamocker_generator_1.generateDataMocker)({ models, meta }));
         generated.write(`/${meta.e2e.selectorsFilePath}.ts`, (0, selectors_generator_1.generateSelectors)());
-        generated.write(`/${meta.e2e.dataMocker.stubIndexFilePath}.ts`, (0, stubs_generator_1.generateDataMockerStubsIndex)({ models, meta }));
         generated.write(`/${meta.data.repository.constFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesArray)({ models, meta }));
-        generated.write(`/${meta.data.repository.indexFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesIndex)({ models, meta }));
-        generated.write(`/${meta.data.stubIndexFilePath}.ts`, (0, stubs_generator_1.generateStubsIndex)({ models, meta }));
-        generated.write(`/${meta.data.types.filePath}.ts`, (0, data_types_generator_1.generateDataTypes)({ models, meta }));
+        generated.write(`/${meta.data.types.location.path}.ts`, (0, data_types_generator_1.generateDataTypes)({ models, meta }));
         // Import-Export
-        generated.write(`/${meta.importExport.types.filePath}.ts`, (0, importexport_types_generator_1.generateImportExportTypes)({ models, meta }));
-        generated.write(`/${meta.importExport.exporterClass.filePath}.ts`, (0, importexport_exporter_class_generator_1.generateImportExportExporterClass)({ models, meta }));
-        generated.write(`/${meta.importExport.importService.filePath}.ts`, (0, importexport_import_service_generator_1.generateImportExportImportService)({ models, meta }));
-        generated.write(`/${meta.importExport.decoder.indexFilePath}.ts`, (0, importexport_decoder_generator_1.generateImportExportDecoderIndex)({ models, meta }));
-        generated.write(`/${meta.importExport.decoder.fullDecoderFilePath}.ts`, (0, importexport_decoder_generator_1.generateImportExportDecoder)({ models, meta }));
-        generated.write(`/${meta.importExport.converterFunctions.filePath}.ts`, (0, importexport_convert_import_functions_generator_1.generateImportExportConvertImportFunctions)({ models, meta }));
+        generated.write(`/${meta.importExport.types.location.path}.ts`, (0, importexport_types_generator_1.generateImportExportTypes)({ models, meta }));
+        generated.write(`/${meta.importExport.exporterClass.location.path}.ts`, (0, importexport_exporter_class_generator_1.generateImportExportExporterClass)({ models, meta }));
+        generated.write(`/${meta.importExport.importService.location.path}.ts`, (0, importexport_import_service_generator_1.generateImportExportImportService)({ models, meta }));
+        generated.write(`/${meta.importExport.decoder.location.path}.ts`, (0, importexport_decoder_generator_1.generateImportExportDecoder)({ models, meta }));
+        generated.write(`/${meta.importExport.converterFunctions.location.path}.ts`, (0, importexport_convert_import_functions_generator_1.generateImportExportConvertImportFunctions)({ models, meta }));
         // Actions
-        generated.write(`/${meta.actions.dispatcher.filePath}.ts`, (0, dispatcher_service_generator_1.generateActionsDispatcherService)({ models, meta }));
+        generated.write(`/${meta.actions.dispatcher.classLocation.path}.ts`, (0, dispatcher_service_generator_1.generateActionsDispatcherService)({ models, meta }));
         // Business Logic
-        generated.write(`/${meta.businessLogic.view.indexFilePath}.ts`, (0, businesslogic_view_index_generator_1.generateBusinessLogicViewIndex)({ models, meta }));
-        generated.write(`/${meta.businessLogic.view.moduleFilePath}.ts`, (0, businesslogic_view_module_generator_1.generateBusinessLogicViewModule)({ models, meta }));
-        generated.write(`/${meta.businessLogic.view.serviceFilePath}.ts`, (0, businesslogic_view_service_generator_1.generateBusinessLogicViewService)({ models, meta }));
-        generated.write(`/${meta.businessLogic.update.indexFilePath}.ts`, (0, businesslogic_update_index_generator_1.generateBusinessLogicUpdateIndex)({ models, meta }));
-        generated.write(`/${meta.businessLogic.update.cloneContextFilePath}.ts`, (0, businesslogic_update_clonecontext_generator_1.generateBusinessLogicCloneContext)({ models, meta }));
-        generated.write(`/${meta.businessLogic.update.moduleFilePath}.ts`, (0, businesslogic_update_module_generator_1.generateBusinessLogicUpdateModule)({ models, meta }));
-        generated.write(`/${meta.businessLogic.update.serviceFilePath}.ts`, (0, businesslogic_update_service_generator_1.generateBusinessLogicUpdateService)({ models, meta }));
-        generated.write(`/${meta.businessLogic.update.actionTypesFilePath}.ts`, (0, businesslogic_actiontypes_generator_1.generateBusinessLogicActionTypes)({ models, meta }));
+        generated.write(`/${meta.view.moduleLocation.path}.ts`, (0, businesslogic_view_module_generator_1.generateBusinessLogicViewModule)({ models, meta }));
+        generated.write(`/${meta.view.serviceLocation.path}.ts`, (0, businesslogic_view_service_generator_1.generateBusinessLogicViewService)({ models, meta }));
+        generated.write(`/${meta.update.cloneContextFilePath}.ts`, (0, businesslogic_update_clonecontext_generator_1.generateBusinessLogicCloneContext)({ models, meta }));
+        generated.write(`/${meta.update.moduleLocation.path}.ts`, (0, businesslogic_update_module_generator_1.generateBusinessLogicUpdateModule)({ models, meta }));
+        generated.write(`/${meta.update.serviceLocation.path}.ts`, (0, businesslogic_update_service_generator_1.generateBusinessLogicUpdateService)({ models, meta }));
+        generated.write(`/${meta.update.actionTypesFilePath}.ts`, (0, businesslogic_actiontypes_generator_1.generateBusinessLogicActionTypes)({ models, meta }));
         // Seed
-        generated.write(`/${meta.seedData.initialMigrationFilePath}.ts`, (0, seed_migration_generator_1.generateSeedMigration)({ models, meta }));
+        generated.write(`/${meta.seedData.initialMigrationLocation.path}.ts`, (0, seed_migration_generator_1.generateSeedMigration)({ models, meta }));
         generated.write(`/${meta.seedData.templateExcelFilePath}`, yield (0, seed_template_generator_1.generateSeedExcelTemplate)({ models }));
         // Routes
         generated.write(`/${meta.trpc.routesFilePath}.ts`, (0, routes_index_generator_1.generateRoutesIndex)({ models, meta }));

package/dist/generators/indices/businesslogic-actiontypes.generator.js

@@ -8,8 +8,8 @@ const file_1 = require("../../lib/utils/file");
  * Generates the action types for the BusinessLogicModule.
  */
 function generateBusinessLogicActionTypes({ models, meta }) {
-    const imports = imports_1.ImportsGenerator.from(meta.businessLogic.update.actionTypesFilePath).addImport({
-        from: meta.actions.importPath,
+    const imports = imports_1.ImportsGenerator.from(meta.update.actionTypesFilePath).addImport({
+        from: meta.actions.definition.importPath,
         items: [meta.actions.definition.payload, meta.actions.definition.resultDict],
     });
     const updateServiceImports = [];
@@ -18,12 +18,12 @@ function generateBusinessLogicActionTypes({ models, meta }) {
     const actionResultTypeElements = [];
     for (const model of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
-        const className = modelMeta.businessLogic.update.serviceClassName;
-        const scope = modelMeta.businessLogic.update.actionModelDiscriminantName;
+        const className = modelMeta.update.serviceClassName;
+        const scope = modelMeta.update.actionModelDiscriminantName;
         modelNameTypeElements.push(`'${scope}'`);
         const relativeImportPath = (0, file_1.getRelativePath)({
-            from: meta.businessLogic.update.actionTypesFilePath,
-            to: modelMeta.businessLogic.update.serviceFilePath,
+            from: meta.update.actionTypesFilePath,
+            to: modelMeta.update.serviceClassLocation.path,
         });
         updateServiceImports.push(`import type * as ${className} from '${relativeImportPath}'`);
         actionsTypeElements.push(`${meta.actions.definition.payload}<${className}.Scope, ${className}.Actions>`);

package/dist/generators/indices/businesslogic-update-clonecontext.generator.js

@@ -7,7 +7,7 @@ const meta_1 = require("../../lib/meta");
  * Generates the clone context for the business logic update service.
  */
 function generateBusinessLogicCloneContext({ models, meta: schemaMeta, }) {
-    const imports = imports_1.ImportsGenerator.from(schemaMeta.businessLogic.update.cloneContextFilePath);
+    const imports = imports_1.ImportsGenerator.from(schemaMeta.update.cloneContextFilePath);
     const typeDefinitions = [];
     const mapAssignments = [];
     for (const model of models) {
@@ -15,8 +15,8 @@ function generateBusinessLogicCloneContext({ models, meta: schemaMeta, }) {
         imports.addImports({
             [schemaMeta.types.importPath]: [modelMeta.types.brandedIdType, modelMeta.types.typeName],
         });
-        typeDefinitions.push(`${modelMeta.businessLogic.update.cloneContextMap}: Map<${modelMeta.types.brandedIdType}, ${modelMeta.types.typeName}>`);
-        mapAssignments.push(`${modelMeta.businessLogic.update.cloneContextMap}: new Map()`);
+        typeDefinitions.push(`${modelMeta.update.cloneContextMap}: Map<${modelMeta.types.brandedIdType}, ${modelMeta.types.typeName}>`);
+        mapAssignments.push(`${modelMeta.update.cloneContextMap}: new Map()`);
     }
     return /* ts */ `
 ${imports.generate()}

package/dist/generators/indices/businesslogic-update-module.generator.js

@@ -9,20 +9,20 @@ const meta_1 = require("../../lib/meta");
 function generateBusinessLogicUpdateModule({ models, meta }) {
     const mm = models
         .map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }))
-        .sort((a, b) => a.meta.businessLogic.update.serviceClassName.localeCompare(b.meta.businessLogic.update.serviceClassName));
-    const imports = imports_1.ImportsGenerator.from(meta.businessLogic.update.moduleFilePath).addImports({
-        [meta.businessLogic.update.serviceFilePath]: meta.businessLogic.update.serviceClassName,
-        [meta.businessLogic.view.importPath]: meta.businessLogic.view.moduleName,
+        .sort((a, b) => a.meta.update.serviceClassName.localeCompare(b.meta.update.serviceClassName));
+    const imports = imports_1.ImportsGenerator.from(meta.update.moduleLocation.path).addImports({
+        [meta.update.serviceLocation.path]: meta.update.serviceClassName,
+        [meta.view.moduleLocation.import]: meta.view.moduleName,
     });
-    const providers = [meta.businessLogic.update.serviceClassName];
+    const providers = [meta.update.serviceClassName];
     for (const { meta } of mm) {
         imports.addImport({
-            items: [meta.businessLogic.update.serviceClassName],
-            from: meta.businessLogic.update.serviceFilePath,
+            items: [meta.update.serviceClassName],
+            from: meta.update.serviceClassLocation.path,
         });
-        providers.push(meta.businessLogic.update.serviceClassName);
+        providers.push(meta.update.serviceClassName);
     }
-    const moduleName = meta.businessLogic.update.moduleName;
+    const moduleName = meta.update.moduleName;
     return /* ts */ `
 import { Module } from '@nestjs/common'
   

package/dist/generators/indices/businesslogic-update-service.generator.js

@@ -9,16 +9,16 @@ const meta_1 = require("../../lib/meta");
 function generateBusinessLogicUpdateService({ models, meta, }) {
     const mm = models
         .map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }))
-        .sort((a, b) => a.meta.businessLogic.update.serviceClassName.localeCompare(b.meta.businessLogic.update.serviceClassName));
-    const imports = imports_1.ImportsGenerator.from(meta.businessLogic.update.serviceFilePath);
+        .sort((a, b) => a.meta.update.serviceClassName.localeCompare(b.meta.update.serviceClassName));
+    const imports = imports_1.ImportsGenerator.from(meta.update.serviceLocation.path);
     for (const { meta } of mm) {
         imports.addImport({
-            items: [meta.businessLogic.update.serviceClassName],
-            from: meta.businessLogic.update.serviceFilePath,
+            items: [meta.update.serviceClassName],
+            from: meta.update.serviceClassLocation.path,
         });
     }
     const constructor = mm
-        .map(({ meta }) => `@Inject(forwardRef(() => ${meta.businessLogic.update.serviceClassName}))  public readonly ${meta.businessLogic.update.serviceVariableName} :${meta.businessLogic.update.serviceClassName}`)
+        .map(({ meta }) => `@Inject(forwardRef(() => ${meta.update.serviceClassName}))  public readonly ${meta.update.serviceVariableName} :${meta.update.serviceClassName}`)
         .join(',\n');
     return /* ts */ `
   import { Inject, Injectable, forwardRef } from '@nestjs/common'
@@ -26,7 +26,7 @@ function generateBusinessLogicUpdateService({ models, meta, }) {
   ${imports.generate()}
 
   @Injectable()
-  export class ${meta.businessLogic.update.serviceClassName} {
+  export class ${meta.update.serviceClassName} {
     constructor(${constructor}) {}
   }
   `;

package/dist/generators/indices/businesslogic-view-module.generator.js

@@ -9,19 +9,19 @@ const meta_1 = require("../../lib/meta");
 function generateBusinessLogicViewModule({ models, meta }) {
     const mm = models
         .map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }))
-        .sort((a, b) => a.meta.businessLogic.view.serviceClassName.localeCompare(b.meta.businessLogic.view.serviceClassName));
-    const imports = imports_1.ImportsGenerator.from(meta.businessLogic.view.moduleFilePath).addImports({
-        [meta.businessLogic.view.serviceFilePath]: meta.businessLogic.view.serviceClassName,
+        .sort((a, b) => a.meta.view.serviceClassName.localeCompare(b.meta.view.serviceClassName));
+    const imports = imports_1.ImportsGenerator.from(meta.view.moduleLocation.path).addImports({
+        [meta.view.serviceLocation.path]: meta.view.serviceClassName,
     });
-    const providers = [meta.businessLogic.view.serviceClassName];
+    const providers = [meta.view.serviceClassName];
     for (const { meta } of mm) {
         imports.addImport({
-            items: [meta.businessLogic.view.serviceClassName],
-            from: meta.businessLogic.view.serviceFilePath,
+            items: [meta.view.serviceClassName],
+            from: meta.view.serviceLocation.path,
         });
-        providers.push(meta.businessLogic.view.serviceClassName);
+        providers.push(meta.view.serviceClassName);
     }
-    const moduleName = meta.businessLogic.view.moduleName;
+    const moduleName = meta.view.moduleName;
     return /* ts */ `
 import { Module } from '@nestjs/common'
 

package/dist/generators/indices/businesslogic-view-service.generator.js

@@ -9,16 +9,16 @@ const meta_1 = require("../../lib/meta");
 function generateBusinessLogicViewService({ models, meta }) {
     const mm = models
         .map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }))
-        .sort((a, b) => a.meta.businessLogic.view.serviceClassName.localeCompare(b.meta.businessLogic.view.serviceClassName));
-    const imports = imports_1.ImportsGenerator.from(meta.businessLogic.view.serviceFilePath);
+        .sort((a, b) => a.meta.view.serviceClassName.localeCompare(b.meta.view.serviceClassName));
+    const imports = imports_1.ImportsGenerator.from(meta.view.serviceLocation.path);
     for (const { meta } of mm) {
         imports.addImport({
-            items: [meta.businessLogic.view.serviceClassName],
-            from: meta.businessLogic.view.serviceFilePath,
+            items: [meta.view.serviceClassName],
+            from: meta.view.serviceLocation.path,
         });
     }
     const constructor = mm
-        .map(({ meta }) => `@Inject(forwardRef(() => ${meta.businessLogic.view.serviceClassName}))  public readonly ${meta.businessLogic.view.serviceVariableName} :${meta.businessLogic.view.serviceClassName}`)
+        .map(({ meta }) => `@Inject(forwardRef(() => ${meta.view.serviceClassName}))  public readonly ${meta.view.serviceVariableName} :${meta.view.serviceClassName}`)
         .join(',\n');
     return /* ts */ `
 import { Inject, Injectable, forwardRef } from '@nestjs/common'
@@ -26,7 +26,7 @@ import { Inject, Injectable, forwardRef } from '@nestjs/common'
 ${imports.generate()}
 
 @Injectable()
-export class ${meta.businessLogic.view.serviceClassName} {
+export class ${meta.view.serviceClassName} {
   constructor(${constructor}) {}
 }
   `;

package/dist/generators/indices/data-types.generator.js

@@ -8,7 +8,7 @@ const meta_1 = require("../../lib/meta");
  */
 function generateDataTypes({ models, meta }) {
     const { types } = meta.data;
-    const imports = imports_1.ImportsGenerator.from(types.filePath);
+    const imports = imports_1.ImportsGenerator.from(types.location.path);
     const dto = meta.types.dto;
     imports.addTypeImport({
         from: meta.types.importPath,

package/dist/generators/indices/datamock-module.generator.js

@@ -1,47 +1,24 @@
 "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.generateDataMockModule = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
-const Types = __importStar(require("../../lib/schema/types"));
 /**
  * Generates a mocking class
  */
 function generateDataMockModule({ models, meta }) {
     const mm = models.map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }));
-    const imports = imports_1.ImportsGenerator.from(meta.data.dataMockModuleFilePath).addImports({
-        [meta.data.dataModuleFilePath]: [Types.toVariableName('DataModule')],
-        [meta.data.dataService.filePath]: [meta.data.dataService.class],
+    const imports = imports_1.ImportsGenerator.from(meta.data.mockModule.location.path).addImports({
+        [meta.data.moduleLocation.path]: [meta.data.moduleName],
+        [meta.data.dataService.location.path]: [meta.data.dataService.class],
+        [meta.backendModules.db.moduleLocation.import]: [meta.backendModules.db.moduleName],
         // we need to import the file directly instead via the normal index file as this would cause a circular dependency else
-        [meta.actions.importPath]: [meta.actions.execution.mock],
+        [meta.actions.execution.mockLocation.import]: [meta.actions.execution.mock],
     });
     for (const { model, meta } of mm) {
         imports.addTypeImport({ items: [model.typeName], from: meta.types.importPath });
-        imports.addImport({ items: [meta.data.repository.className], from: meta.data.repository.filePath });
-        imports.addImport({ items: [meta.data.mockRepository.className], from: meta.data.mockRepository.filePath });
+        imports.addImport({ items: [meta.data.repository.className], from: meta.data.repository.location.path });
+        imports.addImport({ items: [meta.data.mockRepository.className], from: meta.data.mockRepository.location.path });
     }
     const providers = mm
         .map(({ meta }) => `{ 
@@ -57,11 +34,10 @@ function generateDataMockModule({ models, meta }) {
         .join(', ');
     return /* ts */ `
 import { DynamicModule } from '@nestjs/common'
-import { DatabaseModule } from '@backend/db'
 
 ${imports.generate()}
 
-export class ${meta.data.dataMockModuleName} {
+export class ${meta.data.mockModule.name} {
   static mock(seed?: MockData): DynamicModule {
     const execution = new MockActionExecution()
 

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

@@ -10,11 +10,11 @@ const types_1 = require("../../lib/schema/types");
  */
 function generateDataMocker({ models, meta: schemaMeta }) {
     const modelMetas = models.map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }));
-    const imports = imports_1.ImportsGenerator.from(schemaMeta.e2e.dataMocker.filePath);
+    const imports = imports_1.ImportsGenerator.from(schemaMeta.e2e.dataMockerLocation.path);
     for (const { model, meta } of modelMetas) {
         imports.addImports({
             [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(model.typeName)],
-            [schemaMeta.e2e.dataMocker.stubImportPath]: [meta.data.stubGenerationFnName],
+            [meta.e2e.stubLocation.path]: [meta.e2e.stubGenerationFnName],
         });
     }
     const publicVariables = modelMetas
@@ -26,7 +26,7 @@ function generateDataMocker({ models, meta: schemaMeta }) {
     const addDataFunctions = modelMetas.map(({ model, meta }) => generateAddDataFunction(model, meta)).join('\n');
     return `
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import type { MockData } from '@backend/data'
+import type { MockData } from '@backend/data/data.mock.module'
 
 ${imports.generate()}
 

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

@@ -8,19 +8,20 @@ const meta_1 = require("../../lib/meta");
  */
 function generateDataModule({ models, meta }) {
     const mm = models.map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }));
-    const imports = imports_1.ImportsGenerator.from(meta.data.dataModuleFilePath).addImports({
-        [meta.data.dataService.filePath]: [meta.data.dataService.class],
+    const imports = imports_1.ImportsGenerator.from(meta.data.moduleLocation.path).addImports({
+        [meta.data.dataService.location.path]: [meta.data.dataService.class],
+        [meta.backendModules.db.databaseService.location.import]: [meta.backendModules.db.databaseService.name],
+        [meta.backendModules.db.moduleLocation.import]: [meta.backendModules.db.moduleName],
     });
     for (const { meta } of mm) {
         imports.addImport({
             items: [meta.data.repository.className],
-            from: meta.data.repository.filePath,
+            from: meta.data.repository.location.path,
         });
     }
     const moduleName = meta.data.moduleName;
     return /* ts */ `
 import { DynamicModule, FactoryProvider } from '@nestjs/common'  
-import { DatabaseModule, DatabaseService } from '@backend/db'
 
 ${imports.generate()}
 

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

@@ -9,11 +9,11 @@ const types_1 = require("../../lib/schema/types");
  */
 function generateDataService({ models, meta }) {
     const mm = models.map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }));
-    const imports = imports_1.ImportsGenerator.from(meta.data.dataService.filePath);
+    const imports = imports_1.ImportsGenerator.from(meta.data.dataService.location.path);
     for (const { meta } of mm) {
         imports.addImport({
             items: [meta.data.repository.className],
-            from: meta.data.repository.filePath,
+            from: meta.data.repository.location.path,
         });
     }
     const constructor = mm
@@ -28,8 +28,8 @@ function generateDataService({ models, meta }) {
     imports.addImports({
         [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(meta.types.dto.create), (0, types_1.toAnnotatedTypeName)(meta.types.dto.update)],
         [meta.data.repository.typeFilePath]: [(0, types_1.toAnnotatedTypeName)(meta.data.repository.typeName)],
-        [meta.data.types.filePath]: [(0, types_1.toAnnotatedTypeName)(meta.data.types.bulkMutation)],
-        [meta.actions.importPath]: [meta.actions.execution.interface],
+        [meta.data.types.location.import]: [(0, types_1.toAnnotatedTypeName)(meta.data.types.bulkMutation)],
+        [meta.actions.execution.interfaceLocation.import]: [meta.actions.execution.interface],
     });
     const creates = [];
     const updates = [];

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

@@ -8,11 +8,13 @@ const types_1 = require("../../lib/schema/types");
  * Generates the action dispatcher service.
  */
 function generateActionsDispatcherService({ models, meta }) {
-    const imports = imports_1.ImportsGenerator.from(meta.actions.dispatcher.filePath).addImports({
-        [meta.seed.importPath]: [meta.seed.serviceClassName],
-        [meta.importExport.importPath]: [meta.importExport.importService.name],
-        [meta.businessLogic.update.importPath]: [meta.businessLogic.update.serviceClassName],
+    const imports = imports_1.ImportsGenerator.from(meta.actions.dispatcher.classLocation.path).addImports({
+        [meta.seed.serviceLocation.import]: [meta.seed.serviceClassName],
+        [meta.importExport.importService.location.import]: [meta.importExport.importService.name],
+        [meta.update.serviceLocation.import]: [meta.update.serviceClassName],
         [meta.types.importPath]: (0, types_1.toAnnotatedTypeName)(meta.config.userType),
+        [meta.backendModules.db.databaseService.location.import]: [meta.backendModules.db.databaseService.name],
+        [meta.actions.execution.interfaceLocation.path]: [meta.actions.execution.interface],
     });
     const dataLoader = [];
     for (const model of models) {
@@ -23,11 +25,10 @@ function generateActionsDispatcherService({ models, meta }) {
   import { Injectable } from '@nestjs/common'
 
 import { ExhaustiveSwitchCheck } from '@backend/common'
-import { DatabaseService } from '@backend/db'
 
 ${imports.generate()}
 
-import { ActionExecutionFactory, IActionExecution } from './execution'
+import { ActionExecutionFactory } from './execution/action'
 import { Action, ResultOfAction } from './actions.types'
 
 
@@ -42,7 +43,7 @@ export class ${meta.actions.dispatcher.class} {
   public ${meta.importExport.importService.sharedName}: ImportService = {} as unknown as any
 
   constructor(
-    private readonly updateService: ${meta.businessLogic.update.serviceClassName}, 
+    private readonly updateService: ${meta.update.serviceClassName}, 
     private readonly databaseService: DatabaseService,
     private readonly actionExecutionFactory: ActionExecutionFactory,
   ) {}
@@ -77,14 +78,14 @@ export class ${meta.actions.dispatcher.class} {
         .map((model) => {
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
         return `
-        case '${modelMeta.businessLogic.scopeName}': {
-          const method = this.updateService.${modelMeta.businessLogic.update.serviceVariableName}[action.type] as (params: {
+        case '${modelMeta.update.scopeName}': {
+          const method = this.updateService.${modelMeta.update.serviceVariableName}[action.type] as (params: {
             data: A['payload']
             execution: IActionExecution
           }) => Promise<ResultOfAction<A>>
     
           // NOTE: We need to bind the method to the service instance, as it is a method of the service and not a standalone function.
-          return method.bind(this.updateService.${modelMeta.businessLogic.update.serviceVariableName})({ data: action.payload, execution })
+          return method.bind(this.updateService.${modelMeta.update.serviceVariableName})({ data: action.payload, execution })
         }
         `;
     })

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

@@ -13,18 +13,18 @@ function generateImportExportConvertImportFunctions({ models, meta, }) {
     const { importedDataToBulkMutations, deltaToBulkMutations } = meta.importExport.converterFunctions;
     const { types } = meta.importExport;
     const { delta } = types;
-    const imports = imports_1.ImportsGenerator.from(meta.importExport.converterFunctions.filePath);
+    const imports = imports_1.ImportsGenerator.from(meta.importExport.converterFunctions.location.path);
     imports.addImports({
-        [meta.importExport.decoder.fullDecoderFilePath]: [
+        [meta.importExport.decoder.location.path]: [
             (0, types_1.toAnnotatedTypeName)(meta.importExport.decoder.decodedPXLModelDataTypeName),
         ],
-        [meta.data.importPath]: [
-            (0, types_1.toAnnotatedTypeName)(meta.data.dataMockDataType),
+        [meta.data.types.location.import]: [
             (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.filePath]: [(0, types_1.toAnnotatedTypeName)(types.delta), (0, types_1.toAnnotatedTypeName)(types.delta_Model.type)],
+        [types.location.path]: [(0, types_1.toAnnotatedTypeName)(types.delta), (0, types_1.toAnnotatedTypeName)(types.delta_Model.type)],
     });
     const importConverterBlocks = [];
     const deltaConverterBlocks = [];
@@ -379,11 +379,11 @@ function generateDeltaBlock({ fieldsGrouped, modelMeta, schemaMeta, imports, })
         items: [modelMeta.types.typeName, modelMeta.types.brandedIdType],
     });
     imports.addTypeImport({
-        from: schemaMeta.importExport.types.filePath,
+        from: schemaMeta.importExport.types.location.path,
         items: [type, create.type, update.type],
     });
     imports.addImport({
-        from: schemaMeta.importExport.types.filePath,
+        from: schemaMeta.importExport.types.location.path,
         items: [create.typeGuard, update.typeGuard],
     });
     return /* ts */ `

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

@@ -8,10 +8,10 @@ const types_1 = require("../../lib/schema/types");
  * Generates the Exporter class for the Import-Export module
  */
 function generateImportExportExporterClass({ models, meta }) {
-    const imports = imports_1.ImportsGenerator.from(meta.importExport.exporterClass.filePath);
+    const imports = imports_1.ImportsGenerator.from(meta.importExport.exporterClass.location.path);
     imports.addImports({
-        [meta.businessLogic.view.importPath]: [meta.businessLogic.view.serviceClassName],
-        [meta.importExport.decoder.fullDecoderFilePath]: [
+        [meta.view.serviceLocation.import]: [meta.view.serviceClassName],
+        [meta.importExport.decoder.location.path]: [
             meta.importExport.decoder.fullEncoderFunctionName,
             (0, types_1.toAnnotatedTypeName)(meta.importExport.decoder.encodedExcelDataTypeName),
         ],
@@ -54,7 +54,7 @@ function generateImportExportExporterClass({ models, meta }) {
             const linkedFieldMeta = (0, meta_1.getFieldMetadata)({ field: referencingField });
             childItemCalls.push(`
         // Add all ${linkedModelMeta.userFriendlyNamePlural} that are related to the ${modelMeta.userFriendlyName} via ${referencingField.name}
-        for (const ${referencingField.name} of await this.viewService.${linkedModelMeta.businessLogic.view.serviceVariableName}.data.${linkedFieldMeta.getByForeignKeyIdsMethodFnName}(id)) {
+        for (const ${referencingField.name} of await this.viewService.${linkedModelMeta.view.serviceVariableName}.data.${linkedFieldMeta.getByForeignKeyIdsMethodFnName}(id)) {
           await this.${linkedModelMeta.importExport.exportAddFunctionName}({id: ${referencingField.name}, includeChildren})
         }
         `);
@@ -74,7 +74,7 @@ function generateImportExportExporterClass({ models, meta }) {
           if (this.${modelMeta.internalPluralName}.has(id)) {
             return
           }
-          const item = await this.viewService.${modelMeta.businessLogic.view.serviceVariableName}.get(id)
+          const item = await this.viewService.${modelMeta.view.serviceVariableName}.get(id)
           if (!item) {
             this.logger.error(\`Cannot find ${modelMeta.userFriendlyName} \${id}\`)
             return
@@ -86,7 +86,7 @@ function generateImportExportExporterClass({ models, meta }) {
           ${childItems}
         }
       `);
-        addAllCalls.push(`this.${modelMeta.internalPluralName} = await this.viewService.${modelMeta.businessLogic.view.serviceVariableName}.getAll()`);
+        addAllCalls.push(`this.${modelMeta.internalPluralName} = await this.viewService.${modelMeta.view.serviceVariableName}.getAll()`);
     }
     return /* ts */ `
 // For consistency, we include \`{ includeChildren = true }\` in the signature of every add function.