@oclif/plugin-update 5.0.0 → 5.0.1

package/README.md

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

package/dist/commands/update.d.ts

@@ -1,4 +1,4 @@
-import { Command, Interfaces } from '@oclif/core';
+import { Command, type Interfaces } from '@oclif/core';
 export default class UpdateCommand extends Command {
     static args: {
         channel: Interfaces.Arg<string | undefined, Record<string, unknown>>;

package/dist/hooks/init.d.ts

@@ -1,2 +1,2 @@
-import { Interfaces } from '@oclif/core';
+import { type Interfaces } from '@oclif/core';
 export declare const init: Interfaces.Hook<'init'>;

package/dist/hooks/init.js

@@ -81,10 +81,12 @@ export const init = async function (opts) {
         detached: !config.windows,
         env: autoupdateEnv,
         stdio: ['ignore', stream, stream],
-        ...(config.windows ? { shell: true } : {}),
+        ...(config.windows && { shell: true }),
     })
-        .on('error', (e) => process.emitWarning(e))
-        .on('close', () => fd.close())
+        .on('error', (e) => {
+        process.emitWarning(e);
+    })
+        .on('close', async () => fd.close())
         .unref();
     async function claimAutoupdate(markerPath) {
         // Fast path: try to atomically create the marker. Wins the race when no

package/dist/tar.js

@@ -24,16 +24,16 @@ const ignore = (_name, header) => {
     }
 };
 async function extract(stream, basename, output, sha) {
-    const getTmp = () => `${output}.partial.${Math.random().toString().split('.')[1].slice(0, 5)}`;
+    const getTmp = () => `${output}.partial.${Math.random().toString().split('.', 2)[1].slice(0, 5)}`;
     let tmp = getTmp();
     if (existsSync(tmp))
         tmp = getTmp();
     debug(`extracting to ${tmp}`);
     try {
         await new Promise((resolve, reject) => {
-            let shaValidated = false;
-            let extracted = false;
-            const check = () => shaValidated && extracted && resolve(null);
+            let isShaValidated = false;
+            let isExtracted = false;
+            const check = () => isShaValidated && isExtracted && resolve(null);
             if (sha) {
                 const hasher = crypto.createHash('sha256');
                 stream.on('error', reject);
@@ -41,7 +41,7 @@ async function extract(stream, basename, output, sha) {
                 stream.on('end', () => {
                     const shasum = hasher.digest('hex');
                     if (sha === shasum) {
-                        shaValidated = true;
+                        isShaValidated = true;
                         check();
                     }
                     else {
@@ -50,11 +50,11 @@ async function extract(stream, basename, output, sha) {
                 });
             }
             else
-                shaValidated = true;
+                isShaValidated = true;
             const extract = tarExtract(tmp, { ignore });
             extract.on('error', reject);
             extract.on('finish', () => {
-                extracted = true;
+                isExtracted = true;
                 check();
             });
             const gunzip = zlib.createGunzip();

package/dist/update.js

@@ -71,8 +71,8 @@ export class Updater {
             determineCurrentVersion(this.clientBin, this.config.version),
         ]);
         if (version) {
-            const localVersion = force ? null : await this.findLocalVersion(version);
-            if (alreadyOnVersion(current, localVersion || null)) {
+            const localVersion = force ? undefined : await this.findLocalVersion(version);
+            if (alreadyOnVersion(current, localVersion ?? undefined)) {
                 ux.action.stop(this.config.scopedEnvVar('HIDE_UPDATED_MESSAGE') ? 'done' : `already on version ${current}`);
                 return;
             }
@@ -213,7 +213,7 @@ get_script_dir () {
             };
             await Promise.all(files
                 .filter((f) => isNotSpecial(f.path, this.config.version) && isOld(f.stat))
-                .map((f) => rm(f.path, { force: true, recursive: true })));
+                .map(async (f) => rm(f.path, { force: true, recursive: true })));
         }
         catch (error) {
             ux.warn(error);
@@ -289,7 +289,7 @@ const notUpdatable = (config) => {
 };
 const composeS3SubDir = (config) => {
     let s3SubDir = config.pjson.oclif.update?.s3?.folder || '';
-    if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')
+    if (s3SubDir !== '' && !s3SubDir.endsWith('/'))
         s3SubDir = `${s3SubDir}/`;
     return s3SubDir;
 };
@@ -334,10 +334,10 @@ const s3VersionManifestKey = ({ config, hash, version }) => {
 // a new one when it's again "needed".
 const MAX_DEBOUNCE_WAIT_MS = 6 * 60 * 60 * 1000; // 6 hours
 const DEBOUNCE_POLL_INTERVAL_MS = 60 * 1000; // 1 minute
-const debounce = (cacheDir) => {
+const debounce = async (cacheDir) => {
     const lastrunfile = join(cacheDir, 'lastrun');
     const startedAt = Date.now();
-    let announced = false;
+    let isAnnounced = false;
     return new Promise((resolve) => {
         const check = async () => {
             const m = await mtime(lastrunfile);
@@ -353,12 +353,12 @@ const debounce = (cacheDir) => {
                 return;
             }
             const msg = `waiting until ${m.toISOString()} to update`;
-            if (announced) {
+            if (isAnnounced) {
                 debug(msg);
             }
             else {
                 ux.stdout(msg);
-                announced = true;
+                isAnnounced = true;
             }
             setTimeout(check, DEBOUNCE_POLL_INTERVAL_MS);
         };
@@ -439,7 +439,7 @@ const determineChannel = async ({ config, version }) => {
 const determineCurrentVersion = async (clientBin, version) => {
     try {
         const currentVersion = await readFile(clientBin, 'utf8');
-        const matches = currentVersion.match(/\.\.[/\\|](.+)[/\\|]bin/);
+        const matches = /\.\.[/\\|](.+)[/\\|]bin/.exec(currentVersion);
         return matches ? matches[1] : version;
     }
     catch (error) {

package/dist/util.d.ts

@@ -1,4 +1,4 @@
-import { Stats } from 'node:fs';
+import { type Stats } from 'node:fs';
 export declare function touch(p: string): Promise<void>;
 export declare function ls(dir: string): Promise<Array<{
     path: string;

package/dist/util.js

@@ -11,11 +11,13 @@ export async function touch(p) {
 export async function ls(dir) {
     const files = await readdir(dir);
     const paths = files.map((f) => join(dir, f));
-    return Promise.all(paths.map((path) => stat(path).then((s) => ({ path, stat: s }))));
+    return Promise.all(paths.map(async (path) => stat(path).then((s) => ({ path, stat: s }))));
 }
-export function wait(ms, unref = false) {
+export async function wait(ms, unref = false) {
     return new Promise((resolve) => {
-        const t = setTimeout(() => resolve(), ms);
+        const t = setTimeout(() => {
+            resolve();
+        }, ms);
         if (unref)
             t.unref();
     });

package/oclif.manifest.json

@@ -106,5 +106,5 @@
       ]
     }
   },
-  "version": "5.0.0"
+  "version": "5.0.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {