@jskit-ai/jskit-cli 0.2.43 → 0.2.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/jskit-cli",
-  "version": "0.2.43",
+  "version": "0.2.45",
   "description": "Bundle and package orchestration CLI for JSKIT apps.",
   "type": "module",
   "files": [
@@ -20,9 +20,9 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@jskit-ai/jskit-catalog": "0.1.42",
-    "@jskit-ai/kernel": "0.1.34",
-    "@jskit-ai/shell-web": "0.1.33"
+    "@jskit-ai/jskit-catalog": "0.1.44",
+    "@jskit-ai/kernel": "0.1.36",
+    "@jskit-ai/shell-web": "0.1.35"
   },
   "engines": {
     "node": "20.x"

package/src/server/cliRuntime/mutationApplication.js

@@ -5,5 +5,6 @@ export {
 
 export {
   applyTextMutations,
+  partitionPreFileConfigTextMutations,
   resolvePositioningMutations
 } from "./mutations/textMutations.js";

package/src/server/cliRuntime/mutations/textMutations.js

@@ -48,6 +48,10 @@ const SETTINGS_FIELDS_CONTRACT_TARGETS = Object.freeze({
     ])
   })
 });
+const PRE_FILE_CONFIG_MUTATION_TARGETS = new Set([
+  "config/public.js",
+  "config/server.js"
+]);
 
 function resolveSettingsFieldsContractTarget(relativeFile = "") {
   const normalizedRelativeFile = normalizeMutationRelativeFilePath(relativeFile);
@@ -236,6 +240,33 @@ function isPositioningTextMutation(value = {}) {
   return normalizeMutationRelativeFilePath(mutation.file) === "src/placement.js";
 }
 
+function isPreFileConfigTextMutation(value = {}) {
+  const mutation = ensureObject(value);
+  const operation = String(mutation.op || "").trim();
+  if (operation !== "append-text") {
+    return false;
+  }
+  return PRE_FILE_CONFIG_MUTATION_TARGETS.has(normalizeMutationRelativeFilePath(mutation.file));
+}
+
+function partitionPreFileConfigTextMutations(textMutations = []) {
+  const preFileTextMutations = [];
+  const postFileTextMutations = [];
+
+  for (const mutation of ensureArray(textMutations)) {
+    if (isPreFileConfigTextMutation(mutation)) {
+      preFileTextMutations.push(mutation);
+      continue;
+    }
+    postFileTextMutations.push(mutation);
+  }
+
+  return {
+    preFileTextMutations,
+    postFileTextMutations
+  };
+}
+
 function resolvePositioningMutations(descriptorMutations = {}) {
   const mutations = ensureObject(descriptorMutations);
   const files = ensureArray(mutations.files).filter((mutationValue) => {
@@ -251,5 +282,6 @@ function resolvePositioningMutations(descriptorMutations = {}) {
 
 export {
   applyTextMutations,
+  partitionPreFileConfigTextMutations,
   resolvePositioningMutations
 };

package/src/server/cliRuntime/packageInstallFlow.js

@@ -32,6 +32,7 @@ import {
 import {
   applyFileMutations,
   applyTextMutations,
+  partitionPreFileConfigTextMutations,
   prepareFileMutations,
   resolvePositioningMutations
 } from "./mutationApplication.js";
@@ -299,6 +300,19 @@ async function applyPackageInstall({
   const mutationWarnings = [];
   const mutations = ensureObject(packageEntry.descriptor.mutations);
   const fileMutations = ensureArray(mutations.files);
+  const textMutations = ensureArray(mutations.text);
+  const hasSurfaceTargetedFileMutations = fileMutations.some((mutationValue) =>
+    Boolean(normalizeFileMutationRecord(mutationValue).toSurface)
+  );
+  const {
+    preFileTextMutations,
+    postFileTextMutations
+  } = hasSurfaceTargetedFileMutations
+    ? partitionPreFileConfigTextMutations(textMutations)
+    : {
+        preFileTextMutations: [],
+        postFileTextMutations: textMutations
+      };
   const templateRoot = await resolvePackageTemplateRoot({
     packageEntry,
     appRoot,
@@ -311,6 +325,19 @@ async function applyPackageInstall({
           ...packageEntry,
           rootDir: templateRoot
         };
+  const managedRecord = createManagedRecordBase(packageEntry, packageOptions);
+  managedRecord.managed.migrations = cloneManagedArray(existingManaged.migrations);
+
+  if (preFileTextMutations.length > 0) {
+    await applyTextMutations(
+      packageEntryForMutations,
+      appRoot,
+      preFileTextMutations,
+      packageOptions,
+      managedRecord.managed.text,
+      touchedFiles
+    );
+  }
 
   const preparedFileMutations = await prepareFileMutations(
     packageEntryForMutations,
@@ -326,9 +353,6 @@ async function applyPackageInstall({
     touchedFiles
   });
 
-  const managedRecord = createManagedRecordBase(packageEntry, packageOptions);
-  managedRecord.managed.migrations = cloneManagedArray(existingManaged.migrations);
-
   const mutationDependencies = ensureObject(mutations.dependencies);
   const runtimeDependencies = ensureObject(mutationDependencies.runtime);
   const devDependencies = ensureObject(mutationDependencies.dev);
@@ -444,7 +468,7 @@ async function applyPackageInstall({
   await applyTextMutations(
     packageEntryForMutations,
     appRoot,
-    ensureArray(mutations.text),
+    postFileTextMutations,
     packageOptions,
     managedRecord.managed.text,
     touchedFiles