@backstage/repo-tools 0.16.5 → 0.17.0-next.1

package/CHANGELOG.md

@@ -1,10 +1,39 @@
 # @backstage/repo-tools
 
-## 0.16.5
+## 0.17.0-next.1
+
+### Minor Changes
+
+- 0fbcf23: Added support for OpenAPI 3.1 to all `schema openapi` commands. The commands now auto-detect the OpenAPI version from the spec file and use the appropriate generator, supporting both OpenAPI 3.0.x and 3.1.x specifications.
 
 ### Patch Changes
 
-- e67d18a: Updated `@microsoft/api-extractor` to `7.57.3` and added tests for `getTsDocConfig`
+- 426edbe: Fixed `generate-catalog-info` command failing with "too many arguments" when invoked by lint-staged via the pre-commit hook.
+- d5779e5: Updated the CLI report parser to support cleye-style help output, and strip ANSI escape codes from captured output.
+- Updated dependencies
+  - @backstage/cli-common@0.2.0-next.1
+  - @backstage/cli-node@0.2.19-next.1
+  - @backstage/backend-plugin-api@1.7.1-next.0
+  - @backstage/catalog-model@1.7.6
+  - @backstage/config-loader@1.10.9-next.0
+  - @backstage/errors@1.2.7
+
+## 0.16.6-next.0
+
+### Patch Changes
+
+- 6738cf0: build(deps): bump `minimatch` from 9.0.5 to 10.2.1
+- 2a51546: Fixed prettier existence checks in OpenAPI commands to use `fs.pathExists` instead of checking the resolved path string, which was always truthy.
+- 70fc178: Migrated from deprecated `findPaths` to `targetPaths` and `findOwnPaths` from `@backstage/cli-common`.
+- de62a9d: Upgraded `commander` dependency from `^12.0.0` to `^14.0.3` across all CLI packages.
+- 18a946c: Updated `@microsoft/api-extractor` to `7.57.3` and added tests for `getTsDocConfig`
+- Updated dependencies
+  - @backstage/cli-common@0.2.0-next.0
+  - @backstage/cli-node@0.2.19-next.0
+  - @backstage/config-loader@1.10.9-next.0
+  - @backstage/backend-plugin-api@1.7.1-next.0
+  - @backstage/catalog-model@1.7.6
+  - @backstage/errors@1.2.7
 
 ## 0.16.4
 

package/dist/commands/api-reports/api-reports/createTemporaryTsConfig.cjs.js

@@ -2,14 +2,14 @@
 
 var fs = require('fs-extra');
 var path = require('node:path');
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function createTemporaryTsConfig(includedPackageDirs) {
-  const path$1 = paths.paths.resolveTargetRoot("tsconfig.tmp.json");
+  const path$1 = cliCommon.targetPaths.resolveRoot("tsconfig.tmp.json");
   process.once("exit", () => {
     fs__default.default.removeSync(path$1);
   });

package/dist/commands/api-reports/api-reports/generateTypeDeclarations.cjs.js

@@ -2,14 +2,13 @@
 
 var fs = require('fs-extra');
 var cliCommon = require('@backstage/cli-common');
-var paths = require('../../../lib/paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function generateTypeDeclarations(tsconfigFilePath) {
-  await fs__default.default.remove(paths.paths.resolveTargetRoot("dist-types"));
+  await fs__default.default.remove(cliCommon.targetPaths.resolveRoot("dist-types"));
   try {
     await cliCommon.run(
       [
@@ -23,7 +22,7 @@ async function generateTypeDeclarations(tsconfigFilePath) {
         "false"
       ],
       {
-        cwd: paths.paths.targetRoot
+        cwd: cliCommon.targetPaths.rootDir
       }
     ).waitForExit();
   } catch (error) {

package/dist/commands/api-reports/api-reports/patchApiReportGeneration.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var tryRunPrettier = require('../common/tryRunPrettier.cjs.js');
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 let applied = false;
 function patchApiReportGeneration() {
@@ -92,7 +92,7 @@ function patchApiReportGeneration() {
       parser: "markdown",
       // We need a real-looking filepath for proper config resolution, not just a directory
       // Ideally, the real filepath would be better, but it would require too much patching, for very little gain.
-      filepath: `${paths.paths.targetRoot}/report.api.md`
+      filepath: `${cliCommon.targetPaths.rootDir}/report.api.md`
     });
   };
 }

package/dist/commands/api-reports/api-reports/runApiExtraction.cjs.js

@@ -8,7 +8,7 @@ var lodash = require('lodash');
 var minimatch = require('minimatch');
 var path = require('node:path');
 var getPackageExportDetails = require('../../../lib/getPackageExportDetails.cjs.js');
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var logApiReportInstructions = require('../common/logApiReportInstructions.cjs.js');
 var patchApiReportGeneration = require('./patchApiReportGeneration.cjs.js');
 
@@ -16,9 +16,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
-const tmpDir = paths.paths.resolveTargetRoot(
-  "./node_modules/.cache/api-extractor"
-);
+const tmpDir = cliCommon.targetPaths.resolveRoot("./node_modules/.cache/api-extractor");
 async function countApiReportWarnings(reportPath) {
   try {
     const content = await fs__default.default.readFile(reportPath, "utf8");
@@ -58,7 +56,7 @@ async function findPackageEntryPoints(packageDirs) {
   return Promise.all(
     packageDirs.map(async (packageDir) => {
       const pkg = await fs__default.default.readJson(
-        paths.paths.resolveTargetRoot(packageDir, "package.json")
+        cliCommon.targetPaths.resolveRoot(packageDir, "package.json")
       );
       return getPackageExportDetails.getPackageExportDetails(pkg).map((details) => {
         return { packageDir, ...details };
@@ -80,11 +78,7 @@ async function runApiExtraction({
   const allEntryPoints = await findPackageEntryPoints(packageDirs);
   const allDistTypesEntryPointPaths = allEntryPoints.map(
     ({ packageDir, distTypesPath }) => {
-      return paths.paths.resolveTargetRoot(
-        "./dist-types",
-        packageDir,
-        distTypesPath
-      );
+      return cliCommon.targetPaths.resolveRoot("./dist-types", packageDir, distTypesPath);
     }
   );
   let compilerState = void 0;
@@ -101,11 +95,8 @@ async function runApiExtraction({
   )) {
     console.log(`## Processing ${packageDir}`);
     const noBail = Array.isArray(allowWarnings) ? allowWarnings.some((aw) => aw === packageDir || minimatch.minimatch(packageDir, aw)) : allowWarnings;
-    const projectFolder = paths.paths.resolveTargetRoot(packageDir);
-    const packageFolder = paths.paths.resolveTargetRoot(
-      "./dist-types",
-      packageDir
-    );
+    const projectFolder = cliCommon.targetPaths.resolveRoot(packageDir);
+    const packageFolder = cliCommon.targetPaths.resolveRoot("./dist-types", packageDir);
     const remainingReportFiles = new Set(
       fs__default.default.readdirSync(projectFolder).filter(
         (filename) => (

package/dist/commands/api-reports/buildApiReports.cjs.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var categorizePackageDirs = require('./categorizePackageDirs.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var paths = require('../../lib/paths.cjs.js');
 var runSqlExtraction = require('./sql-reports/runSqlExtraction.cjs.js');
 var runCliExtraction = require('./cli-reports/runCliExtraction.cjs.js');
@@ -10,9 +11,7 @@ var createTemporaryTsConfig = require('./api-reports/createTemporaryTsConfig.cjs
 var generateTypeDeclarations = require('./api-reports/generateTypeDeclarations.cjs.js');
 
 async function buildApiReports(paths$1 = [], opts) {
-  const tmpDir = paths.paths.resolveTargetRoot(
-    "./node_modules/.cache/api-extractor"
-  );
+  const tmpDir = cliCommon.targetPaths.resolveRoot("./node_modules/.cache/api-extractor");
   const isCiBuild = opts.ci;
   const isDocsBuild = opts.docs;
   const runTsc = opts.tsc;
@@ -40,7 +39,7 @@ async function buildApiReports(paths$1 = [], opts) {
   if (!isAllPackages) {
     temporaryTsConfigPath = await createTemporaryTsConfig.createTemporaryTsConfig(selectedPackageDirs);
   }
-  const tsconfigFilePath = temporaryTsConfigPath ?? paths.paths.resolveTargetRoot("tsconfig.json");
+  const tsconfigFilePath = temporaryTsConfigPath ?? cliCommon.targetPaths.resolveRoot("tsconfig.json");
   if (runTsc) {
     console.log("# Compiling TypeScript");
     await generateTypeDeclarations.generateTypeDeclarations(tsconfigFilePath);
@@ -76,7 +75,7 @@ async function buildApiReports(paths$1 = [], opts) {
     console.log("# Generating package documentation");
     await buildDocs.buildDocs({
       inputDir: tmpDir,
-      outputDir: paths.paths.resolveTargetRoot("docs/reference")
+      outputDir: cliCommon.targetPaths.resolveRoot("docs/reference")
     });
   }
 }

package/dist/commands/api-reports/categorizePackageDirs.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var paths = require('../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -19,7 +19,7 @@ async function categorizePackageDirs(packageDirs) {
         if (!dir) {
           return;
         }
-        const pkgJson = await fs__default.default.readJson(paths.paths.resolveTargetRoot(dir, "package.json")).catch((error) => {
+        const pkgJson = await fs__default.default.readJson(cliCommon.targetPaths.resolveRoot(dir, "package.json")).catch((error) => {
           if (error.code === "ENOENT") {
             return void 0;
           }
@@ -29,7 +29,7 @@ async function categorizePackageDirs(packageDirs) {
         if (!role) {
           return;
         }
-        if (await fs__default.default.pathExists(paths.paths.resolveTargetRoot(dir, "migrations"))) {
+        if (await fs__default.default.pathExists(cliCommon.targetPaths.resolveRoot(dir, "migrations"))) {
           sqlPackageDirs.push(dir);
         }
         if (pkgJson?.backstage?.inline) {

package/dist/commands/api-reports/cli-reports/runCliExtraction.cjs.js

@@ -3,7 +3,7 @@
 var path = require('node:path');
 var fs = require('fs-extra');
 var util = require('../../util.cjs.js');
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var generateCliReport = require('./generateCliReport.cjs.js');
 var logApiReportInstructions = require('../common/logApiReportInstructions.cjs.js');
 
@@ -12,7 +12,11 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 function parseHelpPage(helpPageContent) {
-  const [, usage] = helpPageContent.match(/^\s*Usage: (.*)$/im) ?? [];
+  let usage;
+  const commanderUsage = helpPageContent.match(/^\s*Usage: (.*)$/im);
+  if (commanderUsage) {
+    usage = commanderUsage[1];
+  }
   const lines = helpPageContent.split(/\r?\n/);
   let options = new Array();
   let commands = new Array();
@@ -22,19 +26,24 @@ function parseHelpPage(helpPageContent) {
       lines.shift();
     }
     if (lines.length > 0) {
-      const sectionName = lines.shift();
+      const sectionName = lines.shift()?.toLocaleLowerCase("en-US");
       const sectionEndIndex = lines.findIndex(
         (line) => line && !line.match(/^\s/)
       );
       const sectionLines = lines.slice(0, sectionEndIndex);
       lines.splice(0, sectionLines.length);
       const sectionItems = sectionLines.map((line) => line.match(/^\s{1,8}(.*?)\s\s+/)?.[1]).filter(Boolean);
-      if (sectionName?.toLocaleLowerCase("en-US") === "options:") {
+      if (sectionName === "options:" || sectionName === "flags:") {
         options = sectionItems;
-      } else if (sectionName?.toLocaleLowerCase("en-US") === "commands:") {
+      } else if (sectionName === "commands:") {
         commands = sectionItems;
-      } else if (sectionName?.toLocaleLowerCase("en-US") === "arguments:") {
+      } else if (sectionName === "arguments:") {
         commandArguments = sectionItems;
+      } else if (sectionName === "usage:") {
+        const usageLine = sectionLines.find((l) => l.trim().length > 0)?.trim();
+        if (usageLine) {
+          usage = usageLine;
+        }
       } else {
         throw new Error(`Unknown CLI section: ${sectionName}`);
       }
@@ -75,7 +84,7 @@ async function runCliExtraction({
 }) {
   for (const packageDir of packageDirs) {
     console.log(`## Processing ${packageDir}`);
-    const fullDir = paths.paths.resolveTargetRoot(packageDir);
+    const fullDir = cliCommon.targetPaths.resolveRoot(packageDir);
     const pkgJson = await fs__default.default.readJson(path.resolve(fullDir, "package.json"));
     if (!pkgJson.bin) {
       throw new Error(`CLI Package in ${packageDir} has no bin field`);
@@ -114,7 +123,7 @@ async function runCliExtraction({
             console.log("");
             console.log(
               `The conflicting file is ${path.relative(
-                paths.paths.targetRoot,
+                cliCommon.targetPaths.rootDir,
                 reportPath
               )}, expecting the following content:`
             );

package/dist/commands/api-reports/common/tryRunPrettier.cjs.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 
 async function tryRunPrettierAsync(content, extraConfig = { parser: "markdown" }) {
   try {
     const prettier = require("prettier");
-    const filepath = extraConfig.filepath ?? `${paths.paths.targetRoot}/should-not-be-ignored.any`;
+    const filepath = extraConfig.filepath ?? `${cliCommon.targetPaths.rootDir}/should-not-be-ignored.any`;
     const config = await prettier.resolveConfig(filepath, { editorconfig: true }) ?? {};
     const formattedContent = prettier.format(content, {
       ...config,
@@ -22,7 +22,7 @@ async function tryRunPrettierAsync(content, extraConfig = { parser: "markdown" }
 function createPrettierSyncFormatter(prettierSync, extraConfig = {}) {
   return function tryRunPrettierInner(content) {
     try {
-      const filepath = extraConfig.filepath ?? `${paths.paths.targetRoot}/should-not-be-ignored.any`;
+      const filepath = extraConfig.filepath ?? `${cliCommon.targetPaths.rootDir}/should-not-be-ignored.any`;
       const resolveConfig = (
         // @ts-expect-error: v2 requires .sync, @prettier/sync v3 does not
         prettierSync.resolveConfig?.sync ?? prettierSync.resolveConfig

package/dist/commands/api-reports/sql-reports/runSqlExtraction.cjs.js

@@ -2,7 +2,7 @@
 
 var fs = require('fs-extra');
 var path = require('node:path');
-var paths = require('../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var justDiff = require('just-diff');
 var getPgSchemaInfo = require('./getPgSchemaInfo.cjs.js');
 var generateSqlReport = require('./generateSqlReport.cjs.js');
@@ -23,13 +23,13 @@ async function runSqlExtraction(options) {
   }
   let dbIndex = 1;
   for (const packageDir of options.packageDirs) {
-    const migrationDir = paths.paths.resolveTargetRoot(packageDir, "migrations");
+    const migrationDir = cliCommon.targetPaths.resolveRoot(packageDir, "migrations");
     if (!await fs__default.default.pathExists(migrationDir)) {
       console.log(`No SQL migrations found in ${packageDir}`);
       continue;
     }
     const { name: pkgName } = await fs.readJson(
-      paths.paths.resolveTargetRoot(packageDir, "package.json")
+      cliCommon.targetPaths.resolveRoot(packageDir, "package.json")
     );
     const migrationFiles = await fs__default.default.readdir(migrationDir, {
       withFileTypes: true
@@ -59,7 +59,7 @@ async function runSqlExtraction(options) {
   }
 }
 async function runSingleSqlExtraction(targetDir, migrationTarget, pkgName, knex, options) {
-  const migrationDir = paths.paths.resolveTargetRoot(
+  const migrationDir = cliCommon.targetPaths.resolveRoot(
     targetDir,
     "migrations",
     migrationTarget
@@ -106,7 +106,7 @@ async function runSingleSqlExtraction(targetDir, migrationTarget, pkgName, knex,
       break;
     }
   }
-  const reportPath = paths.paths.resolveTargetRoot(
+  const reportPath = cliCommon.targetPaths.resolveRoot(
     targetDir,
     `report${migrationTarget === "." ? "" : `-${migrationTarget}`}.sql.md`
   );
@@ -134,7 +134,7 @@ async function runSingleSqlExtraction(targetDir, migrationTarget, pkgName, knex,
         console.log("");
         console.log(
           `The conflicting file is ${path.relative(
-            paths.paths.targetRoot,
+            cliCommon.targetPaths.rootDir,
             reportPath
           )}, expecting the following content:`
         );

package/dist/commands/index.cjs.js

@@ -108,7 +108,7 @@ function registerCommands(program) {
   ).option(
     "--ci",
     "CI run checks that there are no changes to catalog-info.yaml files"
-  ).description("Create or fix info yaml files for all backstage packages").action(
+  ).description("Create or fix info yaml files for all backstage packages").allowExcessArguments(true).action(
     lazy(
       () => import('./generate-catalog-info/generate-catalog-info.cjs.js'),
       "default"

package/dist/commands/knip-reports/knip-extractor.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var paths = require('../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var pLimit = require('p-limit');
 var os = require('node:os');
 var path = require('node:path');
@@ -77,9 +77,9 @@ async function handlePackage({
   isLocalBuild
 }) {
   console.log(`## Processing ${packageDir}`);
-  const fullDir = paths.paths.resolveTargetRoot(packageDir);
+  const fullDir = cliCommon.targetPaths.resolveRoot(packageDir);
   const reportPath = path.resolve(fullDir, "knip-report.md");
-  const run = util.createBinRunner(paths.paths.targetRoot, "");
+  const run = util.createBinRunner(cliCommon.targetPaths.rootDir, "");
   let report = await run(
     `${knipDir}/knip.js`,
     "-W",
@@ -122,7 +122,7 @@ async function handlePackage({
         console.log("");
         console.log(
           `The conflicting file is ${path.relative(
-            paths.paths.targetRoot,
+            cliCommon.targetPaths.rootDir,
             reportPath
           )}, expecting the following content:`
         );
@@ -138,8 +138,8 @@ async function runKnipReports({
   packageDirs,
   isLocalBuild
 }) {
-  const knipDir = paths.paths.resolveTargetRoot("./node_modules/knip/bin/");
-  const knipConfigPath = paths.paths.resolveTargetRoot("./knip.json");
+  const knipDir = cliCommon.targetPaths.resolveRoot("./node_modules/knip/bin/");
+  const knipConfigPath = cliCommon.targetPaths.resolveRoot("./knip.json");
   const limiter = pLimit__default.default(os__default.default.cpus().length);
   await generateKnipConfig({ knipConfigPath });
   try {

package/dist/commands/lint-legacy-backend-exports/lint-legacy-backend-exports.cjs.js

@@ -3,7 +3,7 @@
 var tsMorph = require('ts-morph');
 var cliNode = require('@backstage/cli-node');
 var fs = require('fs-extra');
-var paths = require('../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var path = require('node:path');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -12,7 +12,7 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 var path__default = /*#__PURE__*/_interopDefaultCompat(path);
 
 const project = new tsMorph.Project({
-  tsConfigFilePath: paths.paths.resolveTargetRoot("tsconfig.json")
+  tsConfigFilePath: cliCommon.targetPaths.resolveRoot("tsconfig.json")
 });
 function readPackageJson(pkg) {
   return JSON.parse(fs__default.default.readFileSync(path__default.default.join(pkg, "package.json"), "utf-8"));

package/dist/commands/package/schema/openapi/diff.cjs.js

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var exec = require('../../../../lib/exec.cjs.js');
 var helpers = require('../../../../lib/openapi/helpers.cjs.js');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var node_process = require('node:process');
 var promises = require('node:fs/promises');
 var path = require('node:path');
@@ -37,7 +37,7 @@ async function check(opts) {
         baseRef
       ],
       {
-        cwd: paths.paths.targetRoot,
+        cwd: cliCommon.targetPaths.rootDir,
         env: { CI: opts.json ? "1" : void 0, ...node_process.env }
       }
     );
@@ -47,13 +47,13 @@ async function check(opts) {
     failed = true;
   }
   if (opts.json) {
-    const file = (await promises.readFile(path.resolve(paths.paths.targetRoot, "ci-run-details.json"))).toString();
+    const file = (await promises.readFile(path.resolve(cliCommon.targetPaths.rootDir, "ci-run-details.json"))).toString();
     const results = JSON.parse(file);
     console.log(file);
     if (!opts.ignore && results.failed) {
       throw new Error("Some checks failed");
     }
-    await promises.rm(path.resolve(paths.paths.targetRoot, "ci-run-details.json"));
+    await promises.rm(path.resolve(cliCommon.targetPaths.rootDir, "ci-run-details.json"));
   } else {
     console.log(reduceOpticOutput(output));
     if (!opts.ignore && failed) {

package/dist/commands/package/schema/openapi/fuzz.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var paths = require('../../../../lib/paths.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var chalk = require('chalk');
 var exec = require('../../../../lib/exec.cjs.js');
 var helpers = require('../../../../lib/openapi/helpers.cjs.js');
@@ -30,7 +30,7 @@ async function fuzz(opts) {
     await fs__default.default.readFile(resolvedOpenapiPath, "utf8")
   );
   const configSource = configLoader.ConfigSources.default({
-    rootDir: paths.paths.targetRoot
+    rootDir: cliCommon.targetPaths.rootDir
   });
   const config = await configLoader.ConfigSources.toConfig(configSource);
   const pluginId = openapiSpec.info.title;
@@ -38,7 +38,7 @@ async function fuzz(opts) {
   if (opts.debug) {
     args.push(
       "--cassette-path",
-      paths.paths.resolveTargetRoot(path.join(".cassettes", `${pluginId}.yml`))
+      cliCommon.targetPaths.resolveRoot(path.join(".cassettes", `${pluginId}.yml`))
     );
   }
   if (opts.limit) {

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

@@ -7,8 +7,8 @@ var path = require('node:path');
 var exec = require('../../../../../lib/exec.cjs.js');
 var constants = require('../../../../../lib/openapi/constants.cjs.js');
 var dedupeImports = require('../../../../../lib/openapi/dedupe-imports.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 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 }; }
 
@@ -17,13 +17,14 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function generate(outputDirectory, clientAdditionalProperties, abortSignal) {
   const resolvedOpenapiPath = await helpers.getPathToCurrentOpenApiSpec();
-  const resolvedOutputDirectory = paths.paths.resolveTargetRoot(
+  const resolvedOutputDirectory = cliCommon.targetPaths.resolveRoot(
     outputDirectory,
     constants.OUTPUT_PATH
   );
   const additionalProperties = helpers.toGeneratorAdditionalProperties({
     initialValue: clientAdditionalProperties
   });
+  const generatorKey = await helpers.getOpenApiGeneratorKey(resolvedOpenapiPath);
   await fs__default.default.emptyDir(resolvedOutputDirectory);
   await fs__default.default.writeFile(
     path.resolve(resolvedOutputDirectory, ".openapi-generator-ignore"),
@@ -46,7 +47,7 @@ async function generate(outputDirectory, clientAdditionalProperties, abortSignal
         "templates/typescript-backstage-client.yaml"
       ),
       "--generator-key",
-      "v3.0",
+      generatorKey,
       additionalProperties ? `--additional-properties=${additionalProperties}` : ""
     ],
     {
@@ -61,14 +62,14 @@ async function generate(outputDirectory, clientAdditionalProperties, abortSignal
   const parentDirectory = path.resolve(resolvedOutputDirectory, "..");
   await fs__default.default.writeFile(
     path.resolve(parentDirectory, "index.ts"),
-    `// 
+    `//
     export * from './generated';`
   );
   await exec.exec(`yarn backstage-cli package lint --fix ${parentDirectory}`, [], {
     signal: abortSignal?.signal
   });
-  const prettier = paths.paths.resolveTargetRoot("node_modules/.bin/prettier");
-  if (prettier) {
+  const prettier = cliCommon.targetPaths.resolveRoot("node_modules/.bin/prettier");
+  if (await fs__default.default.pathExists(prettier)) {
     await exec.exec(`${prettier} --write ${parentDirectory}`, [], {
       signal: abortSignal?.signal
     });
@@ -80,6 +81,11 @@ async function generate(outputDirectory, clientAdditionalProperties, abortSignal
     }
   }
   fs__default.default.removeSync(path.resolve(resolvedOutputDirectory, ".openapi-generator-ignore"));
+  fs__default.default.removeSync(path.resolve(resolvedOutputDirectory, ".gitattributes"));
+  fs__default.default.rmSync(path.resolve(resolvedOutputDirectory, "docs"), {
+    recursive: true,
+    force: true
+  });
   fs__default.default.rmSync(path.resolve(resolvedOutputDirectory, ".openapi-generator"), {
     recursive: true,
     force: true

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

@@ -8,8 +8,8 @@ var path = require('node:path');
 var exec = require('../../../../../lib/exec.cjs.js');
 var constants = require('../../../../../lib/openapi/constants.cjs.js');
 var dedupeImports = require('../../../../../lib/openapi/dedupe-imports.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 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 }; }
 
@@ -20,10 +20,10 @@ var YAML__default = /*#__PURE__*/_interopDefaultCompat(YAML);
 async function generateSpecFile() {
   const openapiPath = await helpers.getPathToCurrentOpenApiSpec();
   const yaml = YAML__default.default.load(await fs__default.default.readFile(openapiPath, "utf8"));
-  const tsPath = paths.paths.resolveTarget(constants.TS_SCHEMA_PATH);
+  const tsPath = cliCommon.targetPaths.resolve(constants.TS_SCHEMA_PATH);
   const schemaDir = path.dirname(tsPath);
   await fs__default.default.mkdirp(schemaDir);
-  const oldTsPath = paths.paths.resolveTarget(constants.OLD_SCHEMA_PATH);
+  const oldTsPath = cliCommon.targetPaths.resolve(constants.OLD_SCHEMA_PATH);
   if (fs__default.default.existsSync(oldTsPath)) {
     console.warn(`Removing old schema file at ${oldTsPath}`);
     fs__default.default.removeSync(oldTsPath);
@@ -50,9 +50,9 @@ export const createOpenApiRouter = async (
     export * from './generated';`
   );
   await exec.exec(`yarn backstage-cli package lint`, ["--fix", tsPath, indexFile]);
-  if (await paths.paths.resolveTargetRoot("node_modules/.bin/prettier")) {
+  if (await fs__default.default.pathExists(cliCommon.targetPaths.resolveRoot("node_modules/.bin/prettier"))) {
     await exec.exec(`yarn prettier`, ["--write", tsPath, indexFile], {
-      cwd: paths.paths.targetRoot
+      cwd: cliCommon.targetPaths.rootDir
     });
   }
 }
@@ -67,6 +67,7 @@ async function generate(serverAdditionalProperties, abortSignal) {
   const additionalProperties = helpers.toGeneratorAdditionalProperties({
     initialValue: serverAdditionalProperties
   });
+  const generatorKey = await helpers.getOpenApiGeneratorKey(resolvedOpenapiPath);
   await exec.exec(
     "node",
     [
@@ -84,7 +85,7 @@ async function generate(serverAdditionalProperties, abortSignal) {
         "templates/typescript-backstage-server.yaml"
       ),
       "--generator-key",
-      "v3.0",
+      generatorKey,
       additionalProperties ? `--additional-properties=${additionalProperties}` : ""
     ],
     {
@@ -109,13 +110,18 @@ async function generate(serverAdditionalProperties, abortSignal) {
       signal: abortSignal?.signal
     }
   );
-  const prettier = paths.paths.resolveTargetRoot("node_modules/.bin/prettier");
+  const prettier = cliCommon.targetPaths.resolveRoot("node_modules/.bin/prettier");
   if (prettier) {
     await exec.exec(`${prettier} --write ${resolvedOutputDirectory}`, [], {
       signal: abortSignal?.signal
     });
   }
   fs__default.default.removeSync(path.resolve(resolvedOutputDirectory, ".openapi-generator-ignore"));
+  fs__default.default.removeSync(path.resolve(resolvedOutputDirectory, ".gitattributes"));
+  fs__default.default.rmSync(path.resolve(resolvedOutputDirectory, "docs"), {
+    recursive: true,
+    force: true
+  });
   fs__default.default.rmSync(path.resolve(resolvedOutputDirectory, ".openapi-generator"), {
     recursive: true,
     force: true

package/dist/commands/package/schema/openapi/init.cjs.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var fs = require('fs-extra');
+var cliCommon = require('@backstage/cli-common');
 var constants = require('../../../../lib/openapi/constants.cjs.js');
-var paths = require('../../../../lib/paths.cjs.js');
 var chalk = require('chalk');
 var exec = require('../../../../lib/exec.cjs.js');
 var helpers = require('../../../../lib/openapi/helpers.cjs.js');
@@ -35,7 +35,7 @@ async function init() {
 capture:
     ${constants.YAML_SCHEMA_PATH}:
         # \u{1F527} Runnable example with simple get requests.
-        # Run with "PORT=3000 optic capture ${constants.YAML_SCHEMA_PATH} --update interactive" in '${paths.paths.targetDir}'
+        # Run with "PORT=3000 optic capture ${constants.YAML_SCHEMA_PATH} --update interactive" in '${cliCommon.targetPaths.dir}'
         # You can change the server and the 'requests' section to experiment
         server:
             # This will not be used by 'backstage-repo-tools schema openapi test', but may be useful for interactive updates.
@@ -46,10 +46,10 @@ capture:
                 # \u{1F527} Specify a command that will generate traffic
                 command: yarn backstage-cli package test --no-watch ${ROUTER_TEST_PATHS.map(
       (e) => `"${e}"`
-    ).join(" ")} 
+    ).join(" ")}
   `
   );
-  if (await paths.paths.resolveTargetRoot("node_modules/.bin/prettier")) {
+  if (await fs__default.default.pathExists(cliCommon.targetPaths.resolveRoot("node_modules/.bin/prettier"))) {
     await exec.exec(`yarn prettier`, ["--write", opticConfigFilePath]);
   }
 }

package/dist/commands/package-docs/command.cjs.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var node_child_process = require('node:child_process');
 var node_util = require('node:util');
+var cliCommon = require('@backstage/cli-common');
 var paths = require('../../lib/paths.cjs.js');
 var utils = require('./utils.cjs.js');
 var promises = require('node:fs/promises');
@@ -61,22 +62,22 @@ function getExports(packageJson) {
 async function generateDocJson(pkg) {
   const temporaryTsConfigPath = await utils.createTemporaryTsConfig(pkg);
   const packageJson = JSON.parse(
-    await promises.readFile(paths.paths.resolveTargetRoot(pkg, "package.json"), "utf-8")
+    await promises.readFile(cliCommon.targetPaths.resolveRoot(pkg, "package.json"), "utf-8")
   );
   const exports$1 = getExports(packageJson);
   if (!exports$1.length || !exports$1.some((e) => e.startsWith("src") || e.startsWith("./src"))) {
     return false;
   }
-  await fs$1.mkdirp(paths.paths.resolveTargetRoot(`dist-types`, pkg));
+  await fs$1.mkdirp(cliCommon.targetPaths.resolveRoot(`dist-types`, pkg));
   const { stdout, stderr } = await execAsync(
     [
-      paths.paths.resolveTargetRoot("node_modules/.bin/typedoc"),
+      cliCommon.targetPaths.resolveRoot("node_modules/.bin/typedoc"),
       "--json",
-      paths.paths.resolveTargetRoot(`dist-types`, pkg, "docs.json"),
+      cliCommon.targetPaths.resolveRoot(`dist-types`, pkg, "docs.json"),
       "--tsconfig",
       temporaryTsConfigPath,
       "--basePath",
-      paths.paths.targetRoot,
+      cliCommon.targetPaths.rootDir,
       "--skipErrorChecking",
       ...getExports(packageJson).flatMap((e) => [
         "--entryPoints",
@@ -96,7 +97,7 @@ async function generateDocJson(pkg) {
 async function packageDocs(paths$1 = [], opts) {
   console.warn("!!! This is an experimental command !!!");
   const existingDocsJsonPaths = glob.glob.sync(
-    paths.paths.resolveTargetRoot("dist-types/**/docs.json")
+    cliCommon.targetPaths.resolveRoot("dist-types/**/docs.json")
   );
   if (existingDocsJsonPaths.length > 0) {
     console.warn(
@@ -107,7 +108,7 @@ async function packageDocs(paths$1 = [], opts) {
     }
   }
   console.warn("!!! Deleting existing docs output !!!");
-  await promises.rm(paths.paths.resolveTargetRoot("type-docs"), {
+  await promises.rm(cliCommon.targetPaths.resolveRoot("type-docs"), {
     recursive: true,
     force: true
   });
@@ -117,18 +118,15 @@ async function packageDocs(paths$1 = [], opts) {
     exclude: opts.exclude
   });
   const cache = await Cache.PackageDocsCache.loadAsync(
-    paths.paths.resolveTargetRoot(),
-    await cliNode.Lockfile.load(paths.paths.resolveTargetRoot("yarn.lock"))
+    cliCommon.targetPaths.rootDir,
+    await cliNode.Lockfile.load(cliCommon.targetPaths.resolveRoot("yarn.lock"))
   );
   console.log(`### Generating docs.`);
   await Promise.all(
     selectedPackageDirs.map(
       (pkg) => limit(async () => {
         const pkgJson = JSON.parse(
-          await promises.readFile(
-            paths.paths.resolveTargetRoot(pkg, "package.json"),
-            "utf-8"
-          )
+          await promises.readFile(cliCommon.targetPaths.resolveRoot(pkg, "package.json"), "utf-8")
         );
         if (EXCLUDE.includes(pkg) || pkgJson.name.startsWith("@internal/")) {
           return;
@@ -147,10 +145,7 @@ async function packageDocs(paths$1 = [], opts) {
           console.log(`### Processing ${pkg}`);
           const success = await generateDocJson(pkg);
           if (success) {
-            await cache.write(
-              pkg,
-              paths.paths.resolveTargetRoot(`dist-types`, pkg)
-            );
+            await cache.write(pkg, cliCommon.targetPaths.resolveRoot(`dist-types`, pkg));
           }
         } catch (e) {
           console.error("Failed to generate docs for", pkg);
@@ -162,7 +157,7 @@ async function packageDocs(paths$1 = [], opts) {
   const generatedPackageDirs = [];
   for (const pkg of selectedPackageDirs) {
     try {
-      const docsJsonPath = paths.paths.resolveTargetRoot(
+      const docsJsonPath = cliCommon.targetPaths.resolveRoot(
         `dist-types/${pkg}/docs.json`
       );
       const docsJson = JSON.parse(await promises.readFile(docsJsonPath, "utf-8"));
@@ -184,7 +179,7 @@ async function packageDocs(paths$1 = [], opts) {
   }
   const { stdout, stderr } = await execAsync(
     [
-      paths.paths.resolveTargetRoot("node_modules/.bin/typedoc"),
+      cliCommon.targetPaths.resolveRoot("node_modules/.bin/typedoc"),
       "--entryPointStrategy",
       "merge",
       ...generatedPackageDirs.flatMap((pkg) => [
@@ -193,11 +188,11 @@ async function packageDocs(paths$1 = [], opts) {
       ]),
       ...HIGHLIGHT_LANGUAGES.flatMap((e) => ["--highlightLanguages", e]),
       "--out",
-      paths.paths.resolveTargetRoot("type-docs"),
-      ...fs.existsSync(paths.paths.resolveTargetRoot("typedoc.json")) ? ["--options", paths.paths.resolveTargetRoot("typedoc.json")] : []
+      cliCommon.targetPaths.resolveRoot("type-docs"),
+      ...fs.existsSync(cliCommon.targetPaths.resolveRoot("typedoc.json")) ? ["--options", cliCommon.targetPaths.resolveRoot("typedoc.json")] : []
     ].join(" "),
     {
-      cwd: paths.paths.targetRoot
+      cwd: cliCommon.targetPaths.rootDir
     }
   );
   console.log(stdout);

package/dist/commands/package-docs/utils.cjs.js

@@ -1,14 +1,17 @@
 'use strict';
 
+var cliCommon = require('@backstage/cli-common');
 var fs = require('fs-extra');
-var paths = require('../../lib/paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function createTemporaryTsConfig(dir) {
-  const path = paths.paths.resolveOwnRoot(dir, "tsconfig.typedoc.tmp.json");
+  const path = cliCommon.findOwnPaths(__dirname).resolveRoot(
+    dir,
+    "tsconfig.typedoc.tmp.json"
+  );
   process.once("exit", () => {
     fs__default.default.removeSync(path);
   });

package/dist/commands/repo/schema/openapi/diff.cjs.js

@@ -2,12 +2,12 @@
 
 var cliNode = require('@backstage/cli-node');
 var exec = require('../../../../lib/exec.cjs.js');
+var cliCommon = require('@backstage/cli-common');
 var helpers = require('../../../../lib/openapi/optic/helpers.cjs.js');
-var paths = require('../../../../lib/paths.cjs.js');
 var constants = require('../../../../lib/openapi/constants.cjs.js');
 
 function cleanUpApiName(e) {
-  e.apiName = e.apiName.replace(paths.paths.targetDir, "").replace(constants.YAML_SCHEMA_PATH, "");
+  e.apiName = e.apiName.replace(cliCommon.targetPaths.dir, "").replace(constants.YAML_SCHEMA_PATH, "");
 }
 async function command(opts) {
   let packages = await cliNode.PackageGraph.listTargetPackages();
@@ -21,7 +21,7 @@ async function command(opts) {
       since
     ]);
     const changedFiles = changedFilesRaw.toString().trim();
-    const changedOpenApiSpecs = changedFiles.split("\n").filter((e) => e.endsWith(constants.YAML_SCHEMA_PATH)).map((e) => paths.paths.resolveTarget(e));
+    const changedOpenApiSpecs = changedFiles.split("\n").filter((e) => e.endsWith(constants.YAML_SCHEMA_PATH)).map((e) => cliCommon.targetPaths.resolve(e));
     packages = packages.filter(
       (pkg) => changedOpenApiSpecs.some((e) => e.startsWith(`${pkg.dir}/`))
     );

package/dist/commands/repo/schema/openapi/lint.cjs.js

@@ -33,13 +33,14 @@ async function lint(directoryPath, config) {
     {
       extends: [spectralRulesets.oas, ruleset__default.default],
       rules: {
-        "allow-reserved-in-params": {
-          given: "$.paths..parameters[*]",
+        "allow-reserved-in-query-params": {
+          given: '$.paths..parameters[?(@.in == "query")]',
           then: {
             field: "allowReserved",
             function: spectralFunctions.truthy
           },
-          severity: "error"
+          severity: "error",
+          message: "Query parameters must specify allowReserved (true or false)"
         }
       },
       overrides: [

package/dist/commands/repo/schema/openapi/test.cjs.js

@@ -3,9 +3,9 @@
 var fs = require('fs-extra');
 var path = require('node:path');
 var chalk = require('chalk');
+var cliCommon = require('@backstage/cli-common');
 var runner = require('../../../../lib/runner.cjs.js');
 var constants = require('../../../../lib/openapi/constants.cjs.js');
-var paths = require('../../../../lib/paths.cjs.js');
 var exec = require('../../../../lib/exec.cjs.js');
 var helpers = require('../../../../lib/openapi/helpers.cjs.js');
 
@@ -27,7 +27,10 @@ async function test(directoryPath, { port }, options) {
   }
   let opticLocation = "";
   try {
-    opticLocation = (await exec.exec(`yarn bin optic`, [], { cwd: paths.paths.ownRoot })).stdout;
+    opticLocation = (await exec.exec(`yarn bin optic`, [], {
+      /* eslint-disable-next-line no-restricted-syntax */
+      cwd: cliCommon.findOwnPaths(__dirname).rootDir
+    })).stdout;
   } catch (err) {
     throw new Error(
       `Failed to find an Optic CLI installation, ensure that you have @useoptic/optic installed in the root of your repo. If not, run yarn add @useoptic/optic from the root of your repo.`
@@ -55,7 +58,9 @@ async function test(directoryPath, { port }, options) {
     err.message = err.message.split("\n").map((e) => e.replace(/.{1} Sending requests to server/, "")).filter((e) => !e.includes("PASS")).filter((e) => e.trim()).join("\n");
     throw err;
   }
-  if (await paths.paths.resolveTargetRoot("node_modules/.bin/prettier") && options?.update) {
+  if (await fs__default.default.pathExists(
+    cliCommon.targetPaths.resolveRoot("node_modules/.bin/prettier")
+  ) && options?.update) {
     await exec.exec(`yarn prettier`, ["--write", openapiPath]);
   }
 }

package/dist/commands/repo/schema/openapi/verify.cjs.js

@@ -4,8 +4,8 @@ var fs = require('fs-extra');
 var lodash = require('lodash');
 var path = require('node:path');
 var chalk = require('chalk');
+var cliCommon = require('@backstage/cli-common');
 var runner = require('../../../../lib/runner.cjs.js');
-var paths = require('../../../../lib/paths.cjs.js');
 var constants = require('../../../../lib/openapi/constants.cjs.js');
 var helpers = require('../../../../lib/openapi/helpers.cjs.js');
 
@@ -36,7 +36,7 @@ async function verify(directoryPath) {
     throw new Error(`\`${constants.TS_SCHEMA_PATH}\` needs to have a 'spec' export.`);
   }
   if (!lodash.isEqual(schema.spec, yaml)) {
-    const path$1 = path.relative(paths.paths.targetRoot, directoryPath);
+    const path$1 = path.relative(cliCommon.targetPaths.rootDir, directoryPath);
     throw new Error(
       `\`${constants.YAML_SCHEMA_PATH}\` and \`${constants.TS_SCHEMA_PATH}\` do not match. Please run \`yarn backstage-repo-tools package schema openapi generate\` from '${path$1}' to regenerate \`${constants.TS_SCHEMA_PATH}\`.`
     );

package/dist/commands/util.cjs.js

@@ -1,53 +1,48 @@
 'use strict';
 
 var node_child_process = require('node:child_process');
+var crypto = require('node:crypto');
+var fs = require('node:fs');
 var os = require('node:os');
-var pLimit = require('p-limit');
+var path = require('node:path');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
-
-var os__default = /*#__PURE__*/_interopDefaultCompat(os);
-var pLimit__default = /*#__PURE__*/_interopDefaultCompat(pLimit);
-
-const limiter = pLimit__default.default(os__default.default.cpus().length);
-function createBinRunner(cwd, path) {
-  return async (...command) => limiter(
-    () => new Promise((resolve, reject) => {
-      const args = path ? [path, ...command] : command;
-      const child = node_child_process.spawn("node", args, {
+const ansiPattern = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+function createBinRunner(cwd, path$1) {
+  return async (...command) => {
+    const args = path$1 ? [path$1, ...command] : command;
+    const outPath = path.join(os.tmpdir(), `backstage-cli-out-${crypto.randomUUID()}.txt`);
+    const outFd = fs.openSync(outPath, "w");
+    try {
+      const result = node_child_process.spawnSync("node", args, {
         cwd,
-        stdio: ["ignore", "pipe", "pipe"]
-      });
-      let stdout = "";
-      let stderr = "";
-      child.stdout?.on("data", (data) => {
-        stdout += data.toString();
+        env: { ...process.env, NO_COLOR: "1" },
+        stdio: ["ignore", outFd, "pipe"]
       });
-      child.stderr?.on("data", (data) => {
-        stderr += data.toString();
-      });
-      child.on("error", (err) => {
-        reject(new Error(`Process error: ${err.message}`));
-      });
-      child.on("close", (code, signal) => {
-        if (signal) {
-          reject(
-            new Error(
-              `Process was killed with signal ${signal}
+      fs.closeSync(outFd);
+      const stdout = fs.readFileSync(outPath, "utf8").replace(ansiPattern, "");
+      if (result.error) {
+        throw new Error(`Process error: ${result.error.message}`);
+      }
+      const stderr = result.stderr?.toString() ?? "";
+      if (result.signal) {
+        throw new Error(
+          `Process was killed with signal ${result.signal}
 ${stderr}`
-            )
-          );
-        } else if (code !== 0) {
-          reject(new Error(`Process exited with code ${code}
-${stderr}`));
-        } else if (stderr.trim()) {
-          reject(new Error(`Command printed error output: ${stderr}`));
-        } else {
-          resolve(stdout);
-        }
-      });
-    })
-  );
+        );
+      } else if (result.status !== 0) {
+        throw new Error(`Process exited with code ${result.status}
+${stderr}`);
+      } else if (stderr.trim()) {
+        throw new Error(`Command printed error output: ${stderr}`);
+      }
+      return stdout;
+    } finally {
+      try {
+        fs.unlinkSync(outPath);
+      } catch {
+      }
+    }
+  };
 }
 
 exports.createBinRunner = createBinRunner;

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

@@ -4,8 +4,8 @@ var Parser = require('@apidevtools/swagger-parser');
 var fs = require('fs-extra');
 var YAML = require('js-yaml');
 var lodash = require('lodash');
+var cliCommon = require('@backstage/cli-common');
 var path = require('node: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 }; }
@@ -18,7 +18,7 @@ const getPathToFile = async (directory, filename) => {
   return path.resolve(directory, filename);
 };
 const getRelativePathToFile = async (filename) => {
-  return await getPathToFile(paths.paths.targetDir, filename);
+  return await getPathToFile(cliCommon.targetPaths.dir, filename);
 };
 const assertExists = async (path) => {
   if (!await fs.pathExists(path)) {
@@ -51,8 +51,31 @@ function toGeneratorAdditionalProperties({
   );
   return Object.entries(parsed).map(([key, value]) => `${key}=${value}`).join(",");
 }
+async function getOpenApiGeneratorKey(specPath) {
+  const yaml = await loadAndValidateOpenApiYaml(specPath);
+  const version = yaml.openapi;
+  if (!version) {
+    throw new Error(`Could not determine OpenAPI version from ${specPath}`);
+  }
+  const semver = /^(\d+)\.(\d+)\.(\d+)(-.+)?$/.exec(version);
+  if (!semver) {
+    throw new Error(`Invalid OpenAPI version format ${version} in ${specPath}`);
+  }
+  const [, major, minor] = semver;
+  const supportedVersions = ["3.0", "3.1"];
+  const majorMinor = `${major}.${minor}`;
+  if (!supportedVersions.includes(majorMinor)) {
+    throw new Error(
+      `Unsupported OpenAPI version ${version} in ${specPath}. Supported versions are: ${supportedVersions.join(
+        ", "
+      )}`
+    );
+  }
+  return `v${majorMinor}`;
+}
 
 exports.assertExists = assertExists;
+exports.getOpenApiGeneratorKey = getOpenApiGeneratorKey;
 exports.getPathToCurrentOpenApiSpec = getPathToCurrentOpenApiSpec;
 exports.getPathToFile = getPathToFile;
 exports.getPathToOpenApiSpec = getPathToOpenApiSpec;

package/dist/lib/paths.cjs.js

@@ -5,7 +5,6 @@ var cliNode = require('@backstage/cli-node');
 var minimatch = require('minimatch');
 var path = require('node:path');
 
-const paths = cliCommon.findPaths(__dirname);
 async function resolvePackagePaths(options = {}) {
   const { paths: providedPaths, include, exclude } = options;
   let packages = await cliNode.PackageGraph.listTargetPackages();
@@ -13,7 +12,7 @@ async function resolvePackagePaths(options = {}) {
     const invalidPaths = [];
     for (const path$1 of providedPaths) {
       const matches = packages.some(
-        ({ dir }) => new minimatch.Minimatch(path$1).match(path.relative(paths.targetRoot, dir)) || isChildPath(dir, path$1)
+        ({ dir }) => new minimatch.Minimatch(path$1).match(path.relative(cliCommon.targetPaths.rootDir, dir)) || isChildPath(dir, path$1)
       );
       if (!matches) {
         invalidPaths.push(path$1);
@@ -26,14 +25,16 @@ async function resolvePackagePaths(options = {}) {
   if (providedPaths && providedPaths.length > 0) {
     packages = packages.filter(
       ({ dir }) => providedPaths.some(
-        (path$1) => new minimatch.Minimatch(path$1).match(path.relative(paths.targetRoot, dir)) || isChildPath(dir, path$1)
+        (path$1) => new minimatch.Minimatch(path$1).match(path.relative(cliCommon.targetPaths.rootDir, dir)) || isChildPath(dir, path$1)
       )
     );
   }
   if (include) {
     packages = packages.filter(
       (pkg) => include.some(
-        (pattern) => new minimatch.Minimatch(pattern).match(path.relative(paths.targetRoot, pkg.dir))
+        (pattern) => new minimatch.Minimatch(pattern).match(
+          path.relative(cliCommon.targetPaths.rootDir, pkg.dir)
+        )
       )
     );
   }
@@ -41,12 +42,12 @@ async function resolvePackagePaths(options = {}) {
     packages = packages.filter(
       (pkg) => exclude.some(
         (pattern) => !new minimatch.Minimatch(pattern).match(
-          path.relative(paths.targetRoot, pkg.dir)
+          path.relative(cliCommon.targetPaths.rootDir, pkg.dir)
         )
       )
     );
   }
-  return packages.map((pkg) => path.relative(paths.targetRoot, pkg.dir));
+  return packages.map((pkg) => path.relative(cliCommon.targetPaths.rootDir, pkg.dir));
 }
 function isChildPath(base, path$1) {
   const relative = path.relative(base, path$1);
@@ -59,6 +60,5 @@ function isChildPath(base, path$1) {
 }
 
 exports.isChildPath = isChildPath;
-exports.paths = paths;
 exports.resolvePackagePaths = resolvePackagePaths;
 //# sourceMappingURL=paths.cjs.js.map

package/dist/lib/runner.cjs.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var cliCommon = require('@backstage/cli-common');
 var paths = require('./paths.cjs.js');
 var pLimit = require('p-limit');
 var path = require('node:path');
@@ -35,7 +36,7 @@ async function runner(paths$1, command, options) {
           resultText = err.message;
         }
         return {
-          relativeDir: path.relative(paths.paths.targetRoot, pkg),
+          relativeDir: path.relative(cliCommon.targetPaths.rootDir, pkg),
           resultText
         };
       })

package/dist/package.json.cjs.js

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

package/openapitools.json

@@ -2,6 +2,6 @@
   "$schema": "../../node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "6.5.0"
+    "version": "7.18.0"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/repo-tools",
-  "version": "0.16.5",
+  "version": "0.17.0-next.1",
   "description": "CLI for Backstage repo tooling ",
   "backstage": {
     "role": "cli"
@@ -43,12 +43,12 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@apisyouwonthate/style-guide": "^1.4.0",
-    "@backstage/backend-plugin-api": "^1.7.0",
-    "@backstage/catalog-model": "^1.7.6",
-    "@backstage/cli-common": "^0.1.18",
-    "@backstage/cli-node": "^0.2.18",
-    "@backstage/config-loader": "^1.10.8",
-    "@backstage/errors": "^1.2.7",
+    "@backstage/backend-plugin-api": "1.7.1-next.0",
+    "@backstage/catalog-model": "1.7.6",
+    "@backstage/cli-common": "0.2.0-next.1",
+    "@backstage/cli-node": "0.2.19-next.1",
+    "@backstage/config-loader": "1.10.9-next.0",
+    "@backstage/errors": "1.2.7",
     "@electric-sql/pglite": "^0.3.0",
     "@manypkg/get-packages": "^1.1.3",
     "@microsoft/api-documenter": "^7.28.1",
@@ -67,7 +67,7 @@
     "chokidar": "^3.5.3",
     "codeowners-utils": "^1.0.2",
     "command-exists": "^1.2.9",
-    "commander": "^12.0.0",
+    "commander": "^14.0.3",
     "fs-extra": "^11.2.0",
     "glob": "^8.0.3",
     "globby": "^11.0.0",
@@ -78,7 +78,7 @@
     "knex-pglite": "^0.11.0",
     "knip": "^5.42.0",
     "lodash": "^4.17.21",
-    "minimatch": "^9.0.0",
+    "minimatch": "^10.2.1",
     "p-limit": "^3.0.2",
     "portfinder": "^1.0.32",
     "tar": "^7.5.6",
@@ -87,9 +87,9 @@
     "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^1.11.0",
-    "@backstage/cli": "^0.35.4",
-    "@backstage/types": "^1.2.2",
+    "@backstage/backend-test-utils": "1.11.1-next.1",
+    "@backstage/cli": "0.36.0-next.1",
+    "@backstage/types": "1.2.2",
     "@types/is-glob": "^4.0.2",
     "@types/node": "^22.13.14",
     "@types/prettier": "^2.0.0",