@salesforce/core-bundle 7.3.10 → 7.3.11

package/lib/index.d.ts

@@ -6178,6 +6178,16 @@ declare module '@salesforce/core-bundle/util/fileLocking' {
   export const lockInitSync: (filePath: string) => LockInitSyncResponse;
   export {};
 
+}
+declare module '@salesforce/core-bundle/util/findSuggestion' {
+  /**
+   * 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 const findSuggestion: (needle: string, haystack: string[]) => string;
+
 }
 declare module '@salesforce/core-bundle/util/findUppercaseKeys' {
   import { JsonMap, Optional } from '@salesforce/ts-types';

package/lib/index.js

@@ -12075,7 +12075,7 @@ var require_package2 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@salesforce/core-bundle",
-      version: "7.3.10",
+      version: "7.3.11",
       description: "Core libraries to interact with SFDX projects, orgs, and APIs.",
       main: "lib/index",
       types: "lib/index.d.ts",
@@ -12112,11 +12112,12 @@ var require_package2 = __commonJS({
       ],
       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",
@@ -12134,6 +12135,7 @@ var require_package2 = __commonJS({
         "@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",
@@ -84948,6 +84950,251 @@ var require_configAggregator = __commonJS({
   }
 });
 
+// node_modules/fastest-levenshtein/mod.js
+var require_mod = __commonJS({
+  "node_modules/fastest-levenshtein/mod.js"(exports2) {
+    "use strict";
+    exports2.__esModule = true;
+    exports2.distance = exports2.closest = void 0;
+    var peq = new Uint32Array(65536);
+    var myers_32 = function(a, b) {
+      var n = a.length;
+      var m = b.length;
+      var lst = 1 << n - 1;
+      var pv = -1;
+      var mv = 0;
+      var sc = n;
+      var i = n;
+      while (i--) {
+        peq[a.charCodeAt(i)] |= 1 << i;
+      }
+      for (i = 0; i < m; i++) {
+        var eq = peq[b.charCodeAt(i)];
+        var xv = eq | mv;
+        eq |= (eq & pv) + pv ^ pv;
+        mv |= ~(eq | pv);
+        pv &= eq;
+        if (mv & lst) {
+          sc++;
+        }
+        if (pv & lst) {
+          sc--;
+        }
+        mv = mv << 1 | 1;
+        pv = pv << 1 | ~(xv | mv);
+        mv &= xv;
+      }
+      i = n;
+      while (i--) {
+        peq[a.charCodeAt(i)] = 0;
+      }
+      return sc;
+    };
+    var myers_x = function(b, a) {
+      var n = a.length;
+      var m = b.length;
+      var mhc = [];
+      var phc = [];
+      var hsize = Math.ceil(n / 32);
+      var vsize = Math.ceil(m / 32);
+      for (var i = 0; i < hsize; i++) {
+        phc[i] = -1;
+        mhc[i] = 0;
+      }
+      var j = 0;
+      for (; j < vsize - 1; j++) {
+        var mv_1 = 0;
+        var pv_1 = -1;
+        var start_1 = j * 32;
+        var vlen_1 = Math.min(32, m) + start_1;
+        for (var k = start_1; k < vlen_1; k++) {
+          peq[b.charCodeAt(k)] |= 1 << k;
+        }
+        for (var i = 0; i < n; i++) {
+          var eq = peq[a.charCodeAt(i)];
+          var pb = phc[i / 32 | 0] >>> i & 1;
+          var mb = mhc[i / 32 | 0] >>> i & 1;
+          var xv = eq | mv_1;
+          var xh = ((eq | mb) & pv_1) + pv_1 ^ pv_1 | eq | mb;
+          var ph = mv_1 | ~(xh | pv_1);
+          var mh = pv_1 & xh;
+          if (ph >>> 31 ^ pb) {
+            phc[i / 32 | 0] ^= 1 << i;
+          }
+          if (mh >>> 31 ^ mb) {
+            mhc[i / 32 | 0] ^= 1 << i;
+          }
+          ph = ph << 1 | pb;
+          mh = mh << 1 | mb;
+          pv_1 = mh | ~(xv | ph);
+          mv_1 = ph & xv;
+        }
+        for (var k = start_1; k < vlen_1; k++) {
+          peq[b.charCodeAt(k)] = 0;
+        }
+      }
+      var mv = 0;
+      var pv = -1;
+      var start = j * 32;
+      var vlen = Math.min(32, m - start) + start;
+      for (var k = start; k < vlen; k++) {
+        peq[b.charCodeAt(k)] |= 1 << k;
+      }
+      var score = m;
+      for (var i = 0; i < n; i++) {
+        var eq = peq[a.charCodeAt(i)];
+        var pb = phc[i / 32 | 0] >>> i & 1;
+        var mb = mhc[i / 32 | 0] >>> i & 1;
+        var xv = eq | mv;
+        var xh = ((eq | mb) & pv) + pv ^ pv | eq | mb;
+        var ph = mv | ~(xh | pv);
+        var mh = pv & xh;
+        score += ph >>> m - 1 & 1;
+        score -= mh >>> m - 1 & 1;
+        if (ph >>> 31 ^ pb) {
+          phc[i / 32 | 0] ^= 1 << i;
+        }
+        if (mh >>> 31 ^ mb) {
+          mhc[i / 32 | 0] ^= 1 << i;
+        }
+        ph = ph << 1 | pb;
+        mh = mh << 1 | mb;
+        pv = mh | ~(xv | ph);
+        mv = ph & xv;
+      }
+      for (var k = start; k < vlen; k++) {
+        peq[b.charCodeAt(k)] = 0;
+      }
+      return score;
+    };
+    var distance = function(a, b) {
+      if (a.length < b.length) {
+        var tmp = b;
+        b = a;
+        a = tmp;
+      }
+      if (b.length === 0) {
+        return a.length;
+      }
+      if (a.length <= 32) {
+        return myers_32(a, b);
+      }
+      return myers_x(a, b);
+    };
+    exports2.distance = distance;
+    var closest = function(str, arr) {
+      var min_distance = Infinity;
+      var min_index = 0;
+      for (var i = 0; i < arr.length; i++) {
+        var dist = distance(str, arr[i]);
+        if (dist < min_distance) {
+          min_distance = dist;
+          min_index = i;
+        }
+      }
+      return arr[min_index];
+    };
+    exports2.closest = closest;
+  }
+});
+
+// node_modules/fast-levenshtein/levenshtein.js
+var require_levenshtein = __commonJS({
+  "node_modules/fast-levenshtein/levenshtein.js"(exports2, module2) {
+    (function() {
+      "use strict";
+      var collator;
+      try {
+        collator = typeof Intl !== "undefined" && typeof Intl.Collator !== "undefined" ? Intl.Collator("generic", { sensitivity: "base" }) : null;
+      } catch (err) {
+        console.log("Collator could not be initialized and wouldn't be used");
+      }
+      var levenshtein = require_mod();
+      var prevRow = [], str2Char = [];
+      var Levenshtein = {
+        /**
+         * Calculate levenshtein distance of the two strings.
+         *
+         * @param str1 String the first string.
+         * @param str2 String the second string.
+         * @param [options] Additional options.
+         * @param [options.useCollator] Use `Intl.Collator` for locale-sensitive string comparison.
+         * @return Integer the levenshtein distance (0 and above).
+         */
+        get: function(str1, str2, options) {
+          var useCollator = options && collator && options.useCollator;
+          if (useCollator) {
+            var str1Len = str1.length, str2Len = str2.length;
+            if (str1Len === 0)
+              return str2Len;
+            if (str2Len === 0)
+              return str1Len;
+            var curCol, nextCol, i, j, tmp;
+            for (i = 0; i < str2Len; ++i) {
+              prevRow[i] = i;
+              str2Char[i] = str2.charCodeAt(i);
+            }
+            prevRow[str2Len] = str2Len;
+            var strCmp;
+            for (i = 0; i < str1Len; ++i) {
+              nextCol = i + 1;
+              for (j = 0; j < str2Len; ++j) {
+                curCol = nextCol;
+                strCmp = 0 === collator.compare(str1.charAt(i), String.fromCharCode(str2Char[j]));
+                nextCol = prevRow[j] + (strCmp ? 0 : 1);
+                tmp = curCol + 1;
+                if (nextCol > tmp) {
+                  nextCol = tmp;
+                }
+                tmp = prevRow[j + 1] + 1;
+                if (nextCol > tmp) {
+                  nextCol = tmp;
+                }
+                prevRow[j] = curCol;
+              }
+              prevRow[j] = nextCol;
+            }
+            return nextCol;
+          }
+          return levenshtein.distance(str1, str2);
+        }
+      };
+      if (typeof define !== "undefined" && define !== null && define.amd) {
+        define(function() {
+          return Levenshtein;
+        });
+      } else if (typeof module2 !== "undefined" && module2 !== null && typeof exports2 !== "undefined" && module2.exports === exports2) {
+        module2.exports = Levenshtein;
+      } else if (typeof self !== "undefined" && typeof self.postMessage === "function" && typeof self.importScripts === "function") {
+        self.Levenshtein = Levenshtein;
+      } else if (typeof window !== "undefined" && window !== null) {
+        window.Levenshtein = Levenshtein;
+      }
+    })();
+  }
+});
+
+// lib/util/findSuggestion.js
+var require_findSuggestion = __commonJS({
+  "lib/util/findSuggestion.js"(exports2) {
+    "use strict";
+    var __importDefault3 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.findSuggestion = void 0;
+    var fast_levenshtein_1 = __importDefault3(require_levenshtein());
+    var findSuggestion = (needle, haystack) => {
+      const index = [];
+      haystack.map((hay) => {
+        index[fast_levenshtein_1.default.get(needle, hay)] = hay;
+      });
+      return index.find((item) => item !== void 0) ?? "";
+    };
+    exports2.findSuggestion = findSuggestion;
+  }
+});
+
 // lib/org/connection.js
 var require_connection3 = __commonJS({
   "lib/org/connection.js"(exports2) {
@@ -108661,6 +108908,7 @@ var require_authInfo = __commonJS({
     var filters_1 = require_filters();
     var messages_12 = require_messages();
     var sfdcUrl_12 = require_sfdcUrl();
+    var findSuggestion_1 = require_findSuggestion();
     var connection_12 = require_connection3();
     var orgConfigProperties_12 = require_orgConfigProperties();
     var org_12 = require_org();
@@ -109146,7 +109394,15 @@ var require_authInfo = __commonJS({
           });
           this.usingAccessToken = true;
         } 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_12.SfError.create({
+            name: "NamedOrgNotFoundError",
+            message: messages.getMessage("namedOrgNotFound", [username]),
+            actions: likeName === "" ? void 0 : [`It looks like you mistyped the username or alias. Did you mean "${likeName}"?`]
+          });
         } else {
           await this.initAuthOptions(authOptions);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core-bundle",
-  "version": "7.3.10",
+  "version": "7.3.11",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -37,11 +37,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",
@@ -59,6 +60,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",