@platforma-sdk/model 1.72.0 → 1.73.0

package/dist/components/PlDatasetSelector/build_dataset_options.cjs

@@ -5,6 +5,10 @@ const require_ctx_column_sources = require("../../columns/ctx_column_sources.cjs
 const require_enrichment_discovery = require("./enrichment_discovery.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 //#region src/components/PlDatasetSelector/build_dataset_options.ts
+function toPredicate(opt) {
+	if (opt === void 0) return () => true;
+	return typeof opt === "function" ? opt : (0, _milaboratories_pl_model_common.multiColumnSelectorsToPredicate)(opt);
+}
 /**
 * Usage:
 * ```ts
@@ -12,30 +16,35 @@ let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common")
 * ```
 */
 function buildDatasetOptions(ctx, opts) {
-	const primary = opts?.primary;
-	const primaryPredicate = primary === void 0 ? () => true : typeof primary === "function" ? primary : (0, _milaboratories_pl_model_common.multiColumnSelectorsToPredicate)(primary);
+	const primaryPredicate = toPredicate(opts?.primary);
+	const filterPredicate = toPredicate(opts?.filter);
 	const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });
 	if (options.length === 0) return [];
-	const columnSources = require_ctx_column_sources.collectCtxColumnSnapshotProviders(ctx);
 	const refMap = require_filter_discovery.buildRefMap(ctx.resultPool.getSpecs().entries);
 	const pframeSpec = ctx.getService("pframeSpec");
+	const withEnrichments = opts?.withEnrichments ?? false;
+	const filterSource = new require_ctx_column_sources.ResultPoolColumnSnapshotProvider(ctx.resultPool);
+	const enrichmentSources = withEnrichments ? require_ctx_column_sources.collectCtxColumnSnapshotProviders(ctx) : void 0;
 	return options.map((primary) => {
 		const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);
 		if (!datasetSpec) return { primary };
-		const builder = new require_column_collection_builder.ColumnCollectionBuilder(pframeSpec);
-		for (const src of columnSources) builder.addSource(src);
-		const collection = builder.build({ anchors: { main: datasetSpec } });
-		if (!collection) return { primary };
+		let filterCollection;
+		let enrichmentCollection;
 		try {
-			const filterMatches = require_filter_discovery.findFilterColumns(collection);
+			filterCollection = new require_column_collection_builder.ColumnCollectionBuilder(pframeSpec).addSource(filterSource).build({
+				anchors: { main: datasetSpec },
+				allowPartialColumnList: true
+			});
+			enrichmentCollection = enrichmentSources !== void 0 ? new require_column_collection_builder.ColumnCollectionBuilder(pframeSpec).addSources(enrichmentSources).build({ anchors: { main: datasetSpec } }) : void 0;
+			const filterMatches = require_filter_discovery.findFilterColumns(filterCollection).filter((m) => filterPredicate(m.column.spec));
 			const filters = filterMatches.length === 0 ? void 0 : require_filter_discovery.filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);
 			let enrichments;
-			if (opts?.withEnrichments !== void 0) {
-				const enrichmentVariants = require_enrichment_discovery.findEnrichmentColumns(collection, {
-					maxHops: opts.enrichmentMaxHops,
-					...typeof opts.withEnrichments === "function" ? { predicate: opts.withEnrichments } : { include: opts.withEnrichments }
+			if (enrichmentCollection && withEnrichments) {
+				const enrichmentVariants = require_enrichment_discovery.findEnrichmentColumns(enrichmentCollection, {
+					maxHops: opts?.enrichmentMaxHops,
+					...typeof withEnrichments === "function" ? { predicate: withEnrichments } : { include: withEnrichments }
 				});
-				if (enrichmentVariants.length > 0) enrichments = require_enrichment_discovery.enrichmentVariantsToRefs(enrichmentVariants, opts.labelOptions);
+				if (enrichmentVariants.length > 0) enrichments = require_enrichment_discovery.enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);
 			}
 			return {
 				primary,
@@ -43,7 +52,8 @@ function buildDatasetOptions(ctx, opts) {
 				...enrichments !== void 0 && enrichments.length > 0 ? { enrichments } : {}
 			};
 		} finally {
-			collection.dispose();
+			filterCollection?.dispose();
+			enrichmentCollection?.dispose();
 		}
 	});
 }

package/dist/components/PlDatasetSelector/build_dataset_options.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"build_dataset_options.cjs","names":["collectCtxColumnSnapshotProviders","buildRefMap","ColumnCollectionBuilder","findFilterColumns","filterMatchesToOptions","findEnrichmentColumns","enrichmentVariantsToRefs"],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport { collectCtxColumnSnapshotProviders } from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean);\n  /** Formatting options for filter labels. */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean);\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primary = opts?.primary;\n  const primaryPredicate =\n    primary === undefined\n      ? () => true\n      : typeof primary === \"function\"\n        ? primary\n        : multiColumnSelectorsToPredicate(primary);\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const columnSources = collectCtxColumnSnapshotProviders(ctx);\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    const builder = new ColumnCollectionBuilder(pframeSpec);\n    for (const src of columnSources) builder.addSource(src);\n    const collection = builder.build({ anchors: { main: datasetSpec } });\n    if (!collection) return { primary };\n\n    try {\n      const filterMatches = findFilterColumns(collection);\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);\n\n      let enrichments;\n      if (opts?.withEnrichments !== undefined) {\n        const enrichmentVariants = findEnrichmentColumns(collection, {\n          maxHops: opts.enrichmentMaxHops,\n          ...(typeof opts.withEnrichments === \"function\"\n            ? { predicate: opts.withEnrichments }\n            : { include: opts.withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      collection.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;;;AA8BA,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,UAAU,MAAM;CACtB,MAAM,mBACJ,YAAY,KAAA,UACF,OACN,OAAO,YAAY,aACjB,WAAA,GAAA,gCAAA,iCACgC,QAAQ;CAChD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,gBAAgBA,2BAAAA,kCAAkC,IAAI;CAC5D,MAAM,SAASC,yBAAAA,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;AAE/C,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAEpC,MAAM,UAAU,IAAIC,kCAAAA,wBAAwB,WAAW;AACvD,OAAK,MAAM,OAAO,cAAe,SAAQ,UAAU,IAAI;EACvD,MAAM,aAAa,QAAQ,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC;AACpE,MAAI,CAAC,WAAY,QAAO,EAAE,SAAS;AAEnC,MAAI;GACF,MAAM,gBAAgBC,yBAAAA,kBAAkB,WAAW;GACnD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACAC,yBAAAA,uBAAuB,eAAe,QAAQ,MAAM,aAAa;GAEvE,IAAI;AACJ,OAAI,MAAM,oBAAoB,KAAA,GAAW;IACvC,MAAM,qBAAqBC,6BAAAA,sBAAsB,YAAY;KAC3D,SAAS,KAAK;KACd,GAAI,OAAO,KAAK,oBAAoB,aAChC,EAAE,WAAW,KAAK,iBAAiB,GACnC,EAAE,SAAS,KAAK,iBAAiB;KACtC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAcC,6BAAAA,yBAAyB,oBAAoB,KAAK,aAAa;;AAIjF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,cAAW,SAAS;;GAEtB"}
+{"version":3,"file":"build_dataset_options.cjs","names":["buildRefMap","ResultPoolColumnSnapshotProvider","collectCtxColumnSnapshotProviders","ColumnCollectionBuilder","findFilterColumns","filterMatchesToOptions","findEnrichmentColumns","enrichmentVariantsToRefs"],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { AnchoredColumnCollection } from \"../../columns/column_collection_builder\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport {\n  ResultPoolColumnSnapshotProvider,\n  collectCtxColumnSnapshotProviders,\n} from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\ntype SpecPredicateOption =\n  | MultiColumnSelector\n  | MultiColumnSelector[]\n  | ((spec: PObjectSpec) => boolean);\n\nfunction toPredicate(opt: SpecPredicateOption | undefined): (spec: PObjectSpec) => boolean {\n  if (opt === undefined) return () => true;\n  return typeof opt === \"function\" ? opt : multiColumnSelectorsToPredicate(opt);\n}\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: SpecPredicateOption;\n  /**\n   * Restricts which result pool columns are considered as filters. Intersected\n   * with the built-in `pl7.app/isSubset: \"true\"` constraint. Defaults to\n   * accept-all.\n   */\n  filter?: SpecPredicateOption;\n  /** Formatting options for filter labels. */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: SpecPredicateOption;\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primaryPredicate = toPredicate(opts?.primary);\n  const filterPredicate = toPredicate(opts?.filter);\n\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  const withEnrichments = opts?.withEnrichments ?? false;\n  const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);\n  // Hoisted out of the per-option loop: collectCtxColumnSnapshotProviders\n  // walks the entire output tree, so calling it once per dataset option would\n  // be O(N × tree).\n  const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : undefined;\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    // Allocations happen inside try so a throw on the second build()\n    // still disposes the first collection.\n    let filterCollection: AnchoredColumnCollection | undefined;\n    let enrichmentCollection: AnchoredColumnCollection | undefined;\n    try {\n      // ResultPoolColumnSnapshotProvider is always complete;\n      // allowPartialColumnList narrows the return type to non-undefined.\n      filterCollection = new ColumnCollectionBuilder(pframeSpec)\n        .addSource(filterSource)\n        .build({ anchors: { main: datasetSpec }, allowPartialColumnList: true });\n\n      enrichmentCollection =\n        enrichmentSources !== undefined\n          ? new ColumnCollectionBuilder(pframeSpec)\n              .addSources(enrichmentSources)\n              .build({ anchors: { main: datasetSpec } })\n          : undefined;\n\n      const filterMatches = findFilterColumns(filterCollection).filter((m) =>\n        filterPredicate(m.column.spec),\n      );\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);\n\n      let enrichments;\n      if (enrichmentCollection && withEnrichments) {\n        const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {\n          maxHops: opts?.enrichmentMaxHops,\n          ...(typeof withEnrichments === \"function\"\n            ? { predicate: withEnrichments }\n            : { include: withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      filterCollection?.dispose();\n      enrichmentCollection?.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;;AAmBA,SAAS,YAAY,KAAsE;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,OAAA,GAAA,gCAAA,iCAAsC,IAAI;;;;;;;;AA6B/E,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,QAAQ;CACnD,MAAM,kBAAkB,YAAY,MAAM,OAAO;CAEjD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,SAASA,yBAAAA,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;CAE/C,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,IAAIC,2BAAAA,iCAAiC,IAAI,WAAW;CAIzE,MAAM,oBAAoB,kBAAkBC,2BAAAA,kCAAkC,IAAI,GAAG,KAAA;AAErF,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAIpC,IAAI;EACJ,IAAI;AACJ,MAAI;AAGF,sBAAmB,IAAIC,kCAAAA,wBAAwB,WAAW,CACvD,UAAU,aAAa,CACvB,MAAM;IAAE,SAAS,EAAE,MAAM,aAAa;IAAE,wBAAwB;IAAM,CAAC;AAE1E,0BACE,sBAAsB,KAAA,IAClB,IAAIA,kCAAAA,wBAAwB,WAAW,CACpC,WAAW,kBAAkB,CAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC,GAC5C,KAAA;GAEN,MAAM,gBAAgBC,yBAAAA,kBAAkB,iBAAiB,CAAC,QAAQ,MAChE,gBAAgB,EAAE,OAAO,KAAK,CAC/B;GACD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACAC,yBAAAA,uBAAuB,eAAe,QAAQ,MAAM,aAAa;GAEvE,IAAI;AACJ,OAAI,wBAAwB,iBAAiB;IAC3C,MAAM,qBAAqBC,6BAAAA,sBAAsB,sBAAsB;KACrE,SAAS,MAAM;KACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,iBAAiB,GAC9B,EAAE,SAAS,iBAAiB;KACjC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAcC,6BAAAA,yBAAyB,oBAAoB,MAAM,aAAa;;AAIlF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,qBAAkB,SAAS;AAC3B,yBAAsB,SAAS;;GAEjC"}

package/dist/components/PlDatasetSelector/build_dataset_options.d.ts

@@ -4,14 +4,21 @@ import { DatasetOption } from "./dataset_selection.js";
 import { MultiColumnSelector, PObjectSpec } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDatasetSelector/build_dataset_options.d.ts
+type SpecPredicateOption = MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean);
 type BuildDatasetOptions = {
-  /** Which result pool columns qualify as datasets. Defaults to all. */primary?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean); /** Formatting options for filter labels. */
+  /** Which result pool columns qualify as datasets. Defaults to all. */primary?: SpecPredicateOption;
+  /**
+   * Restricts which result pool columns are considered as filters. Intersected
+   * with the built-in `pl7.app/isSubset: "true"` constraint. Defaults to
+   * accept-all.
+   */
+  filter?: SpecPredicateOption; /** Formatting options for filter labels. */
   labelOptions?: DeriveLabelsOptions;
   /**
    * Enables enrichment discovery and filters hits attached to
    * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.
    */
-  withEnrichments?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean); /** Maximum linker hops considered. Only used when `withEnrichments` is set. */
+  withEnrichments?: SpecPredicateOption; /** Maximum linker hops considered. Only used when `withEnrichments` is set. */
   enrichmentMaxHops?: number;
 };
 /**

package/dist/components/PlDatasetSelector/build_dataset_options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_dataset_options.d.ts","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"mappings":";;;;;;KAUY,mBAAA;wEAEV,OAAA,GAAU,mBAAA,GAAsB,mBAAA,OAA0B,IAAA,EAAM,WAAA,eAFtD;EAIV,YAAA,GAAe,mBAAA;;;;;EAKf,eAAA,GAAkB,mBAAA,GAAsB,mBAAA,OAA0B,IAAA,EAAM,WAAA,eAAtD;EAElB,iBAAA;AAAA;;;;;;;iBASc,mBAAA,CACd,GAAA,EAAK,aAAA,EACL,IAAA,GAAO,mBAAA,GACN,aAAA"}
+{"version":3,"file":"build_dataset_options.d.ts","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"mappings":";;;;;;KAcK,mBAAA,GACD,mBAAA,GACA,mBAAA,OACE,IAAA,EAAM,WAAA;AAAA,KAOA,mBAAA;wEAEV,OAAA,GAAU,mBAAA;EAZY;;;;;EAkBtB,MAAA,GAAS,mBAAA,EAfY;EAiBrB,YAAA,GAAe,mBAAA;EAlBb;;;;EAuBF,eAAA,GAAkB,mBAAA,EAfR;EAiBV,iBAAA;AAAA;;;;;;;iBASc,mBAAA,CACd,GAAA,EAAK,aAAA,EACL,IAAA,GAAO,mBAAA,GACN,aAAA"}

package/dist/components/PlDatasetSelector/build_dataset_options.js

@@ -1,9 +1,13 @@
 import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
 import { ColumnCollectionBuilder } from "../../columns/column_collection_builder.js";
-import { collectCtxColumnSnapshotProviders } from "../../columns/ctx_column_sources.js";
+import { ResultPoolColumnSnapshotProvider, collectCtxColumnSnapshotProviders } from "../../columns/ctx_column_sources.js";
 import { enrichmentVariantsToRefs, findEnrichmentColumns } from "./enrichment_discovery.js";
 import { multiColumnSelectorsToPredicate } from "@milaboratories/pl-model-common";
 //#region src/components/PlDatasetSelector/build_dataset_options.ts
+function toPredicate(opt) {
+	if (opt === void 0) return () => true;
+	return typeof opt === "function" ? opt : multiColumnSelectorsToPredicate(opt);
+}
 /**
 * Usage:
 * ```ts
@@ -11,30 +15,35 @@ import { multiColumnSelectorsToPredicate } from "@milaboratories/pl-model-common
 * ```
 */
 function buildDatasetOptions(ctx, opts) {
-	const primary = opts?.primary;
-	const primaryPredicate = primary === void 0 ? () => true : typeof primary === "function" ? primary : multiColumnSelectorsToPredicate(primary);
+	const primaryPredicate = toPredicate(opts?.primary);
+	const filterPredicate = toPredicate(opts?.filter);
 	const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });
 	if (options.length === 0) return [];
-	const columnSources = collectCtxColumnSnapshotProviders(ctx);
 	const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);
 	const pframeSpec = ctx.getService("pframeSpec");
+	const withEnrichments = opts?.withEnrichments ?? false;
+	const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);
+	const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : void 0;
 	return options.map((primary) => {
 		const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);
 		if (!datasetSpec) return { primary };
-		const builder = new ColumnCollectionBuilder(pframeSpec);
-		for (const src of columnSources) builder.addSource(src);
-		const collection = builder.build({ anchors: { main: datasetSpec } });
-		if (!collection) return { primary };
+		let filterCollection;
+		let enrichmentCollection;
 		try {
-			const filterMatches = findFilterColumns(collection);
+			filterCollection = new ColumnCollectionBuilder(pframeSpec).addSource(filterSource).build({
+				anchors: { main: datasetSpec },
+				allowPartialColumnList: true
+			});
+			enrichmentCollection = enrichmentSources !== void 0 ? new ColumnCollectionBuilder(pframeSpec).addSources(enrichmentSources).build({ anchors: { main: datasetSpec } }) : void 0;
+			const filterMatches = findFilterColumns(filterCollection).filter((m) => filterPredicate(m.column.spec));
 			const filters = filterMatches.length === 0 ? void 0 : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);
 			let enrichments;
-			if (opts?.withEnrichments !== void 0) {
-				const enrichmentVariants = findEnrichmentColumns(collection, {
-					maxHops: opts.enrichmentMaxHops,
-					...typeof opts.withEnrichments === "function" ? { predicate: opts.withEnrichments } : { include: opts.withEnrichments }
+			if (enrichmentCollection && withEnrichments) {
+				const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {
+					maxHops: opts?.enrichmentMaxHops,
+					...typeof withEnrichments === "function" ? { predicate: withEnrichments } : { include: withEnrichments }
 				});
-				if (enrichmentVariants.length > 0) enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts.labelOptions);
+				if (enrichmentVariants.length > 0) enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);
 			}
 			return {
 				primary,
@@ -42,7 +51,8 @@ function buildDatasetOptions(ctx, opts) {
 				...enrichments !== void 0 && enrichments.length > 0 ? { enrichments } : {}
 			};
 		} finally {
-			collection.dispose();
+			filterCollection?.dispose();
+			enrichmentCollection?.dispose();
 		}
 	});
 }

package/dist/components/PlDatasetSelector/build_dataset_options.js.map

@@ -1 +1 @@
-{"version":3,"file":"build_dataset_options.js","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport { collectCtxColumnSnapshotProviders } from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean);\n  /** Formatting options for filter labels. */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean);\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primary = opts?.primary;\n  const primaryPredicate =\n    primary === undefined\n      ? () => true\n      : typeof primary === \"function\"\n        ? primary\n        : multiColumnSelectorsToPredicate(primary);\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const columnSources = collectCtxColumnSnapshotProviders(ctx);\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    const builder = new ColumnCollectionBuilder(pframeSpec);\n    for (const src of columnSources) builder.addSource(src);\n    const collection = builder.build({ anchors: { main: datasetSpec } });\n    if (!collection) return { primary };\n\n    try {\n      const filterMatches = findFilterColumns(collection);\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);\n\n      let enrichments;\n      if (opts?.withEnrichments !== undefined) {\n        const enrichmentVariants = findEnrichmentColumns(collection, {\n          maxHops: opts.enrichmentMaxHops,\n          ...(typeof opts.withEnrichments === \"function\"\n            ? { predicate: opts.withEnrichments }\n            : { include: opts.withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      collection.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;;AA8BA,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,UAAU,MAAM;CACtB,MAAM,mBACJ,YAAY,KAAA,UACF,OACN,OAAO,YAAY,aACjB,UACA,gCAAgC,QAAQ;CAChD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,gBAAgB,kCAAkC,IAAI;CAC5D,MAAM,SAAS,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;AAE/C,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAEpC,MAAM,UAAU,IAAI,wBAAwB,WAAW;AACvD,OAAK,MAAM,OAAO,cAAe,SAAQ,UAAU,IAAI;EACvD,MAAM,aAAa,QAAQ,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC;AACpE,MAAI,CAAC,WAAY,QAAO,EAAE,SAAS;AAEnC,MAAI;GACF,MAAM,gBAAgB,kBAAkB,WAAW;GACnD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACA,uBAAuB,eAAe,QAAQ,MAAM,aAAa;GAEvE,IAAI;AACJ,OAAI,MAAM,oBAAoB,KAAA,GAAW;IACvC,MAAM,qBAAqB,sBAAsB,YAAY;KAC3D,SAAS,KAAK;KACd,GAAI,OAAO,KAAK,oBAAoB,aAChC,EAAE,WAAW,KAAK,iBAAiB,GACnC,EAAE,SAAS,KAAK,iBAAiB;KACtC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAc,yBAAyB,oBAAoB,KAAK,aAAa;;AAIjF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,cAAW,SAAS;;GAEtB"}
+{"version":3,"file":"build_dataset_options.js","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { AnchoredColumnCollection } from \"../../columns/column_collection_builder\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport {\n  ResultPoolColumnSnapshotProvider,\n  collectCtxColumnSnapshotProviders,\n} from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\ntype SpecPredicateOption =\n  | MultiColumnSelector\n  | MultiColumnSelector[]\n  | ((spec: PObjectSpec) => boolean);\n\nfunction toPredicate(opt: SpecPredicateOption | undefined): (spec: PObjectSpec) => boolean {\n  if (opt === undefined) return () => true;\n  return typeof opt === \"function\" ? opt : multiColumnSelectorsToPredicate(opt);\n}\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: SpecPredicateOption;\n  /**\n   * Restricts which result pool columns are considered as filters. Intersected\n   * with the built-in `pl7.app/isSubset: \"true\"` constraint. Defaults to\n   * accept-all.\n   */\n  filter?: SpecPredicateOption;\n  /** Formatting options for filter labels. */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: SpecPredicateOption;\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primaryPredicate = toPredicate(opts?.primary);\n  const filterPredicate = toPredicate(opts?.filter);\n\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  const withEnrichments = opts?.withEnrichments ?? false;\n  const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);\n  // Hoisted out of the per-option loop: collectCtxColumnSnapshotProviders\n  // walks the entire output tree, so calling it once per dataset option would\n  // be O(N × tree).\n  const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : undefined;\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    // Allocations happen inside try so a throw on the second build()\n    // still disposes the first collection.\n    let filterCollection: AnchoredColumnCollection | undefined;\n    let enrichmentCollection: AnchoredColumnCollection | undefined;\n    try {\n      // ResultPoolColumnSnapshotProvider is always complete;\n      // allowPartialColumnList narrows the return type to non-undefined.\n      filterCollection = new ColumnCollectionBuilder(pframeSpec)\n        .addSource(filterSource)\n        .build({ anchors: { main: datasetSpec }, allowPartialColumnList: true });\n\n      enrichmentCollection =\n        enrichmentSources !== undefined\n          ? new ColumnCollectionBuilder(pframeSpec)\n              .addSources(enrichmentSources)\n              .build({ anchors: { main: datasetSpec } })\n          : undefined;\n\n      const filterMatches = findFilterColumns(filterCollection).filter((m) =>\n        filterPredicate(m.column.spec),\n      );\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);\n\n      let enrichments;\n      if (enrichmentCollection && withEnrichments) {\n        const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {\n          maxHops: opts?.enrichmentMaxHops,\n          ...(typeof withEnrichments === \"function\"\n            ? { predicate: withEnrichments }\n            : { include: withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      filterCollection?.dispose();\n      enrichmentCollection?.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;AAmBA,SAAS,YAAY,KAAsE;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,MAAM,gCAAgC,IAAI;;;;;;;;AA6B/E,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,QAAQ;CACnD,MAAM,kBAAkB,YAAY,MAAM,OAAO;CAEjD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,SAAS,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;CAE/C,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,IAAI,iCAAiC,IAAI,WAAW;CAIzE,MAAM,oBAAoB,kBAAkB,kCAAkC,IAAI,GAAG,KAAA;AAErF,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAIpC,IAAI;EACJ,IAAI;AACJ,MAAI;AAGF,sBAAmB,IAAI,wBAAwB,WAAW,CACvD,UAAU,aAAa,CACvB,MAAM;IAAE,SAAS,EAAE,MAAM,aAAa;IAAE,wBAAwB;IAAM,CAAC;AAE1E,0BACE,sBAAsB,KAAA,IAClB,IAAI,wBAAwB,WAAW,CACpC,WAAW,kBAAkB,CAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC,GAC5C,KAAA;GAEN,MAAM,gBAAgB,kBAAkB,iBAAiB,CAAC,QAAQ,MAChE,gBAAgB,EAAE,OAAO,KAAK,CAC/B;GACD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACA,uBAAuB,eAAe,QAAQ,MAAM,aAAa;GAEvE,IAAI;AACJ,OAAI,wBAAwB,iBAAiB;IAC3C,MAAM,qBAAqB,sBAAsB,sBAAsB;KACrE,SAAS,MAAM;KACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,iBAAiB,GAC9B,EAAE,SAAS,iBAAiB;KACjC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAc,yBAAyB,oBAAoB,MAAM,aAAa;;AAIlF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,qBAAkB,SAAS;AAC3B,yBAAsB,SAAS;;GAEjC"}

package/dist/components/PlDatasetSelector/filter_discovery.cjs

@@ -21,28 +21,32 @@ function findFilterColumns(collection) {
 /**
 * Derive labeled options from filter column matches, for use in DatasetOption.filters.
 *
+* Entries whose column id has no PlRef in `refsByObjectId` are silently
+* skipped — they cannot be exposed as user-selectable options.
+*
 * @param matches - from findFilterColumns()
 * @param refsByObjectId - from {@link buildRefMap}
 * @param labelOptions - forwarded to deriveDistinctLabels()
 */
 function filterMatchesToOptions(matches, refsByObjectId, labelOptions) {
 	if (matches.length === 0) return [];
-	const flattened = matches.flatMap((m) => m.variants.map((v) => ({
-		match: m,
-		variant: v
-	})));
+	const flattened = matches.flatMap((match) => {
+		const ref = refsByObjectId.get(match.column.id);
+		if (ref === void 0) return [];
+		return match.variants.map((variant) => ({
+			match,
+			variant,
+			ref
+		}));
+	});
 	const labels = require_derive_distinct_labels.deriveDistinctLabels(flattened.map(({ match, variant }) => ({
 		spec: match.column.spec,
 		linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
 	})), labelOptions);
-	return flattened.map(({ match }, i) => {
-		const ref = refsByObjectId.get(match.column.id);
-		if (ref === void 0) throw new Error(`no PlRef found for filter column ${match.column.spec.name} (id: ${match.column.id})`);
-		return {
-			ref,
-			label: labels[i]
-		};
-	});
+	return flattened.map(({ ref }, i) => ({
+		ref,
+		label: labels[i]
+	}));
 }
 /**
 * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`

package/dist/components/PlDatasetSelector/filter_discovery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"filter_discovery.cjs","names":["Annotation","deriveDistinctLabels"],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { Option, PlRef, PObjectId } from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnMatch,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * Matches columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n *\n * The axes-subset constraint is enforced by `mode: \"enrichment\"`, which sets\n * `allowFloatingHitAxes: false` — every axis of the matched column must be\n * present in the anchor's axes. See `matchingModeToConstraints()` in\n * `column_collection_builder.ts`.\n */\nexport function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[] {\n  return collection.findColumns({\n    mode: \"enrichment\",\n    include: {\n      annotations: { [Annotation.IsSubset]: \"true\" },\n    },\n  });\n}\n\n/**\n * Derive labeled options from filter column matches, for use in DatasetOption.filters.\n *\n * @param matches - from findFilterColumns()\n * @param refsByObjectId - from {@link buildRefMap}\n * @param labelOptions - forwarded to deriveDistinctLabels()\n */\nexport function filterMatchesToOptions(\n  matches: ColumnMatch[],\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>,\n  labelOptions?: DeriveLabelsOptions,\n): Option[] {\n  if (matches.length === 0) return [];\n\n  // Each ColumnMatch can be reached via multiple variants (different linker\n  // paths / qualifications). We emit one Option per variant so the user can\n  // pick a specific path — `deriveDistinctLabels` disambiguates labels by\n  // path.\n  const flattened = matches.flatMap((m) => m.variants.map((v) => ({ match: m, variant: v })));\n\n  const entries: Entry[] = flattened.map(({ match, variant }) => ({\n    spec: match.column.spec,\n    linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),\n  }));\n\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return flattened.map(({ match }, i) => {\n    const ref = refsByObjectId.get(match.column.id);\n    if (ref === undefined)\n      throw new Error(\n        `no PlRef found for filter column ${match.column.spec.name} (id: ${match.column.id})`,\n      );\n    return { ref, label: labels[i] };\n  });\n}\n\n/**\n * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`\n */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  const map = new Map<PObjectId, PlRef>();\n  for (const entry of entries) {\n    map.set(canonicalize(entry.ref)! as PObjectId, entry.ref);\n  }\n  return map;\n}\n"],"mappings":";;;;;;;;;;;;;;AAqBA,SAAgB,kBAAkB,YAAqD;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAGA,gCAAAA,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;;;AAUJ,SAAgB,uBACd,SACA,gBACA,cACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAMnC,MAAM,YAAY,QAAQ,SAAS,MAAM,EAAE,SAAS,KAAK,OAAO;EAAE,OAAO;EAAG,SAAS;EAAG,EAAE,CAAC;CAO3F,MAAM,SAASC,+BAAAA,qBALU,UAAU,KAAK,EAAE,OAAO,eAAe;EAC9D,MAAM,MAAM,OAAO;EACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;EAC/D,EAAE,EAE0C,aAAa;AAE1D,QAAO,UAAU,KAAK,EAAE,SAAS,MAAM;EACrC,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EACV,OAAM,IAAI,MACR,oCAAoC,MAAM,OAAO,KAAK,KAAK,QAAQ,MAAM,OAAO,GAAG,GACpF;AACH,SAAO;GAAE;GAAK,OAAO,OAAO;GAAI;GAChC;;;;;AAMJ,SAAgB,YAAY,SAAoE;CAC9F,MAAM,sBAAM,IAAI,KAAuB;AACvC,MAAK,MAAM,SAAS,QAClB,KAAI,KAAA,GAAA,aAAA,SAAiB,MAAM,IAAI,EAAgB,MAAM,IAAI;AAE3D,QAAO"}
+{"version":3,"file":"filter_discovery.cjs","names":["Annotation","deriveDistinctLabels"],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { Option, PlRef, PObjectId } from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnMatch,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * Matches columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n *\n * The axes-subset constraint is enforced by `mode: \"enrichment\"`, which sets\n * `allowFloatingHitAxes: false` — every axis of the matched column must be\n * present in the anchor's axes. See `matchingModeToConstraints()` in\n * `column_collection_builder.ts`.\n */\nexport function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[] {\n  return collection.findColumns({\n    mode: \"enrichment\",\n    include: {\n      annotations: { [Annotation.IsSubset]: \"true\" },\n    },\n  });\n}\n\n/**\n * Derive labeled options from filter column matches, for use in DatasetOption.filters.\n *\n * Entries whose column id has no PlRef in `refsByObjectId` are silently\n * skipped — they cannot be exposed as user-selectable options.\n *\n * @param matches - from findFilterColumns()\n * @param refsByObjectId - from {@link buildRefMap}\n * @param labelOptions - forwarded to deriveDistinctLabels()\n */\nexport function filterMatchesToOptions(\n  matches: ColumnMatch[],\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>,\n  labelOptions?: DeriveLabelsOptions,\n): Option[] {\n  if (matches.length === 0) return [];\n\n  // Each ColumnMatch can be reached via multiple variants (different linker\n  // paths / qualifications). We emit one Option per variant so the user can\n  // pick a specific path — `deriveDistinctLabels` disambiguates labels by\n  // path. All variants of a match share a column id, so the ref lookup\n  // happens once per match.\n  const flattened = matches.flatMap((match) => {\n    const ref = refsByObjectId.get(match.column.id);\n    if (ref === undefined) return [];\n    return match.variants.map((variant) => ({ match, variant, ref }));\n  });\n\n  const entries: Entry[] = flattened.map(({ match, variant }) => ({\n    spec: match.column.spec,\n    linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),\n  }));\n\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return flattened.map(({ ref }, i) => ({ ref, label: labels[i] }));\n}\n\n/**\n * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`\n */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  const map = new Map<PObjectId, PlRef>();\n  for (const entry of entries) {\n    map.set(canonicalize(entry.ref)! as PObjectId, entry.ref);\n  }\n  return map;\n}\n"],"mappings":";;;;;;;;;;;;;;AAqBA,SAAgB,kBAAkB,YAAqD;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAGA,gCAAAA,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;;;;;;AAaJ,SAAgB,uBACd,SACA,gBACA,cACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAOnC,MAAM,YAAY,QAAQ,SAAS,UAAU;EAC3C,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EAAW,QAAO,EAAE;AAChC,SAAO,MAAM,SAAS,KAAK,aAAa;GAAE;GAAO;GAAS;GAAK,EAAE;GACjE;CAOF,MAAM,SAASC,+BAAAA,qBALU,UAAU,KAAK,EAAE,OAAO,eAAe;EAC9D,MAAM,MAAM,OAAO;EACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;EAC/D,EAAE,EAE0C,aAAa;AAE1D,QAAO,UAAU,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;EAAI,EAAE;;;;;AAMnE,SAAgB,YAAY,SAAoE;CAC9F,MAAM,sBAAM,IAAI,KAAuB;AACvC,MAAK,MAAM,SAAS,QAClB,KAAI,KAAA,GAAA,aAAA,SAAiB,MAAM,IAAI,EAAgB,MAAM,IAAI;AAE3D,QAAO"}

package/dist/components/PlDatasetSelector/filter_discovery.d.ts

@@ -15,6 +15,9 @@ declare function findFilterColumns(collection: AnchoredColumnCollection): Column
 /**
  * Derive labeled options from filter column matches, for use in DatasetOption.filters.
  *
+ * Entries whose column id has no PlRef in `refsByObjectId` are silently
+ * skipped — they cannot be exposed as user-selectable options.
+ *
  * @param matches - from findFilterColumns()
  * @param refsByObjectId - from {@link buildRefMap}
  * @param labelOptions - forwarded to deriveDistinctLabels()

package/dist/components/PlDatasetSelector/filter_discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter_discovery.d.ts","names":[],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"mappings":";;;;;;;AAqBA;;;;;;iBAAgB,iBAAA,CAAkB,UAAA,EAAY,wBAAA,GAA2B,WAAA;;;AAgBzE;;;;;iBAAgB,sBAAA,CACd,OAAA,EAAS,WAAA,IACT,cAAA,EAAgB,WAAA,CAAY,SAAA,EAAW,KAAA,GACvC,YAAA,GAAe,mBAAA,GACd,MAAA;;;;iBA6Ba,WAAA,CAAY,OAAA;EAAA,SAA6B,GAAA,EAAK,KAAA;AAAA,MAAY,GAAA,CAAI,SAAA,EAAW,KAAA"}
+{"version":3,"file":"filter_discovery.d.ts","names":[],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"mappings":";;;;;;;AAqBA;;;;;;iBAAgB,iBAAA,CAAkB,UAAA,EAAY,wBAAA,GAA2B,WAAA;;;AAmBzE;;;;;;;;iBAAgB,sBAAA,CACd,OAAA,EAAS,WAAA,IACT,cAAA,EAAgB,WAAA,CAAY,SAAA,EAAW,KAAA,GACvC,YAAA,GAAe,mBAAA,GACd,MAAA;;;;iBA2Ba,WAAA,CAAY,OAAA;EAAA,SAA6B,GAAA,EAAK,KAAA;AAAA,MAAY,GAAA,CAAI,SAAA,EAAW,KAAA"}

package/dist/components/PlDatasetSelector/filter_discovery.js

@@ -19,28 +19,32 @@ function findFilterColumns(collection) {
 /**
 * Derive labeled options from filter column matches, for use in DatasetOption.filters.
 *
+* Entries whose column id has no PlRef in `refsByObjectId` are silently
+* skipped — they cannot be exposed as user-selectable options.
+*
 * @param matches - from findFilterColumns()
 * @param refsByObjectId - from {@link buildRefMap}
 * @param labelOptions - forwarded to deriveDistinctLabels()
 */
 function filterMatchesToOptions(matches, refsByObjectId, labelOptions) {
 	if (matches.length === 0) return [];
-	const flattened = matches.flatMap((m) => m.variants.map((v) => ({
-		match: m,
-		variant: v
-	})));
+	const flattened = matches.flatMap((match) => {
+		const ref = refsByObjectId.get(match.column.id);
+		if (ref === void 0) return [];
+		return match.variants.map((variant) => ({
+			match,
+			variant,
+			ref
+		}));
+	});
 	const labels = deriveDistinctLabels(flattened.map(({ match, variant }) => ({
 		spec: match.column.spec,
 		linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
 	})), labelOptions);
-	return flattened.map(({ match }, i) => {
-		const ref = refsByObjectId.get(match.column.id);
-		if (ref === void 0) throw new Error(`no PlRef found for filter column ${match.column.spec.name} (id: ${match.column.id})`);
-		return {
-			ref,
-			label: labels[i]
-		};
-	});
+	return flattened.map(({ ref }, i) => ({
+		ref,
+		label: labels[i]
+	}));
 }
 /**
 * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`

package/dist/components/PlDatasetSelector/filter_discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter_discovery.js","names":[],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { Option, PlRef, PObjectId } from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnMatch,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * Matches columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n *\n * The axes-subset constraint is enforced by `mode: \"enrichment\"`, which sets\n * `allowFloatingHitAxes: false` — every axis of the matched column must be\n * present in the anchor's axes. See `matchingModeToConstraints()` in\n * `column_collection_builder.ts`.\n */\nexport function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[] {\n  return collection.findColumns({\n    mode: \"enrichment\",\n    include: {\n      annotations: { [Annotation.IsSubset]: \"true\" },\n    },\n  });\n}\n\n/**\n * Derive labeled options from filter column matches, for use in DatasetOption.filters.\n *\n * @param matches - from findFilterColumns()\n * @param refsByObjectId - from {@link buildRefMap}\n * @param labelOptions - forwarded to deriveDistinctLabels()\n */\nexport function filterMatchesToOptions(\n  matches: ColumnMatch[],\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>,\n  labelOptions?: DeriveLabelsOptions,\n): Option[] {\n  if (matches.length === 0) return [];\n\n  // Each ColumnMatch can be reached via multiple variants (different linker\n  // paths / qualifications). We emit one Option per variant so the user can\n  // pick a specific path — `deriveDistinctLabels` disambiguates labels by\n  // path.\n  const flattened = matches.flatMap((m) => m.variants.map((v) => ({ match: m, variant: v })));\n\n  const entries: Entry[] = flattened.map(({ match, variant }) => ({\n    spec: match.column.spec,\n    linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),\n  }));\n\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return flattened.map(({ match }, i) => {\n    const ref = refsByObjectId.get(match.column.id);\n    if (ref === undefined)\n      throw new Error(\n        `no PlRef found for filter column ${match.column.spec.name} (id: ${match.column.id})`,\n      );\n    return { ref, label: labels[i] };\n  });\n}\n\n/**\n * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`\n */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  const map = new Map<PObjectId, PlRef>();\n  for (const entry of entries) {\n    map.set(canonicalize(entry.ref)! as PObjectId, entry.ref);\n  }\n  return map;\n}\n"],"mappings":";;;;;;;;;;;;AAqBA,SAAgB,kBAAkB,YAAqD;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAG,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;;;AAUJ,SAAgB,uBACd,SACA,gBACA,cACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAMnC,MAAM,YAAY,QAAQ,SAAS,MAAM,EAAE,SAAS,KAAK,OAAO;EAAE,OAAO;EAAG,SAAS;EAAG,EAAE,CAAC;CAO3F,MAAM,SAAS,qBALU,UAAU,KAAK,EAAE,OAAO,eAAe;EAC9D,MAAM,MAAM,OAAO;EACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;EAC/D,EAAE,EAE0C,aAAa;AAE1D,QAAO,UAAU,KAAK,EAAE,SAAS,MAAM;EACrC,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EACV,OAAM,IAAI,MACR,oCAAoC,MAAM,OAAO,KAAK,KAAK,QAAQ,MAAM,OAAO,GAAG,GACpF;AACH,SAAO;GAAE;GAAK,OAAO,OAAO;GAAI;GAChC;;;;;AAMJ,SAAgB,YAAY,SAAoE;CAC9F,MAAM,sBAAM,IAAI,KAAuB;AACvC,MAAK,MAAM,SAAS,QAClB,KAAI,IAAI,aAAa,MAAM,IAAI,EAAgB,MAAM,IAAI;AAE3D,QAAO"}
+{"version":3,"file":"filter_discovery.js","names":[],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { Option, PlRef, PObjectId } from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnMatch,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * Matches columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n *\n * The axes-subset constraint is enforced by `mode: \"enrichment\"`, which sets\n * `allowFloatingHitAxes: false` — every axis of the matched column must be\n * present in the anchor's axes. See `matchingModeToConstraints()` in\n * `column_collection_builder.ts`.\n */\nexport function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[] {\n  return collection.findColumns({\n    mode: \"enrichment\",\n    include: {\n      annotations: { [Annotation.IsSubset]: \"true\" },\n    },\n  });\n}\n\n/**\n * Derive labeled options from filter column matches, for use in DatasetOption.filters.\n *\n * Entries whose column id has no PlRef in `refsByObjectId` are silently\n * skipped — they cannot be exposed as user-selectable options.\n *\n * @param matches - from findFilterColumns()\n * @param refsByObjectId - from {@link buildRefMap}\n * @param labelOptions - forwarded to deriveDistinctLabels()\n */\nexport function filterMatchesToOptions(\n  matches: ColumnMatch[],\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>,\n  labelOptions?: DeriveLabelsOptions,\n): Option[] {\n  if (matches.length === 0) return [];\n\n  // Each ColumnMatch can be reached via multiple variants (different linker\n  // paths / qualifications). We emit one Option per variant so the user can\n  // pick a specific path — `deriveDistinctLabels` disambiguates labels by\n  // path. All variants of a match share a column id, so the ref lookup\n  // happens once per match.\n  const flattened = matches.flatMap((match) => {\n    const ref = refsByObjectId.get(match.column.id);\n    if (ref === undefined) return [];\n    return match.variants.map((variant) => ({ match, variant, ref }));\n  });\n\n  const entries: Entry[] = flattened.map(({ match, variant }) => ({\n    spec: match.column.spec,\n    linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),\n  }));\n\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return flattened.map(({ ref }, i) => ({ ref, label: labels[i] }));\n}\n\n/**\n * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`\n */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  const map = new Map<PObjectId, PlRef>();\n  for (const entry of entries) {\n    map.set(canonicalize(entry.ref)! as PObjectId, entry.ref);\n  }\n  return map;\n}\n"],"mappings":";;;;;;;;;;;;AAqBA,SAAgB,kBAAkB,YAAqD;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAG,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;;;;;;AAaJ,SAAgB,uBACd,SACA,gBACA,cACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAOnC,MAAM,YAAY,QAAQ,SAAS,UAAU;EAC3C,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EAAW,QAAO,EAAE;AAChC,SAAO,MAAM,SAAS,KAAK,aAAa;GAAE;GAAO;GAAS;GAAK,EAAE;GACjE;CAOF,MAAM,SAAS,qBALU,UAAU,KAAK,EAAE,OAAO,eAAe;EAC9D,MAAM,MAAM,OAAO;EACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;EAC/D,EAAE,EAE0C,aAAa;AAE1D,QAAO,UAAU,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;EAAI,EAAE;;;;;AAMnE,SAAgB,YAAY,SAAoE;CAC9F,MAAM,sBAAM,IAAI,KAAuB;AACvC,MAAK,MAAM,SAAS,QAClB,KAAI,IAAI,aAAa,MAAM,IAAI,EAAgB,MAAM,IAAI;AAE3D,QAAO"}

package/dist/package.cjs

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "1.72.0";
+var version = "1.73.0";
 //#endregion
 Object.defineProperty(exports, "version", {
 	enumerable: true,

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "1.72.0";
+var version = "1.73.0";
 //#endregion
 export { version };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.72.0",
+  "version": "1.73.0",
   "description": "Platforma.bio SDK / Block Model",
   "files": [
     "./dist/**/*",
@@ -31,8 +31,8 @@
     "utility-types": "^3.11.0",
     "zod": "~3.25.76",
     "@milaboratories/helpers": "1.14.1",
-    "@milaboratories/pl-model-common": "1.39.0",
     "@milaboratories/pl-error-like": "1.12.10",
+    "@milaboratories/pl-model-common": "1.39.0",
     "@milaboratories/ptabler-expression-js": "1.2.20",
     "@milaboratories/pl-model-middle-layer": "1.18.10"
   },
@@ -41,8 +41,8 @@
     "fast-json-patch": "^3.1.1",
     "typescript": "~5.9.3",
     "vitest": "^4.1.3",
-    "@milaboratories/pf-driver": "1.4.5",
     "@milaboratories/build-configs": "2.0.0",
+    "@milaboratories/pf-driver": "1.4.5",
     "@milaboratories/ts-configs": "1.2.3",
     "@milaboratories/pf-spec-driver": "1.3.9",
     "@milaboratories/ts-builder": "1.3.2"

package/src/components/PlDatasetSelector/build_dataset_options.ts

@@ -2,22 +2,42 @@ import type { MultiColumnSelector, Option, PObjectSpec } from "@milaboratories/p
 import { multiColumnSelectorsToPredicate } from "@milaboratories/pl-model-common";
 import type { DeriveLabelsOptions } from "../../labels/derive_distinct_labels";
 import type { RenderCtxBase } from "../../render";
+import type { AnchoredColumnCollection } from "../../columns/column_collection_builder";
 import { ColumnCollectionBuilder } from "../../columns/column_collection_builder";
-import { collectCtxColumnSnapshotProviders } from "../../columns/ctx_column_sources";
+import {
+  ResultPoolColumnSnapshotProvider,
+  collectCtxColumnSnapshotProviders,
+} from "../../columns/ctx_column_sources";
 import type { DatasetOption } from "./dataset_selection";
 import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery";
 import { enrichmentVariantsToRefs, findEnrichmentColumns } from "./enrichment_discovery";
 
+type SpecPredicateOption =
+  | MultiColumnSelector
+  | MultiColumnSelector[]
+  | ((spec: PObjectSpec) => boolean);
+
+function toPredicate(opt: SpecPredicateOption | undefined): (spec: PObjectSpec) => boolean {
+  if (opt === undefined) return () => true;
+  return typeof opt === "function" ? opt : multiColumnSelectorsToPredicate(opt);
+}
+
 export type BuildDatasetOptions = {
   /** Which result pool columns qualify as datasets. Defaults to all. */
-  primary?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean);
+  primary?: SpecPredicateOption;
+  /**
+   * Restricts which result pool columns are considered as filters. Intersected
+   * with the built-in `pl7.app/isSubset: "true"` constraint. Defaults to
+   * accept-all.
+   */
+  filter?: SpecPredicateOption;
   /** Formatting options for filter labels. */
   labelOptions?: DeriveLabelsOptions;
   /**
    * Enables enrichment discovery and filters hits attached to
    * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.
    */
-  withEnrichments?: MultiColumnSelector | MultiColumnSelector[] | ((spec: PObjectSpec) => boolean);
+  withEnrichments?: SpecPredicateOption;
   /** Maximum linker hops considered. Only used when `withEnrichments` is set. */
   enrichmentMaxHops?: number;
 };
@@ -32,46 +52,62 @@ export function buildDatasetOptions(
   ctx: RenderCtxBase,
   opts?: BuildDatasetOptions,
 ): DatasetOption[] | undefined {
-  const primary = opts?.primary;
-  const primaryPredicate =
-    primary === undefined
-      ? () => true
-      : typeof primary === "function"
-        ? primary
-        : multiColumnSelectorsToPredicate(primary);
+  const primaryPredicate = toPredicate(opts?.primary);
+  const filterPredicate = toPredicate(opts?.filter);
+
   const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });
   if (options.length === 0) return [];
 
-  const columnSources = collectCtxColumnSnapshotProviders(ctx);
   const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);
   const pframeSpec = ctx.getService("pframeSpec");
 
+  const withEnrichments = opts?.withEnrichments ?? false;
+  const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);
+  // Hoisted out of the per-option loop: collectCtxColumnSnapshotProviders
+  // walks the entire output tree, so calling it once per dataset option would
+  // be O(N × tree).
+  const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : undefined;
+
   return options.map((primary: Option): DatasetOption => {
     const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);
     if (!datasetSpec) return { primary };
 
-    const builder = new ColumnCollectionBuilder(pframeSpec);
-    for (const src of columnSources) builder.addSource(src);
-    const collection = builder.build({ anchors: { main: datasetSpec } });
-    if (!collection) return { primary };
-
+    // Allocations happen inside try so a throw on the second build()
+    // still disposes the first collection.
+    let filterCollection: AnchoredColumnCollection | undefined;
+    let enrichmentCollection: AnchoredColumnCollection | undefined;
     try {
-      const filterMatches = findFilterColumns(collection);
+      // ResultPoolColumnSnapshotProvider is always complete;
+      // allowPartialColumnList narrows the return type to non-undefined.
+      filterCollection = new ColumnCollectionBuilder(pframeSpec)
+        .addSource(filterSource)
+        .build({ anchors: { main: datasetSpec }, allowPartialColumnList: true });
+
+      enrichmentCollection =
+        enrichmentSources !== undefined
+          ? new ColumnCollectionBuilder(pframeSpec)
+              .addSources(enrichmentSources)
+              .build({ anchors: { main: datasetSpec } })
+          : undefined;
+
+      const filterMatches = findFilterColumns(filterCollection).filter((m) =>
+        filterPredicate(m.column.spec),
+      );
       const filters =
         filterMatches.length === 0
           ? undefined
           : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);
 
       let enrichments;
-      if (opts?.withEnrichments !== undefined) {
-        const enrichmentVariants = findEnrichmentColumns(collection, {
-          maxHops: opts.enrichmentMaxHops,
-          ...(typeof opts.withEnrichments === "function"
-            ? { predicate: opts.withEnrichments }
-            : { include: opts.withEnrichments }),
+      if (enrichmentCollection && withEnrichments) {
+        const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {
+          maxHops: opts?.enrichmentMaxHops,
+          ...(typeof withEnrichments === "function"
+            ? { predicate: withEnrichments }
+            : { include: withEnrichments }),
         });
         if (enrichmentVariants.length > 0) {
-          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts.labelOptions);
+          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);
         }
       }
 
@@ -81,7 +117,8 @@ export function buildDatasetOptions(
         ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),
       };
     } finally {
-      collection.dispose();
+      filterCollection?.dispose();
+      enrichmentCollection?.dispose();
     }
   });
 }

package/src/components/PlDatasetSelector/filter_discovery.test.ts

@@ -140,17 +140,23 @@ describe("filterMatchesToOptions", () => {
     expect(filterMatchesToOptions([], new Map())).toEqual([]);
   });
 
-  test("throws when ref not found in map", () => {
-    const filterSpec1 = spec("orphan", [axis("sample")], { [Annotation.IsSubset]: "true" });
-    const f1Snap = snap("orphan-id", filterSpec1);
+  test("skips entries whose ref is not found in map", () => {
+    const knownRef = createPlRef("b1", "known");
+    const knownSpec = spec("known", [axis("sample")], { [Annotation.IsSubset]: "true" });
+    const orphanSpec = spec("orphan", [axis("sample")], { [Annotation.IsSubset]: "true" });
+    const knownSnap = snap(canonicalize(knownRef)! as string, knownSpec);
+    const orphanSnap = snap("orphan-id", orphanSpec);
 
     const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
-    builder.addSource([f1Snap, anchorSnap]);
+    builder.addSource([knownSnap, orphanSnap, anchorSnap]);
     const collection = builder.build({ anchors: { main: anchorSpec } })!;
 
     const matches = findFilterColumns(collection);
-    expect(matches.length).toBe(1);
+    expect(matches.length).toBe(2);
 
-    expect(() => filterMatchesToOptions(matches, new Map())).toThrow(/no PlRef found/);
+    const refMap = buildRefMap([{ ref: knownRef }]);
+    const options = filterMatchesToOptions(matches, refMap);
+    expect(options).toHaveLength(1);
+    expect(options[0].ref).toBe(knownRef);
   });
 });

package/src/components/PlDatasetSelector/filter_discovery.ts

@@ -31,6 +31,9 @@ export function findFilterColumns(collection: AnchoredColumnCollection): ColumnM
 /**
  * Derive labeled options from filter column matches, for use in DatasetOption.filters.
  *
+ * Entries whose column id has no PlRef in `refsByObjectId` are silently
+ * skipped — they cannot be exposed as user-selectable options.
+ *
  * @param matches - from findFilterColumns()
  * @param refsByObjectId - from {@link buildRefMap}
  * @param labelOptions - forwarded to deriveDistinctLabels()
@@ -45,8 +48,13 @@ export function filterMatchesToOptions(
   // Each ColumnMatch can be reached via multiple variants (different linker
   // paths / qualifications). We emit one Option per variant so the user can
   // pick a specific path — `deriveDistinctLabels` disambiguates labels by
-  // path.
-  const flattened = matches.flatMap((m) => m.variants.map((v) => ({ match: m, variant: v })));
+  // path. All variants of a match share a column id, so the ref lookup
+  // happens once per match.
+  const flattened = matches.flatMap((match) => {
+    const ref = refsByObjectId.get(match.column.id);
+    if (ref === undefined) return [];
+    return match.variants.map((variant) => ({ match, variant, ref }));
+  });
 
   const entries: Entry[] = flattened.map(({ match, variant }) => ({
     spec: match.column.spec,
@@ -55,14 +63,7 @@ export function filterMatchesToOptions(
 
   const labels = deriveDistinctLabels(entries, labelOptions);
 
-  return flattened.map(({ match }, i) => {
-    const ref = refsByObjectId.get(match.column.id);
-    if (ref === undefined)
-      throw new Error(
-        `no PlRef found for filter column ${match.column.spec.name} (id: ${match.column.id})`,
-      );
-    return { ref, label: labels[i] };
-  });
+  return flattened.map(({ ref }, i) => ({ ref, label: labels[i] }));
 }
 
 /**