@oclif/plugin-commands 4.0.15 → 4.0.17

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @oclif/plugin-commands
 $ oclif-example COMMAND
 running command...
 $ oclif-example (--version)
-@oclif/plugin-commands/4.0.15 linux-x64 node-v20.17.0
+@oclif/plugin-commands/4.0.17 linux-x64 node-v20.17.0
 $ oclif-example --help [COMMAND]
 USAGE
   $ oclif-example COMMAND
@@ -61,7 +61,7 @@ DESCRIPTION
   List all oclif-example commands.
 ```
 
-_See code: [src/commands/commands.ts](https://github.com/oclif/plugin-commands/blob/v4.0.15/src/commands/commands.ts)_
+_See code: [src/commands/commands.ts](https://github.com/oclif/plugin-commands/blob/v4.0.17/src/commands/commands.ts)_
 <!-- commandsstop -->
 
 # Contributing

package/lib/commands/commands.js

@@ -31,6 +31,12 @@ function determineHeaders(columns, extended) {
     }
     return [columnConfigs.id, columnConfigs.summary];
 }
+// In order to collect static properties up the inheritance chain, we need to recursively access the prototypes until there's nothing left
+function mergePrototype(result, command) {
+    const proto = Object.getPrototypeOf(command);
+    const filteredProto = _.pickBy(proto, (v) => v !== undefined);
+    return Object.keys(proto).length > 0 ? mergePrototype({ ...filteredProto, ...result }, proto) : result;
+}
 export default class Commands extends Command {
     static description = 'List all <%= config.bin %> commands.';
     static enableJsonFlag = true;
@@ -114,16 +120,9 @@ export default class Commands extends Command {
             }
             catch (error) {
                 this.debug(error);
+                return cmd;
             }
-            const obj = { ...cmd, ...commandClass };
-            // Load all properties on all extending classes.
-            while (commandClass !== undefined) {
-                commandClass = Object.getPrototypeOf(commandClass) ?? undefined;
-                // ES2022 will return all unset static properties on the prototype as undefined. This is different from ES2021
-                // which only returns the static properties that are set by defaults. In order to prevent
-                // Object.assign from overwriting the properties on the object, we need to filter out the undefined values.
-                Object.assign(obj, _.pickBy(commandClass, (v) => v !== undefined));
-            }
+            const obj = { ...mergePrototype(commandClass, commandClass), ...cmd };
             // The plugin property on the loaded class contains a LOT of information including all the commands again. Remove it.
             delete obj.plugin;
             // If Command classes have circular references, don't break the commands command.

package/oclif.manifest.json

@@ -105,5 +105,5 @@
       ]
     }
   },
-  "version": "4.0.15"
+  "version": "4.0.17"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/plugin-commands",
   "description": "plugin to show the list of all the commands",
-  "version": "4.0.15",
+  "version": "4.0.17",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-commands/issues",
   "dependencies": {
@@ -16,26 +16,26 @@
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4.0.9",
     "@types/chai": "^4.3.17",
-    "@types/lodash": "^4.17.7",
+    "@types/lodash": "^4.17.9",
     "@types/mocha": "^10.0.7",
     "@types/node": "^18",
     "@types/sinon": "^17.0.3",
     "chai": "^4.5.0",
     "commitlint": "^19",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-oclif": "^5.2.1",
     "eslint-config-oclif-typescript": "^3.1.10",
     "eslint-config-prettier": "^9.1.0",
-    "husky": "^9.1.5",
+    "husky": "^9.1.6",
     "lint-staged": "^15",
     "mocha": "^10.7.3",
     "nyc": "^15.1.0",
-    "oclif": "^4.14.29",
+    "oclif": "^4.14.35",
     "prettier": "^3.3.3",
     "shx": "^0.3.3",
-    "sinon": "^18.0.0",
+    "sinon": "^18.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2"
   },
   "engines": {
     "node": ">=18.0.0"