@postxl/generator 0.62.6 → 0.63.1

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

@@ -46,9 +46,12 @@ function generateImportExportTypes({ models, meta }) {
         `);
             }
             if (field.kind === 'scalar' && field.isUnique) {
-                nonUniqueFieldErrors.push(`
-          ${types.delta_Model.errors.nonUnique.type}<"${field.name}", ${field.tsTypeName}>
-        `);
+                if (field.isRequired) {
+                    nonUniqueFieldErrors.push(`${types.delta_Model.errors.nonUnique.type}<"${field.name}", ${field.tsTypeName}>`);
+                }
+                else {
+                    nonUniqueFieldErrors.push(`${types.delta_Model.errors.nonUnique.type}<"${field.name}", ${field.tsTypeName} | null>`);
+                }
             }
             if (field.kind === 'scalar' && field.validation) {
                 invalidTypeFieldErrors.push(`

package/dist/generators/models/admin.page.generator.js

@@ -21,7 +21,6 @@ import { Headline } from '@components/atoms/Headline'
 ${imports.generate()}
 
 import { Content, Layout } from '@components/shared/Layout'
-import { STATIC_TEST_IDS } from '@lib/static_test_ids'
 import { t } from '@i18n/translation'
 import { useState } from 'react'
 
@@ -46,7 +45,7 @@ export default function Admin${meta.internalSingularNameCapitalized}Page() {
             <Spacer key="Spacer" />
 
             <ActionWrapper key="GlobalFilter">
-              <Button label={t['Create']} icon="plus" fill="fill" __e2e_test_id__={STATIC_TEST_IDS.indexPage.buttons.create} onClick={() => setIsCreateModalOpen(true)}/>
+              <Button label={t['Create']} icon="plus" fill="fill" onClick={() => setIsCreateModalOpen(true)}/>
             </ActionWrapper>
           </ActionsBarWrapper>
         </Header>

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

@@ -1166,11 +1166,13 @@ function generateUniqueFieldsBlocks({ model }) {
         removeCode: [],
     };
     for (const f of fields) {
+        const returnType = `string${f.isRequired ? '' : ' | null'}`;
         result.mapDeclarations.push(`'${f.name}': new Map<string, ${model.typeName}>()`);
         result.getByFunctions.push(`
       // NOTE: The current implementation is synchronous, but it needs to be async to conform to the interface.
       // eslint-disable-next-line @typescript-eslint/require-await
-      public async getBy${(0, string_1.toPascalCase)(f.name)}(${f.name}: string): Promise<${model.typeName} | undefined> { 
+      public async getBy${(0, string_1.toPascalCase)(f.name)}(${f.name}: ${returnType}): Promise<${model.typeName} | undefined> {
+        ${f.isRequired ? '' : `if (${f.name} === null) { return undefined }`}
         return this.uniqueIds.${f.name}.get(${(0, string_1.toCamelCase)(f.name)})
       }`);
         result.clearCode.push(`this.uniqueIds.${f.name}.clear()`);
@@ -1183,7 +1185,7 @@ function generateUniqueFieldsBlocks({ model }) {
       /**
        * Utility function that ensures that the ${f.name} field is unique
        */      
-      private ${getEnsureUniqueFnName(f)}(item: { ${f.name}?: string }) {
+      private ${getEnsureUniqueFnName(f)}(item: { ${f.name}?: ${returnType} }) {
           if (!item.${f.name}) {
             return
           }
@@ -1202,8 +1204,14 @@ function generateUniqueFieldsBlocks({ model }) {
           this.logger.log(\`${model.typeName} ${f.name} "\${item.${f.name}}" already exists. Renaming to "\${${f.name}}")\`)
           item.${f.name} = ${f.name}
         }`);
-        result.setCode.push(`this.uniqueIds.${f.name}.set(item.${f.name}, item)`);
-        result.removeCode.push(`this.uniqueIds.${f.name}.delete(item.${f.name})`);
+        if (f.isRequired) {
+            result.setCode.push(`this.uniqueIds.${f.name}.set(item.${f.name}, item)`);
+            result.removeCode.push(`this.uniqueIds.${f.name}.delete(item.${f.name})`);
+        }
+        else {
+            result.setCode.push(`if (item.${f.name} !== null) { this.uniqueIds.${f.name}.set(item.${f.name}, item) }`);
+            result.removeCode.push(`if (item.${f.name} !== null) { this.uniqueIds.${f.name}.delete(item.${f.name}) }`);
+        }
     }
     if (fields.length > 1) {
         result.verifyFunctionComment = `In case a value of the fields ${fields

package/package.json

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