@penvhq/launcher 0.9.3 → 0.9.5

package/dist/bin.js

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

package/dist/{chunk-76SOPEH6.js → chunk-4YZYBC5T.js}

@@ -164,6 +164,7 @@ function setProviderType(source, environment, type) {
 import {
   ENGINE_PACKAGE,
   EXTENSIONS_PATH,
+  LOCAL_EXTENSIONS_PATH,
   MANIFEST_PATH,
   OFFICIAL_SCOPE,
   PenvError
@@ -271,7 +272,38 @@ var AddFlagError = class extends PenvError {
     super(
       "PENV_ADD_FLAG",
       `\`penv add\` does not understand \`${flag}\``,
-      `Run \`penv add <package>\` with \`${TRUST_YOUNG_FLAG}\` or \`--registry <url>\` \u2014 those are the two it takes.`
+      `Run \`penv add <package>\` with \`${TRUST_YOUNG_FLAG}\`, \`--registry <url>\`, or \`${LOCAL_FLAG}\` \u2014 those are the three it takes.`
+    );
+  }
+};
+var LOCAL_FLAG = "--local";
+var AddLocalFlagError = class extends PenvError {
+  name = "AddLocalFlagError";
+  constructor(subject) {
+    super(
+      "PENV_ADD_LOCAL_FLAG",
+      `\`penv add ${LOCAL_FLAG}\` cannot take ${subject}`,
+      `${LOCAL_FLAG} adds the package this project already builds, so there is no release to name and nothing to pin. Publish it and run \`penv add <package>\` to pin one.`
+    );
+  }
+};
+var LocalExtensionUnresolvedError = class extends PenvError {
+  name = "LocalExtensionUnresolvedError";
+  constructor(name, root) {
+    super(
+      "PENV_LOCAL_EXTENSION_UNRESOLVED",
+      `${name} does not resolve from ${root}`,
+      `${LOCAL_FLAG} records that penv should read this package out of the project, so the project has to have it \u2014 add it as a dependency of the root (a workspace link is one), then run this again.`
+    );
+  }
+};
+var AddLocalInCiError = class extends PenvError {
+  name = "AddLocalInCiError";
+  constructor(name) {
+    super(
+      "PENV_ADD_LOCAL_IN_CI",
+      `Adding ${name} writes ${LOCAL_EXTENSIONS_PATH}, and CI does not decide what a project develops`,
+      `Run \`penv add ${LOCAL_FLAG} ${name}\` from a terminal and commit what it writes.`
     );
   }
 };
@@ -474,14 +506,20 @@ function readExtensionPackage(dir) {
   try {
     parsed = JSON.parse(readFileSync(join(dir, "package.json"), "utf8"));
   } catch {
-    return { types: void 0, onboard: void 0 };
+    return { name: void 0, version: void 0, types: void 0, onboard: void 0 };
   }
   const penv = field(parsed, "penv");
-  return { types: text(field(penv, "types")), onboard: text(field(penv, "onboard")) };
+  return {
+    name: text(field(parsed, "name")),
+    version: text(field(parsed, "version")),
+    types: text(field(penv, "types")),
+    onboard: text(field(penv, "onboard"))
+  };
 }
 function header(subject) {
-  const provenance = subject.attested ? "npm records a provenance attestation for it" : "npm records no provenance attestation for it";
-  return `// Written by \`penv add ${subject.name}\`, and committed.
+  const local = subject.local === true;
+  const provenance = local ? "resolved from this project, not from a published release" : subject.attested ? "npm records a provenance attestation for it" : "npm records no provenance attestation for it";
+  return `// Written by \`penv add ${local ? "--local " : ""}${subject.name}\`, and committed.
 // ${subject.name} ${subject.version} \u2014 ${provenance}.
 //
 // Types only: this declares the shape of the provider's \`penv.config.ts\`
@@ -819,9 +857,19 @@ async function fetchRelease(query) {
 }
 
 // src/add.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
-import { relative, sep as sep3 } from "path";
-import { findConfigFile, MANIFEST_PATH as MANIFEST_PATH2, OFFICIAL_SCOPE as OFFICIAL_SCOPE2, serializeManifest } from "@penvhq/core";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { createRequire } from "module";
+import { dirname as dirname3, relative, resolve as resolve3, sep as sep3 } from "path";
+import {
+  findConfigFile,
+  LOCAL_EXTENSIONS_PATH as LOCAL_EXTENSIONS_PATH2,
+  localExtensionsFile,
+  MANIFEST_PATH as MANIFEST_PATH2,
+  OFFICIAL_SCOPE as OFFICIAL_SCOPE2,
+  parseLocalExtensions,
+  serializeLocalExtensions,
+  serializeManifest
+} from "@penvhq/core";
 
 // src/repair.ts
 import { parseManifest } from "@penvhq/core";
@@ -885,8 +933,13 @@ function parseRequest(argv) {
   let spec;
   let registry;
   let trustYoung = false;
+  let local = false;
   for (let index = 0; index < argv.length; index += 1) {
     const token = argv[index] ?? "";
+    if (token === LOCAL_FLAG) {
+      local = true;
+      continue;
+    }
     if (token === TRUST_YOUNG_FLAG) {
       trustYoung = true;
       continue;
@@ -915,7 +968,18 @@ function parseRequest(argv) {
   if (!PACKAGE_NAME.test(name) || version === "") {
     throw new AddPackageNameError(spec);
   }
-  return { name, version, registry, trustYoung };
+  if (local) {
+    if (version !== void 0) {
+      throw new AddLocalFlagError("a version");
+    }
+    if (registry !== void 0) {
+      throw new AddLocalFlagError(`\`${REGISTRY_FLAG}\``);
+    }
+    if (trustYoung) {
+      throw new AddLocalFlagError(`\`${TRUST_YOUNG_FLAG}\``);
+    }
+  }
+  return { name, version, registry, trustYoung, local };
 }
 function tierOf(request) {
   if (request.name.startsWith(OFFICIAL_SCOPE2)) {
@@ -1048,9 +1112,69 @@ async function offerOnboarding(io, name, onboard) {
   io.out(`Run \`${command}\` to finish setting ${name} up.`);
   return void 0;
 }
+function resolvePackageDir(name, root) {
+  const require2 = createRequire(resolve3(root, "noop.js"));
+  try {
+    return dirname3(require2.resolve(`${name}/package.json`));
+  } catch {
+    let dir;
+    try {
+      dir = dirname3(require2.resolve(name));
+    } catch {
+      return void 0;
+    }
+    for (let current = dir, parent = dirname3(dir); current !== parent; parent = dirname3(current)) {
+      if (readExtensionPackage(current).name === name) {
+        return current;
+      }
+      current = parent;
+    }
+    return void 0;
+  }
+}
+function recordLocalExtension(root, name) {
+  const file = localExtensionsFile(root);
+  let current;
+  try {
+    current = readFileSync4(file, "utf8");
+  } catch {
+    current = "[]";
+  }
+  mkdirSync3(dirname3(file), { recursive: true });
+  writeFileSync3(file, serializeLocalExtensions([...parseLocalExtensions(current), name]));
+}
+async function addLocal(options, request) {
+  const { io, root } = options;
+  if (options.ci === true) {
+    throw new AddLocalInCiError(request.name);
+  }
+  const dir = resolvePackageDir(request.name, root);
+  if (dir === void 0) {
+    throw new LocalExtensionUnresolvedError(request.name, root);
+  }
+  const installed = readExtensionPackage(dir);
+  const declaration = writeDeclaration({
+    root,
+    dir,
+    name: request.name,
+    version: installed.version ?? "unpublished",
+    attested: false,
+    local: true,
+    types: installed.types
+  });
+  recordLocalExtension(root, request.name);
+  io.out(`\u2713 ${request.name} resolves from this project \u2014 nothing is pinned`);
+  io.out(`\u2713 ${LOCAL_EXTENSIONS_PATH2} records it`);
+  io.out(`\u2713 ${declaration} declares its config type`);
+  await offerConfigEdit(options, request.name);
+  return { onboard: await offerOnboarding(io, request.name, installed.onboard) };
+}
 async function add(options) {
   const { io, fetcher, home, root, manifestFile } = options;
   const request = parseRequest(options.argv);
+  if (request.local) {
+    return addLocal(options, request);
+  }
   const tier = tierOf(request);
   const now = (options.now ?? (() => /* @__PURE__ */ new Date()))();
   if (options.noDownload === true) {
@@ -1147,13 +1271,13 @@ function nodeSpawner() {
 
 // src/engine.ts
 import { existsSync as existsSync2, readFileSync as readFileSync5 } from "fs";
-import { createRequire } from "module";
-import { dirname as dirname3, join as join4, resolve as resolve3, sep as sep4 } from "path";
+import { createRequire as createRequire2 } from "module";
+import { dirname as dirname4, join as join5, resolve as resolve4, sep as sep4 } from "path";
 import { ENGINE_PACKAGE as ENGINE_PACKAGE2, PenvError as PenvError3 } from "@penvhq/core";
 var ENGINE_BIN = "penv-engine";
 function readPackageManifest(dir) {
   try {
-    return JSON.parse(readFileSync5(join4(dir, "package.json"), "utf8"));
+    return JSON.parse(readFileSync5(join5(dir, "package.json"), "utf8"));
   } catch {
     return void 0;
   }
@@ -1175,15 +1299,15 @@ function binPath(bin) {
 function engineAt(dir, name, version) {
   const manifest = readPackageManifest(dir);
   const bin = manifest === void 0 ? void 0 : binPath(manifest.bin);
-  const root = resolve3(dir);
-  const entry = bin === void 0 ? void 0 : resolve3(root, bin);
+  const root = resolve4(dir);
+  const entry = bin === void 0 ? void 0 : resolve4(root, bin);
   if (entry === void 0 || !entry.startsWith(root + sep4) || !existsSync2(entry)) {
     throw new EngineEntryError(name, version, dir);
   }
   return { name, version, dir, entry };
 }
 function bundledEngine() {
-  const require2 = createRequire(import.meta.url);
+  const require2 = createRequire2(import.meta.url);
   let manifestFile;
   try {
     manifestFile = require2.resolve(`${ENGINE_PACKAGE2}/package.json`);
@@ -1194,7 +1318,7 @@ function bundledEngine() {
       "Reinstall the launcher with `npm install -g @penvhq/launcher`."
     );
   }
-  const dir = dirname3(manifestFile);
+  const dir = dirname4(manifestFile);
   const version = readPackageManifest(dir)?.version;
   return engineAt(dir, ENGINE_PACKAGE2, typeof version === "string" ? version : "unknown");
 }
@@ -1218,8 +1342,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.9.3",
-  integrity: "sha512-9ZPRFCovPXXFYxT7SWJth8IX1Rgu/FXl8+60Pn8MBu5UYG4m4l0fBi1aFwnxVVcriAnFmxNtNG4hwn1a1IliWw=="
+  version: "0.9.5",
+  integrity: "sha512-cacsvynscs6G0NThpGaK1BfKy3POQSoogI/vvQNZ5sTZaftzwg4mPtUpT+i2GSc3KbYAHQu4Kq9MpYLOvSvulA=="
 };
 function assertReleasePin(pin) {
   if (pin.integrity === DEV_PIN_INTEGRITY || pin.version === DEV_PIN_VERSION) {
@@ -1236,16 +1360,16 @@ function releaseEnginePin(pin, ranVersion) {
 
 // src/project.ts
 import { existsSync as existsSync3 } from "fs";
-import { dirname as dirname4, join as join5, resolve as resolve4 } from "path";
+import { dirname as dirname5, join as join6, resolve as resolve5 } from "path";
 import { MANIFEST_PATH as MANIFEST_PATH3, stateDir } from "@penvhq/core";
 var MANIFEST_SEGMENTS = MANIFEST_PATH3.split("/");
 function findUp(cwd, matches) {
-  let dir = resolve4(cwd);
+  let dir = resolve5(cwd);
   for (; ; ) {
     if (matches(dir)) {
       return dir;
     }
-    const parent = dirname4(dir);
+    const parent = dirname5(dir);
     if (parent === dir) {
       return void 0;
     }
@@ -1253,8 +1377,8 @@ function findUp(cwd, matches) {
   }
 }
 function findProject(cwd) {
-  const root = findUp(cwd, (dir) => existsSync3(join5(dir, ...MANIFEST_SEGMENTS)));
-  return root === void 0 ? void 0 : { root, manifestFile: join5(root, ...MANIFEST_SEGMENTS) };
+  const root = findUp(cwd, (dir) => existsSync3(join6(dir, ...MANIFEST_SEGMENTS)));
+  return root === void 0 ? void 0 : { root, manifestFile: join6(root, ...MANIFEST_SEGMENTS) };
 }
 function findAdoptedRoot(cwd) {
   return findUp(cwd, (dir) => existsSync3(stateDir(dir)));
@@ -1262,7 +1386,7 @@ function findAdoptedRoot(cwd) {
 
 // src/launcher.ts
 import { existsSync as existsSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import {
   MANIFEST_FORMAT,
   MANIFEST_PATH as MANIFEST_PATH4,
@@ -1369,7 +1493,7 @@ async function launch(options) {
       return delegate(options, options.bundledEngine(), forwarded, home, cwd);
     }
     if (ADOPTS.has(first)) {
-      return adopt(options, forwarded, home, cwd);
+      return adopt(options, forwarded, home, cwd, noDownload);
     }
     throw new NoProjectError(cwd);
   }
@@ -1393,7 +1517,7 @@ async function launch(options) {
   const engine = engineAt(engineDir, enginePin.name, enginePin.version);
   return delegate(options, engine, forwarded, home, cwd);
 }
-async function adopt(options, forwarded, home, cwd) {
+async function adopt(options, forwarded, home, cwd, noDownload) {
   const engine = options.bundledEngine();
   const code = await delegate(options, engine, forwarded, home, cwd);
   if (code !== 0) {
@@ -1403,7 +1527,7 @@ async function adopt(options, forwarded, home, cwd) {
   if (root === void 0) {
     return 0;
   }
-  const manifestFile = join6(root, ...MANIFEST_PATH4.split("/"));
+  const manifestFile = join7(root, ...MANIFEST_PATH4.split("/"));
   if (existsSync4(manifestFile)) {
     return 0;
   }
@@ -1413,8 +1537,26 @@ async function adopt(options, forwarded, home, cwd) {
     serializeManifest2({ format: MANIFEST_FORMAT, engine: pin, extensions: {} })
   );
   options.io.out(`\u2713 ${MANIFEST_PATH4} pins ${pin.package} ${pin.version}`);
+  await ensureAdoptedEngine(
+    options,
+    { name: pin.package, version: pin.version, integrity: pin.integrity },
+    home,
+    noDownload
+  );
   return 0;
 }
+async function ensureAdoptedEngine(options, pin, home, noDownload) {
+  try {
+    await ensure(options, "engines", pin, home, noDownload);
+  } catch (error) {
+    if (!(error instanceof PackageMissingError || error instanceof InstallDeclinedError)) {
+      report(error, options.io);
+    }
+    options.io.out(
+      `\u2192 Run \`${INSTALL_COMMAND}\` to install ${pin.name} ${pin.version} before your first \`penv run\`.`
+    );
+  }
+}
 async function ensure(options, kind, pin, home, noDownload) {
   const { io, env, fetcher } = options;
   const { dir, state } = inspectInstall(home, kind, pin);
@@ -1498,6 +1640,10 @@ export {
   AddSubjectError,
   AddPackageNameError,
   AddFlagError,
+  LOCAL_FLAG,
+  AddLocalFlagError,
+  LocalExtensionUnresolvedError,
+  AddLocalInCiError,
   AddRegistryError,
   OfficialRegistryError,
   RegistryUnreadableError,
@@ -1549,4 +1695,4 @@ export {
   findAdoptedRoot,
   runLauncher
 };
-//# sourceMappingURL=chunk-76SOPEH6.js.map
+//# sourceMappingURL=chunk-4YZYBC5T.js.map