@platforma-sdk/model 1.79.27 → 1.80.2

package/dist/components/PlDatasetSelector/build_dataset_options.js

@@ -1,5 +1,6 @@
-import { ColumnCollectionBuilder } from "../../columns/column_collection_builder.js";
-import { ResultPoolColumnSnapshotProvider, collectCtxColumnSnapshotProviders } from "../../columns/ctx_column_sources.js";
+import { ColumnsProvider } from "../../columns/column_providers/providers.js";
+import { getCtxProviders } from "../../columns/column_providers/index.js";
+import "../../columns/index.js";
 import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
 import { enrichmentVariantsToRefs, findEnrichmentColumns } from "./enrichment_discovery.js";
 import { multiColumnSelectorsToPredicate } from "@milaboratories/pl-model-common";
@@ -20,44 +21,36 @@ function buildDatasetOptions(ctx, opts) {
 	const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });
 	if (options.length === 0) return [];
 	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;
+	const filterSource = ColumnsProvider(ctx.ctx.getUpstreamBlockCtx());
+	const enrichmentSources = withEnrichments ? getCtxProviders(ctx) : void 0;
 	return options.map((primary) => {
 		const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);
 		if (!datasetSpec) return { primary };
-		let filterCollection;
-		let enrichmentCollection;
-		try {
-			filterCollection = new ColumnCollectionBuilder(pframeSpec).addSource(filterSource).build({
-				anchors: { main: datasetSpec },
-				allowPartialColumnList: true
+		const filterMatches = findFilterColumns({
+			sources: [filterSource],
+			anchorSpec: datasetSpec
+		}).filter((m) => filterPredicate(m.getSpec()));
+		const filters = filterMatches.length === 0 ? void 0 : filterMatchesToOptions(filterMatches, {
+			refsByObjectId: refMap,
+			datasetSpec,
+			labelOptions: opts?.labelOptions
+		});
+		let enrichments;
+		if (enrichmentSources && withEnrichments) {
+			const enrichmentVariants = findEnrichmentColumns({
+				sources: enrichmentSources,
+				anchorSpec: datasetSpec,
+				maxHops: opts?.enrichmentMaxHops,
+				...typeof withEnrichments === "function" ? { predicate: withEnrichments } : { include: withEnrichments }
 			});
-			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, {
-				refsByObjectId: refMap,
-				datasetSpec,
-				labelOptions: opts?.labelOptions
-			});
-			let enrichments;
-			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);
-			}
-			return {
-				primary,
-				...filters !== void 0 && filters.length > 0 ? { filters } : {},
-				...enrichments !== void 0 && enrichments.length > 0 ? { enrichments } : {}
-			};
-		} finally {
-			filterCollection?.dispose();
-			enrichmentCollection?.dispose();
+			if (enrichmentVariants.length > 0) enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);
 		}
+		return {
+			primary,
+			...filters !== void 0 && filters.length > 0 ? { filters } : {},
+			...enrichments !== void 0 && enrichments.length > 0 ? { enrichments } : {}
+		};
 	});
 }
 //#endregion

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 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  /**\n   * Formatting options forwarded to label derivation for both filter and\n   * enrichment rows. `formatters.native` on the filter path is overridden\n   * — see `FilterMatchOptions.labelOptions`.\n   */\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, {\n              refsByObjectId: refMap,\n              datasetSpec,\n              labelOptions: opts?.labelOptions,\n            });\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;CACzF,IAAI,QAAQ,KAAA,GAAW,aAAa;CACpC,OAAO,OAAO,QAAQ,aAAa,MAAM,gCAAgC,GAAG;AAC9E;;;;;;;AAgCA,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,OAAO;CAClD,MAAM,kBAAkB,YAAY,MAAM,MAAM;CAEhD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,KAAK,CAAC;CACzF,IAAI,QAAQ,WAAW,GAAG,OAAO,CAAC;CAElC,MAAM,SAAS,YAAY,IAAI,WAAW,SAAS,CAAC,CAAC,OAAO;CAC5D,MAAM,aAAa,IAAI,WAAW,YAAY;CAE9C,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,IAAI,iCAAiC,IAAI,UAAU;CAIxE,MAAM,oBAAoB,kBAAkB,kCAAkC,GAAG,IAAI,KAAA;CAErF,OAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,GAAG;EAClE,IAAI,CAAC,aAAa,OAAO,EAAE,QAAQ;EAInC,IAAI;EACJ,IAAI;EACJ,IAAI;GAGF,mBAAmB,IAAI,wBAAwB,UAAU,CAAC,CACvD,UAAU,YAAY,CAAC,CACvB,MAAM;IAAE,SAAS,EAAE,MAAM,YAAY;IAAG,wBAAwB;GAAK,CAAC;GAEzE,uBACE,sBAAsB,KAAA,IAClB,IAAI,wBAAwB,UAAU,CAAC,CACpC,WAAW,iBAAiB,CAAC,CAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,YAAY,EAAE,CAAC,IAC3C,KAAA;GAEN,MAAM,gBAAgB,kBAAkB,gBAAgB,CAAC,CAAC,QAAQ,MAChE,gBAAgB,EAAE,OAAO,IAAI,CAC/B;GACA,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACA,uBAAuB,eAAe;IACpC,gBAAgB;IAChB;IACA,cAAc,MAAM;GACtB,CAAC;GAEP,IAAI;GACJ,IAAI,wBAAwB,iBAAiB;IAC3C,MAAM,qBAAqB,sBAAsB,sBAAsB;KACrE,SAAS,MAAM;KACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,gBAAgB,IAC7B,EAAE,SAAS,gBAAgB;IACjC,CAAC;IACD,IAAI,mBAAmB,SAAS,GAC9B,cAAc,yBAAyB,oBAAoB,MAAM,YAAY;GAEjF;GAEA,OAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,QAAQ,IAAI,CAAC;IACjE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,YAAY,IAAI,CAAC;GAC/E;EACF,UAAU;GACR,kBAAkB,QAAQ;GAC1B,sBAAsB,QAAQ;EAChC;CACF,CAAC;AACH"}
+{"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 { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\nimport { ColumnsProvider, getCtxProviders } from \"../../columns\";\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  /**\n   * Formatting options forwarded to label derivation for both filter and\n   * enrichment rows. `formatters.native` on the filter path is overridden\n   * — see `FilterMatchOptions.labelOptions`.\n   */\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\n  const withEnrichments = opts?.withEnrichments ?? false;\n  const filterSource = ColumnsProvider(ctx.ctx.getUpstreamBlockCtx());\n  // Hoist providers once: getCtxProviders walks the full output tree, so\n  // calling it per dataset option would be O(N × tree).\n  const enrichmentSources = withEnrichments ? getCtxProviders(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    const filterMatches = findFilterColumns({\n      sources: [filterSource],\n      anchorSpec: datasetSpec,\n    }).filter((m) => filterPredicate(m.getSpec()!));\n\n    const filters =\n      filterMatches.length === 0\n        ? undefined\n        : filterMatchesToOptions(filterMatches, {\n            refsByObjectId: refMap,\n            datasetSpec,\n            labelOptions: opts?.labelOptions,\n          });\n\n    let enrichments;\n    if (enrichmentSources && withEnrichments) {\n      const enrichmentVariants = findEnrichmentColumns({\n        sources: enrichmentSources,\n        anchorSpec: datasetSpec,\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  });\n}\n"],"mappings":";;;;;;;AAcA,SAAS,YAAY,KAAsE;CACzF,IAAI,QAAQ,KAAA,GAAW,aAAa;CACpC,OAAO,OAAO,QAAQ,aAAa,MAAM,gCAAgC,GAAG;AAC9E;;;;;;;AAgCA,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,OAAO;CAClD,MAAM,kBAAkB,YAAY,MAAM,MAAM;CAEhD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,KAAK,CAAC;CACzF,IAAI,QAAQ,WAAW,GAAG,OAAO,CAAC;CAElC,MAAM,SAAS,YAAY,IAAI,WAAW,SAAS,CAAC,CAAC,OAAO;CAE5D,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,gBAAgB,IAAI,IAAI,oBAAoB,CAAC;CAGlE,MAAM,oBAAoB,kBAAkB,gBAAgB,GAAG,IAAI,KAAA;CAEnE,OAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,GAAG;EAClE,IAAI,CAAC,aAAa,OAAO,EAAE,QAAQ;EAEnC,MAAM,gBAAgB,kBAAkB;GACtC,SAAS,CAAC,YAAY;GACtB,YAAY;EACd,CAAC,CAAC,CAAC,QAAQ,MAAM,gBAAgB,EAAE,QAAQ,CAAE,CAAC;EAE9C,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACA,uBAAuB,eAAe;GACpC,gBAAgB;GAChB;GACA,cAAc,MAAM;EACtB,CAAC;EAEP,IAAI;EACJ,IAAI,qBAAqB,iBAAiB;GACxC,MAAM,qBAAqB,sBAAsB;IAC/C,SAAS;IACT,YAAY;IACZ,SAAS,MAAM;IACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,gBAAgB,IAC7B,EAAE,SAAS,gBAAgB;GACjC,CAAC;GACD,IAAI,mBAAmB,SAAS,GAC9B,cAAc,yBAAyB,oBAAoB,MAAM,YAAY;EAEjF;EAEA,OAAO;GACL;GACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,QAAQ,IAAI,CAAC;GACjE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,YAAY,IAAI,CAAC;EAC/E;CACF,CAAC;AACH"}

package/dist/components/PlDatasetSelector/enrichment_discovery.cjs

@@ -1,43 +1,33 @@
 const require_derive_distinct_labels = require("../../labels/derive_distinct_labels.cjs");
+const require_columns_collection = require("../../columns/columns_collection.cjs");
+const require_utils = require("../../columns/utils.cjs");
+require("../../columns/index.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 //#region src/components/PlDatasetSelector/enrichment_discovery.ts
 /**
-* True for global-form ids — `canonicalize({__isRef: true, blockId, name})` —
-* which the workflow can resolve via bquery. Local-form ids (`resolvePath`)
-* fail this check and are excluded from auto-discovery; prerun/outputs hops
-* must be supplied as resolved `{spec, data}` instead.
-*/
-function isGloballyAddressable(id) {
-	try {
-		const decoded = JSON.parse(id);
-		return typeof decoded === "object" && decoded !== null && decoded.__isRef === true && typeof decoded.blockId === "string" && typeof decoded.name === "string";
-	} catch {
-		return false;
-	}
-}
-/**
 * Linker-reached hits attached to the anchor primary. Drops zero-hop variants
 * (filters / the primary itself) and structural hits (subset, linker, label
 * columns). Narrow further with `include` selectors or a `predicate`.
 */
-function findEnrichmentColumns(collection, options) {
-	const include = options?.include === void 0 ? void 0 : Array.isArray(options.include) ? options.include : [options.include];
-	const variants = collection.findColumnVariants({
+function findEnrichmentColumns(options) {
+	const include = options.include === void 0 ? void 0 : Array.isArray(options.include) ? options.include : [options.include];
+	const columns = require_columns_collection.ColumnsCollection([...options.sources], { driver: options.driver }).discover({
+		anchors: { main: options.anchorSpec },
 		mode: "enrichment",
-		maxHops: options?.maxHops ?? 4,
+		maxHops: options.maxHops ?? 4,
 		include,
 		exclude: [
 			{ annotations: { [_milaboratories_pl_model_common.Annotation.IsSubset]: "true" } },
 			{ annotations: { [_milaboratories_pl_model_common.Annotation.IsLinkerColumn]: "true" } },
 			{ name: _milaboratories_pl_model_common.Annotation.Label }
 		]
-	});
-	const predicate = options?.predicate;
-	return variants.filter((v) => {
-		if ((v.path?.length ?? 0) === 0) return false;
-		if (predicate !== void 0 && !predicate(v.column.spec)) return false;
-		if (!isGloballyAddressable(v.column.id)) return false;
-		if (v.path?.some((p) => !isGloballyAddressable(p.linker.id))) return false;
+	}).getColumns();
+	const predicate = options.predicate;
+	return columns.filter((v) => {
+		if (require_utils.isLeafColumn(v)) return false;
+		if (predicate !== void 0 && !predicate(v.getSpec())) return false;
+		if (!(0, _milaboratories_pl_model_common.isGlobalPObjectId)((0, _milaboratories_pl_model_common.extractPObjectId)(v.id))) return false;
+		if (require_utils.collectLinkerIds(v).some((id) => !(0, _milaboratories_pl_model_common.isGlobalPObjectId)(id))) return false;
 		return true;
 	});
 }
@@ -48,20 +38,25 @@ function findEnrichmentColumns(collection, options) {
 */
 function enrichmentVariantsToRefs(variants, labelOptions) {
 	if (variants.length === 0) return [];
-	const labels = require_derive_distinct_labels.deriveDistinctLabels(variants.map((variant) => ({
-		spec: variant.column.spec,
-		linkerPath: variant.path?.map((p) => ({ spec: p.linker.spec })),
-		qualifications: variant.qualifications
+	const linkerIdsByVariant = variants.map((v) => require_utils.collectLinkerIds(v));
+	const hitQualsByVariant = variants.map((v) => [...require_utils.hitQualifications(v)]);
+	const labels = require_derive_distinct_labels.deriveDistinctLabels(variants.map((variant, i) => ({
+		spec: variant.getSpec(),
+		linkerPath: require_utils.collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() })),
+		qualifications: {
+			forHit: hitQualsByVariant[i],
+			forQueries: require_utils.queriesQualifications(variant)
+		}
 	})), labelOptions);
 	return variants.map((variant, i) => {
-		const path = variant.path?.map((step) => ({
+		const path = linkerIdsByVariant[i].length === 0 ? void 0 : linkerIdsByVariant[i].map((id) => ({
 			type: "linker",
-			linker: step.linker.id
+			linker: id
 		}));
 		return {
-			ref: (0, _milaboratories_pl_model_common.createEnrichmentRef)(variant.column.id, {
+			ref: (0, _milaboratories_pl_model_common.createEnrichmentRef)((0, _milaboratories_pl_model_common.extractPObjectId)(variant.id), {
 				path,
-				qualifications: variant.qualifications?.forHit
+				qualifications: hitQualsByVariant[i]
 			}),
 			label: labels[i]
 		};

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

@@ -1 +1 @@
-{"version":3,"file":"enrichment_discovery.cjs","names":["Annotation","deriveDistinctLabels"],"sources":["../../../src/components/PlDatasetSelector/enrichment_discovery.ts"],"sourcesContent":["import { Annotation, createEnrichmentRef } from \"@milaboratories/pl-model-common\";\nimport type {\n  EnrichmentStep,\n  LabeledEnrichmentRef,\n  LabeledEnrichmentRefs,\n  MultiColumnSelector,\n  PObjectId,\n  PObjectSpec,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnVariant,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * True for global-form ids — `canonicalize({__isRef: true, blockId, name})` —\n * which the workflow can resolve via bquery. Local-form ids (`resolvePath`)\n * fail this check and are excluded from auto-discovery; prerun/outputs hops\n * must be supplied as resolved `{spec, data}` instead.\n */\nfunction isGloballyAddressable(id: PObjectId): boolean {\n  try {\n    const decoded = JSON.parse(id);\n    return (\n      typeof decoded === \"object\" &&\n      decoded !== null &&\n      decoded.__isRef === true &&\n      typeof decoded.blockId === \"string\" &&\n      typeof decoded.name === \"string\"\n    );\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Linker-reached hits attached to the anchor primary. Drops zero-hop variants\n * (filters / the primary itself) and structural hits (subset, linker, label\n * columns). Narrow further with `include` selectors or a `predicate`.\n */\nexport function findEnrichmentColumns(\n  collection: AnchoredColumnCollection,\n  options?: {\n    maxHops?: number;\n    include?: MultiColumnSelector | MultiColumnSelector[];\n    predicate?: (spec: PObjectSpec) => boolean;\n  },\n): ColumnVariant[] {\n  const include =\n    options?.include === undefined\n      ? undefined\n      : Array.isArray(options.include)\n        ? options.include\n        : [options.include];\n  const variants = collection.findColumnVariants({\n    mode: \"enrichment\",\n    maxHops: options?.maxHops ?? 4,\n    include,\n    exclude: [\n      { annotations: { [Annotation.IsSubset]: \"true\" } },\n      { annotations: { [Annotation.IsLinkerColumn]: \"true\" } },\n      { name: Annotation.Label },\n    ],\n  });\n  const predicate = options?.predicate;\n  return variants.filter((v) => {\n    if ((v.path?.length ?? 0) === 0) return false;\n    if (predicate !== undefined && !predicate(v.column.spec)) return false;\n    if (!isGloballyAddressable(v.column.id)) return false;\n    if (v.path?.some((p) => !isGloballyAddressable(p.linker.id))) return false;\n    return true;\n  });\n}\n\n/**\n * Pair each variant with a path-disambiguated label (so export headers stay\n * unique) and carry hit/linker `PObjectId`s through verbatim. Propagates\n * `qualifications.forHit`; `forQueries` is re-derived by the table builder.\n */\nexport function enrichmentVariantsToRefs(\n  variants: ColumnVariant[],\n  labelOptions?: DeriveLabelsOptions,\n): LabeledEnrichmentRefs {\n  if (variants.length === 0) return [];\n\n  const entries: Entry[] = variants.map((variant) => ({\n    spec: variant.column.spec,\n    linkerPath: variant.path?.map((p) => ({ spec: p.linker.spec })),\n    qualifications: variant.qualifications,\n  }));\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return variants.map((variant, i): LabeledEnrichmentRef => {\n    const path: undefined | EnrichmentStep[] = variant.path?.map((step) => ({\n      type: \"linker\",\n      linker: step.linker.id,\n    }));\n    return {\n      ref: createEnrichmentRef(variant.column.id, {\n        path,\n        qualifications: variant.qualifications?.forHit,\n      }),\n      label: labels[i],\n    };\n  });\n}\n"],"mappings":";;;;;;;;;AAyBA,SAAS,sBAAsB,IAAwB;CACrD,IAAI;EACF,MAAM,UAAU,KAAK,MAAM,EAAE;EAC7B,OACE,OAAO,YAAY,YACnB,YAAY,QACZ,QAAQ,YAAY,QACpB,OAAO,QAAQ,YAAY,YAC3B,OAAO,QAAQ,SAAS;CAE5B,QAAQ;EACN,OAAO;CACT;AACF;;;;;;AAOA,SAAgB,sBACd,YACA,SAKiB;CACjB,MAAM,UACJ,SAAS,YAAY,KAAA,IACjB,KAAA,IACA,MAAM,QAAQ,QAAQ,OAAO,IAC3B,QAAQ,UACR,CAAC,QAAQ,OAAO;CACxB,MAAM,WAAW,WAAW,mBAAmB;EAC7C,MAAM;EACN,SAAS,SAAS,WAAW;EAC7B;EACA,SAAS;GACP,EAAE,aAAa,GAAGA,gCAAAA,WAAW,WAAW,OAAO,EAAE;GACjD,EAAE,aAAa,GAAGA,gCAAAA,WAAW,iBAAiB,OAAO,EAAE;GACvD,EAAE,MAAMA,gCAAAA,WAAW,MAAM;EAC3B;CACF,CAAC;CACD,MAAM,YAAY,SAAS;CAC3B,OAAO,SAAS,QAAQ,MAAM;EAC5B,KAAK,EAAE,MAAM,UAAU,OAAO,GAAG,OAAO;EACxC,IAAI,cAAc,KAAA,KAAa,CAAC,UAAU,EAAE,OAAO,IAAI,GAAG,OAAO;EACjE,IAAI,CAAC,sBAAsB,EAAE,OAAO,EAAE,GAAG,OAAO;EAChD,IAAI,EAAE,MAAM,MAAM,MAAM,CAAC,sBAAsB,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO;EACrE,OAAO;CACT,CAAC;AACH;;;;;;AAOA,SAAgB,yBACd,UACA,cACuB;CACvB,IAAI,SAAS,WAAW,GAAG,OAAO,CAAC;CAOnC,MAAM,SAASC,+BAAAA,qBALU,SAAS,KAAK,aAAa;EAClD,MAAM,QAAQ,OAAO;EACrB,YAAY,QAAQ,MAAM,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,EAAE;EAC9D,gBAAgB,QAAQ;CAC1B,EAC0C,GAAG,YAAY;CAEzD,OAAO,SAAS,KAAK,SAAS,MAA4B;EACxD,MAAM,OAAqC,QAAQ,MAAM,KAAK,UAAU;GACtE,MAAM;GACN,QAAQ,KAAK,OAAO;EACtB,EAAE;EACF,OAAO;GACL,MAAA,GAAA,gCAAA,oBAAA,CAAyB,QAAQ,OAAO,IAAI;IAC1C;IACA,gBAAgB,QAAQ,gBAAgB;GAC1C,CAAC;GACD,OAAO,OAAO;EAChB;CACF,CAAC;AACH"}
+{"version":3,"file":"enrichment_discovery.cjs","names":["ColumnsCollection","Annotation","isLeafColumn","collectLinkerIds","hitQualifications","deriveDistinctLabels","collectLinkerColumns","queriesQualifications"],"sources":["../../../src/components/PlDatasetSelector/enrichment_discovery.ts"],"sourcesContent":["import {\n  Annotation,\n  createEnrichmentRef,\n  extractPObjectId,\n  isGlobalPObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  ColumnsCollectionDriverModel,\n  EnrichmentStep,\n  LabeledEnrichmentRef,\n  LabeledEnrichmentRefs,\n  MultiColumnSelector,\n  PColumnSpec,\n  PObjectSpec,\n} from \"@milaboratories/pl-model-common\";\nimport type { ColumnRecipe, ColumnsSource } from \"../../columns\";\nimport {\n  isLeafColumn,\n  ColumnsCollection,\n  collectLinkerIds,\n  hitQualifications,\n  collectLinkerColumns,\n  queriesQualifications,\n} from \"../../columns\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\nexport interface FindEnrichmentColumnsOptions {\n  sources: ReadonlyArray<ColumnsSource>;\n  anchorSpec: PColumnSpec;\n  maxHops?: number;\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  predicate?: (spec: PObjectSpec) => boolean;\n  /** Override the resolved `columnsCollection` service (primarily for tests). */\n  driver?: ColumnsCollectionDriverModel;\n}\n\n/**\n * Linker-reached hits attached to the anchor primary. Drops zero-hop variants\n * (filters / the primary itself) and structural hits (subset, linker, label\n * columns). Narrow further with `include` selectors or a `predicate`.\n */\nexport function findEnrichmentColumns(options: FindEnrichmentColumnsOptions): ColumnRecipe[] {\n  const include =\n    options.include === undefined\n      ? undefined\n      : Array.isArray(options.include)\n        ? options.include\n        : [options.include];\n\n  const columns = ColumnsCollection([...options.sources], { driver: options.driver })\n    .discover({\n      anchors: { main: options.anchorSpec },\n      mode: \"enrichment\",\n      maxHops: options.maxHops ?? 4,\n      include,\n      exclude: [\n        { annotations: { [Annotation.IsSubset]: \"true\" } },\n        { annotations: { [Annotation.IsLinkerColumn]: \"true\" } },\n        { name: Annotation.Label },\n      ],\n    })\n    .getColumns();\n\n  const predicate = options.predicate;\n  return columns.filter((v) => {\n    if (isLeafColumn(v)) return false;\n    if (predicate !== undefined && !predicate(v.getSpec())) return false;\n    if (!isGlobalPObjectId(extractPObjectId(v.id))) return false;\n    if (collectLinkerIds(v).some((id) => !isGlobalPObjectId(id))) return false;\n    return true;\n  });\n}\n\n/**\n * Pair each variant with a path-disambiguated label (so export headers stay\n * unique) and carry hit/linker `PObjectId`s through verbatim. Propagates\n * `qualifications.forHit`; `forQueries` is re-derived by the table builder.\n */\nexport function enrichmentVariantsToRefs(\n  variants: ColumnRecipe[],\n  labelOptions?: DeriveLabelsOptions,\n): LabeledEnrichmentRefs {\n  if (variants.length === 0) return [];\n\n  const linkerIdsByVariant = variants.map((v) => collectLinkerIds(v));\n  const hitQualsByVariant = variants.map((v) => [...hitQualifications(v)]);\n\n  const entries: Entry[] = variants.map((variant, i) => ({\n    spec: variant.getSpec(),\n    linkerPath: collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() })),\n    qualifications: {\n      forHit: hitQualsByVariant[i],\n      forQueries: queriesQualifications(variant),\n    },\n  }));\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return variants.map((variant, i): LabeledEnrichmentRef => {\n    const path: undefined | EnrichmentStep[] =\n      linkerIdsByVariant[i].length === 0\n        ? undefined\n        : linkerIdsByVariant[i].map((id) => ({ type: \"linker\", linker: id }));\n    return {\n      ref: createEnrichmentRef(extractPObjectId(variant.id), {\n        path,\n        qualifications: hitQualsByVariant[i],\n      }),\n      label: labels[i],\n    };\n  });\n}\n"],"mappings":";;;;;;;;;;;AA6CA,SAAgB,sBAAsB,SAAuD;CAC3F,MAAM,UACJ,QAAQ,YAAY,KAAA,IAChB,KAAA,IACA,MAAM,QAAQ,QAAQ,OAAO,IAC3B,QAAQ,UACR,CAAC,QAAQ,OAAO;CAExB,MAAM,UAAUA,2BAAAA,kBAAkB,CAAC,GAAG,QAAQ,OAAO,GAAG,EAAE,QAAQ,QAAQ,OAAO,CAAC,CAAC,CAChF,SAAS;EACR,SAAS,EAAE,MAAM,QAAQ,WAAW;EACpC,MAAM;EACN,SAAS,QAAQ,WAAW;EAC5B;EACA,SAAS;GACP,EAAE,aAAa,GAAGC,gCAAAA,WAAW,WAAW,OAAO,EAAE;GACjD,EAAE,aAAa,GAAGA,gCAAAA,WAAW,iBAAiB,OAAO,EAAE;GACvD,EAAE,MAAMA,gCAAAA,WAAW,MAAM;EAC3B;CACF,CAAC,CAAC,CACD,WAAW;CAEd,MAAM,YAAY,QAAQ;CAC1B,OAAO,QAAQ,QAAQ,MAAM;EAC3B,IAAIC,cAAAA,aAAa,CAAC,GAAG,OAAO;EAC5B,IAAI,cAAc,KAAA,KAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,OAAO;EAC/D,IAAI,EAAA,GAAA,gCAAA,kBAAA,EAAA,GAAA,gCAAA,iBAAA,CAAoC,EAAE,EAAE,CAAC,GAAG,OAAO;EACvD,IAAIC,cAAAA,iBAAiB,CAAC,CAAC,CAAC,MAAM,OAAO,EAAA,GAAA,gCAAA,kBAAA,CAAmB,EAAE,CAAC,GAAG,OAAO;EACrE,OAAO;CACT,CAAC;AACH;;;;;;AAOA,SAAgB,yBACd,UACA,cACuB;CACvB,IAAI,SAAS,WAAW,GAAG,OAAO,CAAC;CAEnC,MAAM,qBAAqB,SAAS,KAAK,MAAMA,cAAAA,iBAAiB,CAAC,CAAC;CAClE,MAAM,oBAAoB,SAAS,KAAK,MAAM,CAAC,GAAGC,cAAAA,kBAAkB,CAAC,CAAC,CAAC;CAUvE,MAAM,SAASC,+BAAAA,qBARU,SAAS,KAAK,SAAS,OAAO;EACrD,MAAM,QAAQ,QAAQ;EACtB,YAAYC,cAAAA,qBAAqB,OAAO,CAAC,CAAC,KAAK,YAAY,EAAE,MAAM,OAAO,QAAQ,EAAE,EAAE;EACtF,gBAAgB;GACd,QAAQ,kBAAkB;GAC1B,YAAYC,cAAAA,sBAAsB,OAAO;EAC3C;CACF,EAC0C,GAAG,YAAY;CAEzD,OAAO,SAAS,KAAK,SAAS,MAA4B;EACxD,MAAM,OACJ,mBAAmB,EAAE,CAAC,WAAW,IAC7B,KAAA,IACA,mBAAmB,EAAE,CAAC,KAAK,QAAQ;GAAE,MAAM;GAAU,QAAQ;EAAG,EAAE;EACxE,OAAO;GACL,MAAA,GAAA,gCAAA,oBAAA,EAAA,GAAA,gCAAA,iBAAA,CAA0C,QAAQ,EAAE,GAAG;IACrD;IACA,gBAAgB,kBAAkB;GACpC,CAAC;GACD,OAAO,OAAO;EAChB;CACF,CAAC;AACH"}

package/dist/components/PlDatasetSelector/enrichment_discovery.js

@@ -1,43 +1,33 @@
 import { deriveDistinctLabels } from "../../labels/derive_distinct_labels.js";
-import { Annotation, createEnrichmentRef } from "@milaboratories/pl-model-common";
+import { ColumnsCollection } from "../../columns/columns_collection.js";
+import { collectLinkerColumns, collectLinkerIds, hitQualifications, isLeafColumn, queriesQualifications } from "../../columns/utils.js";
+import "../../columns/index.js";
+import { Annotation, createEnrichmentRef, extractPObjectId, isGlobalPObjectId } from "@milaboratories/pl-model-common";
 //#region src/components/PlDatasetSelector/enrichment_discovery.ts
 /**
-* True for global-form ids — `canonicalize({__isRef: true, blockId, name})` —
-* which the workflow can resolve via bquery. Local-form ids (`resolvePath`)
-* fail this check and are excluded from auto-discovery; prerun/outputs hops
-* must be supplied as resolved `{spec, data}` instead.
-*/
-function isGloballyAddressable(id) {
-	try {
-		const decoded = JSON.parse(id);
-		return typeof decoded === "object" && decoded !== null && decoded.__isRef === true && typeof decoded.blockId === "string" && typeof decoded.name === "string";
-	} catch {
-		return false;
-	}
-}
-/**
 * Linker-reached hits attached to the anchor primary. Drops zero-hop variants
 * (filters / the primary itself) and structural hits (subset, linker, label
 * columns). Narrow further with `include` selectors or a `predicate`.
 */
-function findEnrichmentColumns(collection, options) {
-	const include = options?.include === void 0 ? void 0 : Array.isArray(options.include) ? options.include : [options.include];
-	const variants = collection.findColumnVariants({
+function findEnrichmentColumns(options) {
+	const include = options.include === void 0 ? void 0 : Array.isArray(options.include) ? options.include : [options.include];
+	const columns = ColumnsCollection([...options.sources], { driver: options.driver }).discover({
+		anchors: { main: options.anchorSpec },
 		mode: "enrichment",
-		maxHops: options?.maxHops ?? 4,
+		maxHops: options.maxHops ?? 4,
 		include,
 		exclude: [
 			{ annotations: { [Annotation.IsSubset]: "true" } },
 			{ annotations: { [Annotation.IsLinkerColumn]: "true" } },
 			{ name: Annotation.Label }
 		]
-	});
-	const predicate = options?.predicate;
-	return variants.filter((v) => {
-		if ((v.path?.length ?? 0) === 0) return false;
-		if (predicate !== void 0 && !predicate(v.column.spec)) return false;
-		if (!isGloballyAddressable(v.column.id)) return false;
-		if (v.path?.some((p) => !isGloballyAddressable(p.linker.id))) return false;
+	}).getColumns();
+	const predicate = options.predicate;
+	return columns.filter((v) => {
+		if (isLeafColumn(v)) return false;
+		if (predicate !== void 0 && !predicate(v.getSpec())) return false;
+		if (!isGlobalPObjectId(extractPObjectId(v.id))) return false;
+		if (collectLinkerIds(v).some((id) => !isGlobalPObjectId(id))) return false;
 		return true;
 	});
 }
@@ -48,20 +38,25 @@ function findEnrichmentColumns(collection, options) {
 */
 function enrichmentVariantsToRefs(variants, labelOptions) {
 	if (variants.length === 0) return [];
-	const labels = deriveDistinctLabels(variants.map((variant) => ({
-		spec: variant.column.spec,
-		linkerPath: variant.path?.map((p) => ({ spec: p.linker.spec })),
-		qualifications: variant.qualifications
+	const linkerIdsByVariant = variants.map((v) => collectLinkerIds(v));
+	const hitQualsByVariant = variants.map((v) => [...hitQualifications(v)]);
+	const labels = deriveDistinctLabels(variants.map((variant, i) => ({
+		spec: variant.getSpec(),
+		linkerPath: collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() })),
+		qualifications: {
+			forHit: hitQualsByVariant[i],
+			forQueries: queriesQualifications(variant)
+		}
 	})), labelOptions);
 	return variants.map((variant, i) => {
-		const path = variant.path?.map((step) => ({
+		const path = linkerIdsByVariant[i].length === 0 ? void 0 : linkerIdsByVariant[i].map((id) => ({
 			type: "linker",
-			linker: step.linker.id
+			linker: id
 		}));
 		return {
-			ref: createEnrichmentRef(variant.column.id, {
+			ref: createEnrichmentRef(extractPObjectId(variant.id), {
 				path,
-				qualifications: variant.qualifications?.forHit
+				qualifications: hitQualsByVariant[i]
 			}),
 			label: labels[i]
 		};

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

@@ -1 +1 @@
-{"version":3,"file":"enrichment_discovery.js","names":[],"sources":["../../../src/components/PlDatasetSelector/enrichment_discovery.ts"],"sourcesContent":["import { Annotation, createEnrichmentRef } from \"@milaboratories/pl-model-common\";\nimport type {\n  EnrichmentStep,\n  LabeledEnrichmentRef,\n  LabeledEnrichmentRefs,\n  MultiColumnSelector,\n  PObjectId,\n  PObjectSpec,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnVariant,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * True for global-form ids — `canonicalize({__isRef: true, blockId, name})` —\n * which the workflow can resolve via bquery. Local-form ids (`resolvePath`)\n * fail this check and are excluded from auto-discovery; prerun/outputs hops\n * must be supplied as resolved `{spec, data}` instead.\n */\nfunction isGloballyAddressable(id: PObjectId): boolean {\n  try {\n    const decoded = JSON.parse(id);\n    return (\n      typeof decoded === \"object\" &&\n      decoded !== null &&\n      decoded.__isRef === true &&\n      typeof decoded.blockId === \"string\" &&\n      typeof decoded.name === \"string\"\n    );\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Linker-reached hits attached to the anchor primary. Drops zero-hop variants\n * (filters / the primary itself) and structural hits (subset, linker, label\n * columns). Narrow further with `include` selectors or a `predicate`.\n */\nexport function findEnrichmentColumns(\n  collection: AnchoredColumnCollection,\n  options?: {\n    maxHops?: number;\n    include?: MultiColumnSelector | MultiColumnSelector[];\n    predicate?: (spec: PObjectSpec) => boolean;\n  },\n): ColumnVariant[] {\n  const include =\n    options?.include === undefined\n      ? undefined\n      : Array.isArray(options.include)\n        ? options.include\n        : [options.include];\n  const variants = collection.findColumnVariants({\n    mode: \"enrichment\",\n    maxHops: options?.maxHops ?? 4,\n    include,\n    exclude: [\n      { annotations: { [Annotation.IsSubset]: \"true\" } },\n      { annotations: { [Annotation.IsLinkerColumn]: \"true\" } },\n      { name: Annotation.Label },\n    ],\n  });\n  const predicate = options?.predicate;\n  return variants.filter((v) => {\n    if ((v.path?.length ?? 0) === 0) return false;\n    if (predicate !== undefined && !predicate(v.column.spec)) return false;\n    if (!isGloballyAddressable(v.column.id)) return false;\n    if (v.path?.some((p) => !isGloballyAddressable(p.linker.id))) return false;\n    return true;\n  });\n}\n\n/**\n * Pair each variant with a path-disambiguated label (so export headers stay\n * unique) and carry hit/linker `PObjectId`s through verbatim. Propagates\n * `qualifications.forHit`; `forQueries` is re-derived by the table builder.\n */\nexport function enrichmentVariantsToRefs(\n  variants: ColumnVariant[],\n  labelOptions?: DeriveLabelsOptions,\n): LabeledEnrichmentRefs {\n  if (variants.length === 0) return [];\n\n  const entries: Entry[] = variants.map((variant) => ({\n    spec: variant.column.spec,\n    linkerPath: variant.path?.map((p) => ({ spec: p.linker.spec })),\n    qualifications: variant.qualifications,\n  }));\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return variants.map((variant, i): LabeledEnrichmentRef => {\n    const path: undefined | EnrichmentStep[] = variant.path?.map((step) => ({\n      type: \"linker\",\n      linker: step.linker.id,\n    }));\n    return {\n      ref: createEnrichmentRef(variant.column.id, {\n        path,\n        qualifications: variant.qualifications?.forHit,\n      }),\n      label: labels[i],\n    };\n  });\n}\n"],"mappings":";;;;;;;;;AAyBA,SAAS,sBAAsB,IAAwB;CACrD,IAAI;EACF,MAAM,UAAU,KAAK,MAAM,EAAE;EAC7B,OACE,OAAO,YAAY,YACnB,YAAY,QACZ,QAAQ,YAAY,QACpB,OAAO,QAAQ,YAAY,YAC3B,OAAO,QAAQ,SAAS;CAE5B,QAAQ;EACN,OAAO;CACT;AACF;;;;;;AAOA,SAAgB,sBACd,YACA,SAKiB;CACjB,MAAM,UACJ,SAAS,YAAY,KAAA,IACjB,KAAA,IACA,MAAM,QAAQ,QAAQ,OAAO,IAC3B,QAAQ,UACR,CAAC,QAAQ,OAAO;CACxB,MAAM,WAAW,WAAW,mBAAmB;EAC7C,MAAM;EACN,SAAS,SAAS,WAAW;EAC7B;EACA,SAAS;GACP,EAAE,aAAa,GAAG,WAAW,WAAW,OAAO,EAAE;GACjD,EAAE,aAAa,GAAG,WAAW,iBAAiB,OAAO,EAAE;GACvD,EAAE,MAAM,WAAW,MAAM;EAC3B;CACF,CAAC;CACD,MAAM,YAAY,SAAS;CAC3B,OAAO,SAAS,QAAQ,MAAM;EAC5B,KAAK,EAAE,MAAM,UAAU,OAAO,GAAG,OAAO;EACxC,IAAI,cAAc,KAAA,KAAa,CAAC,UAAU,EAAE,OAAO,IAAI,GAAG,OAAO;EACjE,IAAI,CAAC,sBAAsB,EAAE,OAAO,EAAE,GAAG,OAAO;EAChD,IAAI,EAAE,MAAM,MAAM,MAAM,CAAC,sBAAsB,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO;EACrE,OAAO;CACT,CAAC;AACH;;;;;;AAOA,SAAgB,yBACd,UACA,cACuB;CACvB,IAAI,SAAS,WAAW,GAAG,OAAO,CAAC;CAOnC,MAAM,SAAS,qBALU,SAAS,KAAK,aAAa;EAClD,MAAM,QAAQ,OAAO;EACrB,YAAY,QAAQ,MAAM,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,EAAE;EAC9D,gBAAgB,QAAQ;CAC1B,EAC0C,GAAG,YAAY;CAEzD,OAAO,SAAS,KAAK,SAAS,MAA4B;EACxD,MAAM,OAAqC,QAAQ,MAAM,KAAK,UAAU;GACtE,MAAM;GACN,QAAQ,KAAK,OAAO;EACtB,EAAE;EACF,OAAO;GACL,KAAK,oBAAoB,QAAQ,OAAO,IAAI;IAC1C;IACA,gBAAgB,QAAQ,gBAAgB;GAC1C,CAAC;GACD,OAAO,OAAO;EAChB;CACF,CAAC;AACH"}
+{"version":3,"file":"enrichment_discovery.js","names":[],"sources":["../../../src/components/PlDatasetSelector/enrichment_discovery.ts"],"sourcesContent":["import {\n  Annotation,\n  createEnrichmentRef,\n  extractPObjectId,\n  isGlobalPObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  ColumnsCollectionDriverModel,\n  EnrichmentStep,\n  LabeledEnrichmentRef,\n  LabeledEnrichmentRefs,\n  MultiColumnSelector,\n  PColumnSpec,\n  PObjectSpec,\n} from \"@milaboratories/pl-model-common\";\nimport type { ColumnRecipe, ColumnsSource } from \"../../columns\";\nimport {\n  isLeafColumn,\n  ColumnsCollection,\n  collectLinkerIds,\n  hitQualifications,\n  collectLinkerColumns,\n  queriesQualifications,\n} from \"../../columns\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\nexport interface FindEnrichmentColumnsOptions {\n  sources: ReadonlyArray<ColumnsSource>;\n  anchorSpec: PColumnSpec;\n  maxHops?: number;\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  predicate?: (spec: PObjectSpec) => boolean;\n  /** Override the resolved `columnsCollection` service (primarily for tests). */\n  driver?: ColumnsCollectionDriverModel;\n}\n\n/**\n * Linker-reached hits attached to the anchor primary. Drops zero-hop variants\n * (filters / the primary itself) and structural hits (subset, linker, label\n * columns). Narrow further with `include` selectors or a `predicate`.\n */\nexport function findEnrichmentColumns(options: FindEnrichmentColumnsOptions): ColumnRecipe[] {\n  const include =\n    options.include === undefined\n      ? undefined\n      : Array.isArray(options.include)\n        ? options.include\n        : [options.include];\n\n  const columns = ColumnsCollection([...options.sources], { driver: options.driver })\n    .discover({\n      anchors: { main: options.anchorSpec },\n      mode: \"enrichment\",\n      maxHops: options.maxHops ?? 4,\n      include,\n      exclude: [\n        { annotations: { [Annotation.IsSubset]: \"true\" } },\n        { annotations: { [Annotation.IsLinkerColumn]: \"true\" } },\n        { name: Annotation.Label },\n      ],\n    })\n    .getColumns();\n\n  const predicate = options.predicate;\n  return columns.filter((v) => {\n    if (isLeafColumn(v)) return false;\n    if (predicate !== undefined && !predicate(v.getSpec())) return false;\n    if (!isGlobalPObjectId(extractPObjectId(v.id))) return false;\n    if (collectLinkerIds(v).some((id) => !isGlobalPObjectId(id))) return false;\n    return true;\n  });\n}\n\n/**\n * Pair each variant with a path-disambiguated label (so export headers stay\n * unique) and carry hit/linker `PObjectId`s through verbatim. Propagates\n * `qualifications.forHit`; `forQueries` is re-derived by the table builder.\n */\nexport function enrichmentVariantsToRefs(\n  variants: ColumnRecipe[],\n  labelOptions?: DeriveLabelsOptions,\n): LabeledEnrichmentRefs {\n  if (variants.length === 0) return [];\n\n  const linkerIdsByVariant = variants.map((v) => collectLinkerIds(v));\n  const hitQualsByVariant = variants.map((v) => [...hitQualifications(v)]);\n\n  const entries: Entry[] = variants.map((variant, i) => ({\n    spec: variant.getSpec(),\n    linkerPath: collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() })),\n    qualifications: {\n      forHit: hitQualsByVariant[i],\n      forQueries: queriesQualifications(variant),\n    },\n  }));\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return variants.map((variant, i): LabeledEnrichmentRef => {\n    const path: undefined | EnrichmentStep[] =\n      linkerIdsByVariant[i].length === 0\n        ? undefined\n        : linkerIdsByVariant[i].map((id) => ({ type: \"linker\", linker: id }));\n    return {\n      ref: createEnrichmentRef(extractPObjectId(variant.id), {\n        path,\n        qualifications: hitQualsByVariant[i],\n      }),\n      label: labels[i],\n    };\n  });\n}\n"],"mappings":";;;;;;;;;;;AA6CA,SAAgB,sBAAsB,SAAuD;CAC3F,MAAM,UACJ,QAAQ,YAAY,KAAA,IAChB,KAAA,IACA,MAAM,QAAQ,QAAQ,OAAO,IAC3B,QAAQ,UACR,CAAC,QAAQ,OAAO;CAExB,MAAM,UAAU,kBAAkB,CAAC,GAAG,QAAQ,OAAO,GAAG,EAAE,QAAQ,QAAQ,OAAO,CAAC,CAAC,CAChF,SAAS;EACR,SAAS,EAAE,MAAM,QAAQ,WAAW;EACpC,MAAM;EACN,SAAS,QAAQ,WAAW;EAC5B;EACA,SAAS;GACP,EAAE,aAAa,GAAG,WAAW,WAAW,OAAO,EAAE;GACjD,EAAE,aAAa,GAAG,WAAW,iBAAiB,OAAO,EAAE;GACvD,EAAE,MAAM,WAAW,MAAM;EAC3B;CACF,CAAC,CAAC,CACD,WAAW;CAEd,MAAM,YAAY,QAAQ;CAC1B,OAAO,QAAQ,QAAQ,MAAM;EAC3B,IAAI,aAAa,CAAC,GAAG,OAAO;EAC5B,IAAI,cAAc,KAAA,KAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,OAAO;EAC/D,IAAI,CAAC,kBAAkB,iBAAiB,EAAE,EAAE,CAAC,GAAG,OAAO;EACvD,IAAI,iBAAiB,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,kBAAkB,EAAE,CAAC,GAAG,OAAO;EACrE,OAAO;CACT,CAAC;AACH;;;;;;AAOA,SAAgB,yBACd,UACA,cACuB;CACvB,IAAI,SAAS,WAAW,GAAG,OAAO,CAAC;CAEnC,MAAM,qBAAqB,SAAS,KAAK,MAAM,iBAAiB,CAAC,CAAC;CAClE,MAAM,oBAAoB,SAAS,KAAK,MAAM,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC;CAUvE,MAAM,SAAS,qBARU,SAAS,KAAK,SAAS,OAAO;EACrD,MAAM,QAAQ,QAAQ;EACtB,YAAY,qBAAqB,OAAO,CAAC,CAAC,KAAK,YAAY,EAAE,MAAM,OAAO,QAAQ,EAAE,EAAE;EACtF,gBAAgB;GACd,QAAQ,kBAAkB;GAC1B,YAAY,sBAAsB,OAAO;EAC3C;CACF,EAC0C,GAAG,YAAY;CAEzD,OAAO,SAAS,KAAK,SAAS,MAA4B;EACxD,MAAM,OACJ,mBAAmB,EAAE,CAAC,WAAW,IAC7B,KAAA,IACA,mBAAmB,EAAE,CAAC,KAAK,QAAQ;GAAE,MAAM;GAAU,QAAQ;EAAG,EAAE;EACxE,OAAO;GACL,KAAK,oBAAoB,iBAAiB,QAAQ,EAAE,GAAG;IACrD;IACA,gBAAgB,kBAAkB;GACpC,CAAC;GACD,OAAO,OAAO;EAChB;CACF,CAAC;AACH"}

package/dist/components/PlDatasetSelector/filter_discovery.cjs

@@ -1,35 +1,45 @@
 const require_runtime = require("../../_virtual/_rolldown/runtime.cjs");
 const require_derive_distinct_labels = require("../../labels/derive_distinct_labels.cjs");
+const require_columns_collection = require("../../columns/columns_collection.cjs");
+const require_utils = require("../../columns/utils.cjs");
+require("../../columns/index.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 let canonicalize = require("canonicalize");
 canonicalize = require_runtime.__toESM(canonicalize, 1);
 //#region src/components/PlDatasetSelector/filter_discovery.ts
 /**
-* Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
-* The axes-subset constraint comes from `mode: "enrichment"`.
+* Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+*
+* Filter-intent: only the dataset's own direct subset columns, no linker
+* traversal — so this uses `.filter()` (pins `maxHops: 0`), not `.discover()`
+* (which would default to 4 hops and surface subset columns from other,
+* linker-reachable datasets). `.filter()` still applies the default
+* `enrichment` matching mode (`allowFloatingHitAxes: false`), which enforces
+* the axes-subset constraint. See `matchingModeToConstraints()`.
 */
-function findFilterColumns(collection) {
-	return collection.findColumns({
-		mode: "enrichment",
+function findFilterColumns(options) {
+	return require_columns_collection.ColumnsCollection([...options.sources], { driver: options.driver }).filter({
+		anchors: { main: options.anchorSpec },
 		include: { annotations: { [_milaboratories_pl_model_common.Annotation.IsSubset]: "true" } }
-	});
+	}).getColumns();
 }
 /**
-* Derive labels for filter column matches (for `DatasetOption.filters`).
-* Matches whose column id is missing from `refsByObjectId` are silently
-* dropped — they cannot be exposed as selectable options.
+* Derive labeled options from filter column variants, 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.
 */
-function filterMatchesToOptions(matches, options) {
-	if (matches.length === 0) return [];
+function filterMatchesToOptions(variants, options) {
+	if (variants.length === 0) return [];
 	const { refsByObjectId, datasetSpec, labelOptions } = options;
-	const entries = matches.flatMap((match) => {
-		const ref = refsByObjectId.get(match.column.id);
+	const entries = variants.flatMap((variant) => {
+		const ref = refsByObjectId.get((0, _milaboratories_pl_model_common.extractPObjectId)(variant.id));
 		if (ref === void 0) return [];
-		return match.variants.map((variant) => ({
+		return [{
 			ref,
-			spec: match.column.spec,
-			linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
-		}));
+			spec: variant.getSpec(),
+			linkerPath: require_utils.collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() }))
+		}];
 	});
 	const labels = require_derive_distinct_labels.deriveDistinctLabels([...entries, { spec: datasetSpec }], {
 		...labelOptions,

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, PObjectSpec } 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 * Columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n * The axes-subset constraint comes from `mode: \"enrichment\"`.\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\nexport type FilterMatchOptions = {\n  /** Maps result-pool column id back to its source PlRef (see {@link buildRefMap}). */\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>;\n  /** Spec of the dataset the filters are subsets of. */\n  datasetSpec: PObjectSpec;\n  /**\n   * Forwarded to `deriveDistinctLabels`. Any `formatters.native` caller\n   * sets is silently overridden — the function relies on a no-op native\n   * formatter to keep the algorithm from short-circuiting on filters'\n   * inherited `pl7.app/label`.\n   */\n  labelOptions?: DeriveLabelsOptions;\n};\n\n/**\n * Derive labels for filter column matches (for `DatasetOption.filters`).\n * Matches whose column id is missing from `refsByObjectId` are silently\n * dropped — they cannot be exposed as selectable options.\n */\nexport function filterMatchesToOptions(\n  matches: ColumnMatch[],\n  options: FilterMatchOptions,\n): Option[] {\n  if (matches.length === 0) return [];\n\n  const { refsByObjectId, datasetSpec, labelOptions } = options;\n\n  // One entry per match-variant (different paths to the same column are\n  // exposed as separate Options). The `ref` field rides along on the\n  // Entry-shaped objects via structural typing; `deriveDistinctLabels`\n  // ignores extra fields.\n  const entries = matches.flatMap((match): (Entry & { ref: PlRef })[] => {\n    const ref = refsByObjectId.get(match.column.id);\n    if (ref === undefined) return [];\n    return match.variants.map((variant) => ({\n      ref,\n      spec: match.column.spec,\n      linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),\n    }));\n  });\n\n  // Appending the dataset forces a discriminating trace step into every\n  // filter label (yielding e.g. \"Bulk / Top 10\"); the dataset's own label\n  // is dropped because we only zip `entries`. Native label is force-\n  // suppressed (the override sits after caller's spread) — filters\n  // inherit the dataset's `pl7.app/label` and would otherwise satisfy\n  // uniqueness before any trace step is consulted.\n  const labels = deriveDistinctLabels([...entries, { spec: datasetSpec }], {\n    ...labelOptions,\n    formatters: { ...labelOptions?.formatters, native: () => undefined },\n  });\n\n  return entries.map(({ ref }, i) => ({ ref, label: labels[i] }));\n}\n\n/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  return new Map(entries.map((e) => [canonicalize(e.ref)! as PObjectId, e.ref]));\n}\n"],"mappings":";;;;;;;;;;AAiBA,SAAgB,kBAAkB,YAAqD;CACrF,OAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAGA,gCAAAA,WAAW,WAAW,OAAO,EAC/C;CACF,CAAC;AACH;;;;;;AAqBA,SAAgB,uBACd,SACA,SACU;CACV,IAAI,QAAQ,WAAW,GAAG,OAAO,CAAC;CAElC,MAAM,EAAE,gBAAgB,aAAa,iBAAiB;CAMtD,MAAM,UAAU,QAAQ,SAAS,UAAsC;EACrE,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,EAAE;EAC9C,IAAI,QAAQ,KAAA,GAAW,OAAO,CAAC;EAC/B,OAAO,MAAM,SAAS,KAAK,aAAa;GACtC;GACA,MAAM,MAAM,OAAO;GACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,EAAE;EAC/D,EAAE;CACJ,CAAC;CAQD,MAAM,SAASC,+BAAAA,qBAAqB,CAAC,GAAG,SAAS,EAAE,MAAM,YAAY,CAAC,GAAG;EACvE,GAAG;EACH,YAAY;GAAE,GAAG,cAAc;GAAY,cAAc,KAAA;EAAU;CACrE,CAAC;CAED,OAAO,QAAQ,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;CAAG,EAAE;AAChE;;AAGA,SAAgB,YAAY,SAAoE;CAC9F,OAAO,IAAI,IAAI,QAAQ,KAAK,MAAM,EAAA,GAAA,aAAA,QAAA,CAAc,EAAE,GAAG,GAAiB,EAAE,GAAG,CAAC,CAAC;AAC/E"}
+{"version":3,"file":"filter_discovery.cjs","names":["ColumnsCollection","Annotation","collectLinkerColumns","deriveDistinctLabels"],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation, extractPObjectId } from \"@milaboratories/pl-model-common\";\nimport type {\n  ColumnsCollectionDriverModel,\n  Option,\n  PColumnSpec,\n  PlRef,\n  PObjectId,\n  PObjectSpec,\n} from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type { ColumnRecipe, ColumnsSource } from \"../../columns\";\nimport { ColumnsCollection, collectLinkerColumns } from \"../../columns\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\nexport interface FindFilterColumnsOptions {\n  sources: ReadonlyArray<ColumnsSource>;\n  anchorSpec: PColumnSpec;\n  /** Override the resolved `columnsCollection` service (primarily for tests). */\n  driver?: ColumnsCollectionDriverModel;\n}\n\n/**\n * Matches columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n *\n * Filter-intent: only the dataset's own direct subset columns, no linker\n * traversal — so this uses `.filter()` (pins `maxHops: 0`), not `.discover()`\n * (which would default to 4 hops and surface subset columns from other,\n * linker-reachable datasets). `.filter()` still applies the default\n * `enrichment` matching mode (`allowFloatingHitAxes: false`), which enforces\n * the axes-subset constraint. See `matchingModeToConstraints()`.\n */\nexport function findFilterColumns(options: FindFilterColumnsOptions): ColumnRecipe[] {\n  return ColumnsCollection([...options.sources], { driver: options.driver })\n    .filter({\n      anchors: { main: options.anchorSpec },\n      include: { annotations: { [Annotation.IsSubset]: \"true\" } },\n    })\n    .getColumns();\n}\n\nexport type FilterMatchOptions = {\n  /** Maps result-pool column id back to its source PlRef (see {@link buildRefMap}). */\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>;\n  /** Spec of the dataset the filters are subsets of. */\n  datasetSpec: PObjectSpec;\n  /**\n   * Forwarded to `deriveDistinctLabels`. Any `formatters.native` caller\n   * sets is silently overridden — the function relies on a no-op native\n   * formatter to keep the algorithm from short-circuiting on filters'\n   * inherited `pl7.app/label`.\n   */\n  labelOptions?: DeriveLabelsOptions;\n};\n\n/**\n * Derive labeled options from filter column variants, 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 */\nexport function filterMatchesToOptions(\n  variants: ColumnRecipe[],\n  options: FilterMatchOptions,\n): Option[] {\n  if (variants.length === 0) return [];\n\n  const { refsByObjectId, datasetSpec, labelOptions } = options;\n\n  // One Option per variant — `deriveDistinctLabels` disambiguates labels by\n  // path. All variants of the same column share a terminal PObjectId, so the\n  // ref lookup happens once per variant.\n  const entries: (Entry & { ref: PlRef })[] = variants.flatMap((variant) => {\n    const ref = refsByObjectId.get(extractPObjectId(variant.id));\n    if (ref === undefined) return [];\n    return [\n      {\n        ref,\n        spec: variant.getSpec(),\n        linkerPath: collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() })),\n      },\n    ];\n  });\n\n  // Appending the dataset forces a discriminating trace step into every\n  // filter label (yielding e.g. \"Bulk / Top 10\"); the dataset's own label\n  // is dropped because we only zip `entries`. Native label is force-\n  // suppressed (the override sits after caller's spread) — filters\n  // inherit the dataset's `pl7.app/label` and would otherwise satisfy\n  // uniqueness before any trace step is consulted.\n  const labels = deriveDistinctLabels([...entries, { spec: datasetSpec }], {\n    ...labelOptions,\n    formatters: { ...labelOptions?.formatters, native: () => undefined },\n  });\n\n  return entries.map(({ ref }, i) => ({ ref, label: labels[i] }));\n}\n\n/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  return new Map(entries.map((e) => [canonicalize(e.ref)! as PObjectId, e.ref]));\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAmCA,SAAgB,kBAAkB,SAAmD;CACnF,OAAOA,2BAAAA,kBAAkB,CAAC,GAAG,QAAQ,OAAO,GAAG,EAAE,QAAQ,QAAQ,OAAO,CAAC,CAAC,CACvE,OAAO;EACN,SAAS,EAAE,MAAM,QAAQ,WAAW;EACpC,SAAS,EAAE,aAAa,GAAGC,gCAAAA,WAAW,WAAW,OAAO,EAAE;CAC5D,CAAC,CAAC,CACD,WAAW;AAChB;;;;;;;AAsBA,SAAgB,uBACd,UACA,SACU;CACV,IAAI,SAAS,WAAW,GAAG,OAAO,CAAC;CAEnC,MAAM,EAAE,gBAAgB,aAAa,iBAAiB;CAKtD,MAAM,UAAsC,SAAS,SAAS,YAAY;EACxE,MAAM,MAAM,eAAe,KAAA,GAAA,gCAAA,iBAAA,CAAqB,QAAQ,EAAE,CAAC;EAC3D,IAAI,QAAQ,KAAA,GAAW,OAAO,CAAC;EAC/B,OAAO,CACL;GACE;GACA,MAAM,QAAQ,QAAQ;GACtB,YAAYC,cAAAA,qBAAqB,OAAO,CAAC,CAAC,KAAK,YAAY,EAAE,MAAM,OAAO,QAAQ,EAAE,EAAE;EACxF,CACF;CACF,CAAC;CAQD,MAAM,SAASC,+BAAAA,qBAAqB,CAAC,GAAG,SAAS,EAAE,MAAM,YAAY,CAAC,GAAG;EACvE,GAAG;EACH,YAAY;GAAE,GAAG,cAAc;GAAY,cAAc,KAAA;EAAU;CACrE,CAAC;CAED,OAAO,QAAQ,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;CAAG,EAAE;AAChE;;AAGA,SAAgB,YAAY,SAAoE;CAC9F,OAAO,IAAI,IAAI,QAAQ,KAAK,MAAM,EAAA,GAAA,aAAA,QAAA,CAAc,EAAE,GAAG,GAAiB,EAAE,GAAG,CAAC,CAAC;AAC/E"}

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

@@ -1,13 +1,26 @@
-import { AnchoredColumnCollection, ColumnMatch } from "../../columns/column_collection_builder.js";
 import { DeriveLabelsOptions } from "../../labels/derive_distinct_labels.js";
-import { Option, PObjectId, PObjectSpec, PlRef } from "@milaboratories/pl-model-common";
+import { ColumnRecipe } from "../../columns/column_recipes/index.js";
+import { ColumnsSource } from "../../columns/column_providers/types.js";
+import { ColumnsCollectionDriverModel, Option, PColumnSpec, PObjectId, PObjectSpec, PlRef } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDatasetSelector/filter_discovery.d.ts
+interface FindFilterColumnsOptions {
+  sources: ReadonlyArray<ColumnsSource>;
+  anchorSpec: PColumnSpec;
+  /** Override the resolved `columnsCollection` service (primarily for tests). */
+  driver?: ColumnsCollectionDriverModel;
+}
 /**
- * Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
- * The axes-subset constraint comes from `mode: "enrichment"`.
+ * Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+ *
+ * Filter-intent: only the dataset's own direct subset columns, no linker
+ * traversal — so this uses `.filter()` (pins `maxHops: 0`), not `.discover()`
+ * (which would default to 4 hops and surface subset columns from other,
+ * linker-reachable datasets). `.filter()` still applies the default
+ * `enrichment` matching mode (`allowFloatingHitAxes: false`), which enforces
+ * the axes-subset constraint. See `matchingModeToConstraints()`.
  */
-declare function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[];
+declare function findFilterColumns(options: FindFilterColumnsOptions): ColumnRecipe[];
 type FilterMatchOptions = {
   /** Maps result-pool column id back to its source PlRef (see {@link buildRefMap}). */refsByObjectId: ReadonlyMap<PObjectId, PlRef>; /** Spec of the dataset the filters are subsets of. */
   datasetSpec: PObjectSpec;
@@ -20,15 +33,16 @@ type FilterMatchOptions = {
   labelOptions?: DeriveLabelsOptions;
 };
 /**
- * Derive labels for filter column matches (for `DatasetOption.filters`).
- * Matches whose column id is missing from `refsByObjectId` are silently
- * dropped — they cannot be exposed as selectable options.
+ * Derive labeled options from filter column variants, 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.
  */
-declare function filterMatchesToOptions(matches: ColumnMatch[], options: FilterMatchOptions): Option[];
+declare function filterMatchesToOptions(variants: ColumnRecipe[], options: FilterMatchOptions): Option[];
 /** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */
 declare function buildRefMap(entries: readonly {
   readonly ref: PlRef;
 }[]): Map<PObjectId, PlRef>;
 //#endregion
-export { FilterMatchOptions, buildRefMap, filterMatchesToOptions, findFilterColumns };
+export { FilterMatchOptions, FindFilterColumnsOptions, buildRefMap, filterMatchesToOptions, findFilterColumns };
 //# sourceMappingURL=filter_discovery.d.ts.map

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":";;;;;;;AAiBA;;iBAAgB,iBAAA,CAAkB,UAAA,EAAY,wBAAA,GAA2B,WAAW;AAAA,KASxE,kBAAA;EATkC,qFAW5C,cAAA,EAAgB,WAAA,CAAY,SAAA,EAAW,KAAA,GAXgC;EAavE,WAAA,EAAa,WAAA;EAbqE;AASpF;;;;;EAWE,YAAA,GAAe,mBAAA;AAAA;;;;;;iBAQD,sBAAA,CACd,OAAA,EAAS,WAAA,IACT,OAAA,EAAS,kBAAA,GACR,MAAA;;iBAkCa,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":";;;;;;UAkBiB,wBAAA;EACf,OAAA,EAAS,aAAA,CAAc,aAAA;EACvB,UAAA,EAAY,WAAA;;EAEZ,MAAA,GAAS,4BAAA;AAAA;;;;;;;;;;;iBAaK,iBAAA,CAAkB,OAAA,EAAS,wBAAA,GAA2B,YAAY;AAAA,KAStE,kBAAA;EAtBV,qFAwBA,cAAA,EAAgB,WAAA,CAAY,SAAA,EAAW,KAAA,GAxBF;EA0BrC,WAAA,EAAa,WAAA;EAbC;;;;;;EAoBd,YAAA,GAAe,mBAAA;AAAA;AApBiE;AASlF;;;;;AATkF,iBA6BlE,sBAAA,CACd,QAAA,EAAU,YAAA,IACV,OAAA,EAAS,kBAAA,GACR,MAAA;;iBAmCa,WAAA,CAAY,OAAA;EAAA,SAA6B,GAAA,EAAK,KAAA;AAAA,MAAY,GAAA,CAAI,SAAA,EAAW,KAAA"}

package/dist/components/PlDatasetSelector/filter_discovery.js

@@ -1,33 +1,43 @@
 import { deriveDistinctLabels } from "../../labels/derive_distinct_labels.js";
-import { Annotation } from "@milaboratories/pl-model-common";
+import { ColumnsCollection } from "../../columns/columns_collection.js";
+import { collectLinkerColumns } from "../../columns/utils.js";
+import "../../columns/index.js";
+import { Annotation, extractPObjectId } from "@milaboratories/pl-model-common";
 import canonicalize from "canonicalize";
 //#region src/components/PlDatasetSelector/filter_discovery.ts
 /**
-* Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
-* The axes-subset constraint comes from `mode: "enrichment"`.
+* Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+*
+* Filter-intent: only the dataset's own direct subset columns, no linker
+* traversal — so this uses `.filter()` (pins `maxHops: 0`), not `.discover()`
+* (which would default to 4 hops and surface subset columns from other,
+* linker-reachable datasets). `.filter()` still applies the default
+* `enrichment` matching mode (`allowFloatingHitAxes: false`), which enforces
+* the axes-subset constraint. See `matchingModeToConstraints()`.
 */
-function findFilterColumns(collection) {
-	return collection.findColumns({
-		mode: "enrichment",
+function findFilterColumns(options) {
+	return ColumnsCollection([...options.sources], { driver: options.driver }).filter({
+		anchors: { main: options.anchorSpec },
 		include: { annotations: { [Annotation.IsSubset]: "true" } }
-	});
+	}).getColumns();
 }
 /**
-* Derive labels for filter column matches (for `DatasetOption.filters`).
-* Matches whose column id is missing from `refsByObjectId` are silently
-* dropped — they cannot be exposed as selectable options.
+* Derive labeled options from filter column variants, 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.
 */
-function filterMatchesToOptions(matches, options) {
-	if (matches.length === 0) return [];
+function filterMatchesToOptions(variants, options) {
+	if (variants.length === 0) return [];
 	const { refsByObjectId, datasetSpec, labelOptions } = options;
-	const entries = matches.flatMap((match) => {
-		const ref = refsByObjectId.get(match.column.id);
+	const entries = variants.flatMap((variant) => {
+		const ref = refsByObjectId.get(extractPObjectId(variant.id));
 		if (ref === void 0) return [];
-		return match.variants.map((variant) => ({
+		return [{
 			ref,
-			spec: match.column.spec,
-			linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
-		}));
+			spec: variant.getSpec(),
+			linkerPath: collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() }))
+		}];
 	});
 	const labels = deriveDistinctLabels([...entries, { spec: datasetSpec }], {
 		...labelOptions,