@oclif/core 4.0.28 → 4.0.30

package/lib/config/config.js

@@ -40,6 +40,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");
@@ -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/lib/ux/colorize-json.d.ts

@@ -2,7 +2,7 @@ type Options = {
     pretty?: boolean | undefined;
     theme?: Record<string, string> | undefined;
 };
-export declare function removeCycles(object: unknown): unknown;
+export declare function stringifyInput(json?: unknown, options?: Options): string;
 export declare function tokenize(json?: unknown, options?: Options): {
     type: string;
     value: string;

package/lib/ux/colorize-json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeCycles = removeCycles;
+exports.stringifyInput = stringifyInput;
 exports.tokenize = tokenize;
 exports.default = colorizeJson;
 const theme_1 = require("./theme");
@@ -16,46 +16,48 @@ const tokenTypes = [
     { regex: /^true|^false/, tokenType: 'boolean' },
     { regex: /^null/, tokenType: 'null' },
 ];
-function removeCycles(object) {
-    // Keep track of seen objects.
-    const seenObjects = new WeakMap();
-    const _removeCycles = (obj) => {
-        // Use object prototype to get around type and null checks
-        if (Object.prototype.toString.call(obj) === '[object Object]') {
-            // We know it is a "Record<string, unknown>" because of the conditional
-            const dictionary = obj;
-            // Seen, return undefined to remove.
-            if (seenObjects.has(dictionary))
-                return;
-            seenObjects.set(dictionary, undefined);
-            for (const key in dictionary) {
-                // Delete the duplicate object if cycle found.
-                if (_removeCycles(dictionary[key]) === undefined) {
-                    delete dictionary[key];
-                }
-            }
-        }
-        else if (Array.isArray(obj)) {
-            for (const i in obj) {
-                if (_removeCycles(obj[i]) === undefined) {
-                    // We don't want to delete the array, but we can replace the element with null.
-                    obj[i] = null;
-                }
-            }
+function stringify(value, replacer, spaces) {
+    return JSON.stringify(value, serializer(replacer, replacer), spaces);
+}
+// Inspired by https://github.com/moll/json-stringify-safe
+function serializer(replacer, cycleReplacer) {
+    const stack = [];
+    const keys = [];
+    if (!cycleReplacer)
+        cycleReplacer = function (key, value) {
+            if (stack[0] === value)
+                return '[Circular ~]';
+            return '[Circular ~.' + keys.slice(0, stack.indexOf(value)).join('.') + ']';
+        };
+    return function (key, value) {
+        if (stack.length > 0) {
+            // @ts-expect-error because `this` is not typed
+            const thisPos = stack.indexOf(this);
+            // @ts-expect-error because `this` is not typed
+            // eslint-disable-next-line no-bitwise
+            ~thisPos ? stack.splice(thisPos + 1) : stack.push(this);
+            // eslint-disable-next-line no-bitwise
+            ~thisPos ? keys.splice(thisPos, Number.POSITIVE_INFINITY, key) : keys.push(key);
+            // @ts-expect-error because `this` is not typed
+            if (stack.includes(value))
+                value = cycleReplacer.call(this, key, value);
         }
-        return obj;
+        else
+            stack.push(value);
+        // @ts-expect-error because `this` is not typed
+        return replacer ? replacer.call(this, key, value) : value;
     };
-    return _removeCycles(object);
 }
-function formatInput(json, options) {
-    return options?.pretty
-        ? JSON.stringify(typeof json === 'string' ? JSON.parse(json) : json, null, 2)
+function stringifyInput(json, options) {
+    const str = options?.pretty
+        ? stringify(typeof json === 'string' ? JSON.parse(json) : json, undefined, 2)
         : typeof json === 'string'
             ? json
-            : JSON.stringify(json);
+            : stringify(json);
+    return str;
 }
 function tokenize(json, options) {
-    let input = formatInput(removeCycles(json), options);
+    let input = stringifyInput(json, options);
     const tokens = [];
     let foundToken = false;
     do {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.0.28",
+  "version": "4.0.30",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -37,7 +37,7 @@
     "@types/debug": "^4.1.10",
     "@types/ejs": "^3.1.5",
     "@types/indent-string": "^4.0.1",
-    "@types/mocha": "^10.0.8",
+    "@types/mocha": "^10.0.9",
     "@types/node": "^18",
     "@types/pnpapi": "^0.0.5",
     "@types/sinon": "^17.0.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",