@comet/api-generator 9.5.0 → 9.5.2

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

@@ -597,12 +597,12 @@ ${options.mode == "update"
     `;
     return { code, imports };
 }
-function generateNestedEntityResolver({ generatorOptions, metadata }) {
+function generateNestedEntityResolver({ generatorOptions, metadata, targetDirectory, }) {
     const { classNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
-    const { skipScopeCheck, targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const { skipScopeCheck } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     const entityHasRequiredPermission = !!Reflect.getMetadata(cms_api_1.REQUIRED_PERMISSION_METADATA_KEY, metadata.class);
     const imports = [];
-    const { imports: fieldImports, code, hasOutputRelations, needsBlocksTransformer, } = generateRelationsFieldResolver({ generatorOptions, metadata });
+    const { imports: fieldImports, code, hasOutputRelations, needsBlocksTransformer, } = generateRelationsFieldResolver({ generatorOptions, metadata, targetDirectory });
     if (!hasOutputRelations) {
         return null;
     }
@@ -621,9 +621,8 @@ function generateNestedEntityResolver({ generatorOptions, metadata }) {
     }
     `;
 }
-function generateRelationsFieldResolver({ generatorOptions, metadata }) {
+function generateRelationsFieldResolver({ generatorOptions, metadata, targetDirectory, }) {
     const { instanceNameSingular } = (0, build_name_variants_1.buildNameVariants)(metadata);
-    const { targetDirectory } = (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");
@@ -729,6 +728,7 @@ function generateResolver({ generatorOptions, metadata }) {
     const { imports: relationsFieldResolverImports, code: relationsFieldResolverCode, needsBlocksTransformer, } = generateRelationsFieldResolver({
         generatorOptions,
         metadata,
+        targetDirectory,
     });
     imports.push(...relationsFieldResolverImports);
     imports.push(generateEntityImport(metadata, targetDirectory));
@@ -1018,7 +1018,7 @@ async function generateCrud(generatorOptionsParam, metadata) {
     }
     const generatedFiles = [];
     const { fileNameSingular, fileNamePlural } = (0, build_name_variants_1.buildNameVariants)(metadata);
-    const { hasFilterArg, hasSortArg, argsFileName, hasPositionProp, hasPaging, hasArgsClass } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
+    const { hasFilterArg, hasSortArg, argsFileName, hasPositionProp, hasPaging, hasArgsClass, targetDirectory } = (0, build_options_1.buildOptions)(metadata, generatorOptions);
     async function generateCrudResolver() {
         if (hasPaging && hasFilterArg) {
             generatedFiles.push(...generateFilterDto({ generatorOptions, metadata }));
@@ -1074,7 +1074,7 @@ async function generateCrud(generatorOptionsParam, metadata) {
                 throw new Error(`Target metadata not set`);
             }
             const { fileNameSingular } = (0, build_name_variants_1.buildNameVariants)(prop.targetMeta);
-            const content = generateNestedEntityResolver({ generatorOptions, metadata: prop.targetMeta });
+            const content = generateNestedEntityResolver({ generatorOptions, metadata: prop.targetMeta, targetDirectory });
             //can be null if no relations exist
             if (content) {
                 generatedFiles.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/api-generator",
-  "version": "9.5.0",
+  "version": "9.5.2",
   "description": "Comet API Generator CLI tool",
   "repository": {
     "directory": "packages/api/api-generator",
@@ -26,7 +26,7 @@
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "@comet/cms-api": "9.5.0"
+    "@comet/cms-api": "9.5.2"
   },
   "devDependencies": {
     "@mikro-orm/cli": "^6.6.14",
@@ -44,7 +44,7 @@
     "unplugin-swc": "^1.5.9",
     "uuid": "^11.1.1",
     "vitest": "^4.1.8",
-    "@comet/eslint-config": "9.5.0"
+    "@comet/eslint-config": "9.5.2"
   },
   "peerDependencies": {
     "@mikro-orm/cli": "^6.0.0",