@comet/api-generator 9.0.0-canary-20251013121422 → 9.0.0-canary-20251113142723

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

@@ -59,11 +59,17 @@ function generateFilterDto({ generatorOptions, metadata }) {
     const { classNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
     const { crudFilterProps } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     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)) {
@@ -75,6 +81,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
             }
         }
         else if (prop.enum) {
+            imports.push({ name: "createEnumFilter", 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 (!generatedEnumsNames.has(enumName)) {
@@ -86,12 +93,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
             }
         }
     });
-    const filterOut = `import { StringFilter, NumberFilter, BooleanFilter, DateFilter, DateTimeFilter, ManyToOneFilter, OneToManyFilter, ManyToManyFilter, IdFilter, createEnumFilter, createEnumsFilter } from "@comet/cms-api";
-    import { Field, InputType } from "@nestjs/graphql";
-    import { Type } from "class-transformer";
-    import { IsNumber, IsOptional, IsString, ValidateNested } from "class-validator";
-    ${(0, generate_imports_code_1.generateImportsCode)(imports)}
-
+    const filterOut = `
     ${enumFiltersOut}
 
     @InputType()
@@ -117,6 +119,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     `;
         }
         else if (prop.type === "string" || prop.type === "text") {
+            imports.push({ name: "StringFilter", importPath: "@comet/cms-api" });
             return `@Field(() => StringFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -125,6 +128,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     `;
         }
         else if (prop.type === "DecimalType" || prop.type == "number" || constants_1.integerTypes.includes(prop.type)) {
+            imports.push({ name: "NumberFilter", importPath: "@comet/cms-api" });
             return `@Field(() => NumberFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -133,6 +137,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     `;
         }
         else if (prop.type === "boolean" || prop.type === "BooleanType") {
+            imports.push({ name: "BooleanFilter", importPath: "@comet/cms-api" });
             return `@Field(() => BooleanFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -142,6 +147,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
         }
         else if (prop.type === "DateType") {
             // ISO Date without time
+            imports.push({ name: "DateFilter", importPath: "@comet/cms-api" });
             return `@Field(() => DateFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -151,6 +157,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
         }
         else if (prop.type === "Date") {
             // DateTime
+            imports.push({ name: "DateTimeFilter", importPath: "@comet/cms-api" });
             return `@Field(() => DateTimeFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -159,6 +166,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     `;
         }
         else if (prop.kind === "m:1") {
+            imports.push({ name: "ManyToOneFilter", importPath: "@comet/cms-api" });
             return `@Field(() => ManyToOneFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -167,6 +175,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     `;
         }
         else if (prop.kind === "1:m") {
+            imports.push({ name: "OneToManyFilter", importPath: "@comet/cms-api" });
             return `@Field(() => OneToManyFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -175,6 +184,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     `;
         }
         else if (prop.kind === "m:n") {
+            imports.push({ name: "ManyToManyFilter", importPath: "@comet/cms-api" });
             return `@Field(() => ManyToManyFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -183,6 +193,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     `;
         }
         else if (prop.type == "uuid") {
+            imports.push({ name: "IdFilter", importPath: "@comet/cms-api" });
             return `@Field(() => IdFilter, { nullable: true })
                     @ValidateNested()
                     @IsOptional()
@@ -210,7 +221,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
         or?: ${classNameSingular}Filter[];
     }
     `;
-    return filterOut;
+    return (0, generate_imports_code_1.generateImportsCode)(imports) + filterOut;
 }
 function generateSortDto({ generatorOptions, metadata }) {
     const { classNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
@@ -415,6 +426,14 @@ function generateService({ generatorOptions, metadata }) {
     return serviceOut;
 }
 function generateEntityImport(targetMetadata, relativeTo) {
+    const libMatch = targetMetadata.path.match(/(packages\/api|@comet)\/cms-api\/lib\/(.*)/);
+    if (libMatch) {
+        // Import from cms-api package
+        return {
+            name: targetMetadata.className,
+            importPath: "@comet/cms-api",
+        };
+    }
     return {
         name: targetMetadata.className,
         importPath: path.relative(relativeTo, targetMetadata.path).replace(/\.ts$/, ""),
@@ -906,8 +925,8 @@ function generateResolver({ generatorOptions, metadata }) {
                     : ``}`)
                     .join(",")} }`
                 : ``});
-                if (input.position > lastPosition + 1) {
-                    input.position = lastPosition + 1;
+                if (input.position > lastPosition) {
+                    input.position = lastPosition;
                 }
                 if (${instanceNameSingular}.position < input.position) {
                     await this.${instanceNamePlural}Service.decrementPositions(${positionGroupProps.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "9.0.0-canary-20251013121422",
+  "version": "9.0.0-canary-20251113142723",
   "description": "Comet API Generator CLI tool",
   "repository": {
     "directory": "packages/api/api-generator",
@@ -9,8 +9,8 @@
   },
   "license": "BSD-2-Clause",
   "type": "commonjs",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "main": "lib/apiGenerator.js",
+  "typings": "lib/apiGenerator.d.ts",
   "bin": {
     "comet-api-generator": "bin/api-generator.js"
   },
@@ -24,7 +24,8 @@
     "pluralize": "^8.0.0",
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
-    "@comet/cms-api": "9.0.0-canary-20251013121422"
+    "typescript": "5.8.3",
+    "@comet/cms-api": "9.0.0-canary-20251113142723"
   },
   "devDependencies": {
     "@mikro-orm/cli": "^6.4.16",
@@ -32,7 +33,7 @@
     "@mikro-orm/postgresql": "^6.4.16",
     "@nestjs/graphql": "^13.1.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.16.3",
+    "@types/node": "^24.9.1",
     "@types/pluralize": "^0.0.33",
     "class-validator": "^0.14.2",
     "eslint": "^9.30.1",
@@ -42,12 +43,13 @@
     "reflect-metadata": "^0.2.2",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.4.0",
-    "typescript": "5.8.3",
     "uuid": "^11.1.0",
-    "@comet/eslint-config": "9.0.0-canary-20251013121422"
+    "@comet/eslint-config": "9.0.0-canary-20251113142723"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",
+    "@mikro-orm/core": "^6.0.0",
+    "@mikro-orm/postgresql": "^6.0.0",
     "@nestjs/graphql": "^13.0.0",
     "class-validator": "^0.14.0"
   },
@@ -59,14 +61,14 @@
     "registry": "https://registry.npmjs.org"
   },
   "scripts": {
-    "build": "$npm_execpath run clean && tsc -p tsconfig.build.json",
+    "build": "pnpm run clean && tsc -p tsconfig.build.json",
     "clean": "rimraf lib",
     "dev": "tsc --watch --preserveWatchOutput -p tsconfig.build.json",
     "lint": "run-p lint:prettier lint:eslint lint:tsc",
     "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
-    "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
+    "lint:prettier": "pnpm exec prettier --check './**/*.{js,json,md,yml,yaml}'",
     "lint:tsc": "tsc --noEmit",
-    "test": "NODE_OPTIONS=--experimental-vm-modules npx jest",
+    "test": "NODE_OPTIONS=--experimental-vm-modules pnpm exec jest",
     "test:updateSnapshot": "NODE_OPTIONS=--experimental-vm-modules jest --updateSnapshot",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   }

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

@@ -1,7 +0,0 @@
-import { type Permission } from "@comet/cms-api";
-import { type SourceFile } from "ts-morph";
-import { type GeneratedFile } from "./write-generated-files";
-export declare function formatSource(sourceCode: string): Promise<string>;
-export declare function formatGeneratedFiles(files: GeneratedFile[]): Promise<GeneratedFile[]>;
-export declare function parseSource(source: string): SourceFile;
-export declare const testPermission: Permission;

package/lib/commands/generate/utils/test-helper.js

@@ -1,74 +0,0 @@
-"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;
-    };
-})();
-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.testPermission = void 0;
-exports.formatSource = formatSource;
-exports.formatGeneratedFiles = formatGeneratedFiles;
-exports.parseSource = parseSource;
-const process = __importStar(require("node:process"));
-const prettier_1 = require("prettier");
-const ts_morph_1 = require("ts-morph");
-let options;
-function formatSource(sourceCode) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!options)
-            options = yield (0, prettier_1.resolveConfig)(process.cwd());
-        return (0, prettier_1.format)(sourceCode, Object.assign(Object.assign({}, options), { filepath: "test.ts" }));
-    });
-}
-function formatGeneratedFiles(files) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () {
-            return Object.assign(Object.assign({}, file), { content: yield formatSource(file.content) });
-        })));
-    });
-}
-function parseSource(source) {
-    const project = new ts_morph_1.Project({
-        tsConfigFilePath: "./tsconfig.json",
-        skipAddingFilesFromTsConfig: true,
-    });
-    return project.createSourceFile("test.ts", source);
-}
-exports.testPermission = "crud";