oclif 4.17.19 → 4.17.21

package/bin/dev.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env ts-node
-// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
+
+// eslint-disable-next-line unicorn/prefer-top-level-await
 ;(async () => {
   const oclif = await import('@oclif/core')
   await oclif.execute({development: true, dir: __dirname})

package/lib/commands/generate.js

@@ -180,6 +180,21 @@ Head to oclif.io/docs/introduction to learn more about building CLIs with oclif.
         debug(`${moduleType} files %O`, moduleSpecificFiles);
         await Promise.all([...sharedFiles, ...moduleSpecificFiles].map(async (file) => {
             switch (file.name) {
+                case '.gitignore.ejs': {
+                    await this.template(file.src, file.destination, { packageManager });
+                    break;
+                }
+                case 'onPushToMain.yml.ejs':
+                case 'onRelease.yml.ejs':
+                case 'test.yml.ejs': {
+                    await this.template(file.src, file.destination, {
+                        exec: packageManager === 'yarn' ? packageManager : `${packageManager} exec`,
+                        install: packageManager === 'yarn' ? packageManager : `${packageManager} install`,
+                        packageManager,
+                        run: packageManager === 'yarn' ? packageManager : `${packageManager} run`,
+                    });
+                    break;
+                }
                 case 'package.json.ejs': {
                     const data = {
                         author,
@@ -195,25 +210,10 @@ Head to oclif.io/docs/introduction to learn more about building CLIs with oclif.
                     await this.template(file.src, file.destination, data);
                     break;
                 }
-                case '.gitignore.ejs': {
-                    await this.template(file.src, file.destination, { packageManager });
-                    break;
-                }
                 case 'README.md.ejs': {
                     await this.template(file.src, file.destination, { description, name, repository });
                     break;
                 }
-                case 'onPushToMain.yml.ejs':
-                case 'onRelease.yml.ejs':
-                case 'test.yml.ejs': {
-                    await this.template(file.src, file.destination, {
-                        exec: packageManager === 'yarn' ? packageManager : `${packageManager} exec`,
-                        install: packageManager === 'yarn' ? packageManager : `${packageManager} install`,
-                        packageManager,
-                        run: packageManager === 'yarn' ? packageManager : `${packageManager} run`,
-                    });
-                    break;
-                }
                 default: {
                     await this.template(file.src, file.destination);
                 }

package/lib/commands/manifest.d.ts

@@ -8,7 +8,6 @@ export default class Manifest extends Command {
         jit: Interfaces.BooleanFlag<boolean>;
     };
     run(): Promise<Interfaces.Manifest>;
+    private downloadTarball;
     private executeCommand;
-    private getTarballUrl;
-    private getVersion;
 }

package/lib/commands/manifest.js

@@ -32,16 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs_extra_1 = require("fs-extra");
 const node_child_process_1 = require("node:child_process");
 const os = __importStar(require("node:os"));
-const path = __importStar(require("node:path"));
-const node_stream_1 = require("node:stream");
-const node_util_1 = require("node:util");
-const semver_1 = require("semver");
-const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
+const node_path_1 = __importDefault(require("node:path"));
 async function fileExists(filePath) {
     try {
         await (0, fs_extra_1.access)(filePath);
@@ -70,25 +69,21 @@ class Manifest extends core_1.Command {
         }
         catch { }
         const { args } = await this.parse(Manifest);
-        const root = path.resolve(args.path);
-        const packageJson = (0, fs_extra_1.readJSONSync)('package.json');
+        const root = node_path_1.default.resolve(args.path);
+        const packageJson = (0, fs_extra_1.readJSONSync)(node_path_1.default.join(root, 'package.json'));
         let jitPluginManifests = [];
         if (flags.jit && packageJson.oclif?.jitPlugins) {
             this.debug('jitPlugins: %s', packageJson.oclif.jitPlugins);
             const tmpDir = os.tmpdir();
-            const { default: got } = await import('got');
             const promises = Object.entries(packageJson.oclif.jitPlugins).map(async ([jitPlugin, version]) => {
                 const pluginDir = jitPlugin.replace('/', '-').replace('@', '');
-                const fullPath = path.join(tmpDir, pluginDir);
+                const fullPath = node_path_1.default.join(tmpDir, pluginDir);
                 if (await fileExists(fullPath))
                     await (0, fs_extra_1.remove)(fullPath);
                 await (0, fs_extra_1.mkdir)(fullPath, { recursive: true });
-                const resolvedVersion = await this.getVersion(jitPlugin, version);
-                const tarballUrl = await this.getTarballUrl(jitPlugin, resolvedVersion);
-                const tarball = path.join(fullPath, path.basename(tarballUrl));
-                await pipeline(got.stream(tarballUrl), (0, fs_extra_1.createWriteStream)(tarball));
+                const tarball = await this.downloadTarball(jitPlugin, version, fullPath);
                 await this.executeCommand(`tar -xzf "${tarball}"`, { cwd: fullPath });
-                const manifest = (await (0, fs_extra_1.readJSON)(path.join(fullPath, 'package', 'oclif.manifest.json')));
+                const manifest = (await (0, fs_extra_1.readJSON)(node_path_1.default.join(fullPath, 'package', 'oclif.manifest.json')));
                 for (const command of Object.values(manifest.commands)) {
                     command.pluginType = 'jit';
                 }
@@ -123,7 +118,7 @@ class Manifest extends core_1.Command {
             });
         }
         const dotfile = plugin.pjson.files.find((f) => f.endsWith('.oclif.manifest.json'));
-        const file = path.join(plugin.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
+        const file = node_path_1.default.join(plugin.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
         for (const manifest of jitPluginManifests) {
             plugin.manifest.commands = { ...plugin.manifest.commands, ...manifest.commands };
         }
@@ -131,6 +126,17 @@ class Manifest extends core_1.Command {
         this.log(`wrote manifest to ${file}`);
         return plugin.manifest;
     }
+    async downloadTarball(plugin, version, tarballStoragePath) {
+        const { stderr } = await this.executeCommand(`npm pack ${plugin}@${version} --pack-destination "${tarballStoragePath}" --json`);
+        // You can `npm pack` with multiple modules to download multiple at a time. There will be at least 1 if the command
+        // succeeded.
+        const tarballs = JSON.parse(stderr);
+        if (!Array.isArray(tarballs) || tarballs.length !== 1) {
+            throw new Error(`Could not download tarballs for ${plugin}. Tarball download was not in the correct format.`);
+        }
+        const { filename } = tarballs[0];
+        return node_path_1.default.join(tarballStoragePath, filename);
+    }
     async executeCommand(command, options) {
         return new Promise((resolve) => {
             (0, node_child_process_1.exec)(command, options, (error, stderr, stdout) => {
@@ -146,24 +152,5 @@ class Manifest extends core_1.Command {
             });
         });
     }
-    async getTarballUrl(plugin, version) {
-        const { stderr } = await this.executeCommand(`npm view ${plugin}@${version} --json`);
-        const { dist } = JSON.parse(stderr);
-        return dist.tarball;
-    }
-    async getVersion(plugin, version) {
-        if (version.startsWith('^') || version.startsWith('~')) {
-            // Grab latest from npm to get all the versions so we can find the max satisfying version.
-            // We explicitly ask for latest since this command is typically run inside of `npm prepack`,
-            // which sets the npm_config_tag env var, which is used as the default anytime a tag isn't
-            // provided to `npm view`. This can be problematic if you're building the `nightly` version
-            // of a CLI and all the JIT plugins don't have a `nightly` tag themselves.
-            // TL;DR - always ask for latest to avoid potentially requesting a non-existent tag.
-            const { stderr } = await this.executeCommand(`npm view ${plugin}@latest --json`);
-            const { versions } = JSON.parse(stderr);
-            return (0, semver_1.maxSatisfying)(versions, version) ?? version.replace('^', '').replace('~', '');
-        }
-        return version;
-    }
 }
 exports.default = Manifest;

package/lib/commands/pack/deb.js

@@ -32,12 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("fs-extra"));
 const node_child_process_1 = require("node:child_process");
 const fsPromises = __importStar(require("node:fs/promises"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const Tarballs = __importStar(require("../../tarballs"));
 const upload_util_1 = require("../../upload-util");
@@ -123,29 +126,29 @@ class PackDeb extends core_1.Command {
                 bin: config.bin,
                 versionShaRevision: (0, upload_util_1.debVersion)(buildConfig),
             });
-            const workspace = path.join(buildConfig.tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
+            const workspace = node_path_1.default.join(buildConfig.tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
             await fs.remove(workspace);
             await Promise.all([
-                fsPromises.mkdir(path.join(workspace, 'DEBIAN'), { recursive: true }),
-                fsPromises.mkdir(path.join(workspace, 'usr', 'bin'), { recursive: true }),
+                fsPromises.mkdir(node_path_1.default.join(workspace, 'DEBIAN'), { recursive: true }),
+                fsPromises.mkdir(node_path_1.default.join(workspace, 'usr', 'bin'), { recursive: true }),
             ]);
-            await fs.copy(buildConfig.workspace(target), path.join(workspace, 'usr', 'lib', config.dirname));
+            await fs.copy(buildConfig.workspace(target), node_path_1.default.join(workspace, 'usr', 'lib', config.dirname));
             await Promise.all([
                 // usr/lib/oclif/bin/oclif (the executable)
-                fsPromises.writeFile(path.join(workspace, 'usr', 'lib', config.dirname, 'bin', config.bin), scripts.bin(config), { mode: 0o755 }),
-                fsPromises.writeFile(path.join(workspace, 'DEBIAN', 'control'), scripts.control(buildConfig, (0, upload_util_1.debArch)(arch))),
+                fsPromises.writeFile(node_path_1.default.join(workspace, 'usr', 'lib', config.dirname, 'bin', config.bin), scripts.bin(config), { mode: 0o755 }),
+                fsPromises.writeFile(node_path_1.default.join(workspace, 'DEBIAN', 'control'), scripts.control(buildConfig, (0, upload_util_1.debArch)(arch))),
             ]);
             // symlink usr/bin/oclif points to usr/lib/oclif/bin/oclif
-            await exec(`ln -s "${path.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${config.bin}"`, {
-                cwd: path.join(workspace, 'usr', 'bin'),
+            await exec(`ln -s "${node_path_1.default.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${config.bin}"`, {
+                cwd: node_path_1.default.join(workspace, 'usr', 'bin'),
             });
-            config.binAliases?.map((alias) => exec(`ln -sf "${path.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${alias}"`, {
-                cwd: path.join(workspace, 'usr', 'bin'),
+            config.binAliases?.map((alias) => exec(`ln -sf "${node_path_1.default.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${alias}"`, {
+                cwd: node_path_1.default.join(workspace, 'usr', 'bin'),
             }));
             await exec(`sudo chown -R root "${workspace}"`);
             await exec(`sudo chgrp -R root "${workspace}"`);
             const dpkgDeb = flags.compression ? `dpkg-deb --build "-Z${flags.compression}"` : 'dpkg-deb --build';
-            await exec(`${dpkgDeb} "${workspace}" "${path.join(dist, versionedDebBase)}"`);
+            await exec(`${dpkgDeb} "${workspace}" "${node_path_1.default.join(dist, versionedDebBase)}"`);
             this.log(`finished building debian / ${arch}`);
         };
         const arches = (0, util_1.uniq)(buildConfig.targets.filter((t) => t.platform === 'linux').map((t) => t.arch));
@@ -170,8 +173,8 @@ class PackDeb extends core_1.Command {
 }
 exports.default = PackDeb;
 async function packForFTP(buildConfig, config, dist) {
-    const ftparchive = path.join(buildConfig.tmp, 'apt', 'apt-ftparchive.conf');
-    await fsPromises.mkdir(path.basename(ftparchive), { recursive: true });
+    const ftparchive = node_path_1.default.join(buildConfig.tmp, 'apt', 'apt-ftparchive.conf');
+    await fsPromises.mkdir(node_path_1.default.basename(ftparchive), { recursive: true });
     await fs.writeFile(ftparchive, scripts.ftparchive(config));
     await exec(`apt-ftparchive -c "${ftparchive}" release . > Release`, { cwd: dist });
 }

package/lib/commands/pack/macos.js

@@ -32,12 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("fs-extra"));
 const node_child_process_1 = require("node:child_process");
 const os = __importStar(require("node:os"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const Tarballs = __importStar(require("../../tarballs"));
 const upload_util_1 = require("../../upload-util");
@@ -205,9 +208,9 @@ the CLI should already exist in a directory named after the CLI that is the root
             pruneLockfiles: flags['prune-lockfiles'],
             tarball: flags.tarball,
         });
-        const scriptsDir = path.join(buildConfig.tmp, 'macos/scripts');
+        const scriptsDir = node_path_1.default.join(buildConfig.tmp, 'macos/scripts');
         await fs.emptyDir(buildConfig.dist('macos'));
-        const noBundleConfigurationPath = path.join(buildConfig.tmp, 'macos', 'no-bundle.plist');
+        const noBundleConfigurationPath = node_path_1.default.join(buildConfig.tmp, 'macos', 'no-bundle.plist');
         const build = async (arch) => {
             const templateKey = (0, upload_util_1.templateShortKey)('macos', {
                 arch,
@@ -218,14 +221,14 @@ the CLI should already exist in a directory named after the CLI that is the root
             const dist = buildConfig.dist(`macos/${templateKey}`);
             const rootDir = buildConfig.workspace({ arch, platform: 'darwin' });
             const writeNoBundleConfiguration = async () => {
-                await fs.mkdir(path.dirname(noBundleConfigurationPath), { recursive: true });
+                await fs.mkdir(node_path_1.default.dirname(noBundleConfigurationPath), { recursive: true });
                 await fs.writeFile(noBundleConfigurationPath, noBundleConfiguration, { mode: 0o755 });
             };
             const writeScript = async (script) => {
                 const scriptLocation = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
                 scriptLocation.push(script);
-                await fs.mkdir(path.dirname(path.join(...scriptLocation)), { recursive: true });
-                await fs.writeFile(path.join(...scriptLocation), scripts[script](config, flags['additional-cli']), {
+                await fs.mkdir(node_path_1.default.dirname(node_path_1.default.join(...scriptLocation)), { recursive: true });
+                await fs.writeFile(node_path_1.default.join(...scriptLocation), scripts[script](config, flags['additional-cli']), {
                     mode: 0o755,
                 });
             };

package/lib/commands/pack/win.js

@@ -32,13 +32,16 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs_extra_1 = require("fs-extra");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const Tarballs = __importStar(require("../../tarballs"));
 const upload_util_1 = require("../../upload-util");
@@ -52,7 +55,7 @@ set ${additionalCLI ? `${additionalCLI.toUpperCase()}_BINPATH` : config.scopedEn
 if exist "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalCLI ?? config.bin}.cmd" (
   "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalCLI ?? config.bin}.cmd" %*
 ) else (
-  "%~dp0\\..\\client\\bin\\node.exe" ${`${nodeOptions?.join(' ')} `}"%~dp0\\..\\client\\${additionalCLI ? `${additionalCLI}\\bin\\run` : 'bin\\run'}" %*
+  "%~dp0\\..\\client\\bin\\node.exe" ${`${nodeOptions?.join(' ')} `}"%~dp0\\..\\client\\${additionalCLI ? `${additionalCLI}\\bin\\run` : String.raw `bin\run`}" %*
 )
 `,
     nsis: ({ arch, config, customization, defenderOptional, hideDefenderOption, }) => `!include MUI2.nsh
@@ -285,13 +288,13 @@ the CLI should already exist in a directory named after the CLI that is the root
             tarball: flags.tarball,
         });
         await Promise.all(arches.map(async (arch) => {
-            const installerBase = path.join(buildConfig.tmp, `windows-${arch}-installer`);
+            const installerBase = node_path_1.default.join(buildConfig.tmp, `windows-${arch}-installer`);
             await (0, promises_1.rm)(installerBase, { force: true, recursive: true });
-            await (0, promises_1.mkdir)(path.join(installerBase, 'bin'), { recursive: true });
+            await (0, promises_1.mkdir)(node_path_1.default.join(installerBase, 'bin'), { recursive: true });
             await Promise.all([
-                (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${config.bin}.cmd`), scripts.cmd(config, undefined, buildConfig.nodeOptions)),
-                (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${config.bin}`), scripts.sh(config)),
-                (0, promises_1.writeFile)(path.join(installerBase, `${config.bin}.nsi`), scripts.nsis({
+                (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${config.bin}.cmd`), scripts.cmd(config, undefined, buildConfig.nodeOptions)),
+                (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${config.bin}`), scripts.sh(config)),
+                (0, promises_1.writeFile)(node_path_1.default.join(installerBase, `${config.bin}.nsi`), scripts.nsis({
                     arch,
                     config,
                     customization: nsisCustomization,
@@ -304,18 +307,18 @@ the CLI should already exist in a directory named after the CLI that is the root
                     // write duplicate files for windows aliases
                     // this avoids mklink which can require admin privileges which not everyone has
                     [
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${alias}.cmd`), scripts.cmd(config)),
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${alias}`), scripts.sh(config)),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${alias}.cmd`), scripts.cmd(config)),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${alias}`), scripts.sh(config)),
                     ])
                     : []),
                 ...(flags['additional-cli']
                     ? [
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${flags['additional-cli']}.cmd`), scripts.cmd(config, flags['additional-cli'])),
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${flags['additional-cli']}`), scripts.sh({ bin: flags['additional-cli'] })),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${flags['additional-cli']}.cmd`), scripts.cmd(config, flags['additional-cli'])),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${flags['additional-cli']}`), scripts.sh({ bin: flags['additional-cli'] })),
                     ]
                     : []),
             ]);
-            await (0, fs_extra_1.move)(buildConfig.workspace({ arch, platform: 'win32' }), path.join(installerBase, 'client'));
+            await (0, fs_extra_1.move)(buildConfig.workspace({ arch, platform: 'win32' }), node_path_1.default.join(installerBase, 'client'));
             await exec(`makensis "${installerBase}/${config.bin}.nsi" | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
             const templateKey = (0, upload_util_1.templateShortKey)('win32', {
                 arch,
@@ -324,7 +327,7 @@ the CLI should already exist in a directory named after the CLI that is the root
                 version: config.version,
             });
             const o = buildConfig.dist(`win32/${templateKey}`);
-            await (0, fs_extra_1.move)(path.join(installerBase, 'installer.exe'), o);
+            await (0, fs_extra_1.move)(node_path_1.default.join(installerBase, 'installer.exe'), o);
             const { windows } = config.pjson.oclif;
             if (windows && windows.name && windows.keypath) {
                 await signWindows(o, arch, config, windows);

package/lib/commands/promote.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_s3_1 = require("@aws-sdk/client-s3");
 const core_1 = require("@oclif/core");
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const aws_1 = __importDefault(require("../aws"));
 const Tarballs = __importStar(require("../tarballs"));
 const upload_util_1 = require("../upload-util");
@@ -86,8 +86,8 @@ class Promote extends core_1.Command {
             CacheControl: indexDefaults.maxAge,
             MetadataDirective: client_s3_1.MetadataDirective.REPLACE,
         };
-        const cloudBucketCommitKey = (shortKey) => path.join(s3Config.bucket, (0, upload_util_1.commitAWSDir)(flags.version, flags.sha, s3Config), shortKey);
-        const cloudChannelKey = (shortKey) => path.join((0, upload_util_1.channelAWSDir)(flags.channel, s3Config), shortKey);
+        const cloudBucketCommitKey = (shortKey) => node_path_1.default.join(s3Config.bucket, (0, upload_util_1.commitAWSDir)(flags.version, flags.sha, s3Config), shortKey);
+        const cloudChannelKey = (shortKey) => node_path_1.default.join((0, upload_util_1.channelAWSDir)(flags.channel, s3Config), shortKey);
         // copy tarballs manifests
         const promoteManifest = async (target) => {
             const manifest = (0, upload_util_1.templateShortKey)('manifest', {

package/lib/commands/readme.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("fs-extra"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const readme_generator_1 = __importDefault(require("../readme-generator"));
 class Readme extends core_1.Command {
     static description = `The readme must have any of the following tags inside of it for it to be replaced or else it will do nothing:
@@ -98,8 +98,8 @@ Customize the code URL prefix by setting oclif.repositoryPrefix in package.json.
         const { flags } = await this.parse(Readme);
         this.flags = flags;
         this.flags['plugin-directory'] ??= process.cwd();
-        const readmePath = path.resolve(this.flags['plugin-directory'], flags['readme-path']);
-        const tsConfigPath = path.resolve(this.flags['plugin-directory'], flags['tsconfig-path']);
+        const readmePath = node_path_1.default.resolve(this.flags['plugin-directory'], flags['readme-path']);
+        const tsConfigPath = node_path_1.default.resolve(this.flags['plugin-directory'], flags['tsconfig-path']);
         if (await fs.pathExists(tsConfigPath)) {
             const { default: JSONC } = await import('tiny-jsonc');
             const tsConfigRaw = await fs.readFile(tsConfigPath, 'utf8');

package/lib/commands/upload/deb.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const aws_1 = __importDefault(require("../../aws"));
 const log_1 = require("../../log");
 const Tarballs = __importStar(require("../../tarballs"));
@@ -53,7 +53,7 @@ class UploadDeb extends core_1.Command {
         const { flags } = await this.parse(UploadDeb);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { config, s3Config } = buildConfig;
-        const dist = (f) => buildConfig.dist(path.join('deb', f));
+        const dist = (f) => buildConfig.dist(node_path_1.default.join('deb', f));
         const S3Options = {
             ACL: s3Config.acl || 'public-read',
             Bucket: s3Config.bucket,

package/lib/generator.d.ts

@@ -27,15 +27,15 @@ export type GetFlagOrPromptOptions = {
      */
     type: 'input' | 'select';
 };
-export declare function exec(command: string, opts?: {
+export declare function exec(command: string, opts?: ExecOptions & {
     silent?: boolean;
-} & ExecOptions): Promise<{
+}): Promise<{
     stderr: string;
     stdout: string;
 }>;
-export declare function readPJSON(location: string): Promise<({
+export declare function readPJSON(location: string): Promise<(Interfaces.PJSON & {
     scripts: Record<string, string>;
-} & Interfaces.PJSON) | undefined>;
+}) | undefined>;
 export declare function makeFlags<T extends Record<string, FlaggablePrompt>>(flaggablePrompts: T): FlagsOfPrompts<T>;
 export declare abstract class GeneratorCommand<T extends typeof Command> extends Command {
     protected args: Args<T>;

package/lib/generator.js

@@ -99,28 +99,28 @@ class GeneratorCommand extends core_1.Command {
             }
         };
         switch (type) {
-            case 'select': {
+            case 'input': {
                 return (maybeFlag() ??
                     (await checkMaybeOtherValue()) ??
                     maybeDefault() ??
-                    // Dynamic import because @inquirer/select is ESM only. Once oclif is ESM, we can make this a normal import
+                    // Dynamic import because @inquirer/input is ESM only. Once oclif is ESM, we can make this a normal import
                     // so that we can avoid importing on every single question.
-                    (await import('@inquirer/select')).default({
-                        choices: (this.flaggablePrompts[name].options ?? []).map((o) => ({ name: o, value: o })),
+                    (await import('@inquirer/input')).default({
                         default: defaultValue,
                         message: this.flaggablePrompts[name].message,
+                        validate: this.flaggablePrompts[name].validate,
                     }));
             }
-            case 'input': {
+            case 'select': {
                 return (maybeFlag() ??
                     (await checkMaybeOtherValue()) ??
                     maybeDefault() ??
-                    // Dynamic import because @inquirer/input is ESM only. Once oclif is ESM, we can make this a normal import
+                    // Dynamic import because @inquirer/select is ESM only. Once oclif is ESM, we can make this a normal import
                     // so that we can avoid importing on every single question.
-                    (await import('@inquirer/input')).default({
+                    (await import('@inquirer/select')).default({
+                        choices: (this.flaggablePrompts[name].options ?? []).map((o) => ({ name: o, value: o })),
                         default: defaultValue,
                         message: this.flaggablePrompts[name].message,
-                        validate: this.flaggablePrompts[name].validate,
                     }));
             }
             default: {

package/lib/log.js

@@ -1,46 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.debug = void 0;
 exports.log = log;
 const core_1 = require("@oclif/core");
-const util = __importStar(require("node:util"));
+const node_util_1 = require("node:util");
 const util_1 = require("./util");
 exports.debug = require('debug')('oclif');
 exports.debug.new = (name) => require('debug')(`oclif:${name}`);
 function log(format, ...args) {
     args = args.map((arg) => (0, util_1.prettifyPaths)(arg));
-    exports.debug.enabled ? (0, exports.debug)(format, ...args) : core_1.ux.stdout(`oclif: ${util.format(format, ...args)}`);
+    return exports.debug.enabled ? (0, exports.debug)(format, ...args) : core_1.ux.stdout(`oclif: ${(0, node_util_1.format)(format, ...args)}`);
 }

package/lib/readme-generator.js

@@ -227,6 +227,7 @@ USAGE
     /**
      * fetches the path to a command
      */
+    // eslint-disable-next-line complexity
     commandPath(plugin, c) {
         const strategy = typeof plugin.pjson.oclif?.commands === 'string' ? 'pattern' : plugin.pjson.oclif?.commands?.strategy;
         // if the strategy is explicit, we can't determine the path so return undefined

package/lib/tarballs/bin.js

@@ -32,11 +32,14 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeBinScripts = writeBinScripts;
 const node_child_process_1 = require("node:child_process");
 const fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 async function writeBinScripts({ baseWorkspace, config, nodeOptions, nodeVersion, }) {
@@ -44,7 +47,7 @@ async function writeBinScripts({ baseWorkspace, config, nodeOptions, nodeVersion
     const redirectedEnvVar = config.scopedEnvVarKey('REDIRECTED');
     const clientHomeEnvVar = config.scopedEnvVarKey('OCLIF_CLIENT_HOME');
     const writeWin32 = async (bin) => {
-        await fs.promises.writeFile(path.join(baseWorkspace, 'bin', `${bin}.cmd`), `@echo off
+        await fs.promises.writeFile(node_path_1.default.join(baseWorkspace, 'bin', `${bin}.cmd`), `@echo off
 setlocal enableextensions
 
 if not "%${redirectedEnvVar}%"=="1" if exist "%LOCALAPPDATA%\\${bin}\\client\\bin\\${bin}.cmd" (
@@ -65,7 +68,7 @@ if exist "%~dp0..\\bin\\node.exe" (
 `);
     };
     const writeUnix = async () => {
-        const bin = path.join(baseWorkspace, 'bin', config.bin);
+        const bin = node_path_1.default.join(baseWorkspace, 'bin', config.bin);
         await fs.promises.writeFile(bin, `#!/usr/bin/env bash
 set -e
 echoerr() { echo "$@" 1>&2; }
@@ -118,6 +121,6 @@ fi
         writeUnix(),
         ...(config.binAliases?.map((alias) => process.platform === 'win32'
             ? writeWin32(alias)
-            : exec(`ln -sf ${config.bin} ${alias}`, { cwd: path.join(baseWorkspace, 'bin') })) ?? []),
+            : exec(`ln -sf ${config.bin} ${alias}`, { cwd: node_path_1.default.join(baseWorkspace, 'bin') })) ?? []),
     ]);
 }