pomotty 1.2.0 → 1.2.2

package/README.ja.md

@@ -2,7 +2,7 @@
 
 [English](./README.md) | 日本語
 
-Node.js `^22.18.0 || >=24.11.0`で利用できる、ターミナル用のポモドーロタイマーです。
+Node.js `>=22.18.0`で利用できる、ターミナル用のポモドーロタイマーです。
 
 ```shell
 npx pomotty

package/README.md

@@ -2,7 +2,7 @@
 
 English | [日本語](./README.ja.md)
 
-A Pomodoro timer for the terminal, available on Node.js `^22.18.0 || >=24.11.0`.
+A Pomodoro timer for the terminal, available on Node.js `>=22.18.0`.
 
 ```shell
 npx pomotty

package/dist/cli.js

@@ -7,7 +7,7 @@ import path from "node:path";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { on } from "node:events";
 import { emitKeypressEvents } from "node:readline";
-//#region src/diagnostics/writer.ts
+// src/diagnostics/writer.ts
 /**
 * 診断の出力先が閉じていても失敗しない書き込み処理を生成します。
 *
@@ -33,8 +33,7 @@ const createDiagnosticWriter = (stream = process$1.stderr) => {
 		}
 	};
 };
-//#endregion
-//#region src/notification/operation.ts
+// src/notification/operation.ts
 const SUCCESS_EXIT_CODE$1 = 0;
 const EMPTY_SIZE = 0;
 const PLAYER_TIMEOUT_MS = 1e4;
@@ -235,8 +234,7 @@ const createOperationTracker = (spawnChild = spawnNodeChild) => {
 		}
 	};
 };
-//#endregion
-//#region src/notification/sound.ts
+// src/notification/sound.ts
 const FALLBACK_SOUNDS = {
 	break: "\x07\x07",
 	work: "\x07"
@@ -285,8 +283,7 @@ const createSoundPlayer = ({ commands, environment = process$1.env, soundDirecto
 	},
 	shutdown: (options) => tracker.shutdown(options)
 });
-//#endregion
-//#region src/diagnostics/escape.ts
+// src/diagnostics/escape.ts
 const BACKSLASH = "\\";
 const BIDIRECTIONAL_PATTERN = /[\u061C\u200B\u200E\u200F\u2028-\u202E\u2066-\u206F\uFEFF]/u;
 const CONTROL_HEX_LENGTH = 2;
@@ -318,8 +315,7 @@ const escapeDiagnostic = (value) => {
 	if (codePoints.length > MAXIMUM_CODE_POINTS) return `${QUOTATION_MARK}${escaped}${TRUNCATION_MARK}${QUOTATION_MARK}`;
 	return `${QUOTATION_MARK}${escaped}${QUOTATION_MARK}`;
 };
-//#endregion
-//#region src/platform/commands.ts
+// src/platform/commands.ts
 const AFPLAY_PATH = "/usr/bin/afplay";
 const DEFAULT_LINUX_PATH = [
 	"/usr/local/bin",
@@ -429,8 +425,7 @@ const resolvePlayerCommands = ({ cwd = process$1.cwd(), environment = process$1.
 		default: return {};
 	}
 };
-//#endregion
-//#region src/timer/state.ts
+// src/timer/state.ts
 const FIRST_CYCLE$1 = 1;
 const COUNT_INCREMENT = 1;
 const NO_TIME$1 = 0;
@@ -604,8 +599,7 @@ const runPomodoroTimer = async ({ workDurationMs = DEFAULT_WORK_DURATION_MS, bre
 		onTick?.(state, currentTime);
 	}
 };
-//#endregion
-//#region src/terminal/output.ts
+// src/terminal/output.ts
 /** 出力先が閉じたパイプであることを示すエラーコードです。 */
 const BROKEN_PIPE_CODE = "EPIPE";
 const isBrokenPipe = (error) => typeof error === "object" && error !== null && Reflect.get(error, "code") === BROKEN_PIPE_CODE;
@@ -648,15 +642,14 @@ const OPTIONS = [
 		name: "--help"
 	}
 ];
-//#endregion
-//#region src/terminal/input.ts
+// src/terminal/input.ts
 const CHOICES = ["OK", "NG"];
 const ENTER_KEY_NAMES = /* @__PURE__ */ new Set(["enter", "return"]);
 const FIRST_CHOICE_INDEX = 0;
 const KEYPRESS_EVENT_KEY_INDEX = 1;
 const MOVE_KEY_NAMES = /* @__PURE__ */ new Set(["down", "up"]);
 const NEXT_INDEX_OFFSET = 1;
-const REDRAW_SEQUENCE = `\r\u001B[${CHOICES.length}A\u001B[J`;
+const CLEAR_SELECTION_SEQUENCE = `\r\u001B[${CHOICES.length}A\u001B[J`;
 const STDIN_CLOSE_EVENTS = ["end", "close"];
 const SELECTION_QUESTION = "Start working? (Use ↑/↓ to select, Enter to confirm)";
 const keyFrom = (value) => {
@@ -717,12 +710,16 @@ const handleKey = (key, selectedIndex, terminal) => {
 	}
 	if (MOVE_KEY_NAMES.has(key.name)) {
 		const newSelectedIndex = nextChoiceIndex(selectedIndex);
-		terminal.write(`${REDRAW_SEQUENCE}${renderSelection(newSelectedIndex)}`);
+		terminal.write(`${CLEAR_SELECTION_SEQUENCE}${renderSelection(newSelectedIndex)}`);
 		return newSelectedIndex;
 	}
 	if (ENTER_KEY_NAMES.has(key.name)) {
+		if (CHOICES[selectedIndex] === "OK") {
+			terminal.write(CLEAR_SELECTION_SEQUENCE);
+			return true;
+		}
 		terminal.write("\n");
-		return CHOICES[selectedIndex] === "OK";
+		return false;
 	}
 	return selectedIndex;
 };
@@ -740,8 +737,7 @@ const confirmWorkStart = async ({ createTerminal = createSelectionTerminal, ...t
 		await terminal.restore();
 	}
 };
-//#endregion
-//#region src/terminal/constants.ts
+// src/terminal/constants.ts
 /**
 * ロゴが収まらない狭い端末で、ロゴの代わりに表示する見出しです。
 */
@@ -756,8 +752,7 @@ const LOGO = `
   ██║     ╚██████╔╝██║ ╚═╝ ██║╚██████╔╝   ██║      ██║      ██║   
   ╚═╝      ╚═════╝ ╚═╝     ╚═╝ ╚═════╝    ╚═╝      ╚═╝      ╚═╝
 `;
-//#endregion
-//#region src/terminal/frame-line.ts
+// src/terminal/frame-line.ts
 const ELLIPSIS = "…";
 const NO_WIDTH = 0;
 const SINGLE_WIDTH = 1;
@@ -813,8 +808,7 @@ const stringifySegment = ({ text, tone }, color) => {
 };
 const stringifyFrameLine = (line, color) => line.map((segment) => stringifySegment(segment, color)).join("").trimEnd();
 const isColorEnabled = (env) => (env.NO_COLOR ?? "") === "";
-//#endregion
-//#region src/terminal/render.ts
+// src/terminal/render.ts
 const CLI_OPTION_INDEX = 2;
 const LOGO_WIDTH = Math.max(...LOGO.split("\n").map((line) => cellWidth(line)));
 const RIGHT_MARGIN$1 = 1;
@@ -835,8 +829,7 @@ const createCliOutput = ({ columns, options, optionName = process.argv.at(CLI_OP
 		""
 	].join("\n");
 };
-//#endregion
-//#region src/terminal/inline-renderer.ts
+// src/terminal/inline-renderer.ts
 const CSI = "\x1B[";
 const NO_ROWS = 0;
 const CLEAR_LINE = `${CSI}2K`;
@@ -872,8 +865,7 @@ const createInlineRenderer = (write) => {
 		}
 	};
 };
-//#endregion
-//#region src/terminal/terminal-guard.ts
+// src/terminal/terminal-guard.ts
 const HIDE_CURSOR = "\x1B[?25l";
 const SHOW_CURSOR = "\x1B[?25h";
 const TERMINATION_SIGNALS = [
@@ -914,8 +906,7 @@ const createTerminalGuard = ({ onSignal, processEvents, terminal, write }) => {
 		}
 	};
 };
-//#endregion
-//#region src/terminal/clock.ts
+// src/terminal/clock.ts
 const MILLISECONDS_PER_SECOND = 1e3;
 const SECONDS_PER_MINUTE = 60;
 const SECONDS_PER_HOUR = 3600;
@@ -946,8 +937,7 @@ const progressFor = (state, now, settings) => {
 		totalSeconds
 	};
 };
-//#endregion
-//#region src/terminal/timeline.ts
+// src/terminal/timeline.ts
 const BLOCK = "█";
 const EMPTY_CELL = "·";
 const EIGHTH_BLOCKS = [
@@ -1046,8 +1036,7 @@ const createTimeline = (state, settings, ratio) => {
 		[{ text: `${prefix}${createLegend(settings, cells)}` }]
 	];
 };
-//#endregion
-//#region src/terminal/timer-view.ts
+// src/terminal/timer-view.ts
 const BAR_WIDTH = 40;
 const INDENT = "  ";
 const MIN_GAP = 2;
@@ -1253,8 +1242,7 @@ const createTimerFrame = ({ state, now, settings, columns }) => {
 	if (width >= COMPACT_MIN_WIDTH) return createCompactFrame(layout).map((line) => truncateLine(line, width));
 	return createMinimalFrame(layout).map((line) => truncateLine(line, width));
 };
-//#endregion
-//#region src/terminal/timer-keys.ts
+// src/terminal/timer-keys.ts
 /** Ctrlなしで受け付けるキー名と操作の対応です。Shift（大文字）は区別しません。 */
 const PLAIN_KEYS = /* @__PURE__ */ new Map([
 	["q", "quit"],
@@ -1288,8 +1276,7 @@ const watchTimerKeys = ({ input = process$1.stdin, onKey }) => {
 		if (!inputWasFlowing) input.pause();
 	};
 };
-//#endregion
-//#region src/cli/progress-view.ts
+// src/cli/progress-view.ts
 const PHASE_ICONS = {
 	break: "☕",
 	work: "🍅"
@@ -1389,8 +1376,7 @@ const createProgressView = ({ color = isColorEnabled(process$1.env), interactive
 		write
 	});
 };
-//#endregion
-//#region src/cli/parse-arguments.ts
+// src/cli/parse-arguments.ts
 const ARGUMENT_INDEX_INCREMENT = 1;
 const ARGUMENTS_START_INDEX = 0;
 const DURATION_PATTERN = /^[1-9][0-9]{0,3}$/u;
@@ -1464,8 +1450,7 @@ const parseCliArguments = (arguments_) => {
 		workDurationMinutes
 	};
 };
-//#endregion
-//#region src/cli/run.ts
+// src/cli/run.ts
 const CLI_ARGUMENTS_START_INDEX = 2;
 const FAILURE_EXIT_CODE$1 = 1;
 const SUCCESS_EXIT_CODE = 0;
@@ -1593,8 +1578,7 @@ const runCli = async ({ arguments_ = process$1.argv.slice(CLI_ARGUMENTS_START_IN
 		throw error;
 	}
 };
-//#endregion
-//#region src/cli.ts
+// src/cli.ts
 const FAILURE_EXIT_CODE = 1;
 const SOUND_DIRECTORY = new URL("../assets/", import.meta.url);
 const UNCONVERTIBLE_VALUE_MESSAGE = "Unable to convert the thrown value to a string";
@@ -1617,5 +1601,4 @@ try {
 } catch (error) {
 	handleFailure(error);
 }
-//#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pomotty",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "An interactive terminal Pomodoro timer with configurable work and break sessions and sound notifications.",
   "keywords": [
     "cli",
@@ -34,12 +34,13 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@types/node": "22.20.1",
-    "oxfmt": "^0.61.0",
-    "oxlint": "^1.76.0",
-    "tsdown": "^0.23.0",
+    "@types/node": "22.20.5",
+    "@vitest/coverage-v8": "^4.1.12",
+    "oxfmt": "^0.75.0",
+    "oxlint": "^1.90.0",
+    "tsdown": "^0.23.4",
     "typescript": "^7.0.2",
-    "vitest": "^4.1.10"
+    "vitest": "^4.1.12"
   },
   "devEngines": {
     "packageManager": {
@@ -48,17 +49,19 @@
     }
   },
   "engines": {
-    "node": "^22.18.0 || >=24.11.0"
+    "node": ">=22.18.0"
   },
   "scripts": {
     "build": "tsdown",
-    "typecheck": "tsc -p tsconfig.json",
     "check": "pnpm typecheck && pnpm build && pnpm test",
     "start": "pnpm build && node dist/cli.js",
+    "typecheck": "tsc --noEmit",
     "lint": "oxlint . --deny-warnings --report-unused-disable-directives-severity=error",
     "lint:fix": "oxlint . --fix --deny-warnings --report-unused-disable-directives-severity=error",
     "format": "oxfmt --write",
     "format:check": "oxfmt --check",
-    "test": "vitest run --dir src"
+    "test": "vitest run --dir src",
+    "test:coverage": "vitest run --dir src --coverage",
+    "test:watch": "vitest --dir src"
   }
 }