@gluhar/cli 6.0.0-next.8 → 6.0.0-next.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gluhar/cli",
-    "version": "6.0.0-next.8",
+    "version": "6.0.0-next.9",
     "description": "Gluhar cli commands and scripts",
     "repository": {
         "type": "git",

package/src/commands/generate/GenerateOptions.d.ts

@@ -2,7 +2,8 @@ export declare const generateTypes: readonly ["project", "package", "command"];
 export type GenerateType = (typeof generateTypes)[number];
 export interface GenerateOptions {
     starter?: string;
-    noRepo?: boolean;
+    /** `--no-repo` sets this to false (commander's negatable option); default true. */
+    repo?: boolean;
     keepHistory?: boolean;
     yes: boolean;
 }

package/src/commands/generate/GenerateOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GenerateOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/GenerateOptions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,4CAA6C,CAAC;AACxE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;CACd"}
+{"version":3,"file":"GenerateOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/GenerateOptions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,4CAA6C,CAAC;AACxE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mFAAmF;IACnF,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,GAAG,EAAE,OAAO,CAAC;CACd"}

package/src/commands/generate/generateProject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateProject.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/generateProject.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,KAAK,MAAM,EACX,SAAS,eAAe,kBAwGzB,CAAC"}
+{"version":3,"file":"generateProject.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/generateProject.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,KAAK,MAAM,EACX,SAAS,eAAe,kBA0GzB,CAAC"}

package/src/commands/generate/generateProject.js

@@ -9,7 +9,9 @@ const cmd_1 = require("../../scripts/cmd");
 const utils_1 = require("../../utils");
 const generateProject = async (name, cwd, options) => {
     // `dev` is the starters' main branch; others (e.g. `mobile`) are variants.
-    const { starter = "dev", noRepo, keepHistory, yes } = options;
+    const { starter = "dev", repo = true, keepHistory, yes } = options;
+    // `--no-repo` arrives as `repo: false`; there is no `noRepo` key
+    const noRepo = !repo;
     log_1.log.verbose("Check if project name is valid");
     if (!name.match(/^[a-z0-9-]+$/)) {
         log_1.log.error("Project name must be lowercase, alphanumeric, and contain hyphens only.");

package/src/commands/upgrade/UpgradeOptions.d.ts

@@ -1,5 +1,7 @@
 export interface UpgradeOptions {
     /** npm dist-tag or version to install, e.g. `latest`, `next`, `6`. */
     tag: string;
+    /** Print the planned package.json changes without writing or installing. */
+    dryRun?: boolean;
 }
 //# sourceMappingURL=UpgradeOptions.d.ts.map

package/src/commands/upgrade/UpgradeOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpgradeOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/upgrade/UpgradeOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,sEAAsE;IACtE,GAAG,EAAE,MAAM,CAAC;CACb"}
+{"version":3,"file":"UpgradeOptions.d.ts","sourceRoot":"","sources":["../../../../src/commands/upgrade/UpgradeOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,sEAAsE;IACtE,GAAG,EAAE,MAAM,CAAC;IACZ,4EAA4E;IAC5E,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}

package/src/commands/upgrade/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/upgrade/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAGpC,wBAMmB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/upgrade/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;;AAGpC,wBAUmB"}

package/src/commands/upgrade/index.js

@@ -6,4 +6,5 @@ exports.default = new commander_1.Command()
     .name("upgrade")
     .description("Upgrade all @gluhar/* dependencies in a project, across major versions.")
     .option("-t, --tag <tag>", "npm dist-tag or version to install.", "latest")
+    .option("-d, --dry-run", "Print the planned package.json changes without writing or installing.")
     .action(upgrade_1.upgrade);

package/src/commands/upgrade/upgrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../../../src/commands/upgrade/upgrade.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,eAAO,MAAM,OAAO,GAAI,SAAS,cAAc,SAiB9C,CAAC"}
+{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../../../src/commands/upgrade/upgrade.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAyClD,eAAO,MAAM,OAAO,GAAI,SAAS,cAAc,SAyE9C,CAAC"}

package/src/commands/upgrade/upgrade.js

@@ -3,20 +3,91 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upgrade = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const semver_1 = require("semver");
 const cmd_1 = require("../../scripts/cmd");
 const log_1 = require("./log");
+const fields = ["dependencies", "devDependencies"];
+/** The version a tag or range resolves to on npm, with that version's peers. */
+const resolve = (name, tag) => {
+    const output = JSON.parse((0, cmd_1.getCmdOutput)(`npm view ${name}@${tag} version peerDependencies --json`));
+    // A single field comes back as a bare string; a range (`6`) as an array
+    // of matches, oldest first
+    const latest = Array.isArray(output) ? output[output.length - 1] : output;
+    return typeof latest === "string" ? { version: latest } : latest;
+};
+/** The version npm installed, else the lowest the range in package.json allows. */
+const currentVersion = (cwd, name, range) => {
+    const installed = (0, path_1.join)(cwd, "node_modules", name, "package.json");
+    if (!(0, fs_1.existsSync)(installed))
+        return (0, semver_1.minVersion)(range)?.version;
+    const { version } = JSON.parse((0, fs_1.readFileSync)(installed).toString());
+    return version;
+};
+/** Of several ranges, the one whose lowest version is highest. */
+const strictest = (ranges) => ranges.reduce((a, b) => {
+    const [minA, minB] = [(0, semver_1.minVersion)(a), (0, semver_1.minVersion)(b)];
+    return minA && minB && minB.compare(minA) > 0 ? b : a;
+});
 const upgrade = (options) => {
-    const { tag } = options;
-    log_1.log.info(`Upgrading gluhar dependencies to "${tag}".`);
-    const pkg = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(process.cwd(), "package.json")).toString());
-    const names = Object.keys({
-        ...pkg.dependencies,
-        ...pkg.devDependencies,
-    }).filter((name) => name.startsWith("@gluhar/"));
+    const { tag, dryRun } = options;
+    const cwd = process.cwd();
+    const pkgPath = (0, path_1.join)(cwd, "package.json");
+    const source = (0, fs_1.readFileSync)(pkgPath).toString();
+    const pkg = JSON.parse(source);
+    // The dependency map that lists `name` (dependencies or devDependencies)
+    const depsOf = (name) => fields
+        .map((field) => pkg[field])
+        .find((deps) => deps?.[name] !== undefined);
+    const names = fields
+        .flatMap((field) => Object.keys(pkg[field] ?? {}))
+        .filter((name) => name.startsWith("@gluhar/"));
     if (!names.length)
         return log_1.log.info("No @gluhar/* dependencies found.");
-    // `npm install pkg@tag`, not `npm update`: update stays inside the semver
-    // range already in package.json, so it can never cross a major version.
-    (0, cmd_1.executeCmd)(`npm install ${names.map((name) => `${name}@${tag}`).join(" ")}`);
+    log_1.log.info(`Upgrading gluhar dependencies to "${tag}".`);
+    const changes = new Map();
+    const peerRanges = new Map();
+    for (const name of names) {
+        const { version, peerDependencies = {} } = resolve(name, tag);
+        changes.set(name, `^${version}`);
+        for (const [peer, range] of Object.entries(peerDependencies))
+            peerRanges.set(peer, [...(peerRanges.get(peer) ?? []), range]);
+    }
+    // A peer the project depends on directly (in practice `nuxt`) has to move in
+    // the same install. `npm install @gluhar/*@<tag>` alone fails with ERESOLVE:
+    // the old nuxt pins its own @nuxt/vite-builder exactly, so npm won't replace
+    // nuxt unless package.json already asks for the new range.
+    for (const [peer, ranges] of peerRanges) {
+        const deps = depsOf(peer);
+        if (!deps || peer.startsWith("@gluhar/"))
+            continue;
+        const current = currentVersion(cwd, peer, deps[peer]);
+        const opts = { includePrerelease: true };
+        if (current && ranges.every((range) => (0, semver_1.satisfies)(current, range, opts)))
+            continue;
+        changes.set(peer, strictest(ranges));
+    }
+    for (const [name, range] of changes) {
+        const deps = depsOf(name);
+        if (!deps || deps[name] === range)
+            continue;
+        const note = name.startsWith("@gluhar/") ? "" : " (peer of @gluhar/*)";
+        log_1.log.info(`${name}: ${deps[name]} -> ${range}${note}`);
+        deps[name] = range;
+    }
+    if (dryRun)
+        return log_1.log.info("Dry run: package.json not written.");
+    const indent = source.match(/^[ \t]+/m)?.[0] ?? "  ";
+    (0, fs_1.writeFileSync)(pkgPath, `${JSON.stringify(pkg, null, indent)}\n`);
+    // A plain install with the existing lockfile: npm re-resolves only what the
+    // new ranges require
+    const result = (0, cmd_1.executeCmd)("npm install");
+    if (result.status !== 0) {
+        log_1.log.error("npm install failed. package.json already has the new ranges; if it is still ERESOLVE, delete package-lock.json and node_modules and run npm install.");
+        process.exit(result.status || 1);
+    }
+    const studioPkg = (0, path_1.join)(cwd, "sanity", "package.json");
+    if ((0, fs_1.existsSync)(studioPkg) &&
+        (0, fs_1.readFileSync)(studioPkg).toString().includes('"@gluhar/'))
+        log_1.log.info("The Studio in sanity/ has its own @gluhar/* dependencies: run `gluhar upgrade` there too.");
 };
 exports.upgrade = upgrade;