oclif 2.0.0 → 2.0.1

package/lib/tarballs/node.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const errors_1 = require("@oclif/errors");
+exports.fetchNodeBinary = void 0;
+const core_1 = require("@oclif/core");
 const path = require("path");
 const qq = require("qqjs");
 const log_1 = require("../log");
@@ -10,7 +11,7 @@ async function checkFor7Zip() {
     }
     catch (error) {
         if (error.code === 127)
-            errors_1.error('install 7-zip to package windows tarball');
+            core_1.Errors.error('install 7-zip to package windows tarball');
         else
             throw error;
     }
@@ -23,7 +24,6 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
     let url = `https://nodejs.org/dist/v${nodeVersion}/${nodeBase}.tar.xz`;
     if (platform === 'win32') {
         await checkFor7Zip();
-        // eslint-disable-next-line require-atomic-updates
         nodeBase = `node-v${nodeVersion}-win-${arch}`;
         tarball = path.join(tmp, 'node', `${nodeBase}.7z`);
         url = `https://nodejs.org/dist/v${nodeVersion}/${nodeBase}.7z`;
@@ -33,7 +33,7 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
     if (platform === 'win32')
         cache += '.exe';
     const download = async () => {
-        log_1.log(`downloading ${nodeBase}`);
+        (0, log_1.log)(`downloading ${nodeBase}`);
         const shasums = path.join(tmp, 'cache', nodeVersion, 'SHASUMS256.txt.asc');
         if (!await qq.exists(shasums)) {
             await qq.download(`https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt.asc`, shasums);
@@ -44,7 +44,7 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
         await qq.x(`grep ${path.basename(tarball)} ${shasums} | shasum -a 256 -c -`, { cwd: basedir });
     };
     const extract = async () => {
-        log_1.log(`extracting ${nodeBase}`);
+        (0, log_1.log)(`extracting ${nodeBase}`);
         const nodeTmp = path.join(tmp, 'node');
         await qq.rm([nodeTmp, nodeBase]);
         await qq.mkdirp(nodeTmp);

package/lib/upload-util.d.ts

@@ -1,7 +1,7 @@
-import * as Config from '@oclif/config';
+import { Interfaces } from '@oclif/core';
 import { BuildConfig as TarballConfig } from './tarballs/config';
 export declare function commitAWSDir(version: string, sha: string, s3Config: TarballConfig['s3Config']): string;
 export declare function channelAWSDir(channel: string, s3Config: TarballConfig['s3Config']): string;
-export declare function templateShortKey(type: keyof Config.PJSON.S3.Templates | 'macos' | 'win32' | 'deb', ext?: '.tar.gz' | '.tar.xz' | Config.IConfig.s3Key.Options, options?: Config.IConfig.s3Key.Options): string;
-export declare function debArch(arch: Config.ArchTypes): "amd64" | "i386" | "armel";
+export declare function templateShortKey(type: keyof Interfaces.PJSON.S3.Templates | 'macos' | 'win32' | 'deb', ext?: '.tar.gz' | '.tar.xz' | Interfaces.Config.s3Key.Options, options?: Interfaces.Config.s3Key.Options): string;
+export declare function debArch(arch: Interfaces.ArchTypes): string;
 export declare function debVersion(buildConfig: TarballConfig): string;

package/lib/upload-util.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.debVersion = exports.debArch = exports.templateShortKey = exports.channelAWSDir = exports.commitAWSDir = void 0;
 const path = require("path");
 function commitAWSDir(version, sha, s3Config) {
     let s3SubDir = s3Config.folder || '';
@@ -19,7 +20,9 @@ exports.channelAWSDir = channelAWSDir;
 // When this pkg starts using oclif/core
 // refactor this key name lookup
 // helper to oclif/core
-function templateShortKey(type, ext, options = { root: '.' }) {
+function templateShortKey(type, ext, 
+// eslint-disable-next-line unicorn/no-object-as-default-parameter
+options = { root: '.' }) {
     if (typeof ext === 'object')
         options = Object.assign(options, ext);
     else if (ext)
@@ -48,7 +51,7 @@ function debArch(arch) {
 }
 exports.debArch = debArch;
 function debVersion(buildConfig) {
-    return `${buildConfig.version.split('-')[0]}.${buildConfig.gitSha}-1`;
+    return `${buildConfig.config.version.split('-')[0]}.${buildConfig.gitSha}-1`;
     // see debian_revision: https://www.debian.org/doc/debian-policy/ch-controlfields.html
 }
 exports.debVersion = debVersion;

package/lib/util.js

@@ -1,23 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortVersionsObjectByKeysDesc = exports.template = exports.sortBy = exports.compact = exports.uniqBy = exports.castArray = void 0;
 const _ = require("lodash");
-function compare(a, b) {
-    a = a === undefined ? 0 : a;
-    b = b === undefined ? 0 : b;
-    if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length === 0 && b.length === 0)
-            return 0;
-        const diff = compare(a[0], b[0]);
-        if (diff !== 0)
-            return diff;
-        return compare(a.slice(1), b.slice(1));
-    }
-    if (a < b)
-        return -1;
-    if (a > b)
-        return 1;
-    return 0;
-}
 function castArray(input) {
     if (input === undefined)
         return [];
@@ -27,7 +11,7 @@ exports.castArray = castArray;
 function uniqBy(arr, fn) {
     return arr.filter((a, i) => {
         const aVal = fn(a);
-        return !arr.some((b, j) => j > i && fn(b) === aVal);
+        return !arr.find((b, j) => j > i && fn(b) === aVal);
     });
 }
 exports.uniqBy = uniqBy;
@@ -36,11 +20,30 @@ function compact(a) {
 }
 exports.compact = compact;
 function sortBy(arr, fn) {
+    function compare(a, b) {
+        a = a === undefined ? 0 : a;
+        b = b === undefined ? 0 : b;
+        if (Array.isArray(a) && Array.isArray(b)) {
+            if (a.length === 0 && b.length === 0)
+                return 0;
+            const diff = compare(a[0], b[0]);
+            if (diff !== 0)
+                return diff;
+            return compare(a.slice(1), b.slice(1));
+        }
+        if (a < b)
+            return -1;
+        if (a > b)
+            return 1;
+        return 0;
+    }
     return arr.sort((a, b) => compare(fn(a), fn(b)));
 }
 exports.sortBy = sortBy;
-exports.template = (context) => (t) => _.template(t || '')(context);
-exports.sortVersionsObjectByKeysDesc = (input) => {
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+const template = (context) => (t) => _.template(t || '')(context);
+exports.template = template;
+const sortVersionsObjectByKeysDesc = (input) => {
     const keys = Reflect.ownKeys(input).sort((a, b) => {
         const splitA = a.split('.').map(part => Number.parseInt(part, 10));
         const splitB = b.split('.').map(part => Number.parseInt(part, 10));
@@ -67,3 +70,4 @@ exports.sortVersionsObjectByKeysDesc = (input) => {
     }
     return result;
 };
+exports.sortVersionsObjectByKeysDesc = sortVersionsObjectByKeysDesc;

package/lib/version-indexes.d.ts

@@ -1,10 +1,8 @@
+import { BuildConfig } from './tarballs';
 export declare const appendToIndex: (input: {
     version: string;
     originalUrl: string;
     filename: string;
     maxAge: string;
-    s3Config: import("@oclif/config").PJSON.S3 & {
-        folder?: string | undefined;
-        indexVersionLimit?: number | undefined;
-    };
+    s3Config: BuildConfig['s3Config'];
 }) => Promise<void>;

package/lib/version-indexes.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.appendToIndex = void 0;
 const fs = require("fs-extra");
 const path = require("path");
 const aws_1 = require("./aws");
@@ -33,7 +34,7 @@ const sortVersionsObjectByKeysDesc = (input, keyLimit) => {
     return result;
 };
 // appends to an existing file (or writes a new one) with the versions in descending order, with an optional limit from the pjson file
-exports.appendToIndex = async (input) => {
+const appendToIndex = async (input) => {
     var _a;
     const { version, originalUrl, filename, maxAge, s3Config } = input;
     // these checks are both nice for users AND helpful for TS
@@ -67,3 +68,4 @@ exports.appendToIndex = async (input) => {
     // cleans up local fs
     await fs.remove(jsonFileName);
 };
+exports.appendToIndex = appendToIndex;

package/package.json

@@ -1,68 +1,68 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "2.0.0",
-  "author": "Jeff Dickey @jdxcode",
+  "version": "2.0.1",
+  "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"
   },
   "bugs": "https://github.com/oclif/oclif/issues",
   "dependencies": {
-    "@oclif/command": "^1.8.6",
-    "@oclif/config": "^1.17.1",
-    "@oclif/errors": "^1.3.5",
+    "@oclif/core": "1.0.10",
     "@oclif/fixpack": "^2.3.0",
-    "@oclif/plugin-help": "^3.2.9",
-    "@oclif/plugin-not-found": "^1.2.2",
-    "@oclif/plugin-warn-if-update-available": "^1.7.3",
-    "cli-ux": "^5.6.4",
+    "@oclif/plugin-help": "5.1.9",
+    "@oclif/plugin-not-found": "^2.2.2",
+    "@oclif/plugin-warn-if-update-available": "^2.0.2",
+    "cli-ux": "6.0.6",
     "debug": "^4.1.1",
     "find-yarn-workspace-root": "^2.0.0",
     "fs-extra": "^8.1",
     "github-slugger": "^1.2.1",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.11",
     "normalize-package-data": "^3.0.0",
     "nps-utils": "^1.7.0",
     "qqjs": "^0.3.10",
+    "semver": "^7.3.5",
     "sort-pjson": "^1.0.3",
     "tslib": "^2.0.0",
-    "yeoman-environment": "^2.10.3",
-    "yeoman-generator": "3.2.0",
+    "yeoman-environment": "^2.3.4",
+    "yeoman-generator": "3",
     "yosay": "^2.0.2"
   },
   "devDependencies": {
-    "@oclif/dev-cli": "^1.26.5",
-    "@oclif/plugin-legacy": "^1.2.2",
-    "@oclif/test": "^1.2.8",
-    "@types/chai": "^4.1.7",
+    "@oclif/plugin-legacy": "^1.2.5",
+    "@oclif/test": "^2.0.2",
+    "@types/chai": "^4.3.0",
     "@types/execa": "^0.9.0",
     "@types/fs-extra": "^9.0",
     "@types/lodash": "^4.14.121",
+    "@types/lodash.template": "^4.4.6",
     "@types/mocha": "^8.0.0",
-    "@types/node": "^14.0.14",
+    "@types/node": "^14.18.0",
     "@types/read-pkg": "^5.1.0",
+    "@types/semver": "^7.3.9",
     "@types/shelljs": "^0.8.3",
     "@types/supports-color": "^7.2.0",
     "@types/write-json-file": "^3.2.1",
-    "@types/yeoman-environment": "^2.10.5",
+    "@types/yeoman-environment": "^2.10.2",
     "@types/yosay": "^0.0.29",
-    "aws-sdk": "^2.443.0",
+    "aws-sdk": "^2.1044.0",
     "chai": "^4.2.0",
     "conventional-changelog-cli": "^2.0.17",
     "eslint": "^7.3.2",
     "eslint-config-oclif": "^4.0.0",
     "eslint-config-oclif-typescript": "^1.0.2",
-    "execa": "^0.10.0",
+    "execa": "^0.11.0",
     "fancy-test": "^1.4.10",
     "globby": "^11.0.1",
-    "mocha": "^8.2.1",
+    "mocha": "^9.1.3",
     "npm-run-path": "^4.0.1",
     "nps": "^5.9.3",
     "shelljs": "^0.8.3",
     "shx": "^0.3.3",
     "tmp": "^0.2.1",
     "ts-node": "^9.0.0",
-    "typescript": "3.8.3"
+    "typescript": "4.4.3"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -116,16 +116,16 @@
   },
   "repository": "oclif/oclif",
   "scripts": {
-    "build": "rm -rf lib && tsc",
+    "build": "shx rm -rf lib && tsc",
     "devcli:lint": "eslint . --ext .ts --config .eslintrc",
     "devcli:test": "mocha --forbid-only \"test/*.test.ts\"",
     "devcli": "yarn build --noEmit && yarn run devcli:test && yarn run devcli:lint",
     "lint": "nps lint",
-    "postpack": "rm .oclif.manifest.json",
+    "postpack": "shx rm .oclif.manifest.json",
     "posttest": "yarn run lint",
-    "prepack": "rm -rf lib && tsc && oclif-dev manifest",
-    "version": "oclif-dev readme && git add README.md",
-    "test": "nps test"
+    "prepack": "shx rm -rf lib && tsc && bin/dev manifest .",
+    "test": "nps test",
+    "version": "bin/dev readme && git add README.md"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/lib/app-command.d.ts

@@ -1,12 +0,0 @@
-import { flags } from '@oclif/command';
-import Base from './command-base';
-export default abstract class AppCommand extends Base {
-    static flags: flags.Input<any>;
-    static args: {
-        name: string;
-        required: boolean;
-        description: string;
-    }[];
-    abstract type: string;
-    run(): Promise<void>;
-}

package/lib/app-command.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
-const command_base_1 = require("./command-base");
-class AppCommand extends command_base_1.default {
-    async run() {
-        const { flags, args } = this.parse(AppCommand);
-        const options = flags.options ? flags.options.split(',') : [];
-        await super.generate('app', {
-            type: this.type,
-            path: args.path,
-            options,
-            defaults: flags.defaults,
-            force: flags.force,
-        });
-    }
-}
-exports.default = AppCommand;
-AppCommand.flags = {
-    defaults: command_1.flags.boolean({ description: 'use defaults for every setting' }),
-    options: command_1.flags.string({ description: '(yarn|typescript|eslint|mocha)' }),
-    force: command_1.flags.boolean({ description: 'overwrite existing files' }),
-};
-AppCommand.args = [
-    { name: 'path', required: false, description: 'path to project, defaults to current directory' },
-];

package/lib/commands/base.d.ts

@@ -1,5 +0,0 @@
-import AppCommand from '../app-command';
-export default class extends AppCommand {
-    static hidden: boolean;
-    type: string;
-}

package/lib/commands/base.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const app_command_1 = require("../app-command");
-class default_1 extends app_command_1.default {
-    constructor() {
-        super(...arguments);
-        this.type = 'base';
-    }
-}
-exports.default = default_1;
-default_1.hidden = true;

package/lib/commands/command.d.ts

@@ -1,17 +0,0 @@
-import { flags } from '@oclif/command';
-import Base from '../command-base';
-export interface Options {
-    name: string;
-    defaults?: boolean;
-    force?: boolean;
-}
-export default abstract class AppCommand extends Base {
-    static description: string;
-    static flags: flags.Input<any>;
-    static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
-    run(): Promise<void>;
-}

package/lib/commands/command.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
-const command_base_1 = require("../command-base");
-class AppCommand extends command_base_1.default {
-    async run() {
-        const { flags, args } = this.parse(AppCommand);
-        await super.generate('command', {
-            name: args.name,
-            defaults: flags.defaults,
-            force: flags.force,
-        });
-    }
-}
-exports.default = AppCommand;
-AppCommand.description = 'add a command to an existing CLI or plugin';
-AppCommand.flags = {
-    defaults: command_1.flags.boolean({ description: 'use defaults for every setting' }),
-    force: command_1.flags.boolean({ description: 'overwrite existing files' }),
-};
-AppCommand.args = [
-    { name: 'name', description: 'name of command', required: true },
-];

package/lib/commands/hook.d.ts

@@ -1,18 +0,0 @@
-import { flags } from '@oclif/command';
-import Base from '../command-base';
-export interface Options {
-    name: string;
-    defaults?: boolean;
-    force?: boolean;
-    event: string;
-}
-export default abstract class HookCommand extends Base {
-    static description: string;
-    static flags: flags.Input<any>;
-    static args: {
-        name: string;
-        description: string;
-        required: boolean;
-    }[];
-    run(): Promise<void>;
-}

package/lib/commands/hook.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@oclif/command");
-const command_base_1 = require("../command-base");
-class HookCommand extends command_base_1.default {
-    async run() {
-        const { flags, args } = this.parse(HookCommand);
-        await super.generate('hook', {
-            name: args.name,
-            event: flags.event,
-            defaults: flags.defaults,
-            force: flags.force,
-        });
-    }
-}
-exports.default = HookCommand;
-HookCommand.description = 'add a hook to an existing CLI or plugin';
-HookCommand.flags = {
-    defaults: command_1.flags.boolean({ description: 'use defaults for every setting' }),
-    force: command_1.flags.boolean({ description: 'overwrite existing files' }),
-    event: command_1.flags.string({ description: 'event to run hook on', default: 'init' }),
-};
-HookCommand.args = [
-    { name: 'name', description: 'name of hook (snake_case)', required: true },
-];

package/lib/commands/multi.d.ts

@@ -1,5 +0,0 @@
-import AppCommand from '../app-command';
-export default class extends AppCommand {
-    static description: string;
-    type: string;
-}

package/lib/commands/multi.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const app_command_1 = require("../app-command");
-class default_1 extends app_command_1.default {
-    constructor() {
-        super(...arguments);
-        this.type = 'multi';
-    }
-}
-exports.default = default_1;
-default_1.description = 'generate a new multi-command CLI';

package/lib/commands/plugin.d.ts

@@ -1,5 +0,0 @@
-import AppCommand from '../app-command';
-export default class extends AppCommand {
-    static description: string;
-    type: string;
-}

package/lib/commands/plugin.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const app_command_1 = require("../app-command");
-class default_1 extends app_command_1.default {
-    constructor() {
-        super(...arguments);
-        this.type = 'plugin';
-    }
-}
-exports.default = default_1;
-default_1.description = 'create a new CLI plugin';

package/lib/commands/single.d.ts

@@ -1,5 +0,0 @@
-import AppCommand from '../app-command';
-export default class extends AppCommand {
-    static description: string;
-    type: string;
-}

package/lib/commands/single.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const app_command_1 = require("../app-command");
-class default_1 extends app_command_1.default {
-    constructor() {
-        super(...arguments);
-        this.type = 'single';
-    }
-}
-exports.default = default_1;
-default_1.description = 'generate a new single-command CLI';