@milaboratories/pl-middle-layer 1.37.99 → 1.38.0

package/src/middle_layer/project_overview.ts

@@ -25,7 +25,7 @@ import type {
 } from '@milaboratories/pl-model-middle-layer';
 import { constructBlockContextArgsOnly } from './block_ctx';
 import { ifNotUndef } from '../cfg_render/util';
-import type { BlockSection } from '@platforma-sdk/model';
+import { extractCodeWithInfo, type BlockSection } from '@platforma-sdk/model';
 import { computableFromCfgOrRF } from './render';
 import type { NavigationStates } from './navigation_states';
 import { getBlockPackInfo } from './util';
@@ -154,15 +154,22 @@ export function projectOverview(
 
         const bp = getBlockPackInfo(prj, id);
 
-        const { sections, title, inputsValid, sdkVersion }
+        const { sections, title, inputsValid, sdkVersion, featureFlags, isIncompatibleWithRuntime }
           = ifNotUndef(bp, ({ bpId, cfg }) => {
+            if (!env.runtimeCapabilities.checkCompatibility(cfg.featureFlags)) {
+              return {
+                isIncompatibleWithRuntime: true,
+                featureFlags: cfg.featureFlags,
+              };
+            }
             const blockCtxArgsOnly = constructBlockContextArgsOnly(prjEntry, id);
+            const codeWithInfo = extractCodeWithInfo(cfg);
             return {
               sections: computableFromCfgOrRF(
                 env,
                 blockCtxArgsOnly,
                 cfg.sections,
-                cfg.code,
+                codeWithInfo,
                 bpId,
               ).wrap({
                 recover: (e) => {
@@ -178,7 +185,7 @@ export function projectOverview(
                     env,
                     blockCtxArgsOnly,
                     title,
-                    cfg.code,
+                    codeWithInfo,
                     bpId,
                   ).wrap({
                     recover: (e) => {
@@ -192,7 +199,7 @@ export function projectOverview(
                 env,
                 blockCtxArgsOnly,
                 cfg.inputsValid,
-                cfg.code,
+                codeWithInfo,
                 bpId,
               ).wrap({
                 recover: (e) => {
@@ -202,7 +209,9 @@ export function projectOverview(
                   return false;
                 },
               }) as ComputableStableDefined<boolean>,
-              sdkVersion: cfg.sdkVersion,
+              sdkVersion: codeWithInfo?.sdkVersion,
+              featureFlags: codeWithInfo?.featureFlags ?? {},
+              isIncompatibleWithRuntime: false,
             };
           }) || {};
 
@@ -239,6 +248,8 @@ export function projectOverview(
           currentBlockPack: bp?.info?.source,
           updates,
           sdkVersion,
+          featureFlags,
+          isIncompatibleWithRuntime,
           navigationState: navigationStates.getState(id),
         };
       });

package/src/middle_layer/render.test.ts

@@ -23,6 +23,8 @@ export async function withMl(
         throw new Error('Not implemented.');
       }
     });
+    ml.addRuntimeCapability('requiresUIAPIVersion', 1);
+    ml.addRuntimeCapability('requiresUIAPIVersion', 2);
     try {
       await cb(ml, workFolder);
     } finally {

package/src/middle_layer/render.ts

@@ -1,4 +1,4 @@
-import type { Code, TypedConfigOrConfigLambda } from '@platforma-sdk/model';
+import type { BlockCodeWithInfo, TypedConfigOrConfigLambda } from '@platforma-sdk/model';
 import { isConfigLambda } from '@platforma-sdk/model';
 import type { Computable, ComputableRenderingOps } from '@milaboratories/computable';
 import { computableFromCfg } from '../cfg_render/executor';
@@ -16,12 +16,12 @@ export function computableFromCfgOrRF(
   env: MiddleLayerEnvironment,
   ctx: BlockContextAny,
   cfgOrFh: TypedConfigOrConfigLambda,
-  code: Code | undefined,
+  codeWithInfo: BlockCodeWithInfo | undefined,
   configKey: string,
   ops: Partial<ComputableRenderingOps> = {},
 ): Computable<unknown> {
   if (isConfigLambda(cfgOrFh)) {
-    if (code === undefined) throw new Error('No code bundle.');
-    return computableFromRF(env, ctx, cfgOrFh, code, configKey, ops);
+    if (codeWithInfo === undefined) throw new Error('No code bundle.');
+    return computableFromRF(env, ctx, cfgOrFh, codeWithInfo, configKey, ops);
   } else return computableFromCfg(env.driverKit, ctx, cfgOrFh, ops);
 }

package/src/model/project_helper.ts

@@ -1,4 +1,4 @@
-import type { BlockConfig, PlRef } from '@platforma-sdk/model';
+import { extractCodeWithInfo, type BlockConfig, type PlRef } from '@platforma-sdk/model';
 import { LRUCache } from 'lru-cache';
 import type { QuickJSWASMModule } from 'quickjs-emscripten';
 import { executeSingleLambda } from '../js_render';
@@ -27,7 +27,7 @@ export class ProjectHelper {
     const blockConfig = req.blockConfig();
     if (blockConfig.enrichmentTargets === undefined) return undefined;
     const args = req.args();
-    const result = executeSingleLambda(this.quickJs, blockConfig.enrichmentTargets, blockConfig.code!, args) as PlRef[];
+    const result = executeSingleLambda(this.quickJs, blockConfig.enrichmentTargets, extractCodeWithInfo(blockConfig)!, args) as PlRef[];
     return result;
   }
 

package/src/pool/driver.ts

@@ -81,6 +81,20 @@ function migrateFilters(filters: PTableRecordFilter[]): PTableRecordFilter[] {
   return filtersV2;
 }
 
+function migratePTableDef(
+  def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>,
+): PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>> {
+  if (!('partitionFilters' in (def as Omit<typeof def, 'partitionFilters'>))) {
+    // For old blocks make all filters partition filters
+    return {
+      ...def,
+      partitionFilters: def.filters,
+      filters: [],
+    };
+  }
+  return def;
+}
+
 const bigintReplacer = (_: string, v: unknown) => (typeof v === 'bigint' ? v.toString() : v);
 
 class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
@@ -324,7 +338,7 @@ export class PFrameDriver implements InternalPFrameDriver {
 
         const table = pFrameHolder.pFrame.createTable({
           src: joinEntryToInternal(params.def.src),
-          filters: migrateFilters(params.def.filters),
+          filters: migrateFilters([...params.def.partitionFilters, ...params.def.filters]),
         });
 
         let sortedTable = table;
@@ -370,9 +384,10 @@ export class PFrameDriver implements InternalPFrameDriver {
   }
 
   public createPTable(
-    def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>,
+    rawDef: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>,
     ctx: ComputableCtx,
   ): PTableHandle {
+    const def = migratePTableDef(rawDef);
     const pFrameHandle = this.createPFrame(extractAllColumns(def.src), ctx);
     const defIds = mapPTableDef(def, (c) => c.id);
     const res = this.pTables.acquire({ def: defIds, pFrameHandle });