@comet/api-generator 9.0.0-canary-20251202103135 → 9.0.0-canary-20251209140438

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

@@ -37,6 +37,7 @@ function buildSortProps(metadata) {
         return metadata.props
             .filter((prop) => (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "sort") &&
             !prop.name.startsWith("scope_") &&
+            !prop.primary &&
             (!prop.embedded || (0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.embedded[0], "sort")) && // the whole embeddable has sort disabled
             (prop.type === "string" ||
                 prop.type === "text" ||
@@ -55,10 +56,14 @@ function buildSortProps(metadata) {
         });
     }
     const crudSortProps = directSortProps(metadata);
-    // add nested from relations, one level deep
     metadata.props.forEach((prop) => {
         if ((0, cms_api_1.hasCrudFieldFeature)(metadata.class, prop.name, "sort")) {
-            if ((prop.kind == "1:1" || prop.kind == "m:1") && prop.targetMeta) {
+            if (prop.primary) {
+                // primary only on root level
+                crudSortProps.push(prop.name);
+            }
+            else if ((prop.kind == "1:1" || prop.kind == "m:1") && prop.targetMeta) {
+                // add nested from relations, one level deep
                 crudSortProps.push(...directSortProps(prop.targetMeta).map((nestedProp) => `${prop.name}.${nestedProp}`));
                 return true;
             }

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

@@ -268,12 +268,22 @@ 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, dedicatedResolverArgProps, hasPositionProp } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const { scopeProp, argsClassName, hasSearchArg, hasSortArg, hasFilterArg, dedicatedResolverArgProps, hasPositionProp, crudSortProps } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const imports = [];
     if (scopeProp && scopeProp.targetMeta) {
         imports.push(generateEntityImport(scopeProp.targetMeta, `${generatorOptions.targetDirectory}/dto`));
     }
+    let defaultSortField = ((_a = metadata.props.find((prop) => prop.primary)) === null || _a === void 0 ? void 0 : _a.name) || "id";
+    if (hasPositionProp) {
+        defaultSortField = "position";
+    }
+    else if (metadata.props.some((prop) => prop.name === "createdAt" && prop.type === "Date")) {
+        defaultSortField = "createdAt";
+    }
+    if (!crudSortProps.includes(defaultSortField))
+        defaultSortField = null;
     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";
@@ -331,11 +341,11 @@ function generateArgsDto({ generatorOptions, metadata }) {
 
         ${hasSortArg
         ? `
-        @Field(() => [${classNameSingular}Sort], { ${hasPositionProp ? `defaultValue: [{ field: ${classNameSingular}SortField.position, direction: SortDirection.ASC }]` : `nullable: true`} })
+        @Field(() => [${classNameSingular}Sort], { ${defaultSortField === null ? "nullable: true" : `defaultValue: [{ field: ${classNameSingular}SortField.${defaultSortField}, direction: SortDirection.ASC }]`} })
         @ValidateNested({ each: true })
         @Type(() => ${classNameSingular}Sort)
-        ${!hasPositionProp ? `@IsOptional()` : ""}
-        sort${!hasPositionProp ? `?` : ""}: ${classNameSingular}Sort[];
+        ${defaultSortField === null ? "@IsOptional()" : ""}
+        sort${defaultSortField === null ? "?" : ""}: ${classNameSingular}Sort[];
         `
         : ""}
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "9.0.0-canary-20251202103135",
+  "version": "9.0.0-canary-20251209140438",
   "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-20251202103135"
+    "@comet/cms-api": "9.0.0-canary-20251209140438"
   },
   "devDependencies": {
     "@mikro-orm/cli": "^6.4.16",
     "@mikro-orm/core": "^6.4.16",
     "@mikro-orm/postgresql": "^6.4.16",
-    "@nestjs/graphql": "^13.1.0",
+    "@nestjs/graphql": "^13.2.0",
     "@types/jest": "^29.5.14",
     "@types/node": "^24.9.1",
     "@types/pluralize": "^0.0.33",
-    "class-validator": "^0.14.2",
+    "class-validator": "^0.14.3",
     "eslint": "^9.30.1",
     "jest": "^29.7.0",
     "npm-run-all2": "^8.0.0",
     "prettier": "^3.6.2",
     "reflect-metadata": "^0.2.2",
-    "rimraf": "^6.0.1",
+    "rimraf": "^6.1.2",
     "ts-jest": "^29.4.0",
     "uuid": "^11.1.0",
-    "@comet/eslint-config": "9.0.0-canary-20251202103135"
+    "@comet/eslint-config": "9.0.0-canary-20251209140438"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",
@@ -65,6 +65,7 @@
     "clean": "rimraf lib",
     "dev": "tsc --watch --preserveWatchOutput -p tsconfig.build.json",
     "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:tsc": "tsc --noEmit",