ripencli 0.3.1 → 0.3.2

package/dist/cli.js

@@ -535,7 +535,8 @@ const DEFAULT_CONFIG = {
 	groupByScope: false,
 	groupScopes: [],
 	groupsOnTop: false,
-	frequencySort: false
+	frequencySort: false,
+	separateDevDeps: true
 };
 const CONFIG_DIR = join(homedir(), ".config", "ripen");
 const CONFIG_PATH = join(CONFIG_DIR, "config.json");
@@ -596,30 +597,37 @@ const GROUP_CHROME = 5;
 function getScope(name) {
 	return name.match(/^(@[^/]+)\//)?.[1] ?? null;
 }
-function buildDisplayRows(packages, groupByScope = false, groupScopes = [], groupsOnTop = false, frequencySort = false, frequency = {}) {
+/** Strip leading @ for natural alphabetical sorting (so @vercel/x sorts among 'v', not before 'a') */
+function sortableName(name) {
+	return name.startsWith("@") ? name.slice(1) : name;
+}
+function buildDisplayRows(packages, groupByScope = false, groupScopes = [], groupsOnTop = false, frequencySort = false, frequency = {}, separateDevDeps = true) {
 	const grouped = /* @__PURE__ */ new Map();
 	packages.forEach((pkg, i) => {
-		if (!grouped.has(pkg.type)) grouped.set(pkg.type, []);
-		grouped.get(pkg.type).push({
+		const type = !separateDevDeps && pkg.type === "devDependencies" ? "dependencies" : pkg.type;
+		if (!grouped.has(type)) grouped.set(type, []);
+		grouped.get(type).push({
 			pkg,
 			index: i
 		});
 	});
+	const nameSort = (a, b) => sortableName(a.pkg.name).localeCompare(sortableName(b.pkg.name));
 	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);
+		return sortableName(a.pkg.name).localeCompare(sortableName(b.pkg.name));
 	};
 	const rows = [];
 	for (const type of GROUP_ORDER) {
 		const items = grouped.get(type);
 		if (!items || items.length === 0) continue;
 		const allPkgs = items.map((i) => i.pkg);
+		const label = !separateDevDeps && type === "dependencies" ? "All Dependencies" : GROUP_LABELS[type] ?? type;
 		rows.push({
 			kind: "header",
 			groupType: type,
-			label: GROUP_LABELS[type] ?? type,
+			label,
 			packages: allPkgs
 		});
 		if (groupByScope && groupScopes.length > 0) {
@@ -666,7 +674,7 @@ function buildDisplayRows(packages, groupByScope = false, groupScopes = [], grou
 				}
 			};
 			const emitUngrouped = () => {
-				if (frequencySort) ungrouped.sort(freqSort);
+				ungrouped.sort(frequencySort ? freqSort : nameSort);
 				for (const item of ungrouped) rows.push({
 					kind: "package",
 					pkg: item.pkg,
@@ -675,44 +683,95 @@ function buildDisplayRows(packages, groupByScope = false, groupScopes = [], grou
 					scopeKey: null
 				});
 			};
-			if (groupsOnTop || frequencySort) {
+			if (groupsOnTop) {
 				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({
+			} else if (frequencySort) {
+				const slots = [];
+				for (const g of scopeGroups) {
+					g.items.sort(freqSort);
+					slots.push({
+						kind: "group",
+						group: g,
+						freq: Math.max(...g.items.map((i) => frequency[i.pkg.name] ?? 0)),
+						sortKey: sortableName(g.scope)
+					});
+				}
+				for (const item of ungrouped) slots.push({
+					kind: "single",
+					item,
+					freq: frequency[item.pkg.name] ?? 0,
+					sortKey: sortableName(item.pkg.name)
+				});
+				slots.sort((a, b) => {
+					if (b.freq !== a.freq) return b.freq - a.freq;
+					return a.sortKey.localeCompare(b.sortKey);
+				});
+				for (const slot of slots) if (slot.kind === "group") {
+					const scopeKey = `${type}::${slot.group.scope}`;
+					rows.push({
+						kind: "scope-header",
+						groupType: type,
+						scope: slot.group.scope,
+						packageIndices: slot.group.items.map((si) => si.index),
+						packages: slot.group.items.map((si) => si.pkg)
+					});
+					for (const si of slot.group.items) rows.push({
 						kind: "package",
-						pkg: item.pkg,
-						packageIndex: item.index,
-						indented: false,
-						scopeKey: null
+						pkg: si.pkg,
+						packageIndex: si.index,
+						indented: true,
+						scopeKey
+					});
+				} else rows.push({
+					kind: "package",
+					pkg: slot.item.pkg,
+					packageIndex: slot.item.index,
+					indented: false,
+					scopeKey: null
+				});
+			} else {
+				const slots = [];
+				for (const g of scopeGroups) {
+					g.items.sort(nameSort);
+					slots.push({
+						kind: "group",
+						group: g,
+						sortKey: sortableName(g.scope)
 					});
 				}
+				for (const item of ungrouped) slots.push({
+					kind: "single",
+					item,
+					sortKey: sortableName(item.pkg.name)
+				});
+				slots.sort((a, b) => a.sortKey.localeCompare(b.sortKey));
+				for (const slot of slots) if (slot.kind === "group") {
+					const scopeKey = `${type}::${slot.group.scope}`;
+					rows.push({
+						kind: "scope-header",
+						groupType: type,
+						scope: slot.group.scope,
+						packageIndices: slot.group.items.map((si) => si.index),
+						packages: slot.group.items.map((si) => si.pkg)
+					});
+					for (const si of slot.group.items) rows.push({
+						kind: "package",
+						pkg: si.pkg,
+						packageIndex: si.index,
+						indented: true,
+						scopeKey
+					});
+				} else rows.push({
+					kind: "package",
+					pkg: slot.item.pkg,
+					packageIndex: slot.item.index,
+					indented: false,
+					scopeKey: null
+				});
 			}
 		} else {
-			const sorted = frequencySort ? [...items].sort(freqSort) : items;
+			const sorted = frequencySort ? [...items].sort(freqSort) : [...items].sort(nameSort);
 			for (const item of sorted) rows.push({
 				kind: "package",
 				pkg: item.pkg,
@@ -770,15 +829,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 = false, groupScopes, groupsOnTop = false, frequencySort = false, frequency = {}, isActive = true }) {
+function PackageList({ packages, onToggle, onToggleGroup, onToggleMany, onSelectVersion, onViewChangelog, onConfirm, onOpenSettings, groupByScope = false, groupScopes, groupsOnTop = false, frequencySort = false, frequency = {}, separateDevDeps = true, isActive = true }) {
 	const [focusedIndex, setFocusedIndex] = useState(0);
-	const allRows = useMemo(() => buildDisplayRows(packages, groupByScope, groupScopes, groupsOnTop, frequencySort, frequency), [
+	const allRows = useMemo(() => buildDisplayRows(packages, groupByScope, groupScopes, groupsOnTop, frequencySort, frequency, separateDevDeps), [
 		packages,
 		groupByScope,
 		groupScopes,
 		groupsOnTop,
 		frequencySort,
-		frequency
+		frequency,
+		separateDevDeps
 	]);
 	const allScopeKeys = useMemo(() => {
 		const keys = /* @__PURE__ */ new Set();
@@ -1710,6 +1770,7 @@ function Settings({ config, onConfigChange, onClose }) {
 	const scopes = config.groupScopes;
 	const rows = [
 		{ type: "toggle-frequency" },
+		{ type: "toggle-separate-dev" },
 		{ type: "toggle-group" },
 		{ type: "toggle-groups-top" },
 		{ type: "list-header" },
@@ -1766,6 +1827,10 @@ function Settings({ config, onConfigChange, onClose }) {
 				...config,
 				groupByScope: !config.groupByScope
 			});
+			else if (currentRow?.type === "toggle-separate-dev") onConfigChange({
+				...config,
+				separateDevDeps: !config.separateDevDeps
+			});
 			else if (currentRow?.type === "toggle-groups-top") onConfigChange({
 				...config,
 				groupsOnTop: !config.groupsOnTop
@@ -1787,6 +1852,7 @@ function Settings({ config, onConfigChange, onClose }) {
 		if (key.escape || input === "s") onClose();
 	});
 	const freqToggleFocused = currentRow?.type === "toggle-frequency";
+	const separateDevFocused = currentRow?.type === "toggle-separate-dev";
 	const groupToggleFocused = currentRow?.type === "toggle-group";
 	const groupsTopFocused = currentRow?.type === "toggle-groups-top";
 	const listHeaderFocused = currentRow?.type === "list-header";
@@ -1841,6 +1907,38 @@ function Settings({ config, onConfigChange, onClose }) {
 					})
 				})]
 			}),
+			/* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				marginBottom: 1,
+				children: [/* @__PURE__ */ jsxs(Box, {
+					gap: 1,
+					children: [
+						/* @__PURE__ */ jsx(Text, {
+							color: "greenBright",
+							children: separateDevFocused ? ">" : " "
+						}),
+						/* @__PURE__ */ jsxs(Text, {
+							color: config.separateDevDeps ? "greenBright" : "gray",
+							children: [
+								"[",
+								config.separateDevDeps ? "x" : " ",
+								"]"
+							]
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							bold: separateDevFocused,
+							color: separateDevFocused ? "whiteBright" : "white",
+							children: "Separate dev dependencies"
+						})
+					]
+				}), /* @__PURE__ */ jsx(Box, {
+					marginLeft: 6,
+					children: /* @__PURE__ */ jsx(Text, {
+						color: "gray",
+						children: "Show dependencies and devDependencies in separate groups"
+					})
+				})]
+			}),
 			/* @__PURE__ */ jsxs(Box, {
 				flexDirection: "column",
 				marginBottom: 1,
@@ -1938,7 +2036,7 @@ function Settings({ config, onConfigChange, onClose }) {
 						})]
 					}),
 					scopes.map((scope, i) => {
-						const itemFocused = flatCursor === 4 + i;
+						const itemFocused = flatCursor === 5 + i;
 						return /* @__PURE__ */ jsxs(Box, {
 							marginLeft: 4,
 							gap: 1,
@@ -2103,14 +2201,7 @@ function SelfUpdatePrompt({ currentVersion, latestVersion, updating, error, onUp
 function App({ project, global, version, installManager }) {
 	const { exit } = useApp();
 	useInput((_input, key) => {
-		if (key.ctrl && _input === "c") {
-			setScreen("empty");
-			setTimeout(() => {
-				exit();
-				console.log("  \x1B[32mCancelled.\x1B[0m\n");
-				process.exit(0);
-			}, 200);
-		}
+		if (key.ctrl && _input === "c") setScreen("cancelled");
 	});
 	const [screen, setScreen] = useState("self-update-check");
 	const [latestVersion, setLatestVersion] = useState(null);
@@ -2155,6 +2246,15 @@ function App({ project, global, version, installManager }) {
 		}, 300);
 		return () => clearTimeout(timer);
 	}, [screen]);
+	useEffect(() => {
+		if (screen !== "cancelled") return;
+		const timer = setTimeout(() => {
+			exit();
+			console.log("  \x1B[32mCancelled.\x1B[0m\n");
+			process.exit(0);
+		}, 200);
+		return () => clearTimeout(timer);
+	}, [screen]);
 	const [fetchStarted, setFetchStarted] = useState(false);
 	useEffect(() => {
 		if (screen !== "loading" || fetchStarted) return;
@@ -2370,6 +2470,7 @@ function App({ project, global, version, installManager }) {
 			]
 		})]
 	});
+	if (screen === "cancelled") return /* @__PURE__ */ jsx(Fragment, {});
 	if (screen === "empty") return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		padding: 1,
@@ -2479,6 +2580,7 @@ function App({ project, global, version, installManager }) {
 				groupsOnTop: config.groupsOnTop,
 				frequencySort: config.frequencySort,
 				frequency,
+				separateDevDeps: config.separateDevDeps,
 				isActive: isListActive
 			})
 		})

package/package.json

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