@backstage/repo-tools 0.15.2 → 0.15.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @backstage/repo-tools
 
+## 0.15.3
+
+### Patch Changes
+
+- 1359279: Fixed an issue with the OpenAPI generated client and server where import/export statements were duplicated.
+- Updated dependencies
+  - @backstage/config-loader@1.10.5
+  - @backstage/backend-plugin-api@1.4.4
+
+## 0.15.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.10.4-next.0
+  - @backstage/backend-plugin-api@1.4.4-next.0
+  - @backstage/cli-node@0.2.14
+
 ## 0.15.2
 
 ### Patch Changes

package/dist/commands/package/schema/openapi/generate/client.cjs.js

@@ -8,6 +8,7 @@ var fs = require('fs-extra');
 var exec = require('../../../../../lib/exec.cjs.js');
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var helpers = require('../../../../../lib/openapi/helpers.cjs.js');
+var dedupeImports = require('../../../../../lib/openapi/dedupe-imports.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -72,6 +73,12 @@ async function generate(outputDirectory, clientAdditionalProperties, abortSignal
       signal: abortSignal?.signal
     });
   }
+  const generatedFiles = await fs__default.default.readdir(resolvedOutputDirectory);
+  for (const file of generatedFiles) {
+    if (file.endsWith(".ts")) {
+      dedupeImports.deduplicateImports(path.resolve(resolvedOutputDirectory, file));
+    }
+  }
   fs__default.default.removeSync(path.resolve(resolvedOutputDirectory, ".openapi-generator-ignore"));
   fs__default.default.rmSync(path.resolve(resolvedOutputDirectory, ".openapi-generator"), {
     recursive: true,

package/dist/commands/package/schema/openapi/generate/server.cjs.js

@@ -1,20 +1,21 @@
 'use strict';
 
+var backendPluginApi = require('@backstage/backend-plugin-api');
 var chalk = require('chalk');
-var path = require('path');
-var YAML = require('js-yaml');
-var constants = require('../../../../../lib/openapi/constants.cjs.js');
-var paths = require('../../../../../lib/paths.cjs.js');
 var fs = require('fs-extra');
+var YAML = require('js-yaml');
+var path = require('path');
 var exec = require('../../../../../lib/exec.cjs.js');
-var backendPluginApi = require('@backstage/backend-plugin-api');
+var constants = require('../../../../../lib/openapi/constants.cjs.js');
+var dedupeImports = require('../../../../../lib/openapi/dedupe-imports.cjs.js');
 var helpers = require('../../../../../lib/openapi/helpers.cjs.js');
+var paths = require('../../../../../lib/paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
-var YAML__default = /*#__PURE__*/_interopDefaultCompat(YAML);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+var YAML__default = /*#__PURE__*/_interopDefaultCompat(YAML);
 
 async function generateSpecFile() {
   const openapiPath = await helpers.getPathToCurrentOpenApiSpec();
@@ -95,6 +96,12 @@ async function generate(serverAdditionalProperties, abortSignal) {
       signal: abortSignal?.signal
     }
   );
+  const generatedFiles = await fs__default.default.readdir(resolvedOutputDirectory);
+  for (const file of generatedFiles) {
+    if (file.endsWith(".ts")) {
+      dedupeImports.deduplicateImports(path.resolve(resolvedOutputDirectory, file));
+    }
+  }
   await exec.exec(
     `yarn backstage-cli package lint --fix ${resolvedOutputDirectory}`,
     [],

package/dist/lib/openapi/dedupe-imports.cjs.js

@@ -0,0 +1,46 @@
+'use strict';
+
+var fs = require('fs');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+
+function deduplicateImports(filePath) {
+  const content = fs__default.default.readFileSync(filePath, "utf8");
+  const lines = content.split("\n");
+  const seen = /* @__PURE__ */ new Set();
+  const result = [];
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (trimmed.startsWith("import ") || trimmed.startsWith("export ")) {
+      let fullStatement = line;
+      let endIndex = i;
+      if (trimmed.includes("{") && !trimmed.includes("}")) {
+        while (endIndex < lines.length && !lines[endIndex].includes("}")) {
+          endIndex++;
+        }
+        if (endIndex < lines.length) {
+          fullStatement = lines.slice(i, endIndex + 1).join("\n");
+        }
+      }
+      const normalized = fullStatement.replace(/\/\/.*$/gm, "").replace(/\s+/g, " ").trim();
+      if (!seen.has(normalized)) {
+        seen.add(normalized);
+        for (let j = i; j <= endIndex; j++) {
+          result.push(lines[j]);
+        }
+      }
+      i = endIndex + 1;
+    } else {
+      result.push(line);
+      i++;
+    }
+  }
+  fs__default.default.writeFileSync(filePath, result.join("\n"));
+}
+
+exports.deduplicateImports = deduplicateImports;
+//# sourceMappingURL=dedupe-imports.cjs.js.map

package/dist/lib/openapi/helpers.cjs.js

@@ -1,18 +1,18 @@
 'use strict';
 
+var Parser = require('@apidevtools/swagger-parser');
 var fs = require('fs-extra');
-var paths = require('../paths.cjs.js');
-var constants = require('./constants.cjs.js');
-var path = require('path');
 var YAML = require('js-yaml');
 var lodash = require('lodash');
-var Parser = require('@apidevtools/swagger-parser');
+var path = require('path');
+var paths = require('../paths.cjs.js');
+var constants = require('./constants.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
+var Parser__default = /*#__PURE__*/_interopDefaultCompat(Parser);
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var YAML__default = /*#__PURE__*/_interopDefaultCompat(YAML);
-var Parser__default = /*#__PURE__*/_interopDefaultCompat(Parser);
 
 const getPathToFile = async (directory, filename) => {
   return path.resolve(directory, filename);

package/dist/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.15.2";
+var version = "0.15.3";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/repo-tools",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "CLI for Backstage repo tooling ",
   "backstage": {
     "role": "cli"
@@ -43,11 +43,11 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@apisyouwonthate/style-guide": "^1.4.0",
-    "@backstage/backend-plugin-api": "^1.4.3",
+    "@backstage/backend-plugin-api": "^1.4.4",
     "@backstage/catalog-model": "^1.7.5",
     "@backstage/cli-common": "^0.1.15",
     "@backstage/cli-node": "^0.2.14",
-    "@backstage/config-loader": "^1.10.3",
+    "@backstage/config-loader": "^1.10.5",
     "@backstage/errors": "^1.2.7",
     "@electric-sql/pglite": "^0.3.0",
     "@manypkg/get-packages": "^1.1.3",
@@ -86,8 +86,8 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^1.9.0",
-    "@backstage/cli": "^0.34.2",
+    "@backstage/backend-test-utils": "^1.9.1",
+    "@backstage/cli": "^0.34.4",
     "@backstage/types": "^1.2.2",
     "@types/is-glob": "^4.0.2",
     "@types/node": "^20.16.0",