@platforma-sdk/model 1.72.0 → 1.73.3

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.cjs

@@ -16,7 +16,7 @@ function createPTableDefV3(params) {
 			entry: query,
 			qualifications: params.secondary.flatMap((g) => params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []))
 		},
-		secondary: params.secondary.flatMap((g) => g.entries.map((e) => toLeaf(e.column, e.qualifications ?? [])))
+		secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e)))
 	};
 	if (!(0, es_toolkit.isNil)(params.filters)) {
 		const nonEmpty = require_distill.distillFilterSpec(params.filters);
@@ -59,6 +59,21 @@ function toLeaf(col, qs) {
 		qualifications: qs
 	};
 }
+function toJoinEntry(e) {
+	const qs = e.qualifications ?? [];
+	if ((0, es_toolkit.isNil)(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);
+	return {
+		...e.linkers.reduceRight((inner, linker) => ({
+			entry: {
+				type: "linkerJoin",
+				linker: { column: linker },
+				secondary: [inner]
+			},
+			qualifications: []
+		}), toLeaf(e.column, [])),
+		qualifications: qs
+	};
+}
 //#endregion
 exports.createPTableDefV3 = createPTableDefV3;
 

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createPTableDefV3.cjs","names":["distillFilterSpec","filterSpecToSpecQueryExpr"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  PColumn,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV5\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\n\n/** Primary side — base row grid. */\nexport type PrimaryEntry<Data> = {\n  column: PColumn<Data>;\n};\n\n/** Secondary side leaf — the hit column, a linker step, or a label column. */\nexport type SecondaryEntry<Data> = {\n  column: PColumn<Data>;\n  /** For hit: `forHit`. For linker step k: `path[k].qualifications`. For label/direct: omit. */\n  qualifications?: AxisQualification[];\n};\n\n/** Secondary group — one join subtree outer-joined onto primary. */\nexport type SecondaryGroup<Data> = {\n  entries: SecondaryEntry<Data>[];\n  /** Per-variant qualifications applied to the cloned primary anchors on this group's side.\n   *  Keyed by `PrimaryEntry.column.id`. Omit → base primary used unqualified (labels, non-variant columns). */\n  primaryQualifications?: Record<PObjectId, AxisQualification[]>;\n};\n\nexport function createPTableDefV3<Data = PColumnDataUniversal>(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: PrimaryEntry<Data>[];\n  secondary: SecondaryGroup<Data>[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<PColumn<Data>> {\n  let query: SpecQuery<PColumn<Data>> = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((a) => toLeaf(a.column, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((g) =>\n          params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []),\n        ),\n      },\n      secondary: params.secondary.flatMap((g) =>\n        g.entries.map((e) => toLeaf(e.column, e.qualifications ?? [])),\n      ),\n    };\n  }\n\n  if (!isNil(params.filters)) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  if (!isNil(params.sorting) && params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: !s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction toLeaf<Data>(\n  col: PColumn<Data>,\n  qs: AxisQualification[],\n): SpecQueryJoinEntry<PColumn<Data>> {\n  return {\n    entry: { type: \"column\", column: col },\n    qualifications: qs,\n  };\n}\n"],"mappings":";;;;;;;AAuCA,SAAgB,kBAA+C,QAMhC;CAC7B,IAAI,QAAkC;EACpC,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;EACzD;AAED,KAAI,OAAO,UAAU,SAAS,EAC5B,SAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MACxC,OAAO,QAAQ,SAAS,MAAM,EAAE,wBAAwB,EAAE,OAAO,OAAO,EAAE,CAAC,CAC5E;GACF;EACD,WAAW,OAAO,UAAU,SAAS,MACnC,EAAE,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAC/D;EACF;AAGH,KAAI,EAAA,GAAA,WAAA,OAAO,OAAO,QAAQ,EAAE;EAC1B,MAAM,WAAWA,gBAAAA,kBAAkB,OAAO,QAAQ;AAElD,MAAI,EAAA,GAAA,WAAA,OAAO,SAAS,EAAE;GACpB,MAAM,YAAYC,sBAAAA,0BAA0B,SAAS;AACrD,OAAI,EAAA,GAAA,gCAAA,qBAAqB,UAAU,CACjC,OAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,sDAClF;AAEH,WAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;IACZ;;;AAIL,KAAI,EAAA,GAAA,WAAA,OAAO,OAAO,QAAQ,IAAI,OAAO,QAAQ,SAAS,EACpD,SAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,OAAO;GACpC,WAAW,EAAE;GACb,YAAY,CAAC,EAAE;GAChB,EAAE;EACJ;AAGH,QAAO,EAAE,OAAO;;AAGlB,SAAS,eAAe,KAA0C;AAChE,QAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;EAA0B,GACxD;EAAE,MAAM;EAAa,OAAO,IAAI;EAAI;;AAG1C,SAAS,OACP,KACA,IACmC;AACnC,QAAO;EACL,OAAO;GAAE,MAAM;GAAU,QAAQ;GAAK;EACtC,gBAAgB;EACjB"}
+{"version":3,"file":"createPTableDefV3.cjs","names":["distillFilterSpec","filterSpecToSpecQueryExpr"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  PColumn,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV5\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\n\n/** Primary side — base row grid. */\nexport type PrimaryEntry<Data> = {\n  column: PColumn<Data>;\n};\n\n/** Secondary side leaf — the hit column or a label column, optionally reached via a linker chain. */\nexport type SecondaryEntry<Data> = {\n  column: PColumn<Data>;\n  /** For hit: `forHit`. For label/direct: omit. Applied to the outermost emitted join entry. */\n  qualifications?: AxisQualification[];\n  /**\n   * Linker chain leading to `column`, ordered from outermost to innermost.\n   * When present, the entry is emitted as nested `linkerJoin` operators —\n   * one per linker — wrapping the hit column. Binds this hit to this exact\n   * chain so the engine cannot reuse a sibling chain that happens to share\n   * axis name + domain.\n   */\n  linkers?: PColumn<Data>[];\n};\n\n/** Secondary group — one join subtree outer-joined onto primary. */\nexport type SecondaryGroup<Data> = {\n  entries: SecondaryEntry<Data>[];\n  /** Per-variant qualifications applied to the cloned primary anchors on this group's side.\n   *  Keyed by `PrimaryEntry.column.id`. Omit → base primary used unqualified (labels, non-variant columns). */\n  primaryQualifications?: Record<PObjectId, AxisQualification[]>;\n};\n\nexport function createPTableDefV3<Data = PColumnDataUniversal>(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: PrimaryEntry<Data>[];\n  secondary: SecondaryGroup<Data>[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<PColumn<Data>> {\n  let query: SpecQuery<PColumn<Data>> = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((a) => toLeaf(a.column, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((g) =>\n          params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []),\n        ),\n      },\n      secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e))),\n    };\n  }\n\n  if (!isNil(params.filters)) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  if (!isNil(params.sorting) && params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: !s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction toLeaf<Data>(\n  col: PColumn<Data>,\n  qs: AxisQualification[],\n): SpecQueryJoinEntry<PColumn<Data>> {\n  return {\n    entry: { type: \"column\", column: col },\n    qualifications: qs,\n  };\n}\n\nfunction toJoinEntry<Data>(e: SecondaryEntry<Data>): SpecQueryJoinEntry<PColumn<Data>> {\n  const qs = e.qualifications ?? [];\n  if (isNil(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);\n\n  const folded = e.linkers.reduceRight<SpecQueryJoinEntry<PColumn<Data>>>(\n    (inner, linker) => ({\n      entry: { type: \"linkerJoin\", linker: { column: linker }, secondary: [inner] },\n      qualifications: [],\n    }),\n    toLeaf(e.column, []),\n  );\n  return { ...folded, qualifications: qs };\n}\n"],"mappings":";;;;;;;AA+CA,SAAgB,kBAA+C,QAMhC;CAC7B,IAAI,QAAkC;EACpC,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;EACzD;AAED,KAAI,OAAO,UAAU,SAAS,EAC5B,SAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MACxC,OAAO,QAAQ,SAAS,MAAM,EAAE,wBAAwB,EAAE,OAAO,OAAO,EAAE,CAAC,CAC5E;GACF;EACD,WAAW,OAAO,UAAU,SAAS,MAAM,EAAE,QAAQ,KAAK,MAAM,YAAY,EAAE,CAAC,CAAC;EACjF;AAGH,KAAI,EAAA,GAAA,WAAA,OAAO,OAAO,QAAQ,EAAE;EAC1B,MAAM,WAAWA,gBAAAA,kBAAkB,OAAO,QAAQ;AAElD,MAAI,EAAA,GAAA,WAAA,OAAO,SAAS,EAAE;GACpB,MAAM,YAAYC,sBAAAA,0BAA0B,SAAS;AACrD,OAAI,EAAA,GAAA,gCAAA,qBAAqB,UAAU,CACjC,OAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,sDAClF;AAEH,WAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;IACZ;;;AAIL,KAAI,EAAA,GAAA,WAAA,OAAO,OAAO,QAAQ,IAAI,OAAO,QAAQ,SAAS,EACpD,SAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,OAAO;GACpC,WAAW,EAAE;GACb,YAAY,CAAC,EAAE;GAChB,EAAE;EACJ;AAGH,QAAO,EAAE,OAAO;;AAGlB,SAAS,eAAe,KAA0C;AAChE,QAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;EAA0B,GACxD;EAAE,MAAM;EAAa,OAAO,IAAI;EAAI;;AAG1C,SAAS,OACP,KACA,IACmC;AACnC,QAAO;EACL,OAAO;GAAE,MAAM;GAAU,QAAQ;GAAK;EACtC,gBAAgB;EACjB;;AAGH,SAAS,YAAkB,GAA4D;CACrF,MAAM,KAAK,EAAE,kBAAkB,EAAE;AACjC,MAAA,GAAA,WAAA,OAAU,EAAE,QAAQ,IAAI,EAAE,QAAQ,WAAW,EAAG,QAAO,OAAO,EAAE,QAAQ,GAAG;AAS3E,QAAO;EAAE,GAPM,EAAE,QAAQ,aACtB,OAAO,YAAY;GAClB,OAAO;IAAE,MAAM;IAAc,QAAQ,EAAE,QAAQ,QAAQ;IAAE,WAAW,CAAC,MAAM;IAAE;GAC7E,gBAAgB,EAAE;GACnB,GACD,OAAO,EAAE,QAAQ,EAAE,CAAC,CACrB;EACmB,gBAAgB;EAAI"}

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.js

@@ -15,7 +15,7 @@ function createPTableDefV3(params) {
 			entry: query,
 			qualifications: params.secondary.flatMap((g) => params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []))
 		},
-		secondary: params.secondary.flatMap((g) => g.entries.map((e) => toLeaf(e.column, e.qualifications ?? [])))
+		secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e)))
 	};
 	if (!isNil(params.filters)) {
 		const nonEmpty = distillFilterSpec(params.filters);
@@ -58,6 +58,21 @@ function toLeaf(col, qs) {
 		qualifications: qs
 	};
 }
+function toJoinEntry(e) {
+	const qs = e.qualifications ?? [];
+	if (isNil(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);
+	return {
+		...e.linkers.reduceRight((inner, linker) => ({
+			entry: {
+				type: "linkerJoin",
+				linker: { column: linker },
+				secondary: [inner]
+			},
+			qualifications: []
+		}), toLeaf(e.column, [])),
+		qualifications: qs
+	};
+}
 //#endregion
 export { createPTableDefV3 };
 

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPTableDefV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  PColumn,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV5\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\n\n/** Primary side — base row grid. */\nexport type PrimaryEntry<Data> = {\n  column: PColumn<Data>;\n};\n\n/** Secondary side leaf — the hit column, a linker step, or a label column. */\nexport type SecondaryEntry<Data> = {\n  column: PColumn<Data>;\n  /** For hit: `forHit`. For linker step k: `path[k].qualifications`. For label/direct: omit. */\n  qualifications?: AxisQualification[];\n};\n\n/** Secondary group — one join subtree outer-joined onto primary. */\nexport type SecondaryGroup<Data> = {\n  entries: SecondaryEntry<Data>[];\n  /** Per-variant qualifications applied to the cloned primary anchors on this group's side.\n   *  Keyed by `PrimaryEntry.column.id`. Omit → base primary used unqualified (labels, non-variant columns). */\n  primaryQualifications?: Record<PObjectId, AxisQualification[]>;\n};\n\nexport function createPTableDefV3<Data = PColumnDataUniversal>(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: PrimaryEntry<Data>[];\n  secondary: SecondaryGroup<Data>[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<PColumn<Data>> {\n  let query: SpecQuery<PColumn<Data>> = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((a) => toLeaf(a.column, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((g) =>\n          params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []),\n        ),\n      },\n      secondary: params.secondary.flatMap((g) =>\n        g.entries.map((e) => toLeaf(e.column, e.qualifications ?? [])),\n      ),\n    };\n  }\n\n  if (!isNil(params.filters)) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  if (!isNil(params.sorting) && params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: !s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction toLeaf<Data>(\n  col: PColumn<Data>,\n  qs: AxisQualification[],\n): SpecQueryJoinEntry<PColumn<Data>> {\n  return {\n    entry: { type: \"column\", column: col },\n    qualifications: qs,\n  };\n}\n"],"mappings":";;;;;;AAuCA,SAAgB,kBAA+C,QAMhC;CAC7B,IAAI,QAAkC;EACpC,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;EACzD;AAED,KAAI,OAAO,UAAU,SAAS,EAC5B,SAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MACxC,OAAO,QAAQ,SAAS,MAAM,EAAE,wBAAwB,EAAE,OAAO,OAAO,EAAE,CAAC,CAC5E;GACF;EACD,WAAW,OAAO,UAAU,SAAS,MACnC,EAAE,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAC/D;EACF;AAGH,KAAI,CAAC,MAAM,OAAO,QAAQ,EAAE;EAC1B,MAAM,WAAW,kBAAkB,OAAO,QAAQ;AAElD,MAAI,CAAC,MAAM,SAAS,EAAE;GACpB,MAAM,YAAY,0BAA0B,SAAS;AACrD,OAAI,CAAC,oBAAoB,UAAU,CACjC,OAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,sDAClF;AAEH,WAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;IACZ;;;AAIL,KAAI,CAAC,MAAM,OAAO,QAAQ,IAAI,OAAO,QAAQ,SAAS,EACpD,SAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,OAAO;GACpC,WAAW,EAAE;GACb,YAAY,CAAC,EAAE;GAChB,EAAE;EACJ;AAGH,QAAO,EAAE,OAAO;;AAGlB,SAAS,eAAe,KAA0C;AAChE,QAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;EAA0B,GACxD;EAAE,MAAM;EAAa,OAAO,IAAI;EAAI;;AAG1C,SAAS,OACP,KACA,IACmC;AACnC,QAAO;EACL,OAAO;GAAE,MAAM;GAAU,QAAQ;GAAK;EACtC,gBAAgB;EACjB"}
+{"version":3,"file":"createPTableDefV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  PColumn,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV5\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\n\n/** Primary side — base row grid. */\nexport type PrimaryEntry<Data> = {\n  column: PColumn<Data>;\n};\n\n/** Secondary side leaf — the hit column or a label column, optionally reached via a linker chain. */\nexport type SecondaryEntry<Data> = {\n  column: PColumn<Data>;\n  /** For hit: `forHit`. For label/direct: omit. Applied to the outermost emitted join entry. */\n  qualifications?: AxisQualification[];\n  /**\n   * Linker chain leading to `column`, ordered from outermost to innermost.\n   * When present, the entry is emitted as nested `linkerJoin` operators —\n   * one per linker — wrapping the hit column. Binds this hit to this exact\n   * chain so the engine cannot reuse a sibling chain that happens to share\n   * axis name + domain.\n   */\n  linkers?: PColumn<Data>[];\n};\n\n/** Secondary group — one join subtree outer-joined onto primary. */\nexport type SecondaryGroup<Data> = {\n  entries: SecondaryEntry<Data>[];\n  /** Per-variant qualifications applied to the cloned primary anchors on this group's side.\n   *  Keyed by `PrimaryEntry.column.id`. Omit → base primary used unqualified (labels, non-variant columns). */\n  primaryQualifications?: Record<PObjectId, AxisQualification[]>;\n};\n\nexport function createPTableDefV3<Data = PColumnDataUniversal>(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: PrimaryEntry<Data>[];\n  secondary: SecondaryGroup<Data>[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<PColumn<Data>> {\n  let query: SpecQuery<PColumn<Data>> = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((a) => toLeaf(a.column, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((g) =>\n          params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []),\n        ),\n      },\n      secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e))),\n    };\n  }\n\n  if (!isNil(params.filters)) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  if (!isNil(params.sorting) && params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: !s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction toLeaf<Data>(\n  col: PColumn<Data>,\n  qs: AxisQualification[],\n): SpecQueryJoinEntry<PColumn<Data>> {\n  return {\n    entry: { type: \"column\", column: col },\n    qualifications: qs,\n  };\n}\n\nfunction toJoinEntry<Data>(e: SecondaryEntry<Data>): SpecQueryJoinEntry<PColumn<Data>> {\n  const qs = e.qualifications ?? [];\n  if (isNil(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);\n\n  const folded = e.linkers.reduceRight<SpecQueryJoinEntry<PColumn<Data>>>(\n    (inner, linker) => ({\n      entry: { type: \"linkerJoin\", linker: { column: linker }, secondary: [inner] },\n      qualifications: [],\n    }),\n    toLeaf(e.column, []),\n  );\n  return { ...folded, qualifications: qs };\n}\n"],"mappings":";;;;;;AA+CA,SAAgB,kBAA+C,QAMhC;CAC7B,IAAI,QAAkC;EACpC,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;EACzD;AAED,KAAI,OAAO,UAAU,SAAS,EAC5B,SAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MACxC,OAAO,QAAQ,SAAS,MAAM,EAAE,wBAAwB,EAAE,OAAO,OAAO,EAAE,CAAC,CAC5E;GACF;EACD,WAAW,OAAO,UAAU,SAAS,MAAM,EAAE,QAAQ,KAAK,MAAM,YAAY,EAAE,CAAC,CAAC;EACjF;AAGH,KAAI,CAAC,MAAM,OAAO,QAAQ,EAAE;EAC1B,MAAM,WAAW,kBAAkB,OAAO,QAAQ;AAElD,MAAI,CAAC,MAAM,SAAS,EAAE;GACpB,MAAM,YAAY,0BAA0B,SAAS;AACrD,OAAI,CAAC,oBAAoB,UAAU,CACjC,OAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,sDAClF;AAEH,WAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;IACZ;;;AAIL,KAAI,CAAC,MAAM,OAAO,QAAQ,IAAI,OAAO,QAAQ,SAAS,EACpD,SAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,OAAO;GACpC,WAAW,EAAE;GACb,YAAY,CAAC,EAAE;GAChB,EAAE;EACJ;AAGH,QAAO,EAAE,OAAO;;AAGlB,SAAS,eAAe,KAA0C;AAChE,QAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;EAA0B,GACxD;EAAE,MAAM;EAAa,OAAO,IAAI;EAAI;;AAG1C,SAAS,OACP,KACA,IACmC;AACnC,QAAO;EACL,OAAO;GAAE,MAAM;GAAU,QAAQ;GAAK;EACtC,gBAAgB;EACjB;;AAGH,SAAS,YAAkB,GAA4D;CACrF,MAAM,KAAK,EAAE,kBAAkB,EAAE;AACjC,KAAI,MAAM,EAAE,QAAQ,IAAI,EAAE,QAAQ,WAAW,EAAG,QAAO,OAAO,EAAE,QAAQ,GAAG;AAS3E,QAAO;EAAE,GAPM,EAAE,QAAQ,aACtB,OAAO,YAAY;GAClB,OAAO;IAAE,MAAM;IAAc,QAAQ,EAAE,QAAQ,QAAQ;IAAE,WAAW,CAAC,MAAM;IAAE;GAC7E,gBAAgB,EAAE;GACnB,GACD,OAAO,EAAE,QAAQ,EAAE,CAAC,CACrB;EACmB,gBAAgB;EAAI"}

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs

@@ -199,9 +199,10 @@ function buildSecondaryGroups(direct, linked) {
 		}],
 		primaryQualifications: c.qualifications.forQueries
 	})), ...linked.map((lc) => ({
-		entries: [...lc.path.map((s) => ({ column: resolveSnapshot(s.linker) })), {
+		entries: [{
 			column: resolveSnapshot(lc.column),
-			qualifications: lc.qualifications.forHit
+			qualifications: lc.qualifications.forHit,
+			linkers: lc.path.map((s) => resolveSnapshot(s.linker))
 		}],
 		primaryQualifications: lc.qualifications.forQueries
 	}))];

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createPlDataTableV3.cjs","names":["upgradePlDataTableStateV2","discoverTableColumnSnaphots","deriveAllLabels","deriveAllTooltips","createPTableDefV3","evaluateRules","withDataStatusAnnotations","withLabelAnnotations","withInfoAnnotations","withTableVisualAnnotations","withHidenAxesAnnotations","getAxisId","isColumnHidden","isColumnOptional","collectFilterSpecColumns","traverseFilterSpec"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  FilterSpecNode,\n  PColumn,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableSorting,\n  PColumnSpec,\n  MultiColumnSelector,\n  PFrameSpecDriver,\n  DiscoveredPColumnId,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson, getAxisId, parseJson, uniqueBy } from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns, traverseFilterSpec } from \"../../../filters/traverse\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../../../render\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport type { PlDataTableFilters, PlDataTableFilterSpecLeaf, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { ColumnSelector, ColumnSnapshot, ColumnVariant, MatchingMode } from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveAllLabels,\n  deriveAllTooltips,\n  evaluateRules,\n  isColumnHidden,\n  isColumnOptional,\n  withHidenAxesAnnotations,\n  withLabelAnnotations,\n  withTableVisualAnnotations,\n  withInfoAnnotations,\n  withDataStatusAnnotations,\n} from \"./utils\";\nimport type { PrimaryEntry, SecondaryGroup } from \"./createPTableDefV3\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport { discoverTableColumnSnaphots, type DiscoverTableColumnOptions } from \"./discoverColumns\";\nimport { isNil, isPlainObject, throwError, type Nil } from \"@milaboratories/helpers\";\nimport { flow } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = {\n  tableState?: PlDataTableStateV2;\n\n  columns: Nil | DiscoverTableColumnOptions | TableColumnVariant[];\n  filters?: PlDataTableFilters;\n  sorting?: PTableSorting[];\n  primaryJoinType?: \"inner\" | \"full\";\n\n  labelsOptions?: DeriveLabelsOptions;\n  displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnSource. */\nexport type ColumnsSelectorConfig = {\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  exclude?: MultiColumnSelector | MultiColumnSelector[];\n  mode?: MatchingMode;\n  maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n  /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n  ordering?: ColumnOrderRule[];\n  /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n  visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n  match: ColumnMatcher | ColumnSelector;\n  /** Higher number = further left in table */\n  priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n  match: ColumnMatcher | ColumnSelector;\n  visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport type ColumnMatcher = (spec: PColumnSpec) => boolean;\n\nexport function createPlDataTableV3<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n  const state = upgradePlDataTableStateV2(options.tableState);\n  const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n  const discovered = isPlainObject(options.columns)\n    ? discoverTableColumnSnaphots(ctx, options.columns)\n    : options.columns;\n  if (isNil(discovered) || discovered.length === 0) return undefined;\n\n  const splited = splitDiscoveredColumns(discovered);\n\n  const derivedLabels = deriveAllLabels({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n    deriveLabelsOptions: {\n      includeNativeLabel: true,\n      ...options.labelsOptions,\n    },\n  });\n\n  const derivedTooltips = deriveAllTooltips({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      originalId: dc.originalId,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n  });\n\n  const annotated = annotateColumnGroups({\n    pframeSpec,\n    ...splited,\n    derivedLabels,\n    derivedTooltips,\n    displayOptions: options.displayOptions,\n  });\n\n  const primarySnapshots = annotated.direct.filter((c) => c.isPrimary);\n  const secondarySnapshots = annotated.direct.filter((c) => !c.isPrimary);\n\n  if (primarySnapshots.length === 0) return undefined;\n\n  const columnIsAvailable = createColumnValidationById([\n    ...annotated.direct.map((v) => v.column),\n    ...annotated.linked.flatMap((lc) => [...lc.path.map((s) => s.linker), lc.column]),\n  ]);\n\n  const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);\n  const filters = filterFilters(\n    concatFilters(\n      state.pTableParams.filters,\n      state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n    ),\n    columnIsAvailable,\n  );\n\n  const sorting = filterSorting(\n    resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered)),\n    columnIsAvailable,\n  );\n\n  const primaryEntries: PrimaryEntry<undefined | PColumnDataUniversal>[] = primarySnapshots.map(\n    (v) => ({ column: resolveSnapshot(v.column) }),\n  );\n  const secondaryGroups: SecondaryGroup<undefined | PColumnDataUniversal>[] = buildSecondaryGroups(\n    secondarySnapshots,\n    annotated.linked,\n  );\n  const fullDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: secondaryGroups,\n    filters,\n    sorting,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  // TODO: is workaround for dropdown suggestions.\n  // Pframe have not equivalent data for columns relativly to Ptable\n  const pframeHandle = ctx.createPFrame([\n    ...annotated.direct.map((v) => resolveSnapshot(v.column)),\n    ...annotated.linked.map((v) => resolveSnapshot(v.column)),\n    ...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot),\n  ]);\n\n  const hiddenSpecs = state.pTableParams.hiddenColIds;\n  const hiddenColumnIds = computeHiddenColumns(\n    [...annotated.direct, ...annotated.linked].map((v) => v.column),\n    sorting,\n    filters,\n    hiddenSpecs,\n  );\n\n  const visible = buildVisibleColumns(annotated, hiddenColumnIds);\n  const visibleDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: buildSecondaryGroups(\n      visible.direct.filter((c) => !c.isPrimary),\n      visible.linked,\n    ),\n    filters,\n    sorting,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  return {\n    sourceId: state.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n    defaultFilters: remapedDefaultFilters,\n  } satisfies PlDataTableModel;\n}\n\nexport type TableColumnVariant = ColumnVariant<DiscoveredPColumnId> & {\n  readonly originalId: PObjectId;\n  readonly isPrimary?: boolean;\n};\n\ntype SplitDiscoveredColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype AnnotatedColumnGroups = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype VisibleColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\n/** Split discovered columns into direct (no linker path) and linked (with linker path). */\nfunction splitDiscoveredColumns(columns: TableColumnVariant[]): SplitDiscoveredColumns {\n  const direct = columns.filter((dc) => dc.path.length === 0);\n  const linked = columns.filter((dc) => dc.path.length > 0);\n  return { direct, linked };\n}\n\n/** All linker snapshots across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: TableColumnVariant[]): ColumnSnapshot<PObjectId>[] {\n  return uniqueBy(\n    linked.flatMap((lc) => lc.path.map((s) => s.linker)),\n    (c) => c.id,\n  );\n}\n\n/**\n * Annotate all column groups with derived labels and display-rule annotations.\n * Evaluates `displayOptions` rules against all discovered columns (direct,\n * linked, labels, linkers) and writes the winning visibility/priority into\n * column annotations via `withTableVisualAnnotations`.\n */\nfunction annotateColumnGroups(params: {\n  direct: TableColumnVariant[];\n  linked: TableColumnVariant[];\n  derivedLabels: Record<string, string>;\n  derivedTooltips: Record<string, string>;\n  displayOptions?: ColumnsDisplayOptions;\n  pframeSpec: PFrameSpecDriver;\n}): AnnotatedColumnGroups {\n  const { direct, linked, derivedLabels, derivedTooltips, displayOptions, pframeSpec } = params;\n\n  const allColumnsForRules = [\n    ...direct.map((v) => v.column),\n    ...linked.map((v) => v.column),\n    ...collectLinkerSnapshots(linked),\n  ];\n  const visibilityByColId = evaluateRules(\n    displayOptions?.visibility ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n  const orderByColId = evaluateRules(\n    displayOptions?.ordering ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n\n  const directAnnotated = liftToVariantColumns(\n    direct,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  );\n\n  const linkedAnnotated = liftToVariantColumns(\n    linked,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withHidenAxesAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  ).map((lc) => ({ ...lc, path: annotateLinkerPath(derivedLabels, lc.path) }));\n\n  return {\n    direct: directAnnotated,\n    linked: linkedAnnotated,\n  };\n}\n\n/** Lift a snapshot-array transform so it runs on the inner `column` of each variant. */\nfunction liftToVariantColumns<V extends { readonly column: ColumnSnapshot<DiscoveredPColumnId> }>(\n  variants: V[],\n  fn: (cols: ColumnSnapshot<DiscoveredPColumnId>[]) => ColumnSnapshot<DiscoveredPColumnId>[],\n): V[] {\n  const cols = fn(variants.map((v) => v.column));\n  if (cols.length !== variants.length)\n    throw new Error(\n      `liftToVariantColumns: fn must preserve array length (got ${cols.length}, expected ${variants.length})`,\n    );\n  return variants.map((v, i) => ({ ...v, column: cols[i] }));\n}\n\nfunction annotateLinkerPath(\n  derivedLabels: Record<string, string>,\n  path: TableColumnVariant[\"path\"],\n): TableColumnVariant[\"path\"] {\n  if (path.length === 0) return path;\n  const annotatedLinkers = withHidenAxesAnnotations(\n    withLabelAnnotations(\n      derivedLabels,\n      path.map((s) => s.linker),\n    ),\n  );\n  return path.map((s, i) => ({ ...s, linker: annotatedLinkers[i] }));\n}\n\n/** Build an index of all valid column IDs (axes + columns) for filter/sorting validation. */\nfunction createColumnValidationById(\n  fullColumns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n) {\n  const axisIds = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map(getAxisId)),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n\n  const allIds: PTableColumnId[] = [\n    ...axisIds.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n\n  const validIdSet = new Set(allIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n\n  return (id: string): boolean => {\n    return validIdSet.has(id as CanonicalizedJson<PTableColumnId>);\n  };\n}\n\n/** Drop filter leaves whose column references are not available in the table. */\nfunction filterFilters(\n  filters: Nil | PlDataTableFilters,\n  isValidColumnId: (id: string) => boolean,\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const isLeafValid = (leaf: PlDataTableFilterSpecLeaf): boolean => {\n    if (leaf.type === undefined) return true;\n    if (\"column\" in leaf && !isValidColumnId(leaf.column)) return false;\n    if (\"rhs\" in leaf && !isValidColumnId(leaf.rhs)) return false;\n    return true;\n  };\n\n  const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n    if (node.type === \"and\" || node.type === \"or\") {\n      const kept = node.filters\n        .map((f) => prune(f))\n        .filter((f): f is PlDataTableFilterNode => !isNil(f));\n      return { type: node.type, filters: kept };\n    }\n    if (node.type === \"not\") {\n      const inner = prune(node.filter);\n      return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n    }\n    return isLeafValid(node) ? node : undefined;\n  };\n\n  return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */\nfunction concatFilters(\n  a: Nil | PlDataTableFilters,\n  b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n  if (isNil(a)) return b;\n  if (isNil(b)) return a;\n  return { ...a, filters: [...a.filters, ...b.filters] };\n}\n\n/** Pick user sorting from state if non-empty, otherwise fall back to options default. */\nfunction resolveSorting(\n  userSorting: PTableSorting[],\n  defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n  return (isEmpty(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Drop sorting entries whose column is not available in the table. */\nfunction filterSorting(\n  sorting: PTableSorting[],\n  isValidColumnId: (id: string) => boolean,\n): PTableSorting[] {\n  return sorting.filter((s) => isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)));\n}\n\nfunction buildSecondaryGroups(\n  direct: TableColumnVariant[],\n  linked: TableColumnVariant[],\n): SecondaryGroup<undefined | PColumnDataUniversal>[] {\n  return [\n    ...direct.map(\n      (c): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [{ column: resolveSnapshot(c.column), qualifications: c.qualifications.forHit }],\n        primaryQualifications: c.qualifications.forQueries,\n      }),\n    ),\n    ...linked.map(\n      (lc): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [\n          ...lc.path.map((s) => ({\n            column: resolveSnapshot(s.linker),\n          })),\n          { column: resolveSnapshot(lc.column), qualifications: lc.qualifications.forHit },\n        ],\n        primaryQualifications: lc.qualifications.forQueries,\n      }),\n    ),\n  ];\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults. */\nfunction computeHiddenColumns(\n  columns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n  hiddenSpecs: Nil | PTableColumnId[],\n): Set<PObjectId> {\n  const alwaysHidden = columns.filter((c) => isColumnHidden(c.spec)).map((c) => c.id);\n  const optionalHidden = !isNil(hiddenSpecs)\n    ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n    : columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n  const initial = [...alwaysHidden, ...optionalHidden];\n  const preserved = collectPreservedColumnIds(sorting, filters);\n\n  return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n): Set<PObjectId> {\n  const sortedIds = (sorting ?? [])\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .map((c) => c.id);\n\n  const filterIds = !isNil(filters)\n    ? collectFilterSpecColumns(filters).flatMap((c) => {\n        const obj = parseJson(c);\n        return obj.type === \"column\" ? [obj.id] : [];\n      })\n    : [];\n\n  return new Set<PObjectId>([...sortedIds, ...filterIds]);\n}\n\n/** Filter annotated columns to only visible ones, re-matching label columns for the visible subset. */\nfunction buildVisibleColumns(\n  annotated: AnnotatedColumnGroups,\n  hiddenColumns: Set<PObjectId>,\n): VisibleColumns {\n  const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.column.id));\n  const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.column.id));\n  return { direct, linked };\n}\n\n/** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */\nfunction resolveSnapshot(\n  snap: ColumnSnapshot<PObjectId>,\n): PColumn<undefined | PColumnDataUniversal> {\n  return { id: snap.id, spec: snap.spec, data: snap.data?.get() };\n}\n\n/** Remap column references in sorting entries. */\nfunction remapSortingColumnIds(\n  sorting: Nil | PTableSorting[],\n  columns: TableColumnVariant[],\n): Nil | PTableSorting[] {\n  return sorting?.flatMap((s) => {\n    if (s.column.type === \"axis\") return [s]; // Axis references are unaffected by column ID remapping\n\n    const id = s.column.id;\n    const column = columns.find((c) => (c.originalId ?? c.column.id) === id);\n    if (column === undefined) return [];\n\n    return [\n      {\n        ...s,\n        column: {\n          type: \"column\" as const,\n          id: column.column.id,\n        },\n      },\n    ];\n  });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree. */\nfunction remapFilterColumnIds(\n  filters: Nil | PlDataTableFilters,\n  columns: TableColumnVariant[],\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const map = (\n    tableColumnId: CanonicalizedJson<PTableColumnId>,\n  ): CanonicalizedJson<PTableColumnId> => {\n    const parsed = parseJson<PTableColumnId>(tableColumnId);\n    if (parsed.type === \"axis\") return tableColumnId; // Axis references are unaffected by column ID remapping\n\n    const originalId = parsed.id;\n    const column =\n      columns.find((c) => (c.originalId ?? c.column.id) === originalId) ??\n      throwError(`Column ID \"${parsed.id}\" in filters does not match any discovered column`);\n\n    return canonicalizeJson<PTableColumnId>({\n      type: \"column\",\n      id: column.column.id,\n    });\n  };\n\n  return traverseFilterSpec(filters, {\n    leaf: (leaf): PlDataTableFilterNode => {\n      if (leaf.type === undefined) return leaf;\n      const result = { ...leaf };\n      if (\"column\" in result) result.column = map(result.column);\n      if (\"rhs\" in result) result.rhs = map(result.rhs);\n      return result;\n    },\n    and: (results): PlDataTableFilterNode => ({ type: \"and\", filters: results }),\n    or: (results): PlDataTableFilterNode => ({ type: \"or\", filters: results }),\n    not: (result): PlDataTableFilterNode => ({ type: \"not\", filter: result }),\n  }) as PlDataTableFilters;\n}\n"],"mappings":"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"}
+{"version":3,"file":"createPlDataTableV3.cjs","names":["upgradePlDataTableStateV2","discoverTableColumnSnaphots","deriveAllLabels","deriveAllTooltips","createPTableDefV3","evaluateRules","withDataStatusAnnotations","withLabelAnnotations","withInfoAnnotations","withTableVisualAnnotations","withHidenAxesAnnotations","getAxisId","isColumnHidden","isColumnOptional","collectFilterSpecColumns","traverseFilterSpec"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  FilterSpecNode,\n  PColumn,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableSorting,\n  PColumnSpec,\n  MultiColumnSelector,\n  PFrameSpecDriver,\n  DiscoveredPColumnId,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson, getAxisId, parseJson, uniqueBy } from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns, traverseFilterSpec } from \"../../../filters/traverse\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../../../render\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport type { PlDataTableFilters, PlDataTableFilterSpecLeaf, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { ColumnSelector, ColumnSnapshot, ColumnVariant, MatchingMode } from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveAllLabels,\n  deriveAllTooltips,\n  evaluateRules,\n  isColumnHidden,\n  isColumnOptional,\n  withHidenAxesAnnotations,\n  withLabelAnnotations,\n  withTableVisualAnnotations,\n  withInfoAnnotations,\n  withDataStatusAnnotations,\n} from \"./utils\";\nimport type { PrimaryEntry, SecondaryGroup } from \"./createPTableDefV3\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport { discoverTableColumnSnaphots, type DiscoverTableColumnOptions } from \"./discoverColumns\";\nimport { isNil, isPlainObject, throwError, type Nil } from \"@milaboratories/helpers\";\nimport { flow } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = {\n  tableState?: PlDataTableStateV2;\n\n  columns: Nil | DiscoverTableColumnOptions | TableColumnVariant[];\n  filters?: PlDataTableFilters;\n  sorting?: PTableSorting[];\n  primaryJoinType?: \"inner\" | \"full\";\n\n  labelsOptions?: DeriveLabelsOptions;\n  displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnSource. */\nexport type ColumnsSelectorConfig = {\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  exclude?: MultiColumnSelector | MultiColumnSelector[];\n  mode?: MatchingMode;\n  maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n  /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n  ordering?: ColumnOrderRule[];\n  /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n  visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n  match: ColumnMatcher | ColumnSelector;\n  /** Higher number = further left in table */\n  priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n  match: ColumnMatcher | ColumnSelector;\n  visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport type ColumnMatcher = (spec: PColumnSpec) => boolean;\n\nexport function createPlDataTableV3<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n  const state = upgradePlDataTableStateV2(options.tableState);\n  const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n  const discovered = isPlainObject(options.columns)\n    ? discoverTableColumnSnaphots(ctx, options.columns)\n    : options.columns;\n  if (isNil(discovered) || discovered.length === 0) return undefined;\n\n  const splited = splitDiscoveredColumns(discovered);\n\n  const derivedLabels = deriveAllLabels({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n    deriveLabelsOptions: {\n      includeNativeLabel: true,\n      ...options.labelsOptions,\n    },\n  });\n\n  const derivedTooltips = deriveAllTooltips({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      originalId: dc.originalId,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n  });\n\n  const annotated = annotateColumnGroups({\n    pframeSpec,\n    ...splited,\n    derivedLabels,\n    derivedTooltips,\n    displayOptions: options.displayOptions,\n  });\n\n  const primarySnapshots = annotated.direct.filter((c) => c.isPrimary);\n  const secondarySnapshots = annotated.direct.filter((c) => !c.isPrimary);\n\n  if (primarySnapshots.length === 0) return undefined;\n\n  const columnIsAvailable = createColumnValidationById([\n    ...annotated.direct.map((v) => v.column),\n    ...annotated.linked.flatMap((lc) => [...lc.path.map((s) => s.linker), lc.column]),\n  ]);\n\n  const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);\n  const filters = filterFilters(\n    concatFilters(\n      state.pTableParams.filters,\n      state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n    ),\n    columnIsAvailable,\n  );\n\n  const sorting = filterSorting(\n    resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered)),\n    columnIsAvailable,\n  );\n\n  const primaryEntries: PrimaryEntry<undefined | PColumnDataUniversal>[] = primarySnapshots.map(\n    (v) => ({ column: resolveSnapshot(v.column) }),\n  );\n  const secondaryGroups: SecondaryGroup<undefined | PColumnDataUniversal>[] = buildSecondaryGroups(\n    secondarySnapshots,\n    annotated.linked,\n  );\n  const fullDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: secondaryGroups,\n    filters,\n    sorting,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  // TODO: is workaround for dropdown suggestions.\n  // Pframe have not equivalent data for columns relativly to Ptable\n  const pframeHandle = ctx.createPFrame([\n    ...annotated.direct.map((v) => resolveSnapshot(v.column)),\n    ...annotated.linked.map((v) => resolveSnapshot(v.column)),\n    ...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot),\n  ]);\n\n  const hiddenSpecs = state.pTableParams.hiddenColIds;\n  const hiddenColumnIds = computeHiddenColumns(\n    [...annotated.direct, ...annotated.linked].map((v) => v.column),\n    sorting,\n    filters,\n    hiddenSpecs,\n  );\n\n  const visible = buildVisibleColumns(annotated, hiddenColumnIds);\n  const visibleDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: buildSecondaryGroups(\n      visible.direct.filter((c) => !c.isPrimary),\n      visible.linked,\n    ),\n    filters,\n    sorting,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  return {\n    sourceId: state.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n    defaultFilters: remapedDefaultFilters,\n  } satisfies PlDataTableModel;\n}\n\nexport type TableColumnVariant = ColumnVariant<DiscoveredPColumnId> & {\n  readonly originalId: PObjectId;\n  readonly isPrimary?: boolean;\n};\n\ntype SplitDiscoveredColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype AnnotatedColumnGroups = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype VisibleColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\n/** Split discovered columns into direct (no linker path) and linked (with linker path). */\nfunction splitDiscoveredColumns(columns: TableColumnVariant[]): SplitDiscoveredColumns {\n  const direct = columns.filter((dc) => dc.path.length === 0);\n  const linked = columns.filter((dc) => dc.path.length > 0);\n  return { direct, linked };\n}\n\n/** All linker snapshots across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: TableColumnVariant[]): ColumnSnapshot<PObjectId>[] {\n  return uniqueBy(\n    linked.flatMap((lc) => lc.path.map((s) => s.linker)),\n    (c) => c.id,\n  );\n}\n\n/**\n * Annotate all column groups with derived labels and display-rule annotations.\n * Evaluates `displayOptions` rules against all discovered columns (direct,\n * linked, labels, linkers) and writes the winning visibility/priority into\n * column annotations via `withTableVisualAnnotations`.\n */\nfunction annotateColumnGroups(params: {\n  direct: TableColumnVariant[];\n  linked: TableColumnVariant[];\n  derivedLabels: Record<string, string>;\n  derivedTooltips: Record<string, string>;\n  displayOptions?: ColumnsDisplayOptions;\n  pframeSpec: PFrameSpecDriver;\n}): AnnotatedColumnGroups {\n  const { direct, linked, derivedLabels, derivedTooltips, displayOptions, pframeSpec } = params;\n\n  const allColumnsForRules = [\n    ...direct.map((v) => v.column),\n    ...linked.map((v) => v.column),\n    ...collectLinkerSnapshots(linked),\n  ];\n  const visibilityByColId = evaluateRules(\n    displayOptions?.visibility ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n  const orderByColId = evaluateRules(\n    displayOptions?.ordering ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n\n  const directAnnotated = liftToVariantColumns(\n    direct,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  );\n\n  const linkedAnnotated = liftToVariantColumns(\n    linked,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withHidenAxesAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  ).map((lc) => ({ ...lc, path: annotateLinkerPath(derivedLabels, lc.path) }));\n\n  return {\n    direct: directAnnotated,\n    linked: linkedAnnotated,\n  };\n}\n\n/** Lift a snapshot-array transform so it runs on the inner `column` of each variant. */\nfunction liftToVariantColumns<V extends { readonly column: ColumnSnapshot<DiscoveredPColumnId> }>(\n  variants: V[],\n  fn: (cols: ColumnSnapshot<DiscoveredPColumnId>[]) => ColumnSnapshot<DiscoveredPColumnId>[],\n): V[] {\n  const cols = fn(variants.map((v) => v.column));\n  if (cols.length !== variants.length)\n    throw new Error(\n      `liftToVariantColumns: fn must preserve array length (got ${cols.length}, expected ${variants.length})`,\n    );\n  return variants.map((v, i) => ({ ...v, column: cols[i] }));\n}\n\nfunction annotateLinkerPath(\n  derivedLabels: Record<string, string>,\n  path: TableColumnVariant[\"path\"],\n): TableColumnVariant[\"path\"] {\n  if (path.length === 0) return path;\n  const annotatedLinkers = withHidenAxesAnnotations(\n    withLabelAnnotations(\n      derivedLabels,\n      path.map((s) => s.linker),\n    ),\n  );\n  return path.map((s, i) => ({ ...s, linker: annotatedLinkers[i] }));\n}\n\n/** Build an index of all valid column IDs (axes + columns) for filter/sorting validation. */\nfunction createColumnValidationById(\n  fullColumns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n) {\n  const axisIds = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map(getAxisId)),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n\n  const allIds: PTableColumnId[] = [\n    ...axisIds.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n\n  const validIdSet = new Set(allIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n\n  return (id: string): boolean => {\n    return validIdSet.has(id as CanonicalizedJson<PTableColumnId>);\n  };\n}\n\n/** Drop filter leaves whose column references are not available in the table. */\nfunction filterFilters(\n  filters: Nil | PlDataTableFilters,\n  isValidColumnId: (id: string) => boolean,\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const isLeafValid = (leaf: PlDataTableFilterSpecLeaf): boolean => {\n    if (leaf.type === undefined) return true;\n    if (\"column\" in leaf && !isValidColumnId(leaf.column)) return false;\n    if (\"rhs\" in leaf && !isValidColumnId(leaf.rhs)) return false;\n    return true;\n  };\n\n  const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n    if (node.type === \"and\" || node.type === \"or\") {\n      const kept = node.filters\n        .map((f) => prune(f))\n        .filter((f): f is PlDataTableFilterNode => !isNil(f));\n      return { type: node.type, filters: kept };\n    }\n    if (node.type === \"not\") {\n      const inner = prune(node.filter);\n      return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n    }\n    return isLeafValid(node) ? node : undefined;\n  };\n\n  return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */\nfunction concatFilters(\n  a: Nil | PlDataTableFilters,\n  b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n  if (isNil(a)) return b;\n  if (isNil(b)) return a;\n  return { ...a, filters: [...a.filters, ...b.filters] };\n}\n\n/** Pick user sorting from state if non-empty, otherwise fall back to options default. */\nfunction resolveSorting(\n  userSorting: PTableSorting[],\n  defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n  return (isEmpty(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Drop sorting entries whose column is not available in the table. */\nfunction filterSorting(\n  sorting: PTableSorting[],\n  isValidColumnId: (id: string) => boolean,\n): PTableSorting[] {\n  return sorting.filter((s) => isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)));\n}\n\nfunction buildSecondaryGroups(\n  direct: TableColumnVariant[],\n  linked: TableColumnVariant[],\n): SecondaryGroup<undefined | PColumnDataUniversal>[] {\n  return [\n    ...direct.map(\n      (c): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [{ column: resolveSnapshot(c.column), qualifications: c.qualifications.forHit }],\n        primaryQualifications: c.qualifications.forQueries,\n      }),\n    ),\n    ...linked.map(\n      (lc): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [\n          {\n            column: resolveSnapshot(lc.column),\n            qualifications: lc.qualifications.forHit,\n            linkers: lc.path.map((s) => resolveSnapshot(s.linker)),\n          },\n        ],\n        primaryQualifications: lc.qualifications.forQueries,\n      }),\n    ),\n  ];\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults. */\nfunction computeHiddenColumns(\n  columns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n  hiddenSpecs: Nil | PTableColumnId[],\n): Set<PObjectId> {\n  const alwaysHidden = columns.filter((c) => isColumnHidden(c.spec)).map((c) => c.id);\n  const optionalHidden = !isNil(hiddenSpecs)\n    ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n    : columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n  const initial = [...alwaysHidden, ...optionalHidden];\n  const preserved = collectPreservedColumnIds(sorting, filters);\n\n  return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n): Set<PObjectId> {\n  const sortedIds = (sorting ?? [])\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .map((c) => c.id);\n\n  const filterIds = !isNil(filters)\n    ? collectFilterSpecColumns(filters).flatMap((c) => {\n        const obj = parseJson(c);\n        return obj.type === \"column\" ? [obj.id] : [];\n      })\n    : [];\n\n  return new Set<PObjectId>([...sortedIds, ...filterIds]);\n}\n\n/** Filter annotated columns to only visible ones, re-matching label columns for the visible subset. */\nfunction buildVisibleColumns(\n  annotated: AnnotatedColumnGroups,\n  hiddenColumns: Set<PObjectId>,\n): VisibleColumns {\n  const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.column.id));\n  const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.column.id));\n  return { direct, linked };\n}\n\n/** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */\nfunction resolveSnapshot(\n  snap: ColumnSnapshot<PObjectId>,\n): PColumn<undefined | PColumnDataUniversal> {\n  return { id: snap.id, spec: snap.spec, data: snap.data?.get() };\n}\n\n/** Remap column references in sorting entries. */\nfunction remapSortingColumnIds(\n  sorting: Nil | PTableSorting[],\n  columns: TableColumnVariant[],\n): Nil | PTableSorting[] {\n  return sorting?.flatMap((s) => {\n    if (s.column.type === \"axis\") return [s]; // Axis references are unaffected by column ID remapping\n\n    const id = s.column.id;\n    const column = columns.find((c) => (c.originalId ?? c.column.id) === id);\n    if (column === undefined) return [];\n\n    return [\n      {\n        ...s,\n        column: {\n          type: \"column\" as const,\n          id: column.column.id,\n        },\n      },\n    ];\n  });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree. */\nfunction remapFilterColumnIds(\n  filters: Nil | PlDataTableFilters,\n  columns: TableColumnVariant[],\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const map = (\n    tableColumnId: CanonicalizedJson<PTableColumnId>,\n  ): CanonicalizedJson<PTableColumnId> => {\n    const parsed = parseJson<PTableColumnId>(tableColumnId);\n    if (parsed.type === \"axis\") return tableColumnId; // Axis references are unaffected by column ID remapping\n\n    const originalId = parsed.id;\n    const column =\n      columns.find((c) => (c.originalId ?? c.column.id) === originalId) ??\n      throwError(`Column ID \"${parsed.id}\" in filters does not match any discovered column`);\n\n    return canonicalizeJson<PTableColumnId>({\n      type: \"column\",\n      id: column.column.id,\n    });\n  };\n\n  return traverseFilterSpec(filters, {\n    leaf: (leaf): PlDataTableFilterNode => {\n      if (leaf.type === undefined) return leaf;\n      const result = { ...leaf };\n      if (\"column\" in result) result.column = map(result.column);\n      if (\"rhs\" in result) result.rhs = map(result.rhs);\n      return result;\n    },\n    and: (results): PlDataTableFilterNode => ({ type: \"and\", filters: results }),\n    or: (results): PlDataTableFilterNode => ({ type: \"or\", filters: results }),\n    not: (result): PlDataTableFilterNode => ({ type: \"not\", filter: result }),\n  }) as PlDataTableFilters;\n}\n"],"mappings":";;;;;;;;;;;AAkFA,SAAgB,oBACd,KACA,SAC8B;CAC9B,MAAM,aAAa,IAAI,WAAW,aAAa;CAC/C,MAAM,QAAQA,wBAAAA,0BAA0B,QAAQ,WAAW;CAC3D,MAAM,kBAAkB,QAAQ,mBAAmB;CAEnD,MAAM,cAAA,GAAA,wBAAA,eAA2B,QAAQ,QAAQ,GAC7CC,wBAAAA,4BAA4B,KAAK,QAAQ,QAAQ,GACjD,QAAQ;AACZ,MAAA,GAAA,wBAAA,OAAU,WAAW,IAAI,WAAW,WAAW,EAAG,QAAO,KAAA;CAEzD,MAAM,UAAU,uBAAuB,WAAW;CAElD,MAAM,gBAAgBC,cAAAA,gBAAgB;EACpC,SAAS,WAAW,KAAK,QAAQ;GAC/B,IAAI,GAAG,OAAO;GACd,MAAM,GAAG,OAAO;GAChB,YAAY,GAAG;GACf,gBAAgB,GAAG;GACpB,EAAE;EACH,qBAAqB;GACnB,oBAAoB;GACpB,GAAG,QAAQ;GACZ;EACF,CAAC;CAEF,MAAM,kBAAkBC,cAAAA,kBAAkB,EACxC,SAAS,WAAW,KAAK,QAAQ;EAC/B,IAAI,GAAG,OAAO;EACd,YAAY,GAAG;EACf,MAAM,GAAG,OAAO;EAChB,YAAY,GAAG;EACf,gBAAgB,GAAG;EACpB,EAAE,EACJ,CAAC;CAEF,MAAM,YAAY,qBAAqB;EACrC;EACA,GAAG;EACH;EACA;EACA,gBAAgB,QAAQ;EACzB,CAAC;CAEF,MAAM,mBAAmB,UAAU,OAAO,QAAQ,MAAM,EAAE,UAAU;CACpE,MAAM,qBAAqB,UAAU,OAAO,QAAQ,MAAM,CAAC,EAAE,UAAU;AAEvE,KAAI,iBAAiB,WAAW,EAAG,QAAO,KAAA;CAE1C,MAAM,oBAAoB,2BAA2B,CACnD,GAAG,UAAU,OAAO,KAAK,MAAM,EAAE,OAAO,EACxC,GAAG,UAAU,OAAO,SAAS,OAAO,CAAC,GAAG,GAAG,KAAK,KAAK,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAClF,CAAC;CAEF,MAAM,wBAAwB,qBAAqB,QAAQ,SAAS,WAAW;CAC/E,MAAM,UAAU,cACd,cACE,MAAM,aAAa,SACnB,MAAM,aAAa,kBAAkB,sBACtC,EACD,kBACD;CAED,MAAM,UAAU,cACd,eAAe,MAAM,aAAa,SAAS,sBAAsB,QAAQ,SAAS,WAAW,CAAC,EAC9F,kBACD;CAED,MAAM,iBAAmE,iBAAiB,KACvF,OAAO,EAAE,QAAQ,gBAAgB,EAAE,OAAO,EAAE,EAC9C;CAKD,MAAM,UAAUC,0BAAAA,kBAAkB;EAChC;EACA,SAAS;EACT,WAP0E,qBAC1E,oBACA,UAAU,OACX;EAKC;EACA;EACD,CAAC;CAEF,MAAM,aAAa,IAAI,eAAe,QAAQ;CAG9C,MAAM,eAAe,IAAI,aAAa;EACpC,GAAG,UAAU,OAAO,KAAK,MAAM,gBAAgB,EAAE,OAAO,CAAC;EACzD,GAAG,UAAU,OAAO,KAAK,MAAM,gBAAgB,EAAE,OAAO,CAAC;EACzD,GAAG,uBAAuB,UAAU,OAAO,CAAC,IAAI,gBAAgB;EACjE,CAAC;CAEF,MAAM,cAAc,MAAM,aAAa;CAQvC,MAAM,UAAU,oBAAoB,WAPZ,qBACtB,CAAC,GAAG,UAAU,QAAQ,GAAG,UAAU,OAAO,CAAC,KAAK,MAAM,EAAE,OAAO,EAC/D,SACA,SACA,YACD,CAE8D;CAC/D,MAAM,aAAaA,0BAAAA,kBAAkB;EACnC;EACA,SAAS;EACT,WAAW,qBACT,QAAQ,OAAO,QAAQ,MAAM,CAAC,EAAE,UAAU,EAC1C,QAAQ,OACT;EACD;EACA;EACD,CAAC;CACF,MAAM,gBAAgB,IAAI,eAAe,WAAW;AAEpD,QAAO;EACL,UAAU,MAAM,aAAa;EAC7B,iBAAiB;EACjB,kBAAkB;EAClB,oBAAoB;EACpB,gBAAgB;EACjB;;;AAwBH,SAAS,uBAAuB,SAAuD;AAGrF,QAAO;EAAE,QAFM,QAAQ,QAAQ,OAAO,GAAG,KAAK,WAAW,EAAE;EAE1C,QADF,QAAQ,QAAQ,OAAO,GAAG,KAAK,SAAS,EAAE;EAChC;;;AAI3B,SAAS,uBAAuB,QAA2D;AACzF,SAAA,GAAA,gCAAA,UACE,OAAO,SAAS,OAAO,GAAG,KAAK,KAAK,MAAM,EAAE,OAAO,CAAC,GACnD,MAAM,EAAE,GACV;;;;;;;;AASH,SAAS,qBAAqB,QAOJ;CACxB,MAAM,EAAE,QAAQ,QAAQ,eAAe,iBAAiB,gBAAgB,eAAe;CAEvF,MAAM,qBAAqB;EACzB,GAAG,OAAO,KAAK,MAAM,EAAE,OAAO;EAC9B,GAAG,OAAO,KAAK,MAAM,EAAE,OAAO;EAC9B,GAAG,uBAAuB,OAAO;EAClC;CACD,MAAM,oBAAoBC,cAAAA,cACxB,gBAAgB,cAAc,EAAE,EAChC,oBACA,WACD;CACD,MAAM,eAAeA,cAAAA,cACnB,gBAAgB,YAAY,EAAE,EAC9B,oBACA,WACD;AAuBD,QAAO;EACL,QAtBsB,qBACtB,SAAA,GAAA,WAAA,OAEG,SAASC,cAAAA,0BAA0B,KAAK,GACxC,SAASC,cAAAA,qBAAqB,eAAe,KAAK,GAClD,SAASC,cAAAA,oBAAoB,iBAAiB,KAAK,GACnD,SAASC,cAAAA,2BAA2B,mBAAmB,cAAc,KAAK,CAC5E,CACF;EAeC,QAbsB,qBACtB,SAAA,GAAA,WAAA,OAEG,SAASH,cAAAA,0BAA0B,KAAK,GACxC,SAASI,cAAAA,yBAAyB,KAAK,GACvC,SAASH,cAAAA,qBAAqB,eAAe,KAAK,GAClD,SAASC,cAAAA,oBAAoB,iBAAiB,KAAK,GACnD,SAASC,cAAAA,2BAA2B,mBAAmB,cAAc,KAAK,CAC5E,CACF,CAAC,KAAK,QAAQ;GAAE,GAAG;GAAI,MAAM,mBAAmB,eAAe,GAAG,KAAK;GAAE,EAAE;EAK3E;;;AAIH,SAAS,qBACP,UACA,IACK;CACL,MAAM,OAAO,GAAG,SAAS,KAAK,MAAM,EAAE,OAAO,CAAC;AAC9C,KAAI,KAAK,WAAW,SAAS,OAC3B,OAAM,IAAI,MACR,4DAA4D,KAAK,OAAO,aAAa,SAAS,OAAO,GACtG;AACH,QAAO,SAAS,KAAK,GAAG,OAAO;EAAE,GAAG;EAAG,QAAQ,KAAK;EAAI,EAAE;;AAG5D,SAAS,mBACP,eACA,MAC4B;AAC5B,KAAI,KAAK,WAAW,EAAG,QAAO;CAC9B,MAAM,mBAAmBC,cAAAA,yBACvBH,cAAAA,qBACE,eACA,KAAK,KAAK,MAAM,EAAE,OAAO,CAC1B,CACF;AACD,QAAO,KAAK,KAAK,GAAG,OAAO;EAAE,GAAG;EAAG,QAAQ,iBAAiB;EAAI,EAAE;;;AAIpE,SAAS,2BACP,aACA;CAMA,MAAM,SAA2B,CAC/B,IAAA,GAAA,gCAAA,UALA,YAAY,SAAS,MAAM,EAAE,KAAK,SAAS,IAAII,gCAAAA,UAAU,CAAC,GACzD,OAAA,GAAA,gCAAA,kBAA+B,EAAE,CACnC,CAGY,KAAK,OAAO;EAAE,MAAM;EAAQ,IAAI;EAAG,EAA+B,EAC7E,GAAG,YAAY,KAAK,OAAO;EAAE,MAAM;EAAU,IAAI,EAAE;EAAI,EAAiC,CACzF;CAED,MAAM,aAAa,IAAI,IAAI,OAAO,KAAK,OAAA,GAAA,gCAAA,kBAAuC,EAAE,CAAC,CAAC;AAElF,SAAQ,OAAwB;AAC9B,SAAO,WAAW,IAAI,GAAwC;;;;AAKlE,SAAS,cACP,SACA,iBAC0B;AAC1B,MAAA,GAAA,wBAAA,OAAU,QAAQ,CAAE,QAAO;CAE3B,MAAM,eAAe,SAA6C;AAChE,MAAI,KAAK,SAAS,KAAA,EAAW,QAAO;AACpC,MAAI,YAAY,QAAQ,CAAC,gBAAgB,KAAK,OAAO,CAAE,QAAO;AAC9D,MAAI,SAAS,QAAQ,CAAC,gBAAgB,KAAK,IAAI,CAAE,QAAO;AACxD,SAAO;;CAGT,MAAM,SAAS,SAA6D;AAC1E,MAAI,KAAK,SAAS,SAAS,KAAK,SAAS,MAAM;GAC7C,MAAM,OAAO,KAAK,QACf,KAAK,MAAM,MAAM,EAAE,CAAC,CACpB,QAAQ,MAAkC,EAAA,GAAA,wBAAA,OAAO,EAAE,CAAC;AACvD,UAAO;IAAE,MAAM,KAAK;IAAM,SAAS;IAAM;;AAE3C,MAAI,KAAK,SAAS,OAAO;GACvB,MAAM,QAAQ,MAAM,KAAK,OAAO;AAChC,WAAA,GAAA,wBAAA,OAAa,MAAM,GAAG,KAAA,IAAY;IAAE,MAAM;IAAO,QAAQ;IAAO;;AAElE,SAAO,YAAY,KAAK,GAAG,OAAO,KAAA;;AAGpC,QAAO,MAAM,QAAQ;;;AAIvB,SAAS,cACP,GACA,GAC0B;AAC1B,MAAA,GAAA,wBAAA,OAAU,EAAE,CAAE,QAAO;AACrB,MAAA,GAAA,wBAAA,OAAU,EAAE,CAAE,QAAO;AACrB,QAAO;EAAE,GAAG;EAAG,SAAS,CAAC,GAAG,EAAE,SAAS,GAAG,EAAE,QAAQ;EAAE;;;AAIxD,SAAS,eACP,aACA,gBACiB;AACjB,UAAA,GAAA,kBAAA,SAAgB,YAAY,GAAG,iBAAiB,gBAAgB,EAAE;;;AAIpE,SAAS,cACP,SACA,iBACiB;AACjB,QAAO,QAAQ,QAAQ,MAAM,iBAAA,GAAA,gCAAA,kBAAiD,EAAE,OAAO,CAAC,CAAC;;AAG3F,SAAS,qBACP,QACA,QACoD;AACpD,QAAO,CACL,GAAG,OAAO,KACP,OAAyD;EACxD,SAAS,CAAC;GAAE,QAAQ,gBAAgB,EAAE,OAAO;GAAE,gBAAgB,EAAE,eAAe;GAAQ,CAAC;EACzF,uBAAuB,EAAE,eAAe;EACzC,EACF,EACD,GAAG,OAAO,KACP,QAA0D;EACzD,SAAS,CACP;GACE,QAAQ,gBAAgB,GAAG,OAAO;GAClC,gBAAgB,GAAG,eAAe;GAClC,SAAS,GAAG,KAAK,KAAK,MAAM,gBAAgB,EAAE,OAAO,CAAC;GACvD,CACF;EACD,uBAAuB,GAAG,eAAe;EAC1C,EACF,CACF;;;AAIH,SAAS,qBACP,SACA,SACA,SACA,aACgB;CAChB,MAAM,eAAe,QAAQ,QAAQ,MAAMC,cAAAA,eAAe,EAAE,KAAK,CAAC,CAAC,KAAK,MAAM,EAAE,GAAG;CACnF,MAAM,iBAAiB,EAAA,GAAA,wBAAA,OAAO,YAAY,GACtC,YAAY,QAAQ,MAAiC,EAAE,SAAS,SAAS,CAAC,KAAK,MAAM,EAAE,GAAG,GAC1F,QAAQ,QAAQ,MAAMC,cAAAA,iBAAiB,EAAE,KAAK,CAAC,CAAC,KAAK,MAAM,EAAE,GAAG;CACpE,MAAM,UAAU,CAAC,GAAG,cAAc,GAAG,eAAe;CACpD,MAAM,YAAY,0BAA0B,SAAS,QAAQ;AAE7D,QAAO,IAAI,IAAI,QAAQ,QAAQ,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;;;AAI5D,SAAS,0BACP,SACA,SACgB;CAChB,MAAM,aAAa,WAAW,EAAE,EAC7B,KAAK,MAAM,EAAE,OAAO,CACpB,QAAQ,MAAiC,EAAE,SAAS,SAAS,CAC7D,KAAK,MAAM,EAAE,GAAG;CAEnB,MAAM,YAAY,EAAA,GAAA,wBAAA,OAAO,QAAQ,GAC7BC,iBAAAA,yBAAyB,QAAQ,CAAC,SAAS,MAAM;EAC/C,MAAM,OAAA,GAAA,gCAAA,WAAgB,EAAE;AACxB,SAAO,IAAI,SAAS,WAAW,CAAC,IAAI,GAAG,GAAG,EAAE;GAC5C,GACF,EAAE;AAEN,QAAO,IAAI,IAAe,CAAC,GAAG,WAAW,GAAG,UAAU,CAAC;;;AAIzD,SAAS,oBACP,WACA,eACgB;AAGhB,QAAO;EAAE,QAFM,UAAU,OAAO,QAAQ,MAAM,CAAC,cAAc,IAAI,EAAE,OAAO,GAAG,CAAC;EAE7D,QADF,UAAU,OAAO,QAAQ,MAAM,CAAC,cAAc,IAAI,EAAE,OAAO,GAAG,CAAC;EACrD;;;AAI3B,SAAS,gBACP,MAC2C;AAC3C,QAAO;EAAE,IAAI,KAAK;EAAI,MAAM,KAAK;EAAM,MAAM,KAAK,MAAM,KAAK;EAAE;;;AAIjE,SAAS,sBACP,SACA,SACuB;AACvB,QAAO,SAAS,SAAS,MAAM;AAC7B,MAAI,EAAE,OAAO,SAAS,OAAQ,QAAO,CAAC,EAAE;EAExC,MAAM,KAAK,EAAE,OAAO;EACpB,MAAM,SAAS,QAAQ,MAAM,OAAO,EAAE,cAAc,EAAE,OAAO,QAAQ,GAAG;AACxE,MAAI,WAAW,KAAA,EAAW,QAAO,EAAE;AAEnC,SAAO,CACL;GACE,GAAG;GACH,QAAQ;IACN,MAAM;IACN,IAAI,OAAO,OAAO;IACnB;GACF,CACF;GACD;;;AAMJ,SAAS,qBACP,SACA,SAC0B;AAC1B,MAAA,GAAA,wBAAA,OAAU,QAAQ,CAAE,QAAO;CAE3B,MAAM,OACJ,kBACsC;EACtC,MAAM,UAAA,GAAA,gCAAA,WAAmC,cAAc;AACvD,MAAI,OAAO,SAAS,OAAQ,QAAO;EAEnC,MAAM,aAAa,OAAO;AAK1B,UAAA,GAAA,gCAAA,kBAAwC;GACtC,MAAM;GACN,KALA,QAAQ,MAAM,OAAO,EAAE,cAAc,EAAE,OAAO,QAAQ,WAAW,KAAA,GAAA,wBAAA,YACtD,cAAc,OAAO,GAAG,mDAAmD,EAI3E,OAAO;GACnB,CAAC;;AAGJ,QAAOC,iBAAAA,mBAAmB,SAAS;EACjC,OAAO,SAAgC;AACrC,OAAI,KAAK,SAAS,KAAA,EAAW,QAAO;GACpC,MAAM,SAAS,EAAE,GAAG,MAAM;AAC1B,OAAI,YAAY,OAAQ,QAAO,SAAS,IAAI,OAAO,OAAO;AAC1D,OAAI,SAAS,OAAQ,QAAO,MAAM,IAAI,OAAO,IAAI;AACjD,UAAO;;EAET,MAAM,aAAoC;GAAE,MAAM;GAAO,SAAS;GAAS;EAC3E,KAAK,aAAoC;GAAE,MAAM;GAAM,SAAS;GAAS;EACzE,MAAM,YAAmC;GAAE,MAAM;GAAO,QAAQ;GAAQ;EACzE,CAAC"}

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.js

@@ -198,9 +198,10 @@ function buildSecondaryGroups(direct, linked) {
 		}],
 		primaryQualifications: c.qualifications.forQueries
 	})), ...linked.map((lc) => ({
-		entries: [...lc.path.map((s) => ({ column: resolveSnapshot(s.linker) })), {
+		entries: [{
 			column: resolveSnapshot(lc.column),
-			qualifications: lc.qualifications.forHit
+			qualifications: lc.qualifications.forHit,
+			linkers: lc.path.map((s) => resolveSnapshot(s.linker))
 		}],
 		primaryQualifications: lc.qualifications.forQueries
 	}))];

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPlDataTableV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  FilterSpecNode,\n  PColumn,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableSorting,\n  PColumnSpec,\n  MultiColumnSelector,\n  PFrameSpecDriver,\n  DiscoveredPColumnId,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson, getAxisId, parseJson, uniqueBy } from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns, traverseFilterSpec } from \"../../../filters/traverse\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../../../render\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport type { PlDataTableFilters, PlDataTableFilterSpecLeaf, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { ColumnSelector, ColumnSnapshot, ColumnVariant, MatchingMode } from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveAllLabels,\n  deriveAllTooltips,\n  evaluateRules,\n  isColumnHidden,\n  isColumnOptional,\n  withHidenAxesAnnotations,\n  withLabelAnnotations,\n  withTableVisualAnnotations,\n  withInfoAnnotations,\n  withDataStatusAnnotations,\n} from \"./utils\";\nimport type { PrimaryEntry, SecondaryGroup } from \"./createPTableDefV3\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport { discoverTableColumnSnaphots, type DiscoverTableColumnOptions } from \"./discoverColumns\";\nimport { isNil, isPlainObject, throwError, type Nil } from \"@milaboratories/helpers\";\nimport { flow } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = {\n  tableState?: PlDataTableStateV2;\n\n  columns: Nil | DiscoverTableColumnOptions | TableColumnVariant[];\n  filters?: PlDataTableFilters;\n  sorting?: PTableSorting[];\n  primaryJoinType?: \"inner\" | \"full\";\n\n  labelsOptions?: DeriveLabelsOptions;\n  displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnSource. */\nexport type ColumnsSelectorConfig = {\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  exclude?: MultiColumnSelector | MultiColumnSelector[];\n  mode?: MatchingMode;\n  maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n  /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n  ordering?: ColumnOrderRule[];\n  /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n  visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n  match: ColumnMatcher | ColumnSelector;\n  /** Higher number = further left in table */\n  priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n  match: ColumnMatcher | ColumnSelector;\n  visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport type ColumnMatcher = (spec: PColumnSpec) => boolean;\n\nexport function createPlDataTableV3<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n  const state = upgradePlDataTableStateV2(options.tableState);\n  const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n  const discovered = isPlainObject(options.columns)\n    ? discoverTableColumnSnaphots(ctx, options.columns)\n    : options.columns;\n  if (isNil(discovered) || discovered.length === 0) return undefined;\n\n  const splited = splitDiscoveredColumns(discovered);\n\n  const derivedLabels = deriveAllLabels({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n    deriveLabelsOptions: {\n      includeNativeLabel: true,\n      ...options.labelsOptions,\n    },\n  });\n\n  const derivedTooltips = deriveAllTooltips({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      originalId: dc.originalId,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n  });\n\n  const annotated = annotateColumnGroups({\n    pframeSpec,\n    ...splited,\n    derivedLabels,\n    derivedTooltips,\n    displayOptions: options.displayOptions,\n  });\n\n  const primarySnapshots = annotated.direct.filter((c) => c.isPrimary);\n  const secondarySnapshots = annotated.direct.filter((c) => !c.isPrimary);\n\n  if (primarySnapshots.length === 0) return undefined;\n\n  const columnIsAvailable = createColumnValidationById([\n    ...annotated.direct.map((v) => v.column),\n    ...annotated.linked.flatMap((lc) => [...lc.path.map((s) => s.linker), lc.column]),\n  ]);\n\n  const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);\n  const filters = filterFilters(\n    concatFilters(\n      state.pTableParams.filters,\n      state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n    ),\n    columnIsAvailable,\n  );\n\n  const sorting = filterSorting(\n    resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered)),\n    columnIsAvailable,\n  );\n\n  const primaryEntries: PrimaryEntry<undefined | PColumnDataUniversal>[] = primarySnapshots.map(\n    (v) => ({ column: resolveSnapshot(v.column) }),\n  );\n  const secondaryGroups: SecondaryGroup<undefined | PColumnDataUniversal>[] = buildSecondaryGroups(\n    secondarySnapshots,\n    annotated.linked,\n  );\n  const fullDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: secondaryGroups,\n    filters,\n    sorting,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  // TODO: is workaround for dropdown suggestions.\n  // Pframe have not equivalent data for columns relativly to Ptable\n  const pframeHandle = ctx.createPFrame([\n    ...annotated.direct.map((v) => resolveSnapshot(v.column)),\n    ...annotated.linked.map((v) => resolveSnapshot(v.column)),\n    ...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot),\n  ]);\n\n  const hiddenSpecs = state.pTableParams.hiddenColIds;\n  const hiddenColumnIds = computeHiddenColumns(\n    [...annotated.direct, ...annotated.linked].map((v) => v.column),\n    sorting,\n    filters,\n    hiddenSpecs,\n  );\n\n  const visible = buildVisibleColumns(annotated, hiddenColumnIds);\n  const visibleDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: buildSecondaryGroups(\n      visible.direct.filter((c) => !c.isPrimary),\n      visible.linked,\n    ),\n    filters,\n    sorting,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  return {\n    sourceId: state.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n    defaultFilters: remapedDefaultFilters,\n  } satisfies PlDataTableModel;\n}\n\nexport type TableColumnVariant = ColumnVariant<DiscoveredPColumnId> & {\n  readonly originalId: PObjectId;\n  readonly isPrimary?: boolean;\n};\n\ntype SplitDiscoveredColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype AnnotatedColumnGroups = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype VisibleColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\n/** Split discovered columns into direct (no linker path) and linked (with linker path). */\nfunction splitDiscoveredColumns(columns: TableColumnVariant[]): SplitDiscoveredColumns {\n  const direct = columns.filter((dc) => dc.path.length === 0);\n  const linked = columns.filter((dc) => dc.path.length > 0);\n  return { direct, linked };\n}\n\n/** All linker snapshots across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: TableColumnVariant[]): ColumnSnapshot<PObjectId>[] {\n  return uniqueBy(\n    linked.flatMap((lc) => lc.path.map((s) => s.linker)),\n    (c) => c.id,\n  );\n}\n\n/**\n * Annotate all column groups with derived labels and display-rule annotations.\n * Evaluates `displayOptions` rules against all discovered columns (direct,\n * linked, labels, linkers) and writes the winning visibility/priority into\n * column annotations via `withTableVisualAnnotations`.\n */\nfunction annotateColumnGroups(params: {\n  direct: TableColumnVariant[];\n  linked: TableColumnVariant[];\n  derivedLabels: Record<string, string>;\n  derivedTooltips: Record<string, string>;\n  displayOptions?: ColumnsDisplayOptions;\n  pframeSpec: PFrameSpecDriver;\n}): AnnotatedColumnGroups {\n  const { direct, linked, derivedLabels, derivedTooltips, displayOptions, pframeSpec } = params;\n\n  const allColumnsForRules = [\n    ...direct.map((v) => v.column),\n    ...linked.map((v) => v.column),\n    ...collectLinkerSnapshots(linked),\n  ];\n  const visibilityByColId = evaluateRules(\n    displayOptions?.visibility ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n  const orderByColId = evaluateRules(\n    displayOptions?.ordering ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n\n  const directAnnotated = liftToVariantColumns(\n    direct,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  );\n\n  const linkedAnnotated = liftToVariantColumns(\n    linked,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withHidenAxesAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  ).map((lc) => ({ ...lc, path: annotateLinkerPath(derivedLabels, lc.path) }));\n\n  return {\n    direct: directAnnotated,\n    linked: linkedAnnotated,\n  };\n}\n\n/** Lift a snapshot-array transform so it runs on the inner `column` of each variant. */\nfunction liftToVariantColumns<V extends { readonly column: ColumnSnapshot<DiscoveredPColumnId> }>(\n  variants: V[],\n  fn: (cols: ColumnSnapshot<DiscoveredPColumnId>[]) => ColumnSnapshot<DiscoveredPColumnId>[],\n): V[] {\n  const cols = fn(variants.map((v) => v.column));\n  if (cols.length !== variants.length)\n    throw new Error(\n      `liftToVariantColumns: fn must preserve array length (got ${cols.length}, expected ${variants.length})`,\n    );\n  return variants.map((v, i) => ({ ...v, column: cols[i] }));\n}\n\nfunction annotateLinkerPath(\n  derivedLabels: Record<string, string>,\n  path: TableColumnVariant[\"path\"],\n): TableColumnVariant[\"path\"] {\n  if (path.length === 0) return path;\n  const annotatedLinkers = withHidenAxesAnnotations(\n    withLabelAnnotations(\n      derivedLabels,\n      path.map((s) => s.linker),\n    ),\n  );\n  return path.map((s, i) => ({ ...s, linker: annotatedLinkers[i] }));\n}\n\n/** Build an index of all valid column IDs (axes + columns) for filter/sorting validation. */\nfunction createColumnValidationById(\n  fullColumns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n) {\n  const axisIds = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map(getAxisId)),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n\n  const allIds: PTableColumnId[] = [\n    ...axisIds.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n\n  const validIdSet = new Set(allIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n\n  return (id: string): boolean => {\n    return validIdSet.has(id as CanonicalizedJson<PTableColumnId>);\n  };\n}\n\n/** Drop filter leaves whose column references are not available in the table. */\nfunction filterFilters(\n  filters: Nil | PlDataTableFilters,\n  isValidColumnId: (id: string) => boolean,\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const isLeafValid = (leaf: PlDataTableFilterSpecLeaf): boolean => {\n    if (leaf.type === undefined) return true;\n    if (\"column\" in leaf && !isValidColumnId(leaf.column)) return false;\n    if (\"rhs\" in leaf && !isValidColumnId(leaf.rhs)) return false;\n    return true;\n  };\n\n  const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n    if (node.type === \"and\" || node.type === \"or\") {\n      const kept = node.filters\n        .map((f) => prune(f))\n        .filter((f): f is PlDataTableFilterNode => !isNil(f));\n      return { type: node.type, filters: kept };\n    }\n    if (node.type === \"not\") {\n      const inner = prune(node.filter);\n      return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n    }\n    return isLeafValid(node) ? node : undefined;\n  };\n\n  return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */\nfunction concatFilters(\n  a: Nil | PlDataTableFilters,\n  b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n  if (isNil(a)) return b;\n  if (isNil(b)) return a;\n  return { ...a, filters: [...a.filters, ...b.filters] };\n}\n\n/** Pick user sorting from state if non-empty, otherwise fall back to options default. */\nfunction resolveSorting(\n  userSorting: PTableSorting[],\n  defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n  return (isEmpty(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Drop sorting entries whose column is not available in the table. */\nfunction filterSorting(\n  sorting: PTableSorting[],\n  isValidColumnId: (id: string) => boolean,\n): PTableSorting[] {\n  return sorting.filter((s) => isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)));\n}\n\nfunction buildSecondaryGroups(\n  direct: TableColumnVariant[],\n  linked: TableColumnVariant[],\n): SecondaryGroup<undefined | PColumnDataUniversal>[] {\n  return [\n    ...direct.map(\n      (c): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [{ column: resolveSnapshot(c.column), qualifications: c.qualifications.forHit }],\n        primaryQualifications: c.qualifications.forQueries,\n      }),\n    ),\n    ...linked.map(\n      (lc): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [\n          ...lc.path.map((s) => ({\n            column: resolveSnapshot(s.linker),\n          })),\n          { column: resolveSnapshot(lc.column), qualifications: lc.qualifications.forHit },\n        ],\n        primaryQualifications: lc.qualifications.forQueries,\n      }),\n    ),\n  ];\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults. */\nfunction computeHiddenColumns(\n  columns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n  hiddenSpecs: Nil | PTableColumnId[],\n): Set<PObjectId> {\n  const alwaysHidden = columns.filter((c) => isColumnHidden(c.spec)).map((c) => c.id);\n  const optionalHidden = !isNil(hiddenSpecs)\n    ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n    : columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n  const initial = [...alwaysHidden, ...optionalHidden];\n  const preserved = collectPreservedColumnIds(sorting, filters);\n\n  return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n): Set<PObjectId> {\n  const sortedIds = (sorting ?? [])\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .map((c) => c.id);\n\n  const filterIds = !isNil(filters)\n    ? collectFilterSpecColumns(filters).flatMap((c) => {\n        const obj = parseJson(c);\n        return obj.type === \"column\" ? [obj.id] : [];\n      })\n    : [];\n\n  return new Set<PObjectId>([...sortedIds, ...filterIds]);\n}\n\n/** Filter annotated columns to only visible ones, re-matching label columns for the visible subset. */\nfunction buildVisibleColumns(\n  annotated: AnnotatedColumnGroups,\n  hiddenColumns: Set<PObjectId>,\n): VisibleColumns {\n  const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.column.id));\n  const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.column.id));\n  return { direct, linked };\n}\n\n/** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */\nfunction resolveSnapshot(\n  snap: ColumnSnapshot<PObjectId>,\n): PColumn<undefined | PColumnDataUniversal> {\n  return { id: snap.id, spec: snap.spec, data: snap.data?.get() };\n}\n\n/** Remap column references in sorting entries. */\nfunction remapSortingColumnIds(\n  sorting: Nil | PTableSorting[],\n  columns: TableColumnVariant[],\n): Nil | PTableSorting[] {\n  return sorting?.flatMap((s) => {\n    if (s.column.type === \"axis\") return [s]; // Axis references are unaffected by column ID remapping\n\n    const id = s.column.id;\n    const column = columns.find((c) => (c.originalId ?? c.column.id) === id);\n    if (column === undefined) return [];\n\n    return [\n      {\n        ...s,\n        column: {\n          type: \"column\" as const,\n          id: column.column.id,\n        },\n      },\n    ];\n  });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree. */\nfunction remapFilterColumnIds(\n  filters: Nil | PlDataTableFilters,\n  columns: TableColumnVariant[],\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const map = (\n    tableColumnId: CanonicalizedJson<PTableColumnId>,\n  ): CanonicalizedJson<PTableColumnId> => {\n    const parsed = parseJson<PTableColumnId>(tableColumnId);\n    if (parsed.type === \"axis\") return tableColumnId; // Axis references are unaffected by column ID remapping\n\n    const originalId = parsed.id;\n    const column =\n      columns.find((c) => (c.originalId ?? c.column.id) === originalId) ??\n      throwError(`Column ID \"${parsed.id}\" in filters does not match any discovered column`);\n\n    return canonicalizeJson<PTableColumnId>({\n      type: \"column\",\n      id: column.column.id,\n    });\n  };\n\n  return traverseFilterSpec(filters, {\n    leaf: (leaf): PlDataTableFilterNode => {\n      if (leaf.type === undefined) return leaf;\n      const result = { ...leaf };\n      if (\"column\" in result) result.column = map(result.column);\n      if (\"rhs\" in result) result.rhs = map(result.rhs);\n      return result;\n    },\n    and: (results): PlDataTableFilterNode => ({ type: \"and\", filters: results }),\n    or: (results): PlDataTableFilterNode => ({ type: \"or\", filters: results }),\n    not: (result): PlDataTableFilterNode => ({ type: \"not\", filter: result }),\n  }) as PlDataTableFilters;\n}\n"],"mappings":"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"}
+{"version":3,"file":"createPlDataTableV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  FilterSpecNode,\n  PColumn,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableSorting,\n  PColumnSpec,\n  MultiColumnSelector,\n  PFrameSpecDriver,\n  DiscoveredPColumnId,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson, getAxisId, parseJson, uniqueBy } from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns, traverseFilterSpec } from \"../../../filters/traverse\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../../../render\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport type { PlDataTableFilters, PlDataTableFilterSpecLeaf, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { ColumnSelector, ColumnSnapshot, ColumnVariant, MatchingMode } from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveAllLabels,\n  deriveAllTooltips,\n  evaluateRules,\n  isColumnHidden,\n  isColumnOptional,\n  withHidenAxesAnnotations,\n  withLabelAnnotations,\n  withTableVisualAnnotations,\n  withInfoAnnotations,\n  withDataStatusAnnotations,\n} from \"./utils\";\nimport type { PrimaryEntry, SecondaryGroup } from \"./createPTableDefV3\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport { discoverTableColumnSnaphots, type DiscoverTableColumnOptions } from \"./discoverColumns\";\nimport { isNil, isPlainObject, throwError, type Nil } from \"@milaboratories/helpers\";\nimport { flow } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = {\n  tableState?: PlDataTableStateV2;\n\n  columns: Nil | DiscoverTableColumnOptions | TableColumnVariant[];\n  filters?: PlDataTableFilters;\n  sorting?: PTableSorting[];\n  primaryJoinType?: \"inner\" | \"full\";\n\n  labelsOptions?: DeriveLabelsOptions;\n  displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnSource. */\nexport type ColumnsSelectorConfig = {\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  exclude?: MultiColumnSelector | MultiColumnSelector[];\n  mode?: MatchingMode;\n  maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n  /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n  ordering?: ColumnOrderRule[];\n  /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n  visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n  match: ColumnMatcher | ColumnSelector;\n  /** Higher number = further left in table */\n  priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n  match: ColumnMatcher | ColumnSelector;\n  visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport type ColumnMatcher = (spec: PColumnSpec) => boolean;\n\nexport function createPlDataTableV3<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n  const state = upgradePlDataTableStateV2(options.tableState);\n  const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n  const discovered = isPlainObject(options.columns)\n    ? discoverTableColumnSnaphots(ctx, options.columns)\n    : options.columns;\n  if (isNil(discovered) || discovered.length === 0) return undefined;\n\n  const splited = splitDiscoveredColumns(discovered);\n\n  const derivedLabels = deriveAllLabels({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n    deriveLabelsOptions: {\n      includeNativeLabel: true,\n      ...options.labelsOptions,\n    },\n  });\n\n  const derivedTooltips = deriveAllTooltips({\n    columns: discovered.map((dc) => ({\n      id: dc.column.id,\n      originalId: dc.originalId,\n      spec: dc.column.spec,\n      linkerPath: dc.path,\n      qualifications: dc.qualifications,\n    })),\n  });\n\n  const annotated = annotateColumnGroups({\n    pframeSpec,\n    ...splited,\n    derivedLabels,\n    derivedTooltips,\n    displayOptions: options.displayOptions,\n  });\n\n  const primarySnapshots = annotated.direct.filter((c) => c.isPrimary);\n  const secondarySnapshots = annotated.direct.filter((c) => !c.isPrimary);\n\n  if (primarySnapshots.length === 0) return undefined;\n\n  const columnIsAvailable = createColumnValidationById([\n    ...annotated.direct.map((v) => v.column),\n    ...annotated.linked.flatMap((lc) => [...lc.path.map((s) => s.linker), lc.column]),\n  ]);\n\n  const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);\n  const filters = filterFilters(\n    concatFilters(\n      state.pTableParams.filters,\n      state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n    ),\n    columnIsAvailable,\n  );\n\n  const sorting = filterSorting(\n    resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered)),\n    columnIsAvailable,\n  );\n\n  const primaryEntries: PrimaryEntry<undefined | PColumnDataUniversal>[] = primarySnapshots.map(\n    (v) => ({ column: resolveSnapshot(v.column) }),\n  );\n  const secondaryGroups: SecondaryGroup<undefined | PColumnDataUniversal>[] = buildSecondaryGroups(\n    secondarySnapshots,\n    annotated.linked,\n  );\n  const fullDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: secondaryGroups,\n    filters,\n    sorting,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  // TODO: is workaround for dropdown suggestions.\n  // Pframe have not equivalent data for columns relativly to Ptable\n  const pframeHandle = ctx.createPFrame([\n    ...annotated.direct.map((v) => resolveSnapshot(v.column)),\n    ...annotated.linked.map((v) => resolveSnapshot(v.column)),\n    ...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot),\n  ]);\n\n  const hiddenSpecs = state.pTableParams.hiddenColIds;\n  const hiddenColumnIds = computeHiddenColumns(\n    [...annotated.direct, ...annotated.linked].map((v) => v.column),\n    sorting,\n    filters,\n    hiddenSpecs,\n  );\n\n  const visible = buildVisibleColumns(annotated, hiddenColumnIds);\n  const visibleDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: buildSecondaryGroups(\n      visible.direct.filter((c) => !c.isPrimary),\n      visible.linked,\n    ),\n    filters,\n    sorting,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  return {\n    sourceId: state.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n    defaultFilters: remapedDefaultFilters,\n  } satisfies PlDataTableModel;\n}\n\nexport type TableColumnVariant = ColumnVariant<DiscoveredPColumnId> & {\n  readonly originalId: PObjectId;\n  readonly isPrimary?: boolean;\n};\n\ntype SplitDiscoveredColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype AnnotatedColumnGroups = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\ntype VisibleColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n};\n\n/** Split discovered columns into direct (no linker path) and linked (with linker path). */\nfunction splitDiscoveredColumns(columns: TableColumnVariant[]): SplitDiscoveredColumns {\n  const direct = columns.filter((dc) => dc.path.length === 0);\n  const linked = columns.filter((dc) => dc.path.length > 0);\n  return { direct, linked };\n}\n\n/** All linker snapshots across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: TableColumnVariant[]): ColumnSnapshot<PObjectId>[] {\n  return uniqueBy(\n    linked.flatMap((lc) => lc.path.map((s) => s.linker)),\n    (c) => c.id,\n  );\n}\n\n/**\n * Annotate all column groups with derived labels and display-rule annotations.\n * Evaluates `displayOptions` rules against all discovered columns (direct,\n * linked, labels, linkers) and writes the winning visibility/priority into\n * column annotations via `withTableVisualAnnotations`.\n */\nfunction annotateColumnGroups(params: {\n  direct: TableColumnVariant[];\n  linked: TableColumnVariant[];\n  derivedLabels: Record<string, string>;\n  derivedTooltips: Record<string, string>;\n  displayOptions?: ColumnsDisplayOptions;\n  pframeSpec: PFrameSpecDriver;\n}): AnnotatedColumnGroups {\n  const { direct, linked, derivedLabels, derivedTooltips, displayOptions, pframeSpec } = params;\n\n  const allColumnsForRules = [\n    ...direct.map((v) => v.column),\n    ...linked.map((v) => v.column),\n    ...collectLinkerSnapshots(linked),\n  ];\n  const visibilityByColId = evaluateRules(\n    displayOptions?.visibility ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n  const orderByColId = evaluateRules(\n    displayOptions?.ordering ?? [],\n    allColumnsForRules,\n    pframeSpec,\n  );\n\n  const directAnnotated = liftToVariantColumns(\n    direct,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  );\n\n  const linkedAnnotated = liftToVariantColumns(\n    linked,\n    flow(\n      (cols) => withDataStatusAnnotations(cols),\n      (cols) => withHidenAxesAnnotations(cols),\n      (cols) => withLabelAnnotations(derivedLabels, cols),\n      (cols) => withInfoAnnotations(derivedTooltips, cols),\n      (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, cols),\n    ),\n  ).map((lc) => ({ ...lc, path: annotateLinkerPath(derivedLabels, lc.path) }));\n\n  return {\n    direct: directAnnotated,\n    linked: linkedAnnotated,\n  };\n}\n\n/** Lift a snapshot-array transform so it runs on the inner `column` of each variant. */\nfunction liftToVariantColumns<V extends { readonly column: ColumnSnapshot<DiscoveredPColumnId> }>(\n  variants: V[],\n  fn: (cols: ColumnSnapshot<DiscoveredPColumnId>[]) => ColumnSnapshot<DiscoveredPColumnId>[],\n): V[] {\n  const cols = fn(variants.map((v) => v.column));\n  if (cols.length !== variants.length)\n    throw new Error(\n      `liftToVariantColumns: fn must preserve array length (got ${cols.length}, expected ${variants.length})`,\n    );\n  return variants.map((v, i) => ({ ...v, column: cols[i] }));\n}\n\nfunction annotateLinkerPath(\n  derivedLabels: Record<string, string>,\n  path: TableColumnVariant[\"path\"],\n): TableColumnVariant[\"path\"] {\n  if (path.length === 0) return path;\n  const annotatedLinkers = withHidenAxesAnnotations(\n    withLabelAnnotations(\n      derivedLabels,\n      path.map((s) => s.linker),\n    ),\n  );\n  return path.map((s, i) => ({ ...s, linker: annotatedLinkers[i] }));\n}\n\n/** Build an index of all valid column IDs (axes + columns) for filter/sorting validation. */\nfunction createColumnValidationById(\n  fullColumns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n) {\n  const axisIds = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map(getAxisId)),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n\n  const allIds: PTableColumnId[] = [\n    ...axisIds.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n\n  const validIdSet = new Set(allIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n\n  return (id: string): boolean => {\n    return validIdSet.has(id as CanonicalizedJson<PTableColumnId>);\n  };\n}\n\n/** Drop filter leaves whose column references are not available in the table. */\nfunction filterFilters(\n  filters: Nil | PlDataTableFilters,\n  isValidColumnId: (id: string) => boolean,\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const isLeafValid = (leaf: PlDataTableFilterSpecLeaf): boolean => {\n    if (leaf.type === undefined) return true;\n    if (\"column\" in leaf && !isValidColumnId(leaf.column)) return false;\n    if (\"rhs\" in leaf && !isValidColumnId(leaf.rhs)) return false;\n    return true;\n  };\n\n  const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n    if (node.type === \"and\" || node.type === \"or\") {\n      const kept = node.filters\n        .map((f) => prune(f))\n        .filter((f): f is PlDataTableFilterNode => !isNil(f));\n      return { type: node.type, filters: kept };\n    }\n    if (node.type === \"not\") {\n      const inner = prune(node.filter);\n      return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n    }\n    return isLeafValid(node) ? node : undefined;\n  };\n\n  return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */\nfunction concatFilters(\n  a: Nil | PlDataTableFilters,\n  b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n  if (isNil(a)) return b;\n  if (isNil(b)) return a;\n  return { ...a, filters: [...a.filters, ...b.filters] };\n}\n\n/** Pick user sorting from state if non-empty, otherwise fall back to options default. */\nfunction resolveSorting(\n  userSorting: PTableSorting[],\n  defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n  return (isEmpty(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Drop sorting entries whose column is not available in the table. */\nfunction filterSorting(\n  sorting: PTableSorting[],\n  isValidColumnId: (id: string) => boolean,\n): PTableSorting[] {\n  return sorting.filter((s) => isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)));\n}\n\nfunction buildSecondaryGroups(\n  direct: TableColumnVariant[],\n  linked: TableColumnVariant[],\n): SecondaryGroup<undefined | PColumnDataUniversal>[] {\n  return [\n    ...direct.map(\n      (c): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [{ column: resolveSnapshot(c.column), qualifications: c.qualifications.forHit }],\n        primaryQualifications: c.qualifications.forQueries,\n      }),\n    ),\n    ...linked.map(\n      (lc): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [\n          {\n            column: resolveSnapshot(lc.column),\n            qualifications: lc.qualifications.forHit,\n            linkers: lc.path.map((s) => resolveSnapshot(s.linker)),\n          },\n        ],\n        primaryQualifications: lc.qualifications.forQueries,\n      }),\n    ),\n  ];\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults. */\nfunction computeHiddenColumns(\n  columns: { readonly id: PObjectId; readonly spec: PColumnSpec }[],\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n  hiddenSpecs: Nil | PTableColumnId[],\n): Set<PObjectId> {\n  const alwaysHidden = columns.filter((c) => isColumnHidden(c.spec)).map((c) => c.id);\n  const optionalHidden = !isNil(hiddenSpecs)\n    ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n    : columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n  const initial = [...alwaysHidden, ...optionalHidden];\n  const preserved = collectPreservedColumnIds(sorting, filters);\n\n  return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n  sorting: Nil | PTableSorting[],\n  filters: Nil | PlDataTableFilters,\n): Set<PObjectId> {\n  const sortedIds = (sorting ?? [])\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .map((c) => c.id);\n\n  const filterIds = !isNil(filters)\n    ? collectFilterSpecColumns(filters).flatMap((c) => {\n        const obj = parseJson(c);\n        return obj.type === \"column\" ? [obj.id] : [];\n      })\n    : [];\n\n  return new Set<PObjectId>([...sortedIds, ...filterIds]);\n}\n\n/** Filter annotated columns to only visible ones, re-matching label columns for the visible subset. */\nfunction buildVisibleColumns(\n  annotated: AnnotatedColumnGroups,\n  hiddenColumns: Set<PObjectId>,\n): VisibleColumns {\n  const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.column.id));\n  const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.column.id));\n  return { direct, linked };\n}\n\n/** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */\nfunction resolveSnapshot(\n  snap: ColumnSnapshot<PObjectId>,\n): PColumn<undefined | PColumnDataUniversal> {\n  return { id: snap.id, spec: snap.spec, data: snap.data?.get() };\n}\n\n/** Remap column references in sorting entries. */\nfunction remapSortingColumnIds(\n  sorting: Nil | PTableSorting[],\n  columns: TableColumnVariant[],\n): Nil | PTableSorting[] {\n  return sorting?.flatMap((s) => {\n    if (s.column.type === \"axis\") return [s]; // Axis references are unaffected by column ID remapping\n\n    const id = s.column.id;\n    const column = columns.find((c) => (c.originalId ?? c.column.id) === id);\n    if (column === undefined) return [];\n\n    return [\n      {\n        ...s,\n        column: {\n          type: \"column\" as const,\n          id: column.column.id,\n        },\n      },\n    ];\n  });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree. */\nfunction remapFilterColumnIds(\n  filters: Nil | PlDataTableFilters,\n  columns: TableColumnVariant[],\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  const map = (\n    tableColumnId: CanonicalizedJson<PTableColumnId>,\n  ): CanonicalizedJson<PTableColumnId> => {\n    const parsed = parseJson<PTableColumnId>(tableColumnId);\n    if (parsed.type === \"axis\") return tableColumnId; // Axis references are unaffected by column ID remapping\n\n    const originalId = parsed.id;\n    const column =\n      columns.find((c) => (c.originalId ?? c.column.id) === originalId) ??\n      throwError(`Column ID \"${parsed.id}\" in filters does not match any discovered column`);\n\n    return canonicalizeJson<PTableColumnId>({\n      type: \"column\",\n      id: column.column.id,\n    });\n  };\n\n  return traverseFilterSpec(filters, {\n    leaf: (leaf): PlDataTableFilterNode => {\n      if (leaf.type === undefined) return leaf;\n      const result = { ...leaf };\n      if (\"column\" in result) result.column = map(result.column);\n      if (\"rhs\" in result) result.rhs = map(result.rhs);\n      return result;\n    },\n    and: (results): PlDataTableFilterNode => ({ type: \"and\", filters: results }),\n    or: (results): PlDataTableFilterNode => ({ type: \"or\", filters: results }),\n    not: (result): PlDataTableFilterNode => ({ type: \"not\", filter: result }),\n  }) as PlDataTableFilters;\n}\n"],"mappings":"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"}

package/dist/components/PlDatasetSelector/build_dataset_options.cjs

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

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

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

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

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

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

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

package/dist/components/PlDatasetSelector/build_dataset_options.js

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

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

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

package/dist/components/PlDatasetSelector/filter_discovery.cjs

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

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

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

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

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

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

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

package/dist/components/PlDatasetSelector/filter_discovery.js

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

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

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

package/dist/package.cjs

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

package/dist/package.js

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

package/package.json

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

package/src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts

@@ -22,11 +22,19 @@ export type PrimaryEntry<Data> = {
   column: PColumn<Data>;
 };
 
-/** Secondary side leaf — the hit column, a linker step, or a label column. */
+/** Secondary side leaf — the hit column or a label column, optionally reached via a linker chain. */
 export type SecondaryEntry<Data> = {
   column: PColumn<Data>;
-  /** For hit: `forHit`. For linker step k: `path[k].qualifications`. For label/direct: omit. */
+  /** For hit: `forHit`. For label/direct: omit. Applied to the outermost emitted join entry. */
   qualifications?: AxisQualification[];
+  /**
+   * Linker chain leading to `column`, ordered from outermost to innermost.
+   * When present, the entry is emitted as nested `linkerJoin` operators —
+   * one per linker — wrapping the hit column. Binds this hit to this exact
+   * chain so the engine cannot reuse a sibling chain that happens to share
+   * axis name + domain.
+   */
+  linkers?: PColumn<Data>[];
 };
 
 /** Secondary group — one join subtree outer-joined onto primary. */
@@ -58,9 +66,7 @@ export function createPTableDefV3<Data = PColumnDataUniversal>(params: {
           params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []),
         ),
       },
-      secondary: params.secondary.flatMap((g) =>
-        g.entries.map((e) => toLeaf(e.column, e.qualifications ?? [])),
-      ),
+      secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e))),
     };
   }
 
@@ -112,3 +118,17 @@ function toLeaf<Data>(
     qualifications: qs,
   };
 }
+
+function toJoinEntry<Data>(e: SecondaryEntry<Data>): SpecQueryJoinEntry<PColumn<Data>> {
+  const qs = e.qualifications ?? [];
+  if (isNil(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);
+
+  const folded = e.linkers.reduceRight<SpecQueryJoinEntry<PColumn<Data>>>(
+    (inner, linker) => ({
+      entry: { type: "linkerJoin", linker: { column: linker }, secondary: [inner] },
+      qualifications: [],
+    }),
+    toLeaf(e.column, []),
+  );
+  return { ...folded, qualifications: qs };
+}

package/src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts

@@ -417,10 +417,11 @@ function buildSecondaryGroups(
     ...linked.map(
       (lc): SecondaryGroup<undefined | PColumnDataUniversal> => ({
         entries: [
-          ...lc.path.map((s) => ({
-            column: resolveSnapshot(s.linker),
-          })),
-          { column: resolveSnapshot(lc.column), qualifications: lc.qualifications.forHit },
+          {
+            column: resolveSnapshot(lc.column),
+            qualifications: lc.qualifications.forHit,
+            linkers: lc.path.map((s) => resolveSnapshot(s.linker)),
+          },
         ],
         primaryQualifications: lc.qualifications.forQueries,
       }),

package/src/components/PlDatasetSelector/build_dataset_options.ts

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

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

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

package/src/components/PlDatasetSelector/filter_discovery.ts

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