@comet/api-generator 9.0.0-canary-20260108124422 → 9.0.0-canary-20260119123708

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

@@ -11,6 +11,7 @@ export declare function buildOptions(metadata: EntityMetadata<any>, generatorOpt
     hasSlugProp: boolean;
     hasPositionProp: boolean;
     positionGroupProps: import("@mikro-orm/core").EntityProperty<any, any>[];
+    hasDeletedAtProp: boolean;
     scopeProp: import("@mikro-orm/core").EntityProperty<any, any> | undefined;
     skipScopeCheck: boolean;
     argsClassName: string;

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

@@ -101,6 +101,7 @@ function buildOptions(metadata, generatorOptions) {
     const scopeProp = metadata.props.find((prop) => prop.name == "scope");
     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 : [
@@ -125,6 +126,7 @@ function buildOptions(metadata, generatorOptions) {
         hasSlugProp,
         hasPositionProp,
         positionGroupProps,
+        hasDeletedAtProp,
         scopeProp,
         skipScopeCheck,
         argsClassName,

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

@@ -719,7 +719,7 @@ function generateRelationsFieldResolver({ generatorOptions, metadata }) {
 }
 function generateResolver({ generatorOptions, metadata }) {
     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, dedicatedResolverArgProps, } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const { scopeProp, skipScopeCheck, argsClassName, argsFileName, hasSlugProp, hasSearchArg, hasSortArg, hasFilterArg, hasPositionProp, positionGroupProps, hasDeletedAtProp, dedicatedResolverArgProps, } = (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");
@@ -973,7 +973,8 @@ function generateResolver({ generatorOptions, metadata }) {
         @AffectedEntity(${metadata.className})
         async delete${metadata.className}(${generateIdArg("id", metadata)}): Promise<boolean> {
             const ${instanceNameSingular} = await this.entityManager.findOneOrFail(${metadata.className}, id);
-            this.entityManager.remove(${instanceNameSingular});${hasPositionProp
+            ${hasDeletedAtProp ? `${instanceNameSingular}.assign({ deletedAt: new Date() });` : `this.entityManager.remove(${instanceNameSingular});`}
+            ${hasPositionProp
             ? `await this.${instanceNamePlural}Service.decrementPositions(${positionGroupProps.length
                 ? `{ ${positionGroupProps
                     .map((prop) => `${prop.name}: ${instanceNameSingular}.${prop.name}${[postgresql_1.ReferenceKind.MANY_TO_ONE, postgresql_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind)

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

@@ -75,6 +75,18 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
             { name: "PartialType", importPath: "@comet/cms-api" },
             { name: "BlockInputInterface", importPath: "@comet/cms-api" },
             { name: "isBlockInputInterface", importPath: "@comet/cms-api" },
+            { name: "IsString", importPath: "class-validator" },
+            { name: "IsNotEmpty", importPath: "class-validator" },
+            { name: "ValidateNested", importPath: "class-validator" },
+            { name: "IsNumber", importPath: "class-validator" },
+            { name: "IsBoolean", importPath: "class-validator" },
+            { name: "IsDate", importPath: "class-validator" },
+            { name: "IsDateString", importPath: "class-validator" },
+            { name: "IsOptional", importPath: "class-validator" },
+            { name: "IsEnum", importPath: "class-validator" },
+            { name: "IsUUID", importPath: "class-validator" },
+            { name: "IsArray", importPath: "class-validator" },
+            { name: "IsInt", importPath: "class-validator" },
         ];
         for (const prop of props) {
             let type = prop.type;
@@ -223,6 +235,7 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
                 }
                 else {
                     console.warn(`${prop.name}: Unsupported referenced type`);
+                    continue;
                 }
             }
             else if (prop.kind == "1:m") {
@@ -466,7 +479,6 @@ function generateCrudInput(generatorOptions_1, metadata_1) {
         const className = (_m = options.className) !== null && _m !== void 0 ? _m : `${metadata.className}Input`;
         const inputOut = `import { Field, InputType, ID, Int } from "@nestjs/graphql";
 import { Transform, Type } from "class-transformer";
-import { IsString, IsNotEmpty, ValidateNested, IsNumber, IsBoolean, IsDate, IsDateString, IsOptional, IsEnum, IsUUID, IsArray, IsInt } from "class-validator";
 import { GraphQLJSONObject, GraphQLLocalDate } from "graphql-scalars";
 ${(0, generate_imports_code_1.generateImportsCode)(imports)}
 

package/lib/commands/generate/generateFiles.js

@@ -14,12 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFiles = void 0;
 const node_console_1 = __importDefault(require("node:console"));
+const node_fs_1 = require("node:fs");
 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 child_process_1 = require("child_process");
+const util_1 = require("util");
 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");
+const exec = (0, util_1.promisify)(child_process_1.exec);
 /**
  * Generate mode for the generator.
  *
@@ -41,6 +45,7 @@ file) => __awaiter(void 0, void 0, void 0, function* () {
         node_console_1.default.warn(e);
     }
     if (orm != null) {
+        const writtenFiles = [];
         const entities = orm.em.getMetadata().getAll();
         lazy_metadata_storage_1.LazyMetadataStorage.load();
         for (const name in entities) {
@@ -56,6 +61,7 @@ file) => __awaiter(void 0, void 0, void 0, function* () {
                         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}`)));
                     }
                 }
                 {
@@ -64,10 +70,15 @@ file) => __awaiter(void 0, void 0, void 0, function* () {
                         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}`)));
                     }
                 }
             }
         }
+        if (writtenFiles.length > 0) {
+            node_console_1.default.log("Formatting generated files...");
+            yield exec(`./node_modules/.bin/prettier --write ${writtenFiles.join(" ")}`);
+        }
     }
 });
 exports.generateFiles = generateFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "9.0.0-canary-20260108124422",
+  "version": "9.0.0-canary-20260119123708",
   "description": "Comet API Generator CLI tool",
   "repository": {
     "directory": "packages/api/api-generator",
@@ -25,26 +25,26 @@
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
     "typescript": "5.9.3",
-    "@comet/cms-api": "9.0.0-canary-20260108124422"
+    "@comet/cms-api": "9.0.0-canary-20260119123708"
   },
   "devDependencies": {
     "@mikro-orm/cli": "^6.4.16",
     "@mikro-orm/core": "^6.4.16",
     "@mikro-orm/postgresql": "^6.4.16",
-    "@nestjs/graphql": "^13.2.0",
+    "@nestjs/graphql": "^13.2.3",
     "@types/jest": "^29.5.14",
     "@types/node": "^24.9.1",
     "@types/pluralize": "^0.0.33",
     "class-validator": "^0.14.3",
     "eslint": "^9.30.1",
     "jest": "^29.7.0",
-    "npm-run-all2": "^8.0.0",
+    "npm-run-all2": "^8.0.4",
     "prettier": "^3.6.2",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^6.1.2",
-    "ts-jest": "^29.4.0",
+    "ts-jest": "^29.4.6",
     "uuid": "^11.1.0",
-    "@comet/eslint-config": "9.0.0-canary-20260108124422"
+    "@comet/eslint-config": "9.0.0-canary-20260119123708"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",
@@ -67,7 +67,7 @@
     "lint": "run-p lint:prettier lint:eslint lint:tsc",
     "lint:ci": "pnpm run lint",
     "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
-    "lint:prettier": "pnpm exec prettier --check './**/*.{js,json,md,yml,yaml}'",
+    "lint:prettier": "pnpm exec prettier --check '*.{ts,js,json,md,yml,yaml}'",
     "lint:tsc": "tsc --noEmit",
     "test": "NODE_OPTIONS=--experimental-vm-modules pnpm exec jest",
     "test:updateSnapshot": "NODE_OPTIONS=--experimental-vm-modules jest --updateSnapshot",