@jskit-ai/jskit-cli 0.2.77 → 0.2.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/jskit-cli",
-  "version": "0.2.77",
+  "version": "0.2.79",
   "description": "Bundle and package orchestration CLI for JSKIT apps.",
   "type": "module",
   "files": [
@@ -20,12 +20,12 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@jskit-ai/jskit-catalog": "0.1.76",
-    "@jskit-ai/kernel": "0.1.68",
-    "@jskit-ai/shell-web": "0.1.67"
+    "@jskit-ai/jskit-catalog": "0.1.78",
+    "@jskit-ai/kernel": "0.1.70",
+    "@jskit-ai/shell-web": "0.1.69"
   },
   "engines": {
-    "node": "20.x"
+    "node": ">=20 <23"
   },
   "publishConfig": {
     "access": "public"

package/src/server/cliRuntime/mutationWhen.js

@@ -52,6 +52,21 @@ function normalizeFileMutationRecord(value) {
   };
 }
 
+function normalizeDependencyMutationRecord(value) {
+  const record = ensureObject(value);
+  if (Object.keys(record).length < 1) {
+    return {
+      version: String(value || ""),
+      when: null
+    };
+  }
+
+  return {
+    version: String(record.version || record.value || "").trim(),
+    when: normalizeMutationWhen(record.when)
+  };
+}
+
 function normalizeMutationWhen(value) {
   const source = ensureObject(value);
   const allConditions = ensureArray(source.all)
@@ -304,6 +319,7 @@ function shouldApplyMutationWhen(
 export {
   normalizeMutationExtension,
   normalizeTemplateContextRecord,
+  normalizeDependencyMutationRecord,
   normalizeFileMutationRecord,
   normalizeMutationWhen,
   readObjectPath,

package/src/server/cliRuntime/packageInstallFlow.js

@@ -8,7 +8,9 @@ import {
   interpolateOptionValue
 } from "../shared/optionInterpolation.js";
 import {
-  normalizeFileMutationRecord
+  normalizeDependencyMutationRecord,
+  normalizeFileMutationRecord,
+  shouldApplyMutationWhen
 } from "./mutationWhen.js";
 import {
   applyViteMutations,
@@ -141,6 +143,13 @@ function resolveManagedSourceRecord(packageEntry, existingInstall = {}) {
   return sourceRecord;
 }
 
+function dependencyMutationUsesWhen(entries = []) {
+  return entries.some(([, rawDependencySpec]) => {
+    const dependencySpec = normalizeDependencyMutationRecord(rawDependencySpec);
+    return Boolean(dependencySpec.when);
+  });
+}
+
 async function applyPackagePositioning({
   packageEntry,
   packageOptions,
@@ -413,9 +422,28 @@ async function applyPackageInstall({
   const mutationDependencies = ensureObject(mutations.dependencies);
   const runtimeDependencies = ensureObject(mutationDependencies.runtime);
   const devDependencies = ensureObject(mutationDependencies.dev);
+  const runtimeDependencyEntries = Object.entries(runtimeDependencies);
+  const devDependencyEntries = Object.entries(devDependencies);
+  const needsDependencyWhenConfig = dependencyMutationUsesWhen([
+    ...runtimeDependencyEntries,
+    ...devDependencyEntries
+  ]);
+  const dependencyWhenConfigContext = needsDependencyWhenConfig
+    ? await loadMutationWhenConfigContext(appRoot)
+    : {};
   const mutationScripts = ensureObject(ensureObject(mutations.packageJson).scripts);
 
-  for (const [rawDependencyId, rawDependencyVersion] of Object.entries(runtimeDependencies)) {
+  for (const [rawDependencyId, rawDependencySpec] of runtimeDependencyEntries) {
+    const dependencySpec = normalizeDependencyMutationRecord(rawDependencySpec);
+    if (!shouldApplyMutationWhen(dependencySpec.when, {
+      options: packageOptions,
+      configContext: dependencyWhenConfigContext,
+      packageId: packageEntry.packageId,
+      mutationContext: `dependencies.runtime.${rawDependencyId}`
+    })) {
+      continue;
+    }
+
     const dependencyId = interpolateOptionValue(
       rawDependencyId,
       packageOptions,
@@ -423,7 +451,7 @@ async function applyPackageInstall({
       `dependencies.runtime.${rawDependencyId}.id`
     );
     const dependencyVersion = interpolateOptionValue(
-      String(rawDependencyVersion || ""),
+      dependencySpec.version,
       packageOptions,
       packageEntry.packageId,
       `dependencies.runtime.${rawDependencyId}.value`
@@ -447,7 +475,17 @@ async function applyPackageInstall({
     }
   }
 
-  for (const [rawDependencyId, rawDependencyVersion] of Object.entries(devDependencies)) {
+  for (const [rawDependencyId, rawDependencySpec] of devDependencyEntries) {
+    const dependencySpec = normalizeDependencyMutationRecord(rawDependencySpec);
+    if (!shouldApplyMutationWhen(dependencySpec.when, {
+      options: packageOptions,
+      configContext: dependencyWhenConfigContext,
+      packageId: packageEntry.packageId,
+      mutationContext: `dependencies.dev.${rawDependencyId}`
+    })) {
+      continue;
+    }
+
     const dependencyId = interpolateOptionValue(
       rawDependencyId,
       packageOptions,
@@ -455,7 +493,7 @@ async function applyPackageInstall({
       `dependencies.dev.${rawDependencyId}.id`
     );
     const dependencyVersion = interpolateOptionValue(
-      String(rawDependencyVersion || ""),
+      dependencySpec.version,
       packageOptions,
       packageEntry.packageId,
       `dependencies.dev.${rawDependencyId}.value`

package/src/server/commandHandlers/show/renderPackageText.js

@@ -2,6 +2,9 @@ import {
   ensureArray,
   ensureObject
 } from "../../shared/collectionUtils.js";
+import {
+  normalizeDependencyMutationRecord
+} from "../../cliRuntime/mutationWhen.js";
 import { createShowRenderHelpers } from "./renderHelpers.js";
 import { writePackageExportsSection } from "./renderPackageExports.js";
 import { writeCapabilitiesSections } from "./renderPackageCapabilities.js";
@@ -35,6 +38,12 @@ function resolveOwnershipGuidance(payload = {}) {
   return ensureObject(ensureObject(ensureObject(payload.metadata).jskit).ownershipGuidance);
 }
 
+function renderDependencyMutationSpec(versionSpec) {
+  const dependencySpec = normalizeDependencyMutationRecord(versionSpec);
+  const whenSuffix = dependencySpec.when ? ` when ${JSON.stringify(dependencySpec.when)}` : "";
+  return `${dependencySpec.version}${whenSuffix}`.trim();
+}
+
 function renderPackagePayloadText({
   payload,
   provides,
@@ -255,7 +264,7 @@ function renderPackagePayloadText({
       wrapWidth,
       items: runtimeMutationEntries.map(([dependencyId, versionSpec]) => {
         const dependencyText = String(dependencyId);
-        const versionText = String(versionSpec);
+        const versionText = renderDependencyMutationSpec(versionSpec);
         return {
           text: `${dependencyText} ${versionText}`,
           rendered: `${color.item(dependencyText)} ${color.installed(versionText)}`
@@ -325,7 +334,7 @@ function renderPackagePayloadText({
       wrapWidth,
       items: devMutationEntries.map(([dependencyId, versionSpec]) => {
         const dependencyText = String(dependencyId);
-        const versionText = String(versionSpec);
+        const versionText = renderDependencyMutationSpec(versionSpec);
         return {
           text: `${dependencyText} ${versionText}`,
           rendered: `${color.item(dependencyText)} ${color.installed(versionText)}`