@backstage/cli 0.35.5-next.0 → 0.36.0-next.2

package/dist/modules/build/lib/config.cjs.js

@@ -0,0 +1,94 @@
+'use strict';
+
+var configLoader = require('@backstage/config-loader');
+var config = require('@backstage/config');
+var cliCommon = require('@backstage/cli-common');
+var getPackages = require('@manypkg/get-packages');
+var cliNode = require('@backstage/cli-node');
+var path = require('node:path');
+
+async function loadCliConfig(options) {
+  const targetDir = options.targetDir ?? cliCommon.targetPaths.dir;
+  const { packages } = await getPackages.getPackages(targetDir);
+  let localPackageNames;
+  if (options.fromPackage) {
+    if (packages.length) {
+      const graph = cliNode.PackageGraph.fromPackages(packages);
+      localPackageNames = Array.from(
+        graph.collectPackageNames([options.fromPackage], (node) => {
+          if (node.name === "@backstage/cli") {
+            return void 0;
+          }
+          return node.localDependencies.keys();
+        })
+      );
+    } else {
+      localPackageNames = [options.fromPackage];
+    }
+  } else {
+    localPackageNames = packages.map((p) => p.packageJson.name);
+  }
+  const schema = await configLoader.loadConfigSchema({
+    dependencies: localPackageNames,
+    packagePaths: [cliCommon.targetPaths.resolveRoot("package.json")]
+  });
+  const source = configLoader.ConfigSources.default({
+    allowMissingDefaultConfig: true,
+    watch: Boolean(options.watch),
+    rootDir: cliCommon.targetPaths.rootDir,
+    argv: options.args.flatMap((t) => ["--config", path.resolve(targetDir, t)])
+  });
+  const appConfigs = await new Promise((resolve, reject) => {
+    async function loadConfigReaderLoop() {
+      let loaded = false;
+      try {
+        const abortController = new AbortController();
+        for await (const { configs } of source.readConfigData({
+          signal: abortController.signal
+        })) {
+          if (loaded) {
+            const newFrontendAppConfigs = schema.process(configs, {
+              visibility: ["frontend"],
+              withFilteredKeys: options.withFilteredKeys,
+              ignoreSchemaErrors: true
+            });
+            options.watch?.(newFrontendAppConfigs);
+          } else {
+            resolve(configs);
+            loaded = true;
+            if (!options.watch) {
+              abortController.abort();
+            }
+          }
+        }
+      } catch (error) {
+        if (loaded) {
+          console.error(`Failed to reload configuration, ${error}`);
+        } else {
+          reject(error);
+        }
+      }
+    }
+    loadConfigReaderLoop();
+  });
+  const configurationLoadedMessage = appConfigs.length ? `Loaded config from ${appConfigs.map((c) => c.context).join(", ")}` : `No configuration files found, running without config`;
+  process.stderr.write(`${configurationLoadedMessage}
+`);
+  const frontendAppConfigs = schema.process(appConfigs, {
+    visibility: ["frontend"],
+    withFilteredKeys: options.withFilteredKeys,
+    ignoreSchemaErrors: true
+  });
+  const frontendConfig = config.ConfigReader.fromConfigs(frontendAppConfigs);
+  const fullConfig = config.ConfigReader.fromConfigs(appConfigs);
+  return {
+    schema,
+    appConfigs,
+    frontendConfig,
+    frontendAppConfigs,
+    fullConfig
+  };
+}
+
+exports.loadCliConfig = loadCliConfig;
+//# sourceMappingURL=config.cjs.js.map

package/dist/modules/build/lib/optionsParser.cjs.js

@@ -0,0 +1,22 @@
+'use strict';
+
+var node_util = require('node:util');
+var shellQuote = require('shell-quote');
+
+function createScriptOptionsParser(commandPath, options) {
+  const expectedScript = `backstage-cli ${commandPath.join(" ")}`;
+  return (scriptStr) => {
+    if (!scriptStr || !scriptStr.startsWith(expectedScript)) {
+      return void 0;
+    }
+    const argsStr = scriptStr.slice(expectedScript.length).trim();
+    const args = argsStr ? shellQuote.parse(argsStr).filter(
+      (e) => typeof e === "string"
+    ) : [];
+    const { values } = node_util.parseArgs({ args, strict: false, options });
+    return values;
+  };
+}
+
+exports.createScriptOptionsParser = createScriptOptionsParser;
+//# sourceMappingURL=optionsParser.cjs.js.map

package/dist/modules/build/lib/packager/createDistWorkspace.cjs.js

@@ -12,7 +12,7 @@ var packager = require('../builder/packager.cjs.js');
 var types = require('../builder/types.cjs.js');
 var productionPack = require('./productionPack.cjs.js');
 var cliNode = require('@backstage/cli-node');
-var typeDistProject = require('../../../../lib/typeDistProject.cjs.js');
+var typeDistProject = require('../typeDistProject.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 

package/dist/modules/build/lib/packager/productionPack.cjs.js

@@ -4,7 +4,7 @@ var fs = require('fs-extra');
 var npmPackList = require('npm-packlist');
 var path = require('node:path');
 var entryPoints = require('../entryPoints.cjs.js');
-var typeDistProject = require('../../../../lib/typeDistProject.cjs.js');
+var typeDistProject = require('../typeDistProject.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 

package/dist/modules/build/lib/role.cjs.js

@@ -10,7 +10,7 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function findRoleFromCommand(opts) {
   if (opts.role) {
-    return cliNode.PackageRoles.getRoleInfo(opts.role)?.role;
+    return cliNode.PackageRoles.getRoleInfo(opts.role).role;
   }
   const pkg = await fs__default.default.readJson(cliCommon.targetPaths.resolve("package.json"));
   const info = cliNode.PackageRoles.getRoleFromPackage(pkg);

package/dist/modules/config/commands/docs.cjs.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var cleye = require('cleye');
 var configLoader = require('@backstage/config-loader');
 var openBrowser = require('react-dev-utils/openBrowser');
 var chalk = require('chalk');
@@ -13,10 +14,26 @@ var openBrowser__default = /*#__PURE__*/_interopDefaultCompat(openBrowser);
 var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 
 const DOCS_URL = "https://config.backstage.io";
-var docs = async (opts) => {
+var docs = async ({ args, info }) => {
+  const {
+    flags: { package: pkg }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        package: {
+          type: String,
+          description: "Only include the schema that applies to the given package"
+        }
+      }
+    },
+    void 0,
+    args
+  );
   const { schema: appSchemas } = await config.loadCliConfig({
     args: [],
-    fromPackage: opts.package,
+    fromPackage: pkg,
     mockEnv: true
   });
   const schema = configLoader.mergeConfigSchemas(

package/dist/modules/config/commands/print.cjs.js

@@ -2,34 +2,62 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var yaml = require('yaml');
+var cleye = require('cleye');
+var YAML = require('yaml');
 var config$1 = require('@backstage/config');
 var config = require('../lib/config.cjs.js');
 
-var print = async (opts) => {
+var print = async ({ args, info }) => {
+  const {
+    flags: { config: config$1, lax, frontend, withSecrets, format, package: pkg }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        package: { type: String, description: "Package to print config for" },
+        lax: {
+          type: Boolean,
+          description: "Do not require environment variables to be set"
+        },
+        frontend: { type: Boolean, description: "Only print frontend config" },
+        withSecrets: {
+          type: Boolean,
+          description: "Include secrets in the output"
+        },
+        format: { type: String, description: "Output format (yaml or json)" },
+        config: {
+          type: [String],
+          description: "Config files to load instead of app-config.yaml"
+        }
+      }
+    },
+    void 0,
+    args
+  );
   const { schema, appConfigs } = await config.loadCliConfig({
-    args: opts.config,
-    fromPackage: opts.package,
-    mockEnv: opts.lax,
-    fullVisibility: !opts.frontend
+    args: config$1,
+    fromPackage: pkg,
+    mockEnv: lax,
+    fullVisibility: !frontend
   });
-  const visibility = getVisibilityOption(opts);
+  const visibility = getVisibilityOption(frontend, withSecrets);
   const data = serializeConfigData(appConfigs, schema, visibility);
-  if (opts.format === "json") {
+  if (format === "json") {
     process.stdout.write(`${JSON.stringify(data, null, 2)}
 `);
   } else {
-    process.stdout.write(`${yaml.stringify(data)}
+    process.stdout.write(`${YAML.stringify(data)}
 `);
   }
 };
-function getVisibilityOption(opts) {
-  if (opts.frontend && opts.withSecrets) {
+function getVisibilityOption(frontend, withSecrets) {
+  if (frontend && withSecrets) {
     throw new Error("Not allowed to combine frontend and secret config");
   }
-  if (opts.frontend) {
+  if (frontend) {
     return "frontend";
-  } else if (opts.withSecrets) {
+  } else if (withSecrets) {
     return "secret";
   }
   return "backend";

package/dist/modules/config/commands/schema.cjs.js

@@ -2,18 +2,37 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var yaml = require('yaml');
+var cleye = require('cleye');
+var YAML = require('yaml');
 var config = require('../lib/config.cjs.js');
 var configLoader = require('@backstage/config-loader');
 
-var schema = async (opts) => {
+var schema = async ({ args, info }) => {
+  const {
+    flags: { merge, format, package: pkg }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        package: { type: String, description: "Package to print schema for" },
+        format: { type: String, description: "Output format (yaml or json)" },
+        merge: {
+          type: Boolean,
+          description: "Merge all schemas into a single schema"
+        }
+      }
+    },
+    void 0,
+    args
+  );
   const { schema } = await config.loadCliConfig({
     args: [],
-    fromPackage: opts.package,
+    fromPackage: pkg,
     mockEnv: true
   });
   let configSchema;
-  if (opts.merge) {
+  if (merge) {
     configSchema = configLoader.mergeConfigSchemas(
       schema.serialize().schemas.map(
         (_) => _.value
@@ -24,11 +43,11 @@ var schema = async (opts) => {
   } else {
     configSchema = schema.serialize();
   }
-  if (opts.format === "json") {
+  if (format === "json") {
     process.stdout.write(`${JSON.stringify(configSchema, null, 2)}
 `);
   } else {
-    process.stdout.write(`${yaml.stringify(configSchema)}
+    process.stdout.write(`${YAML.stringify(configSchema)}
 `);
   }
 };

package/dist/modules/config/commands/validate.cjs.js

@@ -2,16 +2,47 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var cleye = require('cleye');
 var config = require('../lib/config.cjs.js');
 
-var validate = async (opts) => {
+var validate = async ({ args, info }) => {
+  const {
+    flags: { config: config$1, lax, frontend, deprecated, strict, package: pkg }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        package: {
+          type: String,
+          description: "Package to validate config for"
+        },
+        lax: {
+          type: Boolean,
+          description: "Do not require environment variables to be set"
+        },
+        frontend: {
+          type: Boolean,
+          description: "Only validate frontend config"
+        },
+        deprecated: { type: Boolean, description: "Output deprecated keys" },
+        strict: { type: Boolean, description: "Enable strict validation" },
+        config: {
+          type: [String],
+          description: "Config files to load instead of app-config.yaml"
+        }
+      }
+    },
+    void 0,
+    args
+  );
   await config.loadCliConfig({
-    args: opts.config,
-    fromPackage: opts.package,
-    mockEnv: opts.lax,
-    fullVisibility: !opts.frontend,
-    withDeprecatedKeys: opts.deprecated,
-    strict: opts.strict
+    args: config$1,
+    fromPackage: pkg,
+    mockEnv: lax,
+    fullVisibility: !frontend,
+    withDeprecatedKeys: deprecated,
+    strict
   });
 };
 

package/dist/modules/config/index.cjs.js

@@ -3,13 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var factory = require('../../wiring/factory.cjs.js');
-var yargs = require('yargs');
-var commander = require('commander');
-var lazy = require('../../lib/lazy.cjs.js');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
-
-var yargs__default = /*#__PURE__*/_interopDefaultCompat(yargs);
 
 const configOption = [
   "--config <path>",
@@ -23,84 +16,32 @@ var index = factory.createCliPlugin({
     reg.addCommand({
       path: ["config:docs"],
       description: "Browse the configuration reference documentation",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.option(
-          "--package <name>",
-          "Only include the schema that applies to the given package"
-        ).description("Browse the configuration reference documentation").action(lazy.lazy(() => import('./commands/docs.cjs.js'), "default"));
-        await defaultCommand.parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/docs.cjs.js') }
     });
     reg.addCommand({
       path: ["config", "docs"],
       description: "Browse the configuration reference documentation",
-      execute: async ({ args, info }) => {
-        await new commander.Command(info.usage).option(
-          "--package <name>",
-          "Only include the schema that applies to the given package"
-        ).description(info.description).action(lazy.lazy(() => import('./commands/docs.cjs.js'), "default")).parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/docs.cjs.js') }
     });
     reg.addCommand({
       path: ["config:print"],
       description: "Print the app configuration for the current package",
-      execute: async ({ args, info }) => {
-        const argv = await yargs__default.default().options({
-          package: { type: "string" },
-          lax: { type: "boolean" },
-          frontend: { type: "boolean" },
-          "with-secrets": { type: "boolean" },
-          format: { type: "string" },
-          config: { type: "string", array: true, default: [] }
-        }).usage("$0", info.description).help().parse(args);
-        await lazy.lazy(() => import('./commands/print.cjs.js'), "default")(argv);
-      }
+      execute: { loader: () => import('./commands/print.cjs.js') }
     });
     reg.addCommand({
       path: ["config:check"],
       description: "Validate that the given configuration loads and matches schema",
-      execute: async ({ args }) => {
-        const argv = await yargs__default.default().options({
-          package: { type: "string" },
-          lax: { type: "boolean" },
-          frontend: { type: "boolean" },
-          deprecated: { type: "boolean" },
-          strict: { type: "boolean" },
-          config: {
-            type: "string",
-            array: true,
-            default: []
-          }
-        }).help().parse(args);
-        await lazy.lazy(() => import('./commands/validate.cjs.js'), "default")(argv);
-      }
+      execute: { loader: () => import('./commands/validate.cjs.js') }
     });
     reg.addCommand({
       path: ["config:schema"],
       description: "Print the JSON schema for the given configuration",
-      execute: async ({ args }) => {
-        const argv = await yargs__default.default().options({
-          package: { type: "string" },
-          format: { type: "string" },
-          merge: { type: "boolean" },
-          "no-merge": { type: "boolean" }
-        }).help().parse(args);
-        await lazy.lazy(() => import('./commands/schema.cjs.js'), "default")(argv);
-      }
+      execute: { loader: () => import('./commands/schema.cjs.js') }
     });
     reg.addCommand({
       path: ["config", "schema"],
       description: "Print the JSON schema for the given configuration",
-      execute: async ({ args }) => {
-        const argv = await yargs__default.default().options({
-          package: { type: "string" },
-          format: { type: "string" },
-          merge: { type: "boolean" },
-          "no-merge": { type: "boolean" }
-        }).help().parse(args);
-        await lazy.lazy(() => import('./commands/schema.cjs.js'), "default")(argv);
-      }
+      execute: { loader: () => import('./commands/schema.cjs.js') }
     });
   }
 });

package/dist/modules/config/lib/config.cjs.js

@@ -37,43 +37,28 @@ async function loadCliConfig(options) {
   const source = configLoader.ConfigSources.default({
     allowMissingDefaultConfig: true,
     substitutionFunc: options.mockEnv ? async (name) => process.env[name] || "x" : void 0,
-    watch: Boolean(options.watch),
     rootDir: cliCommon.targetPaths.rootDir,
     argv: options.args.flatMap((t) => ["--config", path.resolve(targetDir, t)])
   });
   const appConfigs = await new Promise((resolve, reject) => {
-    async function loadConfigReaderLoop() {
+    async function readConfig() {
       let loaded = false;
       try {
         const abortController = new AbortController();
         for await (const { configs } of source.readConfigData({
           signal: abortController.signal
         })) {
-          if (loaded) {
-            const newFrontendAppConfigs = schema.process(configs, {
-              visibility: options.fullVisibility ? ["frontend", "backend", "secret"] : ["frontend"],
-              withFilteredKeys: options.withFilteredKeys,
-              withDeprecatedKeys: options.withDeprecatedKeys,
-              ignoreSchemaErrors: !options.strict
-            });
-            options.watch?.(newFrontendAppConfigs);
-          } else {
-            resolve(configs);
-            loaded = true;
-            if (!options.watch) {
-              abortController.abort();
-            }
-          }
+          resolve(configs);
+          loaded = true;
+          abortController.abort();
         }
       } catch (error) {
-        if (loaded) {
-          console.error(`Failed to reload configuration, ${error}`);
-        } else {
+        if (!loaded) {
           reject(error);
         }
       }
     }
-    loadConfigReaderLoop();
+    readConfig();
   });
   const configurationLoadedMessage = appConfigs.length ? `Loaded config from ${appConfigs.map((c) => c.context).join(", ")}` : `No configuration files found, running without config`;
   process.stderr.write(`${configurationLoadedMessage}
@@ -81,7 +66,6 @@ async function loadCliConfig(options) {
   try {
     const frontendAppConfigs = schema.process(appConfigs, {
       visibility: options.fullVisibility ? ["frontend", "backend", "secret"] : ["frontend"],
-      withFilteredKeys: options.withFilteredKeys,
       withDeprecatedKeys: options.withDeprecatedKeys,
       ignoreSchemaErrors: !options.strict
     });

package/dist/modules/create-github-app/commands/create-github-app/index.cjs.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var fs = require('fs-extra');
 var chalk = require('chalk');
-var yaml = require('yaml');
+var YAML = require('yaml');
 var inquirer = require('inquirer');
 var cliCommon = require('@backstage/cli-common');
+var cleye = require('cleye');
 var GithubCreateAppServer = require('./GithubCreateAppServer.cjs.js');
 var openBrowser = require('react-dev-utils/openBrowser');
 
@@ -17,7 +18,17 @@ var chalk__default = /*#__PURE__*/_interopDefaultCompat(chalk);
 var inquirer__default = /*#__PURE__*/_interopDefaultCompat(inquirer);
 var openBrowser__default = /*#__PURE__*/_interopDefaultCompat(openBrowser);
 
-var index = async (org) => {
+var index = async ({ args, info }) => {
+  const { _: positionals } = cleye.cli(
+    {
+      help: { ...info, usage: `${info.usage} <github-org>` },
+      booleanFlagNegation: true,
+      parameters: ["<github-org>"]
+    },
+    void 0,
+    args
+  );
+  const org = positionals[0];
   const answers = await inquirer__default.default.prompt({
     name: "appType",
     type: "checkbox",
@@ -50,7 +61,7 @@ var index = async (org) => {
   });
   const fileName = `github-app-${slug}-credentials.yaml`;
   const content = `# Name: ${name}
-${yaml.stringify(config)}`;
+${YAML.stringify(config)}`;
   await fs__default.default.writeFile(cliCommon.targetPaths.resolveRoot(fileName), content);
   console.log(`GitHub App configuration written to ${chalk__default.default.cyan(fileName)}`);
   console.log(

package/dist/modules/create-github-app/index.cjs.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var factory = require('../../wiring/factory.cjs.js');
-var commander = require('commander');
-var lazy = require('../../lib/lazy.cjs.js');
 
 var index = factory.createCliPlugin({
   pluginId: "new",
@@ -12,13 +10,7 @@ var index = factory.createCliPlugin({
     reg.addCommand({
       path: ["create-github-app"],
       description: "Create new GitHub App in your organization.",
-      execute: async ({ args }) => {
-        const command = new commander.Command();
-        const defaultCommand = command.argument("<github-org>").action(
-          lazy.lazy(() => import('./commands/create-github-app/index.cjs.js'), "default")
-        );
-        await defaultCommand.parseAsync(args, { from: "user" });
-      }
+      execute: { loader: () => import('./commands/create-github-app/index.cjs.js') }
     });
   }
 });

package/dist/modules/info/commands/info.cjs.js

@@ -2,14 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var cleye = require('cleye');
 var _package = require('../../../packages/cli/package.json.cjs.js');
 var os = require('node:os');
 var cliCommon = require('@backstage/cli-common');
-var Lockfile = require('../../../lib/versioning/Lockfile.cjs.js');
-var minimatch = require('minimatch');
-require('@manypkg/get-packages');
-require('@backstage/errors');
 var cliNode = require('@backstage/cli-node');
+var minimatch = require('minimatch');
 var fs = require('fs-extra');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -30,7 +28,29 @@ function hasBackstageField(packageName, targetPath) {
   const pkg = tryReadPackageJson(packageName, targetPath);
   return pkg?.backstage !== void 0;
 }
-var info = async (options) => {
+var info = async ({ args, info }) => {
+  const {
+    flags: { include, format }
+  } = cleye.cli(
+    {
+      help: info,
+      booleanFlagNegation: true,
+      flags: {
+        include: {
+          type: [String],
+          description: "Glob patterns for additional packages to include (e.g., @spotify/backstage*)"
+        },
+        format: {
+          type: String,
+          description: "Output format (text or json)",
+          default: "text"
+        }
+      }
+    },
+    void 0,
+    args
+  );
+  const options = { include, format };
   await new Promise(async () => {
     const yarnVersion = await cliCommon.runOutput(["yarn", "--version"]);
     const isLocal = fs__default.default.existsSync(cliCommon.findOwnPaths(__dirname).resolve("./src"));
@@ -57,7 +77,7 @@ var info = async (options) => {
       backstage: backstageVersion
     };
     const lockfilePath = cliCommon.targetPaths.resolveRoot("yarn.lock");
-    const lockfile = await Lockfile.Lockfile.load(lockfilePath);
+    const lockfile = await cliNode.Lockfile.load(lockfilePath);
     const targetPath = cliCommon.targetPaths.rootDir;
     const workspacePackages = /* @__PURE__ */ new Map();
     try {