@salesforce/core 7.3.10 → 7.3.12

package/lib/lifecycleEvents.d.ts

@@ -1,5 +1,7 @@
 import { AnyJson } from '@salesforce/ts-types';
-type callback = (data: any) => Promise<void>;
+export type callback = (data: any) => Promise<void>;
+type ListenerMap = Map<string, callback>;
+export type UniqueListenerMap = Map<string, ListenerMap>;
 /**
  * An asynchronous event listener and emitter that follows the singleton pattern. The singleton pattern allows lifecycle
  * events to be emitted from deep within a library and still be consumed by any other library or tool. It allows other
@@ -92,4 +94,5 @@ export declare class Lifecycle {
      */
     emit<T = AnyJson>(eventName: string, data: T): Promise<void>;
 }
+export declare const cloneUniqueListeners: (uniqueListeners: UniqueListenerMap) => UniqueListenerMap;
 export {};

package/lib/lifecycleEvents.js

@@ -29,7 +29,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lifecycle = void 0;
+exports.cloneUniqueListeners = exports.Lifecycle = void 0;
 const semver_1 = require("semver");
 // needed for TS to not put everything inside /lib/src
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -102,8 +102,8 @@ class Lifecycle {
         (0, semver_1.compare)(global.salesforceCoreLifecycle.version(), Lifecycle.staticVersion()) === -1) {
             const oldInstance = global.salesforceCoreLifecycle;
             // use the newer version and transfer any listeners from the old version
-            // object spread keeps them from being references
-            global.salesforceCoreLifecycle = new Lifecycle({ ...oldInstance.listeners }, oldInstance.uniqueListeners);
+            // object spread and the clone fn keep them from being references
+            global.salesforceCoreLifecycle = new Lifecycle({ ...oldInstance.listeners }, (0, exports.cloneUniqueListeners)(oldInstance.uniqueListeners));
             // clean up any listeners on the old version
             Object.keys(oldInstance.listeners).map((eventName) => {
                 oldInstance.removeAllListeners(eventName);
@@ -232,4 +232,7 @@ 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)]));
+exports.cloneUniqueListeners = cloneUniqueListeners;
 //# sourceMappingURL=lifecycleEvents.js.map

package/lib/org/authInfo.js

@@ -52,6 +52,7 @@ const stateAggregator_1 = require("../stateAggregator/stateAggregator");
 const filters_1 = require("../logger/filters");
 const messages_1 = require("../messages");
 const sfdcUrl_1 = require("../util/sfdcUrl");
+const findSuggestion_1 = require("../util/findSuggestion");
 const connection_1 = require("./connection");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 const org_1 = require("./org");
@@ -624,7 +625,17 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
         // If a username with NO oauth options, ensure authorization already exist.
         else if (username && !authOptions && !(await this.stateAggregator.orgs.exists(username))) {
-            throw messages.createError('namedOrgNotFound', [username]);
+            const likeName = (0, findSuggestion_1.findSuggestion)(username, [
+                ...(await this.stateAggregator.orgs.list()).map((f) => f.split('.json')[0]),
+                ...Object.keys(this.stateAggregator.aliases.getAll()),
+            ]);
+            throw sfError_1.SfError.create({
+                name: 'NamedOrgNotFoundError',
+                message: messages.getMessage('namedOrgNotFound', [username]),
+                actions: likeName === ''
+                    ? undefined
+                    : [`It looks like you mistyped the username or alias. Did you mean "${likeName}"?`],
+            });
         }
         else {
             await this.initAuthOptions(authOptions);

package/lib/util/findSuggestion.d.ts

@@ -0,0 +1,7 @@
+/**
+ * From the haystack, will find the closest value to the needle
+ *
+ * @param needle - what the user provided - find results similar to this
+ * @param haystack - possible results to search against
+ */
+export declare const findSuggestion: (needle: string, haystack: string[]) => string;

package/lib/util/findSuggestion.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findSuggestion = void 0;
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const fast_levenshtein_1 = __importDefault(require("fast-levenshtein"));
+/**
+ * From the haystack, will find the closest value to the needle
+ *
+ * @param needle - what the user provided - find results similar to this
+ * @param haystack - possible results to search against
+ */
+const findSuggestion = (needle, haystack) => {
+    // we'll use this array to keep track of which piece of hay is the closest to the users entered value.
+    // keys closer to the index 0 will be a closer guess than keys indexed further from 0
+    // an entry at 0 would be a direct match, an entry at 1 would be a single character off, etc.
+    const index = [];
+    haystack.map((hay) => {
+        index[fast_levenshtein_1.default.get(needle, hay)] = hay;
+    });
+    return index.find((item) => item !== undefined) ?? '';
+};
+exports.findSuggestion = findSuggestion;
+//# sourceMappingURL=findSuggestion.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "7.3.10",
+  "version": "7.3.12",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -53,11 +53,12 @@
   ],
   "dependencies": {
     "@jsforce/jsforce-node": "^3.2.0",
-    "@salesforce/kit": "^3.1.1",
+    "@salesforce/kit": "^3.1.2",
     "@salesforce/schemas": "^1.9.0",
     "@salesforce/ts-types": "^2.0.9",
     "ajv": "^8.15.0",
     "change-case": "^4.1.2",
+    "fast-levenshtein": "^3.0.0",
     "faye": "^1.4.0",
     "form-data": "^4.0.0",
     "js2xmlparser": "^4.0.1",
@@ -75,6 +76,7 @@
     "@salesforce/ts-sinon": "^1.4.19",
     "@types/benchmark": "^2.1.5",
     "@types/chai-string": "^1.4.5",
+    "@types/fast-levenshtein": "^0.0.4",
     "@types/jsonwebtoken": "9.0.6",
     "@types/proper-lockfile": "^4.1.4",
     "@types/semver": "^7.5.8",