ripencli 0.2.4 → 0.2.6

package/dist/cli.js

@@ -522,7 +522,12 @@ async function updatePackages(manager, packages, cwd, global = false, onLine) {
 }
 //#endregion
 //#region src/config.ts
-const DEFAULT_CONFIG = { groupByScope: true };
+const DEFAULT_CONFIG = {
+	groupByScope: false,
+	groupScopes: [],
+	groupsOnTop: false,
+	frequencySort: false
+};
 const CONFIG_DIR = join(homedir(), ".config", "ripen");
 const CONFIG_PATH = join(CONFIG_DIR, "config.json");
 function loadConfig() {
@@ -543,6 +548,23 @@ function saveConfig(config) {
 		writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + "\n", "utf-8");
 	} catch {}
 }
+const FREQUENCY_PATH = join(CONFIG_DIR, "frequency.json");
+function loadFrequency() {
+	try {
+		const raw = readFileSync(FREQUENCY_PATH, "utf-8");
+		return JSON.parse(raw);
+	} catch {
+		return {};
+	}
+}
+function incrementFrequency(packageNames) {
+	try {
+		const freq = loadFrequency();
+		for (const name of packageNames) freq[name] = (freq[name] ?? 0) + 1;
+		mkdirSync(CONFIG_DIR, { recursive: true });
+		writeFileSync(FREQUENCY_PATH, JSON.stringify(freq, null, 2) + "\n", "utf-8");
+	} catch {}
+}
 //#endregion
 //#region src/ui/PackageList.tsx
 const TYPE_COLORS = {
@@ -565,7 +587,7 @@ const GROUP_CHROME = 5;
 function getScope(name) {
 	return name.match(/^(@[^/]+)\//)?.[1] ?? null;
 }
-function buildDisplayRows(packages, groupByScope) {
+function buildDisplayRows(packages, groupByScope = false, groupScopes = [], groupsOnTop = false, frequencySort = false, frequency = {}) {
 	const grouped = /* @__PURE__ */ new Map();
 	packages.forEach((pkg, i) => {
 		if (!grouped.has(pkg.type)) grouped.set(pkg.type, []);
@@ -574,6 +596,12 @@ function buildDisplayRows(packages, groupByScope) {
 			index: i
 		});
 	});
+	const freqSort = (a, b) => {
+		const fa = frequency[a.pkg.name] ?? 0;
+		const fb = frequency[b.pkg.name] ?? 0;
+		if (fb !== fa) return fb - fa;
+		return a.pkg.name.localeCompare(b.pkg.name);
+	};
 	const rows = [];
 	for (const type of GROUP_ORDER) {
 		const items = grouped.get(type);
@@ -585,54 +613,105 @@ function buildDisplayRows(packages, groupByScope) {
 			label: GROUP_LABELS[type] ?? type,
 			packages: allPkgs
 		});
-		if (groupByScope) {
+		if (groupByScope && groupScopes.length > 0) {
 			const scopeMap = /* @__PURE__ */ new Map();
-			const unscoped = [];
+			const ungrouped = [];
 			for (const item of items) {
 				const scope = getScope(item.pkg.name);
-				if (scope) {
+				if (scope && groupScopes.includes(scope)) {
 					if (!scopeMap.has(scope)) scopeMap.set(scope, []);
 					scopeMap.get(scope).push(item);
-				} else unscoped.push(item);
+				} else ungrouped.push(item);
 			}
-			const emittedScopes = /* @__PURE__ */ new Set();
-			for (const item of items) {
-				const scope = getScope(item.pkg.name);
-				if (scope && scopeMap.get(scope).length >= 2) {
-					if (!emittedScopes.has(scope)) {
-						emittedScopes.add(scope);
-						const scopeItems = scopeMap.get(scope);
-						const scopeKey = `${type}::${scope}`;
-						rows.push({
-							kind: "scope-header",
-							groupType: type,
-							scope,
-							packageIndices: scopeItems.map((si) => si.index),
-							packages: scopeItems.map((si) => si.pkg)
-						});
-						for (const si of scopeItems) rows.push({
-							kind: "package",
-							pkg: si.pkg,
-							packageIndex: si.index,
-							indented: true,
-							scopeKey
-						});
-					}
-				} else rows.push({
+			const scopeGroups = [];
+			for (const [scope, scopeItems] of scopeMap) if (scopeItems.length >= 2) scopeGroups.push({
+				scope,
+				items: scopeItems
+			});
+			else ungrouped.push(...scopeItems);
+			if (frequencySort) scopeGroups.sort((a, b) => {
+				const maxA = Math.max(...a.items.map((i) => frequency[i.pkg.name] ?? 0));
+				const maxB = Math.max(...b.items.map((i) => frequency[i.pkg.name] ?? 0));
+				if (maxB !== maxA) return maxB - maxA;
+				return a.scope.localeCompare(b.scope);
+			});
+			else scopeGroups.sort((a, b) => a.scope.localeCompare(b.scope));
+			const emitScopeGroups = () => {
+				for (const { scope, items: scopeItems } of scopeGroups) {
+					if (frequencySort) scopeItems.sort(freqSort);
+					const scopeKey = `${type}::${scope}`;
+					rows.push({
+						kind: "scope-header",
+						groupType: type,
+						scope,
+						packageIndices: scopeItems.map((si) => si.index),
+						packages: scopeItems.map((si) => si.pkg)
+					});
+					for (const si of scopeItems) rows.push({
+						kind: "package",
+						pkg: si.pkg,
+						packageIndex: si.index,
+						indented: true,
+						scopeKey
+					});
+				}
+			};
+			const emitUngrouped = () => {
+				if (frequencySort) ungrouped.sort(freqSort);
+				for (const item of ungrouped) rows.push({
 					kind: "package",
 					pkg: item.pkg,
 					packageIndex: item.index,
 					indented: false,
 					scopeKey: null
 				});
+			};
+			if (groupsOnTop || frequencySort) {
+				emitScopeGroups();
+				emitUngrouped();
+			} else {
+				const emittedScopes = /* @__PURE__ */ new Set();
+				for (const item of items) {
+					const scope = getScope(item.pkg.name);
+					const group = scope ? scopeGroups.find((g) => g.scope === scope) : void 0;
+					if (group) {
+						if (!emittedScopes.has(scope)) {
+							emittedScopes.add(scope);
+							const scopeKey = `${type}::${scope}`;
+							rows.push({
+								kind: "scope-header",
+								groupType: type,
+								scope,
+								packageIndices: group.items.map((si) => si.index),
+								packages: group.items.map((si) => si.pkg)
+							});
+							for (const si of group.items) rows.push({
+								kind: "package",
+								pkg: si.pkg,
+								packageIndex: si.index,
+								indented: true,
+								scopeKey
+							});
+						}
+					} else rows.push({
+						kind: "package",
+						pkg: item.pkg,
+						packageIndex: item.index,
+						indented: false,
+						scopeKey: null
+					});
+				}
 			}
-		} else for (const item of items) rows.push({
-			kind: "package",
-			pkg: item.pkg,
-			packageIndex: item.index,
-			indented: false,
-			scopeKey: null
-		});
+		} else {
+			const sorted = frequencySort ? [...items].sort(freqSort) : items;
+			for (const item of sorted) rows.push({
+				kind: "package",
+				pkg: item.pkg,
+				packageIndex: item.index,
+				indented: false,
+				scopeKey: null
+			});
+		}
 	}
 	return rows;
 }
@@ -682,9 +761,16 @@ function computeMaxPerGroup(terminalRows, groupCount) {
 	const perGroup = Math.floor(available / groupCount);
 	return Math.max(3, perGroup);
 }
-function PackageList({ packages, onToggle, onToggleGroup, onToggleMany, onSelectVersion, onViewChangelog, onConfirm, onOpenSettings, groupByScope, isActive = true }) {
+function PackageList({ packages, onToggle, onToggleGroup, onToggleMany, onSelectVersion, onViewChangelog, onConfirm, onOpenSettings, groupByScope = false, groupScopes, groupsOnTop = false, frequencySort = false, frequency = {}, isActive = true }) {
 	const [focusedIndex, setFocusedIndex] = useState(0);
-	const allRows = useMemo(() => buildDisplayRows(packages, groupByScope), [packages, groupByScope]);
+	const allRows = useMemo(() => buildDisplayRows(packages, groupByScope, groupScopes, groupsOnTop, frequencySort, frequency), [
+		packages,
+		groupByScope,
+		groupScopes,
+		groupsOnTop,
+		frequencySort,
+		frequency
+	]);
 	const allScopeKeys = useMemo(() => {
 		const keys = /* @__PURE__ */ new Set();
 		for (const row of allRows) if (row.kind === "scope-header") keys.add(`${row.groupType}::${row.scope}`);
@@ -1609,25 +1695,92 @@ function UpdateResults({ results, onDone }) {
 }
 //#endregion
 //#region src/ui/Settings.tsx
-const SETTINGS = [{
-	key: "groupByScope",
-	label: "Group packages by scope",
-	description: "Sub-group scoped packages (@org/pkg) under their scope prefix"
-}];
 function Settings({ config, onConfigChange, onClose }) {
-	const [cursor, setCursor] = useState(0);
+	const [inputMode, setInputMode] = useState(false);
+	const [inputValue, setInputValue] = useState("");
+	const scopes = config.groupScopes;
+	const rows = [
+		{ type: "toggle-frequency" },
+		{ type: "toggle-group" },
+		{ type: "toggle-groups-top" },
+		{ type: "list-header" },
+		...scopes.map((_, i) => ({
+			type: "list-item",
+			listItemIndex: i
+		}))
+	];
+	const [flatCursor, setFlatCursor] = useState(0);
+	const currentRow = rows[flatCursor];
+	const addScope = (value) => {
+		const scope = value.startsWith("@") ? value : `@${value}`;
+		if (scopes.includes(scope)) return;
+		onConfigChange({
+			...config,
+			groupScopes: [...scopes, scope]
+		});
+	};
+	const removeScope = (scope) => {
+		onConfigChange({
+			...config,
+			groupScopes: scopes.filter((s) => s !== scope)
+		});
+	};
 	useInput((input, key) => {
-		if (key.upArrow) setCursor((c) => Math.max(0, c - 1));
-		if (key.downArrow) setCursor((c) => Math.min(SETTINGS.length - 1, c + 1));
+		if (inputMode) {
+			if (key.escape) {
+				setInputMode(false);
+				setInputValue("");
+				return;
+			}
+			if (key.return) {
+				const value = inputValue.trim();
+				if (value) addScope(value);
+				setInputMode(false);
+				setInputValue("");
+				return;
+			}
+			if (key.backspace || key.delete) {
+				setInputValue((v) => v.slice(0, -1));
+				return;
+			}
+			if (input && !key.ctrl && !key.meta) setInputValue((v) => v + input);
+			return;
+		}
+		if (key.upArrow) setFlatCursor((c) => Math.max(0, c - 1));
+		if (key.downArrow) setFlatCursor((c) => Math.min(rows.length - 1, c + 1));
 		if (input === " " || key.return) {
-			const setting = SETTINGS[cursor];
-			onConfigChange({
+			if (currentRow?.type === "toggle-frequency") onConfigChange({
+				...config,
+				frequencySort: !config.frequencySort
+			});
+			else if (currentRow?.type === "toggle-group") onConfigChange({
+				...config,
+				groupByScope: !config.groupByScope
+			});
+			else if (currentRow?.type === "toggle-groups-top") onConfigChange({
 				...config,
-				[setting.key]: !config[setting.key]
+				groupsOnTop: !config.groupsOnTop
 			});
+			else if (currentRow?.type === "list-header") {
+				setInputMode(true);
+				setInputValue("");
+			}
+		}
+		if (input === "a" && !key.ctrl && currentRow?.type === "list-header") {
+			setInputMode(true);
+			setInputValue("");
+		}
+		if ((key.backspace || key.delete) && currentRow?.type === "list-item" && currentRow.listItemIndex !== void 0) {
+			const scope = scopes[currentRow.listItemIndex];
+			removeScope(scope);
+			if (flatCursor >= rows.length - 1) setFlatCursor(Math.max(0, flatCursor - 1));
 		}
 		if (key.escape || input === "s") onClose();
 	});
+	const freqToggleFocused = currentRow?.type === "toggle-frequency";
+	const groupToggleFocused = currentRow?.type === "toggle-group";
+	const groupsTopFocused = currentRow?.type === "toggle-groups-top";
+	const listHeaderFocused = currentRow?.type === "list-header";
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
@@ -1647,41 +1800,179 @@ function Settings({ config, onConfigChange, onClose }) {
 					]
 				})
 			}),
-			SETTINGS.map((setting, i) => {
-				const isFocused = cursor === i;
-				const isEnabled = config[setting.key];
-				return /* @__PURE__ */ jsxs(Box, {
-					flexDirection: "column",
-					marginBottom: 1,
-					children: [/* @__PURE__ */ jsxs(Box, {
-						gap: 1,
-						children: [
-							/* @__PURE__ */ jsx(Text, {
+			/* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				marginBottom: 1,
+				children: [/* @__PURE__ */ jsxs(Box, {
+					gap: 1,
+					children: [
+						/* @__PURE__ */ jsx(Text, {
+							color: "greenBright",
+							children: freqToggleFocused ? ">" : " "
+						}),
+						/* @__PURE__ */ jsxs(Text, {
+							color: config.frequencySort ? "greenBright" : "gray",
+							children: [
+								"[",
+								config.frequencySort ? "x" : " ",
+								"]"
+							]
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							bold: freqToggleFocused,
+							color: freqToggleFocused ? "whiteBright" : "white",
+							children: "Sort by update frequency"
+						})
+					]
+				}), /* @__PURE__ */ jsx(Box, {
+					marginLeft: 6,
+					children: /* @__PURE__ */ jsx(Text, {
+						color: "gray",
+						children: "Packages you update often appear at the top"
+					})
+				})]
+			}),
+			/* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				marginBottom: 1,
+				children: [/* @__PURE__ */ jsxs(Box, {
+					gap: 1,
+					children: [
+						/* @__PURE__ */ jsx(Text, {
+							color: "greenBright",
+							children: groupToggleFocused ? ">" : " "
+						}),
+						/* @__PURE__ */ jsxs(Text, {
+							color: config.groupByScope ? "greenBright" : "gray",
+							children: [
+								"[",
+								config.groupByScope ? "x" : " ",
+								"]"
+							]
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							bold: groupToggleFocused,
+							color: groupToggleFocused ? "whiteBright" : "white",
+							children: "Enable scope grouping"
+						})
+					]
+				}), /* @__PURE__ */ jsx(Box, {
+					marginLeft: 6,
+					children: /* @__PURE__ */ jsx(Text, {
+						color: "gray",
+						children: "Group scoped packages listed below under their scope prefix"
+					})
+				})]
+			}),
+			/* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				marginBottom: 1,
+				children: [/* @__PURE__ */ jsxs(Box, {
+					gap: 1,
+					children: [
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: !config.groupByScope,
+							color: "greenBright",
+							children: groupsTopFocused ? ">" : " "
+						}),
+						/* @__PURE__ */ jsxs(Text, {
+							dimColor: !config.groupByScope,
+							color: config.groupsOnTop && config.groupByScope ? "greenBright" : "gray",
+							children: [
+								"[",
+								config.groupsOnTop ? "x" : " ",
+								"]"
+							]
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: !config.groupByScope,
+							bold: groupsTopFocused,
+							color: !config.groupByScope ? "gray" : groupsTopFocused ? "whiteBright" : "white",
+							children: "Show grouped scopes on top"
+						})
+					]
+				}), /* @__PURE__ */ jsx(Box, {
+					marginLeft: 6,
+					children: /* @__PURE__ */ jsx(Text, {
+						dimColor: !config.groupByScope,
+						color: "gray",
+						children: "Grouped scope packages appear before ungrouped ones"
+					})
+				})]
+			}),
+			/* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				marginBottom: 1,
+				children: [
+					/* @__PURE__ */ jsxs(Box, {
+						flexDirection: "column",
+						marginBottom: 0,
+						children: [/* @__PURE__ */ jsxs(Box, {
+							gap: 1,
+							children: [/* @__PURE__ */ jsx(Text, {
+								dimColor: !config.groupByScope,
 								color: "greenBright",
-								children: isFocused ? "❯" : " "
-							}),
-							/* @__PURE__ */ jsxs(Text, {
-								color: isEnabled ? "greenBright" : "gray",
-								children: [
-									"[",
-									isEnabled ? "✓" : " ",
-									"]"
-								]
-							}),
-							/* @__PURE__ */ jsx(Text, {
-								bold: isFocused,
-								color: isFocused ? "whiteBright" : "white",
-								children: setting.label
+								children: listHeaderFocused ? ">" : " "
+							}), /* @__PURE__ */ jsx(Text, {
+								dimColor: !config.groupByScope,
+								bold: listHeaderFocused,
+								color: !config.groupByScope ? "gray" : listHeaderFocused ? "whiteBright" : "white",
+								children: "Grouped scopes"
+							})]
+						}), /* @__PURE__ */ jsx(Box, {
+							marginLeft: 4,
+							children: /* @__PURE__ */ jsx(Text, {
+								dimColor: !config.groupByScope,
+								color: "gray",
+								children: "Scoped packages (@scope/*) listed here will be sub-grouped together"
 							})
-						]
-					}), /* @__PURE__ */ jsx(Box, {
-						marginLeft: 6,
+						})]
+					}),
+					scopes.map((scope, i) => {
+						const itemFocused = flatCursor === 4 + i;
+						return /* @__PURE__ */ jsxs(Box, {
+							marginLeft: 4,
+							gap: 1,
+							children: [
+								/* @__PURE__ */ jsx(Text, {
+									dimColor: !config.groupByScope,
+									color: "greenBright",
+									children: itemFocused ? ">" : " "
+								}),
+								/* @__PURE__ */ jsx(Text, {
+									dimColor: !config.groupByScope,
+									color: !config.groupByScope ? "gray" : itemFocused ? "whiteBright" : "white",
+									children: scope
+								}),
+								itemFocused && /* @__PURE__ */ jsxs(Text, {
+									dimColor: !config.groupByScope,
+									color: "gray",
+									children: [" ", "delete to remove"]
+								})
+							]
+						}, scope);
+					}),
+					inputMode && currentRow?.type === "list-header" ? /* @__PURE__ */ jsxs(Box, {
+						marginLeft: 4,
+						gap: 1,
+						children: [/* @__PURE__ */ jsx(Text, {
+							color: "greenBright",
+							children: "+"
+						}), /* @__PURE__ */ jsxs(Text, {
+							color: "cyan",
+							children: [inputValue || "", /* @__PURE__ */ jsx(Text, {
+								color: "gray",
+								children: "|"
+							})]
+						})]
+					}) : listHeaderFocused ? /* @__PURE__ */ jsx(Box, {
+						marginLeft: 4,
 						children: /* @__PURE__ */ jsx(Text, {
 							color: "gray",
-							children: setting.description
+							children: "press enter or a to add"
 						})
-					})]
-				}, setting.key);
+					}) : null
+				]
 			}),
 			/* @__PURE__ */ jsx(Box, {
 				marginTop: 1,
@@ -1690,7 +1981,7 @@ function Settings({ config, onConfigChange, onClose }) {
 					children: [
 						/* @__PURE__ */ jsx(Text, {
 							color: "white",
-							children: "↑↓"
+							children: "arrow keys"
 						}),
 						" navigate",
 						"  ",
@@ -1700,6 +1991,18 @@ function Settings({ config, onConfigChange, onClose }) {
 						}),
 						" toggle",
 						"  ",
+						/* @__PURE__ */ jsx(Text, {
+							color: "white",
+							children: "a"
+						}),
+						" add",
+						"  ",
+						/* @__PURE__ */ jsx(Text, {
+							color: "white",
+							children: "delete"
+						}),
+						" remove",
+						"  ",
 						/* @__PURE__ */ jsx(Text, {
 							color: "white",
 							children: "esc"
@@ -1805,6 +2108,7 @@ function App({ project, global, version, installManager }) {
 	const [selfUpdateError, setSelfUpdateError] = useState(null);
 	const [selfUpdating, setSelfUpdating] = useState(false);
 	const [config, setConfig] = useState(() => loadConfig());
+	const [frequency, setFrequency] = useState(() => loadFrequency());
 	const [packages, setPackages] = useState([]);
 	const [activeIndex, setActiveIndex] = useState(0);
 	const [results, setResults] = useState([]);
@@ -1937,8 +2241,14 @@ function App({ project, global, version, installManager }) {
 		const onLine = (line) => {
 			setOutputLines((prev) => [...prev.slice(-(MAX_TERMINAL_LINES - 1)), line]);
 		};
-		setResults(await updatePackages(project.manager, selected, project.cwd, global, onLine));
+		const res = await updatePackages(project.manager, selected, project.cwd, global, onLine);
+		setResults(res);
 		setScreen("results");
+		const successNames = res.filter((r) => r.success).map((r) => r.name);
+		if (successNames.length > 0) {
+			incrementFrequency(successNames);
+			setFrequency(loadFrequency());
+		}
 	};
 	if (screen === "self-update-check") return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
@@ -2156,6 +2466,10 @@ function App({ project, global, version, installManager }) {
 				onConfirm: handleConfirm,
 				onOpenSettings: () => setScreen("settings"),
 				groupByScope: config.groupByScope,
+				groupScopes: config.groupScopes,
+				groupsOnTop: config.groupsOnTop,
+				frequencySort: config.frequencySort,
+				frequency,
 				isActive: isListActive
 			})
 		})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ripencli",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Interactive dependency updater for npm, pnpm, and yarn",
   "license": "MIT",
   "author": {