@platforma-sdk/model 1.75.10 → 1.76.5

package/dist/components/PlDatasetSelector/build_dataset_options.cjs

@@ -37,7 +37,11 @@ function buildDatasetOptions(ctx, opts) {
 			});
 			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);
+			const filters = filterMatches.length === 0 ? void 0 : require_filter_discovery.filterMatchesToOptions(filterMatches, {
+				refsByObjectId: refMap,
+				datasetSpec,
+				labelOptions: opts?.labelOptions
+			});
 			let enrichments;
 			if (enrichmentCollection && withEnrichments) {
 				const enrichmentVariants = require_enrichment_discovery.findEnrichmentColumns(enrichmentCollection, {

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

@@ -1 +1 @@
-{"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"}
+{"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  /**\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;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,OAAA,GAAA,gCAAA,iCAAsC,IAAI;;;;;;;;AAiC/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;IACpC,gBAAgB;IAChB;IACA,cAAc,MAAM;IACrB,CAAC;GAER,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

@@ -12,7 +12,12 @@ type BuildDatasetOptions = {
    * with the built-in `pl7.app/isSubset: "true"` constraint. Defaults to
    * accept-all.
    */
-  filter?: SpecPredicateOption; /** Formatting options for filter labels. */
+  filter?: SpecPredicateOption;
+  /**
+   * Formatting options forwarded to label derivation for both filter and
+   * enrichment rows. `formatters.native` on the filter path is overridden
+   * — see `FilterMatchOptions.labelOptions`.
+   */
   labelOptions?: DeriveLabelsOptions;
   /**
    * Enables enrichment discovery and filters hits attached to

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":";;;;;;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"}
+{"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;;;;;EAqBrB,YAAA,GAAe,mBAAA;EArBM;AAOvB;;;EAmBE,eAAA,GAAkB,mBAAA,EAXT;EAaT,iBAAA;AAAA;;;;;;;iBASc,mBAAA,CACd,GAAA,EAAK,aAAA,EACL,IAAA,GAAO,mBAAA,GACN,aAAA"}

package/dist/components/PlDatasetSelector/build_dataset_options.js

@@ -36,7 +36,11 @@ function buildDatasetOptions(ctx, opts) {
 			});
 			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);
+			const filters = filterMatches.length === 0 ? void 0 : filterMatchesToOptions(filterMatches, {
+				refsByObjectId: refMap,
+				datasetSpec,
+				labelOptions: opts?.labelOptions
+			});
 			let enrichments;
 			if (enrichmentCollection && withEnrichments) {
 				const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {

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  /** 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"}
+{"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;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,MAAM,gCAAgC,IAAI;;;;;;;;AAiC/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;IACpC,gBAAgB;IAChB;IACA,cAAc,MAAM;IACrB,CAAC;GAER,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

@@ -5,12 +5,8 @@ let canonicalize = require("canonicalize");
 canonicalize = require_runtime.__toESM(canonicalize);
 //#region src/components/PlDatasetSelector/filter_discovery.ts
 /**
-* Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
-*
-* The axes-subset constraint is enforced by `mode: "enrichment"`, which sets
-* `allowFloatingHitAxes: false` — every axis of the matched column must be
-* present in the anchor's axes. See `matchingModeToConstraints()` in
-* `column_collection_builder.ts`.
+* Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+* The axes-subset constraint comes from `mode: "enrichment"`.
 */
 function findFilterColumns(collection) {
 	return collection.findColumns({
@@ -19,42 +15,37 @@ 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()
+* 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.
 */
-function filterMatchesToOptions(matches, refsByObjectId, labelOptions) {
+function filterMatchesToOptions(matches, options) {
 	if (matches.length === 0) return [];
-	const flattened = matches.flatMap((match) => {
+	const { refsByObjectId, datasetSpec, labelOptions } = options;
+	const entries = matches.flatMap((match) => {
 		const ref = refsByObjectId.get(match.column.id);
 		if (ref === void 0) return [];
 		return match.variants.map((variant) => ({
-			match,
-			variant,
-			ref
+			ref,
+			spec: match.column.spec,
+			linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
 		}));
 	});
-	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(({ ref }, i) => ({
+	const labels = require_derive_distinct_labels.deriveDistinctLabels([...entries, { spec: datasetSpec }], {
+		...labelOptions,
+		formatters: {
+			...labelOptions?.formatters,
+			native: () => void 0
+		}
+	});
+	return entries.map(({ ref }, i) => ({
 		ref,
 		label: labels[i]
 	}));
 }
-/**
-* Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`
-*/
+/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */
 function buildRefMap(entries) {
-	const map = /* @__PURE__ */ new Map();
-	for (const entry of entries) map.set((0, canonicalize.default)(entry.ref), entry.ref);
-	return map;
+	return new Map(entries.map((e) => [(0, canonicalize.default)(e.ref), e.ref]));
 }
 //#endregion
 exports.buildRefMap = buildRefMap;

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 * 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"}
+{"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;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAGA,gCAAAA,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;AAsBJ,SAAgB,uBACd,SACA,SACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,EAAE,gBAAgB,aAAa,iBAAiB;CAMtD,MAAM,UAAU,QAAQ,SAAS,UAAsC;EACrE,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EAAW,QAAO,EAAE;AAChC,SAAO,MAAM,SAAS,KAAK,aAAa;GACtC;GACA,MAAM,MAAM,OAAO;GACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;GAC/D,EAAE;GACH;CAQF,MAAM,SAASC,+BAAAA,qBAAqB,CAAC,GAAG,SAAS,EAAE,MAAM,aAAa,CAAC,EAAE;EACvE,GAAG;EACH,YAAY;GAAE,GAAG,cAAc;GAAY,cAAc,KAAA;GAAW;EACrE,CAAC;AAEF,QAAO,QAAQ,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;EAAI,EAAE;;;AAIjE,SAAgB,YAAY,SAAoE;AAC9F,QAAO,IAAI,IAAI,QAAQ,KAAK,MAAM,EAAA,GAAA,aAAA,SAAc,EAAE,IAAI,EAAgB,EAAE,IAAI,CAAC,CAAC"}

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

@@ -1,34 +1,34 @@
 import { AnchoredColumnCollection, ColumnMatch } from "../../columns/column_collection_builder.js";
 import { DeriveLabelsOptions } from "../../labels/derive_distinct_labels.js";
-import { Option, PObjectId, PlRef } from "@milaboratories/pl-model-common";
+import { Option, PObjectId, PObjectSpec, PlRef } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDatasetSelector/filter_discovery.d.ts
 /**
- * Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
- *
- * The axes-subset constraint is enforced by `mode: "enrichment"`, which sets
- * `allowFloatingHitAxes: false` — every axis of the matched column must be
- * present in the anchor's axes. See `matchingModeToConstraints()` in
- * `column_collection_builder.ts`.
+ * Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+ * The axes-subset constraint comes from `mode: "enrichment"`.
  */
 declare function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[];
+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;
+  /**
+   * Forwarded to `deriveDistinctLabels`. Any `formatters.native` caller
+   * sets is silently overridden — the function relies on a no-op native
+   * formatter to keep the algorithm from short-circuiting on filters'
+   * inherited `pl7.app/label`.
+   */
+  labelOptions?: DeriveLabelsOptions;
+};
 /**
- * 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()
- */
-declare function filterMatchesToOptions(matches: ColumnMatch[], refsByObjectId: ReadonlyMap<PObjectId, PlRef>, labelOptions?: DeriveLabelsOptions): Option[];
-/**
- * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`
+ * 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.
  */
+declare function filterMatchesToOptions(matches: ColumnMatch[], 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 { buildRefMap, filterMatchesToOptions, findFilterColumns };
+export { FilterMatchOptions, 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":";;;;;;;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"}
+{"version":3,"file":"filter_discovery.d.ts","names":[],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"mappings":";;;;;;;AAiBA;;iBAAgB,iBAAA,CAAkB,UAAA,EAAY,wBAAA,GAA2B,WAAA;AAAA,KAS7D,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"}

package/dist/components/PlDatasetSelector/filter_discovery.js

@@ -3,12 +3,8 @@ import { Annotation } from "@milaboratories/pl-model-common";
 import canonicalize from "canonicalize";
 //#region src/components/PlDatasetSelector/filter_discovery.ts
 /**
-* Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
-*
-* The axes-subset constraint is enforced by `mode: "enrichment"`, which sets
-* `allowFloatingHitAxes: false` — every axis of the matched column must be
-* present in the anchor's axes. See `matchingModeToConstraints()` in
-* `column_collection_builder.ts`.
+* Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+* The axes-subset constraint comes from `mode: "enrichment"`.
 */
 function findFilterColumns(collection) {
 	return collection.findColumns({
@@ -17,42 +13,37 @@ 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()
+* 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.
 */
-function filterMatchesToOptions(matches, refsByObjectId, labelOptions) {
+function filterMatchesToOptions(matches, options) {
 	if (matches.length === 0) return [];
-	const flattened = matches.flatMap((match) => {
+	const { refsByObjectId, datasetSpec, labelOptions } = options;
+	const entries = matches.flatMap((match) => {
 		const ref = refsByObjectId.get(match.column.id);
 		if (ref === void 0) return [];
 		return match.variants.map((variant) => ({
-			match,
-			variant,
-			ref
+			ref,
+			spec: match.column.spec,
+			linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
 		}));
 	});
-	const labels = deriveDistinctLabels(flattened.map(({ match, variant }) => ({
-		spec: match.column.spec,
-		linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
-	})), labelOptions);
-	return flattened.map(({ ref }, i) => ({
+	const labels = deriveDistinctLabels([...entries, { spec: datasetSpec }], {
+		...labelOptions,
+		formatters: {
+			...labelOptions?.formatters,
+			native: () => void 0
+		}
+	});
+	return entries.map(({ ref }, i) => ({
 		ref,
 		label: labels[i]
 	}));
 }
-/**
-* Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`
-*/
+/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */
 function buildRefMap(entries) {
-	const map = /* @__PURE__ */ new Map();
-	for (const entry of entries) map.set(canonicalize(entry.ref), entry.ref);
-	return map;
+	return new Map(entries.map((e) => [canonicalize(e.ref), e.ref]));
 }
 //#endregion
 export { buildRefMap, filterMatchesToOptions, findFilterColumns };

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 * 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"}
+{"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, 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;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAG,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;AAsBJ,SAAgB,uBACd,SACA,SACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,EAAE,gBAAgB,aAAa,iBAAiB;CAMtD,MAAM,UAAU,QAAQ,SAAS,UAAsC;EACrE,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EAAW,QAAO,EAAE;AAChC,SAAO,MAAM,SAAS,KAAK,aAAa;GACtC;GACA,MAAM,MAAM,OAAO;GACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;GAC/D,EAAE;GACH;CAQF,MAAM,SAAS,qBAAqB,CAAC,GAAG,SAAS,EAAE,MAAM,aAAa,CAAC,EAAE;EACvE,GAAG;EACH,YAAY;GAAE,GAAG,cAAc;GAAY,cAAc,KAAA;GAAW;EACrE,CAAC;AAEF,QAAO,QAAQ,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;EAAI,EAAE;;;AAIjE,SAAgB,YAAY,SAAoE;AAC9F,QAAO,IAAI,IAAI,QAAQ,KAAK,MAAM,CAAC,aAAa,EAAE,IAAI,EAAgB,EAAE,IAAI,CAAC,CAAC"}

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

@@ -1,3 +1,3 @@
 import { DatasetOption, DatasetSelection, createDatasetSelection, isDatasetSelection } from "./dataset_selection.js";
-import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
+import { FilterMatchOptions, buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
 import { BuildDatasetOptions, buildDatasetOptions } from "./build_dataset_options.js";

package/dist/components/index.d.ts

@@ -3,7 +3,7 @@ import { createPFrameForGraphs, isHiddenFromGraphColumn, isHiddenFromUIColumn }
 import { AndFilter, AnnotationFilter, AnnotationMode, AnnotationScript, AnnotationScript2, AnnotationStep, IsNA, Log10, NotFilter, NumericalComparisonFilter, OrFilter, PatternFilter, PatternPredicate, PatternPredicateContainSubsequence, PatternPredicateEquals, SortedCumulativeSum, TransformedColumn, ValueRank } from "./PlAnnotations/filter.js";
 import { AnnotationScriptUi, AnnotationStepUi, AnyForm, FilterUi, FilterUiOfType, FilterUiType, FormField, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, compileAnnotationScript, compileFilter, compileFilters, unreachable } from "./PlAnnotations/filters_ui.js";
 import { DatasetOption, DatasetSelection, createDatasetSelection, isDatasetSelection } from "./PlDatasetSelector/dataset_selection.js";
-import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./PlDatasetSelector/filter_discovery.js";
+import { FilterMatchOptions, buildRefMap, filterMatchesToOptions, findFilterColumns } from "./PlDatasetSelector/filter_discovery.js";
 import { BuildDatasetOptions, buildDatasetOptions } from "./PlDatasetSelector/build_dataset_options.js";
 import { PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnIdJson } from "./PlDataTable/typesV6.js";
 import { PlDataTableStateV2, createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./PlDataTable/state-migration.js";

package/dist/filters/converters/filterToQuery.cjs

@@ -242,15 +242,14 @@ function leafToSpecQueryExpr(filter) {
 		case "inSet": return {
 			type: "isIn",
 			input: resolveColumnRef(filter.column),
-			set: filter.value
+			set: filter.value,
+			negate: false
 		};
 		case "notInSet": return {
-			type: "not",
-			input: {
-				type: "isIn",
-				input: resolveColumnRef(filter.column),
-				set: filter.value
-			}
+			type: "isIn",
+			input: resolveColumnRef(filter.column),
+			set: filter.value,
+			negate: true
 		};
 		case "isNA": return {
 			type: "isNull",
@@ -264,7 +263,7 @@ function leafToSpecQueryExpr(filter) {
 			}
 		};
 		case "ifNa": return {
-			type: "ifNull",
+			type: "fillNull",
 			input: resolveColumnRef(filter.column),
 			replacement: {
 				type: "constant",

package/dist/filters/converters/filterToQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"filterToQuery.cjs","names":["traverseFilterSpec"],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  return parsed.type === \"axis\"\n    ? { type: \"axisRef\", value: parsed.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n      };\n    case \"notInSet\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isIn\",\n          input: resolveColumnRef(filter.column),\n          set: filter.value,\n        },\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"ifNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"filterToQuery.cjs","names":["traverseFilterSpec"],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  return parsed.type === \"axis\"\n    ? { type: \"axisRef\", value: parsed.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: false,\n      };\n    case \"notInSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: true,\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"fillNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}

package/dist/filters/converters/filterToQuery.js

@@ -241,15 +241,14 @@ function leafToSpecQueryExpr(filter) {
 		case "inSet": return {
 			type: "isIn",
 			input: resolveColumnRef(filter.column),
-			set: filter.value
+			set: filter.value,
+			negate: false
 		};
 		case "notInSet": return {
-			type: "not",
-			input: {
-				type: "isIn",
-				input: resolveColumnRef(filter.column),
-				set: filter.value
-			}
+			type: "isIn",
+			input: resolveColumnRef(filter.column),
+			set: filter.value,
+			negate: true
 		};
 		case "isNA": return {
 			type: "isNull",
@@ -263,7 +262,7 @@ function leafToSpecQueryExpr(filter) {
 			}
 		};
 		case "ifNa": return {
-			type: "ifNull",
+			type: "fillNull",
 			input: resolveColumnRef(filter.column),
 			replacement: {
 				type: "constant",

package/dist/filters/converters/filterToQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterToQuery.js","names":[],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  return parsed.type === \"axis\"\n    ? { type: \"axisRef\", value: parsed.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n      };\n    case \"notInSet\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isIn\",\n          input: resolveColumnRef(filter.column),\n          set: filter.value,\n        },\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"ifNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"filterToQuery.js","names":[],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  return parsed.type === \"axis\"\n    ? { type: \"axisRef\", value: parsed.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: false,\n      };\n    case \"notInSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: true,\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"fillNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}

package/dist/index.d.ts

@@ -49,7 +49,7 @@ import { AnnotationSpec, AnnotationSpecUi, ExpressionSpec, FilterSpecUi } from "
 import { convertFilterSpecsToExpressionSpecs } from "./annotations/converter.js";
 import { AnnotationScriptUi, AnnotationStepUi, AnyForm, FilterUi, FilterUiOfType, FilterUiType, FormField, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, compileAnnotationScript, compileFilter, compileFilters, unreachable } from "./components/PlAnnotations/filters_ui.js";
 import { DatasetOption, DatasetSelection, createDatasetSelection, isDatasetSelection } from "./components/PlDatasetSelector/dataset_selection.js";
-import { buildRefMap, filterMatchesToOptions, findFilterColumns } from "./components/PlDatasetSelector/filter_discovery.js";
+import { FilterMatchOptions, buildRefMap, filterMatchesToOptions, findFilterColumns } from "./components/PlDatasetSelector/filter_discovery.js";
 import { BuildDatasetOptions, buildDatasetOptions } from "./components/PlDatasetSelector/build_dataset_options.js";
 import { PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnIdJson } from "./components/PlDataTable/typesV6.js";
 import { PlDataTableStateV2, createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./components/PlDataTable/state-migration.js";
@@ -74,4 +74,4 @@ import { getService } from "./services/get_services.js";
 import { getEnvironmentValue } from "./env_value.js";
 export * from "@milaboratories/pl-model-common";
 export * from "@milaboratories/pl-error-like";
-export { ActAnd, ActExtractArchiveAndGetURL, ActFlatten, ActGetBlobContent, ActGetBlobContentAsJson, ActGetBlobContentAsString, ActGetDownloadedBlobContent, ActGetField, ActGetFromCtx, ActGetImmediate, ActGetLastLogs, ActGetLogHandle, ActGetOnDemandBlobContent, ActGetProgressLog, ActGetProgressLogWithInfo, ActGetResourceField, ActGetResourceValueAsJson, ActImportProgress, ActIsEmpty, ActIsolate, ActMakeArray, ActMakeObject, ActMapArrayValues, ActMapRecordValues, ActMapResourceFields, ActNot, ActOr, ActionResult, AnchorEntry, AnchoredBuildOptions, AnchoredColumnCollection, AnchoredFindColumnsOptions, AndFilter, AnnotationFilter, AnnotationMode, AnnotationScript, AnnotationScript2, AnnotationScriptUi, AnnotationSpec, AnnotationSpecUi, AnnotationStep, AnnotationStepUi, AnyForm, Args, ArrayColumnProvider, AxesVault, AxisLabelProvider, BLOCK_SERVICE_FLAGS, BLOCK_STORAGE_FACADE_VERSION, BlockApiV1, BlockApiV2, BlockConfig, BlockConfigV3, BlockConfigV4, BlockDefaultModelServices, BlockDefaultUiServices, BlockModel, BlockModelInfo, BlockModelV3, BlockRenderCtx, BlockServiceFlags, BlockStatePatch, type BlockStorage, BlockStorageFacade, BlockStorageFacadeCallbacks, BlockStorageFacadeHandles, type BlockStorageSchemaVersion, BuildDatasetOptions, BuildOptions, CancelSubscription, Cfg, CfgAnd, CfgBlobContent, CfgBlobContentAsJson, CfgBlobContentAsString, CfgDownloadedBlobContent, CfgExtractArchiveAndGetURL, CfgFlatten, CfgGetFromCtx, CfgGetJsonField, CfgGetResourceField, CfgImmediate, CfgImportProgress, CfgIsEmpty, CfgIsolate, CfgLastLogs, CfgLogHandle, CfgMakeArray, CfgMakeObject, CfgMapArrayValues, CfgMapRecordValues, CfgMapResourceFields, CfgNot, CfgOnDemandBlobContent, CfgOr, CfgProgressLog, CfgProgressLogWithInfo, CfgRenderingMode, CfgResourceValueAsJson, Checked, ColumnCollection, ColumnCollectionBuilder, ColumnData, ColumnDataStatus, ColumnMatch, ColumnMatcher, ColumnOrderRule, ColumnProvider, ColumnSelector, ColumnSnapshot, ColumnSnapshotProvider, ColumnSource, ColumnVariant, ColumnVisibilityRule, ColumnsDisplayOptions, ColumnsSelectorConfig, CommonFieldTraverseOps, CommonTraversalOps, ConfAction, ConfigRenderLambda, ConfigRenderLambdaFlags, ConfigResult, CurrentSdkInfo, DataModel, DataModelBuilder, DatasetOption, DatasetSelection, DeriveHref, DeriveLabelsFormatters, DeriveLabelsOptions, Entry, ExpandByPartitionOpts, ExpandByPartitionResult, ExpressionSpec, ExtractAction, ExtractFunctionHandleReturn, ExtractFutureRefType, FieldTraversalStep, FieldType, FilterSpec, FilterSpecLeaf, FilterSpecNode, FilterSpecOfType, FilterSpecType, FilterSpecUi, FilterUi, FilterUiOfType, FilterUiType, FindColumnsOptions, FormField, FutureRef, GetFieldStep, InferArgsType, InferBlockState, InferBlockStatePatch, InferDataType, InferFactoryData, InferFactoryModelServices, InferFactoryOutputs, InferFactoryParams, InferFactoryUiServices, InferHrefType, InferOutputType, InferOutputsFromConfigs, InferOutputsFromLambdas, InferOutputsType, InferPluginData, InferPluginHandle, InferPluginNames, InferPluginUiEntries, InferRenderFunctionReturn, InferUiState, InferVarTypeSafe, IsNA, It, internal_d_exports as JsRenderInternal, DeriveLabelsOptions as LabelDerivationOps, LinkerStep, Log10, MainOutputs, MatchQualifications, MatchVariant, MatchingMode, type MigrateBlockStorageConfig, type MigrationFailure, type MigrationResult, type MigrationSuccess, ModelServices, type MutateStoragePayload, NotFilter, NumericalComparisonFilter, OptionalPlResourceEntry, OrFilter, OutputColumnProvider, OutputColumnProviderOpts, OutputError, PColumnCollection, PColumnDataUniversal, PColumnEntryUniversal, PColumnEntryWithLabel, PColumnKeyList, PColumnLazyUniversal, PColumnLazyWithLabel, PColumnPredicate, PColumnResourceMapData, PColumnResourceMapEntry, PFrameImpl, POCExtractAction, PTableKey, PTableParamsV2, type ParamsInput, Patch, PatternFilter, PatternPredicate, PatternPredicateContainSubsequence, PatternPredicateEquals, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlMultiSequenceAlignmentColorSchemeOption, PlMultiSequenceAlignmentModel, PlMultiSequenceAlignmentSettings, PlMultiSequenceAlignmentWidget, PlResourceEntry, PlSelectionModel, PlTableColumnIdJson, Platforma, PlatformaApiVersion, PlatformaExtended, PlatformaFactory, PlatformaSDKVersion, PlatformaV1, PlatformaV2, PlatformaV3, type PluginConfig, type PluginData, PluginDataModel, PluginDataModelBuilder, type PluginDataModelVersions, type PluginFactory, PluginFactoryLike, PluginHandle, PluginInstance, PluginModel, type PluginName, type PluginOutputs, type PluginParams, type PluginPublicOutputs, type PluginRecord, type PluginRegistry, PluginRenderCtx, PrimitiveOrConfig, PrimitiveToCfg, type PublicOutputFieldDef, RT_BINARY_PARTITIONED, RT_BINARY_SUPER_PARTITIONED, RT_JSON_PARTITIONED, RT_JSON_SUPER_PARTITIONED, RT_PARQUET_PARTITIONED, RT_PARQUET_SUPER_PARTITIONED, RT_RESOURCE_MAP, RT_RESOURCE_MAP_PARTITIONED, RelaxedAxisSelector, RelaxedColumnSelector, RelaxedRecord, RelaxedStringMatchers, RenderCtx, RenderCtxBase, RenderCtxLegacy, RenderFunction, RenderFunctionLegacy, ResolveCfgType, ResolveModelServices, ResolveUiServices, ResourceTraversalOps, ResourceType, ResultPool, ResultPoolColumnSnapshotProvider, SdkInfo, ServiceProxy, SimplifiedPColumnSpec, SimplifiedUniversalPColumnEntry, SnapshotColumnProvider, SortedCumulativeSum, Entry as SpecExtractorResult, SplitAxis, StagingOutputs, StdCtx, StdCtxArgsOnly, StringMatcher, TooltipEntry, Trace, TraceEntry, TransformedColumn, TreeNodeAccessor, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, TypedConfig, TypedConfigOrConfigLambda, TypedConfigOrString, UiServices, UiState, Unionize, UniversalColumnOption, UnwrapFutureRef, ValueRank, type VersionedData, allPColumnsReady, and, blockServiceNames, buildDatasetOptions, buildRefMap, buildServices, collectCtxColumnSnapshotProviders, compileAnnotationScript, compileFilter, compileFilters, convertColumnSelectorToMultiColumnSelector, convertFilterSpecsToExpressionSpecs, convertFilterUiToExpressionImpl, convertFilterUiToExpressions, convertOrParsePColumnData, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector, createBlockStorage, createColumnSnapshot, createDatasetSelection, createDefaultPTableParams, createPFrameForGraphs, createPlDataTable, createPlDataTableOptionsV3, createPlDataTableSheet, createPlDataTableStateV2, createPlDataTableV2, createPlDataTableV3, createPlSelectionModel, createReadyColumnData, createRowSelectionColumn, createServiceProxy, deriveDataFromStorage, deriveDistinctLabels, deriveDistinctTooltips, deriveLabels, discoverTableColumnSnaphots, distillFilterSpec, downgradeCfgOrLambda, enrichCompatible, expandByPartition, extractArchiveAndGetURL, extractConfig, filterDataInfoEntries, filterMatchesToOptions, filterSpecToSpecQueryExpr, findFilterColumns, flatten, fromPlOption, fromPlRef, getAllRelatedColumns, getAvailableWithLinkersAxes, getAxisUniqueValues, getBlobContent, getBlobContentAsJson, getBlobContentAsString, getColumnOrAxisValueLabelsId, getColumnSpecById, getColumnUniqueValues, getColumnsFull, getDownloadedBlobContent, getEffectiveVisibility, getEnvironmentValue, getFromCfg, getImmediate, getImportProgress, getJsonField, getLastLogs, getLogHandle, getOnDemandBlobContent, getOrderPriority, getPartitionKeysList, getPlatformaApiVersion, getPluginData, getProgressLog, getProgressLogWithInfo, getRawPlatformaInstance, getRelatedColumns, getRequestColumnsFromSelectedSources, getResourceField, getResourceValueAsJson, getService, getSingleColumnData, getStorageData, getUniquePartitionKeys, getUniqueSourceValuesWithLabels, ifDef, isBlockStorage, isColumnHidden, isColumnOptional, isColumnSnapshotProvider, isConfigLambda, isDatasetSelection, isEmpty, isHiddenFromGraphColumn, isHiddenFromUIColumn, isPColumnReady, isPluginOutputKey, isolate, makeArray, makeObject, mapArrayValues, mapRecordValues, mapResourceFields, migrateBlockStorage, normalizeBlockStorage, not, or, parsePColumnData, parseResourceMap, pluginOutputKey, pluginOutputPrefix, readOutput, registerFacadeCallbacks, toColumnSnapshotProvider, unreachable, updateStorageData, upgradePlDataTableStateV2, wrapOutputs };
+export { ActAnd, ActExtractArchiveAndGetURL, ActFlatten, ActGetBlobContent, ActGetBlobContentAsJson, ActGetBlobContentAsString, ActGetDownloadedBlobContent, ActGetField, ActGetFromCtx, ActGetImmediate, ActGetLastLogs, ActGetLogHandle, ActGetOnDemandBlobContent, ActGetProgressLog, ActGetProgressLogWithInfo, ActGetResourceField, ActGetResourceValueAsJson, ActImportProgress, ActIsEmpty, ActIsolate, ActMakeArray, ActMakeObject, ActMapArrayValues, ActMapRecordValues, ActMapResourceFields, ActNot, ActOr, ActionResult, AnchorEntry, AnchoredBuildOptions, AnchoredColumnCollection, AnchoredFindColumnsOptions, AndFilter, AnnotationFilter, AnnotationMode, AnnotationScript, AnnotationScript2, AnnotationScriptUi, AnnotationSpec, AnnotationSpecUi, AnnotationStep, AnnotationStepUi, AnyForm, Args, ArrayColumnProvider, AxesVault, AxisLabelProvider, BLOCK_SERVICE_FLAGS, BLOCK_STORAGE_FACADE_VERSION, BlockApiV1, BlockApiV2, BlockConfig, BlockConfigV3, BlockConfigV4, BlockDefaultModelServices, BlockDefaultUiServices, BlockModel, BlockModelInfo, BlockModelV3, BlockRenderCtx, BlockServiceFlags, BlockStatePatch, type BlockStorage, BlockStorageFacade, BlockStorageFacadeCallbacks, BlockStorageFacadeHandles, type BlockStorageSchemaVersion, BuildDatasetOptions, BuildOptions, CancelSubscription, Cfg, CfgAnd, CfgBlobContent, CfgBlobContentAsJson, CfgBlobContentAsString, CfgDownloadedBlobContent, CfgExtractArchiveAndGetURL, CfgFlatten, CfgGetFromCtx, CfgGetJsonField, CfgGetResourceField, CfgImmediate, CfgImportProgress, CfgIsEmpty, CfgIsolate, CfgLastLogs, CfgLogHandle, CfgMakeArray, CfgMakeObject, CfgMapArrayValues, CfgMapRecordValues, CfgMapResourceFields, CfgNot, CfgOnDemandBlobContent, CfgOr, CfgProgressLog, CfgProgressLogWithInfo, CfgRenderingMode, CfgResourceValueAsJson, Checked, ColumnCollection, ColumnCollectionBuilder, ColumnData, ColumnDataStatus, ColumnMatch, ColumnMatcher, ColumnOrderRule, ColumnProvider, ColumnSelector, ColumnSnapshot, ColumnSnapshotProvider, ColumnSource, ColumnVariant, ColumnVisibilityRule, ColumnsDisplayOptions, ColumnsSelectorConfig, CommonFieldTraverseOps, CommonTraversalOps, ConfAction, ConfigRenderLambda, ConfigRenderLambdaFlags, ConfigResult, CurrentSdkInfo, DataModel, DataModelBuilder, DatasetOption, DatasetSelection, DeriveHref, DeriveLabelsFormatters, DeriveLabelsOptions, Entry, ExpandByPartitionOpts, ExpandByPartitionResult, ExpressionSpec, ExtractAction, ExtractFunctionHandleReturn, ExtractFutureRefType, FieldTraversalStep, FieldType, FilterMatchOptions, FilterSpec, FilterSpecLeaf, FilterSpecNode, FilterSpecOfType, FilterSpecType, FilterSpecUi, FilterUi, FilterUiOfType, FilterUiType, FindColumnsOptions, FormField, FutureRef, GetFieldStep, InferArgsType, InferBlockState, InferBlockStatePatch, InferDataType, InferFactoryData, InferFactoryModelServices, InferFactoryOutputs, InferFactoryParams, InferFactoryUiServices, InferHrefType, InferOutputType, InferOutputsFromConfigs, InferOutputsFromLambdas, InferOutputsType, InferPluginData, InferPluginHandle, InferPluginNames, InferPluginUiEntries, InferRenderFunctionReturn, InferUiState, InferVarTypeSafe, IsNA, It, internal_d_exports as JsRenderInternal, DeriveLabelsOptions as LabelDerivationOps, LinkerStep, Log10, MainOutputs, MatchQualifications, MatchVariant, MatchingMode, type MigrateBlockStorageConfig, type MigrationFailure, type MigrationResult, type MigrationSuccess, ModelServices, type MutateStoragePayload, NotFilter, NumericalComparisonFilter, OptionalPlResourceEntry, OrFilter, OutputColumnProvider, OutputColumnProviderOpts, OutputError, PColumnCollection, PColumnDataUniversal, PColumnEntryUniversal, PColumnEntryWithLabel, PColumnKeyList, PColumnLazyUniversal, PColumnLazyWithLabel, PColumnPredicate, PColumnResourceMapData, PColumnResourceMapEntry, PFrameImpl, POCExtractAction, PTableKey, PTableParamsV2, type ParamsInput, Patch, PatternFilter, PatternPredicate, PatternPredicateContainSubsequence, PatternPredicateEquals, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlMultiSequenceAlignmentColorSchemeOption, PlMultiSequenceAlignmentModel, PlMultiSequenceAlignmentSettings, PlMultiSequenceAlignmentWidget, PlResourceEntry, PlSelectionModel, PlTableColumnIdJson, Platforma, PlatformaApiVersion, PlatformaExtended, PlatformaFactory, PlatformaSDKVersion, PlatformaV1, PlatformaV2, PlatformaV3, type PluginConfig, type PluginData, PluginDataModel, PluginDataModelBuilder, type PluginDataModelVersions, type PluginFactory, PluginFactoryLike, PluginHandle, PluginInstance, PluginModel, type PluginName, type PluginOutputs, type PluginParams, type PluginPublicOutputs, type PluginRecord, type PluginRegistry, PluginRenderCtx, PrimitiveOrConfig, PrimitiveToCfg, type PublicOutputFieldDef, RT_BINARY_PARTITIONED, RT_BINARY_SUPER_PARTITIONED, RT_JSON_PARTITIONED, RT_JSON_SUPER_PARTITIONED, RT_PARQUET_PARTITIONED, RT_PARQUET_SUPER_PARTITIONED, RT_RESOURCE_MAP, RT_RESOURCE_MAP_PARTITIONED, RelaxedAxisSelector, RelaxedColumnSelector, RelaxedRecord, RelaxedStringMatchers, RenderCtx, RenderCtxBase, RenderCtxLegacy, RenderFunction, RenderFunctionLegacy, ResolveCfgType, ResolveModelServices, ResolveUiServices, ResourceTraversalOps, ResourceType, ResultPool, ResultPoolColumnSnapshotProvider, SdkInfo, ServiceProxy, SimplifiedPColumnSpec, SimplifiedUniversalPColumnEntry, SnapshotColumnProvider, SortedCumulativeSum, Entry as SpecExtractorResult, SplitAxis, StagingOutputs, StdCtx, StdCtxArgsOnly, StringMatcher, TooltipEntry, Trace, TraceEntry, TransformedColumn, TreeNodeAccessor, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, TypedConfig, TypedConfigOrConfigLambda, TypedConfigOrString, UiServices, UiState, Unionize, UniversalColumnOption, UnwrapFutureRef, ValueRank, type VersionedData, allPColumnsReady, and, blockServiceNames, buildDatasetOptions, buildRefMap, buildServices, collectCtxColumnSnapshotProviders, compileAnnotationScript, compileFilter, compileFilters, convertColumnSelectorToMultiColumnSelector, convertFilterSpecsToExpressionSpecs, convertFilterUiToExpressionImpl, convertFilterUiToExpressions, convertOrParsePColumnData, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector, createBlockStorage, createColumnSnapshot, createDatasetSelection, createDefaultPTableParams, createPFrameForGraphs, createPlDataTable, createPlDataTableOptionsV3, createPlDataTableSheet, createPlDataTableStateV2, createPlDataTableV2, createPlDataTableV3, createPlSelectionModel, createReadyColumnData, createRowSelectionColumn, createServiceProxy, deriveDataFromStorage, deriveDistinctLabels, deriveDistinctTooltips, deriveLabels, discoverTableColumnSnaphots, distillFilterSpec, downgradeCfgOrLambda, enrichCompatible, expandByPartition, extractArchiveAndGetURL, extractConfig, filterDataInfoEntries, filterMatchesToOptions, filterSpecToSpecQueryExpr, findFilterColumns, flatten, fromPlOption, fromPlRef, getAllRelatedColumns, getAvailableWithLinkersAxes, getAxisUniqueValues, getBlobContent, getBlobContentAsJson, getBlobContentAsString, getColumnOrAxisValueLabelsId, getColumnSpecById, getColumnUniqueValues, getColumnsFull, getDownloadedBlobContent, getEffectiveVisibility, getEnvironmentValue, getFromCfg, getImmediate, getImportProgress, getJsonField, getLastLogs, getLogHandle, getOnDemandBlobContent, getOrderPriority, getPartitionKeysList, getPlatformaApiVersion, getPluginData, getProgressLog, getProgressLogWithInfo, getRawPlatformaInstance, getRelatedColumns, getRequestColumnsFromSelectedSources, getResourceField, getResourceValueAsJson, getService, getSingleColumnData, getStorageData, getUniquePartitionKeys, getUniqueSourceValuesWithLabels, ifDef, isBlockStorage, isColumnHidden, isColumnOptional, isColumnSnapshotProvider, isConfigLambda, isDatasetSelection, isEmpty, isHiddenFromGraphColumn, isHiddenFromUIColumn, isPColumnReady, isPluginOutputKey, isolate, makeArray, makeObject, mapArrayValues, mapRecordValues, mapResourceFields, migrateBlockStorage, normalizeBlockStorage, not, or, parsePColumnData, parseResourceMap, pluginOutputKey, pluginOutputPrefix, readOutput, registerFacadeCallbacks, toColumnSnapshotProvider, unreachable, updateStorageData, upgradePlDataTableStateV2, wrapOutputs };

package/dist/package.cjs

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

package/dist/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.75.10",
+  "version": "1.76.5",
   "description": "Platforma.bio SDK / Block Model",
   "files": [
     "./dist/**/*",
@@ -32,20 +32,20 @@
     "zod": "~3.25.76",
     "@milaboratories/helpers": "1.14.2",
     "@milaboratories/pl-error-like": "1.12.10",
-    "@milaboratories/pl-model-middle-layer": "1.19.3",
-    "@milaboratories/pl-model-common": "1.41.2",
-    "@milaboratories/ptabler-expression-js": "1.2.24"
+    "@milaboratories/pl-model-common": "1.42.0",
+    "@milaboratories/pl-model-middle-layer": "1.19.4",
+    "@milaboratories/ptabler-expression-js": "1.2.25"
   },
   "devDependencies": {
     "@vitest/coverage-istanbul": "^4.1.3",
     "fast-json-patch": "^3.1.1",
     "typescript": "~5.9.3",
     "vitest": "^4.1.3",
-    "@milaboratories/ts-builder": "1.4.0",
-    "@milaboratories/build-configs": "2.0.0",
-    "@milaboratories/pf-spec-driver": "1.3.15",
     "@milaboratories/ts-configs": "1.2.3",
-    "@milaboratories/pf-driver": "1.4.10"
+    "@milaboratories/build-configs": "2.0.0",
+    "@milaboratories/pf-driver": "1.4.11",
+    "@milaboratories/pf-spec-driver": "1.3.16",
+    "@milaboratories/ts-builder": "1.4.0"
   },
   "scripts": {
     "build": "ts-builder build --target node",

package/src/components/PlDatasetSelector/build_dataset_options.ts

@@ -31,7 +31,11 @@ export type BuildDatasetOptions = {
    * accept-all.
    */
   filter?: SpecPredicateOption;
-  /** Formatting options for filter labels. */
+  /**
+   * Formatting options forwarded to label derivation for both filter and
+   * enrichment rows. `formatters.native` on the filter path is overridden
+   * — see `FilterMatchOptions.labelOptions`.
+   */
   labelOptions?: DeriveLabelsOptions;
   /**
    * Enables enrichment discovery and filters hits attached to
@@ -96,7 +100,11 @@ export function buildDatasetOptions(
       const filters =
         filterMatches.length === 0
           ? undefined
-          : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);
+          : filterMatchesToOptions(filterMatches, {
+              refsByObjectId: refMap,
+              datasetSpec,
+              labelOptions: opts?.labelOptions,
+            });
 
       let enrichments;
       if (enrichmentCollection && withEnrichments) {

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

@@ -1,5 +1,5 @@
 import { Annotation, createPlRef } from "@milaboratories/pl-model-common";
-import type { AxisSpec, PColumnSpec, PlRef, PObjectId } from "@milaboratories/pl-model-common";
+import type { AxisSpec, PColumnSpec, PObjectId } from "@milaboratories/pl-model-common";
 import { SpecDriver } from "@milaboratories/pf-spec-driver";
 import canonicalize from "canonicalize";
 import { afterEach, describe, expect, test } from "vitest";
@@ -85,10 +85,7 @@ describe("buildRefMap", () => {
   test("maps canonicalized PlRef to original ref", () => {
     const ref1 = createPlRef("b1", "out1");
     const ref2 = createPlRef("b2", "out2", true);
-    const entries = [{ ref: ref1 }, { ref: ref2 }];
-
-    const map = buildRefMap(entries);
-
+    const map = buildRefMap([{ ref: ref1 }, { ref: ref2 }]);
     expect(map.get(canonicalize(ref1)! as PObjectId)).toBe(ref1);
     expect(map.get(canonicalize(ref2)! as PObjectId)).toBe(ref2);
     expect(map.size).toBe(2);
@@ -104,18 +101,10 @@ describe("filterMatchesToOptions", () => {
     const filterRef1 = createPlRef("b1", "filter-top1000");
     const filterRef2 = createPlRef("b1", "filter-highconf");
 
-    // Build ref map from entries (simulating result pool)
-    const refMap = buildRefMap([
-      { ref: anchorSnap.id as unknown as PlRef }, // anchor — won't be looked up
-      { ref: filterRef1 },
-      { ref: filterRef2 },
-    ]);
-
-    // Build filter specs with isSubset annotation
+    const refMap = buildRefMap([{ ref: filterRef1 }, { ref: filterRef2 }]);
     const filterSpec1 = spec("filter1", [axis("sample")], { [Annotation.IsSubset]: "true" });
     const filterSpec2 = spec("filter2", [axis("sample")], { [Annotation.IsSubset]: "true" });
 
-    // Use the canonical PlRef as the PObjectId (matches how result pool works)
     const f1Snap = snap(canonicalize(filterRef1)! as string, filterSpec1);
     const f2Snap = snap(canonicalize(filterRef2)! as string, filterSpec2);
 
@@ -126,7 +115,10 @@ describe("filterMatchesToOptions", () => {
     const matches = findFilterColumns(collection);
     expect(matches.length).toBe(2);
 
-    const options = filterMatchesToOptions(matches, refMap);
+    const options = filterMatchesToOptions(matches, {
+      refsByObjectId: refMap,
+      datasetSpec: anchorSpec,
+    });
     expect(options).toHaveLength(2);
     // Each option has a ref and label
     for (const opt of options) {
@@ -136,11 +128,114 @@ describe("filterMatchesToOptions", () => {
     }
   });
 
+  test("single filter: dataset name prefixes the discriminating trace step", () => {
+    // Regression: without the dataset in the input, deriveDistinctLabels
+    // picks the highest-importance step it sees — the dataset's own
+    // `samples-and-data/dataset` step (importance 100) — and the filter
+    // shows "Bulk" instead of "Top 10". Appending the dataset forces the
+    // algorithm to include the lower-importance lead-selection step too.
+    const datasetSpec = spec("dataset", [axis("sample"), axis("gene")], {
+      [Annotation.Label]: "Bulk",
+      [Annotation.Trace]: JSON.stringify([
+        { type: "milaboratories.samples-and-data/dataset", label: "Bulk", importance: 100 },
+        { type: "milaboratories.mixcr-clonotyping", label: "MiXCR", importance: 20 },
+      ]),
+    });
+
+    const filterRef = createPlRef("b1", "filter");
+    const refMap = buildRefMap([{ ref: filterRef }]);
+    const filterSpec = spec("filter", [axis("sample")], {
+      [Annotation.IsSubset]: "true",
+      [Annotation.Label]: "Selected Leads",
+      [Annotation.Trace]: JSON.stringify([
+        { type: "milaboratories.samples-and-data/dataset", label: "Bulk", importance: 100 },
+        { type: "milaboratories.mixcr-clonotyping", label: "MiXCR", importance: 20 },
+        { type: "milaboratories.antibody-tcr-lead-selection", label: "Top 10", importance: 30 },
+      ]),
+    });
+    const fSnap = snap(canonicalize(filterRef)! as string, filterSpec);
+
+    const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
+    builder.addSource([fSnap, anchorSnap]);
+    const collection = builder.build({ anchors: { main: anchorSpec } })!;
+
+    const matches = findFilterColumns(collection);
+    expect(matches).toHaveLength(1);
+
+    const options = filterMatchesToOptions(matches, { refsByObjectId: refMap, datasetSpec });
+    expect(options).toHaveLength(1);
+    expect(options[0].label).toBe("Bulk / Top 10");
+
+    // Caller's `formatters.native` must NOT override the internal
+    // suppression — otherwise the algorithm short-circuits on the
+    // inherited "Selected Leads" label.
+    const withCustomNative = filterMatchesToOptions(matches, {
+      refsByObjectId: refMap,
+      datasetSpec,
+      labelOptions: { formatters: { native: (l) => `<<${l}>>` } },
+    });
+    expect(withCustomNative[0].label).toBe("Bulk / Top 10");
+
+    // Non-native label options (here `separator`) flow through.
+    const withSeparator = filterMatchesToOptions(matches, {
+      refsByObjectId: refMap,
+      datasetSpec,
+      labelOptions: { separator: " :: " },
+    });
+    expect(withSeparator[0].label).toBe("Bulk :: Top 10");
+  });
+
+  test("multiple filters with shared dataset trace disambiguate by filter-specific steps", () => {
+    const datasetSpec = spec("dataset", [axis("sample"), axis("gene")], {
+      [Annotation.Label]: "Bulk",
+      [Annotation.Trace]: JSON.stringify([
+        { type: "milaboratories.samples-and-data/dataset", label: "Bulk", importance: 100 },
+        { type: "milaboratories.mixcr-clonotyping", label: "MiXCR", importance: 20 },
+      ]),
+    });
+
+    const ref1 = createPlRef("b1", "f1");
+    const ref2 = createPlRef("b2", "f2");
+    const refMap = buildRefMap([{ ref: ref1 }, { ref: ref2 }]);
+    const filterSpec1 = spec("filter1", [axis("sample")], {
+      [Annotation.IsSubset]: "true",
+      [Annotation.Label]: "Selected Leads",
+      [Annotation.Trace]: JSON.stringify([
+        { type: "milaboratories.samples-and-data/dataset", label: "Bulk", importance: 100 },
+        { type: "milaboratories.mixcr-clonotyping", label: "MiXCR", importance: 20 },
+        { type: "milaboratories.antibody-tcr-lead-selection", label: "Top 10", importance: 30 },
+      ]),
+    });
+    const filterSpec2 = spec("filter2", [axis("sample")], {
+      [Annotation.IsSubset]: "true",
+      [Annotation.Label]: "Selected Leads",
+      [Annotation.Trace]: JSON.stringify([
+        { type: "milaboratories.samples-and-data/dataset", label: "Bulk", importance: 100 },
+        { type: "milaboratories.mixcr-clonotyping", label: "MiXCR", importance: 20 },
+        { type: "milaboratories.antibody-tcr-lead-selection", label: "Top 11", importance: 30 },
+      ]),
+    });
+    const f1Snap = snap(canonicalize(ref1)! as string, filterSpec1);
+    const f2Snap = snap(canonicalize(ref2)! as string, filterSpec2);
+
+    const builder = new ColumnCollectionBuilder(createSpecFrameCtx());
+    builder.addSource([f1Snap, f2Snap, anchorSnap]);
+    const collection = builder.build({ anchors: { main: anchorSpec } })!;
+
+    const matches = findFilterColumns(collection);
+    expect(matches).toHaveLength(2);
+
+    const options = filterMatchesToOptions(matches, { refsByObjectId: refMap, datasetSpec });
+    expect(options.map((o) => o.label).sort()).toEqual(["Bulk / Top 10", "Bulk / Top 11"]);
+  });
+
   test("returns empty array for empty matches", () => {
-    expect(filterMatchesToOptions([], new Map())).toEqual([]);
+    expect(
+      filterMatchesToOptions([], { refsByObjectId: new Map(), datasetSpec: anchorSpec }),
+    ).toEqual([]);
   });
 
-  test("skips entries whose ref is not found in map", () => {
+  test("skips entries whose id is not in refsByObjectId", () => {
     const knownRef = createPlRef("b1", "known");
     const knownSpec = spec("known", [axis("sample")], { [Annotation.IsSubset]: "true" });
     const orphanSpec = spec("orphan", [axis("sample")], { [Annotation.IsSubset]: "true" });
@@ -153,9 +248,11 @@ describe("filterMatchesToOptions", () => {
 
     const matches = findFilterColumns(collection);
     expect(matches.length).toBe(2);
-
     const refMap = buildRefMap([{ ref: knownRef }]);
-    const options = filterMatchesToOptions(matches, refMap);
+    const options = filterMatchesToOptions(matches, {
+      refsByObjectId: refMap,
+      datasetSpec: anchorSpec,
+    });
     expect(options).toHaveLength(1);
     expect(options[0].ref).toBe(knownRef);
   });

package/src/components/PlDatasetSelector/filter_discovery.ts

@@ -1,5 +1,5 @@
 import { Annotation } from "@milaboratories/pl-model-common";
-import type { Option, PlRef, PObjectId } from "@milaboratories/pl-model-common";
+import type { Option, PlRef, PObjectId, PObjectSpec } from "@milaboratories/pl-model-common";
 import canonicalize from "canonicalize";
 import type {
   AnchoredColumnCollection,
@@ -12,12 +12,8 @@ import {
 } from "../../labels/derive_distinct_labels";
 
 /**
- * Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
- *
- * The axes-subset constraint is enforced by `mode: "enrichment"`, which sets
- * `allowFloatingHitAxes: false` — every axis of the matched column must be
- * present in the anchor's axes. See `matchingModeToConstraints()` in
- * `column_collection_builder.ts`.
+ * Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+ * The axes-subset constraint comes from `mode: "enrichment"`.
  */
 export function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[] {
   return collection.findColumns({
@@ -28,51 +24,62 @@ export function findFilterColumns(collection: AnchoredColumnCollection): ColumnM
   });
 }
 
+export 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;
+  /**
+   * Forwarded to `deriveDistinctLabels`. Any `formatters.native` caller
+   * sets is silently overridden — the function relies on a no-op native
+   * formatter to keep the algorithm from short-circuiting on filters'
+   * inherited `pl7.app/label`.
+   */
+  labelOptions?: DeriveLabelsOptions;
+};
+
 /**
- * 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()
+ * 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.
  */
 export function filterMatchesToOptions(
   matches: ColumnMatch[],
-  refsByObjectId: ReadonlyMap<PObjectId, PlRef>,
-  labelOptions?: DeriveLabelsOptions,
+  options: FilterMatchOptions,
 ): Option[] {
   if (matches.length === 0) return [];
 
-  // 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. All variants of a match share a column id, so the ref lookup
-  // happens once per match.
-  const flattened = matches.flatMap((match) => {
+  const { refsByObjectId, datasetSpec, labelOptions } = options;
+
+  // One entry per match-variant (different paths to the same column are
+  // exposed as separate Options). The `ref` field rides along on the
+  // Entry-shaped objects via structural typing; `deriveDistinctLabels`
+  // ignores extra fields.
+  const entries = matches.flatMap((match): (Entry & { ref: PlRef })[] => {
     const ref = refsByObjectId.get(match.column.id);
     if (ref === undefined) return [];
-    return match.variants.map((variant) => ({ match, variant, ref }));
+    return match.variants.map((variant) => ({
+      ref,
+      spec: match.column.spec,
+      linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),
+    }));
   });
 
-  const entries: Entry[] = flattened.map(({ match, variant }) => ({
-    spec: match.column.spec,
-    linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),
-  }));
-
-  const labels = deriveDistinctLabels(entries, labelOptions);
+  // Appending the dataset forces a discriminating trace step into every
+  // filter label (yielding e.g. "Bulk / Top 10"); the dataset's own label
+  // is dropped because we only zip `entries`. Native label is force-
+  // suppressed (the override sits after caller's spread) — filters
+  // inherit the dataset's `pl7.app/label` and would otherwise satisfy
+  // uniqueness before any trace step is consulted.
+  const labels = deriveDistinctLabels([...entries, { spec: datasetSpec }], {
+    ...labelOptions,
+    formatters: { ...labelOptions?.formatters, native: () => undefined },
+  });
 
-  return flattened.map(({ ref }, i) => ({ ref, label: labels[i] }));
+  return entries.map(({ ref }, i) => ({ ref, label: labels[i] }));
 }
 
-/**
- * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`
- */
+/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */
 export function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {
-  const map = new Map<PObjectId, PlRef>();
-  for (const entry of entries) {
-    map.set(canonicalize(entry.ref)! as PObjectId, entry.ref);
-  }
-  return map;
+  return new Map(entries.map((e) => [canonicalize(e.ref)! as PObjectId, e.ref]));
 }

package/src/filters/converters/filterToQuery.test.ts

@@ -312,6 +312,7 @@ describe("filterSpecToSpecQueryExpr", () => {
       type: "isIn",
       input: { type: "columnRef", value: "col1" },
       set: ["a", "b", "c"],
+      negate: false,
     });
   });
 
@@ -322,12 +323,10 @@ describe("filterSpecToSpecQueryExpr", () => {
       value: ["x"],
     };
     expect(filterSpecToSpecQueryExpr(filter)).toEqual({
-      type: "not",
-      input: {
-        type: "isIn",
-        input: { type: "columnRef", value: "col1" },
-        set: ["x"],
-      },
+      type: "isIn",
+      input: { type: "columnRef", value: "col1" },
+      set: ["x"],
+      negate: true,
     });
   });
 

package/src/filters/converters/filterToQuery.ts

@@ -221,15 +221,14 @@ function leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(
         type: "isIn",
         input: resolveColumnRef(filter.column),
         set: filter.value,
+        negate: false,
       };
     case "notInSet":
       return {
-        type: "not",
-        input: {
-          type: "isIn",
-          input: resolveColumnRef(filter.column),
-          set: filter.value,
-        },
+        type: "isIn",
+        input: resolveColumnRef(filter.column),
+        set: filter.value,
+        negate: true,
       };
 
     case "isNA":
@@ -248,7 +247,7 @@ function leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(
 
     case "ifNa":
       return {
-        type: "ifNull",
+        type: "fillNull",
         input: resolveColumnRef(filter.column),
         replacement: { type: "constant", value: filter.replacement },
       };