@milaboratories/pl-middle-layer 1.67.4 → 1.67.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.67.4",
+  "version": "1.67.5",
   "description": "Pl Middle Layer",
   "keywords": [],
   "license": "UNLICENSED",
@@ -32,23 +32,23 @@
     "zod": "~3.25.76",
     "@milaboratories/columns-collection-driver": "0.2.4",
     "@milaboratories/computable": "2.9.8",
-    "@milaboratories/pf-driver": "1.9.1",
     "@milaboratories/pl-deployments": "3.0.16",
+    "@milaboratories/pf-spec-driver": "1.5.1",
     "@milaboratories/helpers": "1.14.5",
     "@milaboratories/pl-client": "3.14.7",
-    "@milaboratories/pf-spec-driver": "1.5.1",
-    "@milaboratories/pl-errors": "1.4.36",
+    "@milaboratories/pf-driver": "1.9.1",
     "@milaboratories/pl-drivers": "1.16.16",
-    "@milaboratories/pl-model-common": "1.48.0",
+    "@milaboratories/pl-errors": "1.4.36",
     "@milaboratories/pl-model-backend": "1.4.21",
+    "@milaboratories/pl-model-common": "1.48.0",
     "@milaboratories/pl-model-middle-layer": "1.32.0",
     "@milaboratories/pl-http": "1.2.4",
-    "@milaboratories/pl-tree": "1.13.7",
     "@milaboratories/resolve-helper": "1.1.3",
-    "@platforma-sdk/model": "1.82.0",
+    "@milaboratories/pl-tree": "1.13.7",
     "@platforma-sdk/block-tools": "2.14.3",
-    "@milaboratories/ts-helpers": "1.8.6",
-    "@platforma-sdk/workflow-tengo": "6.8.3"
+    "@platforma-sdk/workflow-tengo": "6.8.3",
+    "@platforma-sdk/model": "1.83.0",
+    "@milaboratories/ts-helpers": "1.8.6"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",
@@ -56,8 +56,8 @@
     "@vitest/coverage-istanbul": "^4.1.3",
     "typescript": "~5.9.3",
     "vitest": "^4.1.3",
-    "@milaboratories/ts-builder": "1.7.0",
     "@milaboratories/build-configs": "2.0.0",
+    "@milaboratories/ts-builder": "1.7.0",
     "@milaboratories/ts-configs": "1.4.0"
   },
   "engines": {

package/src/cfg_render/executor.test.ts

@@ -1,64 +1,52 @@
 import { Computable } from "@milaboratories/computable";
 import { field, Pl, TestHelpers } from "@milaboratories/pl-client";
 import { SynchronizedTreeState } from "@milaboratories/pl-tree";
-import {
-  Args,
-  BlockConfigGeneric,
-  BlockModel,
-  getJsonField,
-  getResourceField,
-  getResourceValueAsJson,
-  InferOutputType,
-  isolate,
-  It,
-  MainOutputs,
-  makeObject,
-  mapArrayValues,
-  PlResourceEntry,
-  TypedConfig,
-} from "@platforma-sdk/model";
+import type { Cfg, PlResourceEntry } from "@platforma-sdk/model";
 import { expect, test } from "vitest";
 import { MiddleLayerDriverKit } from "../middle_layer/driver_kit";
 import { computableFromCfgUnsafe } from "./executor";
 
+// The SDK no longer ships a builder for these configs — it went away with the v1/v2
+// block model — but the executor still has to render configs of blocks published
+// before that. So the fixtures below are spelled out as plain `Cfg` trees.
+
+const ctxVar = (variable: string): Cfg => ({ type: "GetFromCtx", variable });
+const imm = (value: unknown): Cfg => ({ type: "Immediate", value });
+const jsonField = (source: Cfg, field: Cfg): Cfg => ({ type: "GetJsonField", source, field });
+const resourceField = (source: Cfg, field: Cfg): Cfg => ({
+  type: "GetResourceField",
+  source,
+  field,
+});
+
+const Args = ctxVar("$args");
+const It = ctxVar("$it");
+const MainOutputs = ctxVar("$prod");
+
 test("local cfg test (no pl)", async () => {
   const args = {
     theC: "c",
     a: { c: "hi" },
     b: ["a", "b", "c"],
   };
-  const theCValue = getJsonField(Args, "theC");
-
-  const cfg = (
-    BlockModel.create<typeof args>("Heavy")
-      .initialArgs(args)
-      .output("out1", getJsonField(getJsonField(Args, "a"), theCValue))
-      .output(
-        "out2",
-        mapArrayValues(getJsonField(Args, "b"), isolate(makeObject({ theField: It }))),
-      )
-      .done() as any
-  ).config as BlockConfigGeneric;
+  const theCValue = jsonField(Args, imm("theC"));
+
+  const outputs = {
+    out1: jsonField(jsonField(Args, imm("a")), theCValue),
+    out2: {
+      type: "MapArrayValues",
+      source: jsonField(Args, imm("b")),
+      itVar: "$it",
+      mapping: { type: "Isolate", cfg: { type: "MakeObject", template: { theField: It } } },
+    },
+  } satisfies Record<string, Cfg>;
 
   const ctx = { $args: args };
 
-  const computable1 = computableFromCfgUnsafe(
-    {} as MiddleLayerDriverKit,
-    ctx,
-    cfg.outputs["out1"] as TypedConfig,
-  );
-  const out1 = (await computable1.getValue()) as InferOutputType<
-    (typeof cfg.outputs)["out1"],
-    typeof args,
-    unknown
-  >;
-  expect(out1).toEqual("hi");
-
-  const computable2 = computableFromCfgUnsafe(
-    {} as MiddleLayerDriverKit,
-    ctx,
-    cfg.outputs["out2"] as TypedConfig,
-  );
+  const computable1 = computableFromCfgUnsafe({} as MiddleLayerDriverKit, ctx, outputs.out1);
+  expect(await computable1.getValue()).toEqual("hi");
+
+  const computable2 = computableFromCfgUnsafe({} as MiddleLayerDriverKit, ctx, outputs.out2);
   const out2 = await computable2.getValue();
   expect(out2).toStrictEqual([{ theField: "a" }, { theField: "b" }, { theField: "c" }]);
 });
@@ -71,20 +59,14 @@ test("cfg test with pl, simple", async () => {
   const input = {
     theC: "c",
   };
-  const theCValue = getJsonField(Args, "theC");
-
-  const cfg = (
-    BlockModel.create<typeof input>("Heavy")
-      .initialArgs(input)
-      .output(
-        "out1",
-        getJsonField(
-          getResourceValueAsJson<TestResourceValue>()(getResourceField(MainOutputs, theCValue)),
-          "someField",
-        ),
-      )
-      .done() as any
-  ).config as BlockConfigGeneric;
+  const theCValue = jsonField(Args, imm("theC"));
+
+  const outputs = {
+    out1: jsonField(
+      { type: "GetResourceValueAsJson", source: resourceField(MainOutputs, theCValue) },
+      imm("someField"),
+    ),
+  } satisfies Record<string, Cfg>;
 
   await TestHelpers.withTempRoot(async (pl) => {
     const tree = await SynchronizedTreeState.init(pl, pl.clientRoot, {
@@ -100,7 +82,7 @@ test("cfg test with pl, simple", async () => {
     const computable: Computable<unknown> = computableFromCfgUnsafe(
       {} as MiddleLayerDriverKit,
       ctx,
-      cfg.outputs["out1"] as TypedConfig,
+      outputs.out1,
     ) as any;
 
     expect(await computable.getValue()).toBeUndefined();