@salesforce/plugin-trust 3.5.1 → 3.5.3

package/oclif.manifest.json

@@ -80,5 +80,5 @@
       ]
     }
   },
-  "version": "3.5.1"
+  "version": "3.5.3"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@salesforce/plugin-trust",
     "description": "validate a digital signature for a npm package",
-    "version": "3.5.1",
+    "version": "3.5.3",
     "author": "Salesforce",
     "bin": {
         "sf-trust": "bin/dev"
@@ -9,7 +9,8 @@
     "bugs": "https://github.com/forcedotcom/cli/issues",
     "dependencies": {
         "@oclif/core": "^3.26.0",
-        "@salesforce/core": "^6.5.5",
+        "@salesforce/core": "^6.7.6",
+        "@salesforce/kit": "^3.1.0",
         "@salesforce/sf-plugins-core": "^8.0.2",
         "got": "^13.0.0",
         "npm": "10.2.3",
@@ -19,16 +20,16 @@
         "shelljs": "^0.8.4"
     },
     "devDependencies": {
-        "@oclif/plugin-command-snapshot": "^5.1.2",
-        "@salesforce/cli-plugins-testkit": "^5.1.11",
-        "@salesforce/dev-scripts": "^8.4.1",
+        "@oclif/plugin-command-snapshot": "^5.1.4",
+        "@salesforce/cli-plugins-testkit": "^5.1.13",
+        "@salesforce/dev-scripts": "^8.4.3",
         "@salesforce/plugin-command-reference": "^3.0.71",
         "@salesforce/plugin-telemetry": "^2.3.8",
         "@salesforce/ts-sinon": "^1.4.18",
         "@types/shelljs": "^0.8.15",
         "@types/sinon-chai": "^3.2.12",
         "eslint-plugin-sf-plugin": "^1.17.4",
-        "oclif": "^4.6.1",
+        "oclif": "^4.7.2",
         "sinon-chai": "^3.7.0",
         "ts-node": "^10.9.2",
         "typescript": "^5.4.3"
@@ -218,10 +219,13 @@
             "output": []
         }
     },
-    "exports": "./lib/index.js",
+    "exports": {
+        ".": "./lib/index.js",
+        "./npmName": "./lib/shared/npmName.js"
+    },
     "type": "module",
     "sfdx": {
-        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/3.5.1.crt",
-        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/3.5.1.sig"
+        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/3.5.3.crt",
+        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/3.5.3.sig"
     }
 }

package/lib/shared/NpmName.d.ts

@@ -1,52 +0,0 @@
-/**
- * String representing the parsed components of an NpmName
- *
- * @example
- * const f: NpmName = NpmName.parse('@salesforce/jj@foo');
- * console.log(f.tag === 'foo')
- */
-export declare class NpmName {
-    static readonly DEFAULT_TAG = "latest";
-    tag: string;
-    scope: string;
-    name: string;
-    /**
-     * Private ctor. Use static parse method.
-     */
-    private constructor();
-    /**
-     * Parse an NPM package name into {scope, name, tag}. The tag is 'latest' by default and can be any semver string.
-     *
-     * @param {string} npmName - The npm name to parse.
-     * @return {NpmName} - An object with the parsed components.
-     */
-    static parse(npmName: string): NpmName;
-    /**
-     * Static helper to parse the name and scope.
-     *
-     * @param {string} name - The string to parse.
-     * @param {NpmNameInfo} returnNpmName - The object to update.
-     */
-    private static setNameAndScope;
-    /**
-     * Validate a component part that it's not empty and return it trimmed.
-     *
-     * @param {string} name The component to validate.
-     * @return {string} A whitespace trimmed version of the component.
-     */
-    private static validateComponentString;
-    /**
-     * Produce a string that can be used by npm. @salesforce/jj@1.2.3 becomes "salesforce-jj-1.2.3.tgz
-     *
-     * @param {string} [ext = tgz] The file extension to use.
-     * @param {boolean} includeLatestTag - True if the "latest" tag should be used. Generally you wouldn't do this.
-     * @return {string} Formatted npm string thats compatible with the npm utility
-     */
-    toFilename(ext?: string, includeLatestTag?: boolean): string;
-    /**
-     * Produces a formatted string version of the object.
-     *
-     * @return {string} A formatted string version of the object.
-     */
-    toString(includeTag?: boolean): string;
-}

package/lib/shared/NpmName.js

@@ -1,136 +0,0 @@
-/*
- * 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
- */
-import { SfError } from '@salesforce/core';
-import { setErrorName } from './errors.js';
-/**
- * String representing the parsed components of an NpmName
- *
- * @example
- * const f: NpmName = NpmName.parse('@salesforce/jj@foo');
- * console.log(f.tag === 'foo')
- */
-export class NpmName {
-    static DEFAULT_TAG = 'latest';
-    tag;
-    // next 2 props won't exist until after parse is called
-    // TODO: make this more functional and deterministic
-    scope;
-    name;
-    /**
-     * Private ctor. Use static parse method.
-     */
-    constructor() {
-        this.tag = NpmName.DEFAULT_TAG;
-    }
-    /**
-     * Parse an NPM package name into {scope, name, tag}. The tag is 'latest' by default and can be any semver string.
-     *
-     * @param {string} npmName - The npm name to parse.
-     * @return {NpmName} - An object with the parsed components.
-     */
-    static parse(npmName) {
-        if (!npmName || npmName.length < 1) {
-            throw setErrorName(new SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName'), 'MissingOrInvalidNpmName');
-        }
-        const returnNpmName = new NpmName();
-        const components = npmName.split('@');
-        // salesforce/jj
-        if (components.length === 1) {
-            NpmName.setNameAndScope(components[0], returnNpmName);
-        }
-        else if (components[0].includes('/')) {
-            NpmName.setNameAndScope(components[0], returnNpmName);
-        }
-        else if (components[1].includes('/')) {
-            NpmName.setNameAndScope(components[1], returnNpmName);
-        }
-        else {
-            // Allow something like salesforcedx/pre-release
-            NpmName.setNameAndScope(components[0], returnNpmName);
-            returnNpmName.tag = components[1];
-        }
-        if (components.length > 2) {
-            returnNpmName.tag = components[2];
-        }
-        return returnNpmName;
-    }
-    /**
-     * Static helper to parse the name and scope.
-     *
-     * @param {string} name - The string to parse.
-     * @param {NpmNameInfo} returnNpmName - The object to update.
-     */
-    static setNameAndScope(name, returnNpmName) {
-        // There are at least 2 components. So there is likely a scope.
-        const subComponents = name.split('/');
-        if (subComponents.length === 2 && subComponents[0].trim().length > 0 && subComponents[1].trim().length > 0) {
-            returnNpmName.scope = NpmName.validateComponentString(subComponents[0]);
-            returnNpmName.name = NpmName.validateComponentString(subComponents[1]);
-        }
-        else if (subComponents.length === 1) {
-            returnNpmName.name = NpmName.validateComponentString(subComponents[0]);
-        }
-        else {
-            throw setErrorName(new SfError('The npm name is invalid.', 'InvalidNpmName'), 'InvalidNpmName');
-        }
-    }
-    /**
-     * Validate a component part that it's not empty and return it trimmed.
-     *
-     * @param {string} name The component to validate.
-     * @return {string} A whitespace trimmed version of the component.
-     */
-    static validateComponentString(name) {
-        const trimmedName = name.trim();
-        if (trimmedName && trimmedName.length > 0) {
-            return trimmedName;
-        }
-        else {
-            throw setErrorName(new SfError('The npm name is missing or invalid.', 'MissingOrInvalidNpmName'), 'MissingOrInvalidNpmName');
-        }
-    }
-    /**
-     * Produce a string that can be used by npm. @salesforce/jj@1.2.3 becomes "salesforce-jj-1.2.3.tgz
-     *
-     * @param {string} [ext = tgz] The file extension to use.
-     * @param {boolean} includeLatestTag - True if the "latest" tag should be used. Generally you wouldn't do this.
-     * @return {string} Formatted npm string thats compatible with the npm utility
-     */
-    toFilename(ext = 'tgz', includeLatestTag) {
-        const nameComponents = [];
-        if (this.scope) {
-            nameComponents.push(this.scope);
-        }
-        nameComponents.push(this.name);
-        if (this.tag) {
-            if (this.tag !== NpmName.DEFAULT_TAG) {
-                nameComponents.push(this.tag);
-            }
-            else if (includeLatestTag) {
-                nameComponents.push(this.tag);
-            }
-        }
-        return nameComponents.join('-').concat(ext.startsWith('.') ? ext : `.${ext}`);
-    }
-    /**
-     * Produces a formatted string version of the object.
-     *
-     * @return {string} A formatted string version of the object.
-     */
-    toString(includeTag = false) {
-        const nameComponents = [];
-        if (this.scope && this.scope.length > 0) {
-            nameComponents.push(`@${this.scope}/`);
-        }
-        nameComponents.push(this.name);
-        if (includeTag && this.tag && this.tag.length > 0) {
-            nameComponents.push(`@${this.tag}`);
-        }
-        return nameComponents.join('');
-    }
-}
-//# sourceMappingURL=NpmName.js.map

package/lib/shared/NpmName.js.map

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