oclif 1.18.2-dev.2 → 2.0.0-dev.0

package/lib/commands/promote.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
+const core_1 = require("@oclif/core");
 const cli_ux_1 = require("cli-ux");
 const path = require("path");
 const aws_1 = require("../aws");
 const Tarballs = require("../tarballs");
 const upload_util_1 = require("../upload-util");
 const version_indexes_1 = require("../version-indexes");
-class Promote extends command_1.Command {
+class Promote extends core_1.Command {
     async run() {
-        const { flags } = this.parse(Promote);
+        const { flags } = await this.parse(Promote);
         const maxAge = `max-age=${flags['max-age']}`;
         const targets = flags.targets.split(',');
         const buildConfig = await Tarballs.buildConfig(flags.root, { targets });
@@ -21,13 +21,13 @@ class Promote extends command_1.Command {
         };
         if (!s3Config.bucket)
             this.error('Cannot determine S3 bucket for promotion');
-        const cloudBucketCommitKey = (shortKey) => path.join(s3Config.bucket, upload_util_1.commitAWSDir(flags.version, flags.sha, s3Config), shortKey);
-        const cloudChannelKey = (shortKey) => path.join(upload_util_1.channelAWSDir(flags.channel, s3Config), shortKey);
+        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);
         // copy tarballs manifests
         if (buildConfig.targets.length > 0)
             this.log(`Promoting buildmanifests & unversioned tarballs to ${flags.channel}`);
         for (const target of buildConfig.targets) {
-            const manifest = upload_util_1.templateShortKey('manifest', {
+            const manifest = (0, upload_util_1.templateShortKey)('manifest', {
                 arch: target.arch,
                 bin: config.bin,
                 platform: target.platform,
@@ -46,7 +46,7 @@ class Promote extends command_1.Command {
                 CacheControl: maxAge,
                 MetadataDirective: 'REPLACE',
             });
-            const versionedTarGzName = upload_util_1.templateShortKey('versioned', '.tar.gz', {
+            const versionedTarGzName = (0, upload_util_1.templateShortKey)('versioned', '.tar.gz', {
                 arch: target.arch,
                 bin: config.bin,
                 platform: target.platform,
@@ -67,9 +67,9 @@ class Promote extends command_1.Command {
             });
             // eslint-disable-next-line no-await-in-loop
             if (flags.indexes)
-                await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarGzKey, filename: unversionedTarGzName }));
+                await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarGzKey, filename: unversionedTarGzName }));
             if (flags.xz) {
-                const versionedTarXzName = upload_util_1.templateShortKey('versioned', '.tar.xz', {
+                const versionedTarXzName = (0, upload_util_1.templateShortKey)('versioned', '.tar.xz', {
                     arch: target.arch,
                     bin: config.bin,
                     platform: target.platform,
@@ -90,13 +90,13 @@ class Promote extends command_1.Command {
                 });
                 // eslint-disable-next-line no-await-in-loop
                 if (flags.indexes)
-                    await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarXzKey, filename: unversionedTarXzName }));
+                    await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarXzKey, filename: unversionedTarXzName }));
             }
         }
         // copy darwin pkg
         if (flags.macos) {
             this.log(`Promoting macos pkg to ${flags.channel}`);
-            const darwinPkg = upload_util_1.templateShortKey('macos', { bin: config.bin, version: flags.version, sha: flags.sha });
+            const darwinPkg = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: flags.version, sha: flags.sha });
             const darwinCopySource = cloudBucketCommitKey(darwinPkg);
             // strip version & sha so scripts can point to a static channel pkg
             const unversionedPkg = darwinPkg.replace(`-v${flags.version}-${flags.sha}`, '');
@@ -109,14 +109,14 @@ class Promote extends command_1.Command {
                 MetadataDirective: 'REPLACE',
             });
             if (flags.indexes)
-                await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: darwinCopySource, filename: unversionedPkg }));
+                await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: darwinCopySource, filename: unversionedPkg }));
         }
         // copy win exe
         if (flags.win) {
             this.log(`Promoting windows exe to ${flags.channel}`);
             const archs = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
             for (const arch of archs) {
-                const winPkg = upload_util_1.templateShortKey('win32', { bin: config.bin, version: flags.version, sha: flags.sha, arch });
+                const winPkg = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: flags.version, sha: flags.sha, arch });
                 const winCopySource = cloudBucketCommitKey(winPkg);
                 // strip version & sha so scripts can point to a static channel exe
                 const unversionedExe = winPkg.replace(`-v${flags.version}-${flags.sha}`, '');
@@ -130,14 +130,14 @@ class Promote extends command_1.Command {
                 });
                 // eslint-disable-next-line no-await-in-loop
                 if (flags.indexes)
-                    await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: winCopySource, filename: unversionedExe }));
+                    await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: winCopySource, filename: unversionedExe }));
                 cli_ux_1.cli.action.stop('successfully');
             }
         }
         // copy debian artifacts
         const debArtifacts = [
-            upload_util_1.templateShortKey('deb', { bin: config.bin, versionShaRevision: upload_util_1.debVersion(buildConfig), arch: 'amd64' }),
-            upload_util_1.templateShortKey('deb', { bin: config.bin, versionShaRevision: upload_util_1.debVersion(buildConfig), arch: 'i386' }),
+            (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: 'amd64' }),
+            (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: 'i386' }),
             'Packages.gz',
             'Packages.xz',
             'Packages.bz2',
@@ -163,22 +163,21 @@ class Promote extends command_1.Command {
     }
 }
 exports.default = Promote;
-Promote.hidden = true;
 Promote.description = 'promote CLI builds to a S3 release channel';
 Promote.flags = {
-    root: command_1.flags.string({ char: 'r', description: 'path to the oclif CLI project root', default: '.', required: true }),
-    version: command_1.flags.string({ description: 'semantic version of the CLI to promote', required: true }),
-    sha: command_1.flags.string({ description: '7-digit short git commit SHA of the CLI to promote', required: true }),
-    channel: command_1.flags.string({ description: 'which channel to promote to', required: true, default: 'stable' }),
-    targets: command_1.flags.string({
+    root: core_1.Flags.string({ char: 'r', description: 'path to the oclif CLI project root', default: '.', required: true }),
+    version: core_1.Flags.string({ description: 'semantic version of the CLI to promote', required: true }),
+    sha: core_1.Flags.string({ description: '7-digit short git commit SHA of the CLI to promote', required: true }),
+    channel: core_1.Flags.string({ description: 'which channel to promote to', required: true, default: 'stable' }),
+    targets: core_1.Flags.string({
         char: 't',
         description: 'comma-separated targets to promote (e.g.: linux-arm,win32-x64)',
         default: Tarballs.TARGETS.join(','),
     }),
-    deb: command_1.flags.boolean({ char: 'd', description: 'promote debian artifacts' }),
-    macos: command_1.flags.boolean({ char: 'm', description: 'promote macOS pkg' }),
-    win: command_1.flags.boolean({ char: 'w', description: 'promote Windows exe' }),
-    'max-age': command_1.flags.string({ char: 'a', description: 'cache control max-age in seconds', default: '86400' }),
-    xz: command_1.flags.boolean({ description: 'also upload xz', allowNo: true, default: true }),
-    indexes: command_1.flags.boolean({ description: 'append the promoted urls into the index files' }),
+    deb: core_1.Flags.boolean({ char: 'd', description: 'promote debian artifacts' }),
+    macos: core_1.Flags.boolean({ char: 'm', description: 'promote macOS pkg' }),
+    win: core_1.Flags.boolean({ char: 'w', description: 'promote Windows exe' }),
+    'max-age': core_1.Flags.string({ char: 'a', description: 'cache control max-age in seconds', default: '86400' }),
+    xz: core_1.Flags.boolean({ description: 'also upload xz', allowNo: true, default: true }),
+    indexes: core_1.Flags.boolean({ description: 'append the promoted urls into the index files' }),
 };

package/lib/commands/readme.d.ts

@@ -1,21 +1,20 @@
-import { Command, flags } from '@oclif/command';
-import * as Config from '@oclif/config';
+import { Command, Interfaces } from '@oclif/core';
 export default class Readme extends Command {
-    static hidden: boolean;
     static description: string;
     static flags: {
-        dir: flags.IOptionFlag<string>;
-        multi: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        dir: Interfaces.OptionFlag<string>;
+        multi: Interfaces.BooleanFlag<boolean>;
     };
+    private HelpClass;
     run(): Promise<void>;
     replaceTag(readme: string, tag: string, body: string): string;
-    toc(__: Config.IConfig, readme: string): string;
-    usage(config: Config.IConfig): string;
-    multiCommands(config: Config.IConfig, commands: Config.Command[], dir: string): string;
-    createTopicFile(file: string, config: Config.IConfig, topic: Config.Topic, commands: Config.Command[]): void;
-    commands(config: Config.IConfig, commands: Config.Command[]): string;
-    renderCommand(config: Config.IConfig, c: Config.Command): string;
-    commandCode(config: Config.IConfig, c: Config.Command): string | undefined;
+    toc(__: Interfaces.Config, readme: string): string;
+    usage(config: Interfaces.Config): string;
+    multiCommands(config: Interfaces.Config, commands: Interfaces.Command[], dir: string): string;
+    createTopicFile(file: string, config: Interfaces.Config, topic: Interfaces.Topic, commands: Interfaces.Command[]): void;
+    commands(config: Interfaces.Config, commands: Interfaces.Command[]): string;
+    renderCommand(config: Interfaces.Config, c: Interfaces.Command): string;
+    commandCode(config: Interfaces.Config, c: Interfaces.Command): string | undefined;
     private repo;
     /**
      * fetches the path to a command

package/lib/commands/readme.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // tslint:disable no-implicit-dependencies
-const command_1 = require("@oclif/command");
-const Config = require("@oclif/config");
-const plugin_help_1 = require("@oclif/plugin-help");
+const core_1 = require("@oclif/core");
 const fs = require("fs-extra");
 const _ = require("lodash");
 const path = require("path");
@@ -13,27 +11,28 @@ const help_compatibility_1 = require("../help-compatibility");
 const normalize = require('normalize-package-data');
 const columns = parseInt(process.env.COLUMNS, 10) || 120;
 const slugify = new (require('github-slugger'))();
-class Readme extends command_1.Command {
+class Readme extends core_1.Command {
     async run() {
-        const { flags } = this.parse(Readme);
+        const { flags } = await this.parse(Readme);
         const cwd = process.cwd();
         const readmePath = path.resolve(cwd, 'README.md');
-        const config = await Config.load({ root: cwd, devPlugins: false, userPlugins: false });
+        const config = await core_1.Config.load({ root: cwd, devPlugins: false, userPlugins: false });
         try {
             const p = require.resolve('@oclif/plugin-legacy', { paths: [cwd] });
-            const plugin = new Config.Plugin({ root: p, type: 'core' });
+            const plugin = new core_1.Plugin({ root: p, type: 'core' });
             await plugin.load();
             config.plugins.push(plugin);
         }
         catch (_a) { }
         await config.runHook('init', { id: 'readme', argv: this.argv });
+        this.HelpClass = await (0, core_1.loadHelpClass)(config);
         let readme = await fs.readFile(readmePath, 'utf8');
         let commands = config.commands;
         commands = commands.filter(c => !c.hidden);
         commands = commands.filter(c => c.pluginType === 'core');
         this.debug('commands:', commands.map(c => c.id).length);
-        commands = util_1.uniqBy(commands, c => c.id);
-        commands = util_1.sortBy(commands, c => c.id);
+        commands = (0, util_1.uniqBy)(commands, c => c.id);
+        commands = (0, util_1.sortBy)(commands, c => c.id);
         readme = this.replaceTag(readme, 'usage', this.usage(config));
         readme = this.replaceTag(readme, 'commands', flags.multi ? this.multiCommands(config, commands, flags.dir) : this.commands(config, commands));
         readme = this.replaceTag(readme, 'toc', this.toc(config, readme));
@@ -57,12 +56,15 @@ class Readme extends command_1.Command {
             .join('\n');
     }
     usage(config) {
+        var _a;
+        const versionFlags = ['--version', ...((_a = config.pjson.oclif.additionalVersionFlags) !== null && _a !== void 0 ? _a : []).sort()];
+        const versionFlagsString = `(${versionFlags.join('|')})`;
         return [
             `\`\`\`sh-session
 $ npm install -g ${config.name}
 $ ${config.bin} COMMAND
 running command...
-$ ${config.bin} (-v|--version|version)
+$ ${config.bin} ${versionFlagsString}
 ${config.name}/${process.env.OCLIF_NEXT_VERSION || config.version} ${process.platform}-${process.arch} node-v${process.versions.node}
 $ ${config.bin} --help [COMMAND]
 USAGE
@@ -75,17 +77,17 @@ USAGE
         let topics = config.topics;
         topics = topics.filter(t => !t.hidden && !t.name.includes(':'));
         topics = topics.filter(t => commands.find(c => c.id.startsWith(t.name)));
-        topics = util_1.sortBy(topics, t => t.name);
-        topics = util_1.uniqBy(topics, t => t.name);
+        topics = (0, util_1.sortBy)(topics, t => t.name);
+        topics = (0, util_1.uniqBy)(topics, t => t.name);
         for (const topic of topics) {
             this.createTopicFile(path.join('.', dir, topic.name.replace(/:/g, '/') + '.md'), config, topic, commands.filter(c => c.id === topic.name || c.id.startsWith(topic.name + ':')));
         }
         return [
             '# Command Topics\n',
             ...topics.map(t => {
-                return util_1.compact([
+                return (0, util_1.compact)([
                     `* [\`${config.bin} ${t.name}\`](${dir}/${t.name.replace(/:/g, '/')}.md)`,
-                    util_1.template({ config })(t.description || '').trim().split('\n')[0],
+                    (0, util_1.template)({ config })(t.description || '').trim().split('\n')[0],
                 ]).join(' - ');
             }),
         ].join('\n').trim() + '\n';
@@ -96,7 +98,7 @@ USAGE
             bin,
             '='.repeat(bin.length),
             '',
-            util_1.template({ config })(topic.description || '').trim(),
+            (0, util_1.template)({ config })(topic.description || '').trim(),
             '',
             this.commands(config, commands),
         ].join('\n').trim() + '\n';
@@ -114,13 +116,12 @@ USAGE
     }
     renderCommand(config, c) {
         this.debug('rendering command', c.id);
-        const title = util_1.template({ config, command: c })(c.description || '').trim().split('\n')[0];
-        const HelpClass = plugin_help_1.getHelpClass(config);
-        const help = new HelpClass(config, { stripAnsi: true, maxWidth: columns });
+        const title = (0, util_1.template)({ config, command: c })(c.summary || c.description || '').trim().split('\n')[0];
+        const help = new this.HelpClass(config, { stripAnsi: true, maxWidth: columns });
         const wrapper = new help_compatibility_1.HelpCompatibilityWrapper(help);
         const header = () => `## \`${config.bin} ${this.commandUsage(config, c)}\``;
         try {
-            return util_1.compact([
+            return (0, util_1.compact)([
                 header(),
                 title,
                 '```\n' + wrapper.formatCommand(c).trim() + '\n```',
@@ -210,20 +211,18 @@ USAGE
                 return `${name}`;
             return `[${name}]`;
         };
+        const id = config.topicSeparator ? command.id.replace(/:/g, config.topicSeparator) : command.id;
         const defaultUsage = () => {
-            // const flags = Object.entries(command.flags)
-            // .filter(([, v]) => !v.hidden)
-            return util_1.compact([
-                command.id,
+            return (0, util_1.compact)([
+                id,
                 command.args.filter(a => !a.hidden).map(a => arg(a)).join(' '),
             ]).join(' ');
         };
-        const usages = util_1.castArray(command.usage);
-        return util_1.template({ config, command })(usages.length === 0 ? defaultUsage() : usages[0]);
+        const usages = (0, util_1.castArray)(command.usage);
+        return (0, util_1.template)({ config, command })(usages.length === 0 ? defaultUsage() : usages[0]);
     }
 }
 exports.default = Readme;
-Readme.hidden = true;
 Readme.description = `adds commands to README.md in current directory
 The readme must have any of the following tags inside of it for it to be replaced or else it will do nothing:
 # Usage
@@ -234,6 +233,6 @@ The readme must have any of the following tags inside of it for it to be replace
 Customize the code URL prefix by setting oclif.repositoryPrefix in package.json.
 `;
 Readme.flags = {
-    dir: command_1.flags.string({ description: 'output directory for multi docs', default: 'docs', required: true }),
-    multi: command_1.flags.boolean({ description: 'create a different markdown page for each topic' }),
+    dir: core_1.Flags.string({ description: 'output directory for multi docs', default: 'docs', required: true }),
+    multi: core_1.Flags.boolean({ description: 'create a different markdown page for each topic' }),
 };

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

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

package/lib/commands/upload/deb.js

@@ -1,14 +1,14 @@
 "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 aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
-class UploadDeb extends command_1.Command {
+class UploadDeb extends core_1.Command {
     async run() {
-        const { flags } = this.parse(UploadDeb);
+        const { flags } = await this.parse(UploadDeb);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { s3Config, config } = buildConfig;
         const dist = (f) => buildConfig.dist(qq.join('deb', f));
@@ -20,13 +20,13 @@ class UploadDeb extends command_1.Command {
             this.error('Cannot find debian artifacts', {
                 suggestions: ['Run "oclif-dev pack:deb" before uploading'],
             });
-        const cloudKeyBase = upload_util_1.commitAWSDir(config.pjson.version, buildConfig.gitSha, s3Config);
+        const cloudKeyBase = (0, upload_util_1.commitAWSDir)(config.pjson.version, buildConfig.gitSha, s3Config);
         const upload = (file) => {
             const cloudKey = `${cloudKeyBase}/apt/${file}`;
             return aws_1.default.s3.uploadFile(dist(file), Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
         };
         const uploadDeb = async (arch) => {
-            const deb = upload_util_1.templateShortKey('deb', { bin: config.bin, versionShaRevision: upload_util_1.debVersion(buildConfig), arch: arch });
+            const deb = (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: arch });
             if (await qq.exists(dist(deb)))
                 await upload(deb);
         };
@@ -40,12 +40,11 @@ class UploadDeb extends command_1.Command {
             await upload('InRelease');
         if (await qq.exists(dist('Release.gpg')))
             await upload('Release.gpg');
-        log_1.log(`done uploading deb artifacts for v${config.version}-${buildConfig.gitSha}`);
+        (0, log_1.log)(`done uploading deb artifacts for v${config.version}-${buildConfig.gitSha}`);
     }
 }
 exports.default = UploadDeb;
-UploadDeb.hidden = true;
 UploadDeb.description = 'upload deb package built with pack:deb';
 UploadDeb.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/upload/macos.d.ts

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

package/lib/commands/upload/macos.js

@@ -1,22 +1,22 @@
 "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 aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
-class UploadMacos extends command_1.Command {
+class UploadMacos extends core_1.Command {
     async run() {
-        const { flags } = this.parse(UploadMacos);
+        const { flags } = await this.parse(UploadMacos);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { s3Config, version, config, dist } = buildConfig;
         const S3Options = {
             Bucket: s3Config.bucket,
             ACL: s3Config.acl || 'public-read',
         };
-        const cloudKeyBase = upload_util_1.commitAWSDir(version, buildConfig.gitSha, s3Config);
-        const templateKey = upload_util_1.templateShortKey('macos', { bin: config.bin, version, sha: buildConfig.gitSha });
+        const cloudKeyBase = (0, upload_util_1.commitAWSDir)(version, buildConfig.gitSha, s3Config);
+        const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version, sha: buildConfig.gitSha });
         const cloudKey = `${cloudKeyBase}/${templateKey}`;
         const localPkg = dist(`macos/${templateKey}`);
         if (await qq.exists(localPkg))
@@ -25,12 +25,11 @@ class UploadMacos extends command_1.Command {
             this.error('Cannot find macOS pkg', {
                 suggestions: ['Run "oclif-dev pack:macos" before uploading'],
             });
-        log_1.log(`done uploading macos pkg for v${version}-${buildConfig.gitSha}`);
+        (0, log_1.log)(`done uploading macos pkg for v${version}-${buildConfig.gitSha}`);
     }
 }
 exports.default = UploadMacos;
-UploadMacos.hidden = true;
 UploadMacos.description = 'upload macos installers built with pack:macos';
 UploadMacos.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/upload/tarballs.d.ts

@@ -1,11 +1,11 @@
-import { Command, flags } from '@oclif/command';
+import { Command } from '@oclif/core';
+import { Interfaces } from '@oclif/core';
 export default class UploadTarballs extends Command {
-    static hidden: boolean;
     static description: string;
     static flags: {
-        root: flags.IOptionFlag<string>;
-        targets: flags.IOptionFlag<string>;
-        xz: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        root: Interfaces.OptionFlag<string>;
+        targets: Interfaces.OptionFlag<string>;
+        xz: Interfaces.BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/upload/tarballs.js

@@ -1,14 +1,14 @@
 "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 aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
-class UploadTarballs extends command_1.Command {
+class UploadTarballs extends core_1.Command {
     async run() {
-        const { flags } = this.parse(UploadTarballs);
+        const { flags } = await this.parse(UploadTarballs);
         if (process.platform === 'win32')
             throw new Error('upload does not function on windows');
         const targets = flags.targets.split(',');
@@ -16,14 +16,12 @@ class UploadTarballs extends command_1.Command {
         const { s3Config, dist, version, config, xz } = buildConfig;
         // fail early if targets are not built
         for (const target of buildConfig.targets) {
-            log_1.log(`Looking for ${config.bin}-v${config.version}-${buildConfig.gitSha}-${target.platform}-${target.arch}.tar.gz ...`);
-            const tarball = dist(upload_util_1.templateShortKey('versioned', Object.assign({ ext: '.tar.gz', bin: config.bin, version: config.version, sha: buildConfig.gitSha }, target)));
+            const tarball = dist((0, upload_util_1.templateShortKey)('versioned', Object.assign({ ext: '.tar.gz', bin: config.bin, version: config.version, sha: buildConfig.gitSha }, target)));
             // eslint-disable-next-line no-await-in-loop
             if (!await qq.exists(tarball))
                 this.error(`Cannot find a tarball ${tarball} for ${target.platform}-${target.arch}`, {
-                    suggestions: [`Run "oclif-dev pack --target ${target.platform}-${target.arch}" before uploading`],
+                    suggestions: [`Run "oclif pack --target ${target.platform}-${target.arch}" before uploading`],
                 });
-            log_1.log('Found it.');
         }
         const S3Options = {
             Bucket: s3Config.bucket,
@@ -32,50 +30,49 @@ class UploadTarballs extends command_1.Command {
         const uploadTarball = async (options) => {
             const TarballS3Options = Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=604800' });
             const releaseTarballs = async (ext) => {
-                const localKey = upload_util_1.templateShortKey('versioned', ext, {
+                const localKey = (0, upload_util_1.templateShortKey)('versioned', ext, {
                     arch: options === null || options === void 0 ? void 0 : options.arch,
                     bin: config.bin,
                     platform: options === null || options === void 0 ? void 0 : options.platform,
                     sha: buildConfig.gitSha,
-                    version,
+                    version: config.version,
                 });
-                const cloudKey = `${upload_util_1.commitAWSDir(version, buildConfig.gitSha, s3Config)}/${localKey}`;
+                const cloudKey = `${(0, upload_util_1.commitAWSDir)(version, buildConfig.gitSha, s3Config)}/${localKey}`;
                 await aws_1.default.s3.uploadFile(dist(localKey), Object.assign(Object.assign({}, TarballS3Options), { ContentType: 'application/gzip', Key: cloudKey }));
             };
             await releaseTarballs('.tar.gz');
             if (xz)
                 await releaseTarballs('.tar.xz');
             const ManifestS3Options = Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', ContentType: 'application/json' });
-            const manifest = upload_util_1.templateShortKey('manifest', {
+            const manifest = (0, upload_util_1.templateShortKey)('manifest', {
                 arch: options === null || options === void 0 ? void 0 : options.arch,
                 bin: config.bin,
                 platform: options === null || options === void 0 ? void 0 : options.platform,
                 sha: buildConfig.gitSha,
                 version: config.version,
             });
-            const cloudKey = `${upload_util_1.commitAWSDir(version, buildConfig.gitSha, s3Config)}/${manifest}`;
+            const cloudKey = `${(0, upload_util_1.commitAWSDir)(version, buildConfig.gitSha, s3Config)}/${manifest}`;
             await aws_1.default.s3.uploadFile(dist(manifest), Object.assign(Object.assign({}, ManifestS3Options), { Key: cloudKey }));
         };
         if (targets.length > 0)
-            log_1.log('uploading targets');
+            (0, log_1.log)('uploading targets');
         // eslint-disable-next-line no-await-in-loop
         for (const target of buildConfig.targets)
             await uploadTarball(target);
-        log_1.log(`done uploading tarballs & manifests for v${config.version}-${buildConfig.gitSha}`);
+        (0, log_1.log)(`done uploading tarballs & manifests for v${config.version}-${buildConfig.gitSha}`);
     }
 }
 exports.default = UploadTarballs;
-UploadTarballs.hidden = true;
 UploadTarballs.description = `upload an oclif CLI to S3
 
 "aws-sdk" will need to be installed as a devDependency to upload.
 `;
 UploadTarballs.flags = {
-    root: command_1.flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
-    targets: command_1.flags.string({
+    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 upload (e.g.: linux-arm,win32-x64)',
         default: Tarballs.TARGETS.join(','),
     }),
-    xz: command_1.flags.boolean({ description: 'also upload xz', allowNo: true, default: true }),
+    xz: core_1.Flags.boolean({ description: 'also upload xz', allowNo: true, default: true }),
 };

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

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

package/lib/commands/upload/win.js

@@ -1,14 +1,14 @@
 "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 aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
-class UploadWin extends command_1.Command {
+class UploadWin extends core_1.Command {
     async run() {
-        const { flags } = this.parse(UploadWin);
+        const { flags } = await this.parse(UploadWin);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { s3Config, version, config, dist } = buildConfig;
         const S3Options = {
@@ -17,7 +17,7 @@ class UploadWin extends command_1.Command {
         };
         const archs = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
         for (const arch of archs) {
-            const templateKey = upload_util_1.templateShortKey('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch });
+            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch });
             const localKey = dist(`win32/${templateKey}`);
             // eslint-disable-next-line no-await-in-loop
             if (!await qq.exists(localKey))
@@ -25,9 +25,9 @@ class UploadWin extends command_1.Command {
                     suggestions: ['Run "oclif-dev pack:win" before uploading'],
                 });
         }
-        const cloudKeyBase = upload_util_1.commitAWSDir(config.pjson.version, buildConfig.gitSha, s3Config);
+        const cloudKeyBase = (0, upload_util_1.commitAWSDir)(config.pjson.version, buildConfig.gitSha, s3Config);
         const uploadWin = async (arch) => {
-            const templateKey = upload_util_1.templateShortKey('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch });
+            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch });
             const localExe = dist(`win32/${templateKey}`);
             const cloudKey = `${cloudKeyBase}/${templateKey}`;
             if (await qq.exists(localExe))
@@ -35,12 +35,11 @@ class UploadWin extends command_1.Command {
         };
         await uploadWin('x64');
         await uploadWin('x86');
-        log_1.log(`done uploading windows executables for v${version}-${buildConfig.gitSha}`);
+        (0, log_1.log)(`done uploading windows executables for v${version}-${buildConfig.gitSha}`);
     }
 }
 exports.default = UploadWin;
-UploadWin.hidden = true;
 UploadWin.description = 'upload windows installers built with pack:win';
 UploadWin.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 }),
 };