@milaboratories/pl-middle-layer 1.15.0 → 1.15.2

package/dist/js_render/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/js_render/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGhF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAG5D,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,sBAAsB,EAC3B,GAAG,EAAE,eAAe,EACpB,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,IAAI,EACV,GAAG,GAAE,OAAO,CAAC,sBAAsB,CAAM,GACxC,UAAU,CAAC,OAAO,CAAC,CAkCrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/js_render/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGhF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAG5D,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,sBAAsB,EAC3B,GAAG,EAAE,eAAe,EACpB,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,IAAI,EACV,GAAG,GAAE,OAAO,CAAC,sBAAsB,CAAM,GACxC,UAAU,CAAC,OAAO,CAAC,CA2CrB"}

package/dist/middle_layer/block.d.ts

@@ -5,5 +5,5 @@ import { BlockStateInternal } from '@milaboratories/pl-model-middle-layer';
 export type BlockArgsAndUiState = Omit<BlockStateInternal, 'outputs' | 'navigationState'>;
 export declare function blockArgsAndUiState(projectEntry: PlTreeEntry, id: string): Computable<BlockArgsAndUiState>;
 export declare function blockArgsAndUiState(projectEntry: PlTreeEntry, id: string, cCtx: ComputableCtx): BlockArgsAndUiState;
-export declare function blockOutputs(projectEntry: PlTreeEntry, id: string, env: MiddleLayerEnvironment): ComputableStableDefined<Record<string, ComputableValueOrErrors<unknown>>>;
+export declare function blockOutputs(projectEntry: PlTreeEntry, blockId: string, env: MiddleLayerEnvironment): ComputableStableDefined<Record<string, ComputableValueOrErrors<unknown>>>;
 //# sourceMappingURL=block.d.ts.map

package/dist/middle_layer/block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/middle_layer/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EACL,UAAU,EACV,aAAa,EACb,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAgB,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAIzF,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,iBAAiB,CAAC,CAAC;AAE1F,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,WAAW,EACzB,EAAE,EAAE,MAAM,GACT,UAAU,CAAC,mBAAmB,CAAC,CAAC;AACnC,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,WAAW,EACzB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,aAAa,GAClB,mBAAmB,CAAC;AAoBvB,wBAAgB,YAAY,CAC1B,YAAY,EAAE,WAAW,EACzB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,sBAAsB,GAC1B,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,CAmB3E"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/middle_layer/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EACL,UAAU,EACV,aAAa,EACb,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAgB,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAIzF,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,iBAAiB,CAAC,CAAC;AAE1F,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,WAAW,EACzB,EAAE,EAAE,MAAM,GACT,UAAU,CAAC,mBAAmB,CAAC,CAAC;AACnC,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,WAAW,EACzB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,aAAa,GAClB,mBAAmB,CAAC;AAoBvB,wBAAgB,YAAY,CAC1B,YAAY,EAAE,WAAW,EACzB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,sBAAsB,GAC1B,uBAAuB,CAAC,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,CAmB3E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -28,19 +28,19 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.6.0",
     "zod": "^3.23.8",
-    "@milaboratories/computable": "^2.3.0",
-    "@milaboratories/resolve-helper": "^1.0.1",
+    "@milaboratories/computable": "^2.3.1",
     "@platforma-sdk/block-tools": "^2.3.25",
-    "@milaboratories/pl-drivers": "^1.3.17",
-    "@milaboratories/pl-model-common": "^1.6.2",
     "@milaboratories/pl-client": "^2.5.10",
+    "@milaboratories/pl-model-common": "^1.6.2",
     "@milaboratories/pl-model-middle-layer": "^1.5.9",
+    "@milaboratories/pl-drivers": "^1.3.18",
+    "@milaboratories/resolve-helper": "^1.0.1",
+    "@milaboratories/pl-tree": "^1.4.13",
     "@milaboratories/ts-helpers": "^1.1.1",
-    "@milaboratories/pl-tree": "^1.4.12",
     "@platforma-sdk/model": "^1.9.0",
-    "@platforma-sdk/workflow-tengo": "2.2.0",
     "@milaboratories/pl-config": "^1.3.1",
-    "@milaboratories/pl-local": "^1.6.0"
+    "@milaboratories/pl-local": "^1.6.1",
+    "@platforma-sdk/workflow-tengo": "2.2.0"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/js_render/index.ts

@@ -13,7 +13,8 @@ export function computableFromRF(
   code: Code,
   ops: Partial<ComputableRenderingOps> = {}
 ): Computable<unknown> {
-  ops = { ...ops };
+  const key = `lambda#${fh.handle}`;
+  ops = { ...ops, key };
   if (ops.mode === undefined && fh.retentive === true) ops.mode = 'StableOnlyRetentive';
   return Computable.makeRaw((cCtx) => {
     const scope = new Scope();
@@ -33,16 +34,24 @@ export function computableFromRF(
     return {
       ir: rCtx.computablesToResolve,
       postprocessValue: async (resolved: Record<string, unknown>, { unstableMarker, stable }) => {
-        if (LogOutputStatus && (LogOutputStatus !== 'unstable-only' || !stable)) {
-          if (stable) console.log(`Stable output ${fh.handle} calculated.`);
-          else console.log(`Unstable output ${fh.handle}; marker = ${unstableMarker}`);
-        }
-
         // resolving futures
         for (const [handle, value] of Object.entries(resolved)) rCtx.runCallback(handle, value);
 
         // rendering result
-        return rCtx.importObjectUniversal(result);
+        const renderedResult = rCtx.importObjectUniversal(result);
+
+        if (LogOutputStatus && (LogOutputStatus !== 'unstable-only' || !stable)) {
+          if (stable)
+            console.log(
+              `Stable output ${fh.handle} calculated ${renderedResult !== undefined ? 'defined' : 'undefined'}`
+            );
+          else
+            console.log(
+              `Unstable output ${fh.handle}; marker = ${unstableMarker}; ${renderedResult !== undefined ? 'defined' : 'undefined'}`
+            );
+        }
+
+        return renderedResult;
       }
     };
   }, ops);

package/src/middle_layer/block.ts

@@ -46,15 +46,15 @@ export function blockArgsAndUiState(
 
 export function blockOutputs(
   projectEntry: PlTreeEntry,
-  id: string,
+  blockId: string,
   env: MiddleLayerEnvironment
 ): ComputableStableDefined<Record<string, ComputableValueOrErrors<unknown>>> {
   return Computable.make(
     (c) => {
       const prj = c.accessor(projectEntry).node();
-      const ctx = constructBlockContext(prj, id);
+      const ctx = constructBlockContext(prj, blockId);
 
-      const blockCfg = getBlockCfg(prj, id);
+      const blockCfg = getBlockCfg(prj, blockId);
 
       return ifNotUndef(blockCfg, (cfg) => {
         const outputs: Record<string, Computable<any>> = {};
@@ -65,6 +65,6 @@ export function blockOutputs(
         return outputs;
       });
     },
-    { key: 'outputs#' + resourceIdToString(projectEntry.rid) + id }
+    { key: 'outputs#' + resourceIdToString(projectEntry.rid) + "#" + blockId }
   ).withStableType();
 }