@salesforce/plugin-trust 1.0.10 → 2.0.0

package/CHANGELOG.md

@@ -2,49 +2,57 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.0.10](https://github.com/salesforcecli/plugin-trust/compare/v1.0.9...v1.0.10) (2021-10-12)
+## [2.0.0](https://github.com/salesforcecli/plugin-trust/compare/v1.1.0...v2.0.0) (2022-04-20)
+
+## [1.1.0](https://github.com/salesforcecli/plugin-trust/compare/v1.0.11...v1.1.0) (2021-12-02)
+
+### Features
+
+- bump deps ([6edb393](https://github.com/salesforcecli/plugin-trust/commit/6edb393b14afb094cfaf8b85e1d95b4f0dd79fbc))
+
+### [1.0.11](https://github.com/salesforcecli/plugin-trust/compare/v1.0.10...v1.0.11) (2021-11-03)
+
+### Bug Fixes
 
+- poll `npm pack` until tarball is available ([#185](https://github.com/salesforcecli/plugin-trust/issues/185)) ([001c1ab](https://github.com/salesforcecli/plugin-trust/commit/001c1ab3c79277bf411bc3e4459396e859e5672c))
+
+### [1.0.10](https://github.com/salesforcecli/plugin-trust/compare/v1.0.9...v1.0.10) (2021-10-12)
 
 ### Bug Fixes
 
-* update dependencies ([094ea03](https://github.com/salesforcecli/plugin-trust/commit/094ea03c1f99333b75008376d8be1494e3a794ea))
+- update dependencies ([094ea03](https://github.com/salesforcecli/plugin-trust/commit/094ea03c1f99333b75008376d8be1494e3a794ea))
 
 ### [1.0.9](https://github.com/salesforcecli/plugin-trust/compare/v1.0.8...v1.0.9) (2021-10-12)
 
 ### [1.0.8](https://github.com/salesforcecli/plugin-trust/compare/v1.0.7...v1.0.8) (2021-09-24)
 
-
 ### Bug Fixes
 
-* verify fails if node not installed ([#167](https://github.com/salesforcecli/plugin-trust/issues/167)) ([0393b90](https://github.com/salesforcecli/plugin-trust/commit/0393b906a30e8858816625517eda5db69377c178)), closes [#168](https://github.com/salesforcecli/plugin-trust/issues/168)
+- verify fails if node not installed ([#167](https://github.com/salesforcecli/plugin-trust/issues/167)) ([0393b90](https://github.com/salesforcecli/plugin-trust/commit/0393b906a30e8858816625517eda5db69377c178)), closes [#168](https://github.com/salesforcecli/plugin-trust/issues/168)
 
 ### [1.0.7](https://github.com/salesforcecli/plugin-trust/compare/v1.0.6...v1.0.7) (2021-09-17)
 
-
 ### Bug Fixes
 
-* use tag when getting npm meta ([#165](https://github.com/salesforcecli/plugin-trust/issues/165)) ([e9fe7f2](https://github.com/salesforcecli/plugin-trust/commit/e9fe7f229a716e4685b7cd54ee753c02667bccd8))
+- use tag when getting npm meta ([#165](https://github.com/salesforcecli/plugin-trust/issues/165)) ([e9fe7f2](https://github.com/salesforcecli/plugin-trust/commit/e9fe7f229a716e4685b7cd54ee753c02667bccd8))
 
 ### [1.0.6](https://github.com/salesforcecli/plugin-trust/compare/v1.0.5...v1.0.6) (2021-09-10)
 
-
 ### Bug Fixes
 
-* install plugin-trust as an executable ([#164](https://github.com/salesforcecli/plugin-trust/issues/164)) ([34b293c](https://github.com/salesforcecli/plugin-trust/commit/34b293c1e9276e7653aff41a9fc8e17635ee0a92))
+- install plugin-trust as an executable ([#164](https://github.com/salesforcecli/plugin-trust/issues/164)) ([34b293c](https://github.com/salesforcecli/plugin-trust/commit/34b293c1e9276e7653aff41a9fc8e17635ee0a92))
 
 ### [1.0.5](https://github.com/salesforcecli/plugin-trust/compare/v1.0.4...v1.0.5) (2021-09-07)
 
-
 ### Bug Fixes
 
-* use npm instead of http ([#154](https://github.com/salesforcecli/plugin-trust/issues/154)) ([2bce1f9](https://github.com/salesforcecli/plugin-trust/commit/2bce1f9bd331b75d81f0309bc46962b5c5d19b16))
+- use npm instead of http ([#154](https://github.com/salesforcecli/plugin-trust/issues/154)) ([2bce1f9](https://github.com/salesforcecli/plugin-trust/commit/2bce1f9bd331b75d81f0309bc46962b5c5d19b16))
 
 ### [1.0.4](https://github.com/salesforcecli/plugin-template/compare/v1.0.3...v1.0.4) (2021-05-10)
 
 ### [1.0.3](https://github.com/salesforcecli/plugin-template/compare/v1.0.2...v1.0.3) (2021-04-09)
 
-
 ### Bug Fixes
 
-* leif .yml merge [skip-validate-pr] ([2e6d278](https://github.com/salesforcecli/plugin-template/commit/2e6d2785cf04497ea87a871564adc68c5a19f6be))
-* leif .yml merge [skip-validate-pr] ([3703564](https://github.com/salesforcecli/plugin-template/commit/37035649f051b0d42667be7bdf3f878c631d43a9))
+- leif .yml merge [skip-validate-pr] ([2e6d278](https://github.com/salesforcecli/plugin-template/commit/2e6d2785cf04497ea87a871564adc68c5a19f6be))
+- leif .yml merge [skip-validate-pr] ([3703564](https://github.com/salesforcecli/plugin-template/commit/37035649f051b0d42667be7bdf3f878c631d43a9))

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018, Salesforce.com, Inc.
+Copyright (c) 2022, Salesforce.com, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

package/README.md

@@ -90,7 +90,8 @@ sfdx plugins
 ## Commands
 
 <!-- commands -->
-* [`@salesforce/plugin-trust plugins:trust:verify -n <string> [-r <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#salesforceplugin-trust-pluginstrustverify--n-string--r-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
+
+- [`@salesforce/plugin-trust plugins:trust:verify -n <string> [-r <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#salesforceplugin-trust-pluginstrustverify--n-string--r-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
 
 ## `@salesforce/plugin-trust plugins:trust:verify -n <string> [-r <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
@@ -98,25 +99,27 @@ validate a digital signature for a npm package
 
 ```
 USAGE
-  $ @salesforce/plugin-trust plugins:trust:verify -n <string> [-r <string>] [--json] [--loglevel 
-  trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
+  $ @salesforce/plugin-trust plugins:trust:verify -n <string> [-r <string>] [--json] [--loglevel
+    trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
 
-OPTIONS
-  -n, --npm=npm                                                                     (required) Specify the npm name.
+FLAGS
+  -n, --npm=<value>                                                                 (required) Specify the npm name.
                                                                                     This can include a tag/version
-
-  -r, --registry=registry                                                           The registry name. the behavior is
+  -r, --registry=<value>                                                            The registry name. the behavior is
                                                                                     the same as npm
-
   --json                                                                            format output as json
-
   --loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)  [default: warn] logging level for
                                                                                     this command invocation
 
+DESCRIPTION
+  validate a digital signature for a npm package
+
 EXAMPLES
   sfdx plugins:trust:verify --npm @scope/npmName --registry http://my.repo.org:4874
+
   sfdx plugins:trust:verify --npm @scope/npmName
 ```
 
-_See code: [src/commands/plugins/trust/verify.ts](https://github.com/salesforcecli/plugin-trust/blob/v1.0.9/src/commands/plugins/trust/verify.ts)_
+_See code: [src/commands/plugins/trust/verify.ts](https://github.com/salesforcecli/plugin-trust/blob/v2.0.0/src/commands/plugins/trust/verify.ts)_
+
 <!-- commandsstop -->

package/bin/dev

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+
+const oclif = require('@oclif/core');
+
+const path = require('path');
+const project = path.join(__dirname, '..', 'tsconfig.json');
+
+// In dev mode -> use ts-node and dev plugins
+process.env.NODE_ENV = 'development';
+
+require('ts-node').register({ project });
+// oclif.settings.tsconfigPath = project;
+
+// In dev mode, always show stack traces
+const g = (global.oclif = global.oclif || {});
+
+// In dev mode, always show stack traces
+global.oclif.debug = true;
+
+// Start the CLI
+oclif.run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'));

package/bin/dev.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\dev" %*

package/bin/run

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
 
-require('@oclif/command').run()
-.catch(require('@oclif/errors/handle'))
+require('@oclif/core').run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'));

package/lib/commands/plugins/trust/verify.js

@@ -11,8 +11,8 @@ const os = require("os");
 const ts_types_1 = require("@salesforce/ts-types");
 const command_1 = require("@salesforce/command");
 const core_1 = require("@salesforce/core");
-const installationVerification_1 = require("../../../lib/installationVerification");
-const NpmName_1 = require("../../../lib/NpmName");
+const installationVerification_1 = require("../../../shared/installationVerification");
+const NpmName_1 = require("../../../shared/NpmName");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-trust', 'verify');
 class Verify extends command_1.SfdxCommand {
@@ -39,7 +39,11 @@ class Verify extends command_1.SfdxCommand {
             const meta = await vConfig.verifier.verify();
             this.logger.debug(`meta.verified: ${meta.verified}`);
             if (!meta.verified) {
-                throw new core_1.SfdxError("A digital signature is specified for this plugin but it didn't verify against the certificate.", 'FailedDigitalSignatureVerification');
+                const e = messages.createError('FailedDigitalSignatureVerification');
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore override readonly .name field
+                e.name = 'FailedDigitalSignatureVerification';
+                throw e;
             }
             const message = `Successfully validated digital signature for ${npmName.name}.`;
             if (!this.flags.json) {
@@ -70,7 +74,7 @@ class Verify extends command_1.SfdxCommand {
                 }
                 return response;
             }
-            throw core_1.SfdxError.wrap(err);
+            throw core_1.SfError.wrap(err);
         }
     }
     getVerifier(npmName, config) {

package/lib/commands/plugins/trust/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/commands/plugins/trust/verify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/commands/plugins/trust/verify.ts"],"names":[],"mappings":"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"}

package/lib/hooks/verifyInstallSignature.d.ts

@@ -1,6 +1,6 @@
-import { Hook } from '@oclif/config';
-import { ConfigContext, VerificationConfig } from '../lib/installationVerification';
-import { NpmName } from '../lib/NpmName';
+import { Hook } from '@oclif/core';
+import { ConfigContext, VerificationConfig } from '../shared/installationVerification';
+import { NpmName } from '../shared/NpmName';
 /**
  * Build a VerificationConfig. Useful for testing.
  */

package/lib/hooks/verifyInstallSignature.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hook = exports.VerificationConfigBuilder = void 0;
 const core_1 = require("@salesforce/core");
 const cli_ux_1 = require("cli-ux");
-const installationVerification_1 = require("../lib/installationVerification");
-const NpmName_1 = require("../lib/NpmName");
+const installationVerification_1 = require("../shared/installationVerification");
+const NpmName_1 = require("../shared/NpmName");
 /**
  * Build a VerificationConfig. Useful for testing.
  */

package/lib/hooks/verifyInstallSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyInstallSignature.js","sourceRoot":"","sources":["../../src/hooks/verifyInstallSignature.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifyInstallSignature.js","sourceRoot":"","sources":["../../src/hooks/verifyInstallSignature.ts"],"names":[],"mappings":"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"}

package/lib/{lib → shared}/NpmName.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NpmName = void 0;
 /*
- * Copyright (c) 2018, salesforce.com, inc.
+ * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
@@ -30,7 +30,11 @@ class NpmName {
      */
     static parse(npmName) {
         if (!npmName || npmName.length < 1) {
-            throw new core_1.SfdxError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName');
+            const err = new core_1.SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'MissingOrInvalidNpmName';
+            throw err;
         }
         const returnNpmName = new NpmName();
         const components = npmName.split('@');
@@ -77,7 +81,11 @@ class NpmName {
             returnNpmName.name = NpmName.validateComponentString(subComponents[0]);
         }
         else {
-            throw new core_1.SfdxError('The npm name is invalid.', 'InvalidNpmName');
+            const err = new core_1.SfError('The npm name is invalid.', 'InvalidNpmName');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'InvalidNpmName';
+            throw err;
         }
     }
     /**
@@ -92,7 +100,11 @@ class NpmName {
             return trimmedName;
         }
         else {
-            throw new core_1.SfdxError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName');
+            const err = new core_1.SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'MissingOrInvalidNpmName';
+            throw err;
         }
     }
     /**

package/lib/shared/NpmName.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/shared/NpmName.ts"],"names":[],"mappings":"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"}

package/lib/{lib → shared}/installationVerification.d.ts

@@ -2,7 +2,7 @@
 import { Readable } from 'stream';
 import { URL } from 'url';
 import * as request from 'request';
-import { NpmMeta } from '../lib/npmCommand';
+import { NpmMeta } from '../shared/npmCommand';
 import { NpmName } from './NpmName';
 export declare const ALLOW_LIST_FILENAME = "unsignedPluginAllowList.json";
 export declare const DEFAULT_REGISTRY = "https://registry.npmjs.org/";

package/lib/{lib → shared}/installationVerification.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2018, salesforce.com, inc.
+ * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
@@ -16,9 +16,11 @@ const stream_1 = require("stream");
 const url_1 = require("url");
 const util_1 = require("util");
 const crypto = require("crypto");
+const fs = require("fs");
+const promises_1 = require("fs/promises");
 const core_1 = require("@salesforce/core");
 const request = require("request");
-const npmCommand_1 = require("../lib/npmCommand");
+const npmCommand_1 = require("../shared/npmCommand");
 const CRYPTO_LEVEL = 'RSA-SHA256';
 exports.ALLOW_LIST_FILENAME = 'unsignedPluginAllowList.json';
 exports.DEFAULT_REGISTRY = 'https://registry.npmjs.org/';
@@ -65,7 +67,7 @@ function retrieveKey(stream) {
             });
             stream.on('end', () => {
                 if (!key.includes('-----BEGIN')) {
-                    return reject(new core_1.SfdxError('The specified key format is invalid.', 'InvalidKeyFormat'));
+                    return reject(new core_1.SfError('The specified key format is invalid.', 'InvalidKeyFormat'));
                 }
                 return resolve(key);
             });
@@ -88,7 +90,7 @@ async function verify(codeVerifierInfo) {
             });
             codeVerifierInfo.signatureStream.on('end', () => {
                 if (signature.byteLength === 0) {
-                    return reject(new core_1.SfdxError('The provided signature is invalid or missing.', 'InvalidSignature'));
+                    return reject(new core_1.SfError('The provided signature is invalid or missing.', 'InvalidSignature'));
                 }
                 else {
                     const verification = signApi.verify(publicKey, signature.toString('utf8'), 'base64');
@@ -116,7 +118,7 @@ class InstallationVerification {
     constructor(requestImpl, fsImpl) {
         // why? dependency injection is better than sinon
         this.requestImpl = requestImpl ? requestImpl : request;
-        this.fsImpl = fsImpl ? fsImpl : core_1.fs;
+        this.fsImpl = fsImpl ? fsImpl : fs;
         this.readFileAsync = (0, util_1.promisify)(this.fsImpl.readFile);
         this.unlinkAsync = (0, util_1.promisify)(this.fsImpl.unlink);
     }
@@ -130,7 +132,11 @@ class InstallationVerification {
             this.config = _config;
             return this;
         }
-        throw new core_1.SfdxError('the cli engine config cannot be null', 'InvalidParam');
+        const err = new core_1.SfError('the cli engine config cannot be null', 'InvalidParam');
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore override readonly .name field
+        err.name = 'InvalidParam';
+        throw err;
     }
     /**
      * setter for the plugin name
@@ -142,7 +148,11 @@ class InstallationVerification {
             this.pluginNpmName = _pluginName;
             return this;
         }
-        throw new core_1.SfdxError('pluginName must be specified.', 'InvalidParam');
+        const err = new core_1.SfError('pluginName must be specified.', 'InvalidParam');
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore override readonly .name field
+        err.name = 'InvalidParam';
+        throw err;
     }
     /**
      * validates the digital signature.
@@ -173,7 +183,11 @@ class InstallationVerification {
         })
             .catch((e) => {
             if (e.code === 'DEPTH_ZERO_SELF_SIGNED_CERT') {
-                throw new core_1.SfdxError('Encountered a self signed certificated. To enable "export NODE_TLS_REJECT_UNAUTHORIZED=0"', 'SelfSignedCert');
+                const err = new core_1.SfError('Encountered a self signed certificated. To enable "export NODE_TLS_REJECT_UNAUTHORIZED=0"', 'SelfSignedCert');
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore override readonly .name field
+                err.name = 'SelfSignedCert';
+                throw err;
             }
             throw e;
         });
@@ -220,7 +234,7 @@ class InstallationVerification {
                         }));
                     }
                     else {
-                        return reject(new core_1.SfdxError(`A request to url ${url} failed with error code: [${
+                        return reject(new core_1.SfError(`A request to url ${url} failed with error code: [${
                         // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                         response ? response.statusCode : 'undefined'}]`, 'ErrorGettingContent'));
                     }
@@ -242,18 +256,19 @@ class InstallationVerification {
         logger.debug(`streamTagGz | fileNameStr: ${fileNameStr}`);
         // Make sure the cache path exists.
         try {
-            await core_1.fs.mkdirp(this.getCachePath());
-            new npmCommand_1.NpmModule(npmMeta.moduleName, npmMeta.version, this.config.cliRoot).pack((0, exports.getNpmRegistry)().href, {
+            await (0, promises_1.mkdir)(this.getCachePath(), { recursive: true });
+            const npmModule = new npmCommand_1.NpmModule(npmMeta.moduleName, npmMeta.version, this.config.cliRoot);
+            await npmModule.fetchTarball((0, exports.getNpmRegistry)().href, {
                 cwd: this.getCachePath(),
             });
-            const tarBallFile = core_1.fs
+            const tarBallFile = fs
                 .readdirSync(this.getCachePath(), { withFileTypes: true })
                 .find((entry) => entry.isFile() && entry.name.includes(npmMeta.version));
             npmMeta.tarballLocalPath = path.join(this.getCachePath(), tarBallFile.name);
         }
         catch (err) {
             logger.debug(err);
-            throw new core_1.SfdxError(err, 'ShellExecError');
+            throw err;
         }
         return npmMeta;
     }
@@ -282,7 +297,11 @@ class InstallationVerification {
         const npmMetadata = npmModule.show(npmRegistry.href);
         logger.debug('retrieveNpmMeta | Found npm meta information.');
         if (!npmMetadata.versions) {
-            throw new core_1.SfdxError(`The npm metadata for plugin ${this.pluginNpmName.name} is missing the versions attribute.`, 'InvalidNpmMetadata');
+            const err = new core_1.SfError(`The npm metadata for plugin ${this.pluginNpmName.name} is missing the versions attribute.`, 'InvalidNpmMetadata');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'InvalidNpmMetadata';
+            throw err;
         }
         // Assume the tag is version tag.
         let versionNumber = npmMetadata.versions.find((version) => version === this.pluginNpmName.tag);
@@ -301,27 +320,47 @@ class InstallationVerification {
                     logger.debug(`retrieveNpmMeta | versionObject: ${versionNumber}`);
                 }
                 else {
-                    throw new core_1.SfdxError(`The dist tag ${this.pluginNpmName.tag} was not found for plugin: ${this.pluginNpmName.name}`, 'NpmTagNotFound');
+                    const err = new core_1.SfError(`The dist tag ${this.pluginNpmName.tag} was not found for plugin: ${this.pluginNpmName.name}`, 'NpmTagNotFound');
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore override readonly .name field
+                    err.name = 'NpmTagNotFound';
+                    throw err;
                 }
             }
             else {
-                throw new core_1.SfdxError('The deployed NPM is missing dist-tags.', 'UnexpectedNpmFormat');
+                const err = new core_1.SfError('The deployed NPM is missing dist-tags.', 'UnexpectedNpmFormat');
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore override readonly .name field
+                err.name = 'UnexpectedNpmFormat';
+                throw err;
             }
         }
         npmModule.npmMeta.version = versionNumber;
         if (!npmMetadata.sfdx) {
-            throw new core_1.SfdxError('This plugin is not signed by Salesforce.com, Inc.', 'NotSigned');
+            const err = new core_1.SfError('This plugin is not signed by Salesforce.com, Inc.', 'NotSigned');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'NotSigned';
+            throw err;
         }
         else {
             if (!validSalesforceHostname(npmMetadata.sfdx.publicKeyUrl)) {
-                throw new core_1.SfdxError(`The host is not allowed to provide signing information. [${npmMetadata.sfdx.publicKeyUrl}]`, 'UnexpectedHost');
+                const err = new core_1.SfError(`The host is not allowed to provide signing information. [${npmMetadata.sfdx.publicKeyUrl}]`, 'UnexpectedHost');
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore override readonly .name field
+                err.name = 'UnexpectedHost';
+                throw err;
             }
             else {
                 logger.debug(`retrieveNpmMeta | versionObject.sfdx.publicKeyUrl: ${npmMetadata.sfdx.publicKeyUrl}`);
                 npmModule.npmMeta.publicKeyUrl = npmMetadata.sfdx.publicKeyUrl;
             }
             if (!validSalesforceHostname(npmMetadata.sfdx.signatureUrl)) {
-                throw new core_1.SfdxError(`The host is not allowed to provide signing information. [${npmMetadata.sfdx.signatureUrl}]`, 'UnexpectedHost');
+                const err = new core_1.SfError(`The host is not allowed to provide signing information. [${npmMetadata.sfdx.signatureUrl}]`, 'UnexpectedHost');
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore override readonly .name field
+                err.name = 'UnexpectedHost';
+                throw err;
             }
             else {
                 logger.debug(`retrieveNpmMeta | versionObject.sfdx.signatureUrl: ${npmMetadata.sfdx.signatureUrl}`);
@@ -366,8 +405,13 @@ async function doPrompt(vconfig) {
     switch (shouldContinue.toLowerCase()) {
         case 'y':
             return;
-        default:
-            throw new core_1.SfdxError('The user canceled the plugin installation.', 'InstallationCanceledError');
+        default: {
+            const err = new core_1.SfError('The user canceled the plugin installation.', 'InstallationCanceledError');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'InstallationCanceledError';
+            throw err;
+        }
     }
 }
 exports.doPrompt = doPrompt;
@@ -375,7 +419,11 @@ async function doInstallationCodeSigningVerification(config, plugin, verificatio
     try {
         const meta = await verificationConfig.verifier.verify();
         if (!meta.verified) {
-            throw new core_1.SfdxError("A digital signature is specified for this plugin but it didn't verify against the certificate.", 'FailedDigitalSignatureVerification');
+            const err = new core_1.SfError("A digital signature is specified for this plugin but it didn't verify against the certificate.", 'FailedDigitalSignatureVerification');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'FailedDigitalSignatureVerification';
+            throw err;
         }
         verificationConfig.log(`Successfully validated digital signature for ${plugin.plugin}.`);
     }
@@ -390,9 +438,17 @@ async function doInstallationCodeSigningVerification(config, plugin, verificatio
             }
         }
         else if (err.name === 'PluginNotFound' || err.name === 'PluginAccessDenied') {
-            throw new core_1.SfdxError(err.message || 'The user canceled the plugin installation.');
+            const e = new core_1.SfError(err.message || 'The user canceled the plugin installation.');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            e.name = '';
+            throw e;
         }
-        throw core_1.SfdxError.wrap(err);
+        const sfErr = core_1.SfError.wrap(err);
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore override readonly .name field
+        sfErr.name = err.name;
+        throw sfErr;
     }
 }
 exports.doInstallationCodeSigningVerification = doInstallationCodeSigningVerification;

package/lib/shared/installationVerification.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"installationVerification.js","sourceRoot":"","sources":["../../src/shared/installationVerification.ts"],"names":[],"mappings":"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"}

package/lib/{lib → shared}/npmCommand.d.ts

@@ -27,9 +27,7 @@ declare type NpmCommandOptions = shelljs.ExecOptions & {
     registry?: string;
     cliRoot?: string;
 };
-declare type NpmCommandResult = NpmShowResults & {
-    [name: string]: string;
-};
+declare type NpmCommandResult = shelljs.ShellString;
 export declare class NpmCommand {
     private static npmPkgPath;
     static runNpmCmd(cmd: string, options?: NpmCommandOptions): NpmCommandResult;
@@ -66,5 +64,7 @@ export declare class NpmModule {
     constructor(module: string, version?: string, cliRoot?: string);
     show(registry: string): NpmShowResults;
     pack(registry: string, options?: shelljs.ExecOptions): void;
+    fetchTarball(registry: string, options?: shelljs.ExecOptions): Promise<void>;
+    pollForAvailability(checkFn: () => void): Promise<void>;
 }
 export {};

package/lib/shared/npmCommand.js

@@ -0,0 +1,200 @@
+"use strict";
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NpmModule = exports.NpmCommand = void 0;
+const os_1 = require("os");
+const path = require("path");
+const fs = require("fs");
+const npm_run_path_1 = require("npm-run-path");
+const shelljs = require("shelljs");
+const core_1 = require("@salesforce/core");
+const command_1 = require("@salesforce/command");
+const kit_1 = require("@salesforce/kit");
+class NpmCommand {
+    static runNpmCmd(cmd, options = {}) {
+        const nodeExecutable = NpmCommand.findNode(options.cliRoot);
+        const npmCli = NpmCommand.npmCli();
+        const command = `"${nodeExecutable}" "${npmCli}" ${cmd} --registry=${options.registry}`;
+        const npmCmdResult = shelljs.exec(command, {
+            ...options,
+            silent: true,
+            async: false,
+            env: npm_run_path_1.default.env({ env: process.env }),
+        });
+        if (npmCmdResult.code !== 0) {
+            const err = new core_1.SfError(npmCmdResult.stderr, 'ShellExecError');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'ShellExecError';
+            throw err;
+        }
+        return npmCmdResult;
+    }
+    static npmPackagePath() {
+        return this.npmPkgPath;
+    }
+    /**
+     * Returns the path to the npm-cli.js file in this package's node_modules
+     *
+     * @private
+     */
+    static npmCli() {
+        const pkgPath = NpmCommand.npmPackagePath();
+        const fileData = fs.readFileSync(pkgPath, 'utf8');
+        const pkgJson = (0, kit_1.parseJson)(fileData, pkgPath);
+        const prjPath = pkgPath.substring(0, pkgPath.lastIndexOf(path.sep));
+        return path.join(prjPath, pkgJson.bin['npm']);
+    }
+    /**
+     * Locate node executable and return its absolute path
+     * First it tries to locate the node executable on the root path passed in
+     * If not found then tries to use whatver 'node' resolves to on the user's PATH
+     * If found return absolute path to the executable
+     * If the node executable cannot be found, an error is thrown
+     *
+     * @private
+     */
+    static findNode(root = undefined) {
+        const isExecutable = (filepath) => {
+            if ((0, os_1.type)() === 'Windows_NT')
+                return filepath.endsWith('node.exe');
+            try {
+                if (filepath.endsWith('node')) {
+                    // This checks if the filepath is executable on Mac or Linux, if it is not it errors.
+                    fs.accessSync(filepath, fs.constants.X_OK);
+                    return true;
+                }
+            }
+            catch {
+                return false;
+            }
+            return false;
+        };
+        if (root) {
+            const sfdxBinDirs = NpmCommand.findSfdxBinDirs(root);
+            if (sfdxBinDirs.length > 0) {
+                // Find the node executable
+                const node = shelljs.find(sfdxBinDirs).filter((file) => isExecutable(file))[0];
+                if (node) {
+                    return fs.realpathSync(node);
+                }
+            }
+        }
+        // Check to see if node is installed
+        const nodeShellString = shelljs.which('node');
+        if ((nodeShellString === null || nodeShellString === void 0 ? void 0 : nodeShellString.code) === 0 && (nodeShellString === null || nodeShellString === void 0 ? void 0 : nodeShellString.stdout))
+            return nodeShellString.stdout;
+        const err = new core_1.SfError('Cannot locate node executable.', 'CannotFindNodeExecutable');
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore override readonly .name field
+        err.name = 'CannotFindNodeExecutable';
+        throw err;
+    }
+    /**
+     * Finds the bin directory in the sfdx installation root path
+     *
+     * @param sfdxPath
+     * @private
+     */
+    static findSfdxBinDirs(sfdxPath) {
+        return sfdxPath
+            ? [path.join(sfdxPath, 'bin'), path.join(sfdxPath, 'client', 'bin')].filter((p) => fs.existsSync(p))
+            : [];
+    }
+}
+exports.NpmCommand = NpmCommand;
+NpmCommand.npmPkgPath = require.resolve('npm/package.json');
+class NpmModule {
+    constructor(module, version = 'latest', cliRoot = undefined) {
+        this.module = module;
+        this.version = version;
+        this.cliRoot = cliRoot;
+        this.npmMeta = {
+            moduleName: module,
+        };
+    }
+    show(registry) {
+        const showCmd = NpmCommand.runNpmCmd(`show ${this.module}@${this.version} --json`, {
+            registry,
+            cliRoot: this.cliRoot,
+        });
+        // `npm show` doesn't return exit code 1 when it fails to get a specific package version
+        // If `stdout` is empty then no info was found in the registry.
+        if (showCmd.stdout === '') {
+            const err = new core_1.SfError(`Failed to find ${this.module}@${this.version} in the registry`, 'NpmError');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'NpmError';
+            throw err;
+        }
+        try {
+            return JSON.parse(showCmd.stdout);
+        }
+        catch (error) {
+            const err = new core_1.SfError(error, 'ShellParseError');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            err.name = 'ShellParseError';
+            throw err;
+        }
+    }
+    pack(registry, options) {
+        try {
+            NpmCommand.runNpmCmd(`pack ${this.module}@${this.version}`, {
+                ...options,
+                registry,
+                cliRoot: this.cliRoot,
+            });
+        }
+        catch (err) {
+            const sfErr = core_1.SfError.wrap(err);
+            const e = new core_1.SfError(`Failed to fetch tarball from the registry: \n${sfErr.message}`, 'NpmError');
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore override readonly .name field
+            e.name = 'NpmError';
+            throw e;
+        }
+        return;
+    }
+    async fetchTarball(registry, options) {
+        await this.pollForAvailability(() => {
+            this.pack(registry, options);
+        });
+        this.pack(registry, options);
+    }
+    async pollForAvailability(checkFn) {
+        const ux = await command_1.UX.create();
+        const isNonTTY = process.env.CI !== undefined || process.env.CIRCLECI !== undefined;
+        let found = false;
+        let attempts = 0;
+        const maxAttempts = 300;
+        const start = isNonTTY ? (msg) => ux.log(msg) : (msg) => ux.startSpinner(msg);
+        const update = isNonTTY ? (msg) => ux.log(msg) : (msg) => ux.setSpinnerStatus(msg);
+        const stop = isNonTTY ? (msg) => ux.log(msg) : (msg) => ux.stopSpinner(msg);
+        start('Polling for new version(s) to become available on npm');
+        while (!found && attempts < maxAttempts) {
+            attempts += 1;
+            update(`attempt: ${attempts} of ${maxAttempts}`);
+            try {
+                checkFn();
+                found = true;
+            }
+            catch (error) {
+                if (attempts === maxAttempts) {
+                    throw error;
+                }
+                found = false;
+            }
+            await (0, kit_1.sleep)(1000);
+        }
+        stop(attempts >= maxAttempts ? 'failed' : 'done');
+    }
+}
+exports.NpmModule = NpmModule;
+//# sourceMappingURL=npmCommand.js.map

package/lib/shared/npmCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"npmCommand.js","sourceRoot":"","sources":["../../src/shared/npmCommand.ts"],"names":[],"mappings":"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"}

package/messages/verify.json

@@ -7,5 +7,6 @@
   "flags": {
     "npm": "Specify the npm name. This can include a tag/version",
     "registry": "The registry name. the behavior is the same as npm"
-  }
+  },
+  "FailedDigitalSignatureVerification": "A digital signature is specified for this plugin but it didn't verify against the certificate."
 }

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.0.10","commands":{"plugins:trust:verify":{"id":"plugins:trust:verify","description":"validate a digital signature for a npm package","usage":"<%= command.id %> -n <string> [-r <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-trust","pluginType":"core","aliases":[],"examples":["sfdx plugins:trust:verify --npm @scope/npmName --registry http://my.repo.org:4874","sfdx plugins:trust:verify --npm @scope/npmName"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"npm":{"name":"npm","type":"option","char":"n","description":"Specify the npm name. This can include a tag/version","required":true},"registry":{"name":"registry","type":"option","char":"r","description":"The registry name. the behavior is the same as npm","required":false}},"args":[]}}}
+{"version":"2.0.0","commands":{"plugins:trust:verify":{"id":"plugins:trust:verify","description":"validate a digital signature for a npm package","strict":true,"usage":"<%= command.id %> -n <string> [-r <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-trust","pluginAlias":"@salesforce/plugin-trust","pluginType":"core","aliases":[],"examples":["sfdx plugins:trust:verify --npm @scope/npmName --registry http://my.repo.org:4874","sfdx plugins:trust:verify --npm @scope/npmName"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","multiple":false,"options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"npm":{"name":"npm","type":"option","char":"n","description":"Specify the npm name. This can include a tag/version","required":true,"multiple":false},"registry":{"name":"registry","type":"option","char":"r","description":"The registry name. the behavior is the same as npm","required":false,"multiple":false}},"args":[],"flagsConfig":{"npm":{"kind":"string","char":"n","required":true,"description":"Specify the npm name. This can include a tag/version","input":[],"multiple":false,"type":"option"},"registry":{"kind":"string","char":"r","required":false,"description":"The registry name. the behavior is the same as npm","input":[],"multiple":false,"type":"option"}}}}}

package/package.json

@@ -1,27 +1,28 @@
 {
     "name": "@salesforce/plugin-trust",
     "description": "validate a digital signature for a npm package",
-    "version": "1.0.10",
+    "version": "2.0.0",
     "author": "Salesforce",
+    "main": "lib/index.js",
     "bin": {
         "sf-trust": "bin/run"
     },
     "bugs": "https://github.com/forcedotcom/cli/issues",
     "dependencies": {
-        "@oclif/config": "^1.17.0",
-        "@salesforce/command": "^3.0.5",
-        "@salesforce/core": "^2.23.2",
+        "@oclif/core": "^1.6.3",
+        "@salesforce/command": "^5.0.4",
+        "@salesforce/core": "^3.10.1",
         "npm": "^7.21.0",
         "npm-run-path": "^4.0.1",
         "shelljs": "^0.8.4",
         "tslib": "^2"
     },
     "devDependencies": {
-        "@oclif/dev-cli": "^1",
-        "@oclif/plugin-command-snapshot": "^2.0.0",
+        "oclif": "^2.6.1",
+        "@oclif/plugin-command-snapshot": "^3.1.3",
         "@salesforce/cli-plugins-testkit": "^1.3.0",
-        "@salesforce/dev-config": "^2.1.2",
-        "@salesforce/dev-scripts": "0.9.18",
+        "@salesforce/dev-config": "^3.0.0",
+        "@salesforce/dev-scripts": "^2.0.0",
         "@salesforce/plugin-command-reference": "^1.3.0",
         "@salesforce/prettier-config": "^0.0.2",
         "@salesforce/ts-sinon": "1.3.21",
@@ -37,16 +38,15 @@
         "eslint-config-salesforce-license": "^0.1.6",
         "eslint-config-salesforce-typescript": "^0.2.7",
         "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-import": "2.24.2",
+        "eslint-plugin-import": "2.25.4",
         "eslint-plugin-jsdoc": "^35.1.2",
         "eslint-plugin-prettier": "^3.4.0",
-        "husky": "^4.3.8",
-        "lint-staged": "^11.0.0",
-        "mocha": "^8.4.0",
+        "husky": "^7.0.4",
+        "mocha": "^9.1.3",
         "nyc": "^15.1.0",
         "prettier": "^2.3.0",
         "pretty-quick": "^3.1.0",
-        "shx": "0.3.3",
+        "shx": "0.3.4",
         "sinon": "10.0.0",
         "sinon-chai": "^3.7.0",
         "ts-node": "^10.0.0",
@@ -114,23 +114,16 @@
         "prepare": "sf-install",
         "pretest": "sf-compile-test",
         "test": "sf-test",
-        "test:command-reference": "./bin/run commandreference:generate --erroronwarnings",
-        "test:deprecation-policy": "./bin/run snapshot:compare",
-        "test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000",
-        "version": "oclif-dev readme"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "sf-husky-pre-commit",
-            "commit-msg": "sf-husky-commit-msg",
-            "pre-push": "sf-husky-pre-push"
-        }
+        "test:command-reference": "./bin/dev commandreference:generate --erroronwarnings",
+        "test:deprecation-policy": "./bin/dev snapshot:compare",
+        "test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
+        "version": "oclif readme"
     },
     "publishConfig": {
         "access": "public"
     },
     "sfdx": {
-        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/1.0.10.crt",
-        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/1.0.10.sig"
+        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/2.0.0.crt",
+        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/2.0.0.sig"
     }
 }

package/lib/lib/NpmName.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/lib/NpmName.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA6C;AAO7C;;;;;;GAMG;AACH,MAAa,OAAO;IAMlB;;OAEG;IACH;QACE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;IACjC,CAAC;IACD;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,OAAe;QACjC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,MAAM,IAAI,gBAAS,CAAC,qCAAqC,EAAE,yBAAyB,CAAC,CAAC;SACvF;QAED,MAAM,aAAa,GAAG,IAAI,OAAO,EAAE,CAAC;QAEpC,MAAM,UAAU,GAAa,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhD,gBAAgB;QAChB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;SACvD;aAAM;YACL,oBAAoB;YACpB,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC/B,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;aACvD;iBAAM;gBACL,qBAAqB;gBACrB,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC/B,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;iBACvD;qBAAM;oBACL,gDAAgD;oBAChD,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;oBACtD,aAAa,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;iBACnC;aACF;SACF;QAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,aAAa,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;SACnC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,eAAe,CAAC,IAAY,EAAE,aAA0B;QACrE,+DAA+D;QAC/D,MAAM,aAAa,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1G,aAAa,CAAC,KAAK,GAAG,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YACxE,aAAa,CAAC,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SACxE;aAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YACrC,aAAa,CAAC,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SACxE;aAAM;YACL,MAAM,IAAI,gBAAS,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;SACnE;IACH,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,uBAAuB,CAAC,IAAY;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YACzC,OAAO,WAAW,CAAC;SACpB;aAAM;YACL,MAAM,IAAI,gBAAS,CAAC,qCAAqC,EAAE,yBAAyB,CAAC,CAAC;SACvF;IACH,CAAC;IAED;;;;;;OAMG;IACI,UAAU,CAAC,GAAG,GAAG,KAAK,EAAE,gBAA0B;QACvD,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACjC;QAED,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAI,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,WAAW,EAAE;gBACpC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;iBAAM,IAAI,gBAAgB,EAAE;gBAC3B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;SACF;QAED,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAChF,CAAC;IAED;;;;OAIG;IACI,QAAQ,CAAC,UAAU,GAAG,KAAK;QAChC,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACvC,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;SACxC;QAED,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,UAAU,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;SACrC;QAED,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;;AAnIH,0BAoIC;AAnIwB,mBAAW,GAAG,QAAQ,CAAC"}

package/lib/lib/installationVerification.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"installationVerification.js","sourceRoot":"","sources":["../../src/lib/installationVerification.ts"],"names":[],"mappings":"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"}

package/lib/lib/npmCommand.js

@@ -1,125 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NpmModule = exports.NpmCommand = void 0;
-const os_1 = require("os");
-const path = require("path");
-const npm_run_path_1 = require("npm-run-path");
-const shelljs = require("shelljs");
-const core_1 = require("@salesforce/core");
-class NpmCommand {
-    static runNpmCmd(cmd, options = {}) {
-        const nodeExecutable = NpmCommand.findNode(options.cliRoot);
-        const npmCli = NpmCommand.npmCli();
-        const command = `"${nodeExecutable}" "${npmCli}" ${cmd} --registry=${options.registry} --json`;
-        const npmShowResult = shelljs.exec(command, {
-            ...options,
-            silent: true,
-            fatal: true,
-            async: false,
-            env: npm_run_path_1.default.env({ env: process.env }),
-        });
-        if (npmShowResult.code !== 0) {
-            throw new core_1.SfdxError(npmShowResult.stderr, 'ShellExecError');
-        }
-        try {
-            return JSON.parse(npmShowResult.stdout);
-        }
-        catch (error) {
-            throw new core_1.SfdxError(error, 'ShellParseError');
-        }
-    }
-    static npmPackagePath() {
-        return this.npmPkgPath;
-    }
-    /**
-     * Returns the path to the npm-cli.js file in this package's node_modules
-     *
-     * @private
-     */
-    static npmCli() {
-        const pkgPath = NpmCommand.npmPackagePath();
-        const pkgJson = core_1.fs.readJsonSync(pkgPath);
-        const prjPath = pkgPath.substring(0, pkgPath.lastIndexOf(path.sep));
-        return path.join(prjPath, pkgJson.bin['npm']);
-    }
-    /**
-     * Locate node executable and return its absolute path
-     * First it tries to locate the node executable on the root path passed in
-     * If not found then tries to use whatver 'node' resolves to on the user's PATH
-     * If found return absolute path to the executable
-     * If the node executable cannot be found, an error is thrown
-     *
-     * @private
-     */
-    static findNode(root = undefined) {
-        const isExecutable = (filepath) => {
-            if ((0, os_1.type)() === 'Windows_NT')
-                return filepath.endsWith('node.exe');
-            try {
-                if (filepath.endsWith('node')) {
-                    // This checks if the filepath is executable on Mac or Linux, if it is not it errors.
-                    core_1.fs.accessSync(filepath, core_1.fs.constants.X_OK);
-                    return true;
-                }
-            }
-            catch {
-                return false;
-            }
-            return false;
-        };
-        if (root) {
-            const sfdxBinDirs = NpmCommand.findSfdxBinDirs(root);
-            if (sfdxBinDirs.length > 0) {
-                // Find the node executable
-                const node = shelljs.find(sfdxBinDirs).filter((file) => isExecutable(file))[0];
-                if (node) {
-                    return core_1.fs.realpathSync(node);
-                }
-            }
-        }
-        // Check to see if node is installed
-        const nodeShellString = shelljs.which('node');
-        if ((nodeShellString === null || nodeShellString === void 0 ? void 0 : nodeShellString.code) === 0 && (nodeShellString === null || nodeShellString === void 0 ? void 0 : nodeShellString.stdout))
-            return nodeShellString.stdout;
-        throw new core_1.SfdxError('Cannot locate node executable.', 'CannotFindNodeExecutable');
-    }
-    /**
-     * Finds the bin directory in the sfdx installation root path
-     *
-     * @param sfdxPath
-     * @private
-     */
-    static findSfdxBinDirs(sfdxPath) {
-        return sfdxPath
-            ? [path.join(sfdxPath, 'bin'), path.join(sfdxPath, 'client', 'bin')].filter((p) => core_1.fs.existsSync(p))
-            : [];
-    }
-}
-exports.NpmCommand = NpmCommand;
-NpmCommand.npmPkgPath = require.resolve('npm/package.json');
-class NpmModule {
-    constructor(module, version = 'latest', cliRoot = undefined) {
-        this.module = module;
-        this.version = version;
-        this.cliRoot = cliRoot;
-        this.npmMeta = {
-            moduleName: module,
-        };
-    }
-    show(registry) {
-        return NpmCommand.runNpmCmd(`show ${this.module}@${this.version}`, { registry, cliRoot: this.cliRoot });
-    }
-    pack(registry, options) {
-        NpmCommand.runNpmCmd(`pack ${this.module}@${this.version}`, { ...options, registry, cliRoot: this.cliRoot });
-        return;
-    }
-}
-exports.NpmModule = NpmModule;
-//# sourceMappingURL=npmCommand.js.map

package/lib/lib/npmCommand.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"npmCommand.js","sourceRoot":"","sources":["../../src/lib/npmCommand.ts"],"names":[],"mappings":"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"}