paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 38 Packages Projects Releases Wiki Activity

Use shell-quote for script argument parsing

Browse Source 
Replace custom splitShellArgs with shell-quote's parse() for proper
shell argument tokenization in createScriptOptionsParser.

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
This commit is contained in:
Patrik Oldsberg
2026-02-28 11:46:33 +01:00
parent eb73feac15
commit f01dbf301e
4 changed files with 23 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/modules/build/lib/optionsParser.ts
+6 -35
View File
@@ -14,40 +14,7 @@
* limitations under the License.
*/
import { parseArgs, type ParseArgsConfig } from 'node:util';
// Splits a shell-like argument string, respecting single and double quotes
function splitShellArgs(str: string): string[] {
const args: string[] = [];
let current = '';
let quote: string | undefined;
for (let i = 0; i < str.length; i++) {
const ch = str[i];
if (quote) {
if (ch === quote) {
quote = undefined;
} else {
current += ch;
}
} else if (ch === '"' || ch === "'") {
quote = ch;
} else if (/\s/.test(ch)) {
if (current) {
args.push(current);
current = '';
}
} else {
current += ch;
}
}
if (current) {
args.push(current);
}
return args;
}
import { parse as parseShellArgs } from 'shell-quote';
export function createScriptOptionsParser(
commandPath: string[],
@@ -61,7 +28,11 @@ export function createScriptOptionsParser(
}
const argsStr = scriptStr.slice(expectedScript.length).trim();
const args = argsStr ? splitShellArgs(argsStr) : [];
const args = argsStr
? parseShellArgs(argsStr).filter(
(e): e is string => typeof e === 'string',
)
: [];
const { values } = parseArgs({ args, strict: false, options });
return values;
packages/cli/src/modules/lint/lib/optionsParser.ts
+6 -35
View File
@@ -14,40 +14,7 @@
* limitations under the License.
*/
import { parseArgs, type ParseArgsConfig } from 'node:util';
// Splits a shell-like argument string, respecting single and double quotes
function splitShellArgs(str: string): string[] {
const args: string[] = [];
let current = '';
let quote: string | undefined;
for (let i = 0; i < str.length; i++) {
const ch = str[i];
if (quote) {
if (ch === quote) {
quote = undefined;
} else {
current += ch;
}
} else if (ch === '"' || ch === "'") {
quote = ch;
} else if (/\s/.test(ch)) {
if (current) {
args.push(current);
current = '';
}
} else {
current += ch;
}
}
if (current) {
args.push(current);
}
return args;
}
import { parse as parseShellArgs } from 'shell-quote';
export function createScriptOptionsParser(
commandPath: string[],
@@ -61,7 +28,11 @@ export function createScriptOptionsParser(
}
const argsStr = scriptStr.slice(expectedScript.length).trim();
const args = argsStr ? splitShellArgs(argsStr) : [];
const args = argsStr
? parseShellArgs(argsStr).filter(
(e): e is string => typeof e === 'string',
)
: [];
const { values } = parseArgs({ args, strict: false, options });
return values;