@platforma-sdk/model 1.79.27 → 1.80.2

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

@@ -2,14 +2,17 @@ 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 { ColumnLazyImpl } from "../../../columns/column_lazy.js";
+import "../../../columns/index.js";
+import { collectFilterSpecColumns, traverseFilterSpec } from "../../../filters/traverse.js";
 import { upgradePlDataTableStateV2 } from "../state-migration.js";
 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 { createColumnResolver } from "../columnResolver.js";
+import { Annotation, PColumnName, getColumnIdAndSpec, isLinkerColumn } from "@milaboratories/pl-model-common";
+import { isNil } from "@milaboratories/helpers";
 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
@@ -38,31 +41,19 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 		};
 	});
 	const fullColumns = [...columns, ...fullLabelColumns];
-	const fullColumnsIds = [...uniqueBy(fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))), (a) => canonicalizeJson(a)).map((a) => ({
-		type: "axis",
-		id: a
-	})), ...fullColumns.map((c) => ({
-		type: "column",
-		id: c.id
-	}))];
-	const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson(c)));
-	const isValidColumnId = (id) => fullColumnsIdsSet.has(id);
-	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 resolver = createColumnResolver(fullColumns.map((c) => ColumnLazyImpl.fromColumn(c)), { warn: ctx.logWarn.bind(ctx) });
+	const rawFilters = tableStateNormalized.pTableParams.filters;
+	const rawDefaultFilters = options?.filters ?? void 0;
+	const filters = remapFiltersThrowing(rawFilters, resolver, "filter");
+	const defaultFilters = remapFiltersThrowing(rawDefaultFilters ?? null, resolver, "default filter");
 	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 sorting = remapSortingThrowing((isNil(userSorting) ? options?.sorting : userSorting) ?? [], resolver);
 	const coreJoinType = options?.coreJoinType ?? "full";
 	const fullDef = createPTableDefV2({
 		columns,
 		labelColumns: fullLabelColumns,
 		coreJoinType,
-		filters,
+		filters: filters ?? null,
 		sorting,
 		coreColumnPredicate: options?.coreColumnPredicate
 	});
@@ -79,10 +70,7 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 	const coreColumnPredicate = options?.coreColumnPredicate;
 	if (coreColumnPredicate) columns.flatMap((c) => coreColumnPredicate(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) collectFilterSpecColumns(filters).flatMap((c) => {
-		const obj = parseJson(c);
-		return obj.type === "column" ? [obj.id] : [];
-	}).forEach((c) => hiddenColumns.delete(c));
+	if (filters) collectFilterSpecColumns(filters).flatMap((c) => c.type === "column" ? [c.id] : []).forEach((c) => hiddenColumns.delete(c));
 	const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));
 	const visibleLabelColumns = getMatchingLabelColumns(visibleColumns.map(getColumnIdAndSpec), allLabelColumns);
 	if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return void 0;
@@ -90,7 +78,7 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 		columns: visibleColumns,
 		labelColumns: visibleLabelColumns,
 		coreJoinType,
-		filters,
+		filters: filters ?? null,
 		sorting,
 		coreColumnPredicate
 	});
@@ -101,9 +89,53 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 		fullTableHandle: fullHandle,
 		fullPframeHandle: pframeHandle,
 		visibleTableHandle: visibleHandle,
-		defaultFilters
+		defaultFilters: defaultFilters ?? void 0
 	};
 }
+/** Rewrite filter column refs through the resolver; throw on any unresolved ref. */
+function remapFiltersThrowing(filters, resolver, label) {
+	if (isNil(filters)) return filters;
+	return traverseFilterSpec(filters, {
+		leaf: (leaf) => {
+			if (leaf.type === void 0) return leaf;
+			const result = { ...leaf };
+			if ("column" in result) {
+				const c = resolver(result.column);
+				if (isNil(c)) throw new Error(`Invalid ${label} column ${JSON.stringify(result.column)}: column reference does not match the table columns`);
+				result.column = c;
+			}
+			if ("rhs" in result) {
+				const c = resolver(result.rhs);
+				if (isNil(c)) throw new Error(`Invalid ${label} column ${JSON.stringify(result.rhs)}: column reference does not match the table columns`);
+				result.rhs = c;
+			}
+			return result;
+		},
+		and: (results) => ({
+			type: "and",
+			filters: results
+		}),
+		or: (results) => ({
+			type: "or",
+			filters: results
+		}),
+		not: (result) => ({
+			type: "not",
+			filter: result
+		})
+	});
+}
+/** Rewrite sorting column refs through the resolver; throw on any unresolved ref. */
+function remapSortingThrowing(sorting, resolver) {
+	return sorting.map((s) => {
+		const c = resolver(s.column);
+		if (isNil(c)) throw new Error(`Invalid sorting column ${JSON.stringify(s.column)}: column reference does not match the table columns`);
+		return {
+			...s,
+			column: c
+		};
+	});
+}
 function getAllLabelColumns(resultPool) {
 	return new PColumnCollection().addAxisLabelProvider(resultPool).addColumnProvider(resultPool).getColumns({
 		name: PColumnName.Label,

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  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 \"../typesV7\";\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":";;;;;;;;;;;;;;;;;;;;;;AAsDA,SAAgB,oBACd,KACA,SACA,YACA,SAC8B;CAC9B,IAAI,QAAQ,WAAW,GAAG,OAAO,KAAA;CAEjC,MAAM,uBAAuB,0BAA0B,UAAU;CACjE,MAAM,kBAAkB,mBAAmB,IAAI,UAAU,KAAK,CAAC;CAE/D,IAAI,mBAAmB,wBAAwB,SAAS,eAAe;CACvE,mBAAmB,aAAa,kBAAkB,UAAU,EAAE,oBAAoB,KAAK,CAAC,CAAC,CAAC,KACvF,MAAM;EACL,OAAO;GACL,GAAG,EAAE;GACL,MAAM;IACJ,GAAG,EAAE,MAAM;IACX,aAAa;KACX,GAAG,EAAE,MAAM,KAAK;MACf,WAAW,QAAQ,EAAE;IACxB;GACF;EACF;CACF,CACF;CAEA,MAAM,cAAc,CAAC,GAAG,SAAS,GAAG,gBAAgB;CAMpD,MAAM,iBAAmC,CACvC,GALsB,SACtB,YAAY,SAAS,MAAM,EAAE,KAAK,SAAS,KAAK,MAAM,UAAU,CAAC,CAAC,CAAC,IAClE,MAAM,iBAAyB,CAAC,CAGhB,CAAC,CAAC,KAAK,OAAO;EAAE,MAAM;EAAQ,IAAI;CAAE,EAA+B,GACpF,GAAG,YAAY,KAAK,OAAO;EAAE,MAAM;EAAU,IAAI,EAAE;CAAG,EAAiC,CACzF;CACA,MAAM,oBAAoB,IAAI,IAAI,eAAe,KAAK,MAAM,iBAAiC,CAAC,CAAC,CAAC;CAChG,MAAM,mBAAmB,OACvB,kBAAkB,IAAI,EAAuC;CAG/D,MAAM,UAAU,qBAAqB,aAAa;CAClD,MAAM,iBAAiB,SAAS,WAAW,KAAA;CAE3C,MAAM,4BADgB,YAAY,OAAO,yBAAyB,OAAO,IAAI,CAAC,EAAA,CAC/B,MAAM,QAAQ,CAAC,gBAAgB,GAAG,CAAC;CAClF,IAAI,0BACF,MAAM,IAAI,MACR,yBAAyB,yBAAyB,oDACpD;CAGF,MAAM,mCADJ,mBAAmB,KAAA,IAAY,yBAAyB,cAAc,IAAI,CAAC,EAAA,CAChB,MAAM,QAAQ,CAAC,gBAAgB,GAAG,CAAC;CAChG,IAAI,iCACF,MAAM,IAAI,MACR,iCAAiC,gCAAgC,oDACnE;CAGF,MAAM,cAAc,qBAAqB,aAAa;CACtD,MAAM,WAAW,QAAQ,WAAW,IAAI,SAAS,UAAU,gBAAgB,CAAC;CAC5E,MAAM,4BAA4B,QAAQ,MACvC,MAAM,CAAC,gBAAgB,iBAAiC,EAAE,MAAM,CAAC,CACpE;CACA,IAAI,2BACF,MAAM,IAAI,MACR,0BAA0B,KAAK,UAAU,0BAA0B,MAAM,EAAE,oDAC7E;CAEF,MAAM,eAAe,SAAS,gBAAgB;CAC9C,MAAM,UAAU,kBAAkB;EAChC;EACA,cAAc;EACd;EACA;EACA;EACA,qBAAqB,SAAS;CAChC,CAAC;CAED,MAAM,aAAa,IAAI,eAAe,OAAO;CAC7C,MAAM,eAAe,IAAI,aAAa,WAAW;CACjD,IAAI,CAAC,cAAc,CAAC,cAAc,OAAO,KAAA;CAEzC,MAAM,gBAAgB,IAAI,WACJ;EAElB,IAAI,iBAAiB,SAAS,OAAO,CAAC;EAEtC,MAAM,eAAe,qBAAqB,aAAa;EACvD,IAAI,iBAAiB,MACnB,OAAO,aACJ,QAAQ,MAAiC,EAAE,SAAS,QAAQ,CAAC,CAC7D,KAAK,MAAM,EAAE,EAAE;EAGpB,OAAO,QAAQ,QAAQ,MAAM,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,EAAE;CACxE,EAAA,CAAG,CACL;CAGA,QAAQ,QAAQ,MAAM,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,MAAM,cAAc,OAAO,EAAE,EAAE,CAAC;CAGvF,MAAM,sBAAsB,SAAS;CACrC,IAAI,qBAIF,QAH4B,SAAS,MACnC,oBAAoB,mBAAmB,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAE/C,CAAC,CAAC,SAAS,MAAM,cAAc,OAAO,CAAC,CAAC;CAIpD,QACG,KAAK,MAAM,EAAE,MAAM,CAAC,CACpB,QAAQ,MAAiC,EAAE,SAAS,QAAQ,CAAC,CAC7D,SAAS,MAAM,cAAc,OAAO,EAAE,EAAE,CAAC;CAG5C,IAAI,SACF,yBAAyB,OAAO,CAAC,CAC9B,SAAS,MAAM;EACd,MAAM,MAAM,UAAU,CAAC;EACvB,OAAO,IAAI,SAAS,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC;CAC7C,CAAC,CAAC,CACD,SAAS,MAAM,cAAc,OAAO,CAAC,CAAC;CAG3C,MAAM,iBAAiB,QAAQ,QAAQ,MAAM,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC;CACrE,MAAM,sBAAsB,wBAC1B,eAAe,IAAI,kBAAkB,GACrC,eACF;CAGA,IAAI,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,OAAO,KAAA;CAE3E,MAAM,aAAa,kBAAkB;EACnC,SAAS;EACT,cAAc;EACd;EACA;EACA;EACA;CACF,CAAC;CACD,MAAM,gBAAgB,IAAI,eAAe,UAAU;CAEnD,IAAI,CAAC,eAAe,OAAO,KAAA;CAE3B,OAAO;EACL,UAAU,qBAAqB,aAAa;EAC5C,iBAAiB;EACjB,kBAAkB;EAClB,oBAAoB;EACpB;CACF;AACF;AAEA,SAAS,mBACP,YAC6C;CAC7C,OAAO,IAAI,kBAAkB,CAAC,CAC3B,qBAAqB,UAAU,CAAC,CAChC,kBAAkB,UAAU,CAAC,CAC7B,WACC;EACE,MAAM,YAAY;EAClB,MAAM,CAAC,CAAC,CAAC;CACX,GACA;EAAE,iBAAiB;EAAM,yBAAyB;CAAM,CAC1D;AACJ"}
+{"version":3,"file":"createPlDataTableV2.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts"],"sourcesContent":["import type {\n  ColumnUniversalId,\n  FilterSpecNode,\n  PColumn,\n  PTableColumnIdColumn,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  getColumnIdAndSpec,\n  isLinkerColumn,\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 {\n  CreatePlDataTableOps,\n  PlDataTableFilters,\n  PlDataTableFilterSpecLeaf,\n  PlDataTableModel,\n} from \"../typesV8\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport { getMatchingLabelColumns } from \"../labels\";\nimport { collectFilterSpecColumns, traverseFilterSpec } from \"../../../filters/traverse\";\nimport { createPTableDefV2 } from \"./createPTableDefV2\";\nimport { isColumnOptional } from \"./utils\";\nimport { ColumnLazyImpl } from \"../../../columns\";\nimport { createColumnResolver, type ColumnResolver } from \"../columnResolver\";\nimport { isNil, type Nil } from \"@milaboratories/helpers\";\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 resolver = createColumnResolver(\n    fullColumns.map((c) => ColumnLazyImpl.fromColumn(c)),\n    { warn: ctx.logWarn.bind(ctx) },\n  );\n\n  // -- Filtering: rewrite via resolver, throw if any reference is unresolved --\n  const rawFilters = tableStateNormalized.pTableParams.filters;\n  const rawDefaultFilters = options?.filters ?? undefined;\n  const filters = remapFiltersThrowing(rawFilters, resolver, \"filter\");\n  const defaultFilters = remapFiltersThrowing(\n    rawDefaultFilters ?? null,\n    resolver,\n    \"default filter\",\n  );\n\n  // -- Sorting: rewrite via resolver, throw if any reference is unresolved --\n  const userSorting = tableStateNormalized.pTableParams.sorting;\n  const rawSorting = (isNil(userSorting) ? options?.sorting : userSorting) ?? [];\n  const sorting = remapSortingThrowing(rawSorting, resolver);\n\n  const coreJoinType = options?.coreJoinType ?? \"full\";\n  const fullDef = createPTableDefV2({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters: filters ?? null,\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<ColumnUniversalId>(\n    ((): ColumnUniversalId[] => {\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) => (c.type === \"column\" ? [c.id] : []))\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: filters ?? null,\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: defaultFilters ?? undefined,\n  } satisfies PlDataTableModel;\n}\n\n/** Rewrite filter column refs through the resolver; throw on any unresolved ref. */\nfunction remapFiltersThrowing(\n  filters: Nil | PlDataTableFilters,\n  resolver: ColumnResolver,\n  label: string,\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  type Node = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n  return traverseFilterSpec(filters, {\n    leaf: (leaf): Node => {\n      if (leaf.type === undefined) return leaf;\n      const result = { ...leaf };\n      if (\"column\" in result) {\n        const c = resolver(result.column);\n        if (isNil(c))\n          throw new Error(\n            `Invalid ${label} column ${JSON.stringify(result.column)}: column reference does not match the table columns`,\n          );\n        result.column = c;\n      }\n      if (\"rhs\" in result) {\n        const c = resolver(result.rhs);\n        if (isNil(c))\n          throw new Error(\n            `Invalid ${label} column ${JSON.stringify(result.rhs)}: column reference does not match the table columns`,\n          );\n        result.rhs = c;\n      }\n      return result;\n    },\n    and: (results): Node => ({ type: \"and\", filters: results }),\n    or: (results): Node => ({ type: \"or\", filters: results }),\n    not: (result): Node => ({ type: \"not\", filter: result }),\n  }) as PlDataTableFilters;\n}\n\n/** Rewrite sorting column refs through the resolver; throw on any unresolved ref. */\nfunction remapSortingThrowing(sorting: PTableSorting[], resolver: ColumnResolver): PTableSorting[] {\n  return sorting.map((s) => {\n    const c = resolver(s.column);\n    if (isNil(c))\n      throw new Error(\n        `Invalid sorting column ${JSON.stringify(s.column)}: column reference does not match the table columns`,\n      );\n    return { ...s, column: c };\n  });\n}\n\nfunction getAllLabelColumns(\n  resultPool: AxisLabelProvider & ColumnProvider,\n): undefined | PColumn<undefined | PColumnDataUniversal>[] {\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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"}