@oclif/core 4.0.29 → 4.0.31

package/lib/config/config.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const ejs = __importStar(require("ejs"));
+const is_wsl_1 = __importDefault(require("is-wsl"));
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
@@ -40,6 +41,7 @@ const performance_1 = require("../performance");
 const settings_1 = require("../settings");
 const determine_priority_1 = require("../util/determine-priority");
 const fs_1 = require("../util/fs");
+const ids_1 = require("../util/ids");
 const os_1 = require("../util/os");
 const util_2 = require("../util/util");
 const ux_1 = require("../ux");
@@ -292,8 +294,7 @@ class Config {
         this.channel = this.options.channel || channelFromVersion(this.version);
         this.valid = this.rootPlugin.valid;
         this.arch = (0, node_os_1.arch)() === 'ia32' ? 'x86' : (0, node_os_1.arch)();
-        const { default: isWSL } = await import('is-wsl');
-        this.platform = isWSL ? 'wsl' : (0, os_1.getPlatform)();
+        this.platform = is_wsl_1.default ? 'wsl' : (0, os_1.getPlatform)();
         this.windows = this.platform === 'win32';
         this.bin = this.pjson.oclif.bin || this.name;
         this.binAliases = this.pjson.oclif.binAliases;
@@ -696,22 +697,26 @@ class Config {
                 this.commandPermutations.add(permutation, command.id);
             }
             const handleAlias = (alias, hidden = false) => {
-                if (this._commands.has(alias)) {
+                const aliasWithDefaultTopicSeparator = (0, ids_1.toStandardizedId)(alias, this);
+                if (this._commands.has(aliasWithDefaultTopicSeparator)) {
                     const prioritizedCommand = (0, determine_priority_1.determinePriority)(this.pjson.oclif.plugins ?? [], [
-                        this._commands.get(alias),
+                        this._commands.get(aliasWithDefaultTopicSeparator),
                         command,
                     ]);
-                    this._commands.set(alias, { ...prioritizedCommand, id: alias });
+                    this._commands.set(aliasWithDefaultTopicSeparator, {
+                        ...prioritizedCommand,
+                        id: aliasWithDefaultTopicSeparator,
+                    });
                 }
                 else {
-                    this._commands.set(alias, { ...command, hidden, id: alias });
+                    this._commands.set(aliasWithDefaultTopicSeparator, { ...command, hidden, id: aliasWithDefaultTopicSeparator });
                 }
                 // set every permutation of the aliases
                 // v3 moved command alias permutations to the manifest, but some plugins may not have
                 // the new manifest yet. For those, we need to calculate the permutations here.
                 const aliasPermutations = this.flexibleTaxonomy && command.aliasPermutations === undefined
-                    ? (0, util_3.getCommandIdPermutations)(alias)
-                    : (command.permutations ?? [alias]);
+                    ? (0, util_3.getCommandIdPermutations)(aliasWithDefaultTopicSeparator)
+                    : (command.permutations ?? [aliasWithDefaultTopicSeparator]);
                 // set every permutation
                 for (const permutation of aliasPermutations) {
                     this.commandPermutations.add(permutation, command.id);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.0.29",
+  "version": "4.0.31",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -14,7 +14,7 @@
     "get-package-type": "^0.1.0",
     "globby": "^11.1.0",
     "indent-string": "^4.0.0",
-    "is-wsl": "^3",
+    "is-wsl": "^2.2.0",
     "lilconfig": "^3.1.2",
     "minimatch": "^9.0.5",
     "semver": "^7.6.3",
@@ -51,7 +51,7 @@
     "cross-env": "^7.0.3",
     "eslint": "^8.57.1",
     "eslint-config-oclif": "^5.2.1",
-    "eslint-config-oclif-typescript": "^3.1.11",
+    "eslint-config-oclif-typescript": "^3.1.12",
     "eslint-config-prettier": "^9.1.0",
     "husky": "^9.1.6",
     "lint-staged": "^15",