@platforma-sdk/model 1.61.0 → 1.62.0

package/src/block_model.ts

@@ -6,9 +6,12 @@ import type {
   BlockCodeKnownFeatureFlags,
   BlockConfigContainer,
 } from "@milaboratories/pl-model-common";
+import { resolveRequiredServices } from "@milaboratories/pl-model-common";
 import { getPlatformaInstance, isInUI, createAndRegisterRenderLambda } from "./internal";
 import type { DataModel } from "./block_migrations";
 import type { PlatformaV3 } from "./platforma";
+import type { BlockDefaultUiServices } from "./services/service_resolve";
+import { blockServiceNames, BLOCK_SERVICE_FLAGS } from "./services/block_services";
 import type { InferRenderFunctionReturn, RenderFunction } from "./render";
 import { BlockRenderCtx, PluginRenderCtx } from "./render";
 import type { PluginData, PluginModel, PluginOutputs, PluginParams } from "./plugin_model";
@@ -87,8 +90,10 @@ export type PluginRecord<
   Data extends PluginData = PluginData,
   Params extends PluginParams = undefined,
   Outputs extends PluginOutputs = PluginOutputs,
+  ModelServices = unknown,
+  UiServices = unknown,
 > = {
-  readonly model: PluginModel<Data, Params, Outputs>;
+  readonly model: PluginModel<Data, Params, Outputs, ModelServices, UiServices>;
   readonly inputs: ParamsInputErased;
 };
 
@@ -128,13 +133,17 @@ export class BlockModelV3<
     private readonly config: BlockModelV3Config<OutputsCfg, Data, Plugins, Transfers>,
   ) {}
 
-  public static readonly INITIAL_BLOCK_FEATURE_FLAGS: BlockCodeKnownFeatureFlags = {
+  public static readonly FEATURE_FLAGS = {
     supportsLazyState: true,
     supportsPframeQueryRanking: true,
     requiresUIAPIVersion: 3,
     requiresModelAPIVersion: BLOCK_STORAGE_FACADE_VERSION,
     requiresCreatePTable: 2,
-  };
+    ...BLOCK_SERVICE_FLAGS,
+  } satisfies BlockCodeKnownFeatureFlags;
+
+  /** @deprecated Use FEATURE_FLAGS */
+  public static readonly INITIAL_BLOCK_FEATURE_FLAGS = BlockModelV3.FEATURE_FLAGS;
 
   /**
    * Creates a new BlockModelV3 builder with the specified data model.
@@ -164,7 +173,7 @@ export class BlockModelV3<
       subtitle: undefined,
       tags: undefined,
       enrichmentTargets: undefined,
-      featureFlags: { ...BlockModelV3.INITIAL_BLOCK_FEATURE_FLAGS },
+      featureFlags: { ...BlockModelV3.FEATURE_FLAGS },
       argsFunction: undefined,
       prerunArgsFunction: undefined,
       plugins: {},
@@ -228,7 +237,7 @@ export class BlockModelV3<
         ...this.config.outputs,
         [key]: createAndRegisterRenderLambda({
           handle: `block-output#${key}`,
-          lambda: () => cfgOrRf(new BlockRenderCtx<Args, Data>()),
+          lambda: () => cfgOrRf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
           ...flags,
         }),
       },
@@ -324,7 +333,10 @@ export class BlockModelV3<
         ...this.config,
         // Replace the default sections callback with the user-provided one
         sections: createAndRegisterRenderLambda(
-          { handle: "sections", lambda: () => rf(new BlockRenderCtx<Args, Data>()) },
+          {
+            handle: "sections",
+            lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
+          },
           true,
         ),
       },
@@ -339,7 +351,7 @@ export class BlockModelV3<
       ...this.config,
       title: createAndRegisterRenderLambda({
         handle: "title",
-        lambda: () => rf(new BlockRenderCtx<Args, Data>()),
+        lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
       }),
     });
   }
@@ -351,7 +363,7 @@ export class BlockModelV3<
       ...this.config,
       subtitle: createAndRegisterRenderLambda({
         handle: "subtitle",
-        lambda: () => rf(new BlockRenderCtx<Args, Data>()),
+        lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
       }),
     });
   }
@@ -363,7 +375,7 @@ export class BlockModelV3<
       ...this.config,
       tags: createAndRegisterRenderLambda({
         handle: "tags",
-        lambda: () => rf(new BlockRenderCtx<Args, Data>()),
+        lambda: () => rf(new BlockRenderCtx<Args, Data>(blockServiceNames)),
       }),
     });
   }
@@ -418,6 +430,8 @@ export class BlockModelV3<
     PParams extends PluginParams,
     POutputs extends PluginOutputs,
     PTransferData,
+    PluginModelServices,
+    PluginUiServices,
   >(
     instance: PluginInstanceClass<
       PluginId &
@@ -432,7 +446,9 @@ export class BlockModelV3<
       PData,
       PParams,
       POutputs,
-      PTransferData
+      PTransferData,
+      PluginModelServices,
+      PluginUiServices
     >,
     params?: ParamsInput<PParams, Args, Data>,
   ): BlockModelV3<
@@ -440,7 +456,15 @@ export class BlockModelV3<
     OutputsCfg,
     Data,
     Href,
-    Plugins & { [K in PluginId]: PluginRecord<PData, PParams, POutputs> },
+    Plugins & {
+      [K in PluginId]: PluginRecord<
+        PData,
+        PParams,
+        POutputs,
+        PluginModelServices,
+        PluginUiServices
+      >;
+    },
     Omit<Transfers, PluginId>
   >;
   public plugin(
@@ -489,7 +513,14 @@ export class BlockModelV3<
   public done(
     ..._: keyof Transfers extends never ? [] : [never]
   ): PlatformaExtended<
-    PlatformaV3<Data, Args, InferOutputsFromLambdas<OutputsCfg>, Href, Plugins>
+    PlatformaV3<
+      Data,
+      Args,
+      InferOutputsFromLambdas<OutputsCfg>,
+      Href,
+      Plugins,
+      BlockDefaultUiServices
+    >
   > {
     if (this.config.argsFunction === undefined) throw new Error("Args rendering function not set.");
 
@@ -505,6 +536,8 @@ export class BlockModelV3<
 
     const { dataModel, argsFunction, prerunArgsFunction } = this.config;
 
+    const mergedServiceNames = resolveRequiredServices(this.config.featureFlags);
+
     function getPlugin(handle: PluginHandle): PluginRecord {
       const plugin = plugins[handle];
       if (!plugin) throw new Error(`Plugin model not found for '${handle}'`);
@@ -544,16 +577,18 @@ export class BlockModelV3<
       // Wrap plugin param lambdas: close over BlockRenderCtx creation
       const wrappedInputs: Record<string, () => unknown> = {};
       for (const [paramKey, paramFn] of Object.entries(inputs)) {
-        wrappedInputs[paramKey] = () => paramFn(new BlockRenderCtx());
+        wrappedInputs[paramKey] = () => paramFn(new BlockRenderCtx(mergedServiceNames));
       }
 
       // Register plugin outputs (in config pack, evaluated by middle layer)
       const outputs = model.outputs as Record<string, (ctx: PluginRenderCtx) => unknown>;
+      const { outputFlags } = model;
       for (const [outputKey, outputFn] of Object.entries(outputs)) {
         const key = pluginOutputKey(handle, outputKey);
         pluginOutputs[key] = createAndRegisterRenderLambda({
           handle: key,
-          lambda: () => outputFn(new PluginRenderCtx(handle, wrappedInputs)),
+          lambda: () => outputFn(new PluginRenderCtx(handle, wrappedInputs, mergedServiceNames)),
+          withStatus: outputFlags[outputKey]?.withStatus,
         });
       }
     }

package/src/columns/column_collection_builder.test.ts

@@ -20,8 +20,8 @@ function createSpecFrameCtx() {
   return driver;
 }
 
-afterEach(() => {
-  for (const driver of drivers) driver.dispose();
+afterEach(async () => {
+  for (const driver of drivers) await driver.dispose();
   drivers.length = 0;
 });
 
@@ -166,6 +166,27 @@ describe("ColumnCollection.findColumns", () => {
     expect(results).toHaveLength(1);
     expect(results[0].spec.name).toBe("col2");
   });
+
+  test("include filters by exact name among disjoint-axis columns", () => {
+    const vdjAxis = sampleAxis("pl7.app/vdj/clonotypeKey");
+    const itemAxis = sampleAxis("item");
+
+    const vdjColumns = Array.from({ length: 10 }, (_, i) =>
+      createSnapshot(`vdj${i}`, createSpec(`pl7.app/vdj/col${i}`, { axesSpec: [vdjAxis] })),
+    );
+    const mockScore = createSnapshot("mock", createSpec("mock_score", { axesSpec: [itemAxis] }));
+
+    const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
+    builder.addSource([...vdjColumns, mockScore]);
+
+    const collection = builder.build()!;
+    const results = collection.findColumns({
+      include: [{ name: [{ type: "exact", value: "mock_score" }] }],
+    });
+
+    expect(results).toHaveLength(1);
+    expect(results[0].spec.name).toBe("mock_score");
+  });
 });
 
 describe("dedup by native ID", () => {

package/src/columns/column_collection_builder.ts

@@ -19,13 +19,7 @@ import { createColumnSnapshot } from "./column_snapshot";
 import type { ColumnSnapshotProvider, ColumnSource } from "./column_snapshot_provider";
 import { ArrayColumnProvider, toColumnSnapshotProvider } from "./column_snapshot_provider";
 
-import type { GlobalCfgRenderCtxMethods } from "../render/internal";
-
-/** Subset of render context methods needed for spec frame operations. */
-type SpecFrameCtx = Pick<
-  GlobalCfgRenderCtxMethods,
-  "createSpecFrame" | "specFrameDiscoverColumns" | "disposeSpecFrame"
->;
+import type { PFrameSpecDriver, PoolEntry, SpecFrameHandle } from "@milaboratories/pl-model-common";
 
 // --- FindColumnsOptions ---
 
@@ -40,7 +34,9 @@ export interface FindColumnsOptions {
 // --- ColumnCollection ---
 
 /** Plain collection — no axis context, selector-based filtering only. */
-export interface ColumnCollection {
+export interface ColumnCollection extends Disposable {
+  /** Release the underlying spec frame WASM resource. */
+  dispose(): void;
   /** Point lookup by provider-native ID. */
   getColumn(id: PObjectId): undefined | ColumnSnapshot<PObjectId>;
 
@@ -53,7 +49,9 @@ export interface ColumnCollection {
 // --- AnchoredColumnCollection ---
 
 /** Axis-aware column collection with anchored identity derivation. */
-export interface AnchoredColumnCollection {
+export interface AnchoredColumnCollection extends Disposable {
+  /** Release the underlying spec frame WASM resource. */
+  dispose(): void;
   /** Point lookup by anchored ID. */
   getColumn(id: SUniversalPColumnId): undefined | ColumnSnapshot<SUniversalPColumnId>;
 
@@ -122,7 +120,7 @@ export interface AnchoredBuildOptions extends BuildOptions {
 export class ColumnCollectionBuilder {
   private readonly providers: ColumnSnapshotProvider[] = [];
 
-  constructor(private readonly specFrameCtx: SpecFrameCtx) {}
+  constructor(private readonly specDriver: PFrameSpecDriver) {}
 
   /**
    * Register a column source. Sources added first take precedence for dedup.
@@ -178,14 +176,14 @@ export class ColumnCollectionBuilder {
       const anchorSpecs = resolveAnchorSpecs(options.anchors, columnMap);
       const idDeriver = new AnchoredIdDeriver(anchorSpecs);
 
-      return new AnchoredColumnCollectionImpl(this.specFrameCtx, {
+      return new AnchoredColumnCollectionImpl(this.specDriver, {
         columns: columnMap,
         idDeriver,
         anchorSpecs,
         columnListComplete: allowPartial ? allComplete : false,
       });
     } else {
-      return new ColumnCollectionImpl(this.specFrameCtx, {
+      return new ColumnCollectionImpl(this.specDriver, {
         columns: columnMap,
         columnListComplete: allowPartial ? allComplete : false,
       });
@@ -230,25 +228,30 @@ interface ColumnCollectionImplOptions {
   readonly columnListComplete?: boolean;
 }
 
-class ColumnCollectionImpl implements ColumnCollection {
+class ColumnCollectionImpl implements ColumnCollection, Disposable {
   private readonly columns: Map<PObjectId, ColumnSnapshot<PObjectId>>;
-  private readonly specFrameHandle: string;
+  private readonly specFrameEntry: PoolEntry<SpecFrameHandle>;
   public readonly columnListComplete: boolean;
 
   constructor(
-    private readonly ctx: SpecFrameCtx,
+    private readonly specDriver: PFrameSpecDriver,
     options: ColumnCollectionImplOptions,
   ) {
     this.columns = options.columns;
     this.columnListComplete = options.columnListComplete ?? false;
-    this.specFrameHandle = this.ctx.createSpecFrame(
-      Array.from(this.columns.entries()).reduce(
-        (acc, [id, col]) => ((acc[id] = col.spec), acc),
-        {} as Record<string, PColumnSpec>,
-      ),
+    this.specFrameEntry = this.specDriver.createSpecFrame(
+      Object.fromEntries(Array.from(this.columns.entries(), ([id, col]) => [id, col.spec])),
     );
   }
 
+  dispose(): void {
+    this.specFrameEntry.unref();
+  }
+
+  [Symbol.dispose](): void {
+    this.dispose();
+  }
+
   getColumn(id: PObjectId): undefined | ColumnSnapshot<PObjectId> {
     const col = this.columns.get(id);
     if (col === undefined) return undefined;
@@ -259,7 +262,7 @@ class ColumnCollectionImpl implements ColumnCollection {
     const includeColumns = options?.include ? toMultiColumnSelectors(options.include) : undefined;
     const excludeColumns = options?.exclude ? toMultiColumnSelectors(options.exclude) : undefined;
 
-    const response = this.ctx.specFrameDiscoverColumns(this.specFrameHandle, {
+    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {
       includeColumns,
       excludeColumns,
       axes: [],
@@ -288,17 +291,17 @@ interface AnchoredColumnCollectionImplOptions extends ColumnCollectionImplOption
   readonly anchorSpecs: Record<string, PColumnSpec>;
 }
 
-class AnchoredColumnCollectionImpl implements AnchoredColumnCollection {
+class AnchoredColumnCollectionImpl implements AnchoredColumnCollection, Disposable {
   private readonly columns: Map<PObjectId, ColumnSnapshot<PObjectId>>;
   private readonly idDeriver: AnchoredIdDeriver;
-  private readonly specFrameHandle: string;
+  private readonly specFrameEntry: PoolEntry<SpecFrameHandle>;
   private readonly anchorAxes: ColumnAxesWithQualifications[];
   /** Reverse lookup: SUniversalPColumnId → PObjectId */
   private readonly idToOriginal: Map<SUniversalPColumnId, PObjectId>;
   public readonly columnListComplete: boolean;
 
   constructor(
-    private readonly ctx: SpecFrameCtx,
+    private readonly specDriver: PFrameSpecDriver,
     options: AnchoredColumnCollectionImplOptions,
   ) {
     this.columns = options.columns;
@@ -306,11 +309,8 @@ class AnchoredColumnCollectionImpl implements AnchoredColumnCollection {
     this.columnListComplete = options.columnListComplete ?? false;
 
     // Create spec frame from all collected columns
-    this.specFrameHandle = this.ctx.createSpecFrame(
-      Array.from(this.columns.entries()).reduce(
-        (acc, [id, col]) => ((acc[id] = col.spec), acc),
-        {} as Record<string, PColumnSpec>,
-      ),
+    this.specFrameEntry = this.specDriver.createSpecFrame(
+      Object.fromEntries(Array.from(this.columns.entries(), ([id, col]) => [id, col.spec])),
     );
 
     // Build anchor axes for discovery requests
@@ -327,6 +327,14 @@ class AnchoredColumnCollectionImpl implements AnchoredColumnCollection {
     );
   }
 
+  dispose(): void {
+    this.specFrameEntry.unref();
+  }
+
+  [Symbol.dispose](): void {
+    this.dispose();
+  }
+
   getColumn(id: SUniversalPColumnId): undefined | ColumnSnapshot<SUniversalPColumnId> {
     const origId = this.idToOriginal.get(id);
     if (origId === undefined) return undefined;
@@ -341,7 +349,7 @@ class AnchoredColumnCollectionImpl implements AnchoredColumnCollection {
     const includeColumns = options?.include ? toMultiColumnSelectors(options.include) : undefined;
     const excludeColumns = options?.exclude ? toMultiColumnSelectors(options.exclude) : undefined;
 
-    const response = this.ctx.specFrameDiscoverColumns(this.specFrameHandle, {
+    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {
       includeColumns,
       excludeColumns,
       constraints,

package/src/columns/ctx_column_sources.ts

@@ -17,8 +17,8 @@ import type { ValueOf } from "@milaboratories/helpers";
  *
  * Returns an array of providers suitable for `ColumnCollectionBuilder.addSource()`.
  */
-export function collectCtxColumnSnapshotProviders<A, U>(
-  ctx: RenderCtxBase<A, U>,
+export function collectCtxColumnSnapshotProviders<A, U, S>(
+  ctx: RenderCtxBase<A, U, S>,
 ): ColumnSnapshotProvider[] {
   const providers: ColumnSnapshotProvider[] = [];