@salesforce/core-bundle 8.10.2 → 8.11.0

package/lib/index.js

@@ -8276,16 +8276,22 @@ ${error.message}`);
           throw new sfError_12.SfError(`Missing message ${this.bundleName}:${key} for locale ${_Messages.getLocale()}.`, "MissingMessageError");
         }
         const messages = (0, kit_1.ensureArray)(msg);
+        let tokenCur = 0;
         return messages.map((message) => {
           const msgStr = (0, ts_types_1.ensureString)(message);
           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_12.Logger.childFromRoot("core:messages");
             logger.warn(`Unable to render tokens in message. Ensure a specifier (e.g. %s) exists in the message:
 ${msgStr}`);
           }
-          return specifierFound ? util.format(msgStr, ...tokens) : msgStr;
+          return msgStr;
         });
       }
     };
@@ -12310,7 +12316,7 @@ var require_package2 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@salesforce/core-bundle",
-      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",
@@ -12368,7 +12374,7 @@ var require_package2 = __commonJS({
       },
       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",
@@ -14482,6 +14488,7 @@ __export(tslib_es6_exports, {
   __propKey: () => __propKey,
   __read: () => __read,
   __rest: () => __rest,
+  __rewriteRelativeImportExtension: () => __rewriteRelativeImportExtension,
   __runInitializers: () => __runInitializers,
   __setFunctionName: () => __setFunctionName,
   __spread: () => __spread,
@@ -14806,7 +14813,7 @@ function __importStar(mod) {
   if (mod && mod.__esModule) return mod;
   var result = {};
   if (mod != null) {
-    for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
   }
   __setModuleDefault(result, mod);
   return result;
@@ -14882,7 +14889,15 @@ function __disposeResources(env) {
   }
   return next();
 }
-var extendStatics, __assign, __createBinding, __setModuleDefault, _SuppressedError, tslib_es6_default;
+function __rewriteRelativeImportExtension(path, preserveJsx) {
+  if (typeof path === "string" && /^\.\.?\//.test(path)) {
+    return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
+      return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
+    });
+  }
+  return path;
+}
+var extendStatics, __assign, __createBinding, __setModuleDefault, ownKeys, _SuppressedError, tslib_es6_default;
 var init_tslib_es6 = __esm({
   "node_modules/tslib/tslib.es6.mjs"() {
     extendStatics = function(d, b) {
@@ -14921,6 +14936,14 @@ var init_tslib_es6 = __esm({
     } : function(o, v) {
       o["default"] = v;
     };
+    ownKeys = function(o) {
+      ownKeys = Object.getOwnPropertyNames || function(o2) {
+        var ar = [];
+        for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+        return ar;
+      };
+      return ownKeys(o);
+    };
     _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
       var e = new Error(message);
       return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
@@ -14931,6 +14954,10 @@ var init_tslib_es6 = __esm({
       __rest,
       __decorate,
       __param,
+      __esDecorate,
+      __runInitializers,
+      __propKey,
+      __setFunctionName,
       __metadata,
       __awaiter,
       __generator,
@@ -14952,7 +14979,8 @@ var init_tslib_es6 = __esm({
       __classPrivateFieldSet,
       __classPrivateFieldIn,
       __addDisposableResource,
-      __disposeResources
+      __disposeResources,
+      __rewriteRelativeImportExtension
     };
   }
 });
@@ -47505,7 +47533,7 @@ var require_stream2 = __commonJS({
 var require_buffer_list = __commonJS({
   "node_modules/readable-stream/lib/internal/streams/buffer_list.js"(exports2, module2) {
     "use strict";
-    function ownKeys(object, enumerableOnly) {
+    function ownKeys2(object, enumerableOnly) {
       var keys2 = Object.keys(object);
       if (Object.getOwnPropertySymbols) {
         var symbols = Object.getOwnPropertySymbols(object);
@@ -47518,9 +47546,9 @@ var require_buffer_list = __commonJS({
     function _objectSpread(target) {
       for (var i = 1; i < arguments.length; i++) {
         var source = null != arguments[i] ? arguments[i] : {};
-        i % 2 ? ownKeys(Object(source), true).forEach(function(key) {
+        i % 2 ? ownKeys2(Object(source), true).forEach(function(key) {
           _defineProperty(target, key, source[key]);
-        }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
+        }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys2(Object(source)).forEach(function(key) {
           Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
         });
       }
@@ -49129,7 +49157,7 @@ var require_from = __commonJS({
         });
       };
     }
-    function ownKeys(object, enumerableOnly) {
+    function ownKeys2(object, enumerableOnly) {
       var keys2 = Object.keys(object);
       if (Object.getOwnPropertySymbols) {
         var symbols = Object.getOwnPropertySymbols(object);
@@ -49142,9 +49170,9 @@ var require_from = __commonJS({
     function _objectSpread(target) {
       for (var i = 1; i < arguments.length; i++) {
         var source = null != arguments[i] ? arguments[i] : {};
-        i % 2 ? ownKeys(Object(source), true).forEach(function(key) {
+        i % 2 ? ownKeys2(Object(source), true).forEach(function(key) {
           _defineProperty(target, key, source[key]);
-        }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
+        }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys2(Object(source)).forEach(function(key) {
           Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core-bundle",
-  "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",
@@ -58,7 +58,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",