@penvhq/launcher 0.13.0 → 0.15.0

package/dist/bin.js

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

package/dist/{chunk-QOQVOYJC.js → chunk-PO6FWAPJ.js}

@@ -72,7 +72,7 @@ function readKey(source, index) {
   const match = /^[A-Za-z_$][A-Za-z0-9_$]*/.exec(source.slice(index));
   return match === null ? void 0 : { key: match[0], end: index + match[0].length };
 }
-function typeSlotIn(source, open, close) {
+function providerSlotIn(source, open, close) {
   let i = skipTrivia(source, open + 1);
   while (i < close - 1) {
     const key = readKey(source, i);
@@ -88,7 +88,7 @@ function typeSlotIn(source, open, close) {
     let valueEnd;
     if (QUOTES.has(ch)) {
       valueEnd = skipString(source, valueStart);
-      if (key.key === "type" && ch !== "`") {
+      if (key.key === "provider" && ch !== "`") {
         return {
           start: valueStart,
           end: valueEnd,
@@ -111,8 +111,33 @@ function typeSlotIn(source, open, close) {
   }
   return void 0;
 }
-function scan(source) {
-  const found = /(?:^|[\s{,;])providers\s*:\s*\{/.exec(source);
+function blankComments(source) {
+  let out = "";
+  let i = 0;
+  while (i < source.length) {
+    const ch = source.charAt(i);
+    if (QUOTES.has(ch)) {
+      const end = skipString(source, i);
+      out += source.slice(i, end);
+      i = end;
+      continue;
+    }
+    if (ch === "/" && (source.charAt(i + 1) === "/" || source.charAt(i + 1) === "*")) {
+      const line = source.charAt(i + 1) === "/";
+      const found = line ? source.indexOf("\n", i) : source.indexOf("*/", i + 2);
+      const end = found === -1 ? source.length : line ? found : found + 2;
+      out += source.slice(i, end).replace(/[^\n]/g, " ");
+      i = end;
+      continue;
+    }
+    out += ch;
+    i += 1;
+  }
+  return out;
+}
+function scan(raw) {
+  const source = blankComments(raw);
+  const found = /(?:^|[\s{,;])environments\s*:\s*\{/.exec(source);
   if (found === null) {
     return void 0;
   }
@@ -133,31 +158,42 @@ function scan(source) {
       return void 0;
     }
     const entryOpen = skipTrivia(source, colon + 1);
-    if (source.charAt(entryOpen) !== "{") {
-      return void 0;
-    }
-    const entryClose = matchBrace(source, entryOpen);
-    if (entryClose === -1) {
+    const ch = source.charAt(entryOpen);
+    let entryEnd;
+    let slot;
+    if (ch === "{") {
+      entryEnd = matchBrace(source, entryOpen);
+      if (entryEnd === -1) {
+        return void 0;
+      }
+      slot = providerSlotIn(source, entryOpen, entryEnd);
+    } else if (QUOTES.has(ch)) {
+      entryEnd = skipString(source, entryOpen);
+      slot = ch === "`" ? void 0 : {
+        start: entryOpen,
+        end: entryEnd,
+        value: source.slice(entryOpen + 1, entryEnd - 1)
+      };
+    } else {
       return void 0;
     }
-    const slot = typeSlotIn(source, entryOpen, entryClose);
-    entries.push({ environment: key.key, type: slot?.value, slot });
-    i = skipTrivia(source, entryClose);
+    entries.push({ environment: key.key, provider: slot?.value, slot });
+    i = skipTrivia(source, entryEnd);
     if (source.charAt(i) === ",") {
       i = skipTrivia(source, i + 1);
     }
   }
   return entries;
 }
-function readProviderEntries(source) {
-  return scan(source)?.map(({ environment, type }) => ({ environment, type }));
+function readEnvironmentProviders(source) {
+  return scan(source)?.map(({ environment, provider }) => ({ environment, provider }));
 }
-function setProviderType(source, environment, type) {
+function setEnvironmentProvider(source, environment, provider) {
   const entry = scan(source)?.find((candidate) => candidate.environment === environment);
   if (entry?.slot === void 0) {
     return void 0;
   }
-  return `${source.slice(0, entry.slot.start)}${JSON.stringify(type)}${source.slice(entry.slot.end)}`;
+  return `${source.slice(0, entry.slot.start)}${JSON.stringify(provider)}${source.slice(entry.slot.end)}`;
 }
 
 // src/errors.ts
@@ -167,7 +203,8 @@ import {
   LOCAL_EXTENSIONS_PATH,
   MANIFEST_PATH,
   OFFICIAL_SCOPE,
-  PenvError
+  PenvError,
+  RESERVED_ENTRY_FIELDS
 } from "@penvhq/core";
 var INSTALL_COMMAND = "penv install";
 var UPGRADE_COMMAND = "penv upgrade";
@@ -483,6 +520,26 @@ var DeclarationNotSelfContainedError = class extends PenvError {
     );
   }
 };
+var DeclarationReservedFieldError = class extends PenvError {
+  name = "DeclarationReservedFieldError";
+  constructor(name, file, field2) {
+    super(
+      "PENV_DECLARATION_RESERVED_FIELD",
+      `The declaration ${name} ships at \`${file}\` declares \`${field2}\`, which penv owns on every environment entry`,
+      `Report it to ${name}. penv reserves ${RESERVED_ENTRY_FIELDS.map((reserved) => `\`${reserved}\``).join(", ")} inside an \`environments\` entry, so a provider names its own fields in its own vocabulary \u2014 \`project\`, \`path\` \u2014 and leaves those four to penv.`
+    );
+  }
+};
+var DeclarationShapeUnreadableError = class extends PenvError {
+  name = "DeclarationShapeUnreadableError";
+  constructor(name, file, member) {
+    super(
+      "PENV_DECLARATION_SHAPE_UNREADABLE",
+      member === void 0 ? `The declaration ${name} ships at \`${file}\` has a \`ProviderConfigMap\` member penv cannot read` : `The declaration ${name} ships at \`${file}\` writes \`${member}\` as something other than an entry shape`,
+      `Report it to ${name}. Each \`ProviderConfigMap\` member is written as its own object literal \u2014 \`"@acme/provider-x": { readonly path: string }\` \u2014 so penv can check it names none of ${RESERVED_ENTRY_FIELDS.map((reserved) => `\`${reserved}\``).join(", ")}, which it owns on every environment entry.`
+    );
+  }
+};
 var EnginePinUnreleasedError = class extends PenvError {
   name = "EnginePinUnreleasedError";
   constructor() {
@@ -577,7 +634,7 @@ var EngineEntryError = class extends PenvError {
 // src/declaration.ts
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join, resolve, sep } from "path";
-import { EXTENSIONS_PATH as EXTENSIONS_PATH2 } from "@penvhq/core";
+import { EXTENSIONS_PATH as EXTENSIONS_PATH2, RESERVED_ENTRY_FIELDS as RESERVED_ENTRY_FIELDS2 } from "@penvhq/core";
 var AUGMENTATION_TARGET = "@penvhq/core";
 var MODULE_SPECIFIER = /(?:\bfrom|\bmodule|\bimport|\brequire)\s*\(?\s*(["'])([^"']*)\1/g;
 function field(source, key) {
@@ -616,7 +673,7 @@ function openShape(name) {
 
 declare module "${AUGMENTATION_TARGET}" {
   interface ProviderConfigMap {
-    ${JSON.stringify(name)}: ProviderConfig & { readonly type: ${JSON.stringify(name)} };
+    ${JSON.stringify(name)}: ProviderConfig & { readonly provider: ${JSON.stringify(name)} };
   }
 }
 `;
@@ -634,12 +691,166 @@ function assertSelfContained(name, file, source) {
     }
   }
 }
+function endOfString(source, index) {
+  const quote = source.charAt(index);
+  let i = index + 1;
+  while (i < source.length) {
+    const ch = source.charAt(i);
+    if (ch === "\\") {
+      i += 2;
+      continue;
+    }
+    if (ch === quote) {
+      return i + 1;
+    }
+    i += 1;
+  }
+  return source.length;
+}
+function withoutComments(source) {
+  let out = "";
+  let i = 0;
+  while (i < source.length) {
+    const ch = source.charAt(i);
+    if (ch === '"' || ch === "'" || ch === "`") {
+      const end = endOfString(source, i);
+      out += source.slice(i, end);
+      i = end;
+      continue;
+    }
+    if (ch === "/" && (source.charAt(i + 1) === "/" || source.charAt(i + 1) === "*")) {
+      const line = source.charAt(i + 1) === "/";
+      const end = line ? source.indexOf("\n", i) : source.indexOf("*/", i + 2);
+      i = end === -1 ? source.length : line ? end : end + 2;
+      out += " ";
+      continue;
+    }
+    out += ch;
+    i += 1;
+  }
+  return out;
+}
+var RESERVED_FIELDS = [...RESERVED_ENTRY_FIELDS2].sort((a, b) => b.length - a.length);
+var RESERVED_MEMBER = new RegExp(
+  `(?:^|[\\s;{,])(?:readonly\\s+)?(["']?)(${RESERVED_FIELDS.join("|")})\\1\\s*\\??\\s*:`
+);
+function endOfBrace(code, open) {
+  let depth = 0;
+  let i = open;
+  while (i < code.length) {
+    const ch = code.charAt(i);
+    if (ch === '"' || ch === "'" || ch === "`") {
+      i = endOfString(code, i);
+      continue;
+    }
+    if (ch === "{" || ch === "[" || ch === "(") {
+      depth += 1;
+    } else if (ch === "}" || ch === "]" || ch === ")") {
+      depth -= 1;
+      if (depth === 0) {
+        return i + 1;
+      }
+    }
+    i += 1;
+  }
+  return -1;
+}
+function ownMembers(body) {
+  let members = "";
+  let depth = 0;
+  let i = 0;
+  while (i < body.length) {
+    const ch = body.charAt(i);
+    if (ch === '"' || ch === "'" || ch === "`") {
+      const end = endOfString(body, i);
+      if (depth === 0) {
+        members += body.slice(i, end);
+      }
+      i = end;
+      continue;
+    }
+    if (ch === "{" || ch === "[" || ch === "(") {
+      depth += 1;
+    } else if (ch === "}" || ch === "]" || ch === ")") {
+      depth -= 1;
+    } else if (depth === 0) {
+      members += ch;
+      i += 1;
+      continue;
+    }
+    if (depth <= 1) {
+      members += " ";
+    }
+    i += 1;
+  }
+  return members;
+}
+var MEMBER_NAME = /^(?:readonly\s+)?(?:(["'])([^"']*)\1|([A-Za-z_$][\w$]*))\s*\??\s*:/;
+function mapMembers(source) {
+  const code = withoutComments(source);
+  const map = /interface\s+ProviderConfigMap\s*\{/.exec(code);
+  if (map === null) {
+    return [];
+  }
+  const open = map.index + map[0].length - 1;
+  const close = endOfBrace(code, open);
+  if (close === -1) {
+    return { unreadable: void 0 };
+  }
+  const members = [];
+  let i = open + 1;
+  for (; ; ) {
+    while (/\s|;|,/.test(code.charAt(i))) {
+      i += 1;
+    }
+    if (i >= close - 1) {
+      return members;
+    }
+    const name = MEMBER_NAME.exec(code.slice(i, close - 1));
+    if (name === null) {
+      return { unreadable: void 0 };
+    }
+    let value = i + name[0].length;
+    while (/\s/.test(code.charAt(value))) {
+      value += 1;
+    }
+    const declared = name[2] ?? name[3] ?? "";
+    if (code.charAt(value) !== "{") {
+      return { unreadable: declared };
+    }
+    const end = endOfBrace(code, value);
+    if (end === -1) {
+      return { unreadable: declared };
+    }
+    members.push({ name: declared, body: code.slice(value + 1, end - 1) });
+    i = end;
+    while (/\s/.test(code.charAt(i))) {
+      i += 1;
+    }
+    if (i < close - 1 && code.charAt(i) !== ";" && code.charAt(i) !== ",") {
+      return { unreadable: declared };
+    }
+  }
+}
+function assertEntryShapesAreReadable(name, file, source) {
+  const members = mapMembers(source);
+  if (!Array.isArray(members)) {
+    throw new DeclarationShapeUnreadableError(name, file, members.unreadable);
+  }
+  for (const member of members) {
+    const field2 = RESERVED_MEMBER.exec(ownMembers(member.body))?.[2];
+    if (field2 !== void 0) {
+      throw new DeclarationReservedFieldError(name, file, field2);
+    }
+  }
+}
 function renderDeclaration(subject, shipped) {
   if (shipped === void 0) {
     return `${header(subject)}
 ${openShape(subject.name)}`;
   }
   assertSelfContained(subject.name, shipped.file, shipped.source);
+  assertEntryShapesAreReadable(subject.name, shipped.file, shipped.source);
   const body = shipped.source.replace(/^/, "").trimEnd();
   return `${header(subject)}
 ${body}
@@ -1160,30 +1371,33 @@ function chooseEnvironments(answer, offered) {
 function quoted(environments) {
   return environments.map((environment) => `\`${environment}\``).join(", ");
 }
+function blindAdvice(name) {
+  const spec = JSON.stringify(name);
+  return `Point an environment at ${name} in penv.config.ts: \`production: ${spec}\`, or \`production: { provider: ${spec} }\` plus the provider's own fields and a \`keySource\`.`;
+}
 function configAdvice(name, pointing, unpointed) {
-  const add2 = `Add \`type: ${JSON.stringify(name)}\``;
   if (pointing.length === 0) {
-    return `${add2} to an environment in penv.config.ts.`;
+    return blindAdvice(name);
   }
-  return `${quoted(pointing)} already ${pointing.length === 1 ? "points" : "point"} at ${name}. ${add2} to ${quoted(unpointed)} in penv.config.ts if ${unpointed.length === 1 ? "it" : "they"} should too.`;
+  return `${quoted(pointing)} already ${pointing.length === 1 ? "points" : "point"} at ${name}. Point ${quoted(unpointed)} at it in penv.config.ts if ${unpointed.length === 1 ? "it" : "they"} should too.`;
 }
 async function offerConfigEdit(options, name, ask) {
   const { io, root } = options;
   const configFile = findConfigFile(root);
-  const blind = `Add \`type: ${JSON.stringify(name)}\` to an environment in penv.config.ts.`;
+  const blind = blindAdvice(name);
   if (configFile === void 0) {
     io.out(blind);
     return;
   }
   const shown = relative(root, configFile).split(sep2).join("/");
   let current = readFileSync4(configFile, "utf8");
-  const entries = readProviderEntries(current);
+  const entries = readEnvironmentProviders(current);
   if (entries === void 0 || entries.length === 0) {
     io.out(blind);
     return;
   }
-  const pointing = entries.filter((entry) => entry.type === name).map((entry) => entry.environment);
-  const offered = entries.filter((entry) => entry.type !== name).map((entry) => entry.environment);
+  const pointing = entries.filter((entry) => entry.provider === name).map((entry) => entry.environment);
+  const offered = entries.filter((entry) => entry.provider !== name).map((entry) => entry.environment);
   if (offered.length === 0) {
     return;
   }
@@ -1202,9 +1416,9 @@ async function offerConfigEdit(options, name, ask) {
     return;
   }
   for (const environment of chosen) {
-    const next = setProviderType(current, environment, name);
+    const next = setEnvironmentProvider(current, environment, name);
     if (next === void 0) {
-      io.out(`Add \`type: ${JSON.stringify(name)}\` to \`${environment}\` in ${shown}.`);
+      io.out(`Add \`provider: ${JSON.stringify(name)}\` to \`${environment}\` in ${shown}.`);
       continue;
     }
     current = next;
@@ -1482,8 +1696,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.13.0",
-  integrity: "sha512-gZ2AlzxmQ4c83OvWSRrBdVMAQdwcGqAoENSv4ZNyZuer0fpIEqiT/xUl2b1+t5JSW8EZto5JpilmBSfiNoWFWA=="
+  version: "0.15.0",
+  integrity: "sha512-+ZW8AwYu+pTDabbr1P8BSQ93bjrT5yELTT1N445ZMOUI1WxxAxK3fSvzEiHRjFvYuJNXuB3MwjHzsYopx0KTYg=="
 };
 function assertReleasePin(pin) {
   if (pin.integrity === DEV_PIN_INTEGRITY || pin.version === DEV_PIN_VERSION) {
@@ -1527,9 +1741,9 @@ function findAdoptedRoot(cwd) {
 // src/upgrade.ts
 import { writeFileSync as writeFileSync4 } from "fs";
 import {
+  installedByManifest,
   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";
@@ -1618,11 +1832,8 @@ async function upgrade(options) {
     } catch {
       throw new UpgradeInstallFailedError(plan.manager, release.version);
     }
-    const moved = plan.steps.filter(
-      (entry) => !entry.satisfied && entry.packages.some((one) => one.name === RUNTIME_PACKAGE)
-    );
-    for (const step of moved) {
-      io.out(`\u2713 ${step.manifest} depends on ${RUNTIME_PACKAGE} ${release.version}`);
+    for (const landed of installedByManifest(plan)) {
+      io.out(`\u2713 ${landed.manifest} depends on ${landed.packages}`);
     }
   }
   writeFileSync4(manifestFile, manifestText);
@@ -1650,7 +1861,7 @@ import {
 } from "@penvhq/core";
 
 // src/help.ts
-import { RUNTIME_PACKAGE as RUNTIME_PACKAGE2 } from "@penvhq/cli/install";
+import { RUNTIME_PACKAGE } from "@penvhq/cli/install";
 import { ENGINE_PACKAGE as ENGINE_PACKAGE5, EXTENSIONS_PATH as EXTENSIONS_PATH3, MANIFEST_PATH as MANIFEST_PATH5, OFFICIAL_SCOPE as OFFICIAL_SCOPE3 } from "@penvhq/core";
 function printLauncherCommands(io) {
   io.out("");
@@ -1659,7 +1870,7 @@ function printLauncherCommands(io) {
   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(`  upgrade [version]      Moves the engine pin and ${RUNTIME_PACKAGE} together`);
   io.out("");
 }
 function printInstallHelp(io) {
@@ -1693,7 +1904,7 @@ function printUpgradeHelp(io) {
   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(`${RUNTIME_PACKAGE} 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.");
@@ -1969,8 +2180,8 @@ async function delegate(options, engine, forwarded, home, cwd) {
 }
 
 export {
-  readProviderEntries,
-  setProviderType,
+  readEnvironmentProviders,
+  setEnvironmentProvider,
   INSTALL_COMMAND,
   UPGRADE_COMMAND,
   YES_FLAG,
@@ -2006,6 +2217,7 @@ export {
   TrustReasonMissingError,
   DeclarationMissingError,
   DeclarationNotSelfContainedError,
+  DeclarationReservedFieldError,
   EnginePinUnreleasedError,
   EnginePinMismatchError,
   UpgradeSubjectError,
@@ -2047,4 +2259,4 @@ export {
   upgrade,
   runLauncher
 };
-//# sourceMappingURL=chunk-QOQVOYJC.js.map
+//# sourceMappingURL=chunk-PO6FWAPJ.js.map