@postxl/generator 0.44.3 → 0.44.5

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateModelBusinessLogicUpdate = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
+const types_1 = require("../../lib/schema/types");
 const jsdoc_1 = require("../../lib/utils/jsdoc");
 const repository_generator_1 = require("./repository.generator");
 /**
@@ -15,7 +16,7 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
     imports.addImports({
         [meta.data.importPath]: meta.data.repository.className,
         [schemaMeta.actions.importPath]: schemaMeta.actions.actionExecution.interface,
-        [meta.types.importPath]: [model.brandedIdType, meta.types.typeName],
+        [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(model.brandedIdType), (0, types_1.toAnnotatedTypeName)(meta.types.typeName)],
         [schemaMeta.businessLogic.update.serviceFilePath]: schemaMeta.businessLogic.update.serviceClassName,
         [schemaMeta.businessLogic.view.serviceFilePath]: schemaMeta.businessLogic.view.serviceClassName,
         [meta.data.importPath]: [meta.data.repository.className],
@@ -43,7 +44,7 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
     const methodTypeSignatures = (0, repository_generator_1.getRepositoryMethodsTypeSignatures)({ model, meta });
     return /* ts */ `
 import { Inject, Injectable, forwardRef } from '@nestjs/common'
-import { ExhaustiveSwitchCheck } from '@pxl/common'
+import { ExhaustiveSwitchCheck } from '@backend/common'
 
 ${imports.generate()}
 
@@ -163,7 +164,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameCreate,
             payload: meta.types.dto.create,
             resultType: meta.types.typeName,
-            imports: [meta.types.dto.create],
+            imports: [(0, types_1.toAnnotatedTypeName)(meta.types.dto.create)],
             dispatcherParameterName: 'item',
         },
         createMany: {
@@ -171,7 +172,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameCreateMany,
             payload: `${meta.types.dto.create}[]`,
             resultType: `${meta.types.typeName}[]`,
-            imports: [meta.types.dto.create],
+            imports: [(0, types_1.toAnnotatedTypeName)(meta.types.dto.create)],
             dispatcherParameterName: 'items',
         },
         update: {
@@ -179,7 +180,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameUpdate,
             payload: meta.types.dto.update,
             resultType: meta.types.typeName,
-            imports: [meta.types.dto.update],
+            imports: [(0, types_1.toAnnotatedTypeName)(meta.types.dto.update)],
             dispatcherParameterName: 'item',
         },
         updateMany: {
@@ -187,7 +188,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameUpdateMany,
             payload: `${meta.types.dto.update}[]`,
             resultType: `${meta.types.typeName}[]`,
-            imports: [meta.types.dto.update],
+            imports: [(0, types_1.toAnnotatedTypeName)(meta.types.dto.update)],
             dispatcherParameterName: 'items',
         },
         upsert: {
@@ -195,7 +196,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameUpsert,
             payload: meta.types.dto.upsert,
             resultType: meta.types.typeName,
-            imports: [meta.types.dto.upsert],
+            imports: [(0, types_1.toAnnotatedTypeName)(meta.types.dto.upsert)],
             dispatcherParameterName: 'item',
         },
         upsertMany: {
@@ -203,7 +204,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameUpsertMany,
             payload: `${meta.types.dto.upsert}[]`,
             resultType: `${meta.types.typeName}[]`,
-            imports: [meta.types.dto.upsert],
+            imports: [(0, types_1.toAnnotatedTypeName)(meta.types.dto.upsert)],
             dispatcherParameterName: 'items',
         },
         delete: {
@@ -211,7 +212,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameDelete,
             payload: model.brandedIdType,
             resultType: model.brandedIdType,
-            imports: [model.brandedIdType],
+            imports: [(0, types_1.toAnnotatedTypeName)(model.brandedIdType)],
             dispatcherParameterName: 'id',
         },
         deleteMany: {
@@ -219,7 +220,7 @@ function prepareActionDefinitions({ model, meta, }) {
             createFunctionName: meta.businessLogic.update.createActionFunctionNameDeleteMany,
             payload: `${model.brandedIdType}[]`,
             resultType: `${model.brandedIdType}[]`,
-            imports: [model.brandedIdType],
+            imports: [(0, types_1.toAnnotatedTypeName)(model.brandedIdType)],
             dispatcherParameterName: 'ids',
         },
     };

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

@@ -4,6 +4,7 @@ exports.generateModelBusinessLogicView = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
 const fields_1 = require("../../lib/schema/fields");
+const types_1 = require("../../lib/schema/types");
 const ast_1 = require("../../lib/utils/ast");
 /**
  * Generates view business logic for a given model.
@@ -14,7 +15,7 @@ function generateModelBusinessLogicView({ model, meta }) {
     const imports = imports_1.ImportsGenerator.from(meta.businessLogic.view.serviceFilePath);
     imports.addImports({
         [meta.data.importPath]: meta.data.repository.className,
-        [meta.types.importPath]: [model.brandedIdType, meta.types.typeName],
+        [meta.types.importPath]: [(0, types_1.toAnnotatedTypeName)(model.brandedIdType), (0, types_1.toAnnotatedTypeName)(meta.types.typeName)],
         [schemaMeta.businessLogic.view.serviceFilePath]: schemaMeta.businessLogic.view.serviceClassName,
         [meta.data.importPath]: [meta.data.repository.className],
     });
@@ -59,7 +60,7 @@ function generateModelBusinessLogicView({ model, meta }) {
     }
     const hasLinkedItems = variables.size > 0;
     if (hasLinkedItems) {
-        imports.addImport({ from: meta.types.importPath, items: [meta.types.linkedTypeName] });
+        imports.addTypeImport({ from: meta.types.importPath, items: [meta.types.linkedTypeName] });
     }
     const linkedItemsGetterFn = `
     /**
@@ -95,7 +96,7 @@ function generateModelBusinessLogicView({ model, meta }) {
     return /* ts */ `
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Inject, Injectable, forwardRef } from '@nestjs/common'
-import { FilterOperator } from '@pxl/common'
+import { FilterOperator } from '@backend/common'
 
 ${imports.generate()}
 

package/dist/generators/models/importexport-decoder.generator.d.ts

@@ -3,9 +3,10 @@ import { Model } from '../../lib/schema/schema';
 /**
  * Creates a decoder for the Seed Excel template.
  */
-export declare function generateModelImportExportDecoder({ model, meta }: {
+export declare function generateModelImportExportDecoder({ model, meta, schemaMeta, }: {
     model: Model;
     meta: ModelMetaData;
+    schemaMeta: SchemaMetaData;
 }): string;
 /**
  * Generates the data decoder, aggregating all the models.

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

@@ -6,24 +6,22 @@ const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
 const types_1 = require("../../lib/schema/types");
 const types_2 = require("../../lib/types");
-// TODO: Remove hardcoded path that seems to be reused in multiple places!
-const PXL_COMMON = (0, types_1.toPath)('@pxl/common');
 /**
  * Creates a decoder for the Seed Excel template.
  */
-function generateModelImportExportDecoder({ model, meta }) {
+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({
-        [PXL_COMMON]: [
-            (0, types_1.toFunctionName)('uncapitalizeKeys'),
-            (0, types_1.toFunctionName)('capitalizeKeys'),
-            (0, types_1.toFunctionName)('nullOrBlankDecoder'),
+        [schemaMeta.backendModules.common.importPath]: [
+            schemaMeta.backendModules.common.functions.uncapitalizeKeys,
+            schemaMeta.backendModules.common.functions.capitalizeKeys,
+            schemaMeta.backendModules.common.functions.nullOrBlankDecoder,
         ],
-        [meta.types.importPath]: [meta.types.typeName],
+        [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, imports });
+    const { fieldDecoders, blankFieldDecoders } = generateFieldDecoders({ model, meta, schemaMeta, imports });
     return `
 import * as z from 'zod'
 ${imports.generate()}
@@ -71,7 +69,7 @@ export const ${tableExportFunctionName} = (items: ${model.typeName}[]): ${excelT
   `;
 }
 exports.generateModelImportExportDecoder = generateModelImportExportDecoder;
-function generateFieldDecoders({ model, meta, imports, }) {
+function generateFieldDecoders({ model, meta, schemaMeta, imports, }) {
     const fieldDecoders = [];
     const blankFieldDecoders = [];
     for (const field of model.fields) {
@@ -85,6 +83,7 @@ function generateFieldDecoders({ model, meta, imports, }) {
                     dbTypeName: field.schemaType,
                     nullable: false,
                     imports,
+                    schemaMeta,
                 })}.transform((id: ${field.unbrandedTypeName}) => ${meta.types.toBrandedIdTypeFnName}(id))`);
                 break;
             }
@@ -94,6 +93,7 @@ function generateFieldDecoders({ model, meta, imports, }) {
                     dbTypeName: field.schemaType,
                     nullable: !field.isRequired,
                     imports,
+                    schemaMeta,
                 })}`);
                 break;
             }
@@ -106,6 +106,7 @@ function generateFieldDecoders({ model, meta, imports, }) {
                     dbTypeName: field.schemaType,
                     nullable: !field.isRequired,
                     imports,
+                    schemaMeta,
                 })}
           .transform(
             (id: ${field.unbrandedTypeName}${field.isRequired ? '' : '| null'}) => 
@@ -126,20 +127,20 @@ function generateFieldDecoders({ model, meta, imports, }) {
     }
     return { fieldDecoders, blankFieldDecoders };
 }
-function toExcelDecoder({ tsTypeName, dbTypeName: typeName, nullable, imports, }) {
+function toExcelDecoder({ tsTypeName, dbTypeName: typeName, nullable, imports, schemaMeta, }) {
     switch (tsTypeName) {
         case 'string': {
-            const decoder = (0, types_1.toFunctionName)(nullable ? 'excelStringNullableDecoder' : 'excelStringDecoder');
+            const decoder = schemaMeta.backendModules.common.functions[nullable ? 'excelStringNullableDecoder' : 'excelStringDecoder'];
             imports.addImport({
                 items: [decoder],
-                from: PXL_COMMON,
+                from: schemaMeta.backendModules.common.importPath,
             });
             return decoder;
         }
         case 'boolean':
             imports.addImport({
-                items: [(0, types_1.toFunctionName)('excelBooleanDecoder')],
-                from: PXL_COMMON,
+                items: [schemaMeta.backendModules.common.functions.excelBooleanDecoder],
+                from: schemaMeta.backendModules.common.importPath,
             });
             return 'excelBooleanDecoder';
         case 'number':
@@ -151,10 +152,10 @@ function toExcelDecoder({ tsTypeName, dbTypeName: typeName, nullable, imports, }
                     return `z.number()${nullable ? '.nullable()' : ''}`;
             }
         case 'Date': {
-            const decoder = (0, types_1.toFunctionName)(nullable ? 'excelDateNullableDecoder' : 'excelDateDecoder');
+            const decoder = schemaMeta.backendModules.common.functions[nullable ? 'excelDateNullableDecoder' : 'excelDateDecoder'];
             imports.addImport({
                 items: [decoder],
-                from: PXL_COMMON,
+                from: schemaMeta.backendModules.common.importPath,
             });
             return decoder;
         }
@@ -169,7 +170,7 @@ function generateImportExportDecoder({ models, meta }) {
     const { decodedPXLModelDataTypeName, encodedExcelDataTypeName, fullDecoderName, fullEncoderFunctionName } = meta.importExport.decoder;
     const imports = imports_1.ImportsGenerator.from(meta.importExport.decoder.fullDecoderFilePath);
     imports.addImports({
-        [PXL_COMMON]: (0, types_1.toFunctionName)('uncapitalizeKeys'),
+        [meta.backendModules.common.importPath]: (0, types_1.toFunctionName)('uncapitalizeKeys'),
     });
     const importTypes = [];
     const decoderEntries = [];
@@ -181,7 +182,7 @@ function generateImportExportDecoder({ models, meta }) {
             items: [
                 modelMeta.importExport.decoder.tableDecoder,
                 modelMeta.importExport.decoder.arrayEncoderFunctionName,
-                modelMeta.importExport.decoder.encodedExcelType,
+                (0, types_1.toAnnotatedTypeName)(modelMeta.importExport.decoder.encodedExcelType),
             ],
         });
         importTypes.push(`${modelMeta.importExport.tableName}?: ${modelMeta.importExport.decoder.encodedExcelType}[]`);

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

@@ -8,7 +8,7 @@ const string_1 = require("../../../lib/utils/string");
  */
 function generateModelContext({ model, meta }) {
     const queryName = (0, string_1.toCamelCase)(model.name);
-    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addImport({
+    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addTypeImport({
         items: [model.typeName, model.brandedIdType],
         from: meta.types.importPath,
     });

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

@@ -23,14 +23,8 @@ function generateReactComponentsForModel({ model, meta }) {
     vfs.write(`/EditModal.tsx`, (0, modals_generator_1.generateEditModalModelComponent)({ model, meta }));
     vfs.write(`/DeleteModal.tsx`, (0, modals_generator_1.generateDeleteModalModelComponent)({ model, meta }));
     vfs.write(`/Form.tsx`, (0, lookup_generator_1.generateModelLookupComponents)({ model, meta }));
-    // NOTE: library generator expects that the model has a `name` field.
-    //        Make sure that you don't make a dependency on this
-    //        component without checking that a model has a name field.
-    const hasNameField = model.nameField != null;
-    if (hasNameField) {
-        vfs.write(`/Library.tsx`, (0, library_generator_1.generateModelLibraryComponents)({ model, meta }));
-        exports.exportEverythingFromFile('./Library');
-    }
+    vfs.write(`/Library.tsx`, (0, library_generator_1.generateModelLibraryComponents)({ model, meta }));
+    exports.exportEverythingFromFile('./Library');
     vfs.write(`/index.ts`, exports.generate());
     return vfs;
 }

package/dist/generators/models/react.generator/library.generator.d.ts

@@ -3,8 +3,6 @@ import { Model } from '../../../lib/schema/schema';
 /**
  * Generates components that may be used to list all entries of a given data type.
  *
- * NOTE: Library expects that the model has a `name` field. Make sure that you don't make a dependency on
- *      this component without checking that a model has a name field.
  */
 export declare function generateModelLibraryComponents({ model, meta }: {
     model: Model;

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

@@ -6,14 +6,12 @@ const imports_1 = require("../../../lib/imports");
 /**
  * Generates components that may be used to list all entries of a given data type.
  *
- * NOTE: Library expects that the model has a `name` field. Make sure that you don't make a dependency on
- *      this component without checking that a model has a name field.
  */
 function generateModelLibraryComponents({ model, meta }) {
     const { react: { context, components }, } = meta;
     const selectorCollector = id_collector_1.SelectorCollector.from(meta.seed.constantName + '-card');
     const imports = imports_1.ImportsGenerator.from(meta.react.folderPath)
-        .addImport({
+        .addTypeImport({
         items: [model.typeName],
         from: meta.types.importPath,
     })
@@ -21,7 +19,7 @@ function generateModelLibraryComponents({ model, meta }) {
         items: [context.hookFnName, components.modals.editComponentName, components.modals.deleteComponentName],
         from: meta.react.folderPath,
     });
-    return `
+    return /* ts */ `
     import React, { useState } from 'react'
 
     import { Card } from '@components/atoms/Card'
@@ -54,7 +52,7 @@ function generateModelLibraryComponents({ model, meta }) {
           <>
             <Card
               ref={forwardedRef}
-              title={item.name}
+              title={item.${model.nameField.name}}
               actions={[
                 {
                   label: 'Edit',

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

@@ -12,16 +12,13 @@ function generateModelLookupComponents({ model, meta }) {
         items: [context.hookFnName],
         from: meta.react.folderPath,
     })
-        .addImport({
+        .addTypeImport({
         items: [model.typeName],
         from: meta.types.importPath,
     });
     const typeName = model.typeName;
-    // NOTE: Depending on the model definition - whether it has a `name` field or not - we'll either
-    //        auto-populate the `label` property or not.
-    const hasNameField = model.nameField != null;
-    const tsOmittedFields = hasNameField ? `'label' | 'options' | 'loading'` : `'options' | 'loading'`;
-    const reactLabelField = hasNameField ? `label={(l) => l.name}` : '';
+    const tsOmittedFields = `'label' | 'options' | 'loading'`;
+    const reactLabelField = `label={(l) => l.${model.nameField.name}}`;
     let description = '';
     if (model.description) {
         description = `

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

@@ -305,7 +305,7 @@ exports.generateEditModalModelComponent = generateEditModalModelComponent;
  */
 function generateDeleteModalModelComponent({ model, meta }) {
     const { react: { components }, trpc, } = meta;
-    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addImport({
+    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addTypeImport({
         items: [model.brandedIdType],
         from: meta.types.importPath,
     });
@@ -373,7 +373,7 @@ exports.generateDeleteModalModelComponent = generateDeleteModalModelComponent;
  * Returns the import statements to the models that are used in this modal.
  */
 function getFormImports({ model, meta }) {
-    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addImport({
+    const imports = imports_1.ImportsGenerator.from(meta.react.folderPath).addTypeImport({
         items: [model.brandedIdType, model.typeName],
         from: meta.types.importPath,
     });
@@ -384,14 +384,14 @@ function getFormImports({ model, meta }) {
             items: [refMeta.react.components.forms.searchFieldName],
             from: refMeta.react.folderPath,
         });
-        imports.addImport({
+        imports.addTypeImport({
             items: [refModel.brandedIdType],
             from: refMeta.types.importPath,
         });
     }
     for (const f of (0, fields_1.getEnumFields)(model)) {
         const enumMeta = (0, meta_1.getEnumMetadata)(f);
-        imports.addImport({
+        imports.addTypeImport({
             items: [f.enumerator.tsTypeName],
             from: enumMeta.types.importPath,
         });

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

@@ -15,14 +15,14 @@ function generateRepository({ model, meta }) {
     const { idField } = model;
     const schemaMeta = (0, meta_1.getSchemaMetadata)({ config: model.schemaConfig });
     const imports = imports_1.ImportsGenerator.from(meta.data.repository.filePath).addImports({
-        [schemaMeta.data.repository.typeFilePath]: schemaMeta.data.repository.typeName,
+        [schemaMeta.data.repository.typeFilePath]: (0, types_1.toAnnotatedTypeName)(schemaMeta.data.repository.typeName),
         [meta.types.importPath]: [
-            model.typeName,
-            model.brandedIdType,
+            (0, types_1.toAnnotatedTypeName)(model.typeName),
+            (0, types_1.toAnnotatedTypeName)(model.brandedIdType),
             meta.types.toBrandedIdTypeFnName,
-            meta.types.dto.create,
-            meta.types.dto.update,
-            meta.types.dto.upsert,
+            (0, types_1.toAnnotatedTypeName)(meta.types.dto.create),
+            (0, types_1.toAnnotatedTypeName)(meta.types.dto.update),
+            (0, types_1.toAnnotatedTypeName)(meta.types.dto.upsert),
         ],
         [schemaMeta.actions.importPath]: [schemaMeta.actions.actionExecution.interface],
     });
@@ -48,7 +48,7 @@ function generateRepository({ model, meta }) {
     const uniqueStringFieldsBlocks = generateUniqueFieldsBlocks({ model, meta });
     const maxLengthBlocks = generateMaxLengthBlocks({ model, meta });
     const validationBlocks = generateValidationBlocks({ model, meta });
-    const indexBlocks = generateIndexBlocks({ model, meta, imports });
+    const indexBlocks = generateIndexBlocks({ model, schemaMeta, meta, imports });
     const relationsBlocks = generateRelationsBlocks({ model, meta, imports });
     let mainBlocks;
     if (model.attributes.inMemoryOnly) {
@@ -217,10 +217,13 @@ exports.generateMockRepository = generateMockRepository;
 /**
  * Generates the main building blocks of the repository for in-memory model.
  */
-function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, imports, blocks, }) {
+function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, schemaMeta, imports, blocks, }) {
     const methodTypeSignatures = getRepositoryMethodsTypeSignatures({ model, meta });
     const userRepositorySpecificBlocks = generateUserRepositorySpecificBlocks_InMemoryOnly({ model, meta, imports });
-    imports.addImport({ from: (0, types_1.toPath)('@pxl/common'), items: ['removeUndefinedProperties'].map(types_1.toFunctionName) });
+    imports.addImport({
+        from: schemaMeta.backendModules.common.importPath,
+        items: ['removeUndefinedProperties'].map(types_1.toFunctionName),
+    });
     return {
         constructorCode: '',
         userRepositorySpecificBlocks,
@@ -452,13 +455,19 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, imports, blocks
 /**
  * Generates the methods of the repository for a model that is stored in the database.
  */
-function generateMainBuildingBlocks_InDatabase({ model, meta, imports, blocks, }) {
+function generateMainBuildingBlocks_InDatabase({ model, meta, schemaMeta, imports, blocks, }) {
     const decoderFunctionName = meta.data.repository.decoderFnName;
     const { idField } = model;
     imports.addImports({
         [meta.types.importPath]: [meta.types.zodDecoderFnNames.fromDatabase],
-        [(0, types_1.toFileName)('@pxl/db')]: [`DbService`, `${model.sourceName} as DbType`].map(types_1.toTypeName),
-        [(0, types_1.toFileName)('@pxl/common')]: [`format`, `pluralize`].map(types_1.toTypeName),
+        [schemaMeta.backendModules.db.importPath]: [
+            schemaMeta.backendModules.db.dbService.name,
+            (0, types_1.toAnnotatedTypeName)((0, types_1.toTypeName)(`${model.sourceName} as DbType`)),
+        ],
+        [schemaMeta.backendModules.common.importPath]: [
+            schemaMeta.backendModules.common.functions.format,
+            schemaMeta.backendModules.common.functions.pluralize,
+        ],
     });
     const dbTableName = [model.sourceSchemaName, model.sourceName]
         .filter((s) => s != null)
@@ -777,7 +786,7 @@ function generateUserRepositorySpecificBlocks_InDatabase({ model, meta, imports,
     }
     imports.addImport({
         from: meta.types.importPath,
-        items: [(0, types_1.toTypeName)('UserRole')],
+        items: [(0, types_1.toVariableName)('UserRole')],
     });
     return {
         rootUserNameConst: `public static ROOT_USER_ID = ${meta.types.toBrandedIdTypeFnName}('root')`,
@@ -825,7 +834,7 @@ function generateUserRepositorySpecificBlocks_InMemoryOnly({ model, meta, import
     }
     imports.addImport({
         from: meta.types.importPath,
-        items: [(0, types_1.toTypeName)('UserRole')],
+        items: [(0, types_1.toVariableName)('UserRole')],
     });
     return {
         rootUserNameConst: `public static ROOT_USER_ID = ${meta.types.toBrandedIdTypeFnName}('root')`,
@@ -1164,10 +1173,10 @@ function generateValidationBlocks({ model }) {
     }
     return result;
 }
-function generateIndexBlocks({ model, imports, }) {
+function generateIndexBlocks({ model, imports, schemaMeta, }) {
     const indexes = model.attributes.index ? [getIndexDefinition({ fieldNames: model.attributes.index, model })] : [];
     if (indexes.length > 0) {
-        imports.addImport({ items: [(0, types_1.toTypeName)('NestedMap')], from: (0, types_1.toPath)('@pxl/common') });
+        imports.addTypeImport({ items: [(0, types_1.toTypeName)('NestedMap')], from: schemaMeta.backendModules.common.importPath });
     }
     const result = {
         nestedMapDeclarations: [],
@@ -1228,7 +1237,7 @@ function generateRelationsBlocks({ model, imports, }) {
     for (const r of relations) {
         const fieldMeta = (0, meta_1.getFieldMetadata)({ field: r });
         const relationModelMeta = (0, meta_1.getModelMetadata)({ model: r.relationToModel });
-        imports.addImport({
+        imports.addTypeImport({
             items: [relationModelMeta.types.brandedIdType],
             from: relationModelMeta.types.importPath,
         });

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRoutesIndex = exports.generateRoute = void 0;
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
+const types_1 = require("../../lib/schema/types");
 /**
  * Generates TRPC route for a given model.
  */
@@ -13,7 +14,7 @@ function generateRoute({ model, meta }) {
   `;
     const imports = imports_1.ImportsGenerator.from(meta.trpc.routerFilePath).addImports({
         [meta.types.importPath]: [
-            model.typeName,
+            (0, types_1.toAnnotatedTypeName)(model.typeName),
             meta.types.toBrandedIdTypeFnName,
             meta.types.zodDecoderFnNames.createObject,
             meta.types.zodDecoderFnNames.updateObject,
@@ -35,7 +36,7 @@ function generateRoute({ model, meta }) {
 import { z } from 'zod'
 import { procedure, router } from '../trpc'
 
-import { CURSOR_DECODER, FILTER_OPERATOR_DECODER } from '@pxl/common'
+import { CURSOR_DECODER, FILTER_OPERATOR_DECODER } from '@backend/common'
 ${imports.generate()}
 
 export const ${meta.trpc.routerName} = router({

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

@@ -5,8 +5,9 @@ const faker_1 = require("@faker-js/faker");
 const imports_1 = require("../../lib/imports");
 const meta_1 = require("../../lib/meta");
 const fields_1 = require("../../lib/schema/fields");
+const types_1 = require("../../lib/schema/types");
 const serializer_1 = require("../../lib/serializer");
-const types_1 = require("../../lib/types");
+const types_2 = require("../../lib/types");
 const string_1 = require("../../lib/utils/string");
 /**
  * Creates a seed file for a given model.
@@ -17,7 +18,7 @@ function generateSeedModel({ model, itemCount, meta, }) {
     //       This way changes to another model or to the ordering of models in the schema doesn't impact the generated values.
     faker_1.faker.seed((_a = model.attributes.randomSeed) !== null && _a !== void 0 ? _a : 0);
     const imports = imports_1.ImportsGenerator.from(meta.seed.filePath).addImport({
-        items: [model.typeName, meta.types.toBrandedIdTypeFnName],
+        items: [(0, types_1.toAnnotatedTypeName)(model.typeName), meta.types.toBrandedIdTypeFnName],
         from: meta.types.importPath,
     });
     for (const relation of (0, fields_1.getRelationFields)(model)) {
@@ -92,7 +93,7 @@ function generateFieldData({ field, model, index, mode, }) {
         case 'enum':
             return generateEnumFieldExample({ field, mode, index });
         default:
-            throw new types_1.ExhaustiveSwitchCheck(field);
+            throw new types_2.ExhaustiveSwitchCheck(field);
     }
 }
 function generateIdFieldExample({ field, model, index, mode, }) {
@@ -186,7 +187,7 @@ function generateFieldExample({ field, index, mode, }) {
             return { hasExample: true, example };
         }
         default: {
-            throw new types_1.ExhaustiveSwitchCheck(mode);
+            throw new types_2.ExhaustiveSwitchCheck(mode);
         }
     }
 }

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

@@ -10,8 +10,13 @@ const types_1 = require("../../lib/types");
  */
 function generateStub({ model, meta }) {
     const { fields, idField } = model;
-    const imports = imports_1.ImportsGenerator.from(meta.data.stubFilePath).addImport({
-        items: [model.typeName, meta.types.toBrandedIdTypeFnName],
+    const imports = imports_1.ImportsGenerator.from(meta.data.stubFilePath)
+        .addImport({
+        items: [meta.types.toBrandedIdTypeFnName],
+        from: meta.types.importPath,
+    })
+        .addTypeImport({
+        items: [model.typeName],
         from: meta.types.importPath,
     });
     const assignments = getAssignmentStatementModel({

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

@@ -22,20 +22,24 @@ function generateModelTypes({ model, meta }) {
         const refModel = relation.relationToModel;
         const refMeta = (0, meta_1.getModelMetadata)({ model: refModel });
         imports.addImport({
-            items: [refMeta.types.toBrandedIdTypeFnName, refModel.brandedIdType, refMeta.types.typeName],
+            items: [refMeta.types.toBrandedIdTypeFnName],
+            from: refMeta.types.filePath,
+        });
+        imports.addTypeImport({
+            items: [refModel.brandedIdType, refMeta.types.typeName],
             from: refMeta.types.filePath,
         });
         hasLinkedItems = true;
     }
     for (const f of (0, fields_1.getEnumFields)(model)) {
         const refEnumMeta = (0, meta_1.getEnumMetadata)({ enumerator: f.enumerator });
-        imports.addImport({
+        imports.addTypeImport({
             items: [f.enumerator.tsTypeName],
             from: refEnumMeta.types.filePath,
         });
     }
     const schemaMeta = (0, meta_1.getSchemaMetadata)({ config: model.schemaConfig });
-    imports.addImport({
+    imports.addTypeImport({
         items: [schemaMeta.types.dto.create, schemaMeta.types.dto.update, schemaMeta.types.dto.upsert],
         from: schemaMeta.types.dto.path,
     });

package/dist/lib/exports.d.ts

@@ -19,7 +19,7 @@ export declare class ExportsGenerator {
     /**
      * Creates a new instance of the exports generator.
      */
-    static from(path: Types.Path): ExportsGenerator;
+    static from(path: Types.FilePath): ExportsGenerator;
     /**
      * Creates a new instance of the exports generator from this folder (i.e. every path is relative to this folder).
      */
@@ -27,7 +27,7 @@ export declare class ExportsGenerator {
     /**
      * Adds a given file to the collection of files we're exporting everything from.
      */
-    exportEverythingFromPath(from: Types.Path): ExportsGenerator;
+    exportEverythingFromPath(from: Types.FilePath): ExportsGenerator;
     /**
      * Adds a given file to the collection of files we're exporting everything from.
      *