@penvhq/cli 0.9.5 → 0.10.0

package/dist/index.js

@@ -326,7 +326,7 @@ function installFailed(plan2) {
 
 // src/project.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
-import { dirname, join as join3 } from "path";
+import { dirname, join as join4 } from "path";
 import {
   assertMigrated,
   candidatesFor,
@@ -408,15 +408,20 @@ function environmentFromShorthand(config, candidates, explicit) {
 // src/registry.ts
 import { readFileSync as readFileSync2 } from "fs";
 import { createRequire } from "module";
-import { resolve } from "path";
+import { join as join3, resolve } from "path";
 import { pathToFileURL } from "url";
 import {
   holdsProjection,
   LOCAL_EXTENSIONS_PATH,
   localExtensionsFile,
+  MANIFEST_PATH,
   PENV_DIR,
   PenvError as PenvError4,
+  packageDir,
+  packageEntry,
   parseLocalExtensions,
+  parseManifest,
+  penvHome,
   recordsDir
 } from "@penvhq/core";
 import { createFilesystemProvider } from "@penvhq/provider-filesystem";
@@ -461,19 +466,12 @@ async function createSourceProvider(type, context) {
   return loadPluginProvider(type, context);
 }
 async function loadPluginProvider(type, context) {
-  const resolved = resolvePlugin(type, context.root);
-  if (resolved === void 0) {
-    throw unknownProvider(type, context.environment);
-  }
+  const path = resolveExtension(type, context.root, context.environment);
   let mod;
   try {
-    mod = await importPlugin(resolved);
-  } catch {
-    throw new PenvError4(
-      "PROVIDER_PLUGIN_LOAD",
-      `The provider package \`${type}\` failed to load`,
-      "It resolved but threw while importing. Check it builds and its dependencies are installed."
-    );
+    mod = await importPlugin(path);
+  } catch (cause) {
+    throw providerLoadFailed(type, path, cause);
   }
   const factory = mod[PLUGIN_FACTORY_EXPORT];
   if (typeof factory !== "function") {
@@ -497,10 +495,42 @@ function assertProvidersRegistered(config, projectRoot, options) {
     if (ci && local.includes(provider.type)) {
       throw localExtensionInCi(provider.type, environment);
     }
-    if (resolvePlugin(provider.type, projectRoot) === void 0) {
-      throw unknownProvider(provider.type, environment);
+    resolveExtension(provider.type, projectRoot, environment, local);
+  }
+}
+function resolveExtension(type, projectRoot, environment, local = localExtensions(projectRoot)) {
+  const fromProject = resolvePlugin(type, projectRoot);
+  if (local.includes(type)) {
+    if (fromProject === void 0) {
+      throw localExtensionUnresolved(type, projectRoot, environment);
     }
+    return fromProject;
+  }
+  if (fromProject !== void 0) {
+    return fromProject;
   }
+  const version = pinnedVersion(type, projectRoot);
+  if (version === void 0) {
+    throw unknownProvider(type, environment);
+  }
+  const stored = storedExtension(type, version);
+  if (stored === void 0) {
+    throw extensionNotInstalled(type, version, environment);
+  }
+  return stored;
+}
+function pinnedVersion(type, projectRoot) {
+  let manifest;
+  try {
+    manifest = parseManifest(readFileSync2(join3(projectRoot, ...MANIFEST_PATH.split("/")), "utf8"));
+  } catch {
+    return void 0;
+  }
+  return manifest.extensions[type]?.version;
+}
+function storedExtension(type, version) {
+  const entry = packageEntry(packageDir(penvHome(process.env), "extensions", type, version));
+  return entry?.file;
 }
 function localExtensions(projectRoot) {
   let text;
@@ -552,13 +582,37 @@ function assertSatisfiesContract(provider, specifier) {
     }
   }
 }
+function where(environment) {
+  return environment === void 0 ? "" : ` for environment ${environment}`;
+}
 function unknownProvider(type, environment) {
   const preinstalled = [...REGISTRY.keys()].map((name) => `\`${name}\``).join(", ");
-  const where = environment === void 0 ? "" : ` for environment ${environment}`;
   return new PenvError4(
     "UNKNOWN_PROVIDER",
-    `The provider \`${type}\`${where} in penv.config.ts is not installed in this project`,
-    `A provider's \`type\` is the package penv imports, so it has to resolve from this project: install it with \`npm i ${type}\`, or \u2014 if this repository is the one that builds it \u2014 run \`penv add --local ${type}\` once it is a dependency of the root. The CLI ships ${preinstalled} pre-installed.`
+    `The provider \`${type}\`${where(environment)} in penv.config.ts is nowhere penv looks for it`,
+    `Run \`penv add ${type}\` to pin a release, or \`penv add --local ${type}\` if this repository is the one that builds it. penv looks in ${LOCAL_EXTENSIONS_PATH}, this project's node_modules, and then $PENV_HOME at the version ${MANIFEST_PATH} pins. The CLI ships ${preinstalled} pre-installed.`
+  );
+}
+function extensionNotInstalled(type, version, environment) {
+  return new PenvError4(
+    "EXTENSION_NOT_INSTALLED",
+    `${MANIFEST_PATH} pins \`${type}\` ${version}${where(environment)}, and it is not installed in ${penvHome(process.env)}`,
+    "Run `penv install` \u2014 it downloads and verifies every version the manifest pins, extensions included."
+  );
+}
+function localExtensionUnresolved(type, projectRoot, environment) {
+  return new PenvError4(
+    "LOCAL_EXTENSION_UNRESOLVED",
+    `${LOCAL_EXTENSIONS_PATH} records \`${type}\`${where(environment)} as a package this project develops, and it does not resolve from ${projectRoot}`,
+    `Add it as a dependency of the root (a workspace link is one) and run \`pnpm install\`, or drop the name from ${LOCAL_EXTENSIONS_PATH} if this project no longer builds it.`
+  );
+}
+function providerLoadFailed(type, path, cause) {
+  const detail = cause instanceof Error ? cause.message : String(cause);
+  return new PenvError4(
+    "PROVIDER_PLUGIN_LOAD",
+    `The provider package \`${type}\` failed to load from ${path}: ${detail}`,
+    "penv imports that file exactly as it stands, with no transform, so it has to be built JavaScript with its dependencies installed."
   );
 }
 
@@ -587,7 +641,7 @@ function localTree(project) {
   return project.provider;
 }
 function selfContainedSchemaModule(root, schemaFile) {
-  const file = join3(root, ...schemaFile.split("/"));
+  const file = join4(root, ...schemaFile.split("/"));
   if (!existsSync3(file)) {
     return void 0;
   }
@@ -859,7 +913,7 @@ async function guard(run) {
 // src/commands/run.ts
 import { existsSync as existsSync4, readFileSync as readFileSync4, watch } from "fs";
 import { createRequire as createRequire2 } from "module";
-import { basename, dirname as dirname2, join as join4, resolve as resolve2 } from "path";
+import { basename, dirname as dirname2, join as join5, resolve as resolve2 } from "path";
 import {
   ARTIFACT_BUILD_COMMAND,
   assertArtifactFor,
@@ -1699,7 +1753,7 @@ function packageManifest(specifier, root) {
     return void 0;
   }
   for (; ; ) {
-    const file = join4(directory, "package.json");
+    const file = join5(directory, "package.json");
     if (existsSync4(file)) {
       try {
         const parsed = JSON.parse(readFileSync4(file, "utf8"));
@@ -2201,7 +2255,7 @@ import {
   rmSync,
   writeFileSync as writeFileSync2
 } from "fs";
-import { dirname as dirname4, join as join5, resolve as resolve4 } from "path";
+import { dirname as dirname4, join as join6, resolve as resolve4 } from "path";
 import {
   CUTOVER_PATH,
   findConfigFile,
@@ -2211,7 +2265,7 @@ import {
 } from "@penvhq/core";
 var CUTOVER_FORMAT = 1;
 function fileFor(root, relativePosix) {
-  return join5(root, ...relativePosix.split("/"));
+  return join6(root, ...relativePosix.split("/"));
 }
 function bundleDir(root) {
   return fileFor(root, ROLLBACK_DOTENV_PATH);
@@ -2298,7 +2352,7 @@ function bundleDotenvFiles(root, files, environments, now = /* @__PURE__ */ new
   const bundle = bundleDir(root);
   mkdirSync2(bundle, { recursive: true });
   for (const name of files) {
-    renameSync(join5(root, name), join5(bundle, name));
+    renameSync(join6(root, name), join6(bundle, name));
   }
   return cutover;
 }
@@ -2317,7 +2371,7 @@ function runUndo(options) {
   const names = [...recorded, ...bundled.filter((name) => !recorded.includes(name))];
   const bundle = bundleDir(root);
   const held = new Set(bundled);
-  const occupied2 = names.filter((name) => held.has(name) && existsSync5(join5(root, name)));
+  const occupied2 = names.filter((name) => held.has(name) && existsSync5(join6(root, name)));
   if (occupied2.length > 0) {
     const listed = occupied2.join(", ");
     const many = occupied2.length > 1;
@@ -2332,9 +2386,9 @@ function runUndo(options) {
   const missing = [];
   for (const name of names) {
     if (held.has(name)) {
-      renameSync(join5(bundle, name), join5(root, name));
+      renameSync(join6(bundle, name), join6(root, name));
       restored.push(name);
-    } else if (existsSync5(join5(root, name))) {
+    } else if (existsSync5(join6(root, name))) {
       alreadyBack.push(name);
     } else {
       missing.push(name);
@@ -2388,7 +2442,7 @@ var cleanupCommand = defineCommand5({
 
 // src/commands/doctor.ts
 import { readdirSync as readdirSync3, readFileSync as readFileSync6, statSync as statSync2 } from "fs";
-import { join as join6, relative as relative2 } from "path";
+import { join as join7, relative as relative2 } from "path";
 import {
   ARTIFACT_BUILD_COMMAND as ARTIFACT_BUILD_COMMAND2,
   accessPath as accessPath3,
@@ -3342,7 +3396,7 @@ function scannableFiles(directory, out2) {
     return;
   }
   for (const entry of entries) {
-    const path = join6(directory, entry.name);
+    const path = join7(directory, entry.name);
     if (entry.isDirectory()) {
       if (!UNSCANNED_DIRS.has(entry.name)) {
         scannableFiles(path, out2);
@@ -4397,9 +4451,9 @@ function assertImportable(ref, variable) {
     `Filenames are split on \`.\`. Rename ${variable} in the source file, then import it again.`
   );
 }
-function assertNotReserved(ref, variable, where, config) {
+function assertNotReserved(ref, variable, where2, config) {
   if (isReservedToken3(ref.name, config)) {
-    throw new ReservedTokenError3("parameter", variable, where);
+    throw new ReservedTokenError3("parameter", variable, where2);
   }
 }
 function assertRoundTrips(ref, variable, config) {
@@ -4416,12 +4470,12 @@ function assertRoundTrips(ref, variable, config) {
     `\`penv generate\` would write ${generated}, so anything reading \`process.env["${variable}"]\` would read \`undefined\`. Declare the name you want in the \`override\` block of penv.config.ts \u2014 \`override: { "${ref.name}": "${variable}" }\` \u2014 then import it again. Nothing was imported.`
   );
 }
-function refsForEntries(entries, where, config) {
+function refsForEntries(entries, where2, config) {
   const refs = [];
   for (const entry of entries) {
     const ref = refFromVariable2(entry.key);
     assertImportable(ref, entry.key);
-    assertNotReserved(ref, entry.key, where, config);
+    assertNotReserved(ref, entry.key, where2, config);
     assertRoundTrips(ref, entry.key, config);
     refs.push(ref);
   }
@@ -4452,7 +4506,7 @@ function writeEntries(tree, entries, refs, scope) {
 
 // src/detect.ts
 import { existsSync as existsSync6, readFileSync as readFileSync7 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { DEFAULT_SCHEMA_FILE } from "@penvhq/core";
 var SIGNATURES = [
   { name: "Next.js", packages: ["next"], publicPrefixes: ["NEXT_PUBLIC_"] },
@@ -4480,7 +4534,7 @@ function exportsSchema(file) {
   );
 }
 function occupied(cwd, relative5) {
-  const file = join7(cwd, ...relative5.split("/"));
+  const file = join8(cwd, ...relative5.split("/"));
   return existsSync6(file) && !exportsSchema(file);
 }
 function schemaFileFor(cwd) {
@@ -4496,7 +4550,7 @@ function schemaFileFor(cwd) {
   return { file: DEFAULT_SCHEMA_FILE, displaced: preferred };
 }
 function srcPrefix(cwd) {
-  return existsSync6(join7(cwd, "src")) ? "src/" : "";
+  return existsSync6(join8(cwd, "src")) ? "src/" : "";
 }
 function dependenciesOf(cwd) {
   const manifest = manifestOf2(cwd);
@@ -4515,7 +4569,7 @@ function dependenciesOf(cwd) {
   return names;
 }
 function manifestOf2(cwd) {
-  const file = join7(cwd, "package.json");
+  const file = join8(cwd, "package.json");
   if (!existsSync6(file)) {
     return void 0;
   }
@@ -4537,7 +4591,7 @@ function detectFramework(cwd) {
       return detectedFrom(cwd, signature.name, signature.publicPrefixes);
     }
   }
-  if (existsSync6(join7(cwd, "bunfig.toml")) || dependencies.has("bun-types")) {
+  if (existsSync6(join8(cwd, "bunfig.toml")) || dependencies.has("bun-types")) {
     return detectedFrom(cwd, "Bun", []);
   }
   return void 0;
@@ -4617,7 +4671,7 @@ function draftFieldsAcross(sources, environments) {
 
 // src/commands/init.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync4, readdirSync as readdirSync5, readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "fs";
-import { dirname as dirname6, join as join9, resolve as resolve6 } from "path";
+import { dirname as dirname6, join as join10, resolve as resolve6 } from "path";
 import { createInterface as createInterface2 } from "readline/promises";
 import {
   CUTOVER_PATH as CUTOVER_PATH3,
@@ -4651,7 +4705,7 @@ import {
   unlinkSync,
   writeFileSync as writeFileSync4
 } from "fs";
-import { dirname as dirname5, join as join8 } from "path";
+import { dirname as dirname5, join as join9 } from "path";
 function record(path, files, dirs) {
   let stats;
   try {
@@ -4662,7 +4716,7 @@ function record(path, files, dirs) {
   if (stats.isDirectory()) {
     dirs.add(path);
     for (const entry of readdirSync4(path)) {
-      record(join8(path, entry), files, dirs);
+      record(join9(path, entry), files, dirs);
     }
     return;
   }
@@ -4712,7 +4766,7 @@ function removeAdded(path, undo) {
     return;
   }
   for (const entry of readdirSync4(path)) {
-    removeAdded(join8(path, entry), undo);
+    removeAdded(join9(path, entry), undo);
   }
   if (!undo.dirs.has(path) && readdirSync4(path).length === 0) {
     rmdirSync(path);
@@ -4930,7 +4984,7 @@ function configOf(decisions) {
   return { environments: decisions.environments, providers: {}, schemaFile: decisions.schemaFile };
 }
 function declaredIn(root) {
-  const file = join9(root, CONFIG_FILE);
+  const file = join10(root, CONFIG_FILE);
   if (!existsSync8(file)) {
     return void 0;
   }
@@ -5381,7 +5435,7 @@ function ensurePenvDir(root) {
   return { target: "penv-dir", action: "created", text: `Created ${PENV_DIR2}/` };
 }
 function writeSchemaShapeFile(root, fields, draft, decisions = DEFAULT_DECISIONS) {
-  const file = join9(root, SCHEMA_SHAPE_FILE3);
+  const file = join10(root, SCHEMA_SHAPE_FILE3);
   if (existsSync8(file)) {
     return {
       target: "schema",
@@ -5408,7 +5462,7 @@ function writeSchemaShapeFile(root, fields, draft, decisions = DEFAULT_DECISIONS
   };
 }
 function writeEnvFile(root, decisions = DEFAULT_DECISIONS) {
-  const file = join9(root, ...decisions.schemaFile.split("/"));
+  const file = join10(root, ...decisions.schemaFile.split("/"));
   if (existsSync8(file)) {
     return {
       target: "env",
@@ -5427,7 +5481,7 @@ function writeEnvFile(root, decisions = DEFAULT_DECISIONS) {
   };
 }
 function writeConfigFile(root, decisions = DEFAULT_DECISIONS) {
-  const file = join9(root, CONFIG_FILE);
+  const file = join10(root, CONFIG_FILE);
   if (existsSync8(file)) {
     return { target: "config", action: "kept", text: `Kept ${CONFIG_FILE}` };
   }
@@ -5437,8 +5491,8 @@ function writeConfigFile(root, decisions = DEFAULT_DECISIONS) {
 function writeTsconfigAlias(root, decisions = DEFAULT_DECISIONS) {
   const alias = decisions.alias;
   const imports = alias.startsWith(IMPORTS_PREFIX);
-  const file = join9(root, imports ? PACKAGE_FILE : TSCONFIG_FILE);
-  const where = imports ? PACKAGE_FILE : TSCONFIG_FILE;
+  const file = join10(root, imports ? PACKAGE_FILE : TSCONFIG_FILE);
+  const where2 = imports ? PACKAGE_FILE : TSCONFIG_FILE;
   if (!existsSync8(file)) {
     if (imports) {
       return {
@@ -5461,7 +5515,7 @@ function writeTsconfigAlias(root, decisions = DEFAULT_DECISIONS) {
     return {
       target: "tsconfig",
       action: "conflicted",
-      text: `${where} already maps ${alias} to ${edit.conflict}`,
+      text: `${where2} already maps ${alias} to ${edit.conflict}`,
       note: `(left alone \u2014 \`import { env } from "${alias}"\` will not reach ${decisions.schemaFile})`
     };
   }
@@ -5469,18 +5523,18 @@ function writeTsconfigAlias(root, decisions = DEFAULT_DECISIONS) {
     return {
       target: "tsconfig",
       action: "kept",
-      text: `Kept the ${alias} alias in ${where}`
+      text: `Kept the ${alias} alias in ${where2}`
     };
   }
   writeFileSync5(file, edit.source, "utf8");
   return {
     target: "tsconfig",
     action: "updated",
-    text: `Added ${alias} alias to ${where}`
+    text: `Added ${alias} alias to ${where2}`
   };
 }
 function writeGitignore(root, decisions = DEFAULT_DECISIONS) {
-  const file = join9(root, ...STATE_GITIGNORE_PATH.split("/"));
+  const file = join10(root, ...STATE_GITIGNORE_PATH.split("/"));
   const wanted = renderStateGitignore(configOf(decisions));
   const existing = existsSync8(file) ? readFileSync9(file, "utf8") : void 0;
   if (existing === wanted) {
@@ -5503,7 +5557,7 @@ function outdatedRuntimeWarning(root) {
   return `Injection needs @penvhq/penv ${INJECT_MIN_VERSION}+ \u2014 this project has ${version}, whose \`load\` ignores \`{ inject: true }\`. Upgrade, or process.env stays empty.`;
 }
 function installedPenvVersion(root) {
-  const file = join9(root, "node_modules", "@penvhq", "penv", "package.json");
+  const file = join10(root, "node_modules", "@penvhq", "penv", "package.json");
   if (!existsSync8(file)) {
     return void 0;
   }
@@ -5548,7 +5602,7 @@ function writeSeam(root, decisions = DEFAULT_DECISIONS, framework = detectFramew
     };
   }
   const alsoNote = writeAlso(root, seam.also);
-  const file = join9(root, ...seam.file.split("/"));
+  const file = join10(root, ...seam.file.split("/"));
   const baseNotes = [...seam.notes, ...alsoNote === void 0 ? [] : [alsoNote]];
   const notes = baseNotes.length === 0 ? "" : `
 ${baseNotes.map((n) => `  ${n}`).join("\n")}`;
@@ -5573,7 +5627,7 @@ function writeAlso(root, also) {
   if (also === void 0) {
     return void 0;
   }
-  const file = join9(root, ...also.file.split("/"));
+  const file = join10(root, ...also.file.split("/"));
   if (existsSync8(file)) {
     return also.ifPresent;
   }
@@ -5604,7 +5658,7 @@ function scaffold(root, fields, draft, decisions = DEFAULT_DECISIONS, framework
   return seam === void 0 ? steps : [...steps, seam];
 }
 function scaffoldPaths(root, decisions = DEFAULT_DECISIONS, framework = detectFramework(root)?.name) {
-  const fileAt = (relative5) => join9(root, ...relative5.split("/"));
+  const fileAt = (relative5) => join10(root, ...relative5.split("/"));
   const seam = decisions.inject ? seamFor(framework, {
     alias: decisions.alias,
     srcDir: srcPrefix(root),
@@ -5682,7 +5736,7 @@ function planCutover(input) {
   const diagnostics = [];
   let variables = 0;
   for (const file of selected) {
-    const parsed = parseDotenv(readFileSync9(join9(root, file.name), "utf8"));
+    const parsed = parseDotenv(readFileSync9(join10(root, file.name), "utf8"));
     const fileRefs = refsForEntries(parsed.entries, file.name, config);
     adopted.push({ file, entries: parsed.entries, refs: fileRefs, scope: scopeOf(file) });
     refs.push(...fileRefs);
@@ -5926,7 +5980,7 @@ function dailyCommand(root) {
   return `penv run -- ${detectPackageManager(root)} ${devScript(root)}`;
 }
 function devScript(root) {
-  const file = join9(root, PACKAGE_FILE);
+  const file = join10(root, PACKAGE_FILE);
   if (!existsSync8(file)) {
     return "dev";
   }
@@ -6666,7 +6720,7 @@ import {
   rmSync as rmSync2,
   writeFileSync as writeFileSync6
 } from "fs";
-import { dirname as dirname7, join as join10 } from "path";
+import { dirname as dirname7, join as join11 } from "path";
 import { createInterface as createInterface3 } from "readline/promises";
 import {
   loadConfig as loadConfig2,
@@ -6697,7 +6751,7 @@ function planMigrate(cwd) {
   if (entries.length > 0 && !existsSync10(tree)) {
     creates.push(`${RECORDS_PATH5}/`);
   }
-  if (readIfPresent(join10(root, ...STATE_GITIGNORE_PATH2.split("/"))) !== renderStateGitignore2(config)) {
+  if (readIfPresent(join11(root, ...STATE_GITIGNORE_PATH2.split("/"))) !== renderStateGitignore2(config)) {
     creates.push(STATE_GITIGNORE_PATH2);
   }
   return {
@@ -6707,7 +6761,7 @@ function planMigrate(cwd) {
       to: `${RECORDS_PATH5}/${entry}`
     })),
     creates,
-    removes: existsSync10(join10(root, ...OLD_GITIGNORE.split("/"))) ? [OLD_GITIGNORE] : []
+    removes: existsSync10(join11(root, ...OLD_GITIGNORE.split("/"))) ? [OLD_GITIGNORE] : []
   };
 }
 function readIfPresent(file) {
@@ -6737,16 +6791,16 @@ function applyMigrate(plan2) {
   if (plan2.moves.length > 0) {
     mkdirSync5(recordsDir3(plan2.root), { recursive: true });
     for (const move of plan2.moves) {
-      renameSync2(join10(plan2.root, ...move.from.split("/")), join10(plan2.root, ...move.to.split("/")));
+      renameSync2(join11(plan2.root, ...move.from.split("/")), join11(plan2.root, ...move.to.split("/")));
     }
   }
   if (plan2.creates.includes(STATE_GITIGNORE_PATH2)) {
-    const ignore = join10(plan2.root, ...STATE_GITIGNORE_PATH2.split("/"));
+    const ignore = join11(plan2.root, ...STATE_GITIGNORE_PATH2.split("/"));
     mkdirSync5(dirname7(ignore), { recursive: true });
     writeFileSync6(ignore, renderStateGitignore2(config), "utf8");
   }
   for (const removed of plan2.removes) {
-    rmSync2(join10(plan2.root, ...removed.split("/")), { force: true });
+    rmSync2(join11(plan2.root, ...removed.split("/")), { force: true });
   }
   return { ...plan2, status: "migrated" };
 }