@oclif/plugin-update 4.2.14 → 4.3.0

package/README.md

@@ -55,7 +55,7 @@ EXAMPLES
     $ oclif-example update --available
 ```
 
-_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v4.2.14/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v4.3.0/src/commands/update.ts)_
 <!-- commandsstop -->
 
 # Contributing

package/dist/commands/update.d.ts

@@ -1,7 +1,7 @@
 import { Command } from '@oclif/core';
 export default class UpdateCommand extends Command {
     static args: {
-        channel: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
+        channel: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static description: string;
     static examples: {
@@ -9,11 +9,11 @@ export default class UpdateCommand extends Command {
         description: string;
     }[];
     static flags: {
-        autoupdate: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        available: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        interactive: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        version: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        autoupdate: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        available: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        interactive: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/update.js

@@ -2,6 +2,7 @@ import select from '@inquirer/select';
 import { Args, Command, Flags, ux } from '@oclif/core';
 import { basename } from 'node:path';
 import { sort } from 'semver';
+import TtyTable from 'tty-table';
 import { Updater } from '../update.js';
 export default class UpdateCommand extends Command {
     static args = {
@@ -51,12 +52,17 @@ export default class UpdateCommand extends Command {
         const updater = new Updater(this.config);
         if (flags.available) {
             const [index, localVersions] = await Promise.all([updater.fetchVersionIndex(), updater.findLocalVersions()]);
-            const allVersions = sort(Object.keys(index)).reverse();
-            const table = allVersions.map((version) => {
+            // eslint-disable-next-line new-cap
+            const t = TtyTable([
+                { align: 'left', value: 'Location' },
+                { align: 'left', value: 'Version' },
+            ], sort(Object.keys(index))
+                .reverse()
+                .map((version) => {
                 const location = localVersions.find((l) => basename(l).startsWith(version)) || index[version];
-                return { location, version };
-            });
-            ux.table(table, { location: {}, version: {} });
+                return [location, version];
+            }), { compact: true });
+            ux.stdout(t.render());
             return;
         }
         if (args.channel && flags.version) {

package/dist/update.js

@@ -1,5 +1,6 @@
 import { Config, ux } from '@oclif/core';
 import chalk from 'chalk';
+import makeDebug from 'debug';
 import fileSize from 'filesize';
 import { got } from 'got';
 import { existsSync } from 'node:fs';
@@ -7,6 +8,7 @@ import { mkdir, readFile, readdir, rm, stat, symlink, utimes, writeFile } from '
 import { basename, dirname, join } from 'node:path';
 import { Extractor } from './tar.js';
 import { ls, wait } from './util.js';
+const debug = makeDebug('oclif:update');
 const filesize = (n) => {
     const [num, suffix] = fileSize(n, { output: 'array' });
     return Number.parseFloat(num).toFixed(1) + ` ${suffix}`;
@@ -73,8 +75,8 @@ export class Updater {
             }
             await this.config.runHook('update', { channel, version });
             ux.action.stop();
-            ux.log();
-            ux.log(`Updating to a specific version will not update the channel. If autoupdate is enabled, the CLI will eventually be updated back to ${channel}.`);
+            ux.stdout();
+            ux.stdout(`Updating to a specific version will not update the channel. If autoupdate is enabled, the CLI will eventually be updated back to ${channel}.`);
         }
         else {
             const manifest = await fetchChannelManifest(channel, this.config);
@@ -91,7 +93,7 @@ export class Updater {
         }
         await this.touch();
         await this.tidy();
-        ux.debug('done');
+        debug('done');
     }
     async createBin(version) {
         const dst = this.clientBin;
@@ -149,7 +151,7 @@ ${binPathEnvVar}="\$DIR/${bin}" ${redirectedEnvVar}=1 "$DIR/../${version}/bin/${
     }
     // removes any unused CLIs
     async tidy() {
-        ux.debug('tidy');
+        debug('tidy');
         try {
             const root = this.clientRoot;
             if (!existsSync(root))
@@ -173,7 +175,7 @@ ${binPathEnvVar}="\$DIR/${bin}" ${redirectedEnvVar}=1 "$DIR/../${version}/bin/${
         // touch the client so it won't be tidied up right away
         try {
             const p = join(this.clientRoot, this.config.version);
-            ux.debug('touching client at', p);
+            debug('touching client at', p);
             if (!existsSync(p))
                 return;
             return utimes(p, new Date(), new Date());
@@ -226,14 +228,14 @@ const notUpdatable = (config) => {
             ux.warn(instructions);
             // once the spinner stops, it'll eat this blank line
             // https://github.com/oclif/core/issues/799
-            ux.log();
+            ux.stdout();
         }
         return true;
     }
     return false;
 };
 const composeS3SubDir = (config) => {
-    let s3SubDir = config.pjson.oclif.update.s3.folder || '';
+    let s3SubDir = config.pjson.oclif.update?.s3?.folder || '';
     if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')
         s3SubDir = `${s3SubDir}/`;
     return s3SubDir;
@@ -272,16 +274,16 @@ const debounce = async (cacheDir) => {
     if (m > new Date()) {
         const msg = `waiting until ${m.toISOString()} to update`;
         if (output) {
-            ux.debug(msg);
+            debug(msg);
         }
         else {
-            ux.log(msg);
+            ux.stdout(msg);
             output = true;
         }
         await wait(60 * 1000); // wait 1 minute
         return debounce(cacheDir);
     }
-    ux.log('time to update');
+    ux.stdout('time to update');
 };
 const setChannel = async (channel, dataDir) => writeFile(join(dataDir, 'channel'), channel, 'utf8');
 const fetchChannelManifest = async (channel, config) => {
@@ -358,10 +360,10 @@ const determineCurrentVersion = async (clientBin, version) => {
     }
     catch (error) {
         if (error instanceof Error) {
-            ux.debug(error.name, error.message);
+            debug(error.name, error.message);
         }
         else if (typeof error === 'string') {
-            ux.debug(error);
+            debug(error);
         }
     }
     return version;

package/oclif.manifest.json

@@ -88,5 +88,5 @@
       ]
     }
   },
-  "version": "4.2.14"
+  "version": "4.3.0"
 }

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "4.2.14",
+  "version": "4.3.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {
     "@inquirer/select": "^2.3.4",
-    "@oclif/core": "^3.26.6",
+    "@oclif/core": "^4.0.0-beta.13",
     "chalk": "^5",
     "debug": "^4.3.1",
     "filesize": "^6.1.0",
     "got": "^13",
     "semver": "^7.6.0",
-    "tar-fs": "^2.1.1"
+    "tar-fs": "^2.1.1",
+    "tty-table": "^4.2.3"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^19",
@@ -38,7 +39,7 @@
     "oclif": "^4",
     "prettier": "^3.2.5",
     "shx": "^0.3.4",
-    "sinon": "^17",
+    "sinon": "^18.0.0",
     "strip-ansi": "^7.1.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"