@salesforce/sf-plugins-core 1.21.6 → 1.21.8

package/lib/deployer.d.ts

@@ -75,7 +75,7 @@ export declare namespace Deployer {
      * ```
      */
     type Options<T = AnyJson> = JsonMap & {
-        [key: string]: T;
+        [key: string]: T | undefined;
     };
 }
 //# sourceMappingURL=deployer.d.ts.map

package/lib/flags/salesforceId.d.ts

@@ -1,8 +1,8 @@
 export type IdFlagConfig = {
     /**
-     * Can specify if the version must be 15 or 18 characters long.  Leave blank to allow either 15 or 18.
+     * Can specify if the version must be 15 or 18 characters long or 'both'. Leave blank to allow either 15 or 18.
      */
-    length?: 15 | 18;
+    length?: 15 | 18 | 'both';
     /**
      * If the ID belongs to a certain sobject type, specify the 3 character prefix.
      */

package/lib/flags/salesforceId.js

@@ -39,11 +39,12 @@ exports.salesforceIdFlag = core_1.Flags.custom({
 });
 const validate = (input, config) => {
     const { length, startsWith } = config ?? {};
-    if (length && input.length !== length) {
-        throw messages.createError('errors.InvalidIdLength', [length]);
-    }
-    if (!length && ![15, 18].includes(input.length)) {
-        throw messages.createError('errors.InvalidIdLength', ['15 or 18']);
+    // If the flag doesn't specify a length or specifies "both", then let it accept both 15 or 18.
+    const allowedIdLength = (!length || length === 'both') ? [15, 18] : [length];
+    if (!allowedIdLength.includes(input.length)) {
+        throw messages.createError('errors.InvalidIdLength', [
+            allowedIdLength.join(` ${messages.getMessage('errors.InvalidIdLength.or')} `),
+        ]);
     }
     if (!core_2.sfdc.validateSalesforceId(input)) {
         throw messages.createError('errors.InvalidId');

package/lib/util.d.ts

@@ -1,11 +1,5 @@
 import { EnvironmentVariable, OrgConfigProperties, SfdxPropertyKeys } from '@salesforce/core';
-export type HelpSection = {
-    header: string;
-    body: Array<{
-        name: string;
-        description: string;
-    } | undefined>;
-};
+import { HelpSection } from '@oclif/core';
 /**
  * Function to build a help section for command help.
  * Takes a string to be used as section header text and an array of enums

package/lib/util.js

@@ -42,10 +42,11 @@ function toHelpSection(header, ...vars) {
             return Object.entries(v).map(([name, description]) => ({ name, description }));
         }
     })
-        .filter((b) => b);
+        .filter(isHelpSectionBodyEntry);
     return { header, body };
 }
 exports.toHelpSection = toHelpSection;
+const isHelpSectionBodyEntry = (entry) => typeof entry === 'object' && entry !== null && 'name' in entry && 'description' in entry;
 function parseVarArgs(args, argv) {
     const final = {};
     const argVals = Object.values(args);

package/messages/messages.md

@@ -14,6 +14,10 @@ This command is required to run from within a Salesforce project directory.
 
 The id must be %s characters.
 
+# errors.InvalidIdLength.or
+
+or
+
 # errors.InvalidId
 
 The id is invalid.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "1.21.6",
+  "version": "1.21.8",
   "description": "Utils for writing deploy and retrieve plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",