@postxl/generator 0.44.3 → 0.44.5

package/dist/generator.js

@@ -82,7 +82,6 @@ const client_path_1 = require("./prisma/client-path");
 const parse_1 = require("./prisma/parse");
 const CONFIG_SCHEMA = zod_1.z
     .object({
-    project: zod_1.z.string(),
     pathToDataLib: zod_1.z.string().optional(),
     pathToCypress: zod_1.z.string().optional(),
     pathToE2ELib: zod_1.z.string().optional(),
@@ -106,7 +105,6 @@ const CONFIG_SCHEMA = zod_1.z
 })
     .transform((s) => {
     return {
-        project: s.project,
         paths: {
             dataLibPath: (0, types_1.toPath)(s.pathToDataLib || 'repos'),
             cypressPath: (0, types_1.toPath)(s.pathToCypress || './e2e/cypress/'),
@@ -187,11 +185,11 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
                 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.data.dataMockerStubFilePath}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
+                generated.write(`/${meta.e2e.dataMockerStubFilePath}.ts`, (0, stub_generator_1.generateStub)({ model, meta }));
             }
             // Import-Export
             if (!config.disableGenerators.importExport) {
-                generated.write(`/${meta.importExport.decoder.filePath}.ts`, (0, importexport_decoder_generator_1.generateModelImportExportDecoder)({ model, meta }));
+                generated.write(`/${meta.importExport.decoder.filePath}.ts`, (0, importexport_decoder_generator_1.generateModelImportExportDecoder)({ model, meta, schemaMeta: (0, meta_1.getSchemaMetadata)({ config }) }));
             }
             // Business Logic
             if (!config.disableGenerators.businessLogic) {
@@ -224,10 +222,10 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
             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.dataService.filePath}.ts`, (0, dataservice_generator_1.generateDataService)({ models, meta }));
-            generated.write(`/${meta.data.dataMockerFilePath}.ts`, (0, datamocker_generator_1.generateDataMocker)({ models, meta }));
-            generated.write(`/${meta.data.selectorsFilePath}.ts`, (0, selectors_generator_1.generateSelectors)());
             generated.write(`/${meta.data.testDataServiceFilePath}.ts`, (0, testdata_service_generator_1.generateTestDataService)({ models, meta }));
-            generated.write(`/${meta.data.dataMockerStubIndexFilePath}.ts`, (0, stubs_generator_1.generateDataMockerStubsIndex)({ models, meta }));
+            generated.write(`/${meta.e2e.dataMocker.filePath}.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 }));
@@ -272,6 +270,7 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
         // -------------------------------------------------------------------------
         // Add disclaimer and format.
         yield generated.transformUTF8Files((path, content) => `${DISCLAIMER}\n${content}`);
+        // Important: the eslint config provided here must match the .eslintrc files in the template!
         const lintResult = yield generated.lintUTF8Files({
             fix: true,
             useEslintrc: false,
@@ -306,11 +305,11 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
                                 // Side effect imports.
                                 ['^\\u0000'],
                                 // Any packages that starts with an @ but not libraries we defined in tsconfig.json:
-                                ['^@(?!(pxl|postxl|assets|hooks|components|i18n|lib))'],
+                                ['^@(?!(postxl|assets|backend|hooks|components|i18n|lib))'],
                                 // Any other package.
                                 ['^'],
                                 // Internal PXL packages.
-                                ['^(@pxl|@postxl|@assets|@hooks|@components|@i18n|@lib)(/.*|$)'],
+                                ['^(@postxl|@assets|@backend|@hooks|@components|@i18n|@lib)(/.*|$)'],
                                 // Parent imports. Put `..` last.
                                 ['^\\.\\.(?!/?$)', '^\\.\\./?$'],
                                 // Other relative imports. Put same-folder imports and `.` last.

package/dist/generators/enums/react.generator.js

@@ -20,7 +20,7 @@ exports.generateEnumReactComponents = generateEnumReactComponents;
  * Utility function that generates the select component for a given enumerator.
  */
 function generateEnumSelect({ enumerator, meta }) {
-    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addImport({
+    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addTypeImport({
         items: [enumerator.tsTypeName],
         from: meta.types.importPath,
     });

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

@@ -25,7 +25,7 @@ function generateBusinessLogicUpdateModule({ models, meta }) {
     }
     const moduleName = meta.businessLogic.update.moduleName;
     return /* ts */ `
-import { DynamicModule } from '@${meta.config.project}/common'
+import { DynamicModule } from '@backend/common'
   
 ${imports.generate()}
 

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

@@ -24,7 +24,7 @@ function generateBusinessLogicViewModule({ models, meta }) {
     }
     const moduleName = meta.businessLogic.view.moduleName;
     return /* ts */ `
-import { DynamicModule } from '@${meta.config.project}/common'
+import { DynamicModule } from '@backend/common'
   
 ${imports.generate()}
 

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

@@ -10,13 +10,14 @@ function generateDataTypes({ models, meta }) {
     const { types } = meta.data;
     const imports = imports_1.ImportsGenerator.from(types.filePath);
     const dto = meta.types.dto;
-    imports.addImports({
-        [meta.types.importPath]: [dto.create, dto.update, dto.upsert, dto.genericModel, dto.idType],
+    imports.addTypeImport({
+        from: meta.types.importPath,
+        items: [dto.create, dto.update, dto.upsert, dto.genericModel, dto.idType],
     });
     const modelTypes = [];
     for (const model of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
-        imports.addImport({
+        imports.addTypeImport({
             items: [modelMeta.types.typeName, modelMeta.types.brandedIdType],
             from: modelMeta.types.importPath,
         });

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

@@ -39,7 +39,7 @@ function generateDataMockModule({ models, meta }) {
         [meta.actions.importPath]: [meta.actions.actionExecution.mock],
     });
     for (const { model, meta } of mm) {
-        imports.addImport({ items: [model.typeName], from: meta.types.importPath });
+        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 });
     }
@@ -56,8 +56,8 @@ function generateDataMockModule({ models, meta }) {
         }`)
         .join(', ');
     return /* ts */ `
-import { DynamicModule } from '@pxl/common'
-import { DbModule } from '@${meta.config.project}/db'
+import { DynamicModule } from '@backend/common'
+import { DbModule } from '@backend/db'
 
 ${imports.generate()}
 

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

@@ -4,16 +4,17 @@ exports.generateDataMocker = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
 const schema_1 = require("../../lib/schema/schema");
+const types_1 = require("../../lib/schema/types");
 /**
  * Generates a generic data mocker class.
  */
 function generateDataMocker({ models, meta: schemaMeta }) {
     const modelMetas = models.map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }));
-    const imports = imports_1.ImportsGenerator.from(schemaMeta.data.dataMockerFilePath);
+    const imports = imports_1.ImportsGenerator.from(schemaMeta.e2e.dataMocker.filePath);
     for (const { model, meta } of modelMetas) {
         imports.addImports({
-            [meta.types.importPath]: [model.typeName],
-            [schemaMeta.data.dataMockerStubImportPath]: [meta.data.stubGenerationFnName],
+            [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(model.typeName)],
+            [schemaMeta.e2e.dataMocker.stubImportPath]: [meta.data.stubGenerationFnName],
         });
     }
     const publicVariables = modelMetas
@@ -25,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 '@pxl/data'
+import type { MockData } from '@backend/data'
 
 ${imports.generate()}
 

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

@@ -22,9 +22,9 @@ function generateDataModule({ models, meta }) {
     return /* ts */ `
 import { FactoryProvider } from '@nestjs/common'
   
-import { DynamicModule } from '@${meta.config.project}/common'
-import { DbModule, DbService } from '@${meta.config.project}/db'
-import { E2EConfig } from '@${meta.config.project}/e2e'
+import { DynamicModule } from '@backend/common'
+import { DbModule, DbService } from '@backend/db'
+import { E2EConfig } from '@backend/e2e'
 
 ${imports.generate()}
 

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDataService = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
+const types_1 = require("../../lib/schema/types");
 /**
  * Generates a generic data service object that may be used on the server to access database.
  */
@@ -25,9 +26,9 @@ function generateDataService({ models, meta }) {
     const isEmptyChecks = mm.map(({ meta }) => `(await this.${meta.data.dataServiceName}.count()) === 0`).join(' &&');
     // Building blocks for bulk mutations
     imports.addImports({
-        [meta.types.importPath]: [meta.types.dto.create, meta.types.dto.update],
-        [meta.data.repository.typeFilePath]: [meta.data.repository.typeName],
-        [meta.data.types.filePath]: [meta.data.types.bulkMutation],
+        [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.actionExecution.interface],
     });
     const creates = [];
@@ -44,7 +45,7 @@ function generateDataService({ models, meta }) {
     return /* ts */ `
 import { Injectable, Logger } from '@nestjs/common'
 
-import { format, mapValues, pluralize } from '@pxl/common'
+import { format, mapValues, pluralize } from '@backend/common'
 
 ${imports.generate()}
 

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateActionsDispatcherService = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
+const types_1 = require("../../lib/schema/types");
 /**
  * Generates the action dispatcher service.
  */
@@ -11,7 +12,7 @@ function generateActionsDispatcherService({ models, meta }) {
         [meta.seed.importPath]: [meta.seed.serviceClassName],
         [meta.importExport.importPath]: [meta.importExport.importService.name],
         [meta.businessLogic.update.importPath]: [meta.businessLogic.update.serviceClassName],
-        [meta.types.importPath]: meta.config.userType,
+        [meta.types.importPath]: (0, types_1.toAnnotatedTypeName)(meta.config.userType),
     });
     const dataLoader = [];
     for (const model of models) {
@@ -21,8 +22,8 @@ function generateActionsDispatcherService({ models, meta }) {
     return /* ts */ `
   import { Injectable } from '@nestjs/common'
 
-import { ExhaustiveSwitchCheck } from '@pxl/common'
-import { DbService } from '@pxl/db'
+import { ExhaustiveSwitchCheck } from '@backend/common'
+import { DbService } from '@backend/db'
 
 ${imports.generate()}
 

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateImportExportConvertImportFunctions = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
-const types_1 = require("../../lib/types");
+const types_1 = require("../../lib/schema/types");
+const types_2 = require("../../lib/types");
 /**
  * Generates the Exporter class for the Import-Export module
  */
@@ -14,14 +15,16 @@ function generateImportExportConvertImportFunctions({ models, meta, }) {
     const { delta } = types;
     const imports = imports_1.ImportsGenerator.from(meta.importExport.converterFunctions.filePath);
     imports.addImports({
-        [meta.importExport.decoder.fullDecoderFilePath]: [meta.importExport.decoder.decodedPXLModelDataTypeName],
+        [meta.importExport.decoder.fullDecoderFilePath]: [
+            (0, types_1.toAnnotatedTypeName)(meta.importExport.decoder.decodedPXLModelDataTypeName),
+        ],
         [meta.data.importPath]: [
-            meta.data.dataMockDataType,
-            meta.data.types.bulkMutation,
-            meta.data.types.bulkMutationForModel,
+            (0, types_1.toAnnotatedTypeName)(meta.data.dataMockDataType),
+            (0, types_1.toAnnotatedTypeName)(meta.data.types.bulkMutation),
+            (0, types_1.toAnnotatedTypeName)(meta.data.types.bulkMutationForModel),
         ],
-        [meta.types.importPath]: [dto.genericModel, dto.idType],
-        [types.filePath]: [types.delta, types.delta_Model.type],
+        [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)],
     });
     const importConverterBlocks = [];
     const deltaConverterBlocks = [];
@@ -39,7 +42,7 @@ function generateImportExportConvertImportFunctions({ models, meta, }) {
         // logState({ state, nextStep, lastStep: 'updateModelState' })
     }
     return /* ts */ `
-import { ExhaustiveSwitchCheck } from '@pxl/common'
+import { ExhaustiveSwitchCheck } from '@backend/common'
 ${imports.generate()}
 
 /**
@@ -200,7 +203,7 @@ function assignModelToState({ state, modelNextStep, fieldsGrouped, }) {
             state.canBeCreatedFullyLinked.set(fieldsGrouped.model.name, fieldsGrouped);
             break;
         default:
-            throw new types_1.ExhaustiveSwitchCheck(modelNextStep);
+            throw new types_2.ExhaustiveSwitchCheck(modelNextStep);
     }
 }
 function initializeModelsState(models) {
@@ -270,7 +273,7 @@ function generateBlocks({ state, nextStep, imports, iteration, schemaMeta, }) {
         case 'link':
             return generateBulkMutationBlockLink({ state, imports, iteration, schemaMeta });
         default:
-            throw new types_1.ExhaustiveSwitchCheck(nextStep);
+            throw new types_2.ExhaustiveSwitchCheck(nextStep);
     }
 }
 function copyModelState(state) {
@@ -291,8 +294,9 @@ function generateBulkMutationBlockCreateFullyLinked({ state, iteration, imports,
     const modelNames = [];
     for (const [, fieldsGrouped] of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model: fieldsGrouped.model });
-        imports.addImports({
-            [schemaMeta.types.importPath]: [modelMeta.types.dto.create],
+        imports.addTypeImport({
+            from: schemaMeta.types.importPath,
+            items: [modelMeta.types.dto.create],
         });
         const { block: importConvertBlock } = generateModelCreateBlock({ fieldsGrouped, modelMeta });
         importConvertBlocks.push(importConvertBlock);
@@ -321,7 +325,7 @@ function generateBulkMutationBlockCreatePartiallyLinked({ state, imports, iterat
     const modelNames = [];
     for (const [, fieldsGrouped] of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model: fieldsGrouped.model });
-        imports.addImport({
+        imports.addTypeImport({
             from: modelMeta.types.importPath,
             items: [modelMeta.types.dto.create],
         });
@@ -370,16 +374,17 @@ function generateDeltaBlock({ fieldsGrouped, modelMeta, schemaMeta, imports, })
     });
     const genericsDefinition = `${modelMeta.types.typeName}, ${modelMeta.types.brandedIdType}`;
     const { type, create, update } = schemaMeta.importExport.types.delta_Model;
-    imports.addImports({
-        [modelMeta.types.importPath]: [modelMeta.types.typeName, modelMeta.types.brandedIdType],
-        [schemaMeta.importExport.types.filePath]: [
-            type,
-            create.type,
-            create.typeGuard,
-            update.type,
-            update.typeGuard,
-            // modelMeta.importExport.delta_Model_Errors,
-        ],
+    imports.addTypeImport({
+        from: modelMeta.types.importPath,
+        items: [modelMeta.types.typeName, modelMeta.types.brandedIdType],
+    });
+    imports.addTypeImport({
+        from: schemaMeta.importExport.types.filePath,
+        items: [type, create.type, update.type],
+    });
+    imports.addImport({
+        from: schemaMeta.importExport.types.filePath,
+        items: [create.typeGuard, update.typeGuard],
     });
     return /* ts */ `
   ${modelMeta.seed.constantName}: {
@@ -407,7 +412,7 @@ function generateBulkMutationBlockLink({ state, imports, iteration, schemaMeta,
     const modelNames = [];
     for (const [, fieldsGrouped] of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model: fieldsGrouped.model });
-        imports.addImport({
+        imports.addTypeImport({
             from: modelMeta.types.importPath,
             items: [modelMeta.types.dto.update],
         });

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateImportExportExporterClass = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
+const types_1 = require("../../lib/schema/types");
 /**
  * Generates the Exporter class for the Import-Export module
  */
@@ -12,7 +13,7 @@ function generateImportExportExporterClass({ models, meta }) {
         [meta.businessLogic.view.importPath]: [meta.businessLogic.view.serviceClassName],
         [meta.importExport.decoder.fullDecoderFilePath]: [
             meta.importExport.decoder.fullEncoderFunctionName,
-            meta.importExport.decoder.encodedExcelDataTypeName,
+            (0, types_1.toAnnotatedTypeName)(meta.importExport.decoder.encodedExcelDataTypeName),
         ],
     });
     const typeExports = [];
@@ -23,7 +24,7 @@ function generateImportExportExporterClass({ models, meta }) {
     const addAllCalls = [];
     for (const model of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
-        imports.addImport({
+        imports.addTypeImport({
             from: modelMeta.types.importPath,
             items: [modelMeta.types.brandedIdType, modelMeta.types.typeName],
         });
@@ -70,7 +71,7 @@ function generateImportExportExporterClass({ models, meta }) {
     return /* ts */ `
 import { Logger } from '@nestjs/common'
 
-import { mapValues } from '@pxl/common'
+import { mapValues } from '@backend/common'
 ${imports.generate()}
 
 /**

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateImportExportImportService = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
+const types_1 = require("../../lib/schema/types");
 const string_1 = require("../../lib/utils/string");
 /**
  * Generates the Exporter class for the Import-Export module
@@ -15,18 +16,26 @@ function generateImportExportImportService({ models, meta }) {
     const { nonUnique, invalidReference, invalidType, isRequiredDependency, missingField } = errors;
     const { dto } = meta.types;
     imports.addImports({
-        [meta.data.importPath]: [meta.data.dataService.class, meta.data.types.bulkMutation],
-        [meta.types.importPath]: [dto.genericModel, dto.idType, dto.update],
+        [meta.data.importPath]: [meta.data.dataService.class, (0, types_1.toAnnotatedTypeName)(meta.data.types.bulkMutation)],
+        [meta.types.importPath]: [
+            (0, types_1.toAnnotatedTypeName)(dto.genericModel),
+            (0, types_1.toAnnotatedTypeName)(dto.idType),
+            (0, types_1.toAnnotatedTypeName)(dto.update),
+        ],
         [meta.actions.importPath]: [meta.actions.actionExecution.interface, meta.actions.dispatcherService.class],
-        [types.filePath]: [delta_Fields, delta_Model.type, delta],
-        [decoder.fullDecoderFilePath]: [decoder.decodedPXLModelDataTypeName],
+        [types.filePath]: [
+            (0, types_1.toAnnotatedTypeName)(delta_Fields),
+            (0, types_1.toAnnotatedTypeName)(delta_Model.type),
+            (0, types_1.toAnnotatedTypeName)(delta),
+        ],
+        [decoder.fullDecoderFilePath]: [(0, types_1.toAnnotatedTypeName)(decoder.decodedPXLModelDataTypeName)],
         [converterFunctions.filePath]: [converterFunctions.deltaToBulkMutations],
     });
     const resultAssignments = [];
     const detectDeltaFunctions = [];
     for (const model of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
-        imports.addImport({
+        imports.addTypeImport({
             from: modelMeta.types.importPath,
             items: [modelMeta.types.typeName, modelMeta.types.brandedIdType],
         });
@@ -35,7 +44,7 @@ function generateImportExportImportService({ models, meta }) {
     }
     return /* ts */ `
 import { Injectable } from '@nestjs/common'
-import { ExhaustiveSwitchCheck } from '@pxl/common'
+import { ExhaustiveSwitchCheck } from '@backend/common'
 
 ${imports.generate()}
 
@@ -438,7 +447,7 @@ exports.generateImportExportImportService = generateImportExportImportService;
 function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imports, }) {
     const { types } = schemaMeta.importExport;
     const { delta_Model } = types;
-    imports.addImport({
+    imports.addTypeImport({
         from: types.filePath,
         items: [modelMeta.importExport.delta_Model_Errors],
     });
@@ -460,7 +469,10 @@ function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imp
         }
         if (field.kind === 'scalar') {
             if (field.isUnique) {
-                imports.addImport({ from: schemaMeta.importExport.types.filePath, items: [delta_Model.errors.nonUnique.type] });
+                imports.addTypeImport({
+                    from: schemaMeta.importExport.types.filePath,
+                    items: [delta_Model.errors.nonUnique.type],
+                });
                 const getByName = `getBy${(0, string_1.toPascalCase)(fieldName)}`;
                 sharedValidations.push(`this.validateUniqueField({
             item,
@@ -469,7 +481,7 @@ function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imp
           })`);
             }
             if (field.validation && field.validation.type === 'int') {
-                imports.addImport({
+                imports.addTypeImport({
                     from: schemaMeta.importExport.types.filePath,
                     items: [delta_Model.errors.invalidType.type],
                 });
@@ -478,7 +490,7 @@ function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imp
         }
         else if (field.kind === 'relation') {
             const relatedModelMeta = (0, meta_1.getModelMetadata)({ model: field.relationToModel });
-            imports.addImport({
+            imports.addTypeImport({
                 from: schemaMeta.importExport.types.filePath,
                 items: [delta_Model.errors.invalidReference.type],
             });
@@ -501,7 +513,7 @@ function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imp
                 !relatedField.isRequired) {
                 continue;
             }
-            imports.addImport({
+            imports.addTypeImport({
                 from: schemaMeta.importExport.types.filePath,
                 items: [delta_Model.errors.isRequiredDependency.type],
             });
@@ -519,7 +531,10 @@ function generateDetectDeltaFunction({ model, modelMeta, models, schemaMeta, imp
         }
     }
     if (requiredFields.length > 0) {
-        imports.addImport({ from: schemaMeta.importExport.types.filePath, items: [delta_Model.errors.missingField.type] });
+        imports.addTypeImport({
+            from: schemaMeta.importExport.types.filePath,
+            items: [delta_Model.errors.missingField.type],
+        });
     }
     const requiredFieldsValidation = requiredFields.length > 0
         ? `...this.validateRequiredFields({item, fieldNames: [${requiredFields.join(',')}]}),`

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

@@ -10,15 +10,20 @@ function generateImportExportTypes({ models, meta }) {
     const { types } = meta.importExport;
     const imports = imports_1.ImportsGenerator.from(types.filePath);
     const dto = meta.types.dto;
-    imports.addImports({
-        [meta.types.importPath]: [dto.create, dto.update, dto.genericModel, dto.idType],
-        [meta.data.importPath]: [meta.data.types.bulkMutation],
+    imports
+        .addTypeImport({
+        from: meta.types.importPath,
+        items: [dto.create, dto.update, dto.genericModel, dto.idType],
+    })
+        .addTypeImport({
+        from: meta.data.importPath,
+        items: [meta.data.types.bulkMutation],
     });
     const deltaTypes = [];
     const errorTypes = [];
     for (const model of models) {
         const modelMeta = (0, meta_1.getModelMetadata)({ model });
-        imports.addImport({
+        imports.addTypeImport({
             items: [modelMeta.types.typeName, modelMeta.types.brandedIdType],
             from: modelMeta.types.importPath,
         });

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

@@ -19,10 +19,10 @@ exports.generateStubsIndex = generateStubsIndex;
  * Generates an index file that exports all stubs for the data mocker.
  */
 function generateDataMockerStubsIndex({ models, meta }) {
-    const exports = exports_1.ExportsGenerator.from(meta.data.dataMockerStubIndexFilePath);
+    const exports = exports_1.ExportsGenerator.from(meta.e2e.dataMocker.stubIndexFilePath);
     for (const model of models) {
         const meta = (0, meta_1.getModelMetadata)({ model });
-        exports.exportEverythingFromPath(meta.data.dataMockerStubFilePath);
+        exports.exportEverythingFromPath(meta.e2e.dataMockerStubFilePath);
     }
     return exports.generate();
 }

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

@@ -11,7 +11,10 @@ function generateTestDataService({ models, meta: schemaMeta, }) {
     const imports = imports_1.ImportsGenerator.from(schemaMeta.data.testDataServiceFilePath);
     imports.addImports({
         [schemaMeta.actions.importPath]: [(0, types_1.toClassName)('ActionExecutionFactory')],
-        [schemaMeta.data.importPath]: [schemaMeta.data.dataService.class, schemaMeta.data.dataMockDataType],
+        [schemaMeta.data.importPath]: [
+            schemaMeta.data.dataService.class,
+            (0, types_1.toAnnotatedTypeName)(schemaMeta.data.dataMockDataType),
+        ],
         [schemaMeta.importExport.importPath]: [schemaMeta.importExport.converterFunctions.mockDataToBulkMutations],
         [schemaMeta.seed.importPath]: [(0, types_1.toClassName)('createActionSeedData')],
     });
@@ -30,7 +33,7 @@ function generateTestDataService({ models, meta: schemaMeta, }) {
     return /* ts */ `
 import { Injectable, Logger } from '@nestjs/common'
 
-import { DbService } from '@pxl/db'
+import { DbService } from '@backend/db'
 ${imports.generate()}
 
 @Injectable()