@comet/api-generator 8.20.2 → 9.0.0-beta.1

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

@@ -20,4 +20,5 @@ export declare function buildOptions(metadata: EntityMetadata<any>, generatorOpt
     hasArgsClass: boolean;
     blockProps: import("@mikro-orm/core").EntityProperty<any, any>[];
     dedicatedResolverArgProps: import("@mikro-orm/core").EntityProperty<any, any>[];
+    targetDirectory: string;
 };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSortProps = buildSortProps;
 exports.buildOptions = buildOptions;
+const node_path_1 = require("node:path");
 const cms_api_1 = require("@comet/cms-api");
 const build_name_variants_1 = require("../utils/build-name-variants");
 const constants_1 = require("../utils/constants");
@@ -118,6 +119,7 @@ function buildOptions(metadata, generatorOptions) {
     const blockProps = metadata.props.filter((prop) => {
         return (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "input") && prop.type === "RootBlockType";
     });
+    const targetDirectory = `${(0, node_path_1.dirname)(metadata.path).replace(/\/entities$/, "")}/generated`;
     return {
         crudSearchPropNames,
         hasSearchArg,
@@ -137,5 +139,6 @@ function buildOptions(metadata, generatorOptions) {
         hasArgsClass,
         blockProps,
         dedicatedResolverArgProps,
+        targetDirectory,
     };
 }

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

@@ -11,7 +11,7 @@ export declare function generateInputHandling(options: {
     inputName: string;
     assignEntityCode: string;
     excludeFields?: string[];
-}, metadata: EntityMetadata<any>, generatorOptions: CrudGeneratorOptions): {
+}, metadata: EntityMetadata<any>, generatorOptions: CrudGeneratorOptions, targetDirectory: string): {
     code: string;
     imports: Imports;
 };

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

@@ -57,49 +57,32 @@ const find_hooks_service_1 = require("../utils/find-hooks-service");
 const generate_imports_code_1 = require("../utils/generate-imports-code");
 const ts_morph_helper_1 = require("../utils/ts-morph-helper");
 const build_options_1 = require("./build-options");
+const generate_enum_filter_dto_1 = require("./generate-enum-filter-dto");
 const generate_payload_object_types_1 = require("./generate-payload-object-types");
 const generate_service_hook_call_1 = require("./generate-service-hook-call");
-function generateFilterDto({ generatorOptions, metadata }) {
-    const { classNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
-    const { crudFilterProps } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+function generateFilterDto({ generatorOptions, metadata, }) {
+    const { classNameSingular, fileNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
+    const { crudFilterProps, targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const generatedFiles = [];
     const imports = [];
     imports.push({ name: "IsOptional", importPath: "class-validator" });
     imports.push({ name: "ValidateNested", importPath: "class-validator" });
     imports.push({ name: "Type", importPath: "class-transformer" });
     imports.push({ name: "Field", importPath: "@nestjs/graphql" });
     imports.push({ name: "InputType", importPath: "@nestjs/graphql" });
-    let enumFiltersOut = "";
-    const generatedEnumNames = new Set();
-    const generatedEnumsNames = new Set();
     crudFilterProps.map((prop) => {
-        if (prop.type == "EnumArrayType") {
-            imports.push({ name: "createEnumsFilter", importPath: "@comet/cms-api" });
-            const enumName = (0, ts_morph_helper_1.findEnumName)(prop.name, metadata);
-            const importPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, `${generatorOptions.targetDirectory}/dto`, metadata);
-            if (!generatedEnumNames.has(enumName)) {
-                generatedEnumNames.add(enumName);
-                enumFiltersOut += `@InputType()
-                    class ${enumName}EnumsFilter extends createEnumsFilter(${enumName}) {}
-                `;
-                imports.push({ name: enumName, importPath });
-            }
-        }
-        else if (prop.enum) {
-            imports.push({ name: "createEnumFilter", importPath: "@comet/cms-api" });
+        if (prop.type == "EnumArrayType" || prop.enum) {
             const enumName = (0, ts_morph_helper_1.findEnumName)(prop.name, metadata);
-            const importPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, `${generatorOptions.targetDirectory}/dto`, metadata);
-            if (!generatedEnumsNames.has(enumName)) {
-                generatedEnumsNames.add(enumName);
-                enumFiltersOut += `@InputType()
-                    class ${enumName}EnumFilter extends createEnumFilter(${enumName}) {}
-                `;
-                imports.push({ name: enumName, importPath });
-            }
+            const enumImportPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, targetDirectory, metadata);
+            const enumFilter = (0, generate_enum_filter_dto_1.generateEnumFilterDto)(prop.type == "EnumArrayType" ? "enums" : "enum", enumName, `${targetDirectory}/${enumImportPath}`);
+            generatedFiles.push(enumFilter);
+            imports.push({
+                name: `${enumName}${prop.type == "EnumArrayType" ? "EnumsFilter" : "EnumFilter"}`,
+                importPath: `./${path.relative(`${targetDirectory}/dto`, `${enumFilter.targetDirectory}/${enumFilter.name.replace(/\.ts$/, "")}`)}`,
+            });
         }
     });
     const filterOut = `
-    ${enumFiltersOut}
-
     @InputType()
     export class ${classNameSingular}Filter {
         ${crudFilterProps
@@ -225,7 +208,12 @@ function generateFilterDto({ generatorOptions, metadata }) {
         or?: ${classNameSingular}Filter[];
     }
     `;
-    return (0, generate_imports_code_1.generateImportsCode)(imports) + filterOut;
+    generatedFiles.push({
+        name: `dto/${fileNameSingular}.filter.ts`,
+        content: (0, generate_imports_code_1.generateImportsCode)(imports) + filterOut,
+        type: "filter",
+    });
+    return generatedFiles;
 }
 function generateSortDto({ generatorOptions, metadata }) {
     const { classNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
@@ -261,10 +249,11 @@ function generateSortDto({ generatorOptions, metadata }) {
 }
 function generatePaginatedDto({ generatorOptions, metadata }) {
     const { classNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
+    const { targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const paginatedOut = `import { ObjectType } from "@nestjs/graphql";
     import { PaginatedResponseFactory } from "@comet/cms-api";
 
-    import { ${metadata.className} } from "${path.relative(`${generatorOptions.targetDirectory}/dto`, metadata.path).replace(/\.ts$/, "")}";
+    import { ${metadata.className} } from "${path.relative(`${targetDirectory}/dto`, metadata.path).replace(/\.ts$/, "")}";
 
     @ObjectType()
     export class Paginated${classNamePlural} extends PaginatedResponseFactory.create(${metadata.className}) {}
@@ -274,10 +263,10 @@ function generatePaginatedDto({ generatorOptions, metadata }) {
 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 } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    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, `${generatorOptions.targetDirectory}/dto`));
+        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";
     if (hasPositionProp) {
@@ -358,7 +347,7 @@ function generateArgsDto({ generatorOptions, metadata }) {
 }
 function generateService({ generatorOptions, metadata }) {
     const { classNameSingular, fileNameSingular, classNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
-    const { hasPositionProp, positionGroupProps } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const { hasPositionProp, positionGroupProps, targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const positionGroupType = positionGroupProps.length
         ? `{ ${positionGroupProps
             .map((prop) => {
@@ -373,10 +362,10 @@ function generateService({ generatorOptions, metadata }) {
     const serviceOut = `import { EntityManager, FilterQuery, raw } from "@mikro-orm/postgresql";
     import { Injectable } from "@nestjs/common";
 
-    ${(0, generate_imports_code_1.generateImportsCode)([generateEntityImport(metadata, generatorOptions.targetDirectory)])}
+    ${(0, generate_imports_code_1.generateImportsCode)([generateEntityImport(metadata, targetDirectory)])}
     ${(0, generate_imports_code_1.generateImportsCode)(positionGroupProps.reduce((acc, prop) => {
         if (prop.targetMeta) {
-            acc.push(generateEntityImport(prop.targetMeta, generatorOptions.targetDirectory));
+            acc.push(generateEntityImport(prop.targetMeta, targetDirectory));
         }
         return acc;
     }, []))}
@@ -453,7 +442,7 @@ function generateEntityImport(targetMetadata, relativeTo) {
         importPath: path.relative(relativeTo, targetMetadata.path).replace(/\.ts$/, ""),
     };
 }
-function generateInputHandling(options, metadata, generatorOptions) {
+function generateInputHandling(options, metadata, generatorOptions, targetDirectory) {
     const { instanceNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
     const { blockProps, scopeProp, hasPositionProp, dedicatedResolverArgProps } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const imports = [];
@@ -535,7 +524,7 @@ function generateInputHandling(options, metadata, generatorOptions) {
 ${inputRelationToManyProps
         .map((prop) => {
         if (prop.orphanRemoval) {
-            imports.push(generateEntityImport(prop.targetMeta, generatorOptions.targetDirectory));
+            imports.push(generateEntityImport(prop.targetMeta, targetDirectory));
             const { code, imports: nestedImports } = generateInputHandling({
                 mode: "updateNested",
                 inputName: `${prop.singularName}Input`,
@@ -544,7 +533,7 @@ ${inputRelationToManyProps
                 excludeFields: prop.targetMeta.props
                     .filter((prop) => prop.kind == "m:1" && prop.targetMeta == metadata) //filter out referencing back to this entity
                     .map((prop) => prop.name),
-            }, prop.targetMeta, generatorOptions);
+            }, prop.targetMeta, generatorOptions, targetDirectory);
             imports.push(...nestedImports);
             const isAsync = code.includes("await ");
             return `if (${prop.name}Input) {
@@ -573,7 +562,7 @@ ${inputRelationToManyProps
 
 ${inputRelationOneToOneProps
         .map((prop) => {
-        imports.push(generateEntityImport(prop.targetMeta, generatorOptions.targetDirectory));
+        imports.push(generateEntityImport(prop.targetMeta, targetDirectory));
         const { code, imports: nestedImports } = generateInputHandling({
             mode: "updateNested",
             inputName: `${prop.name}Input`,
@@ -581,7 +570,7 @@ ${inputRelationOneToOneProps
             excludeFields: prop.targetMeta.props
                 .filter((prop) => prop.kind == "1:1" && prop.targetMeta == metadata) //filter out referencing back to this entity
                 .map((prop) => prop.name),
-        }, prop.targetMeta, generatorOptions);
+        }, prop.targetMeta, generatorOptions, targetDirectory);
         imports.push(...nestedImports);
         return `
             ${options.mode != "create" || prop.nullable ? `if (${prop.name}Input) {` : "{"}
@@ -615,13 +604,13 @@ ${options.mode == "update"
 }
 function generateNestedEntityResolver({ generatorOptions, metadata }) {
     const { classNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
-    const { skipScopeCheck } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const { skipScopeCheck, targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const imports = [];
     const { imports: fieldImports, code, hasOutputRelations, needsBlocksTransformer, } = generateRelationsFieldResolver({ generatorOptions, metadata });
     if (!hasOutputRelations)
         return null;
     imports.push(...fieldImports);
-    imports.push(generateEntityImport(metadata, generatorOptions.targetDirectory));
+    imports.push(generateEntityImport(metadata, targetDirectory));
     return `
     import { RequiredPermission, RootBlockDataScalar, BlocksTransformerService } from "@comet/cms-api";
     import { Args, ID, Info, Mutation, Query, Resolver, ResolveField, Parent } from "@nestjs/graphql";
@@ -637,6 +626,7 @@ function generateNestedEntityResolver({ generatorOptions, metadata }) {
 }
 function generateRelationsFieldResolver({ generatorOptions, metadata }) {
     const { instanceNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
+    const { targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const relationManyToOneProps = metadata.props.filter((prop) => prop.kind === "m:1");
     const relationOneToManyProps = metadata.props.filter((prop) => prop.kind === "1:m");
     const relationManyToManyProps = metadata.props.filter((prop) => prop.kind === "m:n");
@@ -665,11 +655,11 @@ function generateRelationsFieldResolver({ generatorOptions, metadata }) {
     for (const prop of [...relationManyToOneProps, ...relationOneToManyProps, ...relationManyToManyProps, ...relationOneToOneProps]) {
         if (!prop.targetMeta)
             throw new Error(`Relation ${prop.name} has targetMeta not set`);
-        imports.push(generateEntityImport(prop.targetMeta, generatorOptions.targetDirectory));
+        imports.push(generateEntityImport(prop.targetMeta, targetDirectory));
     }
     for (const prop of resolveFieldBlockProps) {
         const blockName = (0, ts_morph_helper_1.findBlockName)(prop.name, metadata);
-        const importPath = (0, ts_morph_helper_1.findBlockImportPath)(blockName, `${generatorOptions.targetDirectory}`, metadata);
+        const importPath = (0, ts_morph_helper_1.findBlockImportPath)(blockName, `${targetDirectory}`, metadata);
         imports.push({ name: blockName, importPath });
     }
     const code = `
@@ -729,34 +719,26 @@ 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, hasPaging, hasArgsClass, } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
-    const relationManyToOneProps = metadata.props.filter((prop) => prop.kind === "m:1");
-    const relationOneToManyProps = metadata.props.filter((prop) => prop.kind === "1:m");
-    const relationManyToManyProps = metadata.props.filter((prop) => prop.kind === "m:n");
-    const relationOneToOneProps = metadata.props.filter((prop) => prop.kind === "1:1");
-    const outputRelationManyToOneProps = relationManyToOneProps.filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "resolveField"));
-    const outputRelationOneToManyProps = relationOneToManyProps.filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "resolveField"));
-    const outputRelationManyToManyProps = relationManyToManyProps.filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "resolveField"));
-    const outputRelationOneToOneProps = relationOneToOneProps.filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "resolveField"));
+    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 = [];
     const { code: createInputHandlingCode, imports: createInputHandlingImports } = generateInputHandling({
         mode: "create",
         inputName: "input",
         assignEntityCode: `const ${instanceNameSingular} = this.entityManager.create(${metadata.className}, {`,
-    }, metadata, generatorOptions);
+    }, metadata, generatorOptions, targetDirectory);
     imports.push(...createInputHandlingImports);
-    const { code: updateInputHandlingCode, imports: updateInputHandlingImports } = generateInputHandling({ mode: "update", inputName: "input", assignEntityCode: `${instanceNameSingular}.assign({` }, metadata, generatorOptions);
+    const { code: updateInputHandlingCode, imports: updateInputHandlingImports } = generateInputHandling({ mode: "update", inputName: "input", assignEntityCode: `${instanceNameSingular}.assign({` }, metadata, generatorOptions, targetDirectory);
     imports.push(...updateInputHandlingImports);
-    const { imports: relationsFieldResolverImports, code: relationsFieldResolverCode, hasOutputRelations, needsBlocksTransformer, } = generateRelationsFieldResolver({
+    const { imports: relationsFieldResolverImports, code: relationsFieldResolverCode, needsBlocksTransformer, } = generateRelationsFieldResolver({
         generatorOptions,
         metadata,
     });
     imports.push(...relationsFieldResolverImports);
-    imports.push(generateEntityImport(metadata, generatorOptions.targetDirectory));
+    imports.push(generateEntityImport(metadata, targetDirectory));
     if (scopeProp && scopeProp.targetMeta) {
-        imports.push(generateEntityImport(scopeProp.targetMeta, generatorOptions.targetDirectory));
+        imports.push(generateEntityImport(scopeProp.targetMeta, targetDirectory));
     }
-    const hooksService = (0, find_hooks_service_1.findHooksService)({ 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")) ||
@@ -775,7 +757,6 @@ function generateResolver({ generatorOptions, metadata }) {
     }
     const payloadObjectTypes = (0, generate_payload_object_types_1.generatePayloadObjectTypes)({ hooksService, instanceNameSingular, entityName: metadata.className });
     imports.push(...payloadObjectTypes.imports);
-    imports.push({ name: "extractGraphqlFields", importPath: "@comet/cms-api" });
     imports.push({ name: "SortDirection", importPath: "@comet/cms-api" });
     imports.push({ name: "RequiredPermission", importPath: "@comet/cms-api" });
     imports.push({ name: "AffectedEntity", importPath: "@comet/cms-api" });
@@ -785,8 +766,7 @@ function generateResolver({ generatorOptions, metadata }) {
     imports.push({ name: "gqlArgsToMikroOrmQuery", importPath: "@comet/cms-api" });
     imports.push({ name: "gqlSortToMikroOrmOrderBy", importPath: "@comet/cms-api" });
     const resolverOut = `import { EntityManager, FindOptions, ObjectQuery, Reference } from "@mikro-orm/postgresql";
-    import { Args, ID, Info, Mutation, Query, Resolver, ResolveField, Parent } from "@nestjs/graphql";
-    import { GraphQLResolveInfo } from "graphql";
+    import { Args, ID, Mutation, Query, Resolver, ResolveField, Parent } from "@nestjs/graphql";
 
     ${hasPositionProp ? `import { ${classNamePlural}Service } from "./${fileNamePlural}.service";` : ``}
     import { ${classNameSingular}Input, ${classNameSingular}UpdateInput } from "./dto/${fileNameSingular}.input";
@@ -849,7 +829,6 @@ function generateResolver({ generatorOptions, metadata }) {
                 .map(([key]) => key)
                 .join(", ")}}: ${argsClassName}`
             : ""}
-            ${hasOutputRelations ? `${hasArgsClass ? `,` : ""} @Info() info: GraphQLResolveInfo` : ""}
         ): Promise<${hasPaging ? `Paginated${classNamePlural}` : `${metadata.className}[]`}> {
             const where${hasPaging && (hasSearchArg || hasFilterArg)
             ? ` = gqlArgsToMikroOrmQuery({ ${hasSearchArg ? `search, ` : ""}${hasFilterArg ? `filter, ` : ""} }, this.entityManager.getMetadata(${metadata.className}));`
@@ -861,18 +840,7 @@ function generateResolver({ generatorOptions, metadata }) {
         })
             .join("\n")}
 
-            ${hasOutputRelations
-            ? `const fields = extractGraphqlFields(info${hasPaging ? `, { root: "nodes" }` : ""});
-            const populate: string[] = [];`
-            : ""}
-            ${[...outputRelationManyToOneProps, ...outputRelationOneToManyProps, ...outputRelationManyToManyProps, ...outputRelationOneToOneProps]
-            .map((r) => `if (fields.includes("${r.name}")) {
-                            populate.push("${r.name}");
-                        }`)
-            .join("\n")}
-
-            ${hasOutputRelations ? `// eslint-disable-next-line @typescript-eslint/no-explicit-any` : ""}
-            const options: FindOptions<${metadata.className}${hasOutputRelations ? `, any` : ""}> = { ${hasPaging ? `offset, limit${hasOutputRelations ? `, populate` : ""}` : `${hasOutputRelations ? `populate` : ""}`}};
+            const options: FindOptions<${metadata.className}> = { ${hasPaging ? "offset, limit" : ""}};
 
             ${hasPaging && hasSortArg
             ? `if (sort) {
@@ -1043,11 +1011,7 @@ function generateCrud(generatorOptionsParam, metadata) {
         function generateCrudResolver() {
             return __awaiter(this, void 0, void 0, function* () {
                 if (hasPaging && hasFilterArg) {
-                    generatedFiles.push({
-                        name: `dto/${fileNameSingular}.filter.ts`,
-                        content: generateFilterDto({ generatorOptions, metadata }),
-                        type: "filter",
-                    });
+                    generatedFiles.push(...generateFilterDto({ generatorOptions, metadata }));
                 }
                 if (hasPaging && hasSortArg) {
                     generatedFiles.push({

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

@@ -0,0 +1,2 @@
+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-enum-filter-dto.js

@@ -0,0 +1,76 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateEnumFilterDto = generateEnumFilterDto;
+const path = __importStar(require("path"));
+const generate_imports_code_1 = require("../utils/generate-imports-code");
+function generateEnumFilterDto(type, enumName, enumPath) {
+    const imports = [];
+    const enumFile = path.basename(enumPath);
+    const enumFileDirectory = path.dirname(enumPath);
+    let enumImportPath;
+    let targetDirectory;
+    if (enumFileDirectory.endsWith("/entities")) {
+        targetDirectory = `${enumFileDirectory.replace(/\/entities$/, "")}/generated`;
+        enumImportPath = `../../entities/${enumFile}`;
+    }
+    else {
+        targetDirectory = `${enumFileDirectory}/generated`;
+        enumImportPath = `../../${enumFile}`;
+    }
+    targetDirectory = path.normalize(targetDirectory);
+    imports.push({ name: enumName, importPath: enumImportPath });
+    imports.push({ name: "InputType", importPath: "@nestjs/graphql" });
+    let enumFilterOut;
+    if (type == "enums") {
+        imports.push({ name: "createEnumsFilter", importPath: "@comet/cms-api" });
+        enumFilterOut = `@InputType()
+        export class ${enumName}EnumsFilter extends createEnumsFilter(${enumName}) {}
+    `;
+    }
+    else {
+        imports.push({ name: "createEnumFilter", importPath: "@comet/cms-api" });
+        enumFilterOut = `@InputType()
+        export class ${enumName}EnumFilter extends createEnumFilter(${enumName}) {}
+    `;
+    }
+    const enumNameKebabCase = enumName[0].toLocaleLowerCase() + enumName.slice(1).replace(/[A-Z]/g, (i) => `-${i.toLocaleLowerCase()}`);
+    return {
+        targetDirectory,
+        name: `dto/${enumNameKebabCase}.${type}-filter.ts`,
+        content: (0, generate_imports_code_1.generateImportsCode)(imports) + enumFilterOut,
+        type: `${type}-filter`,
+    };
+}

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

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

package/lib/commands/generate/generateCrudInput/generate-crud-input.js

@@ -54,7 +54,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
     }) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const generatedFiles = [];
-        const { dedicatedResolverArgProps } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+        const { dedicatedResolverArgProps, targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
         const props = metadata.props
             .filter((prop) => {
             return !prop.embedded;
@@ -123,7 +123,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                 const defaultValue = prop.nullable && (initializer == "undefined" || initializer == "null" || initializer === undefined) ? "null" : initializer;
                 const fieldOptions = tsCodeRecordToString({ nullable: prop.nullable ? "true" : undefined, defaultValue });
                 const enumName = (0, ts_morph_helper_1.findEnumName)(prop.name, metadata);
-                const importPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, `${generatorOptions.targetDirectory}/dto`, metadata);
+                const importPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, `${targetDirectory}/dto`, metadata);
                 imports.push({ name: enumName, importPath });
                 decorators.push(`@IsEnum(${enumName})`);
                 decorators.push(`@Field(() => ${enumName}, ${fieldOptions})`);
@@ -137,7 +137,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                 const initializer = (_c = (0, ts_morph_helper_1.morphTsProperty)(prop.name, metadata).getInitializer()) === null || _c === void 0 ? void 0 : _c.getText();
                 const fieldOptions = tsCodeRecordToString({ defaultValue: initializer });
                 const enumName = (0, ts_morph_helper_1.findEnumName)(prop.name, metadata);
-                const importPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, `${generatorOptions.targetDirectory}/dto`, metadata);
+                const importPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, `${targetDirectory}/dto`, metadata);
                 imports.push({ name: enumName, importPath });
                 decorators.push(`@IsEnum(${enumName}, { each: true })`);
                 decorators.push(`@Field(() => [${enumName}], ${fieldOptions})`);
@@ -200,7 +200,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
             }
             else if (prop.type === "RootBlockType") {
                 const blockName = (0, ts_morph_helper_1.findBlockName)(prop.name, metadata);
-                const importPath = (0, ts_morph_helper_1.findBlockImportPath)(blockName, `${generatorOptions.targetDirectory}/dto`, metadata);
+                const importPath = (0, ts_morph_helper_1.findBlockImportPath)(blockName, `${targetDirectory}/dto`, metadata);
                 imports.push({ name: blockName, importPath });
                 decorators.push(`@Field(() => RootBlockInputScalar(${blockName})${prop.nullable ? ", { nullable: true }" : ""})`);
                 decorators.push(`@Transform(({ value }) => (isBlockInputInterface(value) ? value : ${blockName}.blockInputFactory(value)), { toClassOnly: true })`);
@@ -380,7 +380,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                     }
                     else if (tsType.getArrayElementTypeOrThrow().isClass()) {
                         const nestedClassName = tsType.getArrayElementTypeOrThrow().getText(tsProp);
-                        const importPath = (0, ts_morph_helper_1.findInputClassImportPath)(nestedClassName, `${generatorOptions.targetDirectory}/dto`, metadata);
+                        const importPath = (0, ts_morph_helper_1.findInputClassImportPath)(nestedClassName, `${targetDirectory}/dto`, metadata);
                         imports.push({ name: nestedClassName, importPath });
                         decorators.push(`@ValidateNested()`);
                         decorators.push(`@Type(() => ${nestedClassName})`);
@@ -391,7 +391,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                         const elementTypeNode = typeNode.getElementTypeNode();
                         if (elementTypeNode.isKind(ts_morph_1.SyntaxKind.TypeReference)) {
                             // if the element type is a type reference, we need to find the import path
-                            const { importPath } = (0, ts_morph_helper_1.findImportPath)(elementTypeNode.getText(), `${generatorOptions.targetDirectory}/dto`, metadata);
+                            const { importPath } = (0, ts_morph_helper_1.findImportPath)(elementTypeNode.getText(), `${targetDirectory}/dto`, metadata);
                             if (importPath) {
                                 imports.push({ name: elementTypeNode.getText(), importPath });
                             }
@@ -401,7 +401,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                 }
                 else if (tsType.isClass()) {
                     const nestedClassName = tsType.getText(tsProp);
-                    const importPath = (0, ts_morph_helper_1.findInputClassImportPath)(nestedClassName, `${generatorOptions.targetDirectory}/dto`, metadata);
+                    const importPath = (0, ts_morph_helper_1.findInputClassImportPath)(nestedClassName, `${targetDirectory}/dto`, metadata);
                     imports.push({ name: nestedClassName, importPath });
                     decorators.push(`@ValidateNested()`);
                     decorators.push(`@Type(() => ${nestedClassName})`);
@@ -411,7 +411,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                     const typeNode = tsProp.getTypeNodeOrThrow();
                     if (typeNode.isKind(ts_morph_1.SyntaxKind.TypeReference)) {
                         // if the element type is a type reference, we need to find the import path
-                        const { importPath } = (0, ts_morph_helper_1.findImportPath)(typeNode.getText(), `${generatorOptions.targetDirectory}/dto`, metadata);
+                        const { importPath } = (0, ts_morph_helper_1.findImportPath)(typeNode.getText(), `${targetDirectory}/dto`, metadata);
                         if (importPath) {
                             imports.push({ name: typeNode.getText(), importPath });
                         }
@@ -433,7 +433,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
             else if ((0, ts_morph_helper_1.getFieldDecoratorClassName)(prop.name, metadata)) {
                 //for custom mikro-orm type
                 const className = (0, ts_morph_helper_1.getFieldDecoratorClassName)(prop.name, metadata);
-                const importPath = (0, ts_morph_helper_1.findInputClassImportPath)(className, `${generatorOptions.targetDirectory}/dto`, metadata);
+                const importPath = (0, ts_morph_helper_1.findInputClassImportPath)(className, `${targetDirectory}/dto`, metadata);
                 imports.push({ name: className, importPath });
                 decorators.push(`@ValidateNested()`);
                 decorators.push(`@Type(() => ${className})`);
@@ -458,7 +458,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                             `Is${decorator.getName()}`.toUpperCase() === constraint.name.toUpperCase());
                     });
                     if (decorator) {
-                        const importPath = (0, ts_morph_helper_1.findValidatorImportPath)(decorator.getName(), generatorOptions, metadata);
+                        const importPath = (0, ts_morph_helper_1.findValidatorImportPath)(decorator.getName(), targetDirectory, metadata);
                         if (importPath) {
                             imports.push({ name: decorator.getName(), importPath });
                             if (!decorators.includes(decorator.getText())) {

package/lib/commands/generate/generateCrudSingle/generate-crud-single.js

@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCrudSingle = generateCrudSingle;
 const cms_api_1 = require("@comet/cms-api");
 const path = __importStar(require("path"));
+const build_options_1 = require("../generateCrud/build-options");
 const generate_crud_input_1 = require("../generateCrudInput/generate-crud-input");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function generateCrudSingle(generatorOptions, metadata) {
@@ -55,6 +56,7 @@ function generateCrudSingle(generatorOptions, metadata) {
         const instanceNamePlural = classNamePlural[0].toLocaleLowerCase() + classNamePlural.slice(1);
         const fileNameSingular = instanceNameSingular.replace(/[A-Z]/g, (i) => `-${i.toLocaleLowerCase()}`);
         const fileNamePlural = instanceNamePlural.replace(/[A-Z]/g, (i) => `-${i.toLocaleLowerCase()}`);
+        const { targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
         function generateCrudResolver() {
             return __awaiter(this, void 0, void 0, function* () {
                 const generatedFiles = [];
@@ -66,7 +68,7 @@ function generateCrudSingle(generatorOptions, metadata) {
                 });
                 const serviceOut = `import { ObjectQuery } from "@mikro-orm/postgresql";
     import { Injectable } from "@nestjs/common";
-    import { ${metadata.className} } from "${path.relative(generatorOptions.targetDirectory, metadata.path).replace(/\.ts$/, "")}";
+    import { ${metadata.className} } from "${path.relative(targetDirectory, metadata.path).replace(/\.ts$/, "")}";
     
     @Injectable()
     export class ${classNamePlural}Service {    
@@ -78,11 +80,9 @@ function generateCrudSingle(generatorOptions, metadata) {
     import { Args, ID, Mutation, Query, Resolver } from "@nestjs/graphql";
     import { RequiredPermission, SortDirection, validateNotModified } from "@comet/cms-api";
     
-    import { ${metadata.className} } from "${path.relative(generatorOptions.targetDirectory, metadata.path).replace(/\.ts$/, "")}";
+    import { ${metadata.className} } from "${path.relative(targetDirectory, metadata.path).replace(/\.ts$/, "")}";
     ${scopeProp && scopeProp.targetMeta
-                    ? `import { ${scopeProp.targetMeta.className} } from "${path
-                        .relative(generatorOptions.targetDirectory, scopeProp.targetMeta.path)
-                        .replace(/\.ts$/, "")}";`
+                    ? `import { ${scopeProp.targetMeta.className} } from "${path.relative(targetDirectory, scopeProp.targetMeta.path).replace(/\.ts$/, "")}";`
                     : ""}
     import { ${classNamePlural}Service } from "./${fileNamePlural}.service";
     import { ${classNameSingular}Input } from "./dto/${fileNameSingular}.input";

package/lib/commands/generate/generateFiles.js

@@ -20,6 +20,7 @@ const cms_api_1 = require("@comet/cms-api");
 const cli_1 = require("@mikro-orm/cli");
 const lazy_metadata_storage_1 = require("@nestjs/graphql/dist/schema-builder/storages/lazy-metadata.storage");
 const prettier_1 = require("prettier");
+const build_options_1 = require("./generateCrud/build-options");
 const generate_crud_1 = require("./generateCrud/generate-crud");
 const generate_crud_single_1 = require("./generateCrudSingle/generate-crud-single");
 const write_generated_files_1 = require("./utils/write-generated-files");
@@ -59,8 +60,9 @@ file) => __awaiter(void 0, void 0, void 0, function* () {
                     if (generatorOptions) {
                         node_console_1.default.log(`🚀 start generateCrud for Entity ${entity.path}`);
                         const files = yield (0, generate_crud_1.generateCrud)(generatorOptions, entity);
-                        yield (0, write_generated_files_1.writeGeneratedFiles)(files, { targetDirectory: generatorOptions.targetDirectory });
-                        writtenFiles.push(...files.map((f) => (0, node_fs_1.realpathSync)(`${generatorOptions.targetDirectory}/${f.name}`)));
+                        const { targetDirectory } = (0, build_options_1.buildOptions)(entity, generatorOptions);
+                        yield (0, write_generated_files_1.writeGeneratedFiles)(files, targetDirectory);
+                        writtenFiles.push(...files.map((f) => { var _a; return (0, node_fs_1.realpathSync)(`${(_a = f.targetDirectory) !== null && _a !== void 0 ? _a : targetDirectory}/${f.name}`); }));
                     }
                 }
                 {
@@ -68,8 +70,9 @@ file) => __awaiter(void 0, void 0, void 0, function* () {
                     if (generatorOptions) {
                         node_console_1.default.log(`🚀 start generateCrudSingle for Entity ${entity.path}`);
                         const files = yield (0, generate_crud_single_1.generateCrudSingle)(generatorOptions, entity);
-                        yield (0, write_generated_files_1.writeGeneratedFiles)(files, { targetDirectory: generatorOptions.targetDirectory });
-                        writtenFiles.push(...files.map((f) => (0, node_fs_1.realpathSync)(`${generatorOptions.targetDirectory}/${f.name}`)));
+                        const { targetDirectory } = (0, build_options_1.buildOptions)(entity, generatorOptions);
+                        yield (0, write_generated_files_1.writeGeneratedFiles)(files, targetDirectory);
+                        writtenFiles.push(...files.map((f) => { var _a; return (0, node_fs_1.realpathSync)(`${(_a = f.targetDirectory) !== null && _a !== void 0 ? _a : targetDirectory}/${f.name}`); }));
                     }
                 }
             }

package/lib/commands/generate/utils/find-hooks-service.d.ts

@@ -1,23 +1,18 @@
 import { type CrudGeneratorOptions } from "@comet/cms-api";
 import { type EntityMetadata } from "@mikro-orm/core";
 import { type Imports } from "./generate-imports-code";
-export declare function findHooksService({ generatorOptions, metadata }: {
+export declare function findHooksService({ generatorOptions, metadata, targetDirectory, }: {
     generatorOptions: CrudGeneratorOptions;
-    metadata: EntityMetadata<any>;
+    metadata: EntityMetadata;
+    targetDirectory: string;
 }): {
     validateCreateInput: {
-        options: string[];
+        options?: string[];
         returnType: string;
-    } | {
-        returnType: string;
-        options?: undefined;
     } | null;
     validateUpdateInput: {
-        options: string[];
-        returnType: string;
-    } | {
+        options?: string[];
         returnType: string;
-        options?: undefined;
     } | null;
     imports: Imports;
     className: string;

package/lib/commands/generate/utils/find-hooks-service.js

@@ -83,8 +83,7 @@ function unwrapArrayType(type) {
     }
     throw new Error(`Return type must be an array`);
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function findHooksService({ generatorOptions, metadata }) {
+function findHooksService({ generatorOptions, metadata, targetDirectory, }) {
     var _a;
     if (!generatorOptions.hooksService) {
         return null;
@@ -118,7 +117,7 @@ function findHooksService({ generatorOptions, metadata }) {
                 throw new Error("hooksService initializer is not an identifier");
             }
             const hooksServiceClassName = initializer.getText();
-            const { importPath } = (0, ts_morph_helper_1.findImportPath)(hooksServiceClassName, generatorOptions.targetDirectory, metadata);
+            const { importPath } = (0, ts_morph_helper_1.findImportPath)(hooksServiceClassName, targetDirectory, metadata);
             if (importPath) {
                 imports.push({ name: hooksServiceClassName, importPath });
             }
@@ -132,7 +131,7 @@ function findHooksService({ generatorOptions, metadata }) {
                     validateCreateInput = {};
                     const unwrappedType = unwrapArrayType(unwrapPromiseType(method.getReturnType()));
                     const returnType = unwrappedType.getText(method, ts_morph_1.ts.TypeFormatFlags.None);
-                    const returnTypeImport = findReturnTypeImport(unwrappedType, serviceClassDeclaration, generatorOptions.targetDirectory);
+                    const returnTypeImport = findReturnTypeImport(unwrappedType, serviceClassDeclaration, targetDirectory);
                     if (returnTypeImport) {
                         imports.push(returnTypeImport);
                     }
@@ -156,7 +155,7 @@ function findHooksService({ generatorOptions, metadata }) {
                     validateUpdateInput = {};
                     const unwrappedType = unwrapArrayType(unwrapPromiseType(method.getReturnType()));
                     const returnType = unwrappedType.getText(method, ts_morph_1.ts.TypeFormatFlags.None);
-                    const returnTypeImport = findReturnTypeImport(unwrappedType, serviceClassDeclaration, generatorOptions.targetDirectory);
+                    const returnTypeImport = findReturnTypeImport(unwrappedType, serviceClassDeclaration, targetDirectory);
                     if (returnTypeImport) {
                         imports.push(returnTypeImport);
                     }

package/lib/commands/generate/utils/ts-morph-helper.d.ts

@@ -11,9 +11,7 @@ export declare function findImportPath(importName: string, targetDirectory: stri
 };
 export declare function findEnumName(propertyName: string, metadata: EntityMetadata<any>): string;
 export declare function findEnumImportPath(enumName: string, targetDirectory: string, metadata: EntityMetadata<any>): string;
-export declare function findValidatorImportPath(validatorName: string, generatorOptions: {
-    targetDirectory: string;
-}, metadata: EntityMetadata<any>): string;
+export declare function findValidatorImportPath(validatorName: string, targetDirectory: string, metadata: EntityMetadata<any>): string;
 export declare function findBlockName(propertyName: string, metadata: EntityMetadata<any>): string;
 export declare function findBlockImportPath(blockName: string, targetDirectory: string, metadata: EntityMetadata<any>): string;
 export declare function findInputClassImportPath(className: string, targetDirectory: string, metadata: EntityMetadata<any>): string;

package/lib/commands/generate/utils/ts-morph-helper.js

@@ -144,7 +144,7 @@ function findEnumImportPath(enumName, targetDirectory, metadata) {
         return importPath;
     }
 }
-function findValidatorImportPath(validatorName, generatorOptions, metadata) {
+function findValidatorImportPath(validatorName, targetDirectory, metadata) {
     var _a, _b;
     const tsSource = morphTsSource(metadata);
     //validator defined in same file as entity
@@ -152,10 +152,10 @@ function findValidatorImportPath(validatorName, generatorOptions, metadata) {
         if (!(((_a = tsSource.getVariableDeclaration(validatorName)) === null || _a === void 0 ? void 0 : _a.isExported()) || ((_b = tsSource.getFunction(validatorName)) === null || _b === void 0 ? void 0 : _b.isExported()))) {
             throw new Error(`Validator ${validatorName} is not exported in ${metadata.path}`);
         }
-        return path.relative(`${generatorOptions.targetDirectory}/dto`, metadata.path).replace(/\.ts$/, "");
+        return path.relative(`${targetDirectory}/dto`, metadata.path).replace(/\.ts$/, "");
     }
     else {
-        const { importPath } = findImportPathOrThrow(validatorName, generatorOptions.targetDirectory, metadata);
+        const { importPath } = findImportPathOrThrow(validatorName, targetDirectory, metadata);
         return importPath;
     }
 }

package/lib/commands/generate/utils/write-generated-files.d.ts

@@ -1,8 +1,7 @@
 export interface GeneratedFile {
+    targetDirectory?: string;
     name: string;
     content: string;
-    type: "resolver" | "input" | "filter" | "sort" | "service" | "args";
+    type: "resolver" | "input" | "filter" | "enum-filter" | "enums-filter" | "sort" | "service" | "args";
 }
-export declare function writeGeneratedFiles(files: GeneratedFile[], options: {
-    targetDirectory: string;
-}): Promise<void>;
+export declare function writeGeneratedFiles(files: GeneratedFile[], targetDirectory: string): Promise<void>;

package/lib/commands/generate/utils/write-generated-files.js

@@ -11,10 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeGeneratedFiles = writeGeneratedFiles;
 const write_generated_file_1 = require("./write-generated-file");
-function writeGeneratedFiles(files, options) {
+function writeGeneratedFiles(files, targetDirectory) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         for (const file of files) {
-            yield (0, write_generated_file_1.writeGeneratedFile)(`${options.targetDirectory}/${file.name}`, file.content);
+            yield (0, write_generated_file_1.writeGeneratedFile)(`${(_a = file.targetDirectory) !== null && _a !== void 0 ? _a : targetDirectory}/${file.name}`, file.content);
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "8.20.2",
+  "version": "9.0.0-beta.1",
   "description": "Comet API Generator CLI tool",
   "repository": {
     "directory": "packages/api/api-generator",
@@ -25,7 +25,7 @@
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "@comet/cms-api": "8.20.2"
+    "@comet/cms-api": "9.0.0-beta.1"
   },
   "devDependencies": {
     "@mikro-orm/cli": "^6.4.16",
@@ -33,7 +33,7 @@
     "@mikro-orm/postgresql": "^6.4.16",
     "@nestjs/graphql": "^13.2.3",
     "@types/jest": "^29.5.14",
-    "@types/node": "^24.10.9",
+    "@types/node": "^24.12.0",
     "@types/pluralize": "^0.0.33",
     "class-validator": "^0.14.3",
     "eslint": "^9.39.2",
@@ -44,7 +44,7 @@
     "rimraf": "^6.1.2",
     "ts-jest": "^29.4.6",
     "uuid": "^11.1.0",
-    "@comet/eslint-config": "8.20.2"
+    "@comet/eslint-config": "9.0.0-beta.1"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",