fix: bugfix for wildcard naming open-cli-tools#211

transitive-bullshit · Jan 6, 2020 · bb7c815 · bb7c815
1 parent 84ba2de
commit bb7c815
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/command-parser/expand-npm-wildcard.js b/src/command-parser/expand-npm-wildcard.js
@@ -25,10 +25,18 @@ module.exports = class ExpandNpmWildcard {
         const wildcardRegex = new RegExp(`^${preWildcard}(.*?)${postWildcard}$`);
 
         return this.scripts
-            .filter(script => wildcardRegex.test(script))
-            .map(script => Object.assign({}, commandInfo, {
-                command: `${npmCmd} run ${script}${args}`,
-                name: script
-            }));
+            .map(script => {
+                const match = script.match(wildcardRegex);
+
+                if (match) {
+                    return Object.assign({}, commandInfo, {
+                        command: `${npmCmd} run ${script}${args}`,
+                        // Use the wildcard portion of the script match unless it's empty, 
+                        // in which case use the full name of the script
+                        name: match[1] || script
+                    });
+                }
+            })
+            .filter(Boolean);
     }
 };
diff --git a/src/command-parser/expand-npm-wildcard.spec.js b/src/command-parser/expand-npm-wildcard.spec.js
@@ -42,7 +42,7 @@ for (const npmCmd of ['npm', 'yarn']) {
             });
 
             expect(parser.parse({ command: `${npmCmd} run foo-*-baz qux` })).toEqual([
-                { name: 'foo-bar-baz', command: `${npmCmd} run foo-bar-baz qux` },
+                { name: 'bar', command: `${npmCmd} run foo-bar-baz qux` },
                 { name: 'foo--baz', command: `${npmCmd} run foo--baz qux` },
             ]);
         });