@penvhq/launcher 0.10.0 → 0.11.0

package/dist/bin.js

@@ -5,7 +5,7 @@ import {
   httpFetcher,
   nodeSpawner,
   runLauncher
-} from "./chunk-BNUZ52VN.js";
+} from "./chunk-USYQEKPW.js";
 
 // src/bin.ts
 function readLine() {

package/dist/{chunk-BNUZ52VN.js → chunk-USYQEKPW.js}

@@ -170,6 +170,8 @@ import {
   PenvError
 } from "@penvhq/core";
 var INSTALL_COMMAND = "penv install";
+var UPGRADE_COMMAND = "penv upgrade";
+var YES_FLAG = "--yes";
 var MIN_PACKAGE_AGE_DAYS = 7;
 var TRUST_YOUNG_FLAG = "--trust-young";
 function addCommand(name, version, extra) {
@@ -352,11 +354,11 @@ var OfficialRegistryError = class extends PenvError {
 };
 var RegistryUnreadableError = class extends PenvError {
   name = "RegistryUnreadableError";
-  constructor(name, url, detail) {
+  constructor(name, url, detail, retry = addCommand(name)) {
     super(
       "PENV_REGISTRY_UNREADABLE",
       `Reading ${name} from ${url} failed: ${detail}`,
-      `Run \`${addCommand(name)}\` again when the registry is reachable.`
+      `Run \`${retry}\` again when the registry is reachable.`
     );
   }
 };
@@ -372,11 +374,11 @@ var PackageUnknownError = class extends PenvError {
 };
 var VersionUnknownError = class extends PenvError {
   name = "VersionUnknownError";
-  constructor(name, version, url) {
+  constructor(name, version, url, retry = addCommand(name)) {
     super(
       "PENV_VERSION_UNKNOWN",
       `${url} publishes no ${version} of ${name}`,
-      `Run \`${addCommand(name)}\` to take the version \`latest\` points at.`
+      `Run \`${retry}\` to take the version \`latest\` points at.`
     );
   }
 };
@@ -501,6 +503,66 @@ var EnginePinMismatchError = class extends PenvError {
     );
   }
 };
+var UpgradeSubjectError = class extends PenvError {
+  name = "UpgradeSubjectError";
+  constructor() {
+    super(
+      "PENV_UPGRADE_SUBJECT",
+      "`penv upgrade` takes one version, or none",
+      `Run \`${UPGRADE_COMMAND}\` to move to whatever \`latest\` points at, or \`${UPGRADE_COMMAND} 0.9.6\` to move to an exact release.`
+    );
+  }
+};
+var UpgradeFlagError = class extends PenvError {
+  name = "UpgradeFlagError";
+  constructor(flag) {
+    super(
+      "PENV_UPGRADE_FLAG",
+      `\`${UPGRADE_COMMAND}\` does not understand \`${flag}\``,
+      `Run \`${UPGRADE_COMMAND} [version]\` with \`${YES_FLAG}\` \u2014 that is the one flag it takes.`
+    );
+  }
+};
+var UpgradeNoDownloadError = class extends PenvError {
+  name = "UpgradeNoDownloadError";
+  constructor() {
+    super(
+      "PENV_UPGRADE_NO_DOWNLOAD",
+      `Upgrading means reading the registry for the version and integrity to pin, and \`--no-download\` says this run does not`,
+      `Run \`${UPGRADE_COMMAND}\` without \`--no-download\`. Nothing was fetched or written.`
+    );
+  }
+};
+var UpgradeUnattendedError = class extends PenvError {
+  name = "UpgradeUnattendedError";
+  constructor() {
+    super(
+      "PENV_UPGRADE_UNATTENDED",
+      `Upgrading rewrites ${MANIFEST_PATH} and package.json, and this run has nobody to decide that`,
+      `Run \`${UPGRADE_COMMAND} <version> ${YES_FLAG}\` \u2014 unattended, penv moves the pin only to a version you named. In CI, run \`${INSTALL_COMMAND}\`: it installs what the committed manifest already pins.`
+    );
+  }
+};
+var UpgradeDeclinedError = class extends PenvError {
+  name = "UpgradeDeclinedError";
+  constructor(version) {
+    super(
+      "PENV_UPGRADE_DECLINED",
+      `${ENGINE_PACKAGE} ${version} was not installed, so ${MANIFEST_PATH} and package.json are unchanged`,
+      `Run \`${UPGRADE_COMMAND} ${version}\` again when you want both of them to move.`
+    );
+  }
+};
+var UpgradeInstallFailedError = class extends PenvError {
+  name = "UpgradeInstallFailedError";
+  constructor(command) {
+    super(
+      "PENV_UPGRADE_INSTALL_FAILED",
+      `${command} did not finish, so ${MANIFEST_PATH} still pins the engine it pinned before`,
+      `Run \`${command}\` yourself, then run \`${UPGRADE_COMMAND}\` again \u2014 the pin and the dependency move together or not at all.`
+    );
+  }
+};
 var EngineEntryError = class extends PenvError {
   name = "EngineEntryError";
   constructor(name, version, dir) {
@@ -811,7 +873,8 @@ async function fetchRelease(query) {
     throw new RegistryUnreadableError(
       query.name,
       url,
-      cause instanceof Error ? cause.message : String(cause)
+      cause instanceof Error ? cause.message : String(cause),
+      query.retry
     );
   }
   let parsed;
@@ -821,7 +884,8 @@ async function fetchRelease(query) {
     throw new RegistryUnreadableError(
       query.name,
       url,
-      cause instanceof Error ? cause.message : String(cause)
+      cause instanceof Error ? cause.message : String(cause),
+      query.retry
     );
   }
   const packument = record(parsed);
@@ -837,7 +901,7 @@ async function fetchRelease(query) {
   const version = record(at(versions, asked)) === void 0 ? text3(at(tags, asked)) ?? asked : asked;
   const release = record(at(versions, version));
   if (release === void 0) {
-    throw new VersionUnknownError(query.name, asked, url);
+    throw new VersionUnknownError(query.name, asked, url, query.retry);
   }
   const dist = record(at(release, "dist"));
   const integrity = text3(at(dist, "integrity"));
@@ -1369,8 +1433,8 @@ var DEV_PIN_INTEGRITY = "sha512-development-build-not-a-published-release";
 var DEV_PIN_VERSION = "0.0.0-dev";
 var BUNDLED_ENGINE_PIN = {
   package: ENGINE_PACKAGE3,
-  version: "0.10.0",
-  integrity: "sha512-b+U0c3xWbk1ILtMfPjJW8x5XBxSLAaw/IAOLMBmGvT2uuYv41JPED8PrenEj4s3ZJY5BxpWU9mQcJHEBouaw/Q=="
+  version: "0.11.0",
+  integrity: "sha512-Y+WKyuPsX4U8/1j0e+VMUhj0LaGrp67YEoDAWyyinrgA+c8IM4H1blqje/YK4LsQwzQDQQDF9bhWIhfmDAWoxA=="
 };
 function assertReleasePin(pin) {
   if (pin.integrity === DEV_PIN_INTEGRITY || pin.version === DEV_PIN_VERSION) {
@@ -1411,35 +1475,142 @@ function findAdoptedRoot(cwd) {
   return findUp(cwd, (dir) => existsSync3(stateDir(dir)));
 }
 
+// src/upgrade.ts
+import { writeFileSync as writeFileSync4 } from "fs";
+import {
+  installWithPackageManager,
+  planInstall,
+  RUNTIME_PACKAGE,
+  renderInstallPlan
+} from "@penvhq/cli/install";
+import { ENGINE_PACKAGE as ENGINE_PACKAGE4, MANIFEST_PATH as MANIFEST_PATH4, serializeManifest as serializeManifest2 } from "@penvhq/core";
+function parseRequest2(argv) {
+  let version;
+  let yes = false;
+  for (const token of argv) {
+    if (token === YES_FLAG) {
+      yes = true;
+      continue;
+    }
+    if (token.startsWith("-")) {
+      throw new UpgradeFlagError(token);
+    }
+    if (version !== void 0 || token === "") {
+      throw new UpgradeSubjectError();
+    }
+    version = token;
+  }
+  return { version, yes };
+}
+function renderPinChange(engine, release) {
+  return [
+    MANIFEST_PATH4,
+    `  -   "integrity": "${engine.integrity}"`,
+    `  -   "version": "${engine.version}"`,
+    `  +   "integrity": "${release.integrity}"`,
+    `  +   "version": "${release.version}"`
+  ];
+}
+function pinnedElsewhere(manifest, version) {
+  return Object.entries(manifest.extensions).filter(([, entry]) => entry.version !== version).map(([name]) => name);
+}
+async function consent(options, release, plan, yes) {
+  const { io, manifest } = options;
+  io.out(`${ENGINE_PACKAGE4} ${manifest.engine.version} \u2192 ${release.version}`);
+  io.out("");
+  for (const line of renderPinChange(manifest.engine, release)) {
+    io.out(line);
+  }
+  for (const line of renderInstallPlan(plan)) {
+    io.out(line);
+  }
+  if (yes) {
+    return;
+  }
+  if (!await io.confirm(`Move this project to ${release.version}?`)) {
+    throw new UpgradeDeclinedError(release.version);
+  }
+}
+async function upgrade(options) {
+  const { io, fetcher, home, root, manifest, manifestFile } = options;
+  const request = parseRequest2(options.argv);
+  if (options.noDownload === true) {
+    throw new UpgradeNoDownloadError();
+  }
+  if ((options.ci === true || !io.interactive) && !(request.yes && request.version !== void 0)) {
+    throw new UpgradeUnattendedError();
+  }
+  const release = await fetchRelease({
+    name: ENGINE_PACKAGE4,
+    ...request.version === void 0 ? {} : { version: request.version },
+    retry: UPGRADE_COMMAND,
+    fetcher
+  });
+  const plan = planInstall(root, release.version);
+  if (manifest.engine.version === release.version && plan.satisfied) {
+    io.out(`\u2713 Already on ${ENGINE_PACKAGE4} ${release.version} \u2014 nothing to move`);
+    return;
+  }
+  const manifestText = serializeManifest2({
+    ...manifest,
+    engine: { package: ENGINE_PACKAGE4, version: release.version, integrity: release.integrity }
+  });
+  await consent(options, release, plan, request.yes);
+  await installPin({
+    home,
+    kind: "engines",
+    pin: { name: ENGINE_PACKAGE4, version: release.version, integrity: release.integrity },
+    fetcher
+  });
+  io.out(`\u2713 ${ENGINE_PACKAGE4} ${release.version} installed`);
+  if (!plan.satisfied) {
+    try {
+      await (options.install ?? installWithPackageManager)(plan);
+    } catch {
+      throw new UpgradeInstallFailedError(plan.command.join(" "));
+    }
+    io.out(`\u2713 package.json depends on ${RUNTIME_PACKAGE} ${release.version}`);
+  }
+  writeFileSync4(manifestFile, manifestText);
+  io.out(`\u2713 ${MANIFEST_PATH4} pins ${ENGINE_PACKAGE4} ${release.version}`);
+  const kept = pinnedElsewhere(manifest, release.version);
+  if (kept.length > 0) {
+    const subject = kept.length === 1 ? "keeps its own pin" : "keep their own pins";
+    io.out(`\u2192 ${kept.join(", ")} ${subject} \u2014 \`penv add <package>@<version>\` moves one.`);
+  }
+}
+
 // src/launcher.ts
-import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
 import { join as join7 } from "path";
 import {
   MANIFEST_FORMAT,
-  MANIFEST_PATH as MANIFEST_PATH5,
+  MANIFEST_PATH as MANIFEST_PATH6,
   PENV_HOME_VAR,
   PenvError as PenvError3,
   parseManifest as parseManifest2,
   penvHome,
-  serializeManifest as serializeManifest2,
+  serializeManifest as serializeManifest3,
   UnsupportedManifestFormatError
 } from "@penvhq/core";
 
 // src/help.ts
-import { EXTENSIONS_PATH as EXTENSIONS_PATH3, MANIFEST_PATH as MANIFEST_PATH4 } from "@penvhq/core";
+import { RUNTIME_PACKAGE as RUNTIME_PACKAGE2 } from "@penvhq/cli/install";
+import { ENGINE_PACKAGE as ENGINE_PACKAGE5, EXTENSIONS_PATH as EXTENSIONS_PATH3, MANIFEST_PATH as MANIFEST_PATH5 } from "@penvhq/core";
 function printLauncherCommands(io) {
   io.out("");
   io.out("LAUNCHER COMMANDS (penv itself, whatever engine a project pins)");
   io.out("");
-  io.out(`  install                Installs everything ${MANIFEST_PATH4} pins`);
+  io.out(`  install                Installs everything ${MANIFEST_PATH5} pins`);
   io.out("  add <package>          Pins a provider extension, and commits the decision");
   io.out(`  add ${LOCAL_FLAG} <package>  Adds the one this repository builds \u2014 nothing is pinned`);
+  io.out(`  upgrade [version]      Moves the engine pin and ${RUNTIME_PACKAGE2} together`);
   io.out("");
 }
 function printInstallHelp(io) {
   io.out(`${INSTALL_COMMAND}`);
   io.out("");
-  io.out(`Downloads, verifies and installs every version ${MANIFEST_PATH4} pins \u2014 the engine and`);
+  io.out(`Downloads, verifies and installs every version ${MANIFEST_PATH5} pins \u2014 the engine and`);
   io.out("every extension \u2014 into $PENV_HOME. The one penv command CI and production run that");
   io.out("may reach the registry.");
 }
@@ -1452,14 +1623,26 @@ function printAddHelp(io) {
     `  ${TRUST_YOUNG_FLAG}      Add a release published less than ${MIN_PACKAGE_AGE_DAYS} days ago`
   );
   io.out("");
-  io.out(`Pins the release in ${MANIFEST_PATH4} and writes its type declaration to`);
+  io.out(`Pins the release in ${MANIFEST_PATH5} and writes its type declaration to`);
   io.out(`${EXTENSIONS_PATH3}/. Both are committed, so \`${INSTALL_COMMAND}\` gives every machine`);
   io.out(`the bytes you reviewed. \`${LOCAL_FLAG}\` pins nothing and touches no manifest.`);
 }
+function printUpgradeHelp(io) {
+  io.out("penv upgrade [version]");
+  io.out("");
+  io.out(`  ${YES_FLAG}              Skip the question \u2014 unattended runs need it and a version`);
+  io.out("");
+  io.out(`Moves the ${ENGINE_PACKAGE5} pin in ${MANIFEST_PATH5} and this project's`);
+  io.out(`${RUNTIME_PACKAGE2} dependency to the same exact version. No version takes whatever`);
+  io.out("`latest` points at; the integrity is the one the registry states, never one penv");
+  io.out("computed. Both files are shown before either moves, and they move together or not");
+  io.out("at all. Extensions keep their own pins.");
+}
 
 // src/launcher.ts
 var INSTALL = "install";
 var ADD = "add";
+var UPGRADE = "upgrade";
 var VERSION_FLAGS = /* @__PURE__ */ new Set(["--version", "-v"]);
 var HELP_FLAGS = /* @__PURE__ */ new Set(["--help", "-h"]);
 var NO_DOWNLOAD = "--no-download";
@@ -1555,6 +1738,10 @@ async function launch(options) {
       printAddHelp(io);
       return 0;
     }
+    if (first === UPGRADE) {
+      printUpgradeHelp(io);
+      return 0;
+    }
   }
   const project = findProject(cwd);
   if (project === void 0) {
@@ -1582,6 +1769,20 @@ async function launch(options) {
     io.out(`penv ${manifest.engine.version}`);
     return 0;
   }
+  if (first === UPGRADE) {
+    await upgrade({
+      argv: forwarded.slice(1),
+      root: project.root,
+      manifestFile: project.manifestFile,
+      manifest,
+      home,
+      io,
+      fetcher: options.fetcher,
+      noDownload,
+      ci: isCi(env)
+    });
+    return 0;
+  }
   const enginePin = enginePinOf(manifest);
   const engineDir = await ensure(options, "engines", enginePin, home, noDownload);
   for (const pin of extensionPinsOf(manifest)) {
@@ -1600,16 +1801,16 @@ async function adopt(options, forwarded, home, cwd, noDownload) {
   if (root === void 0) {
     return 0;
   }
-  const manifestFile = join7(root, ...MANIFEST_PATH5.split("/"));
+  const manifestFile = join7(root, ...MANIFEST_PATH6.split("/"));
   if (existsSync4(manifestFile)) {
     return 0;
   }
   const pin = releaseEnginePin(options.bundledPin, engine.version);
-  writeFileSync4(
+  writeFileSync5(
     manifestFile,
-    serializeManifest2({ format: MANIFEST_FORMAT, engine: pin, extensions: {} })
+    serializeManifest3({ format: MANIFEST_FORMAT, engine: pin, extensions: {} })
   );
-  options.io.out(`\u2713 ${MANIFEST_PATH5} pins ${pin.package} ${pin.version}`);
+  options.io.out(`\u2713 ${MANIFEST_PATH6} pins ${pin.package} ${pin.version}`);
   await ensureAdoptedEngine(
     options,
     { name: pin.package, version: pin.version, integrity: pin.integrity },
@@ -1709,6 +1910,8 @@ export {
   readProviderEntries,
   setProviderType,
   INSTALL_COMMAND,
+  UPGRADE_COMMAND,
+  YES_FLAG,
   MIN_PACKAGE_AGE_DAYS,
   TRUST_YOUNG_FLAG,
   NoProjectError,
@@ -1743,6 +1946,12 @@ export {
   DeclarationNotSelfContainedError,
   EnginePinUnreleasedError,
   EnginePinMismatchError,
+  UpgradeSubjectError,
+  UpgradeFlagError,
+  UpgradeNoDownloadError,
+  UpgradeUnattendedError,
+  UpgradeDeclinedError,
+  UpgradeInstallFailedError,
   EngineEntryError,
   readExtensionPackage,
   renderDeclaration,
@@ -1773,6 +1982,7 @@ export {
   releaseEnginePin,
   findProject,
   findAdoptedRoot,
+  upgrade,
   runLauncher
 };
-//# sourceMappingURL=chunk-BNUZ52VN.js.map
+//# sourceMappingURL=chunk-USYQEKPW.js.map