@comet/api-generator 8.15.0 → 8.16.0-canary-20260219100902

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

@@ -16,6 +16,8 @@ export declare function buildOptions(metadata: EntityMetadata<any>, generatorOpt
     skipScopeCheck: boolean;
     argsClassName: string;
     argsFileName: string;
+    hasPaging: boolean;
+    hasArgsClass: boolean;
     blockProps: import("@mikro-orm/core").EntityProperty<any, any>[];
     dedicatedResolverArgProps: import("@mikro-orm/core").EntityProperty<any, any>[];
 };

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

@@ -113,6 +113,8 @@ function buildOptions(metadata, generatorOptions) {
     const skipScopeCheck = !scopeProp && !scopedEntity;
     const argsClassName = `${classNameSingular != classNamePlural ? classNamePlural : `${classNamePlural}List`}Args`;
     const argsFileName = `${fileNameSingular != fileNamePlural ? fileNamePlural : `${fileNameSingular}-list`}.args`;
+    const hasPaging = generatorOptions.paging !== false;
+    const hasArgsClass = hasPaging || !!scopeProp || dedicatedResolverArgProps.length > 0;
     const blockProps = metadata.props.filter((prop) => {
         return (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "input") && prop.type === "RootBlockType";
     });
@@ -131,6 +133,8 @@ function buildOptions(metadata, generatorOptions) {
         skipScopeCheck,
         argsClassName,
         argsFileName,
+        hasPaging,
+        hasArgsClass,
         blockProps,
         dedicatedResolverArgProps,
     };

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

@@ -274,7 +274,7 @@ 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 } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const { scopeProp, argsClassName, hasSearchArg, hasSortArg, hasFilterArg, dedicatedResolverArgProps, hasPositionProp, crudSortProps, hasPaging } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const imports = [];
     if (scopeProp && scopeProp.targetMeta) {
         imports.push(generateEntityImport(scopeProp.targetMeta, `${generatorOptions.targetDirectory}/dto`));
@@ -291,14 +291,14 @@ function generateArgsDto({ generatorOptions, metadata }) {
     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";
-    import { OffsetBasedPaginationArgs, SortDirection } from "@comet/cms-api";
-    import { ${classNameSingular}Filter } from "./${fileNameSingular}.filter";
-    import { ${classNameSingular}Sort, ${classNameSingular}SortField } from "./${fileNameSingular}.sort";
+    ${hasPaging ? `import { OffsetBasedPaginationArgs, SortDirection } from "@comet/cms-api";` : ``}
+    ${hasPaging && hasFilterArg ? `import { ${classNameSingular}Filter } from "./${fileNameSingular}.filter";` : ``}
+    ${hasPaging && hasSortArg ? `import { ${classNameSingular}Sort, ${classNameSingular}SortField } from "./${fileNameSingular}.sort";` : ``}
 
     ${(0, generate_imports_code_1.generateImportsCode)(imports)}
 
     @ArgsType()
-    export class ${argsClassName} extends OffsetBasedPaginationArgs {
+    export class ${argsClassName}${hasPaging ? ` extends OffsetBasedPaginationArgs` : ""} {
         ${scopeProp
         ? `
         @Field(() => ${scopeProp.type})
@@ -324,7 +324,7 @@ function generateArgsDto({ generatorOptions, metadata }) {
     })
         .join("")}
 
-        ${hasSearchArg
+        ${hasPaging && hasSearchArg
         ? `
         @Field({ nullable: true })
         @IsOptional()
@@ -333,7 +333,7 @@ function generateArgsDto({ generatorOptions, metadata }) {
         `
         : ""}
 
-        ${hasFilterArg
+        ${hasPaging && hasFilterArg
         ? `
         @Field(() => ${classNameSingular}Filter, { nullable: true })
         @ValidateNested()
@@ -343,7 +343,7 @@ function generateArgsDto({ generatorOptions, metadata }) {
         `
         : ""}
 
-        ${hasSortArg
+        ${hasPaging && hasSortArg
         ? `
         @Field(() => [${classNameSingular}Sort], { ${defaultSortField === null ? "nullable: true" : `defaultValue: [{ field: ${classNameSingular}SortField.${defaultSortField}, direction: SortDirection.ASC }]`} })
         @ValidateNested({ each: true })
@@ -729,7 +729,7 @@ 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, } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    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");
@@ -790,8 +790,8 @@ function generateResolver({ generatorOptions, metadata }) {
 
     ${hasPositionProp ? `import { ${classNamePlural}Service } from "./${fileNamePlural}.service";` : ``}
     import { ${classNameSingular}Input, ${classNameSingular}UpdateInput } from "./dto/${fileNameSingular}.input";
-    import { Paginated${classNamePlural} } from "./dto/paginated-${fileNamePlural}";
-    import { ${argsClassName} } from "./dto/${argsFileName}";
+    ${hasPaging ? `import { Paginated${classNamePlural} } from "./dto/paginated-${fileNamePlural}";` : ""}
+    ${hasArgsClass ? `import { ${argsClassName} } from "./dto/${argsFileName}";` : ""}
     ${(0, generate_imports_code_1.generateImportsCode)(imports)}
 
     ${payloadObjectTypes.code}
@@ -832,7 +832,7 @@ function generateResolver({ generatorOptions, metadata }) {
 
         ${generatorOptions.list
         ? `
-        @Query(() => Paginated${classNamePlural})
+        @Query(() => ${hasPaging ? `Paginated${classNamePlural}` : `[${metadata.className}]`})
         ${dedicatedResolverArgProps
             .map((dedicatedResolverArgProp) => {
             var _a;
@@ -840,16 +840,18 @@ function generateResolver({ generatorOptions, metadata }) {
         })
             .join("")}
         async ${instanceNameSingular != instanceNamePlural ? instanceNamePlural : `${instanceNamePlural}List`}(
-            @Args() {${Object.entries(Object.assign(Object.assign({ scope: !!scopeProp }, dedicatedResolverArgProps.reduce((acc, dedicatedResolverArgProp) => {
-            acc[dedicatedResolverArgProp.name] = true;
-            return acc;
-        }, {})), { search: !!hasSearchArg, filter: !!hasFilterArg, sort: !!hasSortArg, offset: true, limit: true }))
-            .filter(([key, use]) => use)
-            .map(([key]) => key)
-            .join(", ")}}: ${argsClassName}
-            ${hasOutputRelations ? `, @Info() info: GraphQLResolveInfo` : ""}
-        ): Promise<Paginated${classNamePlural}> {
-            const where${hasSearchArg || hasFilterArg
+            ${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 }))
+                .filter(([key, use]) => use)
+                .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}));`
             : `: ObjectQuery<${metadata.className}> = {}`}
             ${scopeProp ? `where.scope = scope;` : ""}
@@ -860,7 +862,7 @@ function generateResolver({ generatorOptions, metadata }) {
             .join("\n")}
 
             ${hasOutputRelations
-            ? `const fields = extractGraphqlFields(info, { root: "nodes" });
+            ? `const fields = extractGraphqlFields(info${hasPaging ? `, { root: "nodes" }` : ""});
             const populate: string[] = [];`
             : ""}
             ${[...outputRelationManyToOneProps, ...outputRelationOneToManyProps, ...outputRelationManyToManyProps, ...outputRelationOneToOneProps]
@@ -870,16 +872,19 @@ function generateResolver({ generatorOptions, metadata }) {
             .join("\n")}
 
             ${hasOutputRelations ? `// eslint-disable-next-line @typescript-eslint/no-explicit-any` : ""}
-            const options: FindOptions<${metadata.className}${hasOutputRelations ? `, any` : ""}> = { offset, limit${hasOutputRelations ? `, populate` : ""}};
+            const options: FindOptions<${metadata.className}${hasOutputRelations ? `, any` : ""}> = { ${hasPaging ? `offset, limit${hasOutputRelations ? `, populate` : ""}` : `${hasOutputRelations ? `populate` : ""}`}};
 
-            ${hasSortArg
+            ${hasPaging && hasSortArg
             ? `if (sort) {
                 options.orderBy = gqlSortToMikroOrmOrderBy(sort);
             }`
             : ""}
 
-            const [entities, totalCount] = await this.entityManager.findAndCount(${metadata.className}, where, options);
-            return new Paginated${classNamePlural}(entities, totalCount);
+            ${hasPaging
+            ? `const [entities, totalCount] = await this.entityManager.findAndCount(${metadata.className}, where, options);
+            return new Paginated${classNamePlural}(entities, totalCount);`
+            : `const entities = await this.entityManager.find(${metadata.className}, where, options);
+            return entities;`}
         }
         `
         : ""}
@@ -1034,33 +1039,37 @@ function generateCrud(generatorOptionsParam, metadata) {
         }
         const generatedFiles = [];
         const { fileNameSingular, fileNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
-        const { hasFilterArg, hasSortArg, argsFileName, hasPositionProp } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+        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 (hasFilterArg) {
+                if (hasPaging && hasFilterArg) {
                     generatedFiles.push({
                         name: `dto/${fileNameSingular}.filter.ts`,
                         content: generateFilterDto({ generatorOptions, metadata }),
                         type: "filter",
                     });
                 }
-                if (hasSortArg) {
+                if (hasPaging && hasSortArg) {
                     generatedFiles.push({
                         name: `dto/${fileNameSingular}.sort.ts`,
                         content: generateSortDto({ generatorOptions, metadata }),
                         type: "sort",
                     });
                 }
-                generatedFiles.push({
-                    name: `dto/paginated-${fileNamePlural}.ts`,
-                    content: generatePaginatedDto({ generatorOptions, metadata }),
-                    type: "sort",
-                });
-                generatedFiles.push({
-                    name: `dto/${argsFileName}.ts`,
-                    content: generateArgsDto({ generatorOptions, metadata }),
-                    type: "args",
-                });
+                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`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "8.15.0",
+  "version": "8.16.0-canary-20260219100902",
   "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.15.0"
+    "@comet/cms-api": "8.16.0-canary-20260219100902"
   },
   "devDependencies": {
     "@mikro-orm/cli": "^6.4.16",
@@ -44,7 +44,7 @@
     "rimraf": "^6.1.2",
     "ts-jest": "^29.4.6",
     "uuid": "^11.1.0",
-    "@comet/eslint-config": "8.15.0"
+    "@comet/eslint-config": "8.16.0-canary-20260219100902"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",