fix: command id parsing bug in oclif

patch for PR oclif/core#886
livecycle · Nov 27, 2023 · 5455c2e · 5455c2e
1 parent e4ed7c3
commit 5455c2e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -95,6 +95,7 @@
       "dist/hooks/**/*.js"
     ]
   },
+  "bundleDependencies": ["@oclif/core"],
   "scripts": {
     "build": "yarn clean && tsc -b",
     "clean": "shx rm -rf dist",
@@ -103,8 +104,7 @@
     "posttest": "yarn lint",
     "prepack": "yarn build && oclif manifest && oclif readme --dir docs --multi     && ./scripts/prepare_and_copy_docs.sh",
     "cli": "./bin/dev",
-    "version": "oclif readme && git add README.md",
-    "bump-to": "yarn version --no-commit-hooks --no-git-tag-version --new-version"
+    "version": "oclif readme && git add README.md"
   },
   "engines": {
     "node": ">=18.0.0"

diff --git a/patches/@oclif+core+3.12.0.patch b/patches/@oclif+core+3.12.0.patch
@@ -1,3 +1,16 @@
+diff --git a/node_modules/@oclif/core/lib/help/util.js b/node_modules/@oclif/core/lib/help/util.js
+index 6c97a31..3a7ace6 100644
+--- a/node_modules/@oclif/core/lib/help/util.js
++++ b/node_modules/@oclif/core/lib/help/util.js
+@@ -43,7 +43,7 @@ function collateSpacedCmdIDFromArgs(argv, config) {
+         const ids = (0, util_1.collectUsableIds)(config.commandIDs);
+         const final = [];
+         const idPresent = (id) => ids.has(id);
+-        const finalizeId = (s) => (s ? [...final, s].join(':') : final.join(':'));
++        const finalizeId = (s) => (s ? [...final, s] : final).filter(Boolean).join(':');
+         const hasArgs = () => {
+             const id = finalizeId();
+             if (!id)
 diff --git a/node_modules/@oclif/core/lib/interfaces/parser.d.ts b/node_modules/@oclif/core/lib/interfaces/parser.d.ts
 index acb8583..2d53745 100644
 --- a/node_modules/@oclif/core/lib/interfaces/parser.d.ts