@salesforce/core 8.1.0 → 8.1.2

package/lib/lifecycleEvents.d.ts

@@ -94,5 +94,5 @@ export declare class Lifecycle {
      */
     emit<T = AnyJson>(eventName: string, data: T): Promise<void>;
 }
-export declare const cloneUniqueListeners: (uniqueListeners: UniqueListenerMap) => UniqueListenerMap;
+export declare const cloneUniqueListeners: (uniqueListeners: UniqueListenerMap | undefined) => UniqueListenerMap;
 export {};

package/lib/lifecycleEvents.js

@@ -233,6 +233,8 @@ class Lifecycle {
 }
 exports.Lifecycle = Lifecycle;
 const cloneListeners = (listeners) => new Map(Array.from(listeners.entries()));
-const cloneUniqueListeners = (uniqueListeners) => new Map(Array.from(uniqueListeners.entries()).map(([key, value]) => [key, cloneListeners(value)]));
+const cloneUniqueListeners = (uniqueListeners) => 
+// in case we're crossing major sfdx-core versions where uniqueListeners might be undefined
+new Map(Array.from(uniqueListeners?.entries() ?? []).map(([key, value]) => [key, cloneListeners(value)]));
 exports.cloneUniqueListeners = cloneUniqueListeners;
 //# sourceMappingURL=lifecycleEvents.js.map

package/lib/messages.js

@@ -37,6 +37,7 @@ const util = __importStar(require("node:util"));
 const node_url_1 = require("node:url");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
+const lifecycleEvents_1 = require("./lifecycleEvents");
 const sfError_1 = require("./sfError");
 const getKey = (packageName, bundleName) => `${packageName}:${bundleName}`;
 const REGEXP_NO_CONTENT = /^\s*$/g;
@@ -519,8 +520,29 @@ class Messages {
         }
         const messages = (0, kit_1.ensureArray)(msg);
         return messages.map((message) => {
-            (0, ts_types_1.ensureString)(message);
-            return util.format(message, ...tokens);
+            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.
+            // The 'markdownLoader' automatically splits bulleted lists into arrays.
+            // This causes the token to be appended to each line regardless of the presence of a specifier.
+            // Here we check for the presence of a specifier and only format the message if one is present.
+            // https://nodejs.org/api/util.html#utilformatformat-args
+            // https://regex101.com/r/8Hf8Z6/1
+            const specifierRegex = new RegExp('%[sdifjoO]{1}', 'gm');
+            // NOTE: This is a temporary telemetry event to track down missing specifiers in messages.
+            //       Once we have enough data and correct missing specifiers, we can remove this.
+            //       The followup work is outlined in: W-16197665
+            if (!specifierRegex.test(msgStr) && tokens.length > 0) {
+                void lifecycleEvents_1.Lifecycle.getInstance().emitTelemetry({
+                    eventName: 'missing_message_specifier',
+                    library: 'sfdx-core',
+                    function: 'getMessageWithMap',
+                    messagesLength: messages.length,
+                    message: msgStr,
+                    tokensLength: tokens.length,
+                });
+            }
+            // return specifierRegex.test(msgStr) ? util.format(msgStr, ...tokens) : msgStr;
+            return util.format(msgStr, ...tokens);
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "8.1.0",
+  "version": "8.1.2",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -56,7 +56,7 @@
     "@salesforce/kit": "^3.1.6",
     "@salesforce/schemas": "^1.9.0",
     "@salesforce/ts-types": "^2.0.10",
-    "ajv": "^8.16.0",
+    "ajv": "^8.17.1",
     "change-case": "^4.1.2",
     "fast-levenshtein": "^3.0.0",
     "faye": "^1.4.0",