@penvhq/cli 0.6.0 → 0.7.0

package/dist/index.d.cts

@@ -310,6 +310,8 @@ interface InitOptions {
     readonly cwd: string;
     /** What to write. Omitted means the plan's defaults, as `--yes` takes them. */
     readonly decisions?: InitDecisions;
+    /** The detected framework name, passed by the command so the seam step need not re-detect it. */
+    readonly framework?: string;
 }
 interface AliasEdit {
     readonly source: string;

package/dist/index.d.ts

@@ -310,6 +310,8 @@ interface InitOptions {
     readonly cwd: string;
     /** What to write. Omitted means the plan's defaults, as `--yes` takes them. */
     readonly decisions?: InitDecisions;
+    /** The detected framework name, passed by the command so the seam step need not re-detect it. */
+    readonly framework?: string;
 }
 interface AliasEdit {
     readonly source: string;

package/dist/index.js

@@ -2833,7 +2833,7 @@ function occupied(cwd, relative3) {
   return existsSync(file) && !exportsSchema(file);
 }
 function schemaFileFor(cwd) {
-  const dir = existsSync(join(cwd, "src")) ? "src/" : "";
+  const dir = srcPrefix(cwd);
   const preferred = `${dir}env.ts`;
   if (!occupied(cwd, preferred)) {
     return { file: preferred };
@@ -2844,6 +2844,9 @@ function schemaFileFor(cwd) {
   }
   return { file: DEFAULT_SCHEMA_FILE, displaced: preferred };
 }
+function srcPrefix(cwd) {
+  return existsSync(join(cwd, "src")) ? "src/" : "";
+}
 function dependenciesOf(cwd) {
   const manifest = manifestOf(cwd);
   if (manifest === void 0) {
@@ -2990,19 +2993,25 @@ function bun({ alias }) {
     kind: "scaffold",
     file: ".penv/preload.ts",
     content: `// Bun evaluates this file before your entry point, because it is listed under
-// \`preload\` in bunfig.toml (see the note penv printed). Running it injects your
-// config into process.env before any library reads it.
+// \`preload\` in bunfig.toml. Running it injects your config into process.env
+// before any library reads it.
 import "${alias}";
 `,
     ifPresent: `Keep .penv/preload.ts as \`import "${alias}";\`.`,
-    notes: [
-      'Register it in bunfig.toml so Bun runs it: `preload = ["./.penv/preload.ts"]` (and the same under `[test]`).',
-      `\`${alias}\` must be a tsconfig \`paths\` alias for Bun to resolve it.`
-    ]
+    notes: [`\`${alias}\` must be a tsconfig \`paths\` alias for Bun to resolve it.`],
+    // The preload file is inert until bunfig.toml points at it — so penv writes
+    // that too, both for the runtime and for `bun test`. Only when there is no
+    // bunfig to overwrite; an existing one is the user's, and penv prints instead.
+    also: {
+      file: "bunfig.toml",
+      content: 'preload = ["./.penv/preload.ts"]\n\n[test]\npreload = ["./.penv/preload.ts"]\n',
+      ifPresent: 'Add "./.penv/preload.ts" to the `preload` array in bunfig.toml \u2014 and mirror it under `[test]` so `bun test` injects too.'
+    }
   };
 }
-function node({ alias, srcDir }) {
-  const runtimeSpecifier = alias.startsWith("#") ? alias : `./${srcDir}.penv/env.js`;
+function node({ alias, schemaFile }) {
+  const builtSchema = `./${schemaFile.replace(/\.ts$/, ".js")}`;
+  const runtimeSpecifier = alias.startsWith("#") ? alias : builtSchema;
   return {
     kind: "instruct",
     instruction: `Plain Node / Express / Fastify have no framework hook that runs before your
@@ -3022,10 +3031,17 @@ import before it. If you have no server.ts yet, create it from TanStack's server
 template and put that import first.`
   };
 }
-function astro(_context) {
+function astro({ alias }) {
   return {
     kind: "instruct",
-    instruction: 'Astro has no single pre-app hook. Add a small integration to astro.config that\ninjects the import into every SSR page, then cover the routes it cannot reach:\n  \u2022 In astro.config integrations, add:\n      { name: "penv", hooks: { "astro:config:setup": ({ injectScript }) =>\n          injectScript("page-ssr", \'import "@env";\') } }\n  \u2022 Also add `import "@env";` as the first line of src/middleware.ts and of any\n    endpoint route (src/pages/*.ts) that imports a library reading process.env.\nInjection only applies under a server (on-demand) adapter, not a static build.'
+    instruction: `Astro has no single pre-app hook. Add a small integration to astro.config that
+injects the import into every SSR page, then cover the routes it cannot reach:
+  \u2022 In astro.config integrations, add:
+      { name: "penv", hooks: { "astro:config:setup": ({ injectScript }) =>
+          injectScript("page-ssr", 'import "${alias}";') } }
+  \u2022 Also add \`import "${alias}";\` as the first line of src/middleware.ts and of any
+    endpoint route (src/pages/*.ts) that imports a library reading process.env.
+Injection only applies under a server (on-demand) adapter, not a static build.`
   };
 }
 function viteSpa(_context) {
@@ -3226,17 +3242,18 @@ async function promptForDecisions(plan2, io) {
     );
     io.write("");
   }
-  const inject = seamKindFor(plan2) === "none" ? false : await askInject(io);
   const proceed = (await io.ask(prompt("Proceed?", "Y/n"))).trim().toLowerCase();
   if (proceed.length > 0 && proceed !== "y" && proceed !== "yes") {
     return void 0;
   }
+  const inject = seamKindFor(plan2) === "none" ? false : await askInject(io);
   return { ...plan2.decisions, environments, inject };
 }
 function seamKindFor(plan2) {
   return seamFor(plan2.detected?.name, {
     alias: plan2.decisions.alias,
-    srcDir: plan2.decisions.schemaFile.startsWith("src/") ? "src/" : ""
+    srcDir: plan2.decisions.schemaFile.startsWith("src/") ? "src/" : "",
+    schemaFile: plan2.decisions.schemaFile
   }).kind;
 }
 async function askInject(io) {
@@ -3631,15 +3648,48 @@ function writeGitignore(root, decisions = DEFAULT_DECISIONS) {
     text: `${existing === void 0 ? "Created" : "Updated"} ${relative3}`
   };
 }
-function srcDirOf(root) {
-  return existsSync2(join2(root, "src")) ? "src/" : "";
+var INJECT_MIN_VERSION = "0.6.0";
+function outdatedRuntimeWarning(root) {
+  const version = installedPenvVersion(root);
+  if (version === void 0 || !isBelow(version, INJECT_MIN_VERSION)) {
+    return void 0;
+  }
+  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 = join2(root, "node_modules", "@penvhq", "penv", "package.json");
+  if (!existsSync2(file)) {
+    return void 0;
+  }
+  try {
+    const version = JSON.parse(readFileSync2(file, "utf8")).version;
+    return typeof version === "string" ? version : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function releaseTriple(version) {
+  const parts = (version.split("-")[0] ?? "").split(".");
+  const at = (i) => Number.parseInt(parts[i] ?? "0", 10) || 0;
+  return [at(0), at(1), at(2)];
+}
+function isBelow(a, b) {
+  const [am, an, ap] = releaseTriple(a);
+  const [bm, bn, bp] = releaseTriple(b);
+  if (am !== bm) return am < bm;
+  if (an !== bn) return an < bn;
+  return ap < bp;
 }
-function writeSeam(root, decisions = DEFAULT_DECISIONS) {
+function writeSeam(root, decisions = DEFAULT_DECISIONS, framework = detectFramework(root)?.name) {
   if (!decisions.inject) {
     return void 0;
   }
-  const framework = detectFramework(root)?.name;
-  const seam = seamFor(framework, { alias: decisions.alias, srcDir: srcDirOf(root) });
+  const seam = seamFor(framework, {
+    alias: decisions.alias,
+    srcDir: srcPrefix(root),
+    schemaFile: decisions.schemaFile
+  });
+  const outdated = outdatedRuntimeWarning(root);
   if (seam.kind === "none") {
     return { target: "seam", action: "info", text: "No injection seam needed", note: seam.reason };
   }
@@ -3648,30 +3698,51 @@ function writeSeam(root, decisions = DEFAULT_DECISIONS) {
       target: "seam",
       action: "info",
       text: "Place the injection seam",
-      note: seam.instruction
+      note: withWarning(seam.instruction, outdated)
     };
   }
+  const alsoNote = writeAlso(root, seam.also);
   const file = join2(root, ...seam.file.split("/"));
-  const notes = seam.notes.length === 0 ? "" : `
-${seam.notes.map((n) => `  ${n}`).join("\n")}`;
+  const baseNotes = [...seam.notes, ...alsoNote === void 0 ? [] : [alsoNote]];
+  const notes = baseNotes.length === 0 ? "" : `
+${baseNotes.map((n) => `  ${n}`).join("\n")}`;
   if (existsSync2(file)) {
     return {
       target: "seam",
       action: "info",
       text: `Add the injection seam to ${seam.file}`,
-      note: `${seam.ifPresent}${notes}`
+      note: withWarning(`${seam.ifPresent}${notes}`, outdated)
     };
   }
   mkdirSync(dirname3(file), { recursive: true });
   writeFileSync2(file, seam.content, "utf8");
   return {
     target: "seam",
-    action: "created",
+    action: outdated === void 0 ? "created" : "info",
     text: `Wrote ${seam.file} (runs the injection before your app)`,
-    ...notes === "" ? {} : { note: notes.trimStart() }
+    ...notes === "" && outdated === void 0 ? {} : { note: withWarning(notes.trimStart(), outdated) }
   };
 }
-function scaffold(root, fields, draft, decisions = DEFAULT_DECISIONS) {
+function writeAlso(root, also) {
+  if (also === void 0) {
+    return void 0;
+  }
+  const file = join2(root, ...also.file.split("/"));
+  if (existsSync2(file)) {
+    return also.ifPresent;
+  }
+  mkdirSync(dirname3(file), { recursive: true });
+  writeFileSync2(file, also.content, "utf8");
+  return `Wrote ${also.file} to register it.`;
+}
+function withWarning(note, warning) {
+  if (warning === void 0) {
+    return note;
+  }
+  return note === "" ? warning : `${note}
+  \u26A0 ${warning}`;
+}
+function scaffold(root, fields, draft, decisions = DEFAULT_DECISIONS, framework = detectFramework(root)?.name) {
   const steps = [
     ensurePenvDir(root),
     writeSchemaFile(root, fields, draft, decisions),
@@ -3679,13 +3750,13 @@ function scaffold(root, fields, draft, decisions = DEFAULT_DECISIONS) {
     writeTsconfigAlias(root, decisions),
     writeGitignore(root, decisions)
   ];
-  const seam = writeSeam(root, decisions);
+  const seam = writeSeam(root, decisions, framework);
   return seam === void 0 ? steps : [...steps, seam];
 }
 function runInit(options) {
   const root = resolve4(options.cwd);
   const decisions = options.decisions ?? planInit(root).decisions;
-  return { root, decisions, steps: scaffold(root, [], false, decisions) };
+  return { root, decisions, steps: scaffold(root, [], false, decisions, options.framework) };
 }
 function renderInit(result2) {
   const steps = result2.steps.map((step) => {
@@ -3752,7 +3823,15 @@ var initCommand = defineCommand9({
       if (!asked) {
         write([...plan2.notes, ""]);
       }
-      write(renderInit(runInit({ cwd: root, decisions })));
+      write(
+        renderInit(
+          runInit({
+            cwd: root,
+            decisions,
+            ...plan2.detected && { framework: plan2.detected.name }
+          })
+        )
+      );
     });
   }
 });