@postxl/generator 0.25.0 → 0.26.0

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

@@ -114,6 +114,7 @@ function generateModelBusinessLogic({ model, meta }) {
       return item
     }
   `;
+    // prettier-ignore
     return `
 import { Inject, Injectable, forwardRef } from '@nestjs/common'
 import { FilterOperator } from '@pxl/common'
@@ -169,18 +170,14 @@ export class ${meta.businessLogic.serviceClassName} {
   /**
    * Creates a new ${meta.userFriendlyName}.
    */
-  public async create(item: Omit<${model.typeName}, '${model.idField.name}'> & Partial<{
-    ${model.idField.name}: ${model.idField.unbrandedTypeName}
-  }>): Promise<${model.typeName}> {
+  public async create(item: Omit<${model.typeName}, '${model.idField.name}'> & Partial<{${model.idField.name}: ${model.idField.unbrandedTypeName}}>): Promise<${model.typeName}> {
     return this.${modelRepositoryVariableName}.create(item)
   }
 
   /**
    * Updates the given ${meta.userFriendlyName}.
    */
-  public async update(item: Partial<${model.typeName}> & { 
-		id: ${model.brandedIdType}
-	}): Promise<${model.typeName}> {
+  public async update(item: Partial<${model.typeName}> & {id: ${model.brandedIdType}}): Promise<${model.typeName}> {
     return this.${modelRepositoryVariableName}.update(item)
   }
 

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

@@ -48,12 +48,35 @@ type CreateInputData = {
  * A modal component that lets the user create a new ${meta.userFriendlyName} instance.
  */
 export const ${modals.createComponentName} = ({ show, onHide }: { show: boolean; onHide: () => void }) => {
+  const Typed = React.useMemo(
+    () => createTypedForm<CreateInputData>().with({ ${(() => {
+        const components = new Set();
+        for (const field of fields.values()) {
+            switch (field.kind) {
+                case 'enum': {
+                    const enumMeta = (0, meta_1.getEnumMetadata)({ enumerator: field.enumerator });
+                    components.add(enumMeta.react.selectFieldName);
+                    break;
+                }
+                case 'relation': {
+                    const refMeta = (0, meta_1.getModelMetadata)({ model: field.relationToModel });
+                    components.add(refMeta.react.components.forms.searchFieldName);
+                    break;
+                }
+                default:
+                    continue;
+            }
+        }
+        return [...components].join(', ');
+    })()} }), 
+    []
+  )
   const cache = trpc.useContext()
   const mutation = trpc.${trpc.create.reactQueryMethod}.useMutation()
 
   return (
     <ModalWithNavigationContainer label="Create new ${meta.userFriendlyName}" show={show} onHide={onHide} fixed wide>
-      <Formik<CreateInputData>
+      <Typed.Formik
         initialValues={{
 					${fields
         .filter((f) => f.kind !== 'id')
@@ -109,7 +132,7 @@ export const ${modals.createComponentName} = ({ show, onHide }: { show: boolean;
 						${getFormFieldComponents({ model })}
           </ModalWithActions>
         )}
-      </Formik>
+      </Typed.Formik>
     </ModalWithNavigationContainer>
   )
 }
@@ -141,12 +164,35 @@ export const ${components.modals.editComponentName} = ({
   show, 
   onHide 
 }: { data: ${model.typeName}; show: boolean; onHide: () => void }) => {
+  const Typed = React.useMemo(
+    () => createTypedForm<EditInputData>().with({ ${(() => {
+        const components = new Set();
+        for (const field of fields.values()) {
+            switch (field.kind) {
+                case 'enum': {
+                    const enumMeta = (0, meta_1.getEnumMetadata)({ enumerator: field.enumerator });
+                    components.add(enumMeta.react.selectFieldName);
+                    break;
+                }
+                case 'relation': {
+                    const refMeta = (0, meta_1.getModelMetadata)({ model: field.relationToModel });
+                    components.add(refMeta.react.components.forms.searchFieldName);
+                    break;
+                }
+                default:
+                    continue;
+            }
+        }
+        return [...components].join(', ');
+    })()} }), 
+    []
+  )
   const cache = trpc.useContext()
   const mutation = trpc.${trpc.update.reactQueryMethod}.useMutation()
 
   return (
     <ModalWithNavigationContainer label="Edit ${meta.userFriendlyName}" show={show} onHide={onHide} fixed wide>
-      <Formik<EditInputData>
+      <Typed.Formik
         initialValues={{
 					${fields
         .map((field) => {
@@ -213,7 +259,7 @@ export const ${components.modals.editComponentName} = ({
             ${getFormFieldComponents({ model })}
           </ModalWithActions>
         )}
-      </Formik>
+      </Typed.Formik>
     </ModalWithNavigationContainer>
   )
 }
@@ -323,13 +369,10 @@ function getFormImports({ model, meta }) {
     return `
     import React from 'react'
     import { toast } from 'react-hot-toast'
-    import { Formik, FormikErrors } from 'formik'
+    import { FormikErrors } from 'formik'
     
-    import { CheckBoxField } from '@components/atoms/CheckBoxInput'
+    import { createTypedForm } from '@components/atoms/Form'
     import { ConfirmButton, ModalWithNavigationContainer, Label, ModalWithActions } from '@components/atoms/Modal'
-    import { TextAreaField } from '@components/atoms/TextAreaInput'
-    import { TextField } from '@components/atoms/TextInput'
-    import { NumberField } from '@components/atoms/NumberInput'
     
     import { trpc } from '@lib/trpc'
 
@@ -491,7 +534,7 @@ function getFormFieldComponents({ model }) {
                         form.append(`
               <div>
                 <Label>${label}</Label>
-                <TextField placeholder="Type..." name="${formikFieldName}" />
+                <Typed.TextField placeholder="Type..." name="${formikFieldName}" />
               </div>
             `);
                         break scalar;
@@ -504,7 +547,7 @@ function getFormFieldComponents({ model }) {
                         form.append(`
               <div>
                 <Label>${label}</Label>
-                <NumberField placeholder="2511" name="${formikFieldName}" decimals={${decimals}}/>
+                <Typed.NumberField placeholder="2511" name="${formikFieldName}" decimals={${decimals}}/>
               </div>
             `);
                         break scalar;
@@ -513,7 +556,7 @@ function getFormFieldComponents({ model }) {
                         form.append(`
               <div>
                 <Label>Is ${label}</Label>
-                <CheckBoxField label="${label}" name="${formikFieldName}" />
+                <Typed.CheckBoxField label="${label}" name="${formikFieldName}" />
               </div>
             `);
                         break scalar;
@@ -534,7 +577,7 @@ function getFormFieldComponents({ model }) {
                 form.append(`
           <div>
             <Label>${refMeta.userFriendlyName}</Label>
-            <${refMeta.react.components.forms.searchFieldName} name="${formikFieldName}" placeholder="Search..." />
+            <Typed.${refMeta.react.components.forms.searchFieldName} name="${formikFieldName}" placeholder="Search..." />
           </div>
         `);
                 break;
@@ -544,7 +587,7 @@ function getFormFieldComponents({ model }) {
                 form.append(`
           <div>
             <Label>${label}</Label>
-            <${enumMeta.react.selectFieldName} name="${formikFieldName}" placeholder="Search..." />
+            <Typed.${enumMeta.react.selectFieldName} name="${formikFieldName}" placeholder="Search..." />
           </div>
         `);
                 break;

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

@@ -210,12 +210,11 @@ function generateMainBuildingBlocks_InMemoryOnly({ model, meta, blocks, }) {
       public async deleteAll(): Promise<void> {
         return this.init()
       }`,
+        // prettier-ignore
         createCode: `  
       // Non-mocked version is async - so we keep type-compatible signatures for create() and createWithId() 
       // eslint-disable-next-line @typescript-eslint/require-await, @typescript-eslint/no-unused-vars
-      public async create(item: Omit<${model.typeName}, '${idField.name}'> & Partial<{ 
-        id: ${idField.unbrandedTypeName}
-      }>): Promise<${model.typeName}> {    
+      public async create(item: Omit<${model.typeName}, '${idField.name}'> & Partial<{id: ${idField.unbrandedTypeName}}>): Promise<${model.typeName}> {    
         const newItem = await Promise.resolve(this.verifyItem(item))
     
         this.set(newItem)
@@ -327,10 +326,9 @@ function generateMainBuildingBlocks_InDatabase({ model, meta, imports, blocks, }
         return this.init()
       }
     `,
+        // prettier-ignore
         createCode: `
-      public async create(item: Omit<${model.typeName}, '${idField.name}'> & Partial<{ 
-        id: ${idField.unbrandedTypeName}
-      }>): Promise<${model.typeName}> {    
+      public async create(item: Omit<${model.typeName}, '${idField.name}'> & Partial<{ id: ${idField.unbrandedTypeName} }>): Promise<${model.typeName}> {    
         const newItem = this.${decoderFunctionName}(
           await this.db.${meta.data.repository.getMethodFnName}.create({
             data: this.toCreateItem(this.verifyItem(item)),
@@ -352,16 +350,14 @@ function generateMainBuildingBlocks_InDatabase({ model, meta, imports, blocks, }
         
         return newItems
       }`,
+        // prettier-ignore
         updateCode: `
-      public async update(item: Partial<${model.typeName}> & { 
-        id: ${model.brandedIdType}
-      }): Promise<${model.typeName}> {
+      public async update(item: Partial<${model.typeName}> & { id: ${model.brandedIdType}}): Promise<${model.typeName}> {
         const existingItem = this.get(item.id)
     
         if (!existingItem) {
           throw new Error(\`Could not update ${meta.userFriendlyName} with id \${item.id}. Not found!\`)
         }
-    
         
         ${blocks.maxLength.updateCode.join('\n')}
     
@@ -443,10 +439,10 @@ function generateIdBlocks_NoGeneration({ idField, model, meta, }) {
         verifyFunctionComment: `an error is thrown as field has no default setting in schema.`,
         verifyFunctionParameterType: model.typeName,
         verifyCode: `
-    if (item.${idField.name} === undefined) {
-      throw new Error('Id field ${idField.name} is required!')
-    }
-    const ${idField.name} = ${meta.types.toBrandedIdTypeFnName}(item.${idField.name})`,
+      if (item.${idField.name} === undefined) {
+        throw new Error('Id field ${idField.name} is required!')
+      }
+      const ${idField.name} = ${meta.types.toBrandedIdTypeFnName}(item.${idField.name})`,
         setCode: '',
     };
 }
@@ -458,10 +454,10 @@ function generateIdBlock_Int({ idField, model, meta, imports, }) {
     return {
         libraryImports: '',
         generateNextIdFunctionName: `
-    protected currentMaxId = 0
-    public generateNextId(): ${model.brandedIdType} {
-      return ${meta.types.toBrandedIdTypeFnName}(++this.currentMaxId)
-    }`,
+      protected currentMaxId = 0
+      public generateNextId(): ${model.brandedIdType} {
+        return ${meta.types.toBrandedIdTypeFnName}(++this.currentMaxId)
+      }`,
         initCode: `this.currentMaxId = (await this.db.${meta.data.repository.getMethodFnName}.aggregate({ _max: { ${idField.sourceName}: true } }))._max.${idField.sourceName} ?? 0`,
         verifyFunctionComment: 'the id is generated by increasing the highest former id and assigned to the item.',
         verifyFunctionParameterType: `(Omit<${model.typeName}, '${idField.name}'> & Partial<{${idField.name}: ${idField.unbrandedTypeName}}>)`,
@@ -477,9 +473,9 @@ function generateIdBlock_UUID({ idField, model, meta, imports, }) {
     return {
         libraryImports: `import { randomUUID } from 'crypto'`,
         generateNextIdFunctionName: `
-    public generateNextId(): ${model.brandedIdType} {
-      return ${meta.types.toBrandedIdTypeFnName}(randomUUID())
-    }`,
+      public generateNextId(): ${model.brandedIdType} {
+        return ${meta.types.toBrandedIdTypeFnName}(randomUUID())
+      }`,
         initCode: '',
         verifyFunctionComment: 'a new UUID is generated and assigned to the item.',
         verifyFunctionParameterType: `(Omit<${model.typeName}, '${idField.name}'> & Partial<{${idField.name}: ${idField.unbrandedTypeName}}>)`,
@@ -689,24 +685,25 @@ function generateRelationsBlocks({ model, imports, }) {
             from: relationModelMeta.types.importPath,
         });
         result.mapDeclarations.push(`protected ${r.name}Map: Map<${relationModelMeta.types.brandedIdType}, Map<${model.brandedIdType}, ${model.typeName}>> = new Map()`);
+        // prettier-ignore
         result.getterFunctions.push(`
-    /** 
-     * Function to retrieve all ${(0, string_1.pluralize)(model.name)} that are related to a ${r.name}
-     */
-    public ${fieldMeta.getByForeignKeyMethodFnName}(id: ${relationModelMeta.types.brandedIdType}): Map<${model.brandedIdType},${model.typeName}> {
-      const result = this.${r.name}Map.get(id)
-      if (!result) return new Map()
-      return result
-    }
+      /** 
+       * Function to retrieve all ${(0, string_1.pluralize)(model.name)} that are related to a ${r.name}
+       */
+      public ${fieldMeta.getByForeignKeyMethodFnName}(id: ${relationModelMeta.types.brandedIdType}): Map<${model.brandedIdType}, ${model.typeName}> {
+        const result = this.${r.name}Map.get(id)
+        if (!result) return new Map()
+        return result
+      }
 
-    /** 
-     * Function to retrieve all ${model.brandedIdType}s that are related to a ${r.name}
-     */
-    public ${fieldMeta.getByForeignKeyIdsMethodFnName}(id: ${relationModelMeta.types.brandedIdType}): ${model.brandedIdType}[] {
-      const s = this.${r.name}Map.get(id)
-      if (!s) return []
-      return Array.from(s.keys())
-    }`);
+      /** 
+       * Function to retrieve all ${model.brandedIdType}s that are related to a ${r.name}
+       */
+      public ${fieldMeta.getByForeignKeyIdsMethodFnName}(id: ${relationModelMeta.types.brandedIdType}): ${model.brandedIdType}[] {
+        const s = this.${r.name}Map.get(id)
+        if (!s) return []
+        return Array.from(s.keys())
+      }`);
         result.setCode.push(`
       ${!r.isRequired ? `if (item.${r.name}) {` : ''}
       let ${r.name}Map = this.${r.name}Map.get(item.${r.name})

package/package.json

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