@platforma-sdk/model 1.63.12 → 1.65.0

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

@@ -1,17 +1,20 @@
 import { deriveLabels } from "../../../render/util/label.js";
 import { allPColumnsReady } from "../../../render/util/pcolumn_data.js";
+import { PColumnCollection } from "../../../render/util/column_collection.js";
 import "../../../render/index.js";
 import { collectFilterSpecColumns } from "../../../filters/traverse.js";
 import { upgradePlDataTableStateV2 } from "../state-migration.js";
-import { getAllLabelColumns, getMatchingLabelColumns } from "../labels.js";
-import { createPTableDef, isColumnOptional } from "./createPlDataTableV3.js";
-import { Annotation, canonicalizeJson, getAxisId, getColumnIdAndSpec, isLinkerColumn, parseJson, uniqueBy } from "@milaboratories/pl-model-common";
-import { isEmpty } from "es-toolkit/compat";
+import { getMatchingLabelColumns } from "../labels.js";
+import { createPTableDefV2 } from "./createPTableDefV2.js";
+import { isColumnOptional } from "./utils.js";
+import { Annotation, PColumnName, canonicalizeJson, getAxisId, getColumnIdAndSpec, isLinkerColumn, parseJson, uniqueBy } from "@milaboratories/pl-model-common";
 import { identity } from "es-toolkit";
+import { isEmpty } from "es-toolkit/compat";
 //#region src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts
 /**
 * Create p-table spec and handle given ui table state
 *
+* @deprecated This version of createPlDataTable is deprecated and will be removed in future. Please migrate to v3 by switching to the new options format and providing necessary information for column discovery and display configuration. See createPlDataTableOptionsV3 for details.
 * @param ctx context
 * @param columns column list
 * @param tableState table ui state
@@ -20,9 +23,8 @@ import { identity } from "es-toolkit";
 function createPlDataTableV2(ctx, columns, tableState, options) {
 	if (columns.length === 0) return void 0;
 	const tableStateNormalized = upgradePlDataTableStateV2(tableState);
-	const allLabelColumns = getAllLabelColumns(ctx.resultPool);
-	if (!allLabelColumns) return void 0;
-	let fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);
+	const allLabelColumns = getAllLabelColumns(ctx.resultPool) ?? [];
+	let fullLabelColumns = getMatchingLabelColumns(columns, allLabelColumns);
 	fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map((v) => {
 		return {
 			...v.value,
@@ -45,20 +47,18 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 	}))];
 	const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson(c)));
 	const isValidColumnId = (id) => fullColumnsIdsSet.has(id);
-	const stateFilters = tableStateNormalized.pTableParams.filters;
-	const opsFilters = options?.filters ?? null;
-	const filters = stateFilters != null && opsFilters != null ? {
-		type: "and",
-		filters: [stateFilters, opsFilters]
-	} : stateFilters ?? opsFilters;
-	const firstInvalidFilterColumn = (filters ? collectFilterSpecColumns(filters) : []).find((col) => !isValidColumnId(col));
+	const filters = tableStateNormalized.pTableParams.filters;
+	const defaultFilters = options?.filters ?? void 0;
+	const firstInvalidFilterColumn = (filters !== null ? collectFilterSpecColumns(filters) : []).find((col) => !isValidColumnId(col));
 	if (firstInvalidFilterColumn) throw new Error(`Invalid filter column ${firstInvalidFilterColumn}: column reference does not match the table columns`);
+	const firstInvalidDefaultFilterColumn = (defaultFilters !== void 0 ? collectFilterSpecColumns(defaultFilters) : []).find((col) => !isValidColumnId(col));
+	if (firstInvalidDefaultFilterColumn) throw new Error(`Invalid default filter column ${firstInvalidDefaultFilterColumn}: column reference does not match the table columns`);
 	const userSorting = tableStateNormalized.pTableParams.sorting;
 	const sorting = (isEmpty(userSorting) ? options?.sorting : userSorting) ?? [];
 	const firstInvalidSortingColumn = sorting.find((s) => !isValidColumnId(canonicalizeJson(s.column)));
 	if (firstInvalidSortingColumn) throw new Error(`Invalid sorting column ${JSON.stringify(firstInvalidSortingColumn.column)}: column reference does not match the table columns`);
 	const coreJoinType = options?.coreJoinType ?? "full";
-	const fullDef = createPTableDef({
+	const fullDef = createPTableDefV2({
 		columns,
 		labelColumns: fullLabelColumns,
 		coreJoinType,
@@ -72,7 +72,7 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 	const hiddenColumns = new Set((() => {
 		if (coreJoinType === "inner") return [];
 		const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;
-		if (hiddenColIds) return hiddenColIds;
+		if (hiddenColIds !== null) return hiddenColIds.filter((s) => s.type === "column").map((s) => s.id);
 		return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);
 	})());
 	columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));
@@ -86,7 +86,7 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 	const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));
 	const visibleLabelColumns = getMatchingLabelColumns(visibleColumns.map(getColumnIdAndSpec), allLabelColumns);
 	if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return void 0;
-	const visibleDef = createPTableDef({
+	const visibleDef = createPTableDefV2({
 		columns: visibleColumns,
 		labelColumns: visibleLabelColumns,
 		coreJoinType,
@@ -100,9 +100,19 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 		sourceId: tableStateNormalized.pTableParams.sourceId,
 		fullTableHandle: fullHandle,
 		fullPframeHandle: pframeHandle,
-		visibleTableHandle: visibleHandle
+		visibleTableHandle: visibleHandle,
+		defaultFilters
 	};
 }
+function getAllLabelColumns(resultPool) {
+	return new PColumnCollection().addAxisLabelProvider(resultPool).addColumnProvider(resultPool).getColumns({
+		name: PColumnName.Label,
+		axes: [{}]
+	}, {
+		dontWaitAllData: true,
+		overrideLabelAnnotation: false
+	});
+}
 //#endregion
 export { createPlDataTableV2 };
 

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

@@ -1 +1 @@
-{"version":3,"file":"createPlDataTableV2.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts"],"sourcesContent":["import type {\n  AxisId,\n  PColumn,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  CanonicalizedJson,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  uniqueBy,\n  parseJson,\n} from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal, RenderCtxBase } from \"../../../render\";\nimport { allPColumnsReady, deriveLabels } from \"../../../render\";\nimport { identity } from \"es-toolkit\";\nimport type { CreatePlDataTableOps, PlDataTableFilters, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"../labels\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport { createPTableDef, isColumnOptional } from \"./createPlDataTableV3\";\n\nexport type createPlDataTableOptionsV2 = {\n  columns: PColumn<PColumnDataUniversal>[];\n  tableState?: PlDataTableStateV2;\n  options?: CreatePlDataTableOps;\n};\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @param ctx context\n * @param columns column list\n * @param tableState table ui state\n * @returns PlAgDataTableV2 table source\n */\nexport function createPlDataTableV2<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  columns: createPlDataTableOptionsV2[\"columns\"],\n  tableState?: createPlDataTableOptionsV2[\"tableState\"],\n  options?: createPlDataTableOptionsV2[\"options\"],\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool);\n  if (!allLabelColumns) return undefined;\n\n  let fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);\n  fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map(\n    (v) => {\n      return {\n        ...v.value,\n        spec: {\n          ...v.value.spec,\n          annotations: {\n            ...v.value.spec.annotations,\n            [Annotation.Label]: v.label,\n          },\n        },\n      };\n    },\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  const fullColumnsAxes = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n  const fullColumnsIds: PTableColumnId[] = [\n    ...fullColumnsAxes.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n  const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n  const isValidColumnId = (id: string): boolean =>\n    fullColumnsIdsSet.has(id as CanonicalizedJson<PTableColumnId>);\n\n  // -- Filtering validation --\n  const stateFilters = tableStateNormalized.pTableParams.filters;\n  const opsFilters = options?.filters ?? null;\n  const filters: null | PlDataTableFilters =\n    stateFilters != null && opsFilters != null\n      ? { type: \"and\", filters: [stateFilters, opsFilters] }\n      : (stateFilters ?? opsFilters);\n  const filterColumns = filters ? collectFilterSpecColumns(filters) : [];\n  const firstInvalidFilterColumn = filterColumns.find((col) => !isValidColumnId(col));\n  if (firstInvalidFilterColumn)\n    throw new Error(\n      `Invalid filter column ${firstInvalidFilterColumn}: column reference does not match the table columns`,\n    );\n\n  // -- Sorting validation --\n  const userSorting = tableStateNormalized.pTableParams.sorting;\n  const sorting = (isEmpty(userSorting) ? options?.sorting : userSorting) ?? [];\n  const firstInvalidSortingColumn = sorting.find(\n    (s) => !isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)),\n  );\n  if (firstInvalidSortingColumn)\n    throw new Error(\n      `Invalid sorting column ${JSON.stringify(firstInvalidSortingColumn.column)}: column reference does not match the table columns`,\n    );\n\n  const coreJoinType = options?.coreJoinType ?? \"full\";\n  const fullDef = createPTableDef({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate: options?.coreColumnPredicate,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  const pframeHandle = ctx.createPFrame(fullColumns);\n  if (!fullHandle || !pframeHandle) return undefined;\n\n  const hiddenColumns = new Set<PObjectId>(\n    ((): PObjectId[] => {\n      // Inner join works as a filter - all columns must be present\n      if (coreJoinType === \"inner\") return [];\n\n      const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;\n      if (hiddenColIds) return hiddenColIds;\n\n      return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n    })(),\n  );\n\n  // Preserve linker columns\n  columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve core columns as they change the shape of join.\n  const coreColumnPredicate = options?.coreColumnPredicate;\n  if (coreColumnPredicate) {\n    const coreColumns = columns.flatMap((c) =>\n      coreColumnPredicate(getColumnIdAndSpec(c)) ? [c.id] : [],\n    );\n    coreColumns.forEach((c) => hiddenColumns.delete(c));\n  }\n\n  // Preserve sorted columns from being hidden\n  sorting\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve filter columns from being hidden\n  if (filters) {\n    collectFilterSpecColumns(filters)\n      .flatMap((c) => {\n        const obj = parseJson(c);\n        return obj.type === \"column\" ? [obj.id] : [];\n      })\n      .forEach((c) => hiddenColumns.delete(c));\n  }\n\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  // if at least one column is not yet computed, we can't show the table\n  if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return undefined;\n\n  const visibleDef = createPTableDef({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n  } satisfies PlDataTableModel;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AA2CA,SAAgB,oBACd,KACA,SACA,YACA,SAC8B;AAC9B,KAAI,QAAQ,WAAW,EAAG,QAAO,KAAA;CAEjC,MAAM,uBAAuB,0BAA0B,WAAW;CAElE,MAAM,kBAAkB,mBAAmB,IAAI,WAAW;AAC1D,KAAI,CAAC,gBAAiB,QAAO,KAAA;CAE7B,IAAI,mBAAmB,wBAAwB,QAAQ,IAAI,mBAAmB,EAAE,gBAAgB;AAChG,oBAAmB,aAAa,kBAAkB,UAAU,EAAE,oBAAoB,MAAM,CAAC,CAAC,KACvF,MAAM;AACL,SAAO;GACL,GAAG,EAAE;GACL,MAAM;IACJ,GAAG,EAAE,MAAM;IACX,aAAa;KACX,GAAG,EAAE,MAAM,KAAK;MACf,WAAW,QAAQ,EAAE;KACvB;IACF;GACF;GAEJ;CAED,MAAM,cAAc,CAAC,GAAG,SAAS,GAAG,iBAAiB;CAMrD,MAAM,iBAAmC,CACvC,GALsB,SACtB,YAAY,SAAS,MAAM,EAAE,KAAK,SAAS,KAAK,MAAM,UAAU,EAAE,CAAC,CAAC,GACnE,MAAM,iBAAyB,EAAE,CACnC,CAEoB,KAAK,OAAO;EAAE,MAAM;EAAQ,IAAI;EAAG,EAA+B,EACrF,GAAG,YAAY,KAAK,OAAO;EAAE,MAAM;EAAU,IAAI,EAAE;EAAI,EAAiC,CACzF;CACD,MAAM,oBAAoB,IAAI,IAAI,eAAe,KAAK,MAAM,iBAAiC,EAAE,CAAC,CAAC;CACjG,MAAM,mBAAmB,OACvB,kBAAkB,IAAI,GAAwC;CAGhE,MAAM,eAAe,qBAAqB,aAAa;CACvD,MAAM,aAAa,SAAS,WAAW;CACvC,MAAM,UACJ,gBAAgB,QAAQ,cAAc,OAClC;EAAE,MAAM;EAAO,SAAS,CAAC,cAAc,WAAW;EAAE,GACnD,gBAAgB;CAEvB,MAAM,4BADgB,UAAU,yBAAyB,QAAQ,GAAG,EAAE,EACvB,MAAM,QAAQ,CAAC,gBAAgB,IAAI,CAAC;AACnF,KAAI,yBACF,OAAM,IAAI,MACR,yBAAyB,yBAAyB,qDACnD;CAGH,MAAM,cAAc,qBAAqB,aAAa;CACtD,MAAM,WAAW,QAAQ,YAAY,GAAG,SAAS,UAAU,gBAAgB,EAAE;CAC7E,MAAM,4BAA4B,QAAQ,MACvC,MAAM,CAAC,gBAAgB,iBAAiC,EAAE,OAAO,CAAC,CACpE;AACD,KAAI,0BACF,OAAM,IAAI,MACR,0BAA0B,KAAK,UAAU,0BAA0B,OAAO,CAAC,qDAC5E;CAEH,MAAM,eAAe,SAAS,gBAAgB;CAC9C,MAAM,UAAU,gBAAgB;EAC9B;EACA,cAAc;EACd;EACA;EACA;EACA,qBAAqB,SAAS;EAC/B,CAAC;CAEF,MAAM,aAAa,IAAI,eAAe,QAAQ;CAC9C,MAAM,eAAe,IAAI,aAAa,YAAY;AAClD,KAAI,CAAC,cAAc,CAAC,aAAc,QAAO,KAAA;CAEzC,MAAM,gBAAgB,IAAI,WACJ;AAElB,MAAI,iBAAiB,QAAS,QAAO,EAAE;EAEvC,MAAM,eAAe,qBAAqB,aAAa;AACvD,MAAI,aAAc,QAAO;AAEzB,SAAO,QAAQ,QAAQ,MAAM,iBAAiB,EAAE,KAAK,CAAC,CAAC,KAAK,MAAM,EAAE,GAAG;KACrE,CACL;AAGD,SAAQ,QAAQ,MAAM,eAAe,EAAE,KAAK,CAAC,CAAC,SAAS,MAAM,cAAc,OAAO,EAAE,GAAG,CAAC;CAGxF,MAAM,sBAAsB,SAAS;AACrC,KAAI,oBACkB,SAAQ,SAAS,MACnC,oBAAoB,mBAAmB,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,EAAE,CACzD,CACW,SAAS,MAAM,cAAc,OAAO,EAAE,CAAC;AAIrD,SACG,KAAK,MAAM,EAAE,OAAO,CACpB,QAAQ,MAAiC,EAAE,SAAS,SAAS,CAC7D,SAAS,MAAM,cAAc,OAAO,EAAE,GAAG,CAAC;AAG7C,KAAI,QACF,0BAAyB,QAAQ,CAC9B,SAAS,MAAM;EACd,MAAM,MAAM,UAAU,EAAE;AACxB,SAAO,IAAI,SAAS,WAAW,CAAC,IAAI,GAAG,GAAG,EAAE;GAC5C,CACD,SAAS,MAAM,cAAc,OAAO,EAAE,CAAC;CAG5C,MAAM,iBAAiB,QAAQ,QAAQ,MAAM,CAAC,cAAc,IAAI,EAAE,GAAG,CAAC;CACtE,MAAM,sBAAsB,wBAC1B,eAAe,IAAI,mBAAmB,EACtC,gBACD;AAGD,KAAI,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,GAAG,oBAAoB,CAAC,CAAE,QAAO,KAAA;CAE3E,MAAM,aAAa,gBAAgB;EACjC,SAAS;EACT,cAAc;EACd;EACA;EACA;EACA;EACD,CAAC;CACF,MAAM,gBAAgB,IAAI,eAAe,WAAW;AAEpD,KAAI,CAAC,cAAe,QAAO,KAAA;AAE3B,QAAO;EACL,UAAU,qBAAqB,aAAa;EAC5C,iBAAiB;EACjB,kBAAkB;EAClB,oBAAoB;EACrB"}
+{"version":3,"file":"createPlDataTableV2.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts"],"sourcesContent":["import type {\n  AxisId,\n  PColumn,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  CanonicalizedJson,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  uniqueBy,\n  parseJson,\n  PColumnName,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  AxisLabelProvider,\n  ColumnProvider,\n  PColumnDataUniversal,\n  RenderCtxBase,\n} from \"../../../render\";\nimport { allPColumnsReady, deriveLabels, PColumnCollection } from \"../../../render\";\nimport { identity } from \"es-toolkit\";\nimport type { CreatePlDataTableOps, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport { getMatchingLabelColumns } from \"../labels\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport { createPTableDefV2 } from \"./createPTableDefV2\";\nimport { isColumnOptional } from \"./utils\";\n\n/**\n * @deprecated This function is deprecated and will be removed in future. Please migrate to createPlDataTable with v3 options for improved column discovery and display configuration. See createPlDataTableOptionsV3 for details on the new options format and migration guidance.\n */\nexport type createPlDataTableOptionsV2 = {\n  columns: PColumn<PColumnDataUniversal>[];\n  tableState?: PlDataTableStateV2;\n  options?: CreatePlDataTableOps;\n};\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @deprecated This version of createPlDataTable is deprecated and will be removed in future. Please migrate to v3 by switching to the new options format and providing necessary information for column discovery and display configuration. See createPlDataTableOptionsV3 for details.\n * @param ctx context\n * @param columns column list\n * @param tableState table ui state\n * @returns PlAgDataTableV2 table source\n */\nexport function createPlDataTableV2<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  columns: createPlDataTableOptionsV2[\"columns\"],\n  tableState?: createPlDataTableOptionsV2[\"tableState\"],\n  options?: createPlDataTableOptionsV2[\"options\"],\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool) ?? [];\n\n  let fullLabelColumns = getMatchingLabelColumns(columns, allLabelColumns);\n  fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map(\n    (v) => {\n      return {\n        ...v.value,\n        spec: {\n          ...v.value.spec,\n          annotations: {\n            ...v.value.spec.annotations,\n            [Annotation.Label]: v.label,\n          },\n        },\n      };\n    },\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  const fullColumnsAxes = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n  const fullColumnsIds: PTableColumnId[] = [\n    ...fullColumnsAxes.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n  const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n  const isValidColumnId = (id: string): boolean =>\n    fullColumnsIdsSet.has(id as CanonicalizedJson<PTableColumnId>);\n\n  // -- Filtering validation --\n  const filters = tableStateNormalized.pTableParams.filters;\n  const defaultFilters = options?.filters ?? undefined;\n  const filterColumns = filters !== null ? collectFilterSpecColumns(filters) : [];\n  const firstInvalidFilterColumn = filterColumns.find((col) => !isValidColumnId(col));\n  if (firstInvalidFilterColumn)\n    throw new Error(\n      `Invalid filter column ${firstInvalidFilterColumn}: column reference does not match the table columns`,\n    );\n  const defaultFilterColumns =\n    defaultFilters !== undefined ? collectFilterSpecColumns(defaultFilters) : [];\n  const firstInvalidDefaultFilterColumn = defaultFilterColumns.find((col) => !isValidColumnId(col));\n  if (firstInvalidDefaultFilterColumn)\n    throw new Error(\n      `Invalid default filter column ${firstInvalidDefaultFilterColumn}: column reference does not match the table columns`,\n    );\n\n  // -- Sorting validation --\n  const userSorting = tableStateNormalized.pTableParams.sorting;\n  const sorting = (isEmpty(userSorting) ? options?.sorting : userSorting) ?? [];\n  const firstInvalidSortingColumn = sorting.find(\n    (s) => !isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)),\n  );\n  if (firstInvalidSortingColumn)\n    throw new Error(\n      `Invalid sorting column ${JSON.stringify(firstInvalidSortingColumn.column)}: column reference does not match the table columns`,\n    );\n\n  const coreJoinType = options?.coreJoinType ?? \"full\";\n  const fullDef = createPTableDefV2({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate: options?.coreColumnPredicate,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  const pframeHandle = ctx.createPFrame(fullColumns);\n  if (!fullHandle || !pframeHandle) return undefined;\n\n  const hiddenColumns = new Set<PObjectId>(\n    ((): PObjectId[] => {\n      // Inner join works as a filter - all columns must be present\n      if (coreJoinType === \"inner\") return [];\n\n      const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;\n      if (hiddenColIds !== null) {\n        return hiddenColIds\n          .filter((s): s is PTableColumnIdColumn => s.type === \"column\")\n          .map((s) => s.id);\n      }\n\n      return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n    })(),\n  );\n\n  // Preserve linker columns\n  columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve core columns as they change the shape of join.\n  const coreColumnPredicate = options?.coreColumnPredicate;\n  if (coreColumnPredicate) {\n    const coreColumns = columns.flatMap((c) =>\n      coreColumnPredicate(getColumnIdAndSpec(c)) ? [c.id] : [],\n    );\n    coreColumns.forEach((c) => hiddenColumns.delete(c));\n  }\n\n  // Preserve sorted columns from being hidden\n  sorting\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve filter columns from being hidden\n  if (filters) {\n    collectFilterSpecColumns(filters)\n      .flatMap((c) => {\n        const obj = parseJson(c);\n        return obj.type === \"column\" ? [obj.id] : [];\n      })\n      .forEach((c) => hiddenColumns.delete(c));\n  }\n\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  // if at least one column is not yet computed, we can't show the table\n  if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return undefined;\n\n  const visibleDef = createPTableDefV2({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n    defaultFilters,\n  } satisfies PlDataTableModel;\n}\n\nfunction getAllLabelColumns(\n  resultPool: AxisLabelProvider & ColumnProvider,\n): PColumn<PColumnDataUniversal>[] | undefined {\n  return new PColumnCollection()\n    .addAxisLabelProvider(resultPool)\n    .addColumnProvider(resultPool)\n    .getColumns(\n      {\n        name: PColumnName.Label,\n        axes: [{}], // exactly one axis\n      },\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    );\n}\n"],"mappings":"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"}

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

@@ -1,203 +1,286 @@
 require("../../../_virtual/_rolldown/runtime.cjs");
-const require_pcolumn_data = require("../../../render/util/pcolumn_data.cjs");
-require("../../../render/index.cjs");
 const require_traverse = require("../../../filters/traverse.cjs");
-const require_filterToQuery = require("../../../filters/converters/filterToQuery.cjs");
-const require_distill = require("../../../filters/distill.cjs");
-require("../../../filters/index.cjs");
 const require_state_migration = require("../state-migration.cjs");
 const require_labels = require("../labels.cjs");
-const require_column_snapshot_provider = require("../../../columns/column_snapshot_provider.cjs");
-const require_column_collection_builder = require("../../../columns/column_collection_builder.cjs");
-const require_ctx_column_sources = require("../../../columns/ctx_column_sources.cjs");
-require("../../../columns/index.cjs");
+const require_createPTableDefV3 = require("./createPTableDefV3.cjs");
+const require_utils = require("./utils.cjs");
+const require_discoverColumns = require("./discoverColumns.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 let es_toolkit_compat = require("es-toolkit/compat");
-let es_toolkit = require("es-toolkit");
 //#region src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts
-/** Convert a PTableColumnId to a SpecQueryExpression reference. */
-function columnIdToExpr(col) {
-	if (col.type === "axis") return {
-		type: "axisRef",
-		value: col.id
+function createPlDataTableV3(ctx, options) {
+	const state = require_state_migration.upgradePlDataTableStateV2(options.tableState);
+	const primaryJoinType = options.primaryJoinType ?? "full";
+	const discovered = "discoverColumnOptions" in options ? require_discoverColumns.discoverTableColumnSnaphots(ctx, options.discoverColumnOptions) : options.columns;
+	if ((0, _milaboratories_helpers.isNil)(discovered) || discovered.length === 0) return void 0;
+	const resolved = resolveDiscoveredColumns(splitDiscoveredColumns(discovered), discovered);
+	const labelColumns = require_labels.getMatchingLabelColumns(resolved.all, require_labels.getAllLabelColumns(ctx));
+	const annotated = annotateColumnGroups(resolved, labelColumns, require_utils.deriveAllLabels({
+		columns: discovered.map((dc) => ({
+			id: dc.id,
+			spec: dc.spec,
+			linkerPath: dc.linkerPath?.map((lp) => ({ spec: lp.linker.spec }))
+		})),
+		labelColumns,
+		deriveLabelsOptions: {
+			includeNativeLabel: true,
+			...options.labelsOptions
+		}
+	}), options.columnsDisplayOptions);
+	const primaryColumnIds = new Set(discovered.filter((dc) => dc.isPrimary).map((dc) => dc.id));
+	const primaryColumns = annotated.direct.filter((c) => primaryColumnIds.has(c.id));
+	const secondaryColumns = annotated.direct.filter((c) => !primaryColumnIds.has(c.id));
+	if (primaryColumns.length === 0) return void 0;
+	const columnIsAvailable = createColumnValidationById([
+		...annotated.direct,
+		...annotated.linked.flatMap((lc) => [...annotated.linkers.get(lc.id) ?? [], lc]),
+		...annotated.labels
+	]);
+	const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);
+	const filters = concatFilters(state.pTableParams.filters, state.pTableParams.defaultFilters ?? remapedDefaultFilters);
+	validateFilters(filters, columnIsAvailable);
+	const sorting = resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered));
+	validateSorting(sorting, columnIsAvailable);
+	const fullDef = require_createPTableDefV3.createPTableDefV3({
+		primaryJoinType,
+		primaryColumns,
+		secondaryGroups: [
+			...secondaryColumns.map((c) => [c]),
+			...annotated.linked.map((lc) => [...annotated.linkers.get(lc.id) ?? [], lc]),
+			...annotated.labels.map((c) => [c])
+		],
+		filters,
+		sorting
+	});
+	const fullHandle = ctx.createPTableV2(fullDef);
+	const pframeHandle = ctx.createPFrame([
+		...annotated.direct,
+		...annotated.linked,
+		...annotated.labels,
+		...(0, _milaboratories_pl_model_common.uniqueBy)([...annotated.linkers.values()].flat(), (c) => c.id)
+	]);
+	const hiddenSpecs = state.pTableParams.hiddenColIds;
+	const hiddenColumnIds = computeHiddenColumns([...annotated.direct, ...annotated.linked], sorting, filters, hiddenSpecs);
+	const visible = buildVisibleColumns(annotated, hiddenColumnIds, labelColumns);
+	const visibleNonCoreDirect = secondaryColumns.filter((c) => !hiddenColumnIds.has(c.id));
+	const visibleLinkedGroups = buildVisibleLinkedGroups(visible.direct, visible.linked, annotated.linkers, hiddenSpecs);
+	const visibleDef = require_createPTableDefV3.createPTableDefV3({
+		primaryJoinType,
+		primaryColumns,
+		secondaryGroups: [
+			...visibleNonCoreDirect.map((c) => [c]),
+			...visibleLinkedGroups,
+			...visible.labels.map((c) => [c])
+		],
+		filters,
+		sorting
+	});
+	const visibleHandle = ctx.createPTableV2(visibleDef);
+	return {
+		sourceId: state.pTableParams.sourceId,
+		fullTableHandle: fullHandle,
+		fullPframeHandle: pframeHandle,
+		visibleTableHandle: visibleHandle,
+		defaultFilters: remapedDefaultFilters
 	};
+}
+/** Split discovered columns into direct (no linker path) and linked (with linker path). */
+function splitDiscoveredColumns(columns) {
 	return {
-		type: "columnRef",
-		value: col.id
+		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)
 	};
 }
-/** Wrap a SpecQuery as a SpecQueryJoinEntry with empty qualifications. */
-function joinEntry(input) {
+/** Resolve DiscoveredColumn snapshots into PColumn objects with lazily-evaluated data. */
+function resolveDiscoveredColumns(split, allDiscovered) {
+	const linked = split.linked.map(resolveSnapshot);
+	const linkers = new Map(split.linked.filter((dc) => !(0, _milaboratories_helpers.isNil)(dc.linkerPath)).map((dc, i) => [linked[i].id, dc.linkerPath.map((s) => resolveSnapshot(s.linker))]));
 	return {
-		entry: input,
-		qualifications: []
+		all: allDiscovered.map(resolveSnapshot),
+		direct: split.direct.map(resolveSnapshot),
+		linked,
+		linkers
 	};
 }
-function createPTableDef(params) {
-	let coreColumns = params.columns;
-	const secondaryColumns = [];
-	if ((0, es_toolkit.isFunction)(params.coreColumnPredicate)) {
-		coreColumns = [];
-		for (const c of params.columns) if (params.coreColumnPredicate((0, _milaboratories_pl_model_common.getColumnIdAndSpec)(c))) coreColumns.push(c);
-		else secondaryColumns.push(c);
-	}
-	secondaryColumns.push(...params.labelColumns);
-	let query = {
-		type: "outerJoin",
-		primary: joinEntry({
-			type: params.coreJoinType === "inner" ? "innerJoin" : "fullJoin",
-			entries: coreColumns.map((c) => joinEntry({
-				type: "column",
-				column: c
-			}))
-		}),
-		secondary: secondaryColumns.map((c) => joinEntry({
-			type: "column",
-			column: c
-		}))
+/** Annotate all column groups with derived labels and display options. */
+function annotateColumnGroups(resolved, labelColumns, derivedLabels, displayOptions) {
+	return {
+		direct: require_utils.withTableVisualAnnotations(displayOptions, require_utils.withLabelAnnotations(derivedLabels, resolved.direct)),
+		linked: require_utils.withTableVisualAnnotations(displayOptions, require_utils.withLabelAnnotations(derivedLabels, resolved.linked)),
+		linkers: new Map([...resolved.linkers].map(([id, cols]) => [id, require_utils.withLabelAnnotations(derivedLabels, cols)])),
+		labels: require_utils.withLabelAnnotations(derivedLabels, labelColumns)
 	};
-	if (params.filters !== null) {
-		const nonEmpty = require_distill.distillFilterSpec(params.filters);
-		if (!(0, es_toolkit.isNil)(nonEmpty)) {
-			const pridicate = require_filterToQuery.filterSpecToSpecQueryExpr(nonEmpty);
-			if (!(0, _milaboratories_pl_model_common.isBooleanExpression)(pridicate)) throw new Error(`Filter conversion produced a non-boolean expression (got type "${pridicate.type}"), expected a boolean predicate for query filtering`);
-			query = {
-				type: "filter",
-				input: query,
-				predicate: pridicate
-			};
-		}
-	}
-	if (params.sorting.length > 0) query = {
-		type: "sort",
-		input: query,
-		sortBy: params.sorting.map((s) => ({
-			expression: columnIdToExpr(s.column),
-			ascending: s.ascending,
-			nullsFirst: !s.naAndAbsentAreLeastValues
-		}))
+}
+/** Build an index of all valid column IDs (axes + columns) for filter/sorting validation. */
+function createColumnValidationById(fullColumns) {
+	const allIds = [...(0, _milaboratories_pl_model_common.uniqueBy)(fullColumns.flatMap((c) => c.spec.axesSpec.map(_milaboratories_pl_model_common.getAxisId)), (a) => (0, _milaboratories_pl_model_common.canonicalizeJson)(a)).map((a) => ({
+		type: "axis",
+		id: a
+	})), ...fullColumns.map((c) => ({
+		type: "column",
+		id: c.id
+	}))];
+	const validIdSet = new Set(allIds.map((c) => (0, _milaboratories_pl_model_common.canonicalizeJson)(c)));
+	return (id) => {
+		return validIdSet.has(id);
+	};
+}
+/** Validate that all column references in filters exist in the table. */
+function validateFilters(filters, isValidColumnId) {
+	if (filters == null) return;
+	const firstInvalid = require_traverse.collectFilterSpecColumns(filters).find((col) => !isValidColumnId(col));
+	if (firstInvalid !== void 0) throw new Error(`Invalid filter column ${firstInvalid}: column reference does not match the table columns`);
+}
+/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */
+function concatFilters(a, b) {
+	if ((0, _milaboratories_helpers.isNil)(a)) return b;
+	if ((0, _milaboratories_helpers.isNil)(b)) return a;
+	return {
+		...a,
+		filters: [...a.filters, ...b.filters]
 	};
-	return { query };
 }
-/** Check if column should be omitted from the table */
-function isColumnHidden(spec) {
-	return (0, _milaboratories_pl_model_common.readAnnotation)(spec, _milaboratories_pl_model_common.Annotation.Table.Visibility) === "hidden";
+/** Pick user sorting from state if non-empty, otherwise fall back to options default. */
+function resolveSorting(userSorting, defaultSorting) {
+	return ((0, es_toolkit_compat.isEmpty)(userSorting) ? defaultSorting : userSorting) ?? [];
 }
-/** Check if column is hidden by default */
-function isColumnOptional(spec) {
-	return (0, _milaboratories_pl_model_common.readAnnotation)(spec, _milaboratories_pl_model_common.Annotation.Table.Visibility) === "optional";
+/** Validate that all column references in sorting exist in the table. */
+function validateSorting(sorting, isValidColumnId) {
+	const firstInvalid = sorting.find((s) => !isValidColumnId((0, _milaboratories_pl_model_common.canonicalizeJson)(s.column)));
+	if (firstInvalid !== void 0) throw new Error(`Invalid sorting column ${JSON.stringify(firstInvalid.column)}: column reference does not match the table columns`);
 }
-function createPlDataTableV3(ctx, options) {
-	const providers = options.source ? normalizeSourceList(options.source).filter(require_column_snapshot_provider.isColumnSnapshotProvider) : require_ctx_column_sources.collectCtxColumnSnapshotProviders(ctx);
-	if (providers.length === 0) return void 0;
-	const builder = new require_column_collection_builder.ColumnCollectionBuilder(ctx.services.pframeSpec).addSources(providers);
-	const anchors = options.columns.anchors;
-	const collection = (0, es_toolkit.isNil)(anchors) ? builder.build() : builder.build({ anchors });
-	if (!collection) return void 0;
-	try {
-		const findOptions = options.columns ? {
-			include: options.columns.include,
-			exclude: options.columns.exclude,
-			mode: options.columns.mode,
-			maxHops: options.columns.maxHops
-		} : void 0;
-		const dataSnapshots = collection.findColumns(findOptions).map((v) => "column" in v ? v.column : v).filter((s) => !isColumnHidden(s.spec));
-		if (dataSnapshots.length === 0) return void 0;
-		const columns = [];
-		for (const snap of dataSnapshots) {
-			if (!snap.data) return void 0;
-			const data = snap.data.get();
-			if (data === void 0) return void 0;
-			columns.push({
-				id: snap.id,
-				spec: snap.spec,
-				data
-			});
+/** Determine which columns should be hidden based on state or optional-column defaults. */
+function computeHiddenColumns(columns, sorting, filters, hiddenSpecs) {
+	const alwaysHidden = columns.filter((c) => require_utils.isColumnHidden(c.spec)).map((c) => c.id);
+	const optionalHidden = !(0, _milaboratories_helpers.isNil)(hiddenSpecs) ? hiddenSpecs.filter((s) => s.type === "column").map((s) => s.id) : columns.filter((c) => require_utils.isColumnOptional(c.spec)).map((c) => c.id);
+	const initial = [...alwaysHidden, ...optionalHidden];
+	const preserved = collectPreservedColumnIds(sorting, filters);
+	return new Set(initial.filter((id) => !preserved.has(id)));
+}
+/**
+* Build visible linked column groups. Non-hidden groups are included fully;
+* hidden groups are trimmed to only the prefix that brings axes not yet
+* covered by earlier groups (visible or previously trimmed).
+*/
+function buildVisibleLinkedGroups(direct, linked, linkers, hiddenSpecs) {
+	const result = [];
+	const coveredAxisIds = /* @__PURE__ */ new Set();
+	const collectAxes = (group) => {
+		for (const col of group) for (const as of col.spec.axesSpec) coveredAxisIds.add((0, _milaboratories_pl_model_common.canonicalizeJson)((0, _milaboratories_pl_model_common.getAxisId)(as)));
+	};
+	collectAxes(direct);
+	for (const lc of linked) {
+		const group = [...linkers.get(lc.id) ?? [], lc];
+		result.push(group);
+		collectAxes(group);
+	}
+	for (const group of linkers.values()) {
+		const trimmed = trimGroupByVisibleAxes(group, hiddenSpecs, coveredAxisIds);
+		if (trimmed.length > 0) {
+			result.push(trimmed);
+			collectAxes(trimmed);
 		}
-		const tableStateNormalized = require_state_migration.upgradePlDataTableStateV2(options.state);
-		const allLabelColumns = require_labels.getAllLabelColumns(ctx.resultPool);
-		if (!allLabelColumns) return void 0;
-		const fullLabelColumns = require_labels.getMatchingLabelColumns(columns.map(_milaboratories_pl_model_common.getColumnIdAndSpec), allLabelColumns);
-		const fullColumns = [...columns, ...fullLabelColumns];
-		const fullColumnsIds = [...(0, _milaboratories_pl_model_common.uniqueBy)(fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => (0, _milaboratories_pl_model_common.getAxisId)(a))), (a) => (0, _milaboratories_pl_model_common.canonicalizeJson)(a)).map((a) => ({
-			type: "axis",
-			id: a
-		})), ...fullColumns.map((c) => ({
-			type: "column",
-			id: c.id
-		}))];
-		const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => (0, _milaboratories_pl_model_common.canonicalizeJson)(c)));
-		const isValidColumnId = (id) => fullColumnsIdsSet.has(id);
-		const stateFilters = tableStateNormalized.pTableParams.filters;
-		const opsFilters = options?.filters ?? null;
-		const filters = stateFilters != null && opsFilters != null ? {
-			type: "and",
-			filters: [stateFilters, opsFilters]
-		} : stateFilters ?? opsFilters;
-		const firstInvalidFilterColumn = (filters ? require_traverse.collectFilterSpecColumns(filters) : []).find((col) => !isValidColumnId(col));
-		if (firstInvalidFilterColumn) throw new Error(`Invalid filter column ${firstInvalidFilterColumn}: column reference does not match the table columns`);
-		const userSorting = tableStateNormalized.pTableParams.sorting;
-		const sorting = ((0, es_toolkit_compat.isEmpty)(userSorting) ? options?.sorting : userSorting) ?? [];
-		const firstInvalidSortingColumn = sorting.find((s) => !isValidColumnId((0, _milaboratories_pl_model_common.canonicalizeJson)(s.column)));
-		if (firstInvalidSortingColumn) throw new Error(`Invalid sorting column ${JSON.stringify(firstInvalidSortingColumn.column)}: column reference does not match the table columns`);
-		const coreJoinType = options?.coreJoinType ?? "full";
-		const fullDef = createPTableDef({
-			columns,
-			labelColumns: fullLabelColumns,
-			coreJoinType,
-			filters,
-			sorting,
-			coreColumnPredicate: options?.coreColumnPredicate
-		});
-		const fullHandle = ctx.createPTableV2(fullDef);
-		const pframeHandle = ctx.createPFrame(fullColumns);
-		if (!fullHandle || !pframeHandle) return void 0;
-		const hiddenColumns = new Set((() => {
-			if (coreJoinType === "inner") return [];
-			const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;
-			if (hiddenColIds) return hiddenColIds;
-			return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);
-		})());
-		columns.filter((c) => (0, _milaboratories_pl_model_common.isLinkerColumn)(c.spec)).forEach((c) => hiddenColumns.delete(c.id));
-		const coreColumnPredicate = options?.coreColumnPredicate;
-		if (coreColumnPredicate) columns.flatMap((c) => coreColumnPredicate((0, _milaboratories_pl_model_common.getColumnIdAndSpec)(c)) ? [c.id] : []).forEach((c) => hiddenColumns.delete(c));
-		sorting.map((s) => s.column).filter((c) => c.type === "column").forEach((c) => hiddenColumns.delete(c.id));
-		if (filters) require_traverse.collectFilterSpecColumns(filters).flatMap((c) => {
-			const obj = (0, _milaboratories_pl_model_common.parseJson)(c);
-			return obj.type === "column" ? [obj.id] : [];
-		}).forEach((c) => hiddenColumns.delete(c));
-		const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));
-		const visibleLabelColumns = require_labels.getMatchingLabelColumns(visibleColumns.map(_milaboratories_pl_model_common.getColumnIdAndSpec), allLabelColumns);
-		if (!require_pcolumn_data.allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return void 0;
-		const visibleDef = createPTableDef({
-			columns: visibleColumns,
-			labelColumns: visibleLabelColumns,
-			coreJoinType,
-			filters,
-			sorting,
-			coreColumnPredicate
-		});
-		const visibleHandle = ctx.createPTableV2(visibleDef);
-		if (!visibleHandle) return void 0;
+	}
+	return result;
+}
+/**
+* For a linked column group [linker1, ..., linkerN, column], find the rightmost
+* element that has at least one non-hidden and not-yet-covered axis.
+* Return the prefix up to and including that element.
+* If no element has such an axis, return empty array.
+*/
+function trimGroupByVisibleAxes(group, hiddenSpecs, coveredAxisIds) {
+	if (hiddenSpecs === null) return group;
+	const hiddenAxisIds = new Set(hiddenSpecs.filter((s) => s.type === "axis").map((s) => (0, _milaboratories_pl_model_common.canonicalizeJson)(s.id)));
+	const uncoveredAxisIds = new Set(group.flatMap((c) => c.spec.axesSpec.map((as) => (0, _milaboratories_pl_model_common.canonicalizeJson)((0, _milaboratories_pl_model_common.getAxisId)(as)))).filter((id) => !hiddenAxisIds.has(id) && !coveredAxisIds.has(id)));
+	let lastNeeded = -1;
+	for (let i = 0; i < group.length; i++) {
+		const newAxes = group[i].spec.axesSpec.map((as) => (0, _milaboratories_pl_model_common.canonicalizeJson)((0, _milaboratories_pl_model_common.getAxisId)(as))).filter((id) => uncoveredAxisIds.has(id));
+		if (newAxes.length > 0) {
+			for (const id of newAxes) uncoveredAxisIds.delete(id);
+			lastNeeded = i;
+		}
+	}
+	return lastNeeded === -1 ? [] : group.slice(0, lastNeeded + 1);
+}
+/** Collect IDs of columns that must remain visible (sorted, filtered). */
+function collectPreservedColumnIds(sorting, filters) {
+	const sortedIds = (sorting ?? []).map((s) => s.column).filter((c) => c.type === "column").map((c) => c.id);
+	const filterIds = !(0, _milaboratories_helpers.isNil)(filters) ? require_traverse.collectFilterSpecColumns(filters).flatMap((c) => {
+		const obj = (0, _milaboratories_pl_model_common.parseJson)(c);
+		return obj.type === "column" ? [obj.id] : [];
+	}) : [];
+	return new Set([...sortedIds, ...filterIds]);
+}
+/** 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));
+	return {
+		direct,
+		linked,
+		labels: require_labels.getMatchingLabelColumns([...direct, ...linked].map(_milaboratories_pl_model_common.getColumnIdAndSpec), originalLabelColumns)
+	};
+}
+/** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */
+function resolveSnapshot(snap) {
+	return {
+		id: snap.id,
+		spec: snap.spec,
+		data: snap.data?.get()
+	};
+}
+/** Remap column references in sorting entries. */
+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`);
 		return {
-			sourceId: tableStateNormalized.pTableParams.sourceId,
-			fullTableHandle: fullHandle,
-			fullPframeHandle: pframeHandle,
-			visibleTableHandle: visibleHandle
+			...s,
+			column: {
+				type: "column",
+				id: column.id
+			}
 		};
-	} finally {
-		collection.dispose();
-	}
+	});
 }
-/** Normalize raw ColumnSource | ColumnSource[] into a flat list of sources. */
-function normalizeSourceList(source) {
-	if (Array.isArray(source) && source.length > 0 && (Array.isArray(source[0]) || require_column_snapshot_provider.isColumnSnapshotProvider(source[0]))) return source;
-	return [source];
+/** Remap column references in a filter tree. */
+function remapFilterColumnIds(filters, columns) {
+	if ((0, _milaboratories_helpers.isNil)(filters)) return filters;
+	const map = (tableColumnId) => {
+		const parsed = (0, _milaboratories_pl_model_common.parseJson)(tableColumnId);
+		if (parsed.type === "axis") return tableColumnId;
+		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
+		});
+	};
+	return require_traverse.traverseFilterSpec(filters, {
+		leaf: (leaf) => {
+			if (leaf.type === void 0) return leaf;
+			const result = { ...leaf };
+			if ("column" in result) result.column = map(result.column);
+			if ("rhs" in result) result.rhs = map(result.rhs);
+			return result;
+		},
+		and: (results) => ({
+			type: "and",
+			filters: results
+		}),
+		or: (results) => ({
+			type: "or",
+			filters: results
+		}),
+		not: (result) => ({
+			type: "not",
+			filter: result
+		})
+	});
 }
 //#endregion
-exports.createPTableDef = createPTableDef;
 exports.createPlDataTableV3 = createPlDataTableV3;
-exports.isColumnHidden = isColumnHidden;
-exports.isColumnOptional = isColumnOptional;
 
 //# sourceMappingURL=createPlDataTableV3.cjs.map