ng-openapi 0.2.22-pr-85-testing-fd2f80a.0 → 0.2.22

package/cli.cjs

@@ -44,7 +44,7 @@ var fs4 = __toESM(require("fs"));
 var path13 = __toESM(require("path"));
 
 // package.json
-var version = "0.2.21";
+var version = "0.2.22";
 
 // src/lib/core/generator.ts
 var import_ts_morph7 = require("ts-morph");
@@ -2711,11 +2711,29 @@ var RequestParamsGenerator = class {
         ] : void 0
       });
     });
-    sourceFile.fixMissingImports().formatText();
+    this.addMissingImports(sourceFile);
+    sourceFile.formatText();
     sourceFile.insertText(0, REQUEST_PARAMS_GENERATOR_HEADER_COMMENT);
     sourceFile.saveSync();
     this.addModelsBarrelExport(outputRoot);
   }
+  /**
+   * `sourceFile.fixMissingImports()` fails with a tree-manipulation error when
+   * the first statement of the file carries a JSDoc (as the interfaces here do),
+   * so the same language-service code fix is applied as a plain text edit instead.
+   */
+  addMissingImports(sourceFile) {
+    const changes = this.project.getLanguageService().getCombinedCodeFix(sourceFile, "fixMissingImport").getChanges().filter((fileChange) => fileChange.getFilePath() === sourceFile.getFilePath()).flatMap((fileChange) => fileChange.getTextChanges()).sort((a, b) => b.getSpan().getStart() - a.getSpan().getStart());
+    if (changes.length === 0) {
+      return;
+    }
+    let text = sourceFile.getFullText();
+    changes.forEach((change) => {
+      const span = change.getSpan();
+      text = text.slice(0, span.getStart()) + change.getNewText() + text.slice(span.getStart() + span.getLength());
+    });
+    sourceFile.replaceWithText(text);
+  }
   /**
    * Method names are only unique per service class, so interfaces sharing the
    * global request-params file fall back to a controller-prefixed name on collision.

package/index.js

@@ -2844,11 +2844,29 @@ var _RequestParamsGenerator = class _RequestParamsGenerator {
         ] : void 0
       });
     });
-    sourceFile.fixMissingImports().formatText();
+    this.addMissingImports(sourceFile);
+    sourceFile.formatText();
     sourceFile.insertText(0, REQUEST_PARAMS_GENERATOR_HEADER_COMMENT);
     sourceFile.saveSync();
     this.addModelsBarrelExport(outputRoot);
   }
+  /**
+   * `sourceFile.fixMissingImports()` fails with a tree-manipulation error when
+   * the first statement of the file carries a JSDoc (as the interfaces here do),
+   * so the same language-service code fix is applied as a plain text edit instead.
+   */
+  addMissingImports(sourceFile) {
+    const changes = this.project.getLanguageService().getCombinedCodeFix(sourceFile, "fixMissingImport").getChanges().filter((fileChange) => fileChange.getFilePath() === sourceFile.getFilePath()).flatMap((fileChange) => fileChange.getTextChanges()).sort((a, b) => b.getSpan().getStart() - a.getSpan().getStart());
+    if (changes.length === 0) {
+      return;
+    }
+    let text = sourceFile.getFullText();
+    changes.forEach((change) => {
+      const span = change.getSpan();
+      text = text.slice(0, span.getStart()) + change.getNewText() + text.slice(span.getStart() + span.getLength());
+    });
+    sourceFile.replaceWithText(text);
+  }
   /**
    * Method names are only unique per service class, so interfaces sharing the
    * global request-params file fall back to a controller-prefixed name on collision.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ng-openapi",
-    "version": "0.2.22-pr-85-testing-fd2f80a.0",
+    "version": "0.2.22",
     "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
     "keywords": [
         "ng-openapi",