@comet/api-generator 9.0.0-beta.2 → 9.0.0-beta.3

package/lib/commands/generate/generate-command.js

@@ -1,28 +1,19 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCommand = void 0;
 const commander_1 = require("commander");
 const generateFiles_1 = require("./generateFiles");
 const watchMode_1 = require("./watchMode/watchMode");
 exports.generateCommand = new commander_1.Command("generate")
-    .action((options) => __awaiter(void 0, void 0, void 0, function* () {
+    .action(async (options) => {
     if (options.watch) {
-        yield (0, generateFiles_1.generateFiles)();
+        await (0, generateFiles_1.generateFiles)();
         console.log("Watching for modified entities...");
-        yield (0, watchMode_1.watchMode)();
+        await (0, watchMode_1.watchMode)();
     }
     else {
         (0, generateFiles_1.generateFiles)(options.file);
     }
-}))
+})
     .option("-f, --file <file>", "path to entity file")
     .option("-w, --watch", "Watch for changes");

package/lib/commands/generate/generateCrud/build-options.d.ts

@@ -1,5 +1,5 @@
 import { type CrudGeneratorOptions } from "@comet/cms-api";
-import { type EntityMetadata } from "@mikro-orm/core";
+import type { EntityMetadata } from "@mikro-orm/core";
 export declare function buildSortProps(metadata: EntityMetadata<any>): string[];
 export declare function buildOptions(metadata: EntityMetadata<any>, generatorOptions: CrudGeneratorOptions): {
     crudSearchPropNames: import("@comet/cms-api/lib/common/helper/crud-generator.helper").CrudSearchField[];

package/lib/commands/generate/generateCrud/build-options.js

@@ -89,7 +89,6 @@ function buildDedicatedResolverArgProps(metadata) {
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function buildOptions(metadata, generatorOptions) {
-    var _a, _b;
     const { classNameSingular, classNamePlural, fileNameSingular, fileNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
     const dedicatedResolverArgProps = buildDedicatedResolverArgProps(metadata);
     const crudSearchPropNames = (0, cms_api_1.getCrudSearchFieldsFromMetadata)(metadata);
@@ -100,12 +99,13 @@ function buildOptions(metadata, generatorOptions) {
     const hasSortArg = crudSortProps.length > 0;
     const hasSlugProp = metadata.props.some((prop) => prop.name == "slug");
     const scopeProp = metadata.props.find((prop) => prop.name == "scope");
-    if (scopeProp && !scopeProp.targetMeta)
+    if (scopeProp && !scopeProp.targetMeta) {
         throw new Error("Scope prop has no targetMeta");
+    }
     const hasDeletedAtProp = metadata.props.some((prop) => prop.name == "deletedAt");
     const hasPositionProp = metadata.props.some((prop) => prop.name == "position");
     const positionGroupPropNames = hasPositionProp
-        ? ((_b = (_a = generatorOptions.position) === null || _a === void 0 ? void 0 : _a.groupByFields) !== null && _b !== void 0 ? _b : [
+        ? (generatorOptions.position?.groupByFields ?? [
             ...(scopeProp ? [scopeProp.name] : []), // if there is a scope prop it's effecting position-group, if not groupByFields should be used
         ])
         : [];

package/lib/commands/generate/generateCrud/generate-crud.d.ts

@@ -1,7 +1,7 @@
 import { type CrudGeneratorOptions } from "@comet/cms-api";
 import { type EntityMetadata } from "@mikro-orm/postgresql";
 import { type Imports } from "../utils/generate-imports-code";
-import { type GeneratedFile } from "../utils/write-generated-files";
+import type { GeneratedFile } from "../utils/write-generated-files";
 export declare function generateSortDto({ generatorOptions, metadata }: {
     generatorOptions: CrudGeneratorOptions;
     metadata: EntityMetadata<any>;

package/lib/commands/generate/generateCrud/generate-crud.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSortDto = generateSortDto;
 exports.generateInputHandling = generateInputHandling;
@@ -261,22 +252,22 @@ function generatePaginatedDto({ generatorOptions, metadata }) {
     return paginatedOut;
 }
 function generateArgsDto({ generatorOptions, metadata }) {
-    var _a;
     const { classNameSingular, fileNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
     const { scopeProp, argsClassName, hasSearchArg, hasSortArg, hasFilterArg, dedicatedResolverArgProps, hasPositionProp, crudSortProps, hasPaging, targetDirectory, } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const imports = [];
     if (scopeProp && scopeProp.targetMeta) {
         imports.push(generateEntityImport(scopeProp.targetMeta, `${targetDirectory}/dto`));
     }
-    let defaultSortField = ((_a = metadata.props.find((prop) => prop.primary)) === null || _a === void 0 ? void 0 : _a.name) || "id";
+    let defaultSortField = metadata.props.find((prop) => prop.primary)?.name || "id";
     if (hasPositionProp) {
         defaultSortField = "position";
     }
     else if (metadata.props.some((prop) => prop.name === "createdAt" && prop.type === "Date")) {
         defaultSortField = "createdAt";
     }
-    if (!crudSortProps.includes(defaultSortField))
+    if (!crudSortProps.includes(defaultSortField)) {
         defaultSortField = null;
+    }
     const argsOut = `import { ArgsType, Field, IntersectionType, registerEnumType, ID } from "@nestjs/graphql";
     import { Type } from "class-transformer";
     import { IsOptional, IsString, ValidateNested, IsEnum, IsUUID } from "class-validator";
@@ -459,8 +450,9 @@ function generateInputHandling(options, metadata, generatorOptions, targetDirect
     })
         .map((prop) => {
         const targetMeta = prop.targetMeta;
-        if (!targetMeta)
+        if (!targetMeta) {
             throw new Error("targetMeta is not set for relation");
+        }
         return {
             name: prop.name,
             singularName: (0, pluralize_1.singular)(prop.name),
@@ -472,8 +464,9 @@ function generateInputHandling(options, metadata, generatorOptions, targetDirect
         .filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "input"))
         .map((prop) => {
         const targetMeta = prop.targetMeta;
-        if (!targetMeta)
+        if (!targetMeta) {
             throw new Error("targetMeta is not set for relation");
+        }
         return {
             name: prop.name,
             singularName: (0, pluralize_1.singular)(prop.name),
@@ -486,8 +479,9 @@ function generateInputHandling(options, metadata, generatorOptions, targetDirect
         .filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "input"))
         .map((prop) => {
         const targetMeta = prop.targetMeta;
-        if (!targetMeta)
+        if (!targetMeta) {
             throw new Error("targetMeta is not set for relation");
+        }
         return {
             name: prop.name,
             singularName: (0, pluralize_1.singular)(prop.name),
@@ -607,8 +601,9 @@ function generateNestedEntityResolver({ generatorOptions, metadata }) {
     const { skipScopeCheck, targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const imports = [];
     const { imports: fieldImports, code, hasOutputRelations, needsBlocksTransformer, } = generateRelationsFieldResolver({ generatorOptions, metadata });
-    if (!hasOutputRelations)
+    if (!hasOutputRelations) {
         return null;
+    }
     imports.push(...fieldImports);
     imports.push(generateEntityImport(metadata, targetDirectory));
     return `
@@ -653,8 +648,9 @@ function generateRelationsFieldResolver({ generatorOptions, metadata }) {
         outputRelationOneToOneProps.length > 0;
     const imports = [];
     for (const prop of [...relationManyToOneProps, ...relationOneToManyProps, ...relationManyToManyProps, ...relationOneToOneProps]) {
-        if (!prop.targetMeta)
+        if (!prop.targetMeta) {
             throw new Error(`Relation ${prop.name} has targetMeta not set`);
+        }
         imports.push(generateEntityImport(prop.targetMeta, targetDirectory));
     }
     for (const prop of resolveFieldBlockProps) {
@@ -717,7 +713,6 @@ function generateRelationsFieldResolver({ generatorOptions, metadata }) {
     };
 }
 function generateResolver({ generatorOptions, metadata }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const { classNameSingular, fileNameSingular, instanceNameSingular, classNamePlural, fileNamePlural, instanceNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
     const { scopeProp, skipScopeCheck, argsClassName, argsFileName, hasSlugProp, hasSearchArg, hasSortArg, hasFilterArg, hasPositionProp, positionGroupProps, hasDeletedAtProp, dedicatedResolverArgProps, targetDirectory, hasPaging, hasArgsClass, } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const imports = [];
@@ -741,8 +736,8 @@ function generateResolver({ generatorOptions, metadata }) {
     const hooksService = (0, find_hooks_service_1.findHooksService)({ generatorOptions, metadata, targetDirectory });
     if (hooksService) {
         imports.push(...hooksService.imports);
-        if (((_b = (_a = hooksService.validateCreateInput) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.includes("currentUser")) ||
-            ((_d = (_c = hooksService.validateUpdateInput) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.includes("currentUser"))) {
+        if (hooksService.validateCreateInput?.options?.includes("currentUser") ||
+            hooksService.validateUpdateInput?.options?.includes("currentUser")) {
             imports.push({ name: "GetCurrentUser", importPath: "@comet/cms-api" });
             imports.push({ name: "CurrentUser", importPath: "@comet/cms-api" });
         }
@@ -815,16 +810,23 @@ function generateResolver({ generatorOptions, metadata }) {
         @Query(() => ${hasPaging ? `Paginated${classNamePlural}` : `[${metadata.className}]`})
         ${dedicatedResolverArgProps
             .map((dedicatedResolverArgProp) => {
-            var _a;
-            return `@AffectedEntity(${(_a = dedicatedResolverArgProp.targetMeta) === null || _a === void 0 ? void 0 : _a.className}, { idArg: "${dedicatedResolverArgProp.name}" })`;
+            return `@AffectedEntity(${dedicatedResolverArgProp.targetMeta?.className}, { idArg: "${dedicatedResolverArgProp.name}" })`;
         })
             .join("")}
         async ${instanceNameSingular != instanceNamePlural ? instanceNamePlural : `${instanceNamePlural}List`}(
             ${hasArgsClass
-            ? `@Args() {${Object.entries(Object.assign(Object.assign({ scope: !!scopeProp }, dedicatedResolverArgProps.reduce((acc, dedicatedResolverArgProp) => {
-                acc[dedicatedResolverArgProp.name] = true;
-                return acc;
-            }, {})), { search: hasPaging && !!hasSearchArg, filter: hasPaging && !!hasFilterArg, sort: hasPaging && !!hasSortArg, offset: hasPaging, limit: hasPaging }))
+            ? `@Args() {${Object.entries({
+                scope: !!scopeProp,
+                ...dedicatedResolverArgProps.reduce((acc, dedicatedResolverArgProp) => {
+                    acc[dedicatedResolverArgProp.name] = true;
+                    return acc;
+                }, {}),
+                search: hasPaging && !!hasSearchArg,
+                filter: hasPaging && !!hasFilterArg,
+                sort: hasPaging && !!hasSortArg,
+                offset: hasPaging,
+                limit: hasPaging,
+            })
                 .filter(([key, use]) => use)
                 .map(([key]) => key)
                 .join(", ")}}: ${argsClassName}`
@@ -863,8 +865,7 @@ function generateResolver({ generatorOptions, metadata }) {
         @Mutation(() => ${payloadObjectTypes.createPayloadType || metadata.className})
         ${dedicatedResolverArgProps
             .map((dedicatedResolverArgProp) => {
-            var _a;
-            return `@AffectedEntity(${(_a = dedicatedResolverArgProp.targetMeta) === null || _a === void 0 ? void 0 : _a.className}, { idArg: "${dedicatedResolverArgProp.name}" })`;
+            return `@AffectedEntity(${dedicatedResolverArgProp.targetMeta?.className}, { idArg: "${dedicatedResolverArgProp.name}" })`;
         })
             .join("")}
         async create${classNameSingular}(
@@ -873,7 +874,7 @@ function generateResolver({ generatorOptions, metadata }) {
             return `${generateIdArg(dedicatedResolverArgProp.name, metadata)}, `;
         })
             .join("")}@Args("input", { type: () => ${classNameSingular}Input }) input: ${classNameSingular}Input
-                ${((_f = (_e = hooksService === null || hooksService === void 0 ? void 0 : hooksService.validateCreateInput) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.includes("currentUser")) ? `, @GetCurrentUser() user: CurrentUser` : ""}
+                ${hooksService?.validateCreateInput?.options?.includes("currentUser") ? `, @GetCurrentUser() user: CurrentUser` : ""}
         ): Promise<${payloadObjectTypes.createPayloadType || metadata.className}> {
             ${(0, generate_service_hook_call_1.generateServiceHookCall)("validateCreateInput", { hooksService, instanceNameSingular, scopeProp, dedicatedResolverArgProps })}
 
@@ -924,7 +925,7 @@ function generateResolver({ generatorOptions, metadata }) {
         async update${classNameSingular}(
             ${generateIdArg("id", metadata)},
             @Args("input", { type: () => ${classNameSingular}UpdateInput }) input: ${classNameSingular}UpdateInput
-            ${((_h = (_g = hooksService === null || hooksService === void 0 ? void 0 : hooksService.validateUpdateInput) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.includes("currentUser")) ? `, @GetCurrentUser() user: CurrentUser` : ""}
+            ${hooksService?.validateUpdateInput?.options?.includes("currentUser") ? `, @GetCurrentUser() user: CurrentUser` : ""}
         ): Promise<${payloadObjectTypes.updatePayloadType || metadata.className}> {
             const ${instanceNameSingular} = await this.entityManager.findOneOrFail(${metadata.className}, id);
             ${(0, generate_service_hook_call_1.generateServiceHookCall)("validateUpdateInput", { hooksService, instanceNameSingular, scopeProp, dedicatedResolverArgProps })}
@@ -998,85 +999,89 @@ function generateResolver({ generatorOptions, metadata }) {
     `;
     return resolverOut;
 }
-function generateCrud(generatorOptionsParam, metadata) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        const generatorOptions = Object.assign(Object.assign({}, generatorOptionsParam), { create: (_a = generatorOptionsParam.create) !== null && _a !== void 0 ? _a : true, update: (_b = generatorOptionsParam.update) !== null && _b !== void 0 ? _b : true, delete: (_c = generatorOptionsParam.delete) !== null && _c !== void 0 ? _c : true, list: (_d = generatorOptionsParam.list) !== null && _d !== void 0 ? _d : true, single: (_e = generatorOptionsParam.single) !== null && _e !== void 0 ? _e : true });
-        if (!generatorOptions.create && !generatorOptions.update && !generatorOptions.delete && !generatorOptions.list && !generatorOptions.single) {
-            throw new Error("At least one of create, update, delete, list or single must be true");
+async function generateCrud(generatorOptionsParam, metadata) {
+    const generatorOptions = {
+        ...generatorOptionsParam,
+        create: generatorOptionsParam.create ?? true,
+        update: generatorOptionsParam.update ?? true,
+        delete: generatorOptionsParam.delete ?? true,
+        list: generatorOptionsParam.list ?? true,
+        single: generatorOptionsParam.single ?? true,
+    };
+    if (!generatorOptions.create && !generatorOptions.update && !generatorOptions.delete && !generatorOptions.list && !generatorOptions.single) {
+        throw new Error("At least one of create, update, delete, list or single must be true");
+    }
+    const generatedFiles = [];
+    const { fileNameSingular, fileNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
+    const { hasFilterArg, hasSortArg, argsFileName, hasPositionProp, hasPaging, hasArgsClass } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    async function generateCrudResolver() {
+        if (hasPaging && hasFilterArg) {
+            generatedFiles.push(...generateFilterDto({ generatorOptions, metadata }));
         }
-        const generatedFiles = [];
-        const { fileNameSingular, fileNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
-        const { hasFilterArg, hasSortArg, argsFileName, hasPositionProp, hasPaging, hasArgsClass } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
-        function generateCrudResolver() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (hasPaging && hasFilterArg) {
-                    generatedFiles.push(...generateFilterDto({ generatorOptions, metadata }));
-                }
-                if (hasPaging && hasSortArg) {
-                    generatedFiles.push({
-                        name: `dto/${fileNameSingular}.sort.ts`,
-                        content: generateSortDto({ generatorOptions, metadata }),
-                        type: "sort",
-                    });
-                }
-                if (hasPaging) {
-                    generatedFiles.push({
-                        name: `dto/paginated-${fileNamePlural}.ts`,
-                        content: generatePaginatedDto({ generatorOptions, metadata }),
-                        type: "sort",
-                    });
-                }
-                if (hasArgsClass) {
-                    generatedFiles.push({
-                        name: `dto/${argsFileName}.ts`,
-                        content: generateArgsDto({ generatorOptions, metadata }),
-                        type: "args",
-                    });
+        if (hasPaging && hasSortArg) {
+            generatedFiles.push({
+                name: `dto/${fileNameSingular}.sort.ts`,
+                content: generateSortDto({ generatorOptions, metadata }),
+                type: "sort",
+            });
+        }
+        if (hasPaging) {
+            generatedFiles.push({
+                name: `dto/paginated-${fileNamePlural}.ts`,
+                content: generatePaginatedDto({ generatorOptions, metadata }),
+                type: "sort",
+            });
+        }
+        if (hasArgsClass) {
+            generatedFiles.push({
+                name: `dto/${argsFileName}.ts`,
+                content: generateArgsDto({ generatorOptions, metadata }),
+                type: "args",
+            });
+        }
+        if (hasPositionProp) {
+            generatedFiles.push({
+                name: `${fileNamePlural}.service.ts`,
+                content: generateService({ generatorOptions, metadata }),
+                type: "service",
+            });
+        }
+        generatedFiles.push({
+            name: `${fileNameSingular}.resolver.ts`,
+            content: generateResolver({ generatorOptions, metadata }),
+            type: "resolver",
+        });
+        metadata.props
+            .filter((prop) => {
+            if (prop.kind === "1:m" && prop.orphanRemoval) {
+                if (!prop.targetMeta) {
+                    throw new Error(`Target metadata not set`);
                 }
-                if (hasPositionProp) {
-                    generatedFiles.push({
-                        name: `${fileNamePlural}.service.ts`,
-                        content: generateService({ generatorOptions, metadata }),
-                        type: "service",
-                    });
+                const hasOwnCrudGenerator = Reflect.getMetadata(cms_api_1.CRUD_GENERATOR_METADATA_KEY, prop.targetMeta.class);
+                if (!hasOwnCrudGenerator) {
+                    //generate nested resolver only if target entity has no own crud generator
+                    return true;
                 }
+            }
+        })
+            .forEach((prop) => {
+            if (!prop.targetMeta) {
+                throw new Error(`Target metadata not set`);
+            }
+            const { fileNameSingular } = (0, build_name_variants_1.buildNameVariants)(prop.targetMeta);
+            const content = generateNestedEntityResolver({ generatorOptions, metadata: prop.targetMeta });
+            //can be null if no relations exist
+            if (content) {
                 generatedFiles.push({
                     name: `${fileNameSingular}.resolver.ts`,
-                    content: generateResolver({ generatorOptions, metadata }),
+                    content,
                     type: "resolver",
                 });
-                metadata.props
-                    .filter((prop) => {
-                    if (prop.kind === "1:m" && prop.orphanRemoval) {
-                        if (!prop.targetMeta)
-                            throw new Error(`Target metadata not set`);
-                        const hasOwnCrudGenerator = Reflect.getMetadata(cms_api_1.CRUD_GENERATOR_METADATA_KEY, prop.targetMeta.class);
-                        if (!hasOwnCrudGenerator) {
-                            //generate nested resolver only if target entity has no own crud generator
-                            return true;
-                        }
-                    }
-                })
-                    .forEach((prop) => {
-                    if (!prop.targetMeta)
-                        throw new Error(`Target metadata not set`);
-                    const { fileNameSingular } = (0, build_name_variants_1.buildNameVariants)(prop.targetMeta);
-                    const content = generateNestedEntityResolver({ generatorOptions, metadata: prop.targetMeta });
-                    //can be null if no relations exist
-                    if (content) {
-                        generatedFiles.push({
-                            name: `${fileNameSingular}.resolver.ts`,
-                            content,
-                            type: "resolver",
-                        });
-                    }
-                });
-                return generatedFiles;
-            });
-        }
-        const crudInput = yield (0, generate_crud_input_1.generateCrudInput)(generatorOptions, metadata);
-        const crudResolver = yield generateCrudResolver();
-        return [...crudInput, ...crudResolver];
-    });
+            }
+        });
+        return generatedFiles;
+    }
+    const crudInput = await (0, generate_crud_input_1.generateCrudInput)(generatorOptions, metadata);
+    const crudResolver = await generateCrudResolver();
+    return [...crudInput, ...crudResolver];
 }

package/lib/commands/generate/generateCrud/generate-enum-filter-dto.d.ts

@@ -1,2 +1,2 @@
-import { type GeneratedFile } from "../utils/write-generated-files";
+import type { GeneratedFile } from "../utils/write-generated-files";
 export declare function generateEnumFilterDto(type: "enum" | "enums", enumName: string, enumPath: string): GeneratedFile;

package/lib/commands/generate/generateCrud/generate-payload-object-types.d.ts

@@ -1,5 +1,5 @@
-import { type findHooksService } from "../utils/find-hooks-service";
-import { type Imports } from "../utils/generate-imports-code";
+import type { findHooksService } from "../utils/find-hooks-service";
+import type { Imports } from "../utils/generate-imports-code";
 export declare function generatePayloadObjectTypes({ hooksService, instanceNameSingular, entityName, }: {
     hooksService: ReturnType<typeof findHooksService>;
     instanceNameSingular: string;

package/lib/commands/generate/generateCrud/generate-payload-object-types.js

@@ -2,19 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePayloadObjectTypes = generatePayloadObjectTypes;
 function generatePayloadObjectTypes({ hooksService, instanceNameSingular, entityName, }) {
-    var _a, _b;
     const ret = {
         createPayloadType: null,
         updatePayloadType: null,
         code: "",
         imports: [],
     };
-    const createReturnType = (_a = hooksService === null || hooksService === void 0 ? void 0 : hooksService.validateCreateInput) === null || _a === void 0 ? void 0 : _a.returnType;
+    const createReturnType = hooksService?.validateCreateInput?.returnType;
     if (createReturnType) {
         ret.createPayloadType = `Create${entityName}Payload`;
         ret.code += generate({ className: ret.createPayloadType, returnType: createReturnType, instanceNameSingular, entityName });
     }
-    const updateReturnType = (_b = hooksService === null || hooksService === void 0 ? void 0 : hooksService.validateUpdateInput) === null || _b === void 0 ? void 0 : _b.returnType;
+    const updateReturnType = hooksService?.validateUpdateInput?.returnType;
     if (updateReturnType) {
         ret.updatePayloadType = `Update${entityName}Payload`;
         ret.code += generate({ className: ret.updatePayloadType, returnType: updateReturnType, instanceNameSingular, entityName });

package/lib/commands/generate/generateCrud/generate-service-hook-call.d.ts

@@ -1,5 +1,5 @@
-import { type EntityProperty } from "@mikro-orm/core";
-import { type findHooksService } from "../utils/find-hooks-service";
+import type { EntityProperty } from "@mikro-orm/core";
+import type { findHooksService } from "../utils/find-hooks-service";
 export declare function generateServiceHookCall(type: "validateCreateInput" | "validateUpdateInput", { hooksService, instanceNameSingular, dedicatedResolverArgProps, scopeProp, }: {
     hooksService: ReturnType<typeof findHooksService>;
     instanceNameSingular: string;

package/lib/commands/generate/generateCrud/generate-service-hook-call.js

@@ -2,23 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateServiceHookCall = generateServiceHookCall;
 function generateServiceHookCall(type, { hooksService, instanceNameSingular, dedicatedResolverArgProps, scopeProp, }) {
-    var _a, _b, _c, _d;
-    if (!hooksService)
+    if (!hooksService) {
         return "";
+    }
     const hook = type === "validateCreateInput" ? hooksService.validateCreateInput : hooksService.validateUpdateInput;
-    if (!hook)
+    if (!hook) {
         return "";
+    }
     const options = [];
-    if ((_a = hook.options) === null || _a === void 0 ? void 0 : _a.includes("currentUser")) {
+    if (hook.options?.includes("currentUser")) {
         options.push("currentUser: user");
     }
-    if ((_b = hook.options) === null || _b === void 0 ? void 0 : _b.includes("scope")) {
+    if (hook.options?.includes("scope")) {
         if (!scopeProp) {
             throw new Error(`${type} hook expects scope, but no scopeProp found`);
         }
         options.push("scope");
     }
-    if ((_c = hook.options) === null || _c === void 0 ? void 0 : _c.includes("args")) {
+    if (hook.options?.includes("args")) {
         if (type === "validateUpdateInput") {
             throw new Error("validateUpdateInput hook cannot have args option, as args are only available during creation");
         }
@@ -30,7 +31,7 @@ function generateServiceHookCall(type, { hooksService, instanceNameSingular, ded
         });
         options.push(`args: { ${argsCode.join(", ")} }`);
     }
-    if ((_d = hook.options) === null || _d === void 0 ? void 0 : _d.includes("entity")) {
+    if (hook.options?.includes("entity")) {
         if (type === "validateCreateInput") {
             throw new Error("validateCreateInput hook cannot have entity option");
         }

package/lib/commands/generate/generateCrudInput/generate-crud-input.d.ts

@@ -1,6 +1,6 @@
 import { type Permission } from "@comet/cms-api";
-import { type EntityMetadata } from "@mikro-orm/postgresql";
-import { type GeneratedFile } from "../utils/write-generated-files";
+import type { EntityMetadata } from "@mikro-orm/postgresql";
+import type { GeneratedFile } from "../utils/write-generated-files";
 export declare function generateCrudInput(generatorOptions: {
     requiredPermission: Permission | Permission[];
 }, metadata: EntityMetadata<any>, options?: {