diff --git a/run-pty.js b/run-pty.js index f7d9a49..761cf3d 100755 --- a/run-pty.js +++ b/run-pty.js @@ -328,7 +328,7 @@ const drawDashboardCommandLines = ( ) => { const lines = commands.map((command) => { const [icon, status] = statusText(command.status, { - statusFromRules: command.statusFromRules, + statusFromRules: command.statusFromRules ?? runningIndicator, useSeparateKilledIndicator, }); const { label = " " } = command; @@ -486,6 +486,7 @@ const drawSummary = (commands) => { : "aborted"; const lines = commands.map((command) => { const [indicator, status] = statusText(command.status, { + statusFromRules: runningIndicator, useSeparateKilledIndicator: true, }); return `${indicator}${EMOJI_WIDTH_FIX} ${ @@ -651,15 +652,12 @@ ${cwdText(command)}${command.history}${CLEAR_DOWN}${newline}${bold( /** * @param {Status} status - * @param {{ statusFromRules?: string, useSeparateKilledIndicator?: boolean }} options + * @param {{ statusFromRules: string, useSeparateKilledIndicator: boolean }} options * @returns {[string, string | undefined]} */ const statusText = ( status, - { - statusFromRules = runningIndicator, - useSeparateKilledIndicator = false, - } = {} + { statusFromRules, useSeparateKilledIndicator } ) => { switch (status.tag) { case "Waiting": @@ -882,7 +880,7 @@ const AUTO_EXIT_REGEX = /^--auto-exit(?:=(\d+|auto))?$/; cwd: string, command: Array, status: Array<[RegExp, [string, string] | undefined]>, - defaultStatus?: [string, string], + defaultStatus?: [string, string] | undefined, killAllSequence: string, }} CommandDescription * diff --git a/tsconfig.json b/tsconfig.json index a4f43ab..33f6653 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,7 @@ "allowJs": true, "allowSyntheticDefaultImports": true, "checkJs": true, + "exactOptionalPropertyTypes": true, "forceConsistentCasingInFileNames": true, "isolatedModules": true, "module": "CommonJS",