oclif 3.3.1 → 3.4.0

package/lib/tarballs/build.js

@@ -2,76 +2,74 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = void 0;
 const findYarnWorkspaceRoot = require("find-yarn-workspace-root");
-const path = require("path");
-const qq = require("qqjs");
 const log_1 = require("../log");
+const path = require("path");
+const fs = require("fs-extra");
 const bin_1 = require("./bin");
 const node_1 = require("./node");
 const upload_util_1 = require("../upload-util");
+const util_1 = require("../util");
+const child_process_1 = require("child_process");
+const node_util_1 = require("node:util");
+const exec = (0, node_util_1.promisify)(child_process_1.exec);
 const pack = async (from, to) => {
-    const prevCwd = qq.cwd();
-    qq.cd(path.dirname(from));
-    await qq.mkdirp(path.dirname(to));
-    (0, log_1.log)(`packing tarball from ${qq.prettifyPaths(from)} to ${qq.prettifyPaths(to)}`);
-    await (to.endsWith('gz') ?
-        qq.x('tar', ['czf', to, path.basename(from)]) :
-        qq.x(`tar c "${path.basename(from)}" | xz > "${to}"`));
-    qq.cd(prevCwd);
+    const cwd = path.dirname(from);
+    await fs.promises.mkdir(path.dirname(to), { recursive: true });
+    (0, log_1.log)(`packing tarball from ${(0, util_1.prettifyPaths)(path.dirname(from))} to ${(0, util_1.prettifyPaths)(to)}`);
+    (to.endsWith('gz') ?
+        await exec(`tar czf ${to} ${(path.basename(from))}`, { cwd }) :
+        await exec(`tar cfJ ${to} ${(path.basename(from))}`, { cwd }));
 };
 async function build(c, options = {}) {
     const { xz, config } = c;
-    const prevCwd = qq.cwd();
     const packCLI = async () => {
-        const stdout = await qq.x.stdout('npm', ['pack', '--unsafe-perm'], { cwd: c.root });
-        return path.join(c.root, stdout.split('\n').pop());
+        const { stdout } = await exec('npm pack --unsafe-perm', { cwd: c.root });
+        return path.join(c.root, stdout.trim().split('\n').pop());
     };
     const extractCLI = async (tarball) => {
-        await qq.emptyDir(c.workspace());
-        await qq.mv(tarball, c.workspace());
-        tarball = path.basename(tarball);
-        tarball = qq.join([c.workspace(), tarball]);
-        qq.cd(c.workspace());
-        await qq.x(`tar -xzf "${tarball}"`);
-        // eslint-disable-next-line no-await-in-loop
-        for (const f of await qq.ls('package', { fullpath: true }))
-            await qq.mv(f, '.');
-        await qq.rm('package', tarball, 'bin/run.cmd');
+        await fs.emptyDir(c.workspace());
+        const tarballNewLocation = path.join(c.workspace(), path.basename(tarball));
+        await fs.move(tarball, tarballNewLocation);
+        await exec(`tar -xzf "${tarballNewLocation}"`, { cwd: c.workspace() });
+        await Promise.all((await fs.promises.readdir(path.join(c.workspace(), 'package'), { withFileTypes: true }))
+            .map(i => fs.move(path.join(c.workspace(), 'package', i.name), path.join(c.workspace(), i.name))));
+        await Promise.all([
+            fs.promises.rm(path.join(c.workspace(), 'package'), { recursive: true }),
+            fs.promises.rm(path.join(c.workspace(), path.basename(tarball)), { recursive: true }),
+            fs.remove(path.join(c.workspace(), 'bin', 'run.cmd')),
+        ]);
     };
     const updatePJSON = async () => {
-        qq.cd(c.workspace());
-        const pjson = await qq.readJSON('package.json');
+        const pjsonPath = path.join(c.workspace(), 'package.json');
+        const pjson = await fs.readJSON(pjsonPath);
         pjson.version = config.version;
         pjson.oclif.update = pjson.oclif.update || {};
         pjson.oclif.update.s3 = pjson.oclif.update.s3 || {};
         pjson.oclif.update.s3.bucket = c.s3Config.bucket;
-        await qq.writeJSON('package.json', pjson);
+        await fs.writeJSON(pjsonPath, pjson);
     };
     const addDependencies = async () => {
-        qq.cd(c.workspace());
         const yarnRoot = findYarnWorkspaceRoot(c.root) || c.root;
-        const yarn = await qq.exists([yarnRoot, 'yarn.lock']);
-        if (yarn) {
-            await qq.cp([yarnRoot, 'yarn.lock'], '.');
-            await qq.x('yarn --no-progress --production --non-interactive');
+        if (fs.existsSync(path.join(yarnRoot, 'yarn.lock'))) {
+            await fs.copy(path.join(yarnRoot, 'yarn.lock'), path.join(c.workspace(), 'yarn.lock'));
+            await exec('yarn --no-progress --production --non-interactive', { cwd: c.workspace() });
         }
         else {
-            let lockpath = qq.join(c.root, 'package-lock.json');
-            if (!await qq.exists(lockpath)) {
-                lockpath = qq.join(c.root, 'npm-shrinkwrap.json');
-            }
-            await qq.cp(lockpath, '.');
-            await qq.x('npm install --production');
+            const lockpath = fs.existsSync(path.join(c.root, 'package-lock.json')) ?
+                path.join(c.root, 'package-lock.json') :
+                path.join(c.root, 'npm-shrinkwrap.json');
+            await fs.copy(lockpath, path.join(c.workspace(), path.basename(lockpath)));
+            await exec('npm install --production', { cwd: c.workspace() });
         }
     };
     const pretarball = async () => {
-        qq.cd(c.workspace());
-        const pjson = await qq.readJSON('package.json');
+        const pjson = await fs.readJSON(path.join(c.workspace(), 'package.json'));
         const yarnRoot = findYarnWorkspaceRoot(c.root) || c.root;
-        const yarn = await qq.exists([yarnRoot, 'yarn.lock']);
+        const yarn = fs.existsSync(path.join(yarnRoot, 'yarn.lock'));
         if (pjson.scripts.pretarball) {
             yarn ?
-                await qq.x('yarn run pretarball') :
-                await qq.x('npm run pretarball', {});
+                await exec('yarn run pretarball', { cwd: c.workspace() }) :
+                await exec('npm run pretarball', { cwd: c.workspace() });
         }
     };
     const buildTarget = async (target) => {
@@ -93,14 +91,14 @@ async function build(c, options = {}) {
         const base = path.basename(gzLocalKey);
         (0, log_1.log)(`building target ${base}`);
         (0, log_1.log)('copying workspace', c.workspace(), workspace);
-        await qq.rm(workspace);
-        await qq.cp(c.workspace(), workspace);
+        await fs.emptyDir(workspace);
+        await fs.copy(c.workspace(), workspace);
         await (0, node_1.fetchNodeBinary)({
             nodeVersion: c.nodeVersion,
             output: path.join(workspace, 'bin', 'node'),
             platform: target.platform,
             arch: target.arch,
-            tmp: qq.join(config.root, 'tmp'),
+            tmp: path.join(config.root, 'tmp'),
         });
         if (options.pack === false)
             return;
@@ -118,6 +116,7 @@ async function build(c, options = {}) {
         const rollout = (typeof c.updateConfig.autoupdate === 'object' && c.updateConfig.autoupdate.rollout);
         const gzCloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, c.gitSha, c.updateConfig.s3)}/${gzLocalKey}`;
         const xzCloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, c.gitSha, c.updateConfig.s3)}/${xzLocalKey}`;
+        const [sha256gz, sha256xz] = await Promise.all([(0, util_1.hash)('sha256', c.dist(gzLocalKey))].concat(xz ? [(0, util_1.hash)('sha256', c.dist(xzLocalKey))] : []));
         const manifest = {
             rollout: rollout === false ? undefined : rollout,
             version: config.version,
@@ -125,8 +124,8 @@ async function build(c, options = {}) {
             baseDir: (0, upload_util_1.templateShortKey)('baseDir', target, { bin: c.config.bin }),
             gz: config.s3Url(gzCloudKey),
             xz: xz ? config.s3Url(xzCloudKey) : undefined,
-            sha256gz: await qq.hash('sha256', c.dist(gzLocalKey)),
-            sha256xz: xz ? await qq.hash('sha256', c.dist(xzLocalKey)) : undefined,
+            sha256gz,
+            sha256xz,
             node: {
                 compatible: config.pjson.engines.node,
                 recommended: c.nodeVersion,
@@ -139,7 +138,7 @@ async function build(c, options = {}) {
             sha: c.gitSha,
             version: config.version,
         }));
-        await qq.writeJSON(manifestFilepath, manifest);
+        await fs.writeJSON(manifestFilepath, manifest);
     };
     (0, log_1.log)(`gathering workspace for ${config.bin} to ${c.workspace()}`);
     await extractCLI(options.tarball ? options.tarball : await packCLI());
@@ -158,7 +157,7 @@ async function build(c, options = {}) {
             // eslint-disable-next-line no-await-in-loop
             await buildTarget(target);
         }
+        (0, log_1.log)(`finished building ${targetsToBuild.length} targets sequentially`);
     }
-    qq.cd(prevCwd);
 }
 exports.build = build;

package/lib/tarballs/config.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildConfig = exports.gitSha = exports.TARGETS = void 0;
 const core_1 = require("@oclif/core");
 const path = require("path");
-const qq = require("qqjs");
 const semver = require("semver");
+const fs = require("fs-extra");
 const util_1 = require("../util");
 const upload_util_1 = require("../upload-util");
+const child_process_1 = require("child_process");
+const node_util_1 = require("node:util");
+const exec = (0, node_util_1.promisify)(child_process_1.exec);
 exports.TARGETS = [
     'linux-x64',
     'linux-arm',
@@ -17,12 +20,12 @@ exports.TARGETS = [
 ];
 async function gitSha(cwd, options = {}) {
     const args = options.short ? ['rev-parse', '--short', 'HEAD'] : ['rev-parse', 'HEAD'];
-    return qq.x.stdout('git', args, { cwd });
+    return (await exec(`git ${args.join(' ')}`, { cwd })).stdout.trim();
 }
 exports.gitSha = gitSha;
 async function Tmp(config) {
     const tmp = path.join(config.root, 'tmp');
-    await qq.mkdirp(tmp);
+    await fs.promises.mkdir(tmp, { recursive: true });
     return tmp;
 }
 async function buildConfig(root, options = {}) {
@@ -58,10 +61,10 @@ async function buildConfig(root, options = {}) {
         s3Config: updateConfig.s3,
         nodeVersion,
         workspace(target) {
-            const base = qq.join(config.root, 'tmp');
+            const base = path.join(config.root, 'tmp');
             if (target && target.platform)
-                return qq.join(base, [target.platform, target.arch].join('-'), (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
-            return qq.join(base, (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
+                return path.join(base, [target.platform, target.arch].join('-'), (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
+            return path.join(base, (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
         },
         targets,
     };

package/lib/tarballs/node.js

@@ -3,11 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchNodeBinary = void 0;
 const core_1 = require("@oclif/core");
 const path = require("path");
-const qq = require("qqjs");
+const fs = require("fs-extra");
+const node_stream_1 = require("node:stream");
 const log_1 = require("../log");
+const node_child_process_1 = require("node:child_process");
+const node_util_1 = require("node:util");
+const got_1 = require("got");
+const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
+const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 async function checkFor7Zip() {
     try {
-        await qq.x('7z', { stdio: [0, null, 2] });
+        await exec('7z');
     }
     catch (error) {
         if (error.code === 127)
@@ -34,38 +40,42 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
         cache += '.exe';
     const download = async () => {
         (0, log_1.log)(`downloading ${nodeBase}`);
+        await Promise.all([
+            fs.ensureDir(path.join(tmp, 'cache', nodeVersion)),
+            fs.ensureDir(path.join(tmp, 'node')),
+        ]);
         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);
+        if (!fs.existsSync(shasums)) {
+            await pipeline(got_1.default.stream(`https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt.asc`), fs.createWriteStream(shasums));
         }
         const basedir = path.dirname(tarball);
-        await qq.mkdirp(basedir);
-        await qq.download(url, tarball);
+        await fs.promises.mkdir(basedir, { recursive: true });
+        await pipeline(got_1.default.stream(url), fs.createWriteStream(tarball));
         if (platform !== 'win32')
-            await qq.x(`grep "${path.basename(tarball)}" "${shasums}" | shasum -a 256 -c -`, { cwd: basedir });
+            await exec(`grep "${path.basename(tarball)}" "${shasums}" | shasum -a 256 -c -`, { cwd: basedir });
     };
     const extract = async () => {
         (0, log_1.log)(`extracting ${nodeBase}`);
         const nodeTmp = path.join(tmp, 'node');
-        await qq.mkdirp(nodeTmp);
-        await qq.mkdirp(path.dirname(cache));
+        await fs.promises.mkdir(nodeTmp, { recursive: true });
+        await fs.promises.mkdir(path.dirname(cache), { recursive: true });
         if (platform === 'win32') {
-            await qq.x(`7z x -bd -y "${tarball}"`, { cwd: nodeTmp });
-            await qq.mv([nodeTmp, nodeBase, 'node.exe'], cache);
+            await exec(`7z x -bd -y "${tarball}"`, { cwd: nodeTmp });
+            await fs.move(path.join(nodeTmp, nodeBase, 'node.exe'), path.join(cache, 'node.exe'));
         }
         else {
-            await qq.x(`tar -C "${tmp}/node" -xJf "${tarball}"`);
-            await qq.mv([nodeTmp, nodeBase, 'bin/node'], cache);
+            await exec(`tar -C "${tmp}/node" -xJf "${tarball}"`);
+            await fs.move(path.join(nodeTmp, nodeBase, 'bin', 'node'), path.join(cache, 'node'));
         }
     };
-    if (await qq.exists(cache)) {
-        await qq.cp(cache, output);
-    }
-    else {
+    if (!fs.existsSync(cache)) {
         await download();
         await extract();
-        await qq.cp(cache, output);
     }
+    await fs.copy(path.join(cache, getFilename(platform)), output);
     return output;
 }
 exports.fetchNodeBinary = fetchNodeBinary;
+const getFilename = (platform) => {
+    return platform === 'win32' ? 'node.exe' : 'node';
+};

package/lib/util.d.ts

@@ -10,4 +10,6 @@ interface VersionsObject {
     [key: string]: string;
 }
 export declare const sortVersionsObjectByKeysDesc: (input: VersionsObject) => VersionsObject;
+export declare const prettifyPaths: (input: string) => string;
+export declare const hash: (algo: string, fp: string | string[]) => Promise<string>;
 export {};

package/lib/util.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortVersionsObjectByKeysDesc = exports.template = exports.sortBy = exports.compact = exports.uniqBy = exports.castArray = void 0;
+exports.hash = exports.prettifyPaths = exports.sortVersionsObjectByKeysDesc = exports.template = exports.sortBy = exports.compact = exports.uniqBy = exports.castArray = void 0;
 const _ = require("lodash");
+const os = require("os");
+const crypto = require("node:crypto");
+const log_1 = require("./log");
+const fs = require("fs-extra");
 function castArray(input) {
     if (input === undefined)
         return [];
@@ -71,3 +75,19 @@ const sortVersionsObjectByKeysDesc = (input) => {
     return result;
 };
 exports.sortVersionsObjectByKeysDesc = sortVersionsObjectByKeysDesc;
+const homeRegexp = new RegExp(`\\B${os.homedir().replace('/', '\\/')}`, 'g');
+const curRegexp = new RegExp(`\\B${process.cwd()}`, 'g');
+const prettifyPaths = (input) => (input !== null && input !== void 0 ? input : '').toString().replace(curRegexp, '.').replace(homeRegexp, '~');
+exports.prettifyPaths = prettifyPaths;
+const hash = async (algo, fp) => {
+    const f = Array.isArray(fp) ? fp.join('') : fp;
+    (0, log_1.log)('hash', algo, f);
+    return new Promise((resolve, reject) => {
+        const hashInProgress = crypto.createHash(algo);
+        const stream = fs.createReadStream(f);
+        stream.on('error', err => reject(err));
+        stream.on('data', chunk => hashInProgress.update(chunk));
+        stream.on('end', () => resolve(hashInProgress.digest('hex')));
+    });
+};
+exports.hash = hash;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"
@@ -18,9 +18,9 @@
     "find-yarn-workspace-root": "^2.0.0",
     "fs-extra": "^8.1",
     "github-slugger": "^1.5.0",
+    "got": "^11",
     "lodash": "^4.17.21",
     "normalize-package-data": "^3.0.3",
-    "qqjs": "^0.3.11",
     "semver": "^7.3.8",
     "tslib": "^2.3.1",
     "yeoman-environment": "^3.11.1",
@@ -33,10 +33,10 @@
     "@types/chai": "^4.3.4",
     "@types/execa": "^0.9.0",
     "@types/fs-extra": "^9.0",
-    "@types/lodash": "^4.14.186",
+    "@types/lodash": "^4.14.191",
     "@types/lodash.template": "^4.5.0",
     "@types/mocha": "^8.2.3",
-    "@types/node": "^14.18.33",
+    "@types/node": "^14.18.34",
     "@types/read-pkg": "^5.1.0",
     "@types/semver": "^7.3.13",
     "@types/shelljs": "^0.8.11",
@@ -62,12 +62,10 @@
     "typescript": "4.5.5"
   },
   "resolutions": {
-    "colors": "1.4.0",
-    "@oclif/core": "^1.16.1"
+    "colors": "1.4.0"
   },
   "overrides": {
-    "colors": "1.4.0",
-    "@oclif/core": "^1.16.1"
+    "colors": "1.4.0"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -103,7 +101,7 @@
         "debounce": 60
       },
       "node": {
-        "version": "12.12.0"
+        "version": "16.13.2"
       },
       "s3": {
         "bucket": "dfc-data-production",