@salesforce/core 8.10.2 → 8.11.0

package/lib/messages.js

@@ -521,6 +521,7 @@ class Messages {
             throw new sfError_1.SfError(`Missing message ${this.bundleName}:${key} for locale ${Messages.getLocale()}.`, 'MissingMessageError');
         }
         const messages = (0, kit_1.ensureArray)(msg);
+        let tokenCur = 0; // Keep track of which tokens we've used
         return messages.map((message) => {
             const msgStr = (0, ts_types_1.ensureString)(message);
             // If the message does not contain a specifier, util.format still appends the token to the end.
@@ -530,12 +531,18 @@ class Messages {
             // https://nodejs.org/api/util.html#utilformatformat-args
             // https://regex101.com/r/8Hf8Z6/1
             const specifierRegex = new RegExp('%[sdifjoO]{1}', 'gm');
-            const specifierFound = specifierRegex.test(msgStr);
-            if (!specifierFound && tokens.length > 0) {
+            const specifierFound = msgStr.match(specifierRegex) ?? [];
+            const tokenCount = specifierFound.length;
+            if (tokenCount > 0) {
+                const relevantTokens = tokens.slice(tokenCur, tokenCur + tokenCount);
+                tokenCur += tokenCount;
+                return util.format(msgStr, ...relevantTokens);
+            }
+            else {
                 const logger = logger_1.Logger.childFromRoot('core:messages');
                 logger.warn(`Unable to render tokens in message. Ensure a specifier (e.g. %s) exists in the message:\n${msgStr}`);
             }
-            return specifierFound ? util.format(msgStr, ...tokens) : msgStr;
+            return msgStr;
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "8.10.2",
+  "version": "8.11.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -74,7 +74,7 @@
   },
   "devDependencies": {
     "@salesforce/dev-scripts": "^10.1.1",
-    "@salesforce/ts-sinon": "^1.4.27",
+    "@salesforce/ts-sinon": "^1.4.30",
     "@types/benchmark": "^2.1.5",
     "@types/fast-levenshtein": "^0.0.4",
     "@types/jsonwebtoken": "9.0.7",