ripencli 0.2.4 → 0.2.5

package/dist/cli.js

@@ -522,7 +522,16 @@ async function updatePackages(manager, packages, cwd, global = false, onLine) {
 }
 //#endregion
 //#region src/config.ts
-const DEFAULT_CONFIG = { groupByScope: true };
+const DEFAULT_UNGROUP_SCOPES = ["@types", "@react-types"];
+const DEFAULT_CONFIG = {
+	groupByScope: true,
+	addedScopes: [],
+	removedDefaults: []
+};
+/** Compute the effective ungroup scopes list: (defaults - removedDefaults) + addedScopes */
+function getEffectiveUngroupScopes(config) {
+	return [...DEFAULT_UNGROUP_SCOPES.filter((s) => !config.removedDefaults.includes(s)), ...config.addedScopes];
+}
 const CONFIG_DIR = join(homedir(), ".config", "ripen");
 const CONFIG_PATH = join(CONFIG_DIR, "config.json");
 function loadConfig() {
@@ -565,7 +574,7 @@ const GROUP_CHROME = 5;
 function getScope(name) {
 	return name.match(/^(@[^/]+)\//)?.[1] ?? null;
 }
-function buildDisplayRows(packages, groupByScope) {
+function buildDisplayRows(packages, groupByScope, ungroupScopes = []) {
 	const grouped = /* @__PURE__ */ new Map();
 	packages.forEach((pkg, i) => {
 		if (!grouped.has(pkg.type)) grouped.set(pkg.type, []);
@@ -590,7 +599,7 @@ function buildDisplayRows(packages, groupByScope) {
 			const unscoped = [];
 			for (const item of items) {
 				const scope = getScope(item.pkg.name);
-				if (scope) {
+				if (scope && !ungroupScopes.includes(scope)) {
 					if (!scopeMap.has(scope)) scopeMap.set(scope, []);
 					scopeMap.get(scope).push(item);
 				} else unscoped.push(item);
@@ -598,7 +607,7 @@ function buildDisplayRows(packages, groupByScope) {
 			const emittedScopes = /* @__PURE__ */ new Set();
 			for (const item of items) {
 				const scope = getScope(item.pkg.name);
-				if (scope && scopeMap.get(scope).length >= 2) {
+				if (scope && scopeMap.has(scope) && scopeMap.get(scope).length >= 2) {
 					if (!emittedScopes.has(scope)) {
 						emittedScopes.add(scope);
 						const scopeItems = scopeMap.get(scope);
@@ -682,9 +691,13 @@ 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, ungroupScopes, isActive = true }) {
 	const [focusedIndex, setFocusedIndex] = useState(0);
-	const allRows = useMemo(() => buildDisplayRows(packages, groupByScope), [packages, groupByScope]);
+	const allRows = useMemo(() => buildDisplayRows(packages, groupByScope, ungroupScopes), [
+		packages,
+		groupByScope,
+		ungroupScopes
+	]);
 	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 +1622,88 @@ 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 effectiveScopes = getEffectiveUngroupScopes(config);
+	const rows = [
+		{ type: "toggle" },
+		{ type: "list-header" },
+		...effectiveScopes.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 (effectiveScopes.includes(scope)) return;
+		if (DEFAULT_UNGROUP_SCOPES.includes(scope)) onConfigChange({
+			...config,
+			removedDefaults: config.removedDefaults.filter((s) => s !== scope)
+		});
+		else onConfigChange({
+			...config,
+			addedScopes: [...config.addedScopes, scope]
+		});
+	};
+	const removeScope = (scope) => {
+		if (DEFAULT_UNGROUP_SCOPES.includes(scope)) onConfigChange({
+			...config,
+			removedDefaults: [...config.removedDefaults, scope]
+		});
+		else onConfigChange({
+			...config,
+			addedScopes: config.addedScopes.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") onConfigChange({
 				...config,
-				[setting.key]: !config[setting.key]
+				groupByScope: !config.groupByScope
 			});
+			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 = effectiveScopes[currentRow.listItemIndex];
+			removeScope(scope);
+			if (flatCursor >= rows.length - 1) setFlatCursor(Math.max(0, flatCursor - 1));
 		}
 		if (key.escape || input === "s") onClose();
 	});
+	const toggleFocused = flatCursor === 0;
+	const listHeaderFocused = flatCursor === 1;
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
@@ -1647,41 +1723,110 @@ 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: toggleFocused ? ">" : " "
+						}),
+						/* @__PURE__ */ jsxs(Text, {
+							color: config.groupByScope ? "greenBright" : "gray",
+							children: [
+								"[",
+								config.groupByScope ? "x" : " ",
+								"]"
+							]
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							bold: toggleFocused,
+							color: toggleFocused ? "whiteBright" : "white",
+							children: "Group packages by scope"
+						})
+					]
+				}), /* @__PURE__ */ jsx(Box, {
+					marginLeft: 6,
+					children: /* @__PURE__ */ jsx(Text, {
+						color: "gray",
+						children: "Sub-group scoped packages (@org/pkg) under their scope prefix"
+					})
+				})]
+			}),
+			/* @__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, {
 								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, {
+								bold: listHeaderFocused,
+								color: listHeaderFocused ? "whiteBright" : "white",
+								children: "Excluded scopes from grouping"
+							})]
+						}), /* @__PURE__ */ jsx(Box, {
+							marginLeft: 4,
+							children: /* @__PURE__ */ jsx(Text, {
+								color: "gray",
+								children: "Scopes listed here won't be sub-grouped (type to add, delete to remove)"
 							})
-						]
-					}), /* @__PURE__ */ jsx(Box, {
-						marginLeft: 6,
+						})]
+					}),
+					effectiveScopes.map((scope, i) => {
+						const itemFocused = flatCursor === 2 + i;
+						const isDefault = DEFAULT_UNGROUP_SCOPES.includes(scope);
+						return /* @__PURE__ */ jsxs(Box, {
+							marginLeft: 4,
+							gap: 1,
+							children: [
+								/* @__PURE__ */ jsx(Text, {
+									color: "greenBright",
+									children: itemFocused ? ">" : " "
+								}),
+								/* @__PURE__ */ jsx(Text, {
+									color: itemFocused ? "whiteBright" : "white",
+									children: scope
+								}),
+								isDefault && /* @__PURE__ */ jsx(Text, {
+									color: "gray",
+									children: "(default)"
+								}),
+								itemFocused && /* @__PURE__ */ jsx(Text, {
+									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 +1835,7 @@ function Settings({ config, onConfigChange, onClose }) {
 					children: [
 						/* @__PURE__ */ jsx(Text, {
 							color: "white",
-							children: "↑↓"
+							children: "arrow keys"
 						}),
 						" navigate",
 						"  ",
@@ -1700,6 +1845,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"
@@ -2156,6 +2313,7 @@ function App({ project, global, version, installManager }) {
 				onConfirm: handleConfirm,
 				onOpenSettings: () => setScreen("settings"),
 				groupByScope: config.groupByScope,
+				ungroupScopes: getEffectiveUngroupScopes(config),
 				isActive: isListActive
 			})
 		})

package/package.json

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