@salesforce/core 6.3.1-bundle-dev.0 → 6.3.1-bundle-dev1.1

package/lib/messages.d.ts

@@ -78,6 +78,9 @@ export type StoredMessageMap = Map<string, StoredMessage>;
  * // Create loader functions for all files in the messages directory
  * Messages.importMessagesDirectory(__dirname);
  *
+ * // or, for ESM code
+ * Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+ *
  * // Now you can use the messages from anywhere in your code or file.
  * // If using importMessageDirectory, the bundle name is the file name.
  * const messages: Messages = Messages.loadMessages(packageName, bundleName);
@@ -146,6 +149,15 @@ export declare class Messages<T extends string> {
      * @param filePath The path of the file.
      */
     static importMessageFile(packageName: string, filePath: string): void;
+    /**
+     * Support ESM plugins who can't use __dirname
+     *
+     * @param metaUrl pass in `import.meta.url`
+     * @param truncateToProjectPath Will look for the messages directory in the project root (where the package.json file is located).
+     * i.e., the module is typescript and the messages folder is in the top level of the module directory.
+     * @param packageName The npm package name. Figured out from the root directory's package.json.
+     */
+    static importMessagesDirectoryFromMetaUrl(metaUrl: string, truncateToProjectPath?: boolean, packageName?: string): void;
     /**
      * Import all json and js files in a messages directory. Use the file name as the bundle key when
      * {@link Messages.loadMessages} is called. By default, we're assuming the moduleDirectoryPart is a

package/lib/messages.js

@@ -34,6 +34,7 @@ const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 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 sfError_1 = require("./sfError");
@@ -161,6 +162,9 @@ const jsAndJsonLoader = (filePath, fileContents) => {
  * // Create loader functions for all files in the messages directory
  * Messages.importMessagesDirectory(__dirname);
  *
+ * // or, for ESM code
+ * Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+ *
  * // Now you can use the messages from anywhere in your code or file.
  * // If using importMessageDirectory, the bundle name is the file name.
  * const messages: Messages = Messages.loadMessages(packageName, bundleName);
@@ -252,6 +256,17 @@ class Messages {
             this.setLoaderFunction(packageName, bundleName, Messages.generateFileLoaderFunction(bundleName, filePath));
         }
     }
+    /**
+     * Support ESM plugins who can't use __dirname
+     *
+     * @param metaUrl pass in `import.meta.url`
+     * @param truncateToProjectPath Will look for the messages directory in the project root (where the package.json file is located).
+     * i.e., the module is typescript and the messages folder is in the top level of the module directory.
+     * @param packageName The npm package name. Figured out from the root directory's package.json.
+     */
+    static importMessagesDirectoryFromMetaUrl(metaUrl, truncateToProjectPath = true, packageName) {
+        return Messages.importMessagesDirectory(path.dirname((0, node_url_1.fileURLToPath)(metaUrl)), truncateToProjectPath, packageName);
+    }
     /**
      * Import all json and js files in a messages directory. Use the file name as the bundle key when
      * {@link Messages.loadMessages} is called. By default, we're assuming the moduleDirectoryPart is a

package/lib/org/connection.js

@@ -304,7 +304,7 @@ class Connection extends jsforce_1.Connection {
         });
         const query = tooling ? await this.tooling.query(soql, options) : await this.query(soql, options);
         if (query.records.length && query.totalSize > query.records.length) {
-            void lifecycleEvents_1.Lifecycle.getInstance().emitWarning(`The query result is missing ${query.totalSize - query.records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "maxQueryLimit" or the environment variable "SFDX_MAX_QUERY_LIMIT" to ${query.totalSize} or greater than ${maxFetch}.`);
+            void lifecycleEvents_1.Lifecycle.getInstance().emitWarning(`The query result is missing ${query.totalSize - query.records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "maxQueryLimit" or the environment variable "SF_ORG_MAX_QUERY_LIMIT" to ${query.totalSize} or greater than ${maxFetch}.`);
         }
         return query;
     }

package/lib/webOAuthServer.js

@@ -224,7 +224,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
     parseAuthCodeFromRequest(response, request) {
         if (!this.validateState(request)) {
             const error = new sfError_1.SfError('urlStateMismatch');
-            this.webServer.sendError(400, `${error.message}\n`, response);
+            this.webServer.sendError(400, error.message, response);
             this.closeRequest(request);
             this.logger.warn('urlStateMismatchAttempt detected.');
             if (!(0, ts_types_1.get)(this.webServer.server, 'urlStateMismatchAttempt')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "6.3.1-bundle-dev.0",
+  "version": "6.3.1-bundle-dev1.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "dist/index",
   "types": "dist/exported.d.ts",
@@ -19,7 +19,7 @@
     "lint": "wireit",
     "lint-fix": "yarn sf-lint --fix",
     "postcompile": "tsc -p typedocExamples",
-    "prepack": "sf-prepack",
+    "prepack": "sf-prepack && yarn bundle",
     "prepare": "sf-install",
     "test": "wireit",
     "test:only": "wireit",
@@ -54,7 +54,7 @@
     "jszip": "3.10.1",
     "pino": "^8.16.2",
     "pino-abstract-transport": "^1.1.0",
-    "pino-pretty": "^10.2.3",
+    "pino-pretty": "^10.3.1",
     "proper-lockfile": "^4.1.2",
     "semver": "^7.5.4",
     "ts-retry-promise": "^0.7.1"
@@ -68,11 +68,11 @@
     "@types/proper-lockfile": "^4.1.4",
     "benchmark": "^2.1.4",
     "chai-string": "^1.5.0",
+    "ts-node": "^10.9.2",
+    "ts-patch": "^3.1.1",
     "esbuild": "^0.19.5",
     "esbuild-plugin-pino": "^2.1.0",
     "npm-dts": "^1.3.12",
-    "ts-node": "^10.9.1",
-    "ts-patch": "^3.0.2",
     "typescript": "^5.2.2"
   },
   "repository": {