@postxl/generator 0.63.5 → 0.65.0

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

@@ -74,7 +74,7 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         [schemaMeta.view.serviceLocation.import]: schemaMeta.view.serviceClassName,
     });
     for (const relation of (0, fields_1.getRelationFields)(model)) {
-        // NOTE: We add branded id type and type name imports only for foreign models.
+        // NOTE: We add `toBrandedType` functions for foreign models for decoders.
         if (relation.relationToModel.typeName === model.typeName) {
             continue;
         }
@@ -84,9 +84,6 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
             from: refMeta.types.importPath,
         });
     }
-    for (const { referencingModel } of model.references) {
-        imports.addTypeImport({ items: [referencingModel.brandedIdType], from: meta.types.importPath });
-    }
     /**
      * The name of the variable that holds the repository instance for the current model
      * (e.g. when we generate business logic service for Aggregation, the AggregationRepository
@@ -100,6 +97,8 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
     ];
     const decoders = meta.update.decoders;
     const { view, update } = meta;
+    const deleteFn = generateDeleteFunction({ model, meta, m });
+    const deleteManyFn = generateDeleteManyMethod({ imports, model, meta, m });
     /* prettier-ignore */
     return /* ts */ `
     import { Inject, Injectable, forwardRef } from '@nestjs/common'
@@ -259,10 +258,9 @@ function generateModelBusinessLogicUpdate({ model, meta }) {
         return this.data.upsertMany({ items: data, execution })
       }
 
-      
-      ${generateDeleteFunction({ model, meta, m })}
+      ${deleteFn}
 
-      ${generateDeleteManyMethod({ model, meta, m })}
+      ${deleteManyFn}
 
       ${generateCloneMethod({ model, meta, m })}
     }
@@ -276,6 +274,10 @@ function generateDeleteFunction({ model, meta, m }) {
     const backReferenceDelete = [];
     const backReferenceNames = [];
     for (const { referencingField, referencingModel } of model.references) {
+        // NOTE: We only delete back references that are required references.
+        if (!referencingField.isRequired) {
+            continue;
+        }
         const refModelMeta = (0, meta_1.getModelMetadata)({ model: referencingModel });
         const refFieldMeta = (0, meta_1.getFieldMetadata)({ field: referencingField });
         const ids = `${refModelMeta.internalSingularName}${(0, string_1.capitalize)(referencingField.name)}s`;
@@ -299,11 +301,16 @@ function generateDeleteFunction({ model, meta, m }) {
 /**
  * Returns a function that deletes multiple entities and all their related entities.
  */
-function generateDeleteManyMethod({ model, meta, m }) {
+function generateDeleteManyMethod({ imports, model, meta, m, }) {
     const idArrays = [];
     const idAssignments = [];
     const deleteCalls = [];
     for (const { referencingField, referencingModel } of model.references) {
+        // NOTE: We only delete back references that are required references.
+        if (!referencingField.isRequired) {
+            continue;
+        }
+        imports.addTypeImport({ items: [referencingModel.brandedIdType], from: meta.types.importPath });
         const refModelMeta = (0, meta_1.getModelMetadata)({ model: referencingModel });
         const refFieldMeta = (0, meta_1.getFieldMetadata)({ field: referencingField });
         const idArray = `${refModelMeta.internalSingularName}${(0, string_1.capitalize)(referencingField.name)}s`;
@@ -318,7 +325,7 @@ function generateDeleteManyMethod({ model, meta, m }) {
         deleteCalls.push(`await this.updateService.${refModelMeta.update.serviceVariableName}.deleteMany({ data: ${idArray}, execution })`);
     }
     let relatedEntities = '';
-    if (model.references.length > 0) {
+    if (idArrays.length > 0) {
         relatedEntities = `
       ${idArrays.join('\n')}
       

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

@@ -101,7 +101,7 @@ export const ${modals.createComponentName} = ({
       <Typed.Formik
         initialValues={{ ...INITIAL_VALUES, ...data }}
         validate={(values) => {
-          const errors: FormikErrors<CreateInputData> = {}
+          const errors: { [K in keyof CreateInputData]?: string } = {}
 
 					${getFormikValidationCases({ model })}
 
@@ -311,7 +311,9 @@ function generateDeleteModalModelComponent({ model, meta }) {
     });
     return `
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Formik, FormikErrors } from 'formik'
+import { TRPCClientError } from '@trpc/client'
+
+import { Formik } from 'formik'
 import React, { useCallback } from 'react'
 import { toast } from 'react-hot-toast'
 
@@ -346,7 +348,12 @@ export const ${components.modals.deleteComponentName} = ({
         {
           loading: "Deleting ${meta.userFriendlyName}...",
           success: "${meta.userFriendlyName} deleted!",
-          error: "Something went wrong...",
+          error: (err) => {
+            if (err instanceof TRPCClientError) {
+              return err.message
+            }
+            return 'Something went wrong...'
+          },
         },
       )
     } catch (err) {
@@ -404,7 +411,6 @@ function getFormImports({ model, meta }) {
     import { TRPCClientError } from '@trpc/client'
     import React from 'react'
     import { toast } from 'react-hot-toast'
-    import { FormikErrors } from 'formik'
     
     import { createTypedForm } from '@components/atoms/Form'
     import { ConfirmButton, ModalWithNavigationContainer, Label, ModalWithActions } from '@components/atoms/Modal'

package/package.json

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