oclif 2.0.0 → 2.0.1

package/bin/run

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
 
-require('..').run()
-.catch(require('@oclif/errors/handle'))
+const oclif = require('@oclif/core')
+
+oclif.settings.disableJsonFlag = true
+
+oclif.run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'))

package/lib/aws.d.ts

@@ -11,13 +11,13 @@ export declare namespace upload {
 }
 declare const _default: {
     readonly cloudfront: {
-        createCloudfrontInvalidation: (options: CloudFront.CreateInvalidationRequest) => Promise<unknown>;
+        createCloudfrontInvalidation: (options: CloudFront.Types.CreateInvalidationRequest) => Promise<unknown>;
     };
     readonly s3: {
-        uploadFile: (local: string, options: S3.PutObjectRequest) => Promise<unknown>;
-        headObject: (options: S3.HeadObjectRequest) => Promise<S3.HeadObjectOutput>;
-        copyObject: (options: S3.CopyObjectRequest) => Promise<unknown>;
-        getObject: (options: S3.GetObjectRequest) => Promise<S3.GetObjectOutput>;
+        uploadFile: (local: string, options: S3.Types.PutObjectRequest) => Promise<unknown>;
+        headObject: (options: S3.Types.HeadObjectRequest) => Promise<S3.HeadObjectOutput>;
+        copyObject: (options: S3.Types.CopyObjectRequest) => Promise<unknown>;
+        getObject: (options: S3.Types.GetObjectRequest) => Promise<S3.GetObjectOutput>;
     };
 };
 export default _default;

package/lib/aws.js

@@ -35,29 +35,31 @@ const aws = {
     },
 };
 exports.default = {
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     get cloudfront() {
         return {
             createCloudfrontInvalidation: (options) => new Promise((resolve, reject) => {
-                log_1.log('createCloudfrontInvalidation', options.DistributionId, options.InvalidationBatch.Paths.Items);
+                (0, log_1.log)('createCloudfrontInvalidation', options.DistributionId, options.InvalidationBatch.Paths.Items);
                 aws.cloudfront.createInvalidation(options, err => {
                     if (err)
                         reject(err);
                     else
-                        resolve();
+                        resolve(null);
                 });
             }),
         };
     },
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     get s3() {
         return {
             uploadFile: (local, options) => new Promise((resolve, reject) => {
-                log_1.log('s3:uploadFile', qq.prettifyPaths(local), `s3://${options.Bucket}/${options.Key}`);
+                (0, log_1.log)('s3:uploadFile', qq.prettifyPaths(local), `s3://${options.Bucket}/${options.Key}`);
                 options.Body = fs.createReadStream(local);
                 aws.s3.upload(options, err => {
                     if (err)
                         reject(err);
                     else
-                        resolve();
+                        resolve(null);
                 });
             }),
             headObject: (options) => new Promise((resolve, reject) => {
@@ -70,7 +72,7 @@ exports.default = {
                 });
             }),
             copyObject: (options) => new Promise((resolve, reject) => {
-                log_1.log('s3:copyObject', `from s3://${options.CopySource}`, `to s3://${options.Bucket}/${options.Key}`);
+                (0, log_1.log)('s3:copyObject', `from s3://${options.CopySource}`, `to s3://${options.Bucket}/${options.Key}`);
                 aws.s3.copyObject(options, function (err, data) {
                     if (err)
                         reject(err);

package/lib/command-base.d.ts

@@ -1,4 +1,4 @@
-import Command from '@oclif/command';
+import { Command } from '@oclif/core';
 export default abstract class CommandBase extends Command {
-    protected generate(type: string, generatorOptions?: {}): Promise<void>;
+    protected generate(type: string, generatorOptions?: Record<string, unknown>): Promise<void>;
 }

package/lib/command-base.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
+const core_1 = require("@oclif/core");
 const yeoman_environment_1 = require("yeoman-environment");
-class CommandBase extends command_1.default {
+class CommandBase extends core_1.Command {
     async generate(type, generatorOptions = {}) {
-        const env = yeoman_environment_1.createEnv();
+        const env = (0, yeoman_environment_1.createEnv)();
         env.register(require.resolve(`./generators/${type}`), `oclif:${type}`);
         await new Promise((resolve, reject) => {
             env.run(`oclif:${type}`, generatorOptions, ((err, results) => {

package/lib/commands/generate.d.ts

@@ -0,0 +1,11 @@
+import CommandBase from './../command-base';
+export default class Generate extends CommandBase {
+    static description: string;
+    static flags: {};
+    static args: {
+        name: string;
+        required: boolean;
+        description: string;
+    }[];
+    run(): Promise<void>;
+}

package/lib/commands/generate.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_base_1 = require("./../command-base");
+class Generate extends command_base_1.default {
+    async run() {
+        const { args } = await this.parse(Generate);
+        await super.generate('cli', {
+            name: args.name,
+            force: true,
+        });
+    }
+}
+exports.default = Generate;
+Generate.description = `generate a new CLI
+This will clone the template repo 'oclif/hello-world' and update package properties`;
+Generate.flags = {};
+Generate.args = [
+    { name: 'name', required: true, description: 'directory name of new project' },
+];

package/lib/commands/manifest.d.ts

@@ -1,6 +1,5 @@
-import { Command } from '@oclif/command';
+import { Command } from '@oclif/core';
 export default class Manifest extends Command {
-    static hidden: boolean;
     static description: string;
     static args: {
         name: string;

package/lib/commands/manifest.js

@@ -1,25 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
-const Config = require("@oclif/config");
+const core_1 = require("@oclif/core");
 const fs = require("fs-extra");
 const path = require("path");
-class Manifest extends command_1.Command {
+class Manifest extends core_1.Command {
     async run() {
         try {
             fs.unlinkSync('oclif.manifest.json');
         }
         catch (_a) { }
-        const { args } = this.parse(Manifest);
+        const { args } = await this.parse(Manifest);
         const root = path.resolve(args.path);
-        let plugin = new Config.Plugin({ root, type: 'core', ignoreManifest: true, errorOnManifestCreate: true });
+        let plugin = new core_1.Plugin({ root, type: 'core', ignoreManifest: true, errorOnManifestCreate: true });
         if (!plugin)
             throw new Error('plugin not found');
         await plugin.load();
         if (!plugin.valid) {
             const p = require.resolve('@oclif/plugin-legacy', { paths: [process.cwd()] });
             const { PluginLegacy } = require(p);
-            delete plugin.name;
             plugin = new PluginLegacy(this.config, plugin);
             await plugin.load();
         }
@@ -33,7 +31,6 @@ class Manifest extends command_1.Command {
     }
 }
 exports.default = Manifest;
-Manifest.hidden = true;
 Manifest.description = 'generates plugin manifest json';
 Manifest.args = [
     { name: 'path', description: 'path to plugin', default: '.' },

package/lib/commands/pack/deb.d.ts

@@ -1,9 +1,9 @@
-import { Command, flags } from '@oclif/command';
+import { Command } from '@oclif/core';
+import { Interfaces } from '@oclif/core';
 export default class PackDeb extends Command {
-    static hidden: boolean;
     static description: string;
     static flags: {
-        root: flags.IOptionFlag<string>;
+        root: Interfaces.OptionFlag<string>;
     };
     run(): Promise<void>;
 }

package/lib/commands/pack/deb.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
+const core_1 = require("@oclif/core");
 const _ = require("lodash");
 const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
@@ -28,7 +28,7 @@ export ${config.scopedEnvVarKey('UPDATE_INSTRUCTIONS')}="update with \\"sudo apt
 `,
     /* eslint-enable no-useless-escape */
     control: (config, arch) => `Package: ${config.config.bin}
-Version: ${upload_util_1.debVersion(config)}
+Version: ${(0, upload_util_1.debVersion)(config)}
 Section: main
 Priority: standard
 Architecture: ${arch}
@@ -41,34 +41,34 @@ APT::FTPArchive::Release {
   Suite  "stable";
 `,
 };
-class PackDeb extends command_1.Command {
+class PackDeb extends core_1.Command {
     async run() {
         if (process.platform !== 'linux')
             throw new Error('debian packing must be run on linux');
-        const { flags } = this.parse(PackDeb);
+        const { flags } = await this.parse(PackDeb);
         const buildConfig = await Tarballs.buildConfig(flags.root);
-        const { config, tmp, targets } = buildConfig;
+        const { config } = buildConfig;
         await Tarballs.build(buildConfig, { platform: 'linux', pack: false });
         const dist = buildConfig.dist('deb');
         await qq.emptyDir(dist);
         const build = async (arch) => {
             const target = { platform: 'linux', arch };
-            const versionedDebBase = upload_util_1.templateShortKey('deb', { bin: config.bin, versionShaRevision: upload_util_1.debVersion(buildConfig), arch: upload_util_1.debArch(arch) });
-            const workspace = qq.join(tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
+            const versionedDebBase = (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: (0, upload_util_1.debArch)(arch) });
+            const workspace = qq.join(buildConfig.tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
             await qq.rm(workspace);
             await qq.mkdirp([workspace, 'DEBIAN']);
             await qq.mkdirp([workspace, 'usr/bin']);
             await qq.mkdirp([workspace, 'usr/lib']);
             await qq.mv(buildConfig.workspace(target), [workspace, 'usr/lib', config.dirname]);
             await qq.write([workspace, 'usr/lib', config.dirname, 'bin', config.bin], scripts.bin(config));
-            await qq.write([workspace, 'DEBIAN/control'], scripts.control(buildConfig, upload_util_1.debArch(arch)));
+            await qq.write([workspace, 'DEBIAN/control'], scripts.control(buildConfig, (0, upload_util_1.debArch)(arch)));
             await qq.chmod([workspace, 'usr/lib', config.dirname, 'bin', config.bin], 0o755);
             await qq.x(`ln -s "../lib/${config.dirname}/bin/${config.bin}" "${workspace}/usr/bin/${config.bin}"`);
             await qq.x(`chown -R root "${workspace}"`);
             await qq.x(`chgrp -R root "${workspace}"`);
             await qq.x(`dpkg --build "${workspace}" "${qq.join(dist, versionedDebBase)}"`);
         };
-        const arches = _.uniq(targets
+        const arches = _.uniq(buildConfig.targets
             .filter(t => t.platform === 'linux')
             .map(t => t.arch));
         // eslint-disable-next-line no-await-in-loop
@@ -78,7 +78,7 @@ class PackDeb extends command_1.Command {
         await qq.x('gzip -c Packages > Packages.gz', { cwd: dist });
         await qq.x('bzip2 -k Packages', { cwd: dist });
         await qq.x('xz -k Packages', { cwd: dist });
-        const ftparchive = qq.join(tmp, 'apt', 'apt-ftparchive.conf');
+        const ftparchive = qq.join(buildConfig.tmp, 'apt', 'apt-ftparchive.conf');
         await qq.write(ftparchive, scripts.ftparchive(config));
         await qq.x(`apt-ftparchive -c "${ftparchive}" release . > Release`, { cwd: dist });
         const gpgKey = config.scopedEnvVar('DEB_KEY');
@@ -89,8 +89,7 @@ class PackDeb extends command_1.Command {
     }
 }
 exports.default = PackDeb;
-PackDeb.hidden = true;
 PackDeb.description = 'pack CLI into debian package';
 PackDeb.flags = {
-    root: command_1.flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
 };

package/lib/commands/pack/macos.d.ts

@@ -1,9 +1,10 @@
-import { Command, flags } from '@oclif/command';
+import { Command } from '@oclif/core';
+import { Interfaces } from '@oclif/core';
 export default class PackMacos extends Command {
-    static hidden: boolean;
     static description: string;
     static flags: {
-        root: flags.IOptionFlag<string>;
+        root: Interfaces.OptionFlag<string>;
+        'additional-cli': Interfaces.OptionFlag<string | undefined>;
     };
     run(): Promise<void>;
 }

package/lib/commands/pack/macos.js

@@ -1,22 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
+const core_1 = require("@oclif/core");
 const path = require("path");
 const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
 const scripts = {
-    preinstall: (config) => `#!/usr/bin/env bash
+    preinstall: (config, additionalCLI) => `#!/usr/bin/env bash
 sudo rm -rf /usr/local/lib/${config.dirname}
 sudo rm -rf /usr/local/${config.bin}
 sudo rm -rf /usr/local/bin/${config.bin}
+${additionalCLI ?
+        `sudo rm -rf /usr/local/${additionalCLI}
+sudo rm -rf /usr/local/bin/${additionalCLI}` : ''}
 `,
-    postinstall: (config) => `#!/usr/bin/env bash
+    postinstall: (config, additionalCLI) => `#!/usr/bin/env bash
 set -x
 sudo mkdir -p /usr/local/bin
 sudo ln -sf /usr/local/lib/${config.dirname}/bin/${config.bin} /usr/local/bin/${config.bin}
+${additionalCLI ? `sudo ln -sf /usr/local/lib/${config.dirname}/bin/${additionalCLI} /usr/local/bin/${additionalCLI}` : ''}
 `,
-    uninstall: (config) => {
+    uninstall: (config, additionalCLI) => {
         const packageIdentifier = config.pjson.oclif.macos.identifier;
         return `#!/usr/bin/env bash
 
@@ -57,6 +61,7 @@ done
 echo "Application uninstalling process started"
 # remove link to shorcut file
 find "/usr/local/bin/" -name "${config.bin}" | xargs rm
+${additionalCLI ? `find "/usr/local/bin/" -name "${additionalCLI}" | xargs rm` : ''}
 if [ $? -eq 0 ]
 then
   echo "[1/3] [DONE] Successfully deleted shortcut links"
@@ -87,13 +92,13 @@ exit 0
 `;
     },
 };
-class PackMacos extends command_1.Command {
+class PackMacos extends core_1.Command {
     async run() {
         if (process.platform !== 'darwin')
             this.error('must be run from macos');
-        const { flags } = this.parse(PackMacos);
+        const { flags } = await this.parse(PackMacos);
         const buildConfig = await Tarballs.buildConfig(flags.root);
-        const { config, tmp, gitSha, version } = buildConfig;
+        const { config } = buildConfig;
         const c = config.pjson.oclif;
         if (!c.macos)
             this.error('package.json is missing an oclif.macos config');
@@ -102,15 +107,15 @@ class PackMacos extends command_1.Command {
         const macos = c.macos;
         const packageIdentifier = macos.identifier;
         await Tarballs.build(buildConfig, { platform: 'darwin', pack: false });
-        const templateKey = upload_util_1.templateShortKey('macos', { bin: config.bin, version: config.version, sha: gitSha });
+        const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: config.version, sha: buildConfig.gitSha });
         const dist = buildConfig.dist(`macos/${templateKey}`);
         await qq.emptyDir(path.dirname(dist));
-        const scriptsDir = qq.join(tmp, 'macos/scripts');
+        const scriptsDir = qq.join(buildConfig.tmp, 'macos/scripts');
         const rootDir = buildConfig.workspace({ platform: 'darwin', arch: 'x64' });
         const writeScript = async (script) => {
             const path = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
             path.push(script);
-            await qq.write(path, scripts[script](config));
+            await qq.write(path, scripts[script](config, flags['additional-cli']));
             await qq.chmod(path, 0o755);
         };
         await writeScript('preinstall');
@@ -120,7 +125,7 @@ class PackMacos extends command_1.Command {
         const args = [
             '--root', rootDir,
             '--identifier', packageIdentifier,
-            '--version', version,
+            '--version', config.version,
             '--install-location', `/usr/local/lib/${config.dirname}`,
             '--scripts', scriptsDir,
         ];
@@ -137,8 +142,9 @@ class PackMacos extends command_1.Command {
     }
 }
 exports.default = PackMacos;
-PackMacos.hidden = true;
 PackMacos.description = 'pack CLI into macOS .pkg';
 PackMacos.flags = {
-    root: command_1.flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    'additional-cli': core_1.Flags.string({ description: `an Oclif CLI other than the one listed in config.bin that should be made available to the user
+the CLI should already exist in a directory named after the CLI that is the root of the tarball produced by "oclif pack:tarballs"`, hidden: true }),
 };

package/lib/commands/pack/tarballs.d.ts

@@ -1,7 +1,10 @@
-import { Command, flags } from '@oclif/command';
+import { Command } from '@oclif/core';
 export default class PackTarballs extends Command {
-    static hidden: boolean;
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        root: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        targets: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        xz: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/lib/commands/pack/tarballs.js

@@ -1,31 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
+const core_1 = require("@oclif/core");
 const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
-class PackTarballs extends command_1.Command {
+class PackTarballs extends core_1.Command {
     async run() {
         const prevCwd = qq.cwd();
         if (process.platform === 'win32')
             throw new Error('pack does not function on windows');
-        const { flags } = this.parse(PackTarballs);
+        const { flags } = await this.parse(PackTarballs);
         const targets = flags.targets.split(',');
         const buildConfig = await Tarballs.buildConfig(flags.root, { xz: flags.xz, targets: targets });
+        if (buildConfig.targets.length === 0) {
+            throw new Error('Please specify one or more valid targets.');
+        }
         await Tarballs.build(buildConfig);
         qq.cd(prevCwd);
     }
 }
 exports.default = PackTarballs;
-PackTarballs.hidden = true;
 PackTarballs.description = `packages oclif CLI into tarballs
 
 This can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.
 `;
 PackTarballs.flags = {
-    root: command_1.flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
-    targets: command_1.flags.string({ char: 't',
+    root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    targets: core_1.Flags.string({ char: 't',
         description: 'comma-separated targets to pack (e.g.: linux-arm,win32-x64)',
         default: Tarballs.TARGETS.join(','),
     }),
-    xz: command_1.flags.boolean({ description: 'also build xz', allowNo: true, default: true }),
+    xz: core_1.Flags.boolean({ description: 'also build xz', allowNo: true, default: true }),
 };

package/lib/commands/pack/win.d.ts

@@ -1,9 +1,10 @@
-import { Command, flags } from '@oclif/command';
+import { Command } from '@oclif/core';
+import { Interfaces } from '@oclif/core';
 export default class PackWin extends Command {
-    static hidden: boolean;
     static description: string;
     static flags: {
-        root: flags.IOptionFlag<string>;
+        root: Interfaces.OptionFlag<string>;
+        'additional-cli': Interfaces.OptionFlag<string | undefined>;
     };
     run(): Promise<void>;
     private checkForNSIS;

package/lib/commands/pack/win.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
+const core_1 = require("@oclif/core");
 const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
 const scripts = {
     /* eslint-disable no-useless-escape */
-    cmd: (config) => `@echo off
+    // eslint-disable-next-line unicorn/no-useless-undefined
+    cmd: (config, additionalCLI = undefined) => `@echo off
 setlocal enableextensions
 
-set ${config.scopedEnvVarKey('BINPATH')}=%~dp0\\${config.bin}.cmd
-if exist "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${config.bin}.cmd" (
-  "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${config.bin}.cmd" %*
+set ${additionalCLI ? `${additionalCLI.toUpperCase()}_BINPATH` : config.scopedEnvVarKey('BINPATH')}=%~dp0\\${additionalCLI !== null && additionalCLI !== void 0 ? additionalCLI : config.bin}.cmd
+if exist "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalCLI !== null && additionalCLI !== void 0 ? additionalCLI : config.bin}.cmd" (
+  "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalCLI !== null && additionalCLI !== void 0 ? additionalCLI : config.bin}.cmd" %*
 ) else (
-  "%~dp0\\..\\client\\bin\\node.exe" "%~dp0\\..\\client\\bin\\run" %*
+  "%~dp0\\..\\client\\bin\\node.exe" "%~dp0\\..\\client\\${additionalCLI ? `${additionalCLI}\\bin\\run` : 'bin\\run'}" %*
 )
 `,
     sh: (config) => `#!/bin/sh
@@ -188,28 +189,33 @@ done:
   Exch $R1 ; $R1=old$R1, stack=[result,...]
 FunctionEnd
 `,
+    /* eslint-enable no-useless-escape */
 };
-class PackWin extends command_1.Command {
+class PackWin extends core_1.Command {
     async run() {
         await this.checkForNSIS();
-        const { flags } = this.parse(PackWin);
+        const { flags } = await this.parse(PackWin);
         const buildConfig = await Tarballs.buildConfig(flags.root);
-        const { config, version, gitSha, targets, tmp } = buildConfig;
+        const { config } = buildConfig;
         await Tarballs.build(buildConfig, { platform: 'win32', pack: false });
-        const arches = targets.filter(t => t.platform === 'win32').map(t => t.arch);
+        const arches = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
         for (const arch of arches) {
-            const installerBase = qq.join(tmp, `windows-${arch}-installer`);
+            const installerBase = qq.join(buildConfig.tmp, `windows-${arch}-installer`);
             // eslint-disable-next-line no-await-in-loop
             await qq.write([installerBase, `bin/${config.bin}.cmd`], scripts.cmd(config));
             // eslint-disable-next-line no-await-in-loop
             await qq.write([installerBase, `bin/${config.bin}`], scripts.sh(config));
+            if (flags['additional-cli']) {
+                await qq.write([installerBase, `bin/${flags['additional-cli']}.cmd`], scripts.cmd(config, flags['additional-cli'])); // eslint-disable-line no-await-in-loop
+                await qq.write([installerBase, `bin/${flags['additional-cli']}`], scripts.sh({ bin: flags['additional-cli'] })); // eslint-disable-line no-await-in-loop
+            }
             // eslint-disable-next-line no-await-in-loop
             await qq.write([installerBase, `${config.bin}.nsi`], scripts.nsis(config, arch));
             // eslint-disable-next-line no-await-in-loop
             await qq.mv(buildConfig.workspace({ platform: 'win32', arch }), [installerBase, 'client']);
             // eslint-disable-next-line no-await-in-loop
             await qq.x(`makensis ${installerBase}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
-            const templateKey = upload_util_1.templateShortKey('win32', { bin: config.bin, version: version, sha: gitSha, arch });
+            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const o = buildConfig.dist(`win32/${templateKey}`);
             // eslint-disable-next-line no-await-in-loop
             await qq.mv([installerBase, 'installer.exe'], o);
@@ -218,10 +224,14 @@ class PackWin extends command_1.Command {
                 const buildLocationUnsigned = o.replace(`${arch}.exe`, `${arch}-unsigned.exe`);
                 // eslint-disable-next-line no-await-in-loop
                 await qq.mv(o, buildLocationUnsigned);
+                const pass = config.scopedEnvVar('WINDOWS_SIGNING_PASS');
+                if (!pass) {
+                    throw new Error(`${config.scopedEnvVarKey('WINDOWS_SIGNING_PASS')} not set in the environment`);
+                }
                 /* eslint-disable array-element-newline */
                 const args = [
                     '-pkcs12', windows.keypath,
-                    '-pass', config.scopedEnvVar('WINDOWS_SIGNING_PASS'),
+                    '-pass', pass,
                     '-n', windows.name,
                     '-i', windows.homepage || config.pjson.homepage,
                     '-h', 'sha512',
@@ -251,8 +261,11 @@ class PackWin extends command_1.Command {
     }
 }
 exports.default = PackWin;
-PackWin.hidden = true;
-PackWin.description = 'create windows installer from oclif CLI';
+PackWin.description = `create windows installer from oclif CLI
+
+  This command requires WINDOWS_SIGNING (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) to be set in the environment`;
 PackWin.flags = {
-    root: command_1.flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    'additional-cli': core_1.Flags.string({ description: `an Oclif CLI other than the one listed in config.bin that should be made available to the user
+the CLI should already exist in a directory named after the CLI that is the root of the tarball produced by "oclif pack:tarballs"`, hidden: true }),
 };

package/lib/commands/promote.d.ts

@@ -1,7 +1,18 @@
-import { Command, flags } from '@oclif/command';
+import { Command } from '@oclif/core';
 export default class Promote extends Command {
-    static hidden: boolean;
     static description: string;
-    static flags: flags.Input<any>;
+    static flags: {
+        root: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        version: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        sha: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        channel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        targets: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        deb: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        macos: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        win: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'max-age': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        xz: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        indexes: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }