@gjsify/cli 0.4.33 → 0.4.35

package/lib/utils/dep-aggregation.js

@@ -0,0 +1,86 @@
+// Workspace-aware dependency aggregation for `gjsify upgrade`.
+//
+// Given a flat list of per-workspace dependency declarations, group them by
+// package name and surface inconsistencies (the same package declared at
+// different version ranges across workspaces). Used by:
+//
+//   - `gjsify upgrade` interactive table — shows fan-out (count of workspaces
+//     declaring the dep) and flags inconsistent declarations with `⚠`.
+//   - `gjsify upgrade --align` — offline mode that detects inconsistencies
+//     and proposes a single range (the highest semver-satisfying one) without
+//     hitting the registry.
+//   - `gjsify upgrade --check` — CI gate that exits non-zero when any
+//     inconsistency exists.
+import { compare, parse } from '@gjsify/semver';
+/** Local `gt` shim: `@gjsify/semver` exports `compare` returning -1|0|1. */
+function semverGt(a, b) {
+    try {
+        return compare(a, b) === 1;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Group a flat list of `DepDeclaration`s by dep name. Each group has the full
+ * occurrence list plus pre-computed aggregates (consensus range, highest
+ * declared version) so callers don't have to re-scan.
+ */
+export function groupByDependency(decls) {
+    const map = new Map();
+    for (const d of decls) {
+        let g = map.get(d.name);
+        if (!g) {
+            g = {
+                name: d.name,
+                occurrences: [],
+                declaredRanges: new Set(),
+                dominantRange: d.currentRange,
+                highestVersion: d.currentVersion,
+            };
+            map.set(d.name, g);
+        }
+        g.occurrences.push(d);
+        g.declaredRanges.add(d.currentRange);
+        if (d.currentVersion) {
+            if (!g.highestVersion || semverGt(d.currentVersion, g.highestVersion)) {
+                g.highestVersion = d.currentVersion;
+            }
+        }
+    }
+    // Second pass: dominantRange = the range with the most occurrences;
+    // ties resolve by highest semver, then by lexicographic order.
+    for (const g of map.values()) {
+        const counts = new Map();
+        for (const occ of g.occurrences) {
+            counts.set(occ.currentRange, (counts.get(occ.currentRange) ?? 0) + 1);
+        }
+        let bestRange = g.occurrences[0].currentRange;
+        let bestCount = -1;
+        let bestVersion = null;
+        for (const [range, count] of counts.entries()) {
+            const v = parse(range.replace(/^[\^~>=<]+/, ''));
+            const version = v?.version ?? null;
+            if (count > bestCount ||
+                (count === bestCount && version && bestVersion && semverGt(version, bestVersion)) ||
+                (count === bestCount && range < bestRange)) {
+                bestRange = range;
+                bestCount = count;
+                bestVersion = version;
+            }
+        }
+        g.dominantRange = bestRange;
+    }
+    return [...map.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+/** `true` when the group's workspaces declare the dep at >1 distinct range. */
+export function isInconsistent(group) {
+    return group.declaredRanges.size > 1;
+}
+/**
+ * Filter to just the inconsistent groups (>1 distinct range across workspaces).
+ * Convenience wrapper for `--align` and `--check` modes.
+ */
+export function findInconsistencies(groups) {
+    return groups.filter(isInconsistent);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.4.33",
+    "version": "0.4.35",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -120,18 +120,18 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/buffer": "^0.4.33",
-        "@gjsify/create-app": "^0.4.33",
-        "@gjsify/node-globals": "^0.4.33",
-        "@gjsify/node-polyfills": "^0.4.33",
-        "@gjsify/npm-registry": "^0.4.33",
-        "@gjsify/resolve-npm": "^0.4.33",
-        "@gjsify/rolldown-plugin-gjsify": "^0.4.33",
-        "@gjsify/rolldown-plugin-pnp": "^0.4.33",
-        "@gjsify/semver": "^0.4.33",
-        "@gjsify/tar": "^0.4.33",
-        "@gjsify/web-polyfills": "^0.4.33",
-        "@gjsify/workspace": "^0.4.33",
+        "@gjsify/buffer": "^0.4.35",
+        "@gjsify/create-app": "^0.4.35",
+        "@gjsify/node-globals": "^0.4.35",
+        "@gjsify/node-polyfills": "^0.4.35",
+        "@gjsify/npm-registry": "^0.4.35",
+        "@gjsify/resolve-npm": "^0.4.35",
+        "@gjsify/rolldown-plugin-gjsify": "^0.4.35",
+        "@gjsify/rolldown-plugin-pnp": "^0.4.35",
+        "@gjsify/semver": "^0.4.35",
+        "@gjsify/tar": "^0.4.35",
+        "@gjsify/web-polyfills": "^0.4.35",
+        "@gjsify/workspace": "^0.4.35",
         "cosmiconfig": "^9.0.1",
         "get-tsconfig": "^4.14.0",
         "pkg-types": "^2.3.1",
@@ -139,12 +139,12 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.4.33",
+        "@gjsify/unit": "^0.4.35",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/rolldown-native": "^0.4.33"
+        "@gjsify/rolldown-native": "^0.4.35"
     },
     "peerDependenciesMeta": {
         "@gjsify/rolldown-native": {