@comet/api-generator 8.0.0-beta.2 → 8.0.0-beta.4

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

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

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

@@ -56,7 +56,7 @@ const generate_imports_code_1 = require("../utils/generate-imports-code");
 const ts_morph_helper_1 = require("../utils/ts-morph-helper");
 // TODO move into own file
 function buildOptions(metadata, generatorOptions) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const { classNameSingular, classNamePlural, fileNameSingular, fileNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
     const dedicatedResolverArgProps = metadata.props.filter((prop) => {
         if ((0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "dedicatedResolverArg")) {
@@ -72,34 +72,6 @@ function buildOptions(metadata, generatorOptions) {
     });
     const crudSearchPropNames = (0, cms_api_1.getCrudSearchFieldsFromMetadata)(metadata);
     const hasSearchArg = crudSearchPropNames.length > 0;
-    let statusProp = metadata.props.find((prop) => prop.name == "status");
-    if (statusProp) {
-        if (!statusProp.enum) {
-            console.warn(`${metadata.className} status prop must be an enum to be supported by crud generator`);
-            statusProp = undefined;
-        }
-        else if (statusProp.nullable) {
-            console.warn(`${metadata.className} status prop must not be nullable to be supported by crud generator`);
-            statusProp = undefined;
-        }
-        else if (((_a = (0, ts_morph_helper_1.morphTsProperty)(statusProp.name, metadata).getInitializer()) === null || _a === void 0 ? void 0 : _a.getText()) == "") {
-            console.warn(`${metadata.className} status prop must have a default value to be supported by crud generator`);
-            statusProp = undefined;
-        }
-    }
-    let statusActiveItems = undefined;
-    if (statusProp) {
-        if (!statusProp.items)
-            throw new Error("Status enum prop has not items");
-        statusActiveItems = statusProp.items.filter((item) => {
-            if (typeof item == "number") {
-                console.warn(`${metadata.className} status prop must not have numeric items to be supported by crud generator`);
-                return false;
-            }
-            return ["Active", "Visible", "Invisible", "Published", "Unpublished"].includes(item);
-        });
-    }
-    const hasStatusFilter = statusProp && statusActiveItems && statusActiveItems.length != ((_b = statusProp.items) === null || _b === void 0 ? void 0 : _b.length); //if all items are active ones, no need for status filter
     const crudFilterProps = metadata.props.filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "filter") &&
         !prop.name.startsWith("scope_") &&
         prop.name != "position" &&
@@ -117,7 +89,8 @@ function buildOptions(metadata, generatorOptions) {
             prop.kind === "m:1" ||
             prop.kind === "1:m" ||
             prop.kind === "m:n" ||
-            prop.type === "EnumArrayType") &&
+            prop.type === "EnumArrayType" ||
+            prop.type === "uuid") &&
         !dedicatedResolverArgProps.some((dedicatedResolverArgProp) => dedicatedResolverArgProp.name == prop.name));
     const hasFilterArg = crudFilterProps.length > 0;
     const crudSortProps = metadata.props.filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "sort") &&
@@ -141,7 +114,7 @@ function buildOptions(metadata, generatorOptions) {
         throw new Error("Scope prop has no targetMeta");
     const hasPositionProp = metadata.props.some((prop) => prop.name == "position");
     const positionGroupPropNames = hasPositionProp
-        ? ((_d = (_c = generatorOptions.position) === null || _c === void 0 ? void 0 : _c.groupByFields) !== null && _d !== void 0 ? _d : [
+        ? ((_b = (_a = generatorOptions.position) === null || _a === void 0 ? void 0 : _a.groupByFields) !== null && _b !== void 0 ? _b : [
             ...(scopeProp ? [scopeProp.name] : []), // if there is a scope prop it's effecting position-group, if not groupByFields should be used
         ])
         : [];
@@ -163,9 +136,6 @@ function buildOptions(metadata, generatorOptions) {
         hasSlugProp,
         hasPositionProp,
         positionGroupProps,
-        statusProp,
-        statusActiveItems,
-        hasStatusFilter,
         scopeProp,
         skipScopeCheck,
         argsClassName,
@@ -205,7 +175,7 @@ function generateFilterDto({ generatorOptions, metadata }) {
             }
         }
     });
-    const filterOut = `import { StringFilter, NumberFilter, BooleanFilter, DateFilter, DateTimeFilter, ManyToOneFilter, OneToManyFilter, ManyToManyFilter, createEnumFilter, createEnumsFilter } from "@comet/cms-api";
+    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";
@@ -301,6 +271,14 @@ function generateFilterDto({ generatorOptions, metadata }) {
                     ${prop.name}?: ManyToManyFilter;
                     `;
         }
+        else if (prop.type == "uuid") {
+            return `@Field(() => IdFilter, { nullable: true })
+                    @ValidateNested()
+                    @IsOptional()
+                    @Type(() => IdFilter)
+                    ${prop.name}?: IdFilter;
+                    `;
+        }
         else {
             //unsupported type TODO support more
         }
@@ -368,29 +346,12 @@ 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, statusProp, statusActiveItems, hasStatusFilter, dedicatedResolverArgProps, } = buildOptions(metadata, generatorOptions);
+    const { scopeProp, argsClassName, hasSearchArg, hasSortArg, hasFilterArg, dedicatedResolverArgProps } = buildOptions(metadata, generatorOptions);
     const imports = [];
     if (scopeProp && scopeProp.targetMeta) {
         imports.push(generateEntityImport(scopeProp.targetMeta, `${generatorOptions.targetDirectory}/dto`));
     }
-    let statusFilterClassName = undefined;
-    let statusFilterDefaultValue;
-    if (hasStatusFilter && statusProp) {
-        statusFilterClassName = (0, ts_morph_helper_1.findEnumName)(statusProp.name, metadata);
-        const importPath = (0, ts_morph_helper_1.findEnumImportPath)(statusFilterClassName, `${generatorOptions.targetDirectory}/dto`, metadata);
-        imports.push({
-            name: statusFilterClassName,
-            importPath,
-        });
-        if (statusActiveItems && statusActiveItems.length > 1) {
-            statusFilterDefaultValue = `[${statusActiveItems.map((i) => `${statusFilterClassName}.${i}`).join(", ")}]`;
-        }
-        else {
-            statusFilterDefaultValue = `[${(_a = (0, ts_morph_helper_1.morphTsProperty)(statusProp.name, metadata).getInitializer()) === null || _a === void 0 ? void 0 : _a.getText()}]`;
-        }
-    }
     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";
@@ -427,14 +388,6 @@ function generateArgsDto({ generatorOptions, metadata }) {
     })
         .join("")}
 
-        ${hasStatusFilter
-        ? `
-        @Field(() => [${statusFilterClassName}], { defaultValue: ${statusFilterDefaultValue} })
-        @IsEnum(${statusFilterClassName}, { each: true })
-        status: ${statusFilterClassName}[];
-        `
-        : ""}
-
         ${hasSearchArg
         ? `
         @Field({ nullable: true })
@@ -837,7 +790,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, statusProp, hasStatusFilter, dedicatedResolverArgProps, } = buildOptions(metadata, generatorOptions);
+    const { scopeProp, skipScopeCheck, argsClassName, argsFileName, hasSlugProp, hasSearchArg, hasSortArg, hasFilterArg, hasPositionProp, positionGroupProps, dedicatedResolverArgProps, } = 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");
@@ -867,14 +820,6 @@ function generateResolver({ generatorOptions, metadata }) {
         imports.push(generateEntityImport(scopeProp.targetMeta, generatorOptions.targetDirectory));
     }
     imports.push(...injectRepositories.map((meta) => generateEntityImport(meta, generatorOptions.targetDirectory)));
-    if (statusProp) {
-        const enumName = (0, ts_morph_helper_1.findEnumName)(statusProp.name, metadata);
-        const importPath = (0, ts_morph_helper_1.findEnumImportPath)(enumName, generatorOptions.targetDirectory, metadata);
-        imports.push({
-            name: enumName,
-            importPath,
-        });
-    }
     function generateIdArg(name, metadata) {
         if (constants_1.integerTypes.includes(metadata.properties[name].type)) {
             return `@Args("${name}", { type: () => ID }, { transform: (value) => parseInt(value) }) ${name}: number`;
@@ -948,7 +893,7 @@ function generateResolver({ generatorOptions, metadata }) {
             @Args() {${Object.entries(Object.assign(Object.assign({ scope: !!scopeProp }, dedicatedResolverArgProps.reduce((acc, dedicatedResolverArgProp) => {
             acc[dedicatedResolverArgProp.name] = true;
             return acc;
-        }, {})), { status: !!hasStatusFilter, search: !!hasSearchArg, filter: !!hasFilterArg, sort: !!hasSortArg, offset: true, limit: true }))
+        }, {})), { search: !!hasSearchArg, filter: !!hasFilterArg, sort: !!hasSortArg, offset: true, limit: true }))
             .filter(([key, use]) => use)
             .map(([key]) => key)
             .join(", ")}}: ${argsClassName}
@@ -957,7 +902,6 @@ function generateResolver({ generatorOptions, metadata }) {
             const where${hasSearchArg || hasFilterArg
             ? ` = gqlArgsToMikroOrmQuery({ ${hasSearchArg ? `search, ` : ""}${hasFilterArg ? `filter, ` : ""} }, this.repository);`
             : `: ObjectQuery<${metadata.className}> = {}`}
-            ${hasStatusFilter ? `where.status = { $in: status };` : ""}
             ${scopeProp ? `where.scope = scope;` : ""}
             ${dedicatedResolverArgProps
             .map((dedicatedResolverArgProp) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "8.0.0-beta.2",
+  "version": "8.0.0-beta.4",
   "repository": {
     "directory": "packages/api/api-generator",
     "type": "git",
@@ -21,15 +21,15 @@
     "pluralize": "^8.0.0",
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
-    "@comet/cms-api": "8.0.0-beta.2"
+    "@comet/cms-api": "8.0.0-beta.4"
   },
   "devDependencies": {
-    "@mikro-orm/cli": "^6.4.9",
-    "@mikro-orm/core": "^6.4.9",
-    "@mikro-orm/postgresql": "^6.4.9",
-    "@nestjs/graphql": "^13.0.3",
+    "@mikro-orm/cli": "^6.4.10",
+    "@mikro-orm/core": "^6.4.10",
+    "@mikro-orm/postgresql": "^6.4.10",
+    "@nestjs/graphql": "^13.1.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.14.0",
     "@types/pluralize": "^0.0.33",
     "class-validator": "^0.14.1",
     "eslint": "^9.22.0",
@@ -41,7 +41,7 @@
     "ts-jest": "^29.2.6",
     "typescript": "^5.7.3",
     "uuid": "^11.1.0",
-    "@comet/eslint-config": "8.0.0-beta.2"
+    "@comet/eslint-config": "8.0.0-beta.4"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",
@@ -64,6 +64,6 @@
     "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
     "lint:tsc": "tsc",
     "test": "NODE_OPTIONS=--experimental-vm-modules npx jest",
-    "test:watch": "jest --watch"
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   }
 }