@milaboratories/pl-middle-layer 1.54.7 → 1.55.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.54.7",
+  "version": "1.55.1",
   "description": "Pl Middle Layer",
   "keywords": [],
   "license": "UNLICENSED",
@@ -30,24 +30,24 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.8.0",
     "zod": "~3.23.8",
-    "@milaboratories/computable": "2.9.2",
-    "@milaboratories/pf-spec-driver": "1.2.4",
     "@milaboratories/helpers": "1.14.1",
     "@milaboratories/pf-driver": "1.3.3",
     "@milaboratories/pl-client": "3.0.0",
+    "@milaboratories/pf-spec-driver": "1.2.4",
     "@milaboratories/pl-deployments": "2.16.5",
-    "@milaboratories/pl-errors": "1.2.6",
-    "@milaboratories/pl-http": "1.2.4",
+    "@milaboratories/computable": "2.9.2",
     "@milaboratories/pl-drivers": "1.12.8",
+    "@milaboratories/pl-http": "1.2.4",
     "@milaboratories/pl-model-backend": "1.2.6",
+    "@milaboratories/pl-errors": "1.2.6",
     "@milaboratories/pl-model-common": "1.31.1",
     "@milaboratories/pl-model-middle-layer": "1.16.3",
     "@milaboratories/resolve-helper": "1.1.3",
+    "@milaboratories/ts-helpers": "1.8.1",
     "@milaboratories/pl-tree": "1.9.7",
     "@platforma-sdk/block-tools": "2.7.5",
-    "@platforma-sdk/workflow-tengo": "5.11.0",
-    "@platforma-sdk/model": "1.63.1",
-    "@milaboratories/ts-helpers": "1.8.1"
+    "@platforma-sdk/workflow-tengo": "5.12.0",
+    "@platforma-sdk/model": "1.63.1"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",

package/src/mutator/project-v3.test.ts

@@ -433,6 +433,77 @@ test("v3 blocks: migrateBlockPack with storage migration re-derives args and pre
   });
 });
 
+test("v3 blocks: resetToInitialStorage derives prerunArgs even when args() throws", async () => {
+  const quickJs = await getQuickJS();
+
+  await TestHelpers.withTempRoot(async (pl) => {
+    const prj = await pl.withWriteTx("CreatingProject", async (tx) => {
+      const prjRef = await createProject(tx);
+      tx.createField(field(tx.clientRoot, "prj"), "Dynamic", prjRef);
+      await tx.commit();
+      return await toGlobalResourceId(prjRef);
+    });
+
+    // Add block with valid data so args and prerunArgs are both set
+    await pl.withWriteTx("AddBlock", async (tx) => {
+      const mut = await ProjectMutator.load(new ProjectHelper(quickJs), tx, prj);
+      mut.addBlock(
+        { id: "enter1", label: "Enter Numbers V3", renderingMode: "Heavy" },
+        {
+          storageMode: "fromModel",
+          blockPack: await TestBPPreparer.prepare(BPSpecEnterV3),
+        },
+      );
+      mut.setStates([
+        {
+          modelAPIVersion: 2,
+          blockId: "enter1",
+          payload: { operation: "update-block-data", value: { numbers: [4, 2, 6] } },
+        },
+      ]);
+      mut.save();
+      await tx.commit();
+    });
+
+    // Verify both args and prerunArgs are set
+    await poll(pl, async (tx) => {
+      const prjR = await tx.get(prj);
+      const currentArgs = await prjR.get(projectFieldName("enter1", "currentArgs"));
+      const argsData = JSON.parse(Buffer.from(currentArgs.data.data!).toString());
+      expect(argsData).toStrictEqual({ numbers: [2, 4, 6] });
+
+      const currentPrerunArgs = await prjR.get(projectFieldName("enter1", "currentPrerunArgs"));
+      const prerunData = JSON.parse(Buffer.from(currentPrerunArgs.data.data!).toString());
+      expect(prerunData).toStrictEqual({ evenNumbers: [2, 4, 6] });
+    });
+
+    // Reset to initial storage — init() returns { numbers: [] }
+    // args() will throw "Numbers are required!" but prerunArgs() should still succeed
+    await pl.withWriteTx("ResetToInitial", async (tx) => {
+      const mut = await ProjectMutator.load(new ProjectHelper(quickJs), tx, prj);
+      mut.resetToInitialStorage("enter1");
+      mut.save();
+      await tx.commit();
+    });
+
+    // Verify: currentArgs is cleared (args threw), but currentPrerunArgs is still derived
+    await poll(pl, async (tx) => {
+      const prjR = await tx.get(prj);
+
+      // currentArgs should be gone since args() throws for empty numbers
+      const currentArgsField = prjR.data.fields.find(
+        (f) => f.name === projectFieldName("enter1", "currentArgs"),
+      );
+      expect(currentArgsField).toBeUndefined();
+
+      // currentPrerunArgs should still be set with empty even numbers
+      const currentPrerunArgs = await prjR.get(projectFieldName("enter1", "currentPrerunArgs"));
+      const prerunData = JSON.parse(Buffer.from(currentPrerunArgs.data.data!).toString());
+      expect(prerunData).toStrictEqual({ evenNumbers: [] });
+    });
+  });
+});
+
 test("v3 blocks: migrateBlockPack assigns author marker", async () => {
   const quickJs = await getQuickJS();
 

package/src/mutator/project.ts

@@ -751,6 +751,17 @@ export class ProjectMutator {
     const initialStorageJson = this.projectHelper.getInitialStorageInVM(blockConfig);
     this.setBlockStorageRaw(blockId, initialStorageJson);
 
+    // Derive prerunArgs first — always derived independently of args validation
+    const prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(
+      blockConfig,
+      initialStorageJson,
+    );
+    if (prerunArgs !== undefined) {
+      this.setBlockFieldObj(blockId, "currentPrerunArgs", this.createJsonFieldValue(prerunArgs));
+    } else {
+      this.deleteBlockFields(blockId, "currentPrerunArgs");
+    }
+
     // Derive args from storage - set or clear currentArgs based on derivation result
     const deriveArgsResult = this.projectHelper.deriveArgsFromStorage(
       blockConfig,
@@ -762,24 +773,8 @@ export class ProjectMutator {
         "currentArgs",
         this.createJsonFieldValue(deriveArgsResult.value),
       );
-      // Derive prerunArgs from storage
-      const prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(
-        blockConfig,
-        initialStorageJson,
-      );
-      if (prerunArgs !== undefined) {
-        this.setBlockFieldObj(blockId, "currentPrerunArgs", this.createJsonFieldValue(prerunArgs));
-      } else {
-        this.deleteBlockFields(blockId, "currentPrerunArgs");
-      }
     } else {
-      if (info.fields.currentPrerunArgs !== undefined) {
-        this.projectHelper.logger.warn(
-          `[staging] ${blockId}: currentPrerunArgs cleared (args derivation failed)`,
-        );
-      }
       this.deleteBlockFields(blockId, "currentArgs");
-      this.deleteBlockFields(blockId, "currentPrerunArgs");
     }
   }
 
@@ -823,22 +818,18 @@ export class ProjectMutator {
           this.createGzJsonFieldValueFromContent(updatedStorageJson),
         );
 
-        // Derive args directly from storage (VM extracts data internally)
+        // Derive prerunArgs first — always derived independently of args validation
+        prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(
+          blockConfig,
+          updatedStorageJson,
+        );
+
+        // Derive args from storage (VM extracts data internally)
         const derivedArgsResult = this.projectHelper.deriveArgsFromStorage(
           blockConfig,
           updatedStorageJson,
         );
-        if (derivedArgsResult.error) {
-          args = undefined;
-          prerunArgs = undefined;
-        } else {
-          args = derivedArgsResult.value;
-          // Derive prerunArgs from storage, or fall back to args
-          prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(
-            blockConfig,
-            updatedStorageJson,
-          );
-        }
+        args = derivedArgsResult.error ? undefined : derivedArgsResult.value;
       } else {
         this.setBlockFieldObj(req.blockId, "blockStorage", this.createGzJsonFieldValue(req.state));
         if (req.state !== null && typeof req.state === "object" && "args" in req.state) {
@@ -1118,18 +1109,15 @@ export class ProjectMutator {
       // Model API v2+: get initial storage and derive args from it
       storageToWrite = this.projectHelper.getInitialStorageInVM(blockConfig);
 
-      // Derive args directly from storage (VM extracts data internally)
+      // Derive prerunArgs first — always derived independently of args validation
+      prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(blockConfig, storageToWrite);
+
+      // Derive args from storage (VM extracts data internally)
       const deriveArgsResult = this.projectHelper.deriveArgsFromStorage(
         blockConfig,
         storageToWrite,
       );
-      if (deriveArgsResult.error) {
-        args = undefined;
-        prerunArgs = undefined;
-      } else {
-        args = deriveArgsResult.value;
-        prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(blockConfig, storageToWrite);
-      }
+      args = deriveArgsResult.error ? undefined : deriveArgsResult.value;
     } else if (spec.storageMode === "legacy") {
       // Model API v1: use legacyState from spec
       const parsedState = JSON.parse(spec.legacyState);
@@ -1406,6 +1394,15 @@ export class ProjectMutator {
     const applyStorageAndDeriveArgs = (storageJson: string) => {
       persistBlockPack();
       this.setBlockStorageRaw(blockId, storageJson);
+
+      // Derive prerunArgs first — always derived independently of args validation
+      const prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(newConfig, storageJson);
+      if (prerunArgs !== undefined) {
+        this.setBlockFieldObj(blockId, "currentPrerunArgs", this.createJsonFieldValue(prerunArgs));
+      } else {
+        this.deleteBlockFields(blockId, "currentPrerunArgs");
+      }
+
       const deriveArgsResult = this.projectHelper.deriveArgsFromStorage(newConfig, storageJson);
       if (!deriveArgsResult.error) {
         this.setBlockFieldObj(
@@ -1413,19 +1410,8 @@ export class ProjectMutator {
           "currentArgs",
           this.createJsonFieldValue(deriveArgsResult.value),
         );
-        const prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(newConfig, storageJson);
-        if (prerunArgs !== undefined) {
-          this.setBlockFieldObj(
-            blockId,
-            "currentPrerunArgs",
-            this.createJsonFieldValue(prerunArgs),
-          );
-        } else {
-          this.deleteBlockFields(blockId, "currentPrerunArgs");
-        }
       } else {
         this.deleteBlockFields(blockId, "currentArgs");
-        this.deleteBlockFields(blockId, "currentPrerunArgs");
       }
     };