@milaboratories/pl-middle-layer 1.45.5 → 1.46.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +58 -0
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/js_render/computable_context.cjs +37 -7
- package/dist/js_render/computable_context.cjs.map +1 -1
- package/dist/js_render/computable_context.d.ts.map +1 -1
- package/dist/js_render/computable_context.js +37 -7
- package/dist/js_render/computable_context.js.map +1 -1
- package/dist/js_render/context.cjs +12 -4
- package/dist/js_render/context.cjs.map +1 -1
- package/dist/js_render/context.d.ts +9 -0
- package/dist/js_render/context.d.ts.map +1 -1
- package/dist/js_render/context.js +12 -4
- package/dist/js_render/context.js.map +1 -1
- package/dist/js_render/index.cjs +1 -1
- package/dist/js_render/index.cjs.map +1 -1
- package/dist/js_render/index.js +1 -1
- package/dist/js_render/index.js.map +1 -1
- package/dist/middle_layer/block.cjs +7 -8
- package/dist/middle_layer/block.cjs.map +1 -1
- package/dist/middle_layer/block.d.ts +4 -4
- package/dist/middle_layer/block.d.ts.map +1 -1
- package/dist/middle_layer/block.js +7 -8
- package/dist/middle_layer/block.js.map +1 -1
- package/dist/middle_layer/block_ctx.cjs +67 -13
- package/dist/middle_layer/block_ctx.cjs.map +1 -1
- package/dist/middle_layer/block_ctx.d.ts +4 -7
- package/dist/middle_layer/block_ctx.d.ts.map +1 -1
- package/dist/middle_layer/block_ctx.js +68 -14
- package/dist/middle_layer/block_ctx.js.map +1 -1
- package/dist/middle_layer/block_ctx_unsafe.cjs +10 -3
- package/dist/middle_layer/block_ctx_unsafe.cjs.map +1 -1
- package/dist/middle_layer/block_ctx_unsafe.d.ts +1 -1
- package/dist/middle_layer/block_ctx_unsafe.d.ts.map +1 -1
- package/dist/middle_layer/block_ctx_unsafe.js +10 -3
- package/dist/middle_layer/block_ctx_unsafe.js.map +1 -1
- package/dist/middle_layer/frontend_path.cjs +1 -0
- package/dist/middle_layer/frontend_path.cjs.map +1 -1
- package/dist/middle_layer/frontend_path.js +1 -0
- package/dist/middle_layer/frontend_path.js.map +1 -1
- package/dist/middle_layer/middle_layer.cjs +1 -0
- package/dist/middle_layer/middle_layer.cjs.map +1 -1
- package/dist/middle_layer/middle_layer.d.ts +1 -1
- package/dist/middle_layer/middle_layer.d.ts.map +1 -1
- package/dist/middle_layer/middle_layer.js +1 -0
- package/dist/middle_layer/middle_layer.js.map +1 -1
- package/dist/middle_layer/project.cjs +75 -28
- package/dist/middle_layer/project.cjs.map +1 -1
- package/dist/middle_layer/project.d.ts +34 -7
- package/dist/middle_layer/project.d.ts.map +1 -1
- package/dist/middle_layer/project.js +76 -29
- package/dist/middle_layer/project.js.map +1 -1
- package/dist/middle_layer/project_overview.cjs +32 -11
- package/dist/middle_layer/project_overview.cjs.map +1 -1
- package/dist/middle_layer/project_overview.d.ts.map +1 -1
- package/dist/middle_layer/project_overview.js +32 -11
- package/dist/middle_layer/project_overview.js.map +1 -1
- package/dist/middle_layer/render.cjs +1 -1
- package/dist/middle_layer/render.cjs.map +1 -1
- package/dist/middle_layer/render.js +1 -1
- package/dist/middle_layer/render.js.map +1 -1
- package/dist/middle_layer/render.test.d.ts.map +1 -1
- package/dist/model/block_storage_helper.cjs +210 -0
- package/dist/model/block_storage_helper.cjs.map +1 -0
- package/dist/model/block_storage_helper.d.ts +98 -0
- package/dist/model/block_storage_helper.d.ts.map +1 -0
- package/dist/model/block_storage_helper.js +153 -0
- package/dist/model/block_storage_helper.js.map +1 -0
- package/dist/model/index.d.ts +2 -1
- package/dist/model/index.d.ts.map +1 -1
- package/dist/model/project_helper.cjs +177 -0
- package/dist/model/project_helper.cjs.map +1 -1
- package/dist/model/project_helper.d.ts +110 -1
- package/dist/model/project_helper.d.ts.map +1 -1
- package/dist/model/project_helper.js +178 -1
- package/dist/model/project_helper.js.map +1 -1
- package/dist/model/project_model.cjs +6 -3
- package/dist/model/project_model.cjs.map +1 -1
- package/dist/model/project_model.d.ts +3 -2
- package/dist/model/project_model.d.ts.map +1 -1
- package/dist/model/project_model.js +6 -4
- package/dist/model/project_model.js.map +1 -1
- package/dist/mutator/block-pack/block_pack.cjs +1 -2
- package/dist/mutator/block-pack/block_pack.cjs.map +1 -1
- package/dist/mutator/block-pack/block_pack.d.ts.map +1 -1
- package/dist/mutator/block-pack/block_pack.js +1 -2
- package/dist/mutator/block-pack/block_pack.js.map +1 -1
- package/dist/mutator/block-pack/frontend.cjs +1 -0
- package/dist/mutator/block-pack/frontend.cjs.map +1 -1
- package/dist/mutator/block-pack/frontend.js +1 -0
- package/dist/mutator/block-pack/frontend.js.map +1 -1
- package/dist/mutator/migration.cjs +64 -3
- package/dist/mutator/migration.cjs.map +1 -1
- package/dist/mutator/migration.d.ts.map +1 -1
- package/dist/mutator/migration.js +66 -5
- package/dist/mutator/migration.js.map +1 -1
- package/dist/mutator/project-v3.test.d.ts +2 -0
- package/dist/mutator/project-v3.test.d.ts.map +1 -0
- package/dist/mutator/project.cjs +282 -41
- package/dist/mutator/project.cjs.map +1 -1
- package/dist/mutator/project.d.ts +77 -12
- package/dist/mutator/project.d.ts.map +1 -1
- package/dist/mutator/project.js +283 -42
- package/dist/mutator/project.js.map +1 -1
- package/dist/pool/result_pool.cjs +9 -6
- package/dist/pool/result_pool.cjs.map +1 -1
- package/dist/pool/result_pool.d.ts.map +1 -1
- package/dist/pool/result_pool.js +9 -6
- package/dist/pool/result_pool.js.map +1 -1
- package/package.json +17 -17
- package/src/js_render/computable_context.ts +37 -7
- package/src/js_render/context.ts +12 -5
- package/src/js_render/index.ts +1 -1
- package/src/middle_layer/block.ts +13 -14
- package/src/middle_layer/block_ctx.ts +70 -23
- package/src/middle_layer/block_ctx_unsafe.ts +11 -4
- package/src/middle_layer/middle_layer.ts +2 -1
- package/src/middle_layer/project.ts +86 -40
- package/src/middle_layer/project_overview.ts +44 -20
- package/src/middle_layer/render.test.ts +1 -1
- package/src/middle_layer/render.ts +1 -1
- package/src/model/block_storage_helper.ts +213 -0
- package/src/model/index.ts +2 -1
- package/src/model/project_helper.ts +249 -1
- package/src/model/project_model.ts +9 -5
- package/src/mutator/block-pack/block_pack.ts +1 -2
- package/src/mutator/migration.ts +79 -6
- package/src/mutator/project-v3.test.ts +280 -0
- package/src/mutator/project.test.ts +27 -27
- package/src/mutator/project.ts +351 -68
- package/src/pool/result_pool.ts +11 -4
package/dist/js_render/index.js
CHANGED
|
@@ -148,7 +148,7 @@ function executeSingleLambda(quickJs, fh, codeWithInfo, ...args) {
|
|
|
148
148
|
const rCtx = new JsExecutionContext(scope, vm, (s) => { deadlineSettings = s; }, featureFlags);
|
|
149
149
|
// Initializing the model
|
|
150
150
|
rCtx.evaluateBundle(code.content);
|
|
151
|
-
// Running the lambda
|
|
151
|
+
// Running the lambda with arguments (e.g., state for args(), args for enrichmentTargets())
|
|
152
152
|
return rCtx.importObjectUniversal(rCtx.runCallback(fh.handle, ...args));
|
|
153
153
|
}
|
|
154
154
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../src/js_render/index.ts"],"sourcesContent":["import type { MiddleLayerEnvironment } from '../middle_layer/middle_layer';\nimport type { BlockCodeWithInfo, ConfigRenderLambda } from '@platforma-sdk/model';\nimport type { ComputableRenderingOps } from '@milaboratories/computable';\nimport { Computable } from '@milaboratories/computable';\nimport type { QuickJSWASMModule } from 'quickjs-emscripten';\nimport { Scope } from 'quickjs-emscripten';\nimport type { DeadlineSettings } from './context';\nimport { JsExecutionContext } from './context';\nimport type { BlockContextAny } from '../middle_layer/block_ctx';\nimport { getDebugFlags } from '../debug';\n\nfunction logOutputStatus(handle: string, renderedResult: unknown, stable: boolean, recalculationCounter: number, unstableMarker?: string) {\n if (getDebugFlags().logOutputStatus && (getDebugFlags().logOutputStatus === 'any' || !stable)) {\n if (stable)\n console.log(`Stable output ${handle} calculated ${renderedResult !== undefined ? 'defined' : 'undefined'}; (#${recalculationCounter})`);\n else\n console.log(`Unstable output ${handle}; marker = ${unstableMarker}; ${renderedResult !== undefined ? 'defined' : 'undefined'} (#${recalculationCounter})`);\n }\n}\n\n/**\n * Creates a Computable that executes a render function (`fh`) from a block's code in a QuickJS virtual machine.\n * This function handles both synchronous and asynchronous execution patterns of the sandboxed JS code.\n *\n * The overall data flow is as follows:\n * 1. A QuickJS VM is initialized.\n * 2. A `JsExecutionContext` is created to bridge the host (TypeScript) and guest (QuickJS) environments. It injects a\n * context object (`cfgRenderCtx`) into the VM, providing helper methods for the sandboxed code to interact with the\n * platform (e.g., to request data).\n * 3. The block's Javascript bundle is evaluated in the VM.\n * 4. The specified render function (`fh.handle`) is executed.\n *\n * Two execution paths are possible depending on the behavior of the render function:\n *\n * ### Synchronous Path\n * If the render function computes its result without requesting any external data requiring asynchronous calculations,\n * it executes synchronously.\n * - The `computablesToResolve` map in `JsExecutionContext` remains empty.\n * - The function returns an object with an `ir` field holding the result (`{ ir: importedResult }`).\n * Since `postprocessValue` is not specified, `ir` is treated as the final resolved value of the Computable.\n * - The QuickJS VM is disposed of immediately as it's no longer needed.\n *\n * ### Asynchronous Path (with `postprocessValue`)\n * If the render function needs external data requiring asynchronous calculations (e.g., fetching a file), it calls\n * one of the injected helper methods. These methods don't return data directly. Instead, they:\n * a. Create a new `Computable` for the data request (e.g., to fetch a blob).\n * b. Register this new `Computable` in the `computablesToResolve` map.\n * c. Return a handle (string) to the sandboxed code.\n *\n * In this case:\n * - The initial execution of the render function returns a scaffold of the final result, which depends on the pending\n * computables.\n * - The `computablesToResolve` map is passed as the `ir` (initial result) to `Computable.makeRaw`.\n * - The `postprocessValue` function is provided to handle the results once the computables are resolved.\n * - The QuickJS VM is kept alive (`keepVmAlive = true`) because its state is needed in `postprocessValue`.\n * - Once the `computable` framework resolves all dependencies, it calls `postprocessValue` with the resolved data.\n * - `postprocessValue` feeds the resolved data back into the VM, allowing the sandboxed code to compute the final\n * result.\n * - The VM is eventually disposed of when the host Computable is destroyed.\n *\n * @param env The middle layer environment.\n * @param ctx The block context.\n * @param fh The config render lambda to execute.\n * @param codeWithInfo The block's code and feature flags.\n * @param configKey A key for the configuration, used for cache busting.\n * @param ops Options for the computable.\n * @returns A `Computable` that will resolve to the result of the lambda execution.\n */\nexport function computableFromRF(\n env: MiddleLayerEnvironment,\n ctx: BlockContextAny,\n fh: ConfigRenderLambda,\n codeWithInfo: BlockCodeWithInfo,\n configKey: string,\n ops: Partial<ComputableRenderingOps> = {},\n): Computable<unknown> {\n // adding configKey to reload all outputs on block-pack update\n const key = `${ctx.blockId}#lambda#${configKey}#${fh.handle}`;\n ops = { ...ops, key };\n if (ops.mode === undefined && fh.retentive === true) ops.mode = 'StableOnlyRetentive';\n return Computable.makeRaw((cCtx) => {\n const { code, featureFlags } = codeWithInfo;\n\n if (getDebugFlags().logOutputRecalculations)\n console.log(`Block lambda recalculation : ${key} (${cCtx.changeSourceMarker}; ${cCtx.bodyInvocations} invocations)`);\n\n const scope = new Scope();\n let keepVmAlive = false;\n cCtx.addOnDestroy(() => {\n // If keepVmAlive is false, the scope will be disposed by the finally block,\n // no need to dispose it here.\n if (keepVmAlive) scope.dispose();\n });\n\n try {\n const runtime = scope.manage(env.quickJs.newRuntime());\n runtime.setMemoryLimit(1024 * 1024 * 8);\n runtime.setMaxStackSize(1024 * 320);\n\n let deadlineSettings: DeadlineSettings | undefined;\n runtime.setInterruptHandler(() => {\n if (deadlineSettings === undefined) return false;\n if (Date.now() > deadlineSettings.deadline) return true;\n return false;\n });\n const vm = scope.manage(runtime.newContext());\n const rCtx = new JsExecutionContext(scope, vm,\n (s) => { deadlineSettings = s; },\n featureFlags,\n { computableCtx: cCtx, blockCtx: ctx, mlEnv: env });\n\n rCtx.evaluateBundle(code.content);\n const result = rCtx.runCallback(fh.handle);\n\n rCtx.resetComputableCtx();\n\n const toBeResolved = rCtx.computableHelper!.computablesToResolve;\n\n if (Object.keys(toBeResolved).length === 0) {\n const importedResult = rCtx.importObjectUniversal(result);\n logOutputStatus(fh.handle, importedResult, cCtx.unstableMarker === undefined, -1, cCtx.unstableMarker);\n return { ir: importedResult };\n }\n\n let recalculationCounter = 0;\n if (getDebugFlags().logOutputStatus)\n console.log(`Output ${fh.handle} scaffold calculated (not all computables resolved yet).`);\n keepVmAlive = true;\n\n return {\n ir: toBeResolved,\n postprocessValue: (resolved: Record<string, unknown>, { unstableMarker, stable }) => {\n // resolving futures\n for (const [handle, value] of Object.entries(resolved)) rCtx.runCallback(handle, value);\n\n // rendering result\n const renderedResult = rCtx.importObjectUniversal(result);\n\n // logging\n recalculationCounter++;\n logOutputStatus(fh.handle, renderedResult, stable, recalculationCounter, unstableMarker);\n\n return renderedResult;\n },\n };\n } catch (e) {\n keepVmAlive = false;\n throw e;\n } finally {\n if (!keepVmAlive) scope.dispose();\n }\n }, ops);\n}\n\nexport function executeSingleLambda(\n quickJs: QuickJSWASMModule,\n fh: ConfigRenderLambda,\n codeWithInfo: BlockCodeWithInfo,\n ...args: unknown[]\n): unknown {\n const { code, featureFlags } = codeWithInfo;\n const scope = new Scope();\n try {\n const runtime = scope.manage(quickJs.newRuntime());\n runtime.setMemoryLimit(1024 * 1024 * 8);\n runtime.setMaxStackSize(1024 * 320);\n\n let deadlineSettings: DeadlineSettings | undefined;\n runtime.setInterruptHandler(() => {\n if (deadlineSettings === undefined) return false;\n if (Date.now() > deadlineSettings.deadline) return true;\n return false;\n });\n const vm = scope.manage(runtime.newContext());\n const rCtx = new JsExecutionContext(scope, vm,\n (s) => { deadlineSettings = s; },\n featureFlags,\n );\n\n // Initializing the model\n rCtx.evaluateBundle(code.content);\n\n // Running the lambda\n return rCtx.importObjectUniversal(rCtx.runCallback(fh.handle, ...args));\n } finally {\n scope.dispose();\n }\n}\n"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../src/js_render/index.ts"],"sourcesContent":["import type { MiddleLayerEnvironment } from '../middle_layer/middle_layer';\nimport type { BlockCodeWithInfo, ConfigRenderLambda } from '@platforma-sdk/model';\nimport type { ComputableRenderingOps } from '@milaboratories/computable';\nimport { Computable } from '@milaboratories/computable';\nimport type { QuickJSWASMModule } from 'quickjs-emscripten';\nimport { Scope } from 'quickjs-emscripten';\nimport type { DeadlineSettings } from './context';\nimport { JsExecutionContext } from './context';\nimport type { BlockContextAny } from '../middle_layer/block_ctx';\nimport { getDebugFlags } from '../debug';\n\nfunction logOutputStatus(handle: string, renderedResult: unknown, stable: boolean, recalculationCounter: number, unstableMarker?: string) {\n if (getDebugFlags().logOutputStatus && (getDebugFlags().logOutputStatus === 'any' || !stable)) {\n if (stable)\n console.log(`Stable output ${handle} calculated ${renderedResult !== undefined ? 'defined' : 'undefined'}; (#${recalculationCounter})`);\n else\n console.log(`Unstable output ${handle}; marker = ${unstableMarker}; ${renderedResult !== undefined ? 'defined' : 'undefined'} (#${recalculationCounter})`);\n }\n}\n\n/**\n * Creates a Computable that executes a render function (`fh`) from a block's code in a QuickJS virtual machine.\n * This function handles both synchronous and asynchronous execution patterns of the sandboxed JS code.\n *\n * The overall data flow is as follows:\n * 1. A QuickJS VM is initialized.\n * 2. A `JsExecutionContext` is created to bridge the host (TypeScript) and guest (QuickJS) environments. It injects a\n * context object (`cfgRenderCtx`) into the VM, providing helper methods for the sandboxed code to interact with the\n * platform (e.g., to request data).\n * 3. The block's Javascript bundle is evaluated in the VM.\n * 4. The specified render function (`fh.handle`) is executed.\n *\n * Two execution paths are possible depending on the behavior of the render function:\n *\n * ### Synchronous Path\n * If the render function computes its result without requesting any external data requiring asynchronous calculations,\n * it executes synchronously.\n * - The `computablesToResolve` map in `JsExecutionContext` remains empty.\n * - The function returns an object with an `ir` field holding the result (`{ ir: importedResult }`).\n * Since `postprocessValue` is not specified, `ir` is treated as the final resolved value of the Computable.\n * - The QuickJS VM is disposed of immediately as it's no longer needed.\n *\n * ### Asynchronous Path (with `postprocessValue`)\n * If the render function needs external data requiring asynchronous calculations (e.g., fetching a file), it calls\n * one of the injected helper methods. These methods don't return data directly. Instead, they:\n * a. Create a new `Computable` for the data request (e.g., to fetch a blob).\n * b. Register this new `Computable` in the `computablesToResolve` map.\n * c. Return a handle (string) to the sandboxed code.\n *\n * In this case:\n * - The initial execution of the render function returns a scaffold of the final result, which depends on the pending\n * computables.\n * - The `computablesToResolve` map is passed as the `ir` (initial result) to `Computable.makeRaw`.\n * - The `postprocessValue` function is provided to handle the results once the computables are resolved.\n * - The QuickJS VM is kept alive (`keepVmAlive = true`) because its state is needed in `postprocessValue`.\n * - Once the `computable` framework resolves all dependencies, it calls `postprocessValue` with the resolved data.\n * - `postprocessValue` feeds the resolved data back into the VM, allowing the sandboxed code to compute the final\n * result.\n * - The VM is eventually disposed of when the host Computable is destroyed.\n *\n * @param env The middle layer environment.\n * @param ctx The block context.\n * @param fh The config render lambda to execute.\n * @param codeWithInfo The block's code and feature flags.\n * @param configKey A key for the configuration, used for cache busting.\n * @param ops Options for the computable.\n * @returns A `Computable` that will resolve to the result of the lambda execution.\n */\nexport function computableFromRF(\n env: MiddleLayerEnvironment,\n ctx: BlockContextAny,\n fh: ConfigRenderLambda,\n codeWithInfo: BlockCodeWithInfo,\n configKey: string,\n ops: Partial<ComputableRenderingOps> = {},\n): Computable<unknown> {\n // adding configKey to reload all outputs on block-pack update\n const key = `${ctx.blockId}#lambda#${configKey}#${fh.handle}`;\n ops = { ...ops, key };\n if (ops.mode === undefined && fh.retentive === true) ops.mode = 'StableOnlyRetentive';\n return Computable.makeRaw((cCtx) => {\n const { code, featureFlags } = codeWithInfo;\n\n if (getDebugFlags().logOutputRecalculations)\n console.log(`Block lambda recalculation : ${key} (${cCtx.changeSourceMarker}; ${cCtx.bodyInvocations} invocations)`);\n\n const scope = new Scope();\n let keepVmAlive = false;\n cCtx.addOnDestroy(() => {\n // If keepVmAlive is false, the scope will be disposed by the finally block,\n // no need to dispose it here.\n if (keepVmAlive) scope.dispose();\n });\n\n try {\n const runtime = scope.manage(env.quickJs.newRuntime());\n runtime.setMemoryLimit(1024 * 1024 * 8);\n runtime.setMaxStackSize(1024 * 320);\n\n let deadlineSettings: DeadlineSettings | undefined;\n runtime.setInterruptHandler(() => {\n if (deadlineSettings === undefined) return false;\n if (Date.now() > deadlineSettings.deadline) return true;\n return false;\n });\n const vm = scope.manage(runtime.newContext());\n const rCtx = new JsExecutionContext(scope, vm,\n (s) => { deadlineSettings = s; },\n featureFlags,\n { computableCtx: cCtx, blockCtx: ctx, mlEnv: env });\n\n rCtx.evaluateBundle(code.content);\n const result = rCtx.runCallback(fh.handle);\n\n rCtx.resetComputableCtx();\n\n const toBeResolved = rCtx.computableHelper!.computablesToResolve;\n\n if (Object.keys(toBeResolved).length === 0) {\n const importedResult = rCtx.importObjectUniversal(result);\n logOutputStatus(fh.handle, importedResult, cCtx.unstableMarker === undefined, -1, cCtx.unstableMarker);\n return { ir: importedResult };\n }\n\n let recalculationCounter = 0;\n if (getDebugFlags().logOutputStatus)\n console.log(`Output ${fh.handle} scaffold calculated (not all computables resolved yet).`);\n keepVmAlive = true;\n\n return {\n ir: toBeResolved,\n postprocessValue: (resolved: Record<string, unknown>, { unstableMarker, stable }) => {\n // resolving futures\n for (const [handle, value] of Object.entries(resolved)) rCtx.runCallback(handle, value);\n\n // rendering result\n const renderedResult = rCtx.importObjectUniversal(result);\n\n // logging\n recalculationCounter++;\n logOutputStatus(fh.handle, renderedResult, stable, recalculationCounter, unstableMarker);\n\n return renderedResult;\n },\n };\n } catch (e) {\n keepVmAlive = false;\n throw e;\n } finally {\n if (!keepVmAlive) scope.dispose();\n }\n }, ops);\n}\n\nexport function executeSingleLambda(\n quickJs: QuickJSWASMModule,\n fh: ConfigRenderLambda,\n codeWithInfo: BlockCodeWithInfo,\n ...args: unknown[]\n): unknown {\n const { code, featureFlags } = codeWithInfo;\n const scope = new Scope();\n try {\n const runtime = scope.manage(quickJs.newRuntime());\n runtime.setMemoryLimit(1024 * 1024 * 8);\n runtime.setMaxStackSize(1024 * 320);\n\n let deadlineSettings: DeadlineSettings | undefined;\n runtime.setInterruptHandler(() => {\n if (deadlineSettings === undefined) return false;\n if (Date.now() > deadlineSettings.deadline) return true;\n return false;\n });\n const vm = scope.manage(runtime.newContext());\n const rCtx = new JsExecutionContext(scope, vm,\n (s) => { deadlineSettings = s; },\n featureFlags,\n );\n\n // Initializing the model\n rCtx.evaluateBundle(code.content);\n\n // Running the lambda with arguments (e.g., state for args(), args for enrichmentTargets())\n return rCtx.importObjectUniversal(rCtx.runCallback(fh.handle, ...args));\n } finally {\n scope.dispose();\n }\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -11,20 +11,19 @@ var tsHelpers = require('@milaboratories/ts-helpers');
|
|
|
11
11
|
var model = require('@platforma-sdk/model');
|
|
12
12
|
var index = require('../debug/index.cjs');
|
|
13
13
|
|
|
14
|
-
function
|
|
14
|
+
function getBlockParameters(projectEntry, blockId, cCtx) {
|
|
15
15
|
if (cCtx === undefined)
|
|
16
|
-
return computable.Computable.make((c) =>
|
|
16
|
+
return computable.Computable.make((c) => getBlockParameters(projectEntry, blockId, c), {
|
|
17
17
|
key: `inputs#${plClient.resourceIdToString(projectEntry.rid)}#${blockId}`,
|
|
18
18
|
});
|
|
19
19
|
const prj = cCtx.accessor(projectEntry).node();
|
|
20
20
|
const ctx = block_ctx.constructBlockContextArgsOnly(projectEntry, blockId);
|
|
21
|
-
const
|
|
21
|
+
const blockStorageJson = ctx.blockStorage(cCtx);
|
|
22
|
+
// Parse raw storage JSON - UI will derive data using sdk/model
|
|
23
|
+
const blockStorage = blockStorageJson !== undefined ? tsHelpers.deepFreeze(JSON.parse(blockStorageJson)) : undefined;
|
|
22
24
|
return {
|
|
23
25
|
author: prj.getKeyValueAsJson(project_model.blockArgsAuthorKey(blockId)),
|
|
24
|
-
|
|
25
|
-
args: tsHelpers.deepFreeze(JSON.parse(ctx.args(cCtx))),
|
|
26
|
-
// @TODO add deserialization caching
|
|
27
|
-
ui: uiState !== undefined ? tsHelpers.deepFreeze(JSON.parse(uiState)) : undefined,
|
|
26
|
+
blockStorage,
|
|
28
27
|
};
|
|
29
28
|
}
|
|
30
29
|
function blockOutputs(projectEntry, blockId, env) {
|
|
@@ -46,6 +45,6 @@ function blockOutputs(projectEntry, blockId, env) {
|
|
|
46
45
|
}, { key }).withStableType();
|
|
47
46
|
}
|
|
48
47
|
|
|
49
|
-
exports.blockArgsAndUiState = blockArgsAndUiState;
|
|
50
48
|
exports.blockOutputs = blockOutputs;
|
|
49
|
+
exports.getBlockParameters = getBlockParameters;
|
|
51
50
|
//# sourceMappingURL=block.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.cjs","sources":["../../src/middle_layer/block.ts"],"sourcesContent":["import type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport type {\n ComputableCtx,\n ComputableStableDefined,\n ComputableValueOrErrors,\n} from '@milaboratories/computable';\nimport {\n Computable,\n} from '@milaboratories/computable';\nimport { constructBlockContext, constructBlockContextArgsOnly } from './block_ctx';\nimport { blockArgsAuthorKey } from '../model/project_model';\nimport { ifNotUndef } from '../cfg_render/util';\nimport type { MiddleLayerEnvironment } from './middle_layer';\nimport { getBlockPackInfo } from './util';\nimport type { AuthorMarker,
|
|
1
|
+
{"version":3,"file":"block.cjs","sources":["../../src/middle_layer/block.ts"],"sourcesContent":["import type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport type {\n ComputableCtx,\n ComputableStableDefined,\n ComputableValueOrErrors,\n} from '@milaboratories/computable';\nimport {\n Computable,\n} from '@milaboratories/computable';\nimport { constructBlockContext, constructBlockContextArgsOnly } from './block_ctx';\nimport { blockArgsAuthorKey } from '../model/project_model';\nimport { ifNotUndef } from '../cfg_render/util';\nimport type { MiddleLayerEnvironment } from './middle_layer';\nimport { getBlockPackInfo } from './util';\nimport type { AuthorMarker, BlockStateInternalV3 } from '@milaboratories/pl-model-middle-layer';\nimport { computableFromCfgOrRF } from './render';\nimport { resourceIdToString } from '@milaboratories/pl-client';\nimport { deepFreeze } from '@milaboratories/ts-helpers';\nimport { extractCodeWithInfo } from '@platforma-sdk/model';\nimport { getDebugFlags } from '../debug';\n\nexport type BlockParameters = Omit<BlockStateInternalV3, 'outputs' | 'navigationState'>;\n\nexport function getBlockParameters(\n projectEntry: PlTreeEntry,\n blockId: string\n): Computable<BlockParameters>;\nexport function getBlockParameters(\n projectEntry: PlTreeEntry,\n blockId: string,\n cCtx: ComputableCtx\n): BlockParameters;\nexport function getBlockParameters(\n projectEntry: PlTreeEntry,\n blockId: string,\n cCtx?: ComputableCtx,\n): BlockParameters | Computable<BlockParameters> {\n if (cCtx === undefined)\n return Computable.make((c) => getBlockParameters(projectEntry, blockId, c), {\n key: `inputs#${resourceIdToString(projectEntry.rid)}#${blockId}`,\n });\n\n const prj = cCtx.accessor(projectEntry).node();\n const ctx = constructBlockContextArgsOnly(projectEntry, blockId);\n const blockStorageJson = ctx.blockStorage(cCtx);\n // Parse raw storage JSON - UI will derive data using sdk/model\n const blockStorage = blockStorageJson !== undefined ? deepFreeze(JSON.parse(blockStorageJson)) : undefined;\n return {\n author: prj.getKeyValueAsJson<AuthorMarker>(blockArgsAuthorKey(blockId)),\n blockStorage,\n };\n}\n\nexport function blockOutputs(\n projectEntry: PlTreeEntry,\n blockId: string,\n env: MiddleLayerEnvironment,\n): ComputableStableDefined<Record<string, ComputableValueOrErrors<unknown>>> {\n const key = 'outputs#' + resourceIdToString(projectEntry.rid) + '#' + blockId;\n return Computable.make(\n (c) => {\n if (getDebugFlags().logOutputRecalculations) {\n console.log(`blockOutput recalculation : ${key} (${c.changeSourceMarker}; ${c.bodyInvocations} invocations)`);\n }\n\n const prj = c.accessor(projectEntry).node();\n const ctx = constructBlockContext(projectEntry, blockId);\n\n return ifNotUndef(getBlockPackInfo(prj, blockId), ({ cfg, bpId }) => {\n const outputs: Record<string, Computable<any>> = {};\n for (const [cellId, cellCfg] of Object.entries(cfg.outputs)) {\n const computableOutput = computableFromCfgOrRF(env, ctx, cellCfg, extractCodeWithInfo(cfg), bpId);\n outputs[cellId] = Computable.wrapError(computableOutput, 1);\n }\n return outputs;\n });\n },\n { key },\n ).withStableType();\n}\n"],"names":["Computable","resourceIdToString","constructBlockContextArgsOnly","deepFreeze","blockArgsAuthorKey","getDebugFlags","constructBlockContext","ifNotUndef","getBlockPackInfo","computableFromCfgOrRF","extractCodeWithInfo"],"mappings":";;;;;;;;;;;;;SAgCgB,kBAAkB,CAChC,YAAyB,EACzB,OAAe,EACf,IAAoB,EAAA;IAEpB,IAAI,IAAI,KAAK,SAAS;AACpB,QAAA,OAAOA,qBAAU,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;YAC1E,GAAG,EAAE,CAAA,OAAA,EAAUC,2BAAkB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA,CAAA,EAAI,OAAO,CAAA,CAAE;AACjE,SAAA,CAAC;IAEJ,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE;IAC9C,MAAM,GAAG,GAAGC,uCAA6B,CAAC,YAAY,EAAE,OAAO,CAAC;IAChE,MAAM,gBAAgB,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;;IAE/C,MAAM,YAAY,GAAG,gBAAgB,KAAK,SAAS,GAAGC,oBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,GAAG,SAAS;IAC1G,OAAO;QACL,MAAM,EAAE,GAAG,CAAC,iBAAiB,CAAeC,gCAAkB,CAAC,OAAO,CAAC,CAAC;QACxE,YAAY;KACb;AACH;SAEgB,YAAY,CAC1B,YAAyB,EACzB,OAAe,EACf,GAA2B,EAAA;AAE3B,IAAA,MAAM,GAAG,GAAG,UAAU,GAAGH,2BAAkB,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO;AAC7E,IAAA,OAAOD,qBAAU,CAAC,IAAI,CACpB,CAAC,CAAC,KAAI;AACJ,QAAA,IAAIK,mBAAa,EAAE,CAAC,uBAAuB,EAAE;AAC3C,YAAA,OAAO,CAAC,GAAG,CAAC,CAAA,4BAAA,EAA+B,GAAG,CAAA,EAAA,EAAK,CAAC,CAAC,kBAAkB,KAAK,CAAC,CAAC,eAAe,CAAA,aAAA,CAAe,CAAC;QAC/G;QAEA,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE;QAC3C,MAAM,GAAG,GAAGC,+BAAqB,CAAC,YAAY,EAAE,OAAO,CAAC;AAExD,QAAA,OAAOC,eAAU,CAACC,uBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAI;YAClE,MAAM,OAAO,GAAoC,EAAE;AACnD,YAAA,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;AAC3D,gBAAA,MAAM,gBAAgB,GAAGC,4BAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAEC,yBAAmB,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;AACjG,gBAAA,OAAO,CAAC,MAAM,CAAC,GAAGV,qBAAU,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAC7D;AACA,YAAA,OAAO,OAAO;AAChB,QAAA,CAAC,CAAC;IACJ,CAAC,EACD,EAAE,GAAG,EAAE,CACR,CAAC,cAAc,EAAE;AACpB;;;;;"}
|
|
@@ -2,9 +2,9 @@ import type { PlTreeEntry } from '@milaboratories/pl-tree';
|
|
|
2
2
|
import type { ComputableCtx, ComputableStableDefined, ComputableValueOrErrors } from '@milaboratories/computable';
|
|
3
3
|
import { Computable } from '@milaboratories/computable';
|
|
4
4
|
import type { MiddleLayerEnvironment } from './middle_layer';
|
|
5
|
-
import type {
|
|
6
|
-
export type
|
|
7
|
-
export declare function
|
|
8
|
-
export declare function
|
|
5
|
+
import type { BlockStateInternalV3 } from '@milaboratories/pl-model-middle-layer';
|
|
6
|
+
export type BlockParameters = Omit<BlockStateInternalV3, 'outputs' | 'navigationState'>;
|
|
7
|
+
export declare function getBlockParameters(projectEntry: PlTreeEntry, blockId: string): Computable<BlockParameters>;
|
|
8
|
+
export declare function getBlockParameters(projectEntry: PlTreeEntry, blockId: string, cCtx: ComputableCtx): BlockParameters;
|
|
9
9
|
export declare function blockOutputs(projectEntry: PlTreeEntry, blockId: string, env: MiddleLayerEnvironment): ComputableStableDefined<Record<string, ComputableValueOrErrors<unknown>>>;
|
|
10
10
|
//# sourceMappingURL=block.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/middle_layer/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,UAAU,EACX,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,KAAK,EAAgB,
|
|
1
|
+
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../src/middle_layer/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EACV,aAAa,EACb,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,UAAU,EACX,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,KAAK,EAAgB,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAOhG,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,iBAAiB,CAAC,CAAC;AAExF,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,WAAW,EACzB,OAAO,EAAE,MAAM,GACd,UAAU,CAAC,eAAe,CAAC,CAAC;AAC/B,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,WAAW,EACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,aAAa,GAClB,eAAe,CAAC;AAsBnB,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,CAsB3E"}
|
|
@@ -9,20 +9,19 @@ import { deepFreeze } from '@milaboratories/ts-helpers';
|
|
|
9
9
|
import { extractCodeWithInfo } from '@platforma-sdk/model';
|
|
10
10
|
import { getDebugFlags } from '../debug/index.js';
|
|
11
11
|
|
|
12
|
-
function
|
|
12
|
+
function getBlockParameters(projectEntry, blockId, cCtx) {
|
|
13
13
|
if (cCtx === undefined)
|
|
14
|
-
return Computable.make((c) =>
|
|
14
|
+
return Computable.make((c) => getBlockParameters(projectEntry, blockId, c), {
|
|
15
15
|
key: `inputs#${resourceIdToString(projectEntry.rid)}#${blockId}`,
|
|
16
16
|
});
|
|
17
17
|
const prj = cCtx.accessor(projectEntry).node();
|
|
18
18
|
const ctx = constructBlockContextArgsOnly(projectEntry, blockId);
|
|
19
|
-
const
|
|
19
|
+
const blockStorageJson = ctx.blockStorage(cCtx);
|
|
20
|
+
// Parse raw storage JSON - UI will derive data using sdk/model
|
|
21
|
+
const blockStorage = blockStorageJson !== undefined ? deepFreeze(JSON.parse(blockStorageJson)) : undefined;
|
|
20
22
|
return {
|
|
21
23
|
author: prj.getKeyValueAsJson(blockArgsAuthorKey(blockId)),
|
|
22
|
-
|
|
23
|
-
args: deepFreeze(JSON.parse(ctx.args(cCtx))),
|
|
24
|
-
// @TODO add deserialization caching
|
|
25
|
-
ui: uiState !== undefined ? deepFreeze(JSON.parse(uiState)) : undefined,
|
|
24
|
+
blockStorage,
|
|
26
25
|
};
|
|
27
26
|
}
|
|
28
27
|
function blockOutputs(projectEntry, blockId, env) {
|
|
@@ -44,5 +43,5 @@ function blockOutputs(projectEntry, blockId, env) {
|
|
|
44
43
|
}, { key }).withStableType();
|
|
45
44
|
}
|
|
46
45
|
|
|
47
|
-
export {
|
|
46
|
+
export { blockOutputs, getBlockParameters };
|
|
48
47
|
//# sourceMappingURL=block.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.js","sources":["../../src/middle_layer/block.ts"],"sourcesContent":["import type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport type {\n ComputableCtx,\n ComputableStableDefined,\n ComputableValueOrErrors,\n} from '@milaboratories/computable';\nimport {\n Computable,\n} from '@milaboratories/computable';\nimport { constructBlockContext, constructBlockContextArgsOnly } from './block_ctx';\nimport { blockArgsAuthorKey } from '../model/project_model';\nimport { ifNotUndef } from '../cfg_render/util';\nimport type { MiddleLayerEnvironment } from './middle_layer';\nimport { getBlockPackInfo } from './util';\nimport type { AuthorMarker,
|
|
1
|
+
{"version":3,"file":"block.js","sources":["../../src/middle_layer/block.ts"],"sourcesContent":["import type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport type {\n ComputableCtx,\n ComputableStableDefined,\n ComputableValueOrErrors,\n} from '@milaboratories/computable';\nimport {\n Computable,\n} from '@milaboratories/computable';\nimport { constructBlockContext, constructBlockContextArgsOnly } from './block_ctx';\nimport { blockArgsAuthorKey } from '../model/project_model';\nimport { ifNotUndef } from '../cfg_render/util';\nimport type { MiddleLayerEnvironment } from './middle_layer';\nimport { getBlockPackInfo } from './util';\nimport type { AuthorMarker, BlockStateInternalV3 } from '@milaboratories/pl-model-middle-layer';\nimport { computableFromCfgOrRF } from './render';\nimport { resourceIdToString } from '@milaboratories/pl-client';\nimport { deepFreeze } from '@milaboratories/ts-helpers';\nimport { extractCodeWithInfo } from '@platforma-sdk/model';\nimport { getDebugFlags } from '../debug';\n\nexport type BlockParameters = Omit<BlockStateInternalV3, 'outputs' | 'navigationState'>;\n\nexport function getBlockParameters(\n projectEntry: PlTreeEntry,\n blockId: string\n): Computable<BlockParameters>;\nexport function getBlockParameters(\n projectEntry: PlTreeEntry,\n blockId: string,\n cCtx: ComputableCtx\n): BlockParameters;\nexport function getBlockParameters(\n projectEntry: PlTreeEntry,\n blockId: string,\n cCtx?: ComputableCtx,\n): BlockParameters | Computable<BlockParameters> {\n if (cCtx === undefined)\n return Computable.make((c) => getBlockParameters(projectEntry, blockId, c), {\n key: `inputs#${resourceIdToString(projectEntry.rid)}#${blockId}`,\n });\n\n const prj = cCtx.accessor(projectEntry).node();\n const ctx = constructBlockContextArgsOnly(projectEntry, blockId);\n const blockStorageJson = ctx.blockStorage(cCtx);\n // Parse raw storage JSON - UI will derive data using sdk/model\n const blockStorage = blockStorageJson !== undefined ? deepFreeze(JSON.parse(blockStorageJson)) : undefined;\n return {\n author: prj.getKeyValueAsJson<AuthorMarker>(blockArgsAuthorKey(blockId)),\n blockStorage,\n };\n}\n\nexport function blockOutputs(\n projectEntry: PlTreeEntry,\n blockId: string,\n env: MiddleLayerEnvironment,\n): ComputableStableDefined<Record<string, ComputableValueOrErrors<unknown>>> {\n const key = 'outputs#' + resourceIdToString(projectEntry.rid) + '#' + blockId;\n return Computable.make(\n (c) => {\n if (getDebugFlags().logOutputRecalculations) {\n console.log(`blockOutput recalculation : ${key} (${c.changeSourceMarker}; ${c.bodyInvocations} invocations)`);\n }\n\n const prj = c.accessor(projectEntry).node();\n const ctx = constructBlockContext(projectEntry, blockId);\n\n return ifNotUndef(getBlockPackInfo(prj, blockId), ({ cfg, bpId }) => {\n const outputs: Record<string, Computable<any>> = {};\n for (const [cellId, cellCfg] of Object.entries(cfg.outputs)) {\n const computableOutput = computableFromCfgOrRF(env, ctx, cellCfg, extractCodeWithInfo(cfg), bpId);\n outputs[cellId] = Computable.wrapError(computableOutput, 1);\n }\n return outputs;\n });\n },\n { key },\n ).withStableType();\n}\n"],"names":[],"mappings":";;;;;;;;;;;SAgCgB,kBAAkB,CAChC,YAAyB,EACzB,OAAe,EACf,IAAoB,EAAA;IAEpB,IAAI,IAAI,KAAK,SAAS;AACpB,QAAA,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;YAC1E,GAAG,EAAE,CAAA,OAAA,EAAU,kBAAkB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA,CAAA,EAAI,OAAO,CAAA,CAAE;AACjE,SAAA,CAAC;IAEJ,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE;IAC9C,MAAM,GAAG,GAAG,6BAA6B,CAAC,YAAY,EAAE,OAAO,CAAC;IAChE,MAAM,gBAAgB,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;;IAE/C,MAAM,YAAY,GAAG,gBAAgB,KAAK,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,GAAG,SAAS;IAC1G,OAAO;QACL,MAAM,EAAE,GAAG,CAAC,iBAAiB,CAAe,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxE,YAAY;KACb;AACH;SAEgB,YAAY,CAC1B,YAAyB,EACzB,OAAe,EACf,GAA2B,EAAA;AAE3B,IAAA,MAAM,GAAG,GAAG,UAAU,GAAG,kBAAkB,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO;AAC7E,IAAA,OAAO,UAAU,CAAC,IAAI,CACpB,CAAC,CAAC,KAAI;AACJ,QAAA,IAAI,aAAa,EAAE,CAAC,uBAAuB,EAAE;AAC3C,YAAA,OAAO,CAAC,GAAG,CAAC,CAAA,4BAAA,EAA+B,GAAG,CAAA,EAAA,EAAK,CAAC,CAAC,kBAAkB,KAAK,CAAC,CAAC,eAAe,CAAA,aAAA,CAAe,CAAC;QAC/G;QAEA,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE;QAC3C,MAAM,GAAG,GAAG,qBAAqB,CAAC,YAAY,EAAE,OAAO,CAAC;AAExD,QAAA,OAAO,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAI;YAClE,MAAM,OAAO,GAAoC,EAAE;AACnD,YAAA,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;AAC3D,gBAAA,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;AACjG,gBAAA,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAC7D;AACA,YAAA,OAAO,OAAO;AAChB,QAAA,CAAC,CAAC;IACJ,CAAC,EACD,EAAE,GAAG,EAAE,CACR,CAAC,cAAc,EAAE;AACpB;;;;"}
|
|
@@ -4,16 +4,20 @@ var tsHelpers = require('@milaboratories/ts-helpers');
|
|
|
4
4
|
var project_model = require('../model/project_model.cjs');
|
|
5
5
|
var project_model_util = require('../model/project_model_util.cjs');
|
|
6
6
|
var result_pool = require('../pool/result_pool.cjs');
|
|
7
|
+
var model = require('@platforma-sdk/model');
|
|
7
8
|
|
|
8
9
|
function constructBlockContextArgsOnly(projectEntry, blockId) {
|
|
9
|
-
const args = (cCtx) =>
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
const args = (cCtx) => {
|
|
11
|
+
const data = cCtx
|
|
12
|
+
.accessor(projectEntry)
|
|
13
|
+
.node()
|
|
14
|
+
.traverse({
|
|
15
|
+
field: project_model.projectFieldName(blockId, 'currentArgs'),
|
|
16
|
+
stableIfNotFound: true,
|
|
17
|
+
})
|
|
18
|
+
?.getData();
|
|
19
|
+
return data ? tsHelpers.cachedDecode(data) : undefined;
|
|
20
|
+
};
|
|
17
21
|
const activeArgs = (cCtx) => {
|
|
18
22
|
const data = cCtx
|
|
19
23
|
.accessor(projectEntry)
|
|
@@ -25,12 +29,50 @@ function constructBlockContextArgsOnly(projectEntry, blockId) {
|
|
|
25
29
|
?.getData();
|
|
26
30
|
return data ? tsHelpers.cachedDecode(data) : undefined;
|
|
27
31
|
};
|
|
28
|
-
const
|
|
32
|
+
const data = (cCtx) => {
|
|
29
33
|
const data = cCtx
|
|
30
34
|
.accessor(projectEntry)
|
|
31
35
|
.node()
|
|
32
36
|
.traverse({
|
|
33
|
-
field: project_model.projectFieldName(blockId, '
|
|
37
|
+
field: project_model.projectFieldName(blockId, 'blockStorage'),
|
|
38
|
+
stableIfNotFound: true,
|
|
39
|
+
})
|
|
40
|
+
?.getData();
|
|
41
|
+
if (!data)
|
|
42
|
+
return undefined;
|
|
43
|
+
const rawJson = tsHelpers.cachedDecode(data);
|
|
44
|
+
if (!rawJson)
|
|
45
|
+
return undefined;
|
|
46
|
+
// Parse to check if it's BlockStorage format
|
|
47
|
+
try {
|
|
48
|
+
const parsed = JSON.parse(rawJson);
|
|
49
|
+
return JSON.stringify(model.deriveDataFromStorage(parsed));
|
|
50
|
+
}
|
|
51
|
+
catch (err) {
|
|
52
|
+
console.error('Error deriving data from storage', err);
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
// Returns raw blockStorage JSON - UI derives data using sdk/model
|
|
57
|
+
const blockStorage = (cCtx) => {
|
|
58
|
+
const storageData = cCtx
|
|
59
|
+
.accessor(projectEntry)
|
|
60
|
+
.node()
|
|
61
|
+
.traverse({
|
|
62
|
+
field: project_model.projectFieldName(blockId, 'blockStorage'),
|
|
63
|
+
stableIfNotFound: true,
|
|
64
|
+
})
|
|
65
|
+
?.getData();
|
|
66
|
+
if (!storageData)
|
|
67
|
+
return undefined;
|
|
68
|
+
return tsHelpers.cachedDecode(storageData);
|
|
69
|
+
};
|
|
70
|
+
const prerunArgs = (cCtx) => {
|
|
71
|
+
const data = cCtx
|
|
72
|
+
.accessor(projectEntry)
|
|
73
|
+
.node()
|
|
74
|
+
.traverse({
|
|
75
|
+
field: project_model.projectFieldName(blockId, 'currentPrerunArgs'),
|
|
34
76
|
stableIfNotFound: true,
|
|
35
77
|
})
|
|
36
78
|
?.getData();
|
|
@@ -40,7 +82,9 @@ function constructBlockContextArgsOnly(projectEntry, blockId) {
|
|
|
40
82
|
blockId,
|
|
41
83
|
args,
|
|
42
84
|
activeArgs,
|
|
43
|
-
|
|
85
|
+
data,
|
|
86
|
+
blockStorage,
|
|
87
|
+
prerunArgs,
|
|
44
88
|
blockMeta: (cCtx) => {
|
|
45
89
|
const prj = cCtx.accessor(projectEntry).node();
|
|
46
90
|
const structure = tsHelpers.notEmpty(prj.getKeyValueAsJson(project_model.ProjectStructureKey));
|
|
@@ -66,16 +110,26 @@ function constructBlockContext(projectEntry, blockId) {
|
|
|
66
110
|
?.persist();
|
|
67
111
|
},
|
|
68
112
|
staging: (cCtx) => {
|
|
113
|
+
// Check if staging is expected (currentPrerunArgs is set)
|
|
114
|
+
// For blocks with failed args derivation, staging will never be rendered
|
|
115
|
+
const hasPrerunArgs = cCtx
|
|
116
|
+
.accessor(projectEntry)
|
|
117
|
+
.node({ ignoreError: true })
|
|
118
|
+
.traverse({
|
|
119
|
+
field: project_model.projectFieldName(blockId, 'currentPrerunArgs'),
|
|
120
|
+
stableIfNotFound: true,
|
|
121
|
+
ignoreError: true,
|
|
122
|
+
}) !== undefined;
|
|
69
123
|
const result = cCtx
|
|
70
124
|
.accessor(projectEntry)
|
|
71
125
|
.node({ ignoreError: true })
|
|
72
126
|
.traverse({
|
|
73
127
|
field: project_model.projectFieldName(blockId, 'stagingOutput'),
|
|
128
|
+
// Only mark stable if staging is NOT expected (no prerunArgs)
|
|
129
|
+
stableIfNotFound: !hasPrerunArgs,
|
|
74
130
|
ignoreError: true,
|
|
75
131
|
})
|
|
76
132
|
?.persist();
|
|
77
|
-
if (result === undefined)
|
|
78
|
-
cCtx.markUnstable('staging_not_rendered');
|
|
79
133
|
return result;
|
|
80
134
|
},
|
|
81
135
|
getResultsPool: (cCtx) => result_pool.ResultPool.create(cCtx, projectEntry, blockId),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_ctx.cjs","sources":["../../src/middle_layer/block_ctx.ts"],"sourcesContent":["import type { ComputableCtx } from '@milaboratories/computable';\nimport type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport { cachedDecode, notEmpty } from '@milaboratories/ts-helpers';\nimport type { Optional } from 'utility-types';\nimport type {\n Block,\n ProjectStructure } from '../model/project_model';\nimport {\n ProjectStructureKey,\n projectFieldName,\n} from '../model/project_model';\nimport { allBlocks } from '../model/project_model_util';\nimport { ResultPool } from '../pool/result_pool';\n\nexport type
|
|
1
|
+
{"version":3,"file":"block_ctx.cjs","sources":["../../src/middle_layer/block_ctx.ts"],"sourcesContent":["import type { ComputableCtx } from '@milaboratories/computable';\nimport type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport { cachedDecode, notEmpty } from '@milaboratories/ts-helpers';\nimport type { Optional } from 'utility-types';\nimport type {\n Block,\n ProjectStructure } from '../model/project_model';\nimport {\n ProjectStructureKey,\n projectFieldName,\n} from '../model/project_model';\nimport { allBlocks } from '../model/project_model_util';\nimport { ResultPool } from '../pool/result_pool';\nimport { deriveDataFromStorage } from '@platforma-sdk/model';\n\nexport type BlockContextArgsOnly = {\n readonly blockId: string;\n readonly args: (cCtx: ComputableCtx) => string | undefined;\n readonly activeArgs: (cCtx: ComputableCtx) => string | undefined;\n readonly blockMeta: (cCtx: ComputableCtx) => Map<string, Block>;\n readonly data: (cCtx: ComputableCtx) => string | undefined;\n readonly blockStorage: (cCtx: ComputableCtx) => string | undefined;\n readonly prerunArgs: (cCtx: ComputableCtx) => string | undefined;\n};\n\nexport type BlockContextFull = BlockContextArgsOnly & {\n readonly prod: (cCtx: ComputableCtx) => PlTreeEntry | undefined;\n readonly staging: (cCtx: ComputableCtx) => PlTreeEntry | undefined;\n readonly getResultsPool: (cCtx: ComputableCtx) => ResultPool;\n};\n\nexport type BlockContextAny = Optional<BlockContextFull, 'prod' | 'staging' | 'getResultsPool'>;\n\nexport function constructBlockContextArgsOnly(\n projectEntry: PlTreeEntry,\n blockId: string,\n): BlockContextArgsOnly {\n const args = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'currentArgs'),\n stableIfNotFound: true,\n })\n ?.getData();\n return data ? cachedDecode(data) : undefined;\n };\n const activeArgs = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'prodArgs'),\n stableIfNotFound: true,\n })\n ?.getData();\n return data ? cachedDecode(data) : undefined;\n };\n const data = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'blockStorage'),\n stableIfNotFound: true,\n })\n ?.getData();\n if (!data) return undefined;\n\n const rawJson = cachedDecode(data);\n if (!rawJson) return undefined;\n\n // Parse to check if it's BlockStorage format\n try {\n const parsed = JSON.parse(rawJson);\n return JSON.stringify(deriveDataFromStorage(parsed));\n } catch (err) {\n console.error('Error deriving data from storage', err);\n return undefined;\n }\n };\n // Returns raw blockStorage JSON - UI derives data using sdk/model\n const blockStorage = (cCtx: ComputableCtx) => {\n const storageData = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'blockStorage'),\n stableIfNotFound: true,\n })\n ?.getData();\n if (!storageData) return undefined;\n return cachedDecode(storageData);\n };\n const prerunArgs = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'currentPrerunArgs'),\n stableIfNotFound: true,\n })\n ?.getData();\n return data ? cachedDecode(data) : undefined;\n };\n return {\n blockId,\n args,\n activeArgs,\n data,\n blockStorage,\n prerunArgs,\n blockMeta: (cCtx: ComputableCtx) => {\n const prj = cCtx.accessor(projectEntry).node();\n const structure = notEmpty(prj.getKeyValueAsJson<ProjectStructure>(ProjectStructureKey));\n const result = new Map<string, Block>();\n for (const block of allBlocks(structure)) result.set(block.id, block);\n return result;\n },\n };\n}\n\nexport function constructBlockContext(\n projectEntry: PlTreeEntry,\n blockId: string,\n): BlockContextFull {\n return {\n ...constructBlockContextArgsOnly(projectEntry, blockId),\n prod: (cCtx: ComputableCtx) => {\n return cCtx\n .accessor(projectEntry)\n .node({ ignoreError: true })\n .traverse({\n field: projectFieldName(blockId, 'prodOutput'),\n stableIfNotFound: true,\n ignoreError: true,\n })\n ?.persist();\n },\n staging: (cCtx: ComputableCtx) => {\n // Check if staging is expected (currentPrerunArgs is set)\n // For blocks with failed args derivation, staging will never be rendered\n const hasPrerunArgs = cCtx\n .accessor(projectEntry)\n .node({ ignoreError: true })\n .traverse({\n field: projectFieldName(blockId, 'currentPrerunArgs'),\n stableIfNotFound: true,\n ignoreError: true,\n }) !== undefined;\n\n const result = cCtx\n .accessor(projectEntry)\n .node({ ignoreError: true })\n .traverse({\n field: projectFieldName(blockId, 'stagingOutput'),\n // Only mark stable if staging is NOT expected (no prerunArgs)\n stableIfNotFound: !hasPrerunArgs,\n ignoreError: true,\n })\n ?.persist();\n return result;\n },\n getResultsPool: (cCtx: ComputableCtx) => ResultPool.create(cCtx, projectEntry, blockId),\n };\n}\n"],"names":["projectFieldName","cachedDecode","deriveDataFromStorage","notEmpty","ProjectStructureKey","allBlocks","ResultPool"],"mappings":"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"}
|
|
@@ -3,17 +3,14 @@ import type { PlTreeEntry } from '@milaboratories/pl-tree';
|
|
|
3
3
|
import type { Optional } from 'utility-types';
|
|
4
4
|
import type { Block } from '../model/project_model';
|
|
5
5
|
import { ResultPool } from '../pool/result_pool';
|
|
6
|
-
export type BlockContextMaterialized = {
|
|
7
|
-
readonly blockId: string;
|
|
8
|
-
readonly args: string;
|
|
9
|
-
readonly uiState?: string;
|
|
10
|
-
};
|
|
11
6
|
export type BlockContextArgsOnly = {
|
|
12
7
|
readonly blockId: string;
|
|
13
|
-
readonly args: (cCtx: ComputableCtx) => string;
|
|
8
|
+
readonly args: (cCtx: ComputableCtx) => string | undefined;
|
|
14
9
|
readonly activeArgs: (cCtx: ComputableCtx) => string | undefined;
|
|
15
|
-
readonly uiState: (cCtx: ComputableCtx) => string | undefined;
|
|
16
10
|
readonly blockMeta: (cCtx: ComputableCtx) => Map<string, Block>;
|
|
11
|
+
readonly data: (cCtx: ComputableCtx) => string | undefined;
|
|
12
|
+
readonly blockStorage: (cCtx: ComputableCtx) => string | undefined;
|
|
13
|
+
readonly prerunArgs: (cCtx: ComputableCtx) => string | undefined;
|
|
17
14
|
};
|
|
18
15
|
export type BlockContextFull = BlockContextArgsOnly & {
|
|
19
16
|
readonly prod: (cCtx: ComputableCtx) => PlTreeEntry | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_ctx.d.ts","sourceRoot":"","sources":["../../src/middle_layer/block_ctx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EACV,KAAK,EACa,MAAM,wBAAwB,CAAC;AAMnD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"block_ctx.d.ts","sourceRoot":"","sources":["../../src/middle_layer/block_ctx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EACV,KAAK,EACa,MAAM,wBAAwB,CAAC;AAMnD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,GAAG,SAAS,CAAC;IAC3D,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChE,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,GAAG,SAAS,CAAC;IAC3D,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,GAAG,SAAS,CAAC;IACnE,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,GAAG,SAAS,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG;IACpD,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,WAAW,GAAG,SAAS,CAAC;IAChE,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,WAAW,GAAG,SAAS,CAAC;IACnE,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,UAAU,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,GAAG,gBAAgB,CAAC,CAAC;AAEhG,wBAAgB,6BAA6B,CAC3C,YAAY,EAAE,WAAW,EACzB,OAAO,EAAE,MAAM,GACd,oBAAoB,CAqFtB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,WAAW,EACzB,OAAO,EAAE,MAAM,GACd,gBAAgB,CAwClB"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { notEmpty, cachedDecode } from '@milaboratories/ts-helpers';
|
|
2
2
|
import { projectFieldName, ProjectStructureKey } from '../model/project_model.js';
|
|
3
3
|
import { allBlocks } from '../model/project_model_util.js';
|
|
4
4
|
import { ResultPool } from '../pool/result_pool.js';
|
|
5
|
+
import { deriveDataFromStorage } from '@platforma-sdk/model';
|
|
5
6
|
|
|
6
7
|
function constructBlockContextArgsOnly(projectEntry, blockId) {
|
|
7
|
-
const args = (cCtx) =>
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
const args = (cCtx) => {
|
|
9
|
+
const data = cCtx
|
|
10
|
+
.accessor(projectEntry)
|
|
11
|
+
.node()
|
|
12
|
+
.traverse({
|
|
13
|
+
field: projectFieldName(blockId, 'currentArgs'),
|
|
14
|
+
stableIfNotFound: true,
|
|
15
|
+
})
|
|
16
|
+
?.getData();
|
|
17
|
+
return data ? cachedDecode(data) : undefined;
|
|
18
|
+
};
|
|
15
19
|
const activeArgs = (cCtx) => {
|
|
16
20
|
const data = cCtx
|
|
17
21
|
.accessor(projectEntry)
|
|
@@ -23,12 +27,50 @@ function constructBlockContextArgsOnly(projectEntry, blockId) {
|
|
|
23
27
|
?.getData();
|
|
24
28
|
return data ? cachedDecode(data) : undefined;
|
|
25
29
|
};
|
|
26
|
-
const
|
|
30
|
+
const data = (cCtx) => {
|
|
27
31
|
const data = cCtx
|
|
28
32
|
.accessor(projectEntry)
|
|
29
33
|
.node()
|
|
30
34
|
.traverse({
|
|
31
|
-
field: projectFieldName(blockId, '
|
|
35
|
+
field: projectFieldName(blockId, 'blockStorage'),
|
|
36
|
+
stableIfNotFound: true,
|
|
37
|
+
})
|
|
38
|
+
?.getData();
|
|
39
|
+
if (!data)
|
|
40
|
+
return undefined;
|
|
41
|
+
const rawJson = cachedDecode(data);
|
|
42
|
+
if (!rawJson)
|
|
43
|
+
return undefined;
|
|
44
|
+
// Parse to check if it's BlockStorage format
|
|
45
|
+
try {
|
|
46
|
+
const parsed = JSON.parse(rawJson);
|
|
47
|
+
return JSON.stringify(deriveDataFromStorage(parsed));
|
|
48
|
+
}
|
|
49
|
+
catch (err) {
|
|
50
|
+
console.error('Error deriving data from storage', err);
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
// Returns raw blockStorage JSON - UI derives data using sdk/model
|
|
55
|
+
const blockStorage = (cCtx) => {
|
|
56
|
+
const storageData = cCtx
|
|
57
|
+
.accessor(projectEntry)
|
|
58
|
+
.node()
|
|
59
|
+
.traverse({
|
|
60
|
+
field: projectFieldName(blockId, 'blockStorage'),
|
|
61
|
+
stableIfNotFound: true,
|
|
62
|
+
})
|
|
63
|
+
?.getData();
|
|
64
|
+
if (!storageData)
|
|
65
|
+
return undefined;
|
|
66
|
+
return cachedDecode(storageData);
|
|
67
|
+
};
|
|
68
|
+
const prerunArgs = (cCtx) => {
|
|
69
|
+
const data = cCtx
|
|
70
|
+
.accessor(projectEntry)
|
|
71
|
+
.node()
|
|
72
|
+
.traverse({
|
|
73
|
+
field: projectFieldName(blockId, 'currentPrerunArgs'),
|
|
32
74
|
stableIfNotFound: true,
|
|
33
75
|
})
|
|
34
76
|
?.getData();
|
|
@@ -38,7 +80,9 @@ function constructBlockContextArgsOnly(projectEntry, blockId) {
|
|
|
38
80
|
blockId,
|
|
39
81
|
args,
|
|
40
82
|
activeArgs,
|
|
41
|
-
|
|
83
|
+
data,
|
|
84
|
+
blockStorage,
|
|
85
|
+
prerunArgs,
|
|
42
86
|
blockMeta: (cCtx) => {
|
|
43
87
|
const prj = cCtx.accessor(projectEntry).node();
|
|
44
88
|
const structure = notEmpty(prj.getKeyValueAsJson(ProjectStructureKey));
|
|
@@ -64,16 +108,26 @@ function constructBlockContext(projectEntry, blockId) {
|
|
|
64
108
|
?.persist();
|
|
65
109
|
},
|
|
66
110
|
staging: (cCtx) => {
|
|
111
|
+
// Check if staging is expected (currentPrerunArgs is set)
|
|
112
|
+
// For blocks with failed args derivation, staging will never be rendered
|
|
113
|
+
const hasPrerunArgs = cCtx
|
|
114
|
+
.accessor(projectEntry)
|
|
115
|
+
.node({ ignoreError: true })
|
|
116
|
+
.traverse({
|
|
117
|
+
field: projectFieldName(blockId, 'currentPrerunArgs'),
|
|
118
|
+
stableIfNotFound: true,
|
|
119
|
+
ignoreError: true,
|
|
120
|
+
}) !== undefined;
|
|
67
121
|
const result = cCtx
|
|
68
122
|
.accessor(projectEntry)
|
|
69
123
|
.node({ ignoreError: true })
|
|
70
124
|
.traverse({
|
|
71
125
|
field: projectFieldName(blockId, 'stagingOutput'),
|
|
126
|
+
// Only mark stable if staging is NOT expected (no prerunArgs)
|
|
127
|
+
stableIfNotFound: !hasPrerunArgs,
|
|
72
128
|
ignoreError: true,
|
|
73
129
|
})
|
|
74
130
|
?.persist();
|
|
75
|
-
if (result === undefined)
|
|
76
|
-
cCtx.markUnstable('staging_not_rendered');
|
|
77
131
|
return result;
|
|
78
132
|
},
|
|
79
133
|
getResultsPool: (cCtx) => ResultPool.create(cCtx, projectEntry, blockId),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_ctx.js","sources":["../../src/middle_layer/block_ctx.ts"],"sourcesContent":["import type { ComputableCtx } from '@milaboratories/computable';\nimport type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport { cachedDecode, notEmpty } from '@milaboratories/ts-helpers';\nimport type { Optional } from 'utility-types';\nimport type {\n Block,\n ProjectStructure } from '../model/project_model';\nimport {\n ProjectStructureKey,\n projectFieldName,\n} from '../model/project_model';\nimport { allBlocks } from '../model/project_model_util';\nimport { ResultPool } from '../pool/result_pool';\n\nexport type
|
|
1
|
+
{"version":3,"file":"block_ctx.js","sources":["../../src/middle_layer/block_ctx.ts"],"sourcesContent":["import type { ComputableCtx } from '@milaboratories/computable';\nimport type { PlTreeEntry } from '@milaboratories/pl-tree';\nimport { cachedDecode, notEmpty } from '@milaboratories/ts-helpers';\nimport type { Optional } from 'utility-types';\nimport type {\n Block,\n ProjectStructure } from '../model/project_model';\nimport {\n ProjectStructureKey,\n projectFieldName,\n} from '../model/project_model';\nimport { allBlocks } from '../model/project_model_util';\nimport { ResultPool } from '../pool/result_pool';\nimport { deriveDataFromStorage } from '@platforma-sdk/model';\n\nexport type BlockContextArgsOnly = {\n readonly blockId: string;\n readonly args: (cCtx: ComputableCtx) => string | undefined;\n readonly activeArgs: (cCtx: ComputableCtx) => string | undefined;\n readonly blockMeta: (cCtx: ComputableCtx) => Map<string, Block>;\n readonly data: (cCtx: ComputableCtx) => string | undefined;\n readonly blockStorage: (cCtx: ComputableCtx) => string | undefined;\n readonly prerunArgs: (cCtx: ComputableCtx) => string | undefined;\n};\n\nexport type BlockContextFull = BlockContextArgsOnly & {\n readonly prod: (cCtx: ComputableCtx) => PlTreeEntry | undefined;\n readonly staging: (cCtx: ComputableCtx) => PlTreeEntry | undefined;\n readonly getResultsPool: (cCtx: ComputableCtx) => ResultPool;\n};\n\nexport type BlockContextAny = Optional<BlockContextFull, 'prod' | 'staging' | 'getResultsPool'>;\n\nexport function constructBlockContextArgsOnly(\n projectEntry: PlTreeEntry,\n blockId: string,\n): BlockContextArgsOnly {\n const args = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'currentArgs'),\n stableIfNotFound: true,\n })\n ?.getData();\n return data ? cachedDecode(data) : undefined;\n };\n const activeArgs = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'prodArgs'),\n stableIfNotFound: true,\n })\n ?.getData();\n return data ? cachedDecode(data) : undefined;\n };\n const data = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'blockStorage'),\n stableIfNotFound: true,\n })\n ?.getData();\n if (!data) return undefined;\n\n const rawJson = cachedDecode(data);\n if (!rawJson) return undefined;\n\n // Parse to check if it's BlockStorage format\n try {\n const parsed = JSON.parse(rawJson);\n return JSON.stringify(deriveDataFromStorage(parsed));\n } catch (err) {\n console.error('Error deriving data from storage', err);\n return undefined;\n }\n };\n // Returns raw blockStorage JSON - UI derives data using sdk/model\n const blockStorage = (cCtx: ComputableCtx) => {\n const storageData = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'blockStorage'),\n stableIfNotFound: true,\n })\n ?.getData();\n if (!storageData) return undefined;\n return cachedDecode(storageData);\n };\n const prerunArgs = (cCtx: ComputableCtx) => {\n const data = cCtx\n .accessor(projectEntry)\n .node()\n .traverse({\n field: projectFieldName(blockId, 'currentPrerunArgs'),\n stableIfNotFound: true,\n })\n ?.getData();\n return data ? cachedDecode(data) : undefined;\n };\n return {\n blockId,\n args,\n activeArgs,\n data,\n blockStorage,\n prerunArgs,\n blockMeta: (cCtx: ComputableCtx) => {\n const prj = cCtx.accessor(projectEntry).node();\n const structure = notEmpty(prj.getKeyValueAsJson<ProjectStructure>(ProjectStructureKey));\n const result = new Map<string, Block>();\n for (const block of allBlocks(structure)) result.set(block.id, block);\n return result;\n },\n };\n}\n\nexport function constructBlockContext(\n projectEntry: PlTreeEntry,\n blockId: string,\n): BlockContextFull {\n return {\n ...constructBlockContextArgsOnly(projectEntry, blockId),\n prod: (cCtx: ComputableCtx) => {\n return cCtx\n .accessor(projectEntry)\n .node({ ignoreError: true })\n .traverse({\n field: projectFieldName(blockId, 'prodOutput'),\n stableIfNotFound: true,\n ignoreError: true,\n })\n ?.persist();\n },\n staging: (cCtx: ComputableCtx) => {\n // Check if staging is expected (currentPrerunArgs is set)\n // For blocks with failed args derivation, staging will never be rendered\n const hasPrerunArgs = cCtx\n .accessor(projectEntry)\n .node({ ignoreError: true })\n .traverse({\n field: projectFieldName(blockId, 'currentPrerunArgs'),\n stableIfNotFound: true,\n ignoreError: true,\n }) !== undefined;\n\n const result = cCtx\n .accessor(projectEntry)\n .node({ ignoreError: true })\n .traverse({\n field: projectFieldName(blockId, 'stagingOutput'),\n // Only mark stable if staging is NOT expected (no prerunArgs)\n stableIfNotFound: !hasPrerunArgs,\n ignoreError: true,\n })\n ?.persist();\n return result;\n },\n getResultsPool: (cCtx: ComputableCtx) => ResultPool.create(cCtx, projectEntry, blockId),\n };\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,17 @@ const NonKeyCtxFields = ['$prod', '$staging'];
|
|
|
4
4
|
function toCfgContext(ctx) {
|
|
5
5
|
return {
|
|
6
6
|
$blockId: ctx.blockId,
|
|
7
|
-
$args: (cCtx) =>
|
|
7
|
+
$args: (cCtx) => {
|
|
8
|
+
const args = ctx.args(cCtx);
|
|
9
|
+
return args !== undefined ? JSON.parse(args) : undefined;
|
|
10
|
+
},
|
|
8
11
|
$ui: (cCtx) => {
|
|
9
|
-
const
|
|
10
|
-
return
|
|
12
|
+
const data = ctx.data(cCtx);
|
|
13
|
+
return data !== undefined ? JSON.parse(data) : undefined;
|
|
14
|
+
},
|
|
15
|
+
$data: (cCtx) => {
|
|
16
|
+
const data = ctx.data(cCtx);
|
|
17
|
+
return data !== undefined ? JSON.parse(data) : undefined;
|
|
11
18
|
},
|
|
12
19
|
$prod: ctx.prod,
|
|
13
20
|
$staging: ctx.staging,
|