@platforma-sdk/model 1.68.4 → 1.68.6

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

@@ -16,12 +16,13 @@ function createPlDataTableV3(ctx, options) {
 	const discovered = (0, _milaboratories_helpers.isPlainObject)(options.columns) ? require_discoverColumns.discoverTableColumnSnaphots(ctx, options.columns) : options.columns;
 	if ((0, _milaboratories_helpers.isNil)(discovered) || discovered.length === 0) return void 0;
 	const splited = splitDiscoveredColumns(discovered);
-	const labelColumns = require_labels.getMatchingLabelColumns([...splited.direct, ...splited.linked], require_labels.getAllLabelColumns(ctx));
+	const labelColumns = require_labels.getMatchingLabelColumns([...splited.direct, ...splited.linked].map((v) => v.column), require_labels.getAllLabelColumns(ctx));
 	const derivedLabels = require_utils.deriveAllLabels({
 		columns: discovered.map((dc) => ({
-			id: dc.id,
-			spec: dc.spec,
-			linkerPath: dc.linkerPath?.map((lp) => ({ spec: lp.linker.spec }))
+			id: dc.column.id,
+			spec: dc.column.spec,
+			linkerPath: dc.path,
+			qualifications: dc.qualifications
 		})),
 		labelColumns,
 		deriveLabelsOptions: {
@@ -30,12 +31,11 @@ function createPlDataTableV3(ctx, options) {
 		}
 	});
 	const derivedTooltips = require_utils.deriveAllTooltips({ columns: discovered.map((dc) => ({
-		id: dc.id,
+		id: dc.column.id,
 		originalId: dc.originalId,
-		spec: dc.spec,
-		linkerPath: dc.linkerPath,
-		qualifications: dc.qualifications,
-		distinctiveQualifications: dc.distinctiveQualifications
+		spec: dc.column.spec,
+		linkerPath: dc.path,
+		qualifications: dc.qualifications
 	})) });
 	const annotated = annotateColumnGroups({
 		pframeSpec,
@@ -49,8 +49,8 @@ function createPlDataTableV3(ctx, options) {
 	const secondarySnapshots = annotated.direct.filter((c) => !c.isPrimary);
 	if (primarySnapshots.length === 0) return void 0;
 	const columnIsAvailable = createColumnValidationById([
-		...annotated.direct,
-		...annotated.linked.flatMap((lc) => [...(lc.linkerPath ?? []).map((s) => s.linker), lc]),
+		...annotated.direct.map((v) => v.column),
+		...annotated.linked.flatMap((lc) => [...lc.path.map((s) => s.linker), lc.column]),
 		...annotated.labels
 	]);
 	const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);
@@ -58,7 +58,7 @@ function createPlDataTableV3(ctx, options) {
 	validateFilters(filters, columnIsAvailable);
 	const sorting = resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered));
 	validateSorting(sorting, columnIsAvailable);
-	const primaryEntries = primarySnapshots.map((snap) => ({ column: resolveSnapshot(snap) }));
+	const primaryEntries = primarySnapshots.map((v) => ({ column: resolveSnapshot(v.column) }));
 	const fullDef = require_createPTableDefV3.createPTableDefV3({
 		primaryJoinType,
 		primary: primaryEntries,
@@ -68,13 +68,13 @@ function createPlDataTableV3(ctx, options) {
 	});
 	const fullHandle = ctx.createPTableV2(fullDef);
 	const pframeHandle = ctx.createPFrame([
-		...annotated.direct.map(resolveSnapshot),
-		...annotated.linked.map(resolveSnapshot),
+		...annotated.direct.map((v) => resolveSnapshot(v.column)),
+		...annotated.linked.map((v) => resolveSnapshot(v.column)),
 		...annotated.labels,
 		...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot)
 	]);
 	const hiddenSpecs = state.pTableParams.hiddenColIds;
-	const visible = buildVisibleColumns(annotated, computeHiddenColumns([...annotated.direct, ...annotated.linked], sorting, filters, hiddenSpecs), labelColumns);
+	const visible = buildVisibleColumns(annotated, computeHiddenColumns([...annotated.direct, ...annotated.linked].map((v) => v.column), sorting, filters, hiddenSpecs), labelColumns);
 	const visibleDef = require_createPTableDefV3.createPTableDefV3({
 		primaryJoinType,
 		primary: primaryEntries,
@@ -94,13 +94,13 @@ function createPlDataTableV3(ctx, options) {
 /** Split discovered columns into direct (no linker path) and linked (with linker path). */
 function splitDiscoveredColumns(columns) {
 	return {
-		direct: columns.filter((dc) => (0, _milaboratories_helpers.isNil)(dc.linkerPath) || dc.linkerPath.length === 0),
-		linked: columns.filter((dc) => !(0, _milaboratories_helpers.isNil)(dc.linkerPath) && dc.linkerPath.length > 0)
+		direct: columns.filter((dc) => dc.path.length === 0),
+		linked: columns.filter((dc) => dc.path.length > 0)
 	};
 }
 /** All linker snapshots across the given linked columns, deduped by id. */
 function collectLinkerSnapshots(linked) {
-	return (0, _milaboratories_pl_model_common.uniqueBy)(linked.flatMap((lc) => (lc.linkerPath ?? []).map((s) => s.linker)), (c) => c.id);
+	return (0, _milaboratories_pl_model_common.uniqueBy)(linked.flatMap((lc) => lc.path.map((s) => s.linker)), (c) => c.id);
 }
 /**
 * Annotate all column groups with derived labels and display-rule annotations.
@@ -111,34 +111,33 @@ function collectLinkerSnapshots(linked) {
 function annotateColumnGroups(params) {
 	const { direct, linked, labelColumns, derivedLabels, derivedTooltips, displayOptions, pframeSpec } = params;
 	const allColumnsForRules = [
-		...direct,
-		...linked,
+		...direct.map((v) => v.column),
+		...linked.map((v) => v.column),
 		...labelColumns,
 		...collectLinkerSnapshots(linked)
 	];
 	const visibilityByColId = require_utils.evaluateRules(displayOptions?.visibility ?? [], allColumnsForRules, pframeSpec);
 	const orderByColId = require_utils.evaluateRules(displayOptions?.ordering ?? [], allColumnsForRules, pframeSpec);
 	return {
-		direct: [
-			require_utils.withLabelAnnotations.bind(null, derivedLabels),
-			require_utils.withInfoAnnotations.bind(null, derivedTooltips),
-			require_utils.withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId)
-		].reduce((cols, fn) => fn(cols), direct),
-		linked: [
-			require_utils.withLabelAnnotations.bind(null, derivedLabels),
-			require_utils.withInfoAnnotations.bind(null, derivedTooltips),
-			require_utils.withHidenAxesAnnotations.bind(null),
-			require_utils.withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId),
-			(cols) => cols.map((lc) => ({
-				...lc,
-				linkerPath: annotateLinkerPath(derivedLabels, lc.linkerPath)
-			}))
-		].reduce((cols, fn) => fn(cols), linked),
+		direct: withVariantColumns(direct, (cols) => require_utils.withTableVisualAnnotations(visibilityByColId, orderByColId, require_utils.withInfoAnnotations(derivedTooltips, require_utils.withLabelAnnotations(derivedLabels, cols)))),
+		linked: withVariantColumns(linked, (cols) => require_utils.withTableVisualAnnotations(visibilityByColId, orderByColId, require_utils.withHidenAxesAnnotations(require_utils.withInfoAnnotations(derivedTooltips, require_utils.withLabelAnnotations(derivedLabels, cols))))).map((lc) => ({
+			...lc,
+			path: annotateLinkerPath(derivedLabels, lc.path)
+		})),
 		labels: require_utils.withLabelAnnotations(derivedLabels, labelColumns)
 	};
 }
+/** Apply a snapshot-array transformation to the inner `column` of each variant. */
+function withVariantColumns(variants, fn) {
+	const cols = fn(variants.map((v) => v.column));
+	if (cols.length !== variants.length) throw new Error(`withVariantColumns: fn must preserve array length (got ${cols.length}, expected ${variants.length})`);
+	return variants.map((v, i) => ({
+		...v,
+		column: cols[i]
+	}));
+}
 function annotateLinkerPath(derivedLabels, path) {
-	if ((0, _milaboratories_helpers.isNil)(path) || path.length === 0) return path;
+	if (path.length === 0) return path;
 	const annotatedLinkers = require_utils.withHidenAxesAnnotations(require_utils.withLabelAnnotations(derivedLabels, path.map((s) => s.linker)));
 	return path.map((s, i) => ({
 		...s,
@@ -187,20 +186,20 @@ function buildSecondaryGroups(direct, linked, labels) {
 	return [
 		...direct.map((c) => ({
 			entries: [{
-				column: resolveSnapshot(c),
-				qualifications: c.qualifications?.forHit
+				column: resolveSnapshot(c.column),
+				qualifications: c.qualifications.forHit
 			}],
-			primaryQualifications: c.qualifications?.forQueries
+			primaryQualifications: c.qualifications.forQueries
 		})),
 		...linked.map((lc) => ({
-			entries: [...(lc.linkerPath ?? []).map((s) => ({
+			entries: [...lc.path.map((s) => ({
 				column: resolveSnapshot(s.linker),
 				qualifications: s.qualifications
 			})), {
-				column: resolveSnapshot(lc),
-				qualifications: lc.qualifications?.forHit
+				column: resolveSnapshot(lc.column),
+				qualifications: lc.qualifications.forHit
 			}],
-			primaryQualifications: lc.qualifications?.forQueries
+			primaryQualifications: lc.qualifications.forQueries
 		})),
 		...labels.map((c) => ({ entries: [{ column: c }] }))
 	];
@@ -224,12 +223,12 @@ function collectPreservedColumnIds(sorting, filters) {
 }
 /** Filter annotated columns to only visible ones, re-matching label columns for the visible subset. */
 function buildVisibleColumns(annotated, hiddenColumns, originalLabelColumns) {
-	const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.id));
-	const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.id));
+	const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.column.id));
+	const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.column.id));
 	return {
 		direct,
 		linked,
-		labels: require_labels.getMatchingLabelColumns([...direct, ...linked], originalLabelColumns)
+		labels: require_labels.getMatchingLabelColumns([...direct, ...linked].map((v) => v.column), originalLabelColumns)
 	};
 }
 /** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */
@@ -245,12 +244,12 @@ function remapSortingColumnIds(sorting, columns) {
 	return sorting?.map((s) => {
 		if (s.column.type === "axis") return s;
 		const id = s.column.id;
-		const column = columns.find((c) => (c.originalId ?? c.id) === id) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${id}" in sorting does not match any discovered column`);
+		const column = columns.find((c) => (c.originalId ?? c.column.id) === id) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${id}" in sorting does not match any discovered column`);
 		return {
 			...s,
 			column: {
 				type: "column",
-				id: column.id
+				id: column.column.id
 			}
 		};
 	});
@@ -264,7 +263,7 @@ function remapFilterColumnIds(filters, columns) {
 		const originalId = parsed.id;
 		return (0, _milaboratories_pl_model_common.canonicalizeJson)({
 			type: "column",
-			id: (columns.find((c) => (c.originalId ?? c.id) === originalId) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${parsed.id}" in filters does not match any discovered column`)).id
+			id: (columns.find((c) => (c.originalId ?? c.column.id) === originalId) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${parsed.id}" in filters does not match any discovered column`)).column.id
 		});
 	};
 	return require_traverse.traverseFilterSpec(filters, {

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

@@ -1 +1 @@
-{"version":3,"file":"createPlDataTableV3.cjs","names":["upgradePlDataTableStateV2","discoverTableColumnSnaphots","getMatchingLabelColumns","getAllLabelColumns","deriveAllLabels","deriveAllTooltips","createPTableDefV3","evaluateRules","withLabelAnnotations","withInfoAnnotations","withTableVisualAnnotations","withHidenAxesAnnotations","getAxisId","collectFilterSpecColumns","isColumnHidden","isColumnOptional","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 {\n  ColumnSelector,\n  ColumnSnapshot,\n  MatchingMode,\n  MatchQualifications,\n  MatchVariant,\n} from \"../../../columns\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"../labels\";\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} 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\";\n\nexport type createPlDataTableOptionsV3 = {\n  tableState?: PlDataTableStateV2;\n\n  columns: Nil | DiscoverTableColumnOptions | TableColumnSnapshot[];\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\n// Main Function\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 labelColumns = getMatchingLabelColumns(\n    [...splited.direct, ...splited.linked],\n    getAllLabelColumns(ctx),\n  );\n\n  const derivedLabels = deriveAllLabels({\n    columns: discovered.map((dc) => ({\n      id: dc.id,\n      spec: dc.spec,\n      linkerPath: dc.linkerPath?.map((lp) => ({ spec: lp.linker.spec })),\n    })),\n    labelColumns,\n    deriveLabelsOptions: {\n      includeNativeLabel: true,\n      ...options.labelsOptions,\n    },\n  });\n\n  const derivedTooltips = deriveAllTooltips({\n    columns: discovered.map((dc) => ({\n      id: dc.id,\n      originalId: dc.originalId,\n      spec: dc.spec,\n      linkerPath: dc.linkerPath,\n      qualifications: dc.qualifications,\n      distinctiveQualifications: dc.distinctiveQualifications,\n    })),\n  });\n\n  const annotated = annotateColumnGroups({\n    pframeSpec,\n    ...splited,\n    labelColumns,\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,\n    ...annotated.linked.flatMap((lc) => [...(lc.linkerPath ?? []).map((s) => s.linker), lc]),\n    ...annotated.labels,\n  ]);\n\n  const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);\n  const filters = concatFilters(\n    state.pTableParams.filters,\n    state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n  );\n  validateFilters(filters, columnIsAvailable);\n\n  const sorting = resolveSorting(\n    state.pTableParams.sorting,\n    remapSortingColumnIds(options.sorting, discovered),\n  );\n  validateSorting(sorting, columnIsAvailable);\n\n  const primaryEntries: PrimaryEntry<undefined | PColumnDataUniversal>[] = primarySnapshots.map(\n    (snap) => ({ column: resolveSnapshot(snap) }),\n  );\n  const fullDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: buildSecondaryGroups(secondarySnapshots, annotated.linked, annotated.labels),\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(resolveSnapshot),\n    ...annotated.linked.map(resolveSnapshot),\n    ...annotated.labels,\n    ...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot),\n  ]);\n\n  const hiddenSpecs = state.pTableParams.hiddenColIds;\n  const hiddenColumnIds = computeHiddenColumns(\n    [...annotated.direct, ...annotated.linked],\n    sorting,\n    filters,\n    hiddenSpecs,\n  );\n\n  const visible = buildVisibleColumns(annotated, hiddenColumnIds, labelColumns);\n  const visibleDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: buildSecondaryGroups(\n      visible.direct.filter((c) => !c.isPrimary),\n      visible.linked,\n      visible.labels,\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\n/** A single column discovered from sources — normalized from raw ColumnSnapshot/ColumnMatch. */\nexport type TableColumnSnapshot = ColumnSnapshot<DiscoveredPColumnId> & {\n  readonly originalId: PObjectId;\n  readonly isPrimary?: boolean;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n  readonly distinctiveQualifications?: MatchQualifications;\n};\n\ntype SplitDiscoveredColumns = {\n  readonly direct: TableColumnSnapshot[];\n  readonly linked: TableColumnSnapshot[];\n};\n\ntype AnnotatedColumnGroups = {\n  readonly direct: TableColumnSnapshot[];\n  readonly linked: TableColumnSnapshot[];\n  readonly labels: PColumn<PColumnDataUniversal>[];\n};\n\ntype VisibleColumns = {\n  readonly direct: TableColumnSnapshot[];\n  readonly linked: TableColumnSnapshot[];\n  readonly labels: PColumn<PColumnDataUniversal>[];\n};\n\n/** Split discovered columns into direct (no linker path) and linked (with linker path). */\nfunction splitDiscoveredColumns(columns: TableColumnSnapshot[]): SplitDiscoveredColumns {\n  const direct = columns.filter((dc) => isNil(dc.linkerPath) || dc.linkerPath.length === 0);\n  const linked = columns.filter((dc) => !isNil(dc.linkerPath) && dc.linkerPath.length > 0);\n  return { direct, linked };\n}\n\n/** All linker snapshots across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: TableColumnSnapshot[]): ColumnSnapshot<PObjectId>[] {\n  return uniqueBy(\n    linked.flatMap((lc) => (lc.linkerPath ?? []).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: TableColumnSnapshot[];\n  linked: TableColumnSnapshot[];\n  labelColumns: PColumn<PColumnDataUniversal>[];\n  derivedLabels: Record<string, string>;\n  derivedTooltips: Record<string, string>;\n  displayOptions?: ColumnsDisplayOptions;\n  pframeSpec: PFrameSpecDriver;\n}): AnnotatedColumnGroups {\n  const {\n    direct,\n    linked,\n    labelColumns,\n    derivedLabels,\n    derivedTooltips,\n    displayOptions,\n    pframeSpec,\n  } = params;\n\n  const allColumnsForRules = [\n    ...direct,\n    ...linked,\n    ...labelColumns,\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 = [\n    withLabelAnnotations.bind(null, derivedLabels),\n    withInfoAnnotations.bind(null, derivedTooltips),\n    withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId),\n  ].reduce((cols, fn) => fn(cols) as TableColumnSnapshot[], direct);\n\n  const linkedAnnotated = [\n    withLabelAnnotations.bind(null, derivedLabels),\n    withInfoAnnotations.bind(null, derivedTooltips),\n    withHidenAxesAnnotations.bind(null),\n    withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId),\n    (cols: TableColumnSnapshot[]) =>\n      cols.map((lc) => ({ ...lc, linkerPath: annotateLinkerPath(derivedLabels, lc.linkerPath) })),\n  ].reduce((cols, fn) => fn(cols) as TableColumnSnapshot[], linked);\n\n  const labelColumnsAnnotated = withLabelAnnotations(derivedLabels, labelColumns);\n\n  return {\n    direct: directAnnotated,\n    linked: linkedAnnotated,\n    labels: labelColumnsAnnotated,\n  };\n}\nfunction annotateLinkerPath(\n  derivedLabels: Record<string, string>,\n  path: TableColumnSnapshot[\"linkerPath\"],\n): TableColumnSnapshot[\"linkerPath\"] {\n  if (isNil(path) || 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/** Validate that all column references in filters exist in the table. */\nfunction validateFilters(\n  filters: Nil | PlDataTableFilters,\n  isValidColumnId: (id: string) => boolean,\n): void {\n  if (filters == null) return;\n  const filterColumns = collectFilterSpecColumns(filters);\n  const firstInvalid = filterColumns.find((col) => !isValidColumnId(col));\n  if (firstInvalid !== undefined) {\n    throw new Error(\n      `Invalid filter column ${firstInvalid}: column reference does not match the table columns`,\n    );\n  }\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/** Validate that all column references in sorting exist in the table. */\nfunction validateSorting(sorting: PTableSorting[], isValidColumnId: (id: string) => boolean): void {\n  const firstInvalid = sorting.find(\n    (s) => !isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)),\n  );\n  if (firstInvalid !== undefined) {\n    throw new Error(\n      `Invalid sorting column ${JSON.stringify(firstInvalid.column)}: column reference does not match the table columns`,\n    );\n  }\n}\n\nfunction buildSecondaryGroups(\n  direct: TableColumnSnapshot[],\n  linked: TableColumnSnapshot[],\n  labels: PColumn<PColumnDataUniversal>[],\n): SecondaryGroup<undefined | PColumnDataUniversal>[] {\n  return [\n    ...direct.map(\n      (c): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [{ column: resolveSnapshot(c), qualifications: c.qualifications?.forHit }],\n        primaryQualifications: c.qualifications?.forQueries,\n      }),\n    ),\n    ...linked.map(\n      (lc): SecondaryGroup<undefined | PColumnDataUniversal> => ({\n        entries: [\n          ...(lc.linkerPath ?? []).map((s) => ({\n            column: resolveSnapshot(s.linker),\n            qualifications: s.qualifications,\n          })),\n          { column: resolveSnapshot(lc), qualifications: lc.qualifications?.forHit },\n        ],\n        primaryQualifications: lc.qualifications?.forQueries,\n      }),\n    ),\n    ...labels.map(\n      (c): SecondaryGroup<undefined | PColumnDataUniversal> => ({ entries: [{ column: c }] }),\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  originalLabelColumns: PColumn<PColumnDataUniversal>[],\n): VisibleColumns {\n  const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.id));\n  const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.id));\n  const labels = getMatchingLabelColumns([...direct, ...linked], originalLabelColumns);\n  return { direct, linked, labels };\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: TableColumnSnapshot[],\n): Nil | PTableSorting[] {\n  return sorting?.map((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 =\n      columns.find((c) => (c.originalId ?? c.id) === id) ??\n      throwError(`Column ID \"${id}\" in sorting does not match any discovered column`);\n\n    return {\n      ...s,\n      column: {\n        type: \"column\",\n        id: column.id,\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: TableColumnSnapshot[],\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.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.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","getMatchingLabelColumns","getAllLabelColumns","deriveAllLabels","deriveAllTooltips","createPTableDefV3","evaluateRules","withTableVisualAnnotations","withInfoAnnotations","withLabelAnnotations","withHidenAxesAnnotations","getAxisId","collectFilterSpecColumns","isColumnHidden","isColumnOptional","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 { getAllLabelColumns, getMatchingLabelColumns } from \"../labels\";\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} 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\";\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\n// Main Function\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 labelColumns = getMatchingLabelColumns(\n    [...splited.direct, ...splited.linked].map((v) => v.column),\n    getAllLabelColumns(ctx),\n  );\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    labelColumns,\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    labelColumns,\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    ...annotated.labels,\n  ]);\n\n  const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);\n  const filters = concatFilters(\n    state.pTableParams.filters,\n    state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n  );\n  validateFilters(filters, columnIsAvailable);\n\n  const sorting = resolveSorting(\n    state.pTableParams.sorting,\n    remapSortingColumnIds(options.sorting, discovered),\n  );\n  validateSorting(sorting, columnIsAvailable);\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    annotated.labels,\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    ...annotated.labels,\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, labelColumns);\n  const visibleDef = createPTableDefV3({\n    primaryJoinType,\n    primary: primaryEntries,\n    secondary: buildSecondaryGroups(\n      visible.direct.filter((c) => !c.isPrimary),\n      visible.linked,\n      visible.labels,\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  readonly labels: PColumn<PColumnDataUniversal>[];\n};\n\ntype VisibleColumns = {\n  readonly direct: TableColumnVariant[];\n  readonly linked: TableColumnVariant[];\n  readonly labels: PColumn<PColumnDataUniversal>[];\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  labelColumns: PColumn<PColumnDataUniversal>[];\n  derivedLabels: Record<string, string>;\n  derivedTooltips: Record<string, string>;\n  displayOptions?: ColumnsDisplayOptions;\n  pframeSpec: PFrameSpecDriver;\n}): AnnotatedColumnGroups {\n  const {\n    direct,\n    linked,\n    labelColumns,\n    derivedLabels,\n    derivedTooltips,\n    displayOptions,\n    pframeSpec,\n  } = params;\n\n  const allColumnsForRules = [\n    ...direct.map((v) => v.column),\n    ...linked.map((v) => v.column),\n    ...labelColumns,\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 = withVariantColumns(direct, (cols) =>\n    withTableVisualAnnotations(\n      visibilityByColId,\n      orderByColId,\n      withInfoAnnotations(derivedTooltips, withLabelAnnotations(derivedLabels, cols)),\n    ),\n  );\n\n  const linkedAnnotated = withVariantColumns(linked, (cols) =>\n    withTableVisualAnnotations(\n      visibilityByColId,\n      orderByColId,\n      withHidenAxesAnnotations(\n        withInfoAnnotations(derivedTooltips, withLabelAnnotations(derivedLabels, cols)),\n      ),\n    ),\n  ).map((lc) => ({ ...lc, path: annotateLinkerPath(derivedLabels, lc.path) }));\n\n  const labelColumnsAnnotated = withLabelAnnotations(derivedLabels, labelColumns);\n\n  return {\n    direct: directAnnotated,\n    linked: linkedAnnotated,\n    labels: labelColumnsAnnotated,\n  };\n}\n\n/** Apply a snapshot-array transformation to the inner `column` of each variant. */\nfunction withVariantColumns<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      `withVariantColumns: 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/** Validate that all column references in filters exist in the table. */\nfunction validateFilters(\n  filters: Nil | PlDataTableFilters,\n  isValidColumnId: (id: string) => boolean,\n): void {\n  if (filters == null) return;\n  const filterColumns = collectFilterSpecColumns(filters);\n  const firstInvalid = filterColumns.find((col) => !isValidColumnId(col));\n  if (firstInvalid !== undefined) {\n    throw new Error(\n      `Invalid filter column ${firstInvalid}: column reference does not match the table columns`,\n    );\n  }\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/** Validate that all column references in sorting exist in the table. */\nfunction validateSorting(sorting: PTableSorting[], isValidColumnId: (id: string) => boolean): void {\n  const firstInvalid = sorting.find(\n    (s) => !isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)),\n  );\n  if (firstInvalid !== undefined) {\n    throw new Error(\n      `Invalid sorting column ${JSON.stringify(firstInvalid.column)}: column reference does not match the table columns`,\n    );\n  }\n}\n\nfunction buildSecondaryGroups(\n  direct: TableColumnVariant[],\n  linked: TableColumnVariant[],\n  labels: PColumn<PColumnDataUniversal>[],\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            qualifications: s.qualifications,\n          })),\n          { column: resolveSnapshot(lc.column), qualifications: lc.qualifications.forHit },\n        ],\n        primaryQualifications: lc.qualifications.forQueries,\n      }),\n    ),\n    ...labels.map(\n      (c): SecondaryGroup<undefined | PColumnDataUniversal> => ({ entries: [{ column: c }] }),\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  originalLabelColumns: PColumn<PColumnDataUniversal>[],\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  const labels = getMatchingLabelColumns(\n    [...direct, ...linked].map((v) => v.column),\n    originalLabelColumns,\n  );\n  return { direct, linked, labels };\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?.map((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 =\n      columns.find((c) => (c.originalId ?? c.column.id) === id) ??\n      throwError(`Column ID \"${id}\" in sorting does not match any discovered column`);\n\n    return {\n      ...s,\n      column: {\n        type: \"column\",\n        id: column.column.id,\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/PlDataTable/createPlDataTable/createPlDataTableV3.d.ts

@@ -1,8 +1,7 @@
+import { ColumnSelector } from "../../../columns/column_selector.js";
+import { ColumnVariant, MatchingMode } from "../../../columns/column_collection_builder.js";
 import { DeriveLabelsOptions } from "../../../labels/derive_distinct_labels.js";
 import { RenderCtxBase } from "../../../render/api.js";
-import { ColumnSelector } from "../../../columns/column_selector.js";
-import { ColumnSnapshot } from "../../../columns/column_snapshot.js";
-import { MatchQualifications, MatchVariant, MatchingMode } from "../../../columns/column_collection_builder.js";
 import { PlDataTableFilters, PlDataTableModel } from "../typesV5.js";
 import { PlDataTableStateV2 } from "../state-migration.js";
 import { DiscoverTableColumnOptions } from "./discoverColumns.js";
@@ -12,7 +11,7 @@ import { Nil } from "@milaboratories/helpers";
 //#region src/components/PlDataTable/createPlDataTable/createPlDataTableV3.d.ts
 type createPlDataTableOptionsV3 = {
   tableState?: PlDataTableStateV2;
-  columns: Nil | DiscoverTableColumnOptions | TableColumnSnapshot[];
+  columns: Nil | DiscoverTableColumnOptions | TableColumnVariant[];
   filters?: PlDataTableFilters;
   sorting?: PTableSorting[];
   primaryJoinType?: "inner" | "full";
@@ -40,14 +39,10 @@ type ColumnVisibilityRule = {
 };
 type ColumnMatcher = (spec: PColumnSpec) => boolean;
 declare function createPlDataTableV3<A, U>(ctx: RenderCtxBase<A, U>, options: createPlDataTableOptionsV3): PlDataTableModel | undefined;
-/** A single column discovered from sources — normalized from raw ColumnSnapshot/ColumnMatch. */
-type TableColumnSnapshot = ColumnSnapshot<DiscoveredPColumnId> & {
+type TableColumnVariant = ColumnVariant<DiscoveredPColumnId> & {
   readonly originalId: PObjectId;
   readonly isPrimary?: boolean;
-  readonly linkerPath?: MatchVariant["path"];
-  readonly qualifications?: MatchQualifications;
-  readonly distinctiveQualifications?: MatchQualifications;
 };
 //#endregion
-export { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule, ColumnsDisplayOptions, ColumnsSelectorConfig, TableColumnSnapshot, createPlDataTableOptionsV3, createPlDataTableV3 };
+export { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule, ColumnsDisplayOptions, ColumnsSelectorConfig, TableColumnVariant, createPlDataTableOptionsV3, createPlDataTableV3 };
 //# sourceMappingURL=createPlDataTableV3.d.ts.map

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPlDataTableV3.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"mappings":";;;;;;;;;;;;KA+CY,0BAAA;EACV,UAAA,GAAa,kBAAA;EAEb,OAAA,EAAS,GAAA,GAAM,0BAAA,GAA6B,mBAAA;EAC5C,OAAA,GAAU,kBAAA;EACV,OAAA,GAAU,aAAA;EACV,eAAA;EAEA,aAAA,GAAgB,mBAAA;EAChB,cAAA,GAAiB,qBAAA;AAAA;;KAIP,qBAAA;EACV,OAAA,GAAU,mBAAA,GAAsB,mBAAA;EAChC,OAAA,GAAU,mBAAA,GAAsB,mBAAA;EAChC,IAAA,GAAO,YAAA;EACP,OAAA;AAAA;AAAA,KAGU,qBAAA;EAX4B,uFAatC,QAAA,GAAW,eAAA,IArBX;EAuBA,UAAA,GAAa,oBAAA;AAAA;AAAA,KAGH,eAAA;EACV,KAAA,EAAO,aAAA,GAAgB,cAAA,EAzBqB;EA2B5C,QAAA;AAAA;AAAA,KAGU,oBAAA;EACV,KAAA,EAAO,aAAA,GAAgB,cAAA;EACvB,UAAA;AAAA;AAAA,KAGU,aAAA,IAAiB,IAAA,EAAM,WAAA;AAAA,iBAInB,mBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,OAAA,EAAS,0BAAA,GACR,gBAAA;;KA+HS,mBAAA,GAAsB,cAAA,CAAe,mBAAA;EAAA,SACtC,UAAA,EAAY,SAAA;EAAA,SACZ,SAAA;EAAA,SACA,UAAA,GAAa,YAAA;EAAA,SACb,cAAA,GAAiB,mBAAA;EAAA,SACjB,yBAAA,GAA4B,mBAAA;AAAA"}
+{"version":3,"file":"createPlDataTableV3.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"mappings":";;;;;;;;;;;KAyCY,0BAAA;EACV,UAAA,GAAa,kBAAA;EAEb,OAAA,EAAS,GAAA,GAAM,0BAAA,GAA6B,kBAAA;EAC5C,OAAA,GAAU,kBAAA;EACV,OAAA,GAAU,aAAA;EACV,eAAA;EAEA,aAAA,GAAgB,mBAAA;EAChB,cAAA,GAAiB,qBAAA;AAAA;;KAIP,qBAAA;EACV,OAAA,GAAU,mBAAA,GAAsB,mBAAA;EAChC,OAAA,GAAU,mBAAA,GAAsB,mBAAA;EAChC,IAAA,GAAO,YAAA;EACP,OAAA;AAAA;AAAA,KAGU,qBAAA;EAX4B,uFAatC,QAAA,GAAW,eAAA,IArBE;EAuBb,UAAA,GAAa,oBAAA;AAAA;AAAA,KAGH,eAAA;EACV,KAAA,EAAO,aAAA,GAAgB,cAAA,EAxBvB;EA0BA,QAAA;AAAA;AAAA,KAGU,oBAAA;EACV,KAAA,EAAO,aAAA,GAAgB,cAAA;EACvB,UAAA;AAAA;AAAA,KAGU,aAAA,IAAiB,IAAA,EAAM,WAAA;AAAA,iBAInB,mBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,OAAA,EAAS,0BAAA,GACR,gBAAA;AAAA,KAmIS,kBAAA,GAAqB,aAAA,CAAc,mBAAA;EAAA,SACpC,UAAA,EAAY,SAAA;EAAA,SACZ,SAAA;AAAA"}

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

@@ -15,12 +15,13 @@ function createPlDataTableV3(ctx, options) {
 	const discovered = isPlainObject(options.columns) ? discoverTableColumnSnaphots(ctx, options.columns) : options.columns;
 	if (isNil(discovered) || discovered.length === 0) return void 0;
 	const splited = splitDiscoveredColumns(discovered);
-	const labelColumns = getMatchingLabelColumns([...splited.direct, ...splited.linked], getAllLabelColumns(ctx));
+	const labelColumns = getMatchingLabelColumns([...splited.direct, ...splited.linked].map((v) => v.column), getAllLabelColumns(ctx));
 	const derivedLabels = deriveAllLabels({
 		columns: discovered.map((dc) => ({
-			id: dc.id,
-			spec: dc.spec,
-			linkerPath: dc.linkerPath?.map((lp) => ({ spec: lp.linker.spec }))
+			id: dc.column.id,
+			spec: dc.column.spec,
+			linkerPath: dc.path,
+			qualifications: dc.qualifications
 		})),
 		labelColumns,
 		deriveLabelsOptions: {
@@ -29,12 +30,11 @@ function createPlDataTableV3(ctx, options) {
 		}
 	});
 	const derivedTooltips = deriveAllTooltips({ columns: discovered.map((dc) => ({
-		id: dc.id,
+		id: dc.column.id,
 		originalId: dc.originalId,
-		spec: dc.spec,
-		linkerPath: dc.linkerPath,
-		qualifications: dc.qualifications,
-		distinctiveQualifications: dc.distinctiveQualifications
+		spec: dc.column.spec,
+		linkerPath: dc.path,
+		qualifications: dc.qualifications
 	})) });
 	const annotated = annotateColumnGroups({
 		pframeSpec,
@@ -48,8 +48,8 @@ function createPlDataTableV3(ctx, options) {
 	const secondarySnapshots = annotated.direct.filter((c) => !c.isPrimary);
 	if (primarySnapshots.length === 0) return void 0;
 	const columnIsAvailable = createColumnValidationById([
-		...annotated.direct,
-		...annotated.linked.flatMap((lc) => [...(lc.linkerPath ?? []).map((s) => s.linker), lc]),
+		...annotated.direct.map((v) => v.column),
+		...annotated.linked.flatMap((lc) => [...lc.path.map((s) => s.linker), lc.column]),
 		...annotated.labels
 	]);
 	const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);
@@ -57,7 +57,7 @@ function createPlDataTableV3(ctx, options) {
 	validateFilters(filters, columnIsAvailable);
 	const sorting = resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered));
 	validateSorting(sorting, columnIsAvailable);
-	const primaryEntries = primarySnapshots.map((snap) => ({ column: resolveSnapshot(snap) }));
+	const primaryEntries = primarySnapshots.map((v) => ({ column: resolveSnapshot(v.column) }));
 	const fullDef = createPTableDefV3({
 		primaryJoinType,
 		primary: primaryEntries,
@@ -67,13 +67,13 @@ function createPlDataTableV3(ctx, options) {
 	});
 	const fullHandle = ctx.createPTableV2(fullDef);
 	const pframeHandle = ctx.createPFrame([
-		...annotated.direct.map(resolveSnapshot),
-		...annotated.linked.map(resolveSnapshot),
+		...annotated.direct.map((v) => resolveSnapshot(v.column)),
+		...annotated.linked.map((v) => resolveSnapshot(v.column)),
 		...annotated.labels,
 		...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot)
 	]);
 	const hiddenSpecs = state.pTableParams.hiddenColIds;
-	const visible = buildVisibleColumns(annotated, computeHiddenColumns([...annotated.direct, ...annotated.linked], sorting, filters, hiddenSpecs), labelColumns);
+	const visible = buildVisibleColumns(annotated, computeHiddenColumns([...annotated.direct, ...annotated.linked].map((v) => v.column), sorting, filters, hiddenSpecs), labelColumns);
 	const visibleDef = createPTableDefV3({
 		primaryJoinType,
 		primary: primaryEntries,
@@ -93,13 +93,13 @@ function createPlDataTableV3(ctx, options) {
 /** Split discovered columns into direct (no linker path) and linked (with linker path). */
 function splitDiscoveredColumns(columns) {
 	return {
-		direct: columns.filter((dc) => isNil(dc.linkerPath) || dc.linkerPath.length === 0),
-		linked: columns.filter((dc) => !isNil(dc.linkerPath) && dc.linkerPath.length > 0)
+		direct: columns.filter((dc) => dc.path.length === 0),
+		linked: columns.filter((dc) => dc.path.length > 0)
 	};
 }
 /** All linker snapshots across the given linked columns, deduped by id. */
 function collectLinkerSnapshots(linked) {
-	return uniqueBy(linked.flatMap((lc) => (lc.linkerPath ?? []).map((s) => s.linker)), (c) => c.id);
+	return uniqueBy(linked.flatMap((lc) => lc.path.map((s) => s.linker)), (c) => c.id);
 }
 /**
 * Annotate all column groups with derived labels and display-rule annotations.
@@ -110,34 +110,33 @@ function collectLinkerSnapshots(linked) {
 function annotateColumnGroups(params) {
 	const { direct, linked, labelColumns, derivedLabels, derivedTooltips, displayOptions, pframeSpec } = params;
 	const allColumnsForRules = [
-		...direct,
-		...linked,
+		...direct.map((v) => v.column),
+		...linked.map((v) => v.column),
 		...labelColumns,
 		...collectLinkerSnapshots(linked)
 	];
 	const visibilityByColId = evaluateRules(displayOptions?.visibility ?? [], allColumnsForRules, pframeSpec);
 	const orderByColId = evaluateRules(displayOptions?.ordering ?? [], allColumnsForRules, pframeSpec);
 	return {
-		direct: [
-			withLabelAnnotations.bind(null, derivedLabels),
-			withInfoAnnotations.bind(null, derivedTooltips),
-			withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId)
-		].reduce((cols, fn) => fn(cols), direct),
-		linked: [
-			withLabelAnnotations.bind(null, derivedLabels),
-			withInfoAnnotations.bind(null, derivedTooltips),
-			withHidenAxesAnnotations.bind(null),
-			withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId),
-			(cols) => cols.map((lc) => ({
-				...lc,
-				linkerPath: annotateLinkerPath(derivedLabels, lc.linkerPath)
-			}))
-		].reduce((cols, fn) => fn(cols), linked),
+		direct: withVariantColumns(direct, (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, withInfoAnnotations(derivedTooltips, withLabelAnnotations(derivedLabels, cols)))),
+		linked: withVariantColumns(linked, (cols) => withTableVisualAnnotations(visibilityByColId, orderByColId, withHidenAxesAnnotations(withInfoAnnotations(derivedTooltips, withLabelAnnotations(derivedLabels, cols))))).map((lc) => ({
+			...lc,
+			path: annotateLinkerPath(derivedLabels, lc.path)
+		})),
 		labels: withLabelAnnotations(derivedLabels, labelColumns)
 	};
 }
+/** Apply a snapshot-array transformation to the inner `column` of each variant. */
+function withVariantColumns(variants, fn) {
+	const cols = fn(variants.map((v) => v.column));
+	if (cols.length !== variants.length) throw new Error(`withVariantColumns: fn must preserve array length (got ${cols.length}, expected ${variants.length})`);
+	return variants.map((v, i) => ({
+		...v,
+		column: cols[i]
+	}));
+}
 function annotateLinkerPath(derivedLabels, path) {
-	if (isNil(path) || path.length === 0) return path;
+	if (path.length === 0) return path;
 	const annotatedLinkers = withHidenAxesAnnotations(withLabelAnnotations(derivedLabels, path.map((s) => s.linker)));
 	return path.map((s, i) => ({
 		...s,
@@ -186,20 +185,20 @@ function buildSecondaryGroups(direct, linked, labels) {
 	return [
 		...direct.map((c) => ({
 			entries: [{
-				column: resolveSnapshot(c),
-				qualifications: c.qualifications?.forHit
+				column: resolveSnapshot(c.column),
+				qualifications: c.qualifications.forHit
 			}],
-			primaryQualifications: c.qualifications?.forQueries
+			primaryQualifications: c.qualifications.forQueries
 		})),
 		...linked.map((lc) => ({
-			entries: [...(lc.linkerPath ?? []).map((s) => ({
+			entries: [...lc.path.map((s) => ({
 				column: resolveSnapshot(s.linker),
 				qualifications: s.qualifications
 			})), {
-				column: resolveSnapshot(lc),
-				qualifications: lc.qualifications?.forHit
+				column: resolveSnapshot(lc.column),
+				qualifications: lc.qualifications.forHit
 			}],
-			primaryQualifications: lc.qualifications?.forQueries
+			primaryQualifications: lc.qualifications.forQueries
 		})),
 		...labels.map((c) => ({ entries: [{ column: c }] }))
 	];
@@ -223,12 +222,12 @@ function collectPreservedColumnIds(sorting, filters) {
 }
 /** Filter annotated columns to only visible ones, re-matching label columns for the visible subset. */
 function buildVisibleColumns(annotated, hiddenColumns, originalLabelColumns) {
-	const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.id));
-	const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.id));
+	const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.column.id));
+	const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.column.id));
 	return {
 		direct,
 		linked,
-		labels: getMatchingLabelColumns([...direct, ...linked], originalLabelColumns)
+		labels: getMatchingLabelColumns([...direct, ...linked].map((v) => v.column), originalLabelColumns)
 	};
 }
 /** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */
@@ -244,12 +243,12 @@ function remapSortingColumnIds(sorting, columns) {
 	return sorting?.map((s) => {
 		if (s.column.type === "axis") return s;
 		const id = s.column.id;
-		const column = columns.find((c) => (c.originalId ?? c.id) === id) ?? throwError(`Column ID "${id}" in sorting does not match any discovered column`);
+		const column = columns.find((c) => (c.originalId ?? c.column.id) === id) ?? throwError(`Column ID "${id}" in sorting does not match any discovered column`);
 		return {
 			...s,
 			column: {
 				type: "column",
-				id: column.id
+				id: column.column.id
 			}
 		};
 	});
@@ -263,7 +262,7 @@ function remapFilterColumnIds(filters, columns) {
 		const originalId = parsed.id;
 		return canonicalizeJson({
 			type: "column",
-			id: (columns.find((c) => (c.originalId ?? c.id) === originalId) ?? throwError(`Column ID "${parsed.id}" in filters does not match any discovered column`)).id
+			id: (columns.find((c) => (c.originalId ?? c.column.id) === originalId) ?? throwError(`Column ID "${parsed.id}" in filters does not match any discovered column`)).column.id
 		});
 	};
 	return traverseFilterSpec(filters, {