@postxl/generator 0.7.0 → 0.8.0

package/dist/generator.js

@@ -178,7 +178,7 @@ const generate = ({ models, enums, config, prismaClientPath, logger, }) => __awa
         generated.write(`/${meta.data.dataMockModuleFilePath}.ts`, (0, datamockmodule_generator_1.generateDataMockModule)({ models, meta }));
         generated.write(`/${meta.data.dataModuleFilePath}.ts`, (0, datamodule_generator_1.generateDataModule)({ models, meta }));
         generated.write(`/${meta.data.dataServiceFilePath}.ts`, (0, dataservice_generator_1.generateDataService)({ models, meta }));
-        generated.write(`/${meta.data.testDataServiceFilePath}.ts`, (0, testdataservice_generator_1.generateTestDataService)({ meta }));
+        generated.write(`/${meta.data.testDataServiceFilePath}.ts`, (0, testdataservice_generator_1.generateTestDataService)({ models, meta }));
         generated.write(`/${meta.data.repositoriesConstFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesArray)({ models, meta }));
         generated.write(`/${meta.data.repositoriesIndexFilePath}.ts`, (0, repositories_generator_1.generateRepositoriesIndex)({ models, meta }));
         generated.write(`/${meta.data.stubIndexFilePath}.ts`, (0, stubs_generator_1.generateStubsIndex)({ models, meta }));

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

@@ -1,7 +1,9 @@
 import { SchemaMetaData } from '../../lib/meta';
+import { Model } from '../../lib/schema/schema';
 /**
  * Generates a generic data service object that may be used on the server to access database.
  */
-export declare function generateTestDataService({ meta }: {
+export declare function generateTestDataService({ meta, models }: {
     meta: SchemaMetaData;
+    models: Model[];
 }): string;

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

@@ -24,16 +24,27 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTestDataService = void 0;
+const meta_1 = require("../../lib/meta");
 const Types = __importStar(require("../../lib/schema/types"));
 const imports_1 = require("../../lib/imports");
 /**
  * Generates a generic data service object that may be used on the server to access database.
  */
-function generateTestDataService({ meta }) {
+function generateTestDataService({ meta, models }) {
     const imports = imports_1.ImportsGenerator.from(meta.data.testDataServiceFilePath).addImport({
         items: [Types.toVariableName('MockData')],
         from: meta.data.dataMockModuleFilePath,
     });
+    const mm = models.map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }));
+    for (const { meta } of mm) {
+        imports.addImport({
+            items: [meta.data.repositoryClassName],
+            from: meta.data.repoFilePath,
+        });
+    }
+    const constructor = mm
+        .map(({ meta }) => `private ${meta.data.dataServiceName} :${meta.data.repositoryClassName}`)
+        .join(',\n');
     return `
 		import { Injectable, Logger } from '@nestjs/common'
 
@@ -47,14 +58,19 @@ function generateTestDataService({ meta }) {
 			private logger = new Logger(TestDataService.name)
 			constructor(
 				private db: DbService,
-
 				private resetService: ResetService,
+				${constructor}
 			) {}
 
 			public async resetTestData(data: MockData) {
 				this.logger.log(\`✅ Reset test data\`)
 				await this.db.emptyDatabase()
-				return this.resetService.reset()
+
+				${mm
+        .map(({ meta }) => `await this.${meta.data.dataServiceName}.reInit(data.${meta.data.mockDataPropertyName} ?? [])`)
+        .join('\n')}
+				
+					return this.resetService.reset()
 			}
 		}
 	`;

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

@@ -12,6 +12,7 @@ function generateRepository({ model, meta }) {
     const { idField, fields } = model;
     const decoder = meta.data.repository.decoderFnName;
     const uniqueStringFields = fields.filter(fields_1.isUniqueStringField);
+    const maxLengthStringFields = fields.filter(fields_1.isMaxLengthStringField);
     const defaultValueInitFn = `
 		if (item.${(_a = model.defaultField) === null || _a === void 0 ? void 0 : _a.name}) {
 			if (this.defaultValue) {
@@ -36,7 +37,7 @@ function generateRepository({ model, meta }) {
     return `
 import { Injectable, Logger } from '@nestjs/common'
 import { DbService, ${model.sourceName} as DbType } from '@${model.schemaConfig.project}/db'
-import { format, pluralize } from '@${model.schemaConfig.project}/common'
+import { format, pluralize } from '@pxl/common'
 
 import { Repository } from '../repository.type'
 
@@ -145,6 +146,8 @@ export class ${meta.data.repositoryClassName} implements Repository<
     }`
         : ''}
 
+    ${maxLengthStringFields.map((f) => `this.${getEnsureMaxLengthFnName(f)}(item)`).join('\n')}
+
     ${uniqueStringFields.map((f) => `this.${getEnsureUniqueFnName(f)}(item)`).join('\n')}
 
     return {
@@ -156,6 +159,7 @@ export class ${meta.data.repositoryClassName} implements Repository<
 	}): Promise<${model.typeName}> {    
     ${model.attributes.inMemoryOnly
         ? `
+    ${maxLengthStringFields.map((f) => `this.${getEnsureMaxLengthFnName(f)}(item)`).join('\n')}
     ${uniqueStringFields.map((f) => `this.${getEnsureUniqueFnName(f)}(item)`).join('\n')}
     const newItem = await Promise.resolve(item)`
         : `
@@ -180,6 +184,8 @@ export class ${meta.data.repositoryClassName} implements Repository<
     
     ${isGenerated ? `const id = ++this.currentMaxId\n` : ''}
 
+    ${maxLengthStringFields.map((f) => `this.${getEnsureMaxLengthFnName(f)}(item)`).join('\n')}
+
     ${uniqueStringFields.map((f) => `this.${getEnsureUniqueFnName(f)}(item)`).join('\n')}
 
     ${model.attributes.inMemoryOnly
@@ -206,9 +212,10 @@ export class ${meta.data.repositoryClassName} implements Repository<
   }
 
   public async createMany(items: ${model.typeName}[]) {
-    ${uniqueStringFields.length > 0
+    ${uniqueStringFields.length > 0 || maxLengthStringFields.length > 0
         ? `
     for (const item of items) {
+      ${maxLengthStringFields.map((f) => `this.${getEnsureMaxLengthFnName(f)}(item)`).join('\n')}
       ${uniqueStringFields.map((f) => `this.${getEnsureUniqueFnName(f)}(item)`).join('\n')}
     }`
         : ''}
@@ -238,6 +245,16 @@ export class ${meta.data.repositoryClassName} implements Repository<
       throw new Error(\`Could not update ${meta.userFriendlyName} with id \${item.id}. Not found!\`)
     }
 
+    
+    ${maxLengthStringFields
+        .map((f) => {
+        return `
+					if (item.${f.name} !== undefined && existingItem.${f.name} !== item.${f.name}) {
+						this.${getEnsureMaxLengthFnName(f)}(item)
+					}
+				`;
+    })
+        .join('\n')}
     ${uniqueStringFields
         .map((f) => {
         return `
@@ -305,6 +322,18 @@ export class ${meta.data.repositoryClassName} implements Repository<
     this.data.delete(${meta.types.toBrandedIdTypeFnName}(id))
   }
 
+  ${maxLengthStringFields.map((f) => {
+        return `
+  /**
+   * Utility function that ensures that the ${f.name} field has a max length of ${f.attributes.maxLength}
+   */      
+  private ${getEnsureMaxLengthFnName(f)}(item: { ${f.name}?: string }) {
+    if (!item.${f.name}) return
+    if (item.${f.name}.length <= ${f.attributes.maxLength}) return
+    item.${f.name} = item.${f.name}.substring(0, ${f.attributes.maxLength - 4}) + \`...\`
+  }`;
+    })}
+
   ${uniqueStringFields
         .map((f) => {
         return `
@@ -347,3 +376,6 @@ exports.generateRepository = generateRepository;
 function getEnsureUniqueFnName(field) {
     return `ensureUnique${(0, string_1.toPascalCase)(field.name)}`;
 }
+function getEnsureMaxLengthFnName(field) {
+    return `ensureMaxLength${(0, string_1.toPascalCase)(field.name)}`;
+}

package/dist/lib/schema/fields.d.ts

@@ -33,3 +33,7 @@ export declare const getDefaultValueForType: (type: string) => string;
  * Returns true if the given field is unique and a string field.
  */
 export declare const isUniqueStringField: (f: Field) => boolean;
+/**
+ * Returns true if the given field has a maxLength attribute.
+ */
+export declare const isMaxLengthStringField: (f: Field) => boolean;

package/dist/lib/schema/fields.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUniqueStringField = exports.getDefaultValueForType = exports.getEnumFields = exports.getRelationFields = exports.getScalarFields = exports.getDefaultField = void 0;
+exports.isMaxLengthStringField = exports.isUniqueStringField = exports.getDefaultValueForType = exports.getEnumFields = exports.getRelationFields = exports.getScalarFields = exports.getDefaultField = void 0;
 /**
  * The default field of the model.
  * Note: A model can only have one or no default field!
@@ -47,3 +47,9 @@ exports.getDefaultValueForType = getDefaultValueForType;
 const isUniqueStringField = (f) => (f.kind === 'id' && f.isUnique && f.unbrandedTypeName === 'string') ||
     (f.kind === 'scalar' && f.isUnique && f.typeName === 'string');
 exports.isUniqueStringField = isUniqueStringField;
+/**
+ * Returns true if the given field has a maxLength attribute.
+ */
+const isMaxLengthStringField = (f) => (f.kind === 'id' && !!f.attributes.maxLength && f.unbrandedTypeName === 'string') ||
+    (f.kind === 'scalar' && !!f.attributes.maxLength && f.typeName === 'string');
+exports.isMaxLengthStringField = isMaxLengthStringField;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {