@penvhq/cli 0.12.0 → 0.14.0

package/dist/bin.cjs

@@ -50926,6 +50926,7 @@ function escapeArgument(argument, doubleEscape) {
 // src/install.ts
 var RUNTIME_PACKAGE = "@penvhq/penv";
 var SCHEMA_PACKAGE = "zod";
+var TYPES_PACKAGE = "@penvhq/core";
 var LOCKFILES = [
   ["pnpm", "pnpm-lock.yaml"],
   ["yarn", "yarn.lock"],
@@ -51028,6 +51029,10 @@ function declaredIn(dir, name) {
   }
   return void 0;
 }
+function blockPresentIn(dir, dev) {
+  const block = manifestOf(dir)?.[dev ? "devDependencies" : "dependencies"];
+  return block !== null && typeof block === "object" && !Array.isArray(block);
+}
 function isPnpmWorkspaceRoot(root) {
   return (0, import_node_fs2.existsSync)((0, import_node_path2.join)(root, PNPM_WORKSPACE)) && (0, import_node_fs2.existsSync)((0, import_node_path2.join)(root, "package.json"));
 }
@@ -51151,6 +51156,8 @@ function stepFor(manager, manifest, packages, options) {
     manifest,
     packages,
     command: addCommand(manager, options, specs),
+    dev: options.dev,
+    blockPresent: blockPresentIn(options.dir, options.dev),
     satisfied: pending.length === 0
   };
 }
@@ -51162,6 +51169,7 @@ function planInstall(root, version2 = engineVersion()) {
   const workspaceRoot = manager === "pnpm" && isPnpmWorkspaceRoot(root);
   const runtime = declaredIn(root, RUNTIME_PACKAGE);
   const zod = declaredIn(root, SCHEMA_PACKAGE);
+  const types = declaredIn(root, TYPES_PACKAGE);
   const packages = [
     {
       name: RUNTIME_PACKAGE,
@@ -51178,34 +51186,47 @@ function planInstall(root, version2 = engineVersion()) {
       satisfied: zod !== void 0
     }
   ];
+  const typesPackage = {
+    name: TYPES_PACKAGE,
+    version: version2,
+    ...types === void 0 ? {} : { declared: types.version },
+    // Any declared version counts, for zod's reason: the augmentation binds on
+    // the module resolving, not on which release of it a project pinned.
+    satisfied: types !== void 0
+  };
   const pending = packages.filter((entry) => !entry.satisfied);
   const steps = [
     stepFor(manager, "package.json", packages, {
       workspaceRoot,
+      dir: root,
       dev: runtime?.dev === true && pending.every((entry) => entry.name === RUNTIME_PACKAGE) && pending.length > 0
-    })
+    }),
+    stepFor(manager, "package.json", [typesPackage], { workspaceRoot, dir: root, dev: true })
   ];
-  for (const dir of workspaceMembers(root, RUNTIME_PACKAGE)) {
-    const declared = declaredIn(dir, RUNTIME_PACKAGE);
-    steps.push(
-      stepFor(
-        manager,
-        manifestPathOf(root, dir),
-        [
+  for (const name of [RUNTIME_PACKAGE, TYPES_PACKAGE]) {
+    for (const dir of workspaceMembers(root, name)) {
+      const declared = declaredIn(dir, name);
+      steps.push(
+        stepFor(
+          manager,
+          manifestPathOf(root, dir),
+          [
+            {
+              name,
+              version: version2,
+              declared: declared.version,
+              satisfied: declared.version === version2
+            }
+          ],
           {
-            name: RUNTIME_PACKAGE,
-            version: version2,
-            declared: declared.version,
-            satisfied: declared.version === version2
+            filter: `./${(0, import_node_path2.relative)(root, dir).split(import_node_path2.sep).join("/")}`,
+            workspaceRoot: false,
+            dir,
+            dev: declared.dev
           }
-        ],
-        {
-          filter: `./${(0, import_node_path2.relative)(root, dir).split(import_node_path2.sep).join("/")}`,
-          workspaceRoot: false,
-          dev: declared.dev
-        }
-      )
-    );
+        )
+      );
+    }
   }
   return {
     root,
@@ -51222,16 +51243,25 @@ function installedPackages(plan2) {
   const pending = plan2.steps.flatMap((step) => step.packages).filter((entry) => !entry.satisfied);
   return [...new Map(pending.map((entry) => [entry.name, entry])).values()];
 }
+function plannedPackages(plan2) {
+  const all = plan2.steps.flatMap((step) => step.packages);
+  return [...new Map(all.map((entry) => [entry.name, entry])).values()];
+}
+function series(values) {
+  return values.length < 2 ? values[0] ?? "" : `${values.slice(0, -1).join(", ")} and ${values.at(-1)}`;
+}
 function renderStep(step) {
   const pending = step.packages.filter((entry) => !entry.satisfied);
   const added = pending.filter((entry) => entry.declared === void 0);
   const replaced = pending.filter((entry) => entry.declared !== void 0);
+  const block = step.dev ? "devDependencies" : "dependencies";
+  const edge = step.blockPresent ? "   " : "  +";
   return [
     step.manifest,
     ...added.length === 0 ? [] : [
-      '  + "dependencies": {',
+      `${edge} "${block}": {`,
       ...added.map((entry) => `  +   "${entry.name}": "${entry.version}"`),
-      "  + }"
+      `${edge} }`
     ],
     ...replaced.flatMap((entry) => [
       `  - "${entry.name}": "${entry.declared}"`,
@@ -51241,9 +51271,8 @@ function renderStep(step) {
 }
 function renderInstallPlan(plan2) {
   if (plan2.satisfied) {
-    const packages = plan2.steps[0]?.packages ?? [];
     return [
-      `package.json already has ${packages.map(describe4).join(" and ")} \u2014 nothing to install.`
+      `package.json already has ${series(plannedPackages(plan2).map(describe4))} \u2014 nothing to install.`
     ];
   }
   const pending = plan2.steps.filter((step) => !step.satisfied);