defunkt/shout
1
0
Fork 0
Code Pull Requests Activity

Simplify port-from handling and typing

Browse Source
This commit is contained in:
Chris Wanstrath 2026-03-12 14:22:35 -07:00
parent d22b5fbcea
commit c71a34cc85
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cli/index.ts
View File

@ -94,14 +94,14 @@ program
const start = performance.now() const start = performance.now()
const results: TestResult[] = [] const results: TestResult[] = []
const cwd = process.cwd() const cwd = process.cwd()
const portFrom = opts.portFrom ? parseInt(opts.portFrom, 10) : undefined const portFrom = parseInt(opts.portFrom, 10)
if (portFrom !== undefined && Number.isNaN(portFrom)) { if (Number.isNaN(portFrom)) {
console.error("--port-from must be an integer") console.error("--port-from must be an integer")
process.exit(1) process.exit(1)
} }
let nextPort = portFrom let nextPort = portFrom
const runOne = async (filePath: string, port: number | undefined) => { const runOne = async (filePath: string, port: number) => {
const content = await readFile(filePath, "utf-8") const content = await readFile(filePath, "utf-8")
const parsed = parse(relative(cwd, filePath), content) const parsed = parse(relative(cwd, filePath), content)
@ -125,7 +125,7 @@ program
} }
} }
Object.assign(envVars, setupEnvVars, userEnvVars) Object.assign(envVars, setupEnvVars, userEnvVars)
if (port !== undefined && !("PORT" in userEnvVars) && !("PORT" in setupEnvVars)) { if (!("PORT" in userEnvVars) && !("PORT" in setupEnvVars)) {
envVars["PORT"] = String(port) envVars["PORT"] = String(port)
} }
const merged: ShoutFile = { ...parsed, commands: [...setupCommands, ...parsed.commands] } const merged: ShoutFile = { ...parsed, commands: [...setupCommands, ...parsed.commands] }
@ -203,7 +203,7 @@ program
} }
if (opts.parallel) { if (opts.parallel) {
const all = await Promise.all(files.map(f => runOne(f, nextPort !== undefined ? nextPort++ : undefined))) const all = await Promise.all(files.map(f => runOne(f, nextPort++)))
for (const r of all) { for (const r of all) {
printDots(r) printDots(r)
results.push(r) results.push(r)
@ -211,7 +211,7 @@ program
process.stdout.write("\n") process.stdout.write("\n")
} else { } else {
for (const filePath of files) { for (const filePath of files) {
const r = await runOne(filePath, nextPort !== undefined ? nextPort++ : undefined) const r = await runOne(filePath, nextPort++)
printDots(r) printDots(r)
results.push(r) results.push(r)
} }