@milaboratories/pl-middle-layer 1.46.34 → 1.47.0

package/src/middle_layer/project.ts

@@ -34,7 +34,7 @@ import type {
 } from "@milaboratories/pl-model-middle-layer";
 import { activeConfigs } from "./active_cfg";
 import { NavigationStates } from "./navigation_states";
-import { extractConfig } from "@platforma-sdk/model";
+import { extractConfig, BLOCK_STORAGE_FACADE_VERSION } from "@platforma-sdk/model";
 import fs from "node:fs/promises";
 import canonicalize from "canonicalize";
 import type { ProjectOverviewLight } from "./project_overview_light";
@@ -187,9 +187,11 @@ export class Project {
     const blockCfgContainer = await this.env.bpPreparer.getBlockConfigContainer(blockPackSpec);
     const blockCfg = extractConfig(blockCfgContainer); // full content of this var should never be persisted
 
+    this.env.runtimeCapabilities.throwIfIncompatible(blockCfg.featureFlags);
+
     // Build NewBlockSpec based on model API version
     const newBlockSpec =
-      blockCfg.modelAPIVersion === 2
+      blockCfg.modelAPIVersion === BLOCK_STORAGE_FACADE_VERSION
         ? { storageMode: "fromModel" as const, blockPack: preparedBp }
         : {
             storageMode: "legacy" as const,
@@ -276,15 +278,18 @@ export class Project {
     const blockCfg = extractConfig(
       await this.env.bpPreparer.getBlockConfigContainer(blockPackSpec),
     );
+
+    this.env.runtimeCapabilities.throwIfIncompatible(blockCfg.featureFlags);
+
     // resetState signals to mutator to reset storage
     // For v2+ blocks: mutator gets initial storage directly via getInitialStorageInVM
     // For v1 blocks: we pass the legacy state format
     const resetState = resetArgs
       ? {
           state:
-            blockCfg.modelAPIVersion === 2
-              ? {}
-              : { args: blockCfg.initialArgs, uiState: blockCfg.initialUiState },
+            blockCfg.modelAPIVersion === 1
+              ? { args: blockCfg.initialArgs, uiState: blockCfg.initialUiState }
+              : {},
         }
       : undefined;
     await withProjectAuthored(
@@ -459,7 +464,7 @@ export class Project {
   /**
    * Sets navigation state.
    * */
-  // eslint-disable-next-line @typescript-eslint/require-await
+  //
   public async setNavigationState(blockId: string, state: NavigationState): Promise<void> {
     this.navigationStates.setState(blockId, state);
   }
@@ -545,7 +550,7 @@ export class Project {
         this.rid,
         author,
         (prj) => {
-          if (config.modelAPIVersion === 2) {
+          if (config.modelAPIVersion === BLOCK_STORAGE_FACADE_VERSION) {
             // V2+: Reset to initial storage via VM
             prj.resetToInitialStorage(blockId);
           } else {

package/src/middle_layer/project_overview.ts

@@ -23,7 +23,7 @@ import type {
 } from "@milaboratories/pl-model-middle-layer";
 import { constructBlockContext, constructBlockContextArgsOnly } from "./block_ctx";
 import { ifNotUndef } from "../cfg_render/util";
-import { type BlockSection } from "@platforma-sdk/model";
+import { type BlockSection, BLOCK_STORAGE_FACADE_VERSION } from "@platforma-sdk/model";
 import { extractCodeWithInfo, wrapCallback } from "@platforma-sdk/model";
 import { computableFromCfgOrRF } from "./render";
 import type { NavigationStates } from "./navigation_states";
@@ -231,7 +231,7 @@ export function projectOverview(
               // inputsValid: for modelAPIVersion 2, it's true if currentArgs exists (args derivation succeeded)
               // For older blocks, use the inputsValid callback from config
               inputsValid:
-                cfg.modelAPIVersion === 2
+                cfg.modelAPIVersion === BLOCK_STORAGE_FACADE_VERSION
                   ? info.currentArguments !== undefined
                   : cfg.inputsValid
                     ? (computableFromCfgOrRF(
@@ -265,7 +265,7 @@ export function projectOverview(
 
         // Get block storage debug view by calling VM function (only for Model API v2 blocks)
         const storageDebugView = ifNotUndef(bp, ({ cfg }) => {
-          if (cfg.modelAPIVersion !== 2) {
+          if (cfg.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
             return undefined;
           }
           const storageNode = prj.traverse({

package/src/model/index.ts

@@ -1,3 +1,2 @@
 export * from "./block_pack_spec";
-export * from "./block_storage_helper";
 export { type ProjectListEntry, type ProjectField } from "./project_model";

package/src/model/project_helper.ts

@@ -1,12 +1,17 @@
 import type {
   ResultOrError,
   BlockConfig,
+  BlockStorage,
   PlRef,
-  ConfigRenderLambda,
   StorageDebugView,
 } from "@platforma-sdk/model";
 import type { StringifiedJson } from "@milaboratories/pl-model-common";
-import { extractCodeWithInfo, ensureError } from "@platforma-sdk/model";
+import {
+  extractCodeWithInfo,
+  ensureError,
+  BlockStorageFacadeCallbacks,
+  BLOCK_STORAGE_FACADE_VERSION,
+} from "@platforma-sdk/model";
 import { LRUCache } from "lru-cache";
 import type { QuickJSWASMModule } from "quickjs-emscripten";
 import { executeSingleLambda } from "../js_render";
@@ -26,36 +31,11 @@ type EnrichmentTargetsValue = {
  * Returned by migrateStorageInVM().
  *
  * - Error result: { error: string } - serious failure (no context, etc.)
- * - Success result: { newStorageJson: string, info: string, warn?: string } - migration succeeded or reset to initial
+ * - Success result: { newStorageJson: StringifiedJson<BlockStorage>, info: string } - migration succeeded
  */
 export type MigrationResult =
   | { error: string }
-  | { error?: undefined; newStorageJson: string; info: string; warn?: string };
-
-// Internal lambda handles for storage operations (registered by SDK's block_storage_vm.ts)
-// All callbacks are prefixed with `__pl_` to indicate internal SDK use
-const STORAGE_APPLY_UPDATE_HANDLE: ConfigRenderLambda = {
-  __renderLambda: true,
-  handle: "__pl_storage_applyUpdate",
-};
-const STORAGE_DEBUG_VIEW_HANDLE: ConfigRenderLambda = {
-  __renderLambda: true,
-  handle: "__pl_storage_debugView",
-};
-const STORAGE_MIGRATE_HANDLE: ConfigRenderLambda = {
-  __renderLambda: true,
-  handle: "__pl_storage_migrate",
-};
-const ARGS_DERIVE_HANDLE: ConfigRenderLambda = { __renderLambda: true, handle: "__pl_args_derive" };
-const PRERUN_ARGS_DERIVE_HANDLE: ConfigRenderLambda = {
-  __renderLambda: true,
-  handle: "__pl_prerunArgs_derive",
-};
-// Registered by DataModel.registerCallbacks()
-const INITIAL_STORAGE_HANDLE: ConfigRenderLambda = {
-  __renderLambda: true,
-  handle: "__pl_storage_initial",
-};
+  | { error?: undefined; newStorageJson: StringifiedJson<BlockStorage>; info: string };
 
 /**
  * Result of args derivation from storage.
@@ -96,7 +76,7 @@ export class ProjectHelper {
     blockConfig: BlockConfig,
     storageJson: string,
   ): ResultOrError<unknown> {
-    if (blockConfig.modelAPIVersion !== 2) {
+    if (blockConfig.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
       return {
         error: new Error("deriveArgsFromStorage is only supported for model API version 2"),
       };
@@ -105,7 +85,7 @@ export class ProjectHelper {
     try {
       const result = executeSingleLambda(
         this.quickJs,
-        ARGS_DERIVE_HANDLE,
+        blockConfig.blockLifecycleCallbacks[BlockStorageFacadeCallbacks.ArgsDerive],
         extractCodeWithInfo(blockConfig),
         storageJson,
       ) as ArgsDeriveResult;
@@ -128,14 +108,14 @@ export class ProjectHelper {
    * @returns The derived prerunArgs, or undefined if derivation fails
    */
   public derivePrerunArgsFromStorage(blockConfig: BlockConfig, storageJson: string): unknown {
-    if (blockConfig.modelAPIVersion !== 2) {
+    if (blockConfig.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
       throw new Error("derivePrerunArgsFromStorage is only supported for model API version 2");
     }
 
     try {
       const result = executeSingleLambda(
         this.quickJs,
-        PRERUN_ARGS_DERIVE_HANDLE,
+        blockConfig.blockLifecycleCallbacks[BlockStorageFacadeCallbacks.PrerunArgsDerive],
         extractCodeWithInfo(blockConfig),
         storageJson,
       ) as ArgsDeriveResult;
@@ -190,10 +170,14 @@ export class ProjectHelper {
    * @throws Error if storage creation fails
    */
   public getInitialStorageInVM(blockConfig: BlockConfig): string {
+    if (blockConfig.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
+      throw new Error("getInitialStorageInVM is only supported for model API version 2");
+    }
+
     try {
       const result = executeSingleLambda(
         this.quickJs,
-        INITIAL_STORAGE_HANDLE,
+        blockConfig.blockLifecycleCallbacks[BlockStorageFacadeCallbacks.StorageInitial],
         extractCodeWithInfo(blockConfig),
       ) as string;
       return result;
@@ -221,10 +205,14 @@ export class ProjectHelper {
     currentStorageJson: string,
     payload: { operation: string; value: unknown },
   ): string {
+    if (blockConfig.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
+      throw new Error("applyStorageUpdateInVM is only supported for model API version 2");
+    }
+
     try {
       const result = executeSingleLambda(
         this.quickJs,
-        STORAGE_APPLY_UPDATE_HANDLE,
+        blockConfig.blockLifecycleCallbacks[BlockStorageFacadeCallbacks.StorageApplyUpdate],
         extractCodeWithInfo(blockConfig),
         currentStorageJson,
         payload,
@@ -248,10 +236,14 @@ export class ProjectHelper {
     blockConfig: BlockConfig,
     rawStorageJson: string | undefined,
   ): StringifiedJson<StorageDebugView> | undefined {
+    if (blockConfig.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
+      throw new Error("getStorageDebugViewInVM is only supported for model API version 2");
+    }
+
     try {
       const result = executeSingleLambda(
         this.quickJs,
-        STORAGE_DEBUG_VIEW_HANDLE,
+        blockConfig.blockLifecycleCallbacks[BlockStorageFacadeCallbacks.StorageDebugView],
         extractCodeWithInfo(blockConfig),
         rawStorageJson,
       ) as StringifiedJson<StorageDebugView>;
@@ -285,10 +277,14 @@ export class ProjectHelper {
     blockConfig: BlockConfig,
     currentStorageJson: string | undefined,
   ): MigrationResult {
+    if (blockConfig.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
+      return { error: "migrateStorageInVM is only supported for model API version 2" };
+    }
+
     try {
       const result = executeSingleLambda(
         this.quickJs,
-        STORAGE_MIGRATE_HANDLE,
+        blockConfig.blockLifecycleCallbacks[BlockStorageFacadeCallbacks.StorageMigrate],
         extractCodeWithInfo(blockConfig),
         currentStorageJson,
       ) as MigrationResult;

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

@@ -50,7 +50,7 @@ test("v3 blocks: basic test with unified state", async () => {
           modelAPIVersion: 2,
           blockId: "enter1",
           payload: {
-            operation: "update-data",
+            operation: "update-block-data",
             value: { numbers: [1, 2, 3] },
           },
         },
@@ -82,7 +82,7 @@ test("v3 blocks: basic test with unified state", async () => {
           modelAPIVersion: 2,
           blockId: "enter2",
           payload: {
-            operation: "update-data",
+            operation: "update-block-data",
             value: { numbers: [4, 5, 6] },
           },
         },
@@ -108,7 +108,7 @@ test("v3 blocks: basic test with unified state", async () => {
           modelAPIVersion: 2,
           blockId: "sum1",
           payload: {
-            operation: "update-data",
+            operation: "update-block-data",
             value: { sources: [outputRef("enter1", "numbers"), outputRef("enter2", "numbers")] },
           },
         },
@@ -182,7 +182,7 @@ test("v3 blocks: prerunArgs skip test", async () => {
           modelAPIVersion: 2,
           blockId: "enter1",
           payload: {
-            operation: "update-data",
+            operation: "update-block-data",
             value: { numbers: [3, 1, 2] },
           },
         },
@@ -215,7 +215,7 @@ test("v3 blocks: prerunArgs skip test", async () => {
           modelAPIVersion: 2,
           blockId: "enter1",
           payload: {
-            operation: "update-data",
+            operation: "update-block-data",
             value: { numbers: [5, 1, 2] }, // Changed odd numbers only
           },
         },
@@ -245,7 +245,7 @@ test("v3 blocks: prerunArgs skip test", async () => {
           modelAPIVersion: 2,
           blockId: "enter1",
           payload: {
-            operation: "update-data",
+            operation: "update-block-data",
             value: { numbers: [5, 1, 4] }, // Changed even number from 2 to 4
           },
         },
@@ -309,7 +309,7 @@ test("v3 blocks: migrateBlockPack preserves state and re-derives args and prerun
         {
           modelAPIVersion: 2,
           blockId: "enter1",
-          payload: { operation: "update-data", value: { numbers: [4, 2, 6] } },
+          payload: { operation: "update-block-data", value: { numbers: [4, 2, 6] } },
         },
       ]);
       mut.save();
@@ -381,7 +381,7 @@ test("v3 blocks: migrateBlockPack with storage migration re-derives args and pre
         {
           modelAPIVersion: 2,
           blockId: "enter1",
-          payload: { operation: "update-data", value: { numbers: [1] } },
+          payload: { operation: "update-block-data", value: { numbers: [1] } },
         },
       ]);
       mut.save();
@@ -461,7 +461,7 @@ test("v3 blocks: migrateBlockPack assigns author marker", async () => {
         {
           modelAPIVersion: 2,
           blockId: "enter1",
-          payload: { operation: "update-data", value: { numbers: [1, 2, 3] } },
+          payload: { operation: "update-block-data", value: { numbers: [1, 2, 3] } },
         },
       ]);
       mut.save();

package/src/mutator/project.ts

@@ -65,7 +65,12 @@ import {
   cachedDecode,
 } from "@milaboratories/ts-helpers";
 import type { ProjectHelper } from "../model/project_helper";
-import { extractConfig, UiError, type BlockConfig } from "@platforma-sdk/model";
+import {
+  extractConfig,
+  UiError,
+  BLOCK_STORAGE_FACADE_VERSION,
+  type BlockConfig,
+} from "@platforma-sdk/model";
 import { getDebugFlags } from "../debug";
 import type { BlockPackInfo } from "../model/block_pack";
 
@@ -622,7 +627,7 @@ export class ProjectMutator {
     const info = this.getBlockInfo(blockId);
     const blockConfig = info.config;
 
-    if (blockConfig.modelAPIVersion !== 2) {
+    if (blockConfig.modelAPIVersion !== BLOCK_STORAGE_FACADE_VERSION) {
       throw new Error("resetToInitialStorage is only supported for model API version 2");
     }
 
@@ -675,7 +680,7 @@ export class ProjectMutator {
       let args: unknown;
       let prerunArgs: unknown;
 
-      if (req.modelAPIVersion === 2) {
+      if (req.modelAPIVersion === BLOCK_STORAGE_FACADE_VERSION) {
         const currentStorageJson = info.blockStorageJson;
         if (currentStorageJson === undefined) {
           throw new Error(`Block ${req.blockId} has no blockStorage - this should not happen`);
@@ -1179,106 +1184,77 @@ export class ProjectMutator {
     const info = this.getBlockInfo(blockId);
     const newConfig = extractConfig(spec.config);
 
-    this.setBlockField(
-      blockId,
-      "blockPack",
-      Pl.wrapInHolder(this.tx, createBlockPack(this.tx, spec)),
-      "NotReady",
-    );
+    const persistBlockPack = () => {
+      this.setBlockField(
+        blockId,
+        "blockPack",
+        Pl.wrapInHolder(this.tx, createBlockPack(this.tx, spec)),
+        "NotReady",
+      );
+    };
+
+    const applyStorageAndDeriveArgs = (storageJson: string) => {
+      persistBlockPack();
+      this.setBlockStorageRaw(blockId, storageJson);
+      const deriveArgsResult = this.projectHelper.deriveArgsFromStorage(newConfig, storageJson);
+      if (!deriveArgsResult.error) {
+        this.setBlockFieldObj(
+          blockId,
+          "currentArgs",
+          this.createJsonFieldValue(deriveArgsResult.value),
+        );
+        const prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(newConfig, storageJson);
+        if (prerunArgs !== undefined) {
+          this.setBlockFieldObj(
+            blockId,
+            "currentPrerunArgs",
+            this.createJsonFieldValue(prerunArgs),
+          );
+        }
+      }
+    };
 
     if (newClearState !== undefined) {
       // State is being reset - no migration needed
-      const supportsStorageFromVM = newConfig.modelAPIVersion === 2;
+      const supportsStorageFromVM = newConfig.modelAPIVersion === BLOCK_STORAGE_FACADE_VERSION;
 
       if (supportsStorageFromVM) {
         // V2+: Get initial storage directly from VM and derive args from it
         const initialStorageJson = this.projectHelper.getInitialStorageInVM(newConfig);
-        this.setBlockStorageRaw(blockId, initialStorageJson);
-
-        // Derive args from storage - only set currentArgs if derivation succeeds
-        const deriveArgsResult = this.projectHelper.deriveArgsFromStorage(
-          newConfig,
-          initialStorageJson,
-        );
-        if (!deriveArgsResult.error) {
-          this.setBlockFieldObj(
-            blockId,
-            "currentArgs",
-            this.createJsonFieldValue(deriveArgsResult.value),
-          );
-          // Derive prerunArgs from storage
-          const prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(
-            newConfig,
-            initialStorageJson,
-          );
-          if (prerunArgs !== undefined) {
-            this.setBlockFieldObj(
-              blockId,
-              "currentPrerunArgs",
-              this.createJsonFieldValue(prerunArgs),
-            );
-          }
-        }
+        applyStorageAndDeriveArgs(initialStorageJson);
         this.blocksWithChangedInputs.add(blockId);
         this.updateLastModified();
       } else {
         // V1: Use setStates with legacy state format
+        persistBlockPack();
         this.setStates([{ modelAPIVersion: 1, blockId, state: newClearState.state }]);
       }
     } else {
       // State is being preserved - run migrations if needed via VM
       // Only Model API v2 blocks support migrations
-      const supportsStateMigrations = newConfig.modelAPIVersion === 2;
+      const supportsStateMigrations = newConfig.modelAPIVersion === BLOCK_STORAGE_FACADE_VERSION;
 
       if (supportsStateMigrations) {
         const currentStorageJson = info.blockStorageJson;
 
+        // Attempt migration BEFORE persisting block pack — on failure,
+        // block stays on old version (no inconsistent new-code/old-storage state)
         const migrationResult = this.projectHelper.migrateStorageInVM(
           newConfig,
           currentStorageJson,
         );
 
         if (migrationResult.error !== undefined) {
-          console.error(
-            `[migrateBlockPack] Block ${blockId} migration error: ${migrationResult.error}`,
+          throw new Error(
+            `[migrateBlockPack] Block ${blockId} migration failed: ${migrationResult.error}`,
           );
-        } else {
-          console.log(`[migrateBlockPack] Block ${blockId}: ${migrationResult.info}`);
-          if (migrationResult.warn) {
-            console.warn(
-              `[migrateBlockPack] Block ${blockId} migration warning: ${migrationResult.warn}`,
-            );
-          }
-          this.setBlockStorageRaw(blockId, migrationResult.newStorageJson);
-
-          // Re-derive currentArgs from migrated storage (new block code + migrated data)
-          const deriveArgsResult = this.projectHelper.deriveArgsFromStorage(
-            newConfig,
-            migrationResult.newStorageJson,
-          );
-          if (!deriveArgsResult.error) {
-            this.setBlockFieldObj(
-              blockId,
-              "currentArgs",
-              this.createJsonFieldValue(deriveArgsResult.value),
-            );
-          }
-
-          // Derive prerunArgs from the migrated storage so staging can re-render
-          const prerunArgs = this.projectHelper.derivePrerunArgsFromStorage(
-            newConfig,
-            migrationResult.newStorageJson,
-          );
-          if (prerunArgs !== undefined) {
-            this.setBlockFieldObj(
-              blockId,
-              "currentPrerunArgs",
-              this.createJsonFieldValue(prerunArgs),
-            );
-          }
         }
+
+        console.log(`[migrateBlockPack] Block ${blockId}: ${migrationResult.info}`);
+        applyStorageAndDeriveArgs(migrationResult.newStorageJson);
       } else {
-        // Legacy blocks (modelAPIVersion 1): prerunArgs = currentArgs
+        // Legacy blocks (modelAPIVersion 1): persist block pack, set prerunArgs = currentArgs
+        persistBlockPack();
         if (info.fields.currentArgs !== undefined) {
           this.setBlockFieldObj(blockId, "currentPrerunArgs", info.fields.currentArgs);
         }