@arthony/keybook 0.6.0 → 0.7.0

package/dist/cli.js

@@ -5,7 +5,7 @@ import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Command } from "commander";
 import { Box, Text, render, useApp, useInput, useStdout } from "ink";
-import { createElement, useCallback, useMemo, useState } from "react";
+import { createElement, useCallback, useEffect, useMemo, useState } from "react";
 import { homedir } from "node:os";
 import { Document, isMap, isSeq, parse, parseDocument } from "yaml";
 import { z } from "zod";
@@ -379,6 +379,23 @@ function editEntry(dir, file, index, entry, expectedAction) {
 		lines: [`✓ updated '${clean.action}'`]
 	};
 }
+function moveEntry(dir, sourceFile, index, expectedAction, targetApp, entry) {
+	if (resolveTargetFile(dir, targetApp).file === join(dir, sourceFile)) return editEntry(dir, sourceFile, index, entry, expectedAction);
+	const addRes = addEntry(dir, targetApp, entry);
+	if (!addRes.ok) return addRes;
+	if (!deleteEntry(dir, sourceFile, index, expectedAction).ok) return {
+		ok: true,
+		file: addRes.file,
+		created: addRes.created,
+		lines: [`⚠ moved to ${targetApp}; original still in ${sourceFile} — remove it manually`]
+	};
+	return {
+		ok: true,
+		file: addRes.file,
+		created: addRes.created,
+		lines: [`✓ moved '${entry.action}' → ${targetApp}`]
+	};
+}
 //#endregion
 //#region src/commands.ts
 function runPath(env = process.env) {
@@ -412,29 +429,40 @@ function runAdd(dir, draft) {
 }
 //#endregion
 //#region src/tui/StepsBuilder.tsx
-function StepsBuilder({ steps, line, active }) {
+function StepsBuilder({ steps, line, active, cursor, grabbed = false }) {
+	const cur = cursor ?? steps.length;
+	const onAppendLine = cur >= steps.length;
+	const hint = grabbed ? "↑↓ move · Space/⏎ drop" : steps.length === 0 ? "⏎ adds a step · ⌫ on an empty line removes the last" : onAppendLine ? "⏎ adds a step · ↑ select a step to reorder" : "↑↓ select · Space grab · ⌫ delete";
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
-			steps.map((s, i) => /* @__PURE__ */ jsxs(Text, { children: [
-				i + 1,
-				". ",
-				s
-			] }, i)),
+			steps.map((s, i) => {
+				return /* @__PURE__ */ jsxs(Text, { children: [
+					active && cur === i ? grabbed ? "⇅ " : "> " : "  ",
+					i + 1,
+					". ",
+					s
+				] }, i);
+			}),
 			/* @__PURE__ */ jsxs(Box, { children: [
 				/* @__PURE__ */ jsxs(Text, {
-					color: active ? "cyan" : "gray",
-					children: [steps.length + 1, ". "]
+					color: active && onAppendLine ? "cyan" : "gray",
+					children: [
+						"  ",
+						steps.length + 1,
+						".",
+						" "
+					]
 				}),
 				/* @__PURE__ */ jsx(Text, { children: line }),
-				active ? /* @__PURE__ */ jsx(Text, {
+				active && onAppendLine ? /* @__PURE__ */ jsx(Text, {
 					inverse: true,
 					children: " "
 				}) : null
 			] }),
-			steps.length === 0 ? /* @__PURE__ */ jsx(Text, {
+			active ? /* @__PURE__ */ jsx(Text, {
 				color: "gray",
-				children: "⏎ adds a step · ⌫ on an empty line removes the last"
+				children: hint
 			}) : null
 		]
 	});
@@ -459,7 +487,7 @@ function Field({ label, value, focused }) {
 		}) : null
 	] });
 }
-function FormFields({ draft, apps, appIndex, focused, existingTags, lockedApp }) {
+function FormFields({ draft, apps, appIndex, focused, existingTags, stepCursor, grabbed }) {
 	const appChoices = [...apps, "Create new app…"];
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
@@ -467,10 +495,7 @@ function FormFields({ draft, apps, appIndex, focused, existingTags, lockedApp })
 			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
 				color: focused === 0 ? "cyan" : "gray",
 				children: "App".padEnd(8)
-			}), lockedApp ? /* @__PURE__ */ jsx(Text, {
-				color: "gray",
-				children: `${lockedApp}  (locked)`
-			}) : draft.creatingApp ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, { children: draft.newApp }), focused === 0 ? /* @__PURE__ */ jsx(Text, {
+			}), draft.creatingApp ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, { children: draft.newApp }), focused === 0 ? /* @__PURE__ */ jsx(Text, {
 				inverse: true,
 				children: " "
 			}) : null] }) : /* @__PURE__ */ jsxs(Text, { children: [appChoices[appIndex] ?? "—", focused === 0 ? "  (↑/↓)" : ""] })] }),
@@ -509,7 +534,9 @@ function FormFields({ draft, apps, appIndex, focused, existingTags, lockedApp })
 				}), /* @__PURE__ */ jsx(StepsBuilder, {
 					steps: draft.steps,
 					line: draft.stepLine,
-					active: focused === 3
+					active: focused === 3,
+					cursor: stepCursor,
+					grabbed
 				})]
 			}),
 			/* @__PURE__ */ jsx(Field, {
@@ -656,6 +683,20 @@ const emptyDraft = {
 function parseTags(raw) {
 	return raw.split(",").map((t) => t.trim()).filter(Boolean);
 }
+/** Move the step at `from` to position `to`, returning a NEW array. No-op if out of range or from===to. */
+function moveStep(steps, from, to) {
+	if (from < 0 || from >= steps.length || to < 0 || to >= steps.length || from === to) return steps;
+	const next = [...steps];
+	const [moved] = next.splice(from, 1);
+	if (moved === void 0) return steps;
+	next.splice(to, 0, moved);
+	return next;
+}
+/** Remove the step at `i`, returning a NEW array. No-op if out of range. */
+function deleteStep(steps, i) {
+	if (i < 0 || i >= steps.length) return steps;
+	return steps.filter((_, idx) => idx !== i);
+}
 function resolvedApp(d) {
 	return (d.creatingApp ? d.newApp : d.app).trim();
 }
@@ -727,13 +768,28 @@ const TYPES = [
 	"recipe"
 ];
 const LAST_FIELD = 5;
-function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, resolveTarget, initial, lockedApp, title }) {
+function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, resolveTarget, initial, initialFocus, title }) {
 	const { draft, update, setDraft } = useAddForm(initial ?? { app: apps[0] ?? "" });
-	const [focused, setFocused] = useState(lockedApp ? 1 : 0);
-	const [appIndex, setAppIndex] = useState(0);
+	const [focused, setFocused] = useState(initialFocus ?? 0);
+	const [stepCursor, setStepCursor] = useState(initial?.steps?.length ?? 0);
+	const [grabbed, setGrabbed] = useState(false);
+	const [appIndex, setAppIndex] = useState(() => {
+		const i = apps.indexOf(initial?.app ?? apps[0] ?? "");
+		return i >= 0 ? i : 0;
+	});
 	const [screen, setScreen] = useState("form");
 	const [hint, setHint] = useState("");
 	const [writeError, setWriteError] = useState("");
+	useEffect(() => {
+		if (!(focused === 3 && draft.type === "recipe")) {
+			setGrabbed(false);
+			setStepCursor(draft.steps.length);
+		}
+	}, [
+		focused,
+		draft.type,
+		draft.steps.length
+	]);
 	const appChoices = [...apps, "Create new app…"];
 	function commitAppSelection(index) {
 		if (index === apps.length) update({ creatingApp: true });
@@ -767,9 +823,10 @@ function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, reso
 			}
 			return;
 		}
+		if (grabbed && key.escape) return setGrabbed(false);
 		if (key.escape) return onCancel();
 		if (key.ctrl && input === "n") return setFocused((f) => Math.min(f + 1, LAST_FIELD));
-		if (key.ctrl && input === "p") return setFocused((f) => Math.max(f - 1, lockedApp ? 1 : 0));
+		if (key.ctrl && input === "p") return setFocused((f) => Math.max(f - 1, 0));
 		if (focused === 0) {
 			if (key.upArrow) {
 				const next = Math.max(appIndex - 1, 0);
@@ -799,18 +856,51 @@ function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, reso
 			return;
 		}
 		if (focused === 3 && draft.type === "recipe") {
-			if (key.return) {
-				if (draft.stepLine.trim()) update({
-					steps: [...draft.steps, draft.stepLine.trim()],
-					stepLine: ""
-				});
+			const steps = draft.steps;
+			const onAppendLine = stepCursor >= steps.length;
+			if (grabbed) {
+				if (key.upArrow && stepCursor > 0) {
+					update({ steps: moveStep(steps, stepCursor, stepCursor - 1) });
+					return setStepCursor(stepCursor - 1);
+				}
+				if (key.downArrow && stepCursor < steps.length - 1) {
+					update({ steps: moveStep(steps, stepCursor, stepCursor + 1) });
+					return setStepCursor(stepCursor + 1);
+				}
+				if (key.return || input === " " || key.escape) return setGrabbed(false);
 				return;
 			}
+			if (onAppendLine) {
+				if (key.return) {
+					if (draft.stepLine.trim()) {
+						update({
+							steps: [...steps, draft.stepLine.trim()],
+							stepLine: ""
+						});
+						setStepCursor(steps.length + 1);
+					}
+					return;
+				}
+				if (key.backspace || key.delete) {
+					if (draft.stepLine) return update({ stepLine: draft.stepLine.slice(0, -1) });
+					if (steps.length) return setStepCursor(steps.length - 1);
+					return;
+				}
+				if (key.upArrow) {
+					if (steps.length) return setStepCursor(steps.length - 1);
+					return;
+				}
+				if (input && !key.ctrl && !key.meta) return update({ stepLine: draft.stepLine + input });
+				return;
+			}
+			if (key.upArrow) return setStepCursor(Math.max(0, stepCursor - 1));
+			if (key.downArrow) return setStepCursor(stepCursor + 1);
+			if (key.return || input === " ") return setGrabbed(true);
 			if (key.backspace || key.delete) {
-				if (draft.stepLine) return update({ stepLine: draft.stepLine.slice(0, -1) });
-				return update({ steps: draft.steps.slice(0, -1) });
+				const next = deleteStep(steps, stepCursor);
+				update({ steps: next });
+				return setStepCursor(Math.min(stepCursor, next.length));
 			}
-			if (input && !key.ctrl && !key.meta) return update({ stepLine: draft.stepLine + input });
 			return;
 		}
 		if (key.return) return goReview();
@@ -840,7 +930,8 @@ function AddEntryForm({ apps, existingTags, onSubmit, onComplete, onCancel, reso
 					appIndex,
 					focused,
 					existingTags,
-					lockedApp
+					stepCursor,
+					grabbed
 				})
 			}),
 			/* @__PURE__ */ jsxs(Box, {
@@ -1223,6 +1314,7 @@ function columnWidths(terminalCols) {
 }
 //#endregion
 //#region src/tui/App.tsx
+const sameApp = (a, b) => a.trim().toLowerCase() === b.trim().toLowerCase();
 function App({ entries: initial, errorCount = 0, dataDir, onCopy = copyToClipboard }) {
 	const { exit } = useApp();
 	const { stdout } = useStdout();
@@ -1364,14 +1456,14 @@ function App({ entries: initial, errorCount = 0, dataDir, onCopy = copyToClipboa
 	if (mode === "edit" && dataDir && editTarget) return /* @__PURE__ */ jsx(AddEntryForm, {
 		apps: listApps(dataDir),
 		existingTags,
-		lockedApp: editTarget.app,
+		initialFocus: 1,
 		initial: entryToDraft(editTarget.app, editTarget),
 		title: `Edit entry — ${editTarget.app}`,
-		resolveTarget: () => ({
+		resolveTarget: (app) => sameApp(app, editTarget.app) ? {
 			file: editTarget.file,
 			created: false
-		}),
-		onSubmit: (_app, entry) => editEntry(dataDir, editTarget.file, editTarget.index, entry, editTarget.action),
+		} : resolveTargetFile(dataDir, app),
+		onSubmit: (app, entry) => sameApp(app, editTarget.app) ? editEntry(dataDir, editTarget.file, editTarget.index, entry, editTarget.action) : moveEntry(dataDir, editTarget.file, editTarget.index, editTarget.action, app, entry),
 		onComplete: (result) => {
 			if (result.ok) {
 				reload();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arthony/keybook",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "publishConfig": {
     "access": "public"
   },
@@ -65,6 +65,7 @@
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit",
     "lint": "biome check .",
-    "format": "biome format --write ."
+    "format": "biome format --write .",
+    "bump-tap": "./scripts/bump-tap.sh"
   }
 }