@platforma-sdk/model 1.59.3 → 1.60.2

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

@@ -0,0 +1 @@
+{"version":3,"file":"createPlDataTableV3.cjs","names":["distillFilterSpec","filterSpecToSpecQueryExpr","Annotation","isColumnSnapshotProvider","collectCtxColumnSnapshotProviders","ColumnCollectionBuilder","upgradePlDataTableStateV2","getAllLabelColumns","getMatchingLabelColumns","getColumnIdAndSpec","collectFilterSpecColumns","allPColumnsReady"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  DataInfo,\n  PColumn,\n  PColumnIdAndSpec,\n  PColumnValues,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableDefV2,\n  PTableSorting,\n  SpecQuery,\n  SingleAxisSelector,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PColumnSpec,\n  PlRef,\n  MultiColumnSelector,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  readAnnotation,\n  isBooleanExpression,\n  parseJson,\n  uniqueBy,\n} from \"@milaboratories/pl-model-common\";\nimport { filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from \"../../../render\";\nimport { allPColumnsReady } from \"../../../render\";\nimport { isFunction, isNil } from \"es-toolkit\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport { distillFilterSpec } from \"../../../filters/distill\";\nimport type { PlDataTableFilters, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { ColumnSource, MatchingMode } from \"../../../columns\";\nimport { ColumnCollectionBuilder } from \"../../../columns\";\nimport { isColumnSnapshotProvider } from \"../../../columns/column_snapshot_provider\";\nimport { collectCtxColumnSnapshotProviders } from \"../../../columns/ctx_column_sources\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"../labels\";\n\n/** Convert a PTableColumnId to a SpecQueryExpression reference. */\nexport function columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  if (col.type === \"axis\") {\n    return { type: \"axisRef\", value: col.id as SingleAxisSelector };\n  }\n  return { type: \"columnRef\", value: col.id };\n}\n\n/** Wrap a SpecQuery as a SpecQueryJoinEntry with empty qualifications. */\nexport function joinEntry<C>(input: SpecQuery<C>): SpecQueryJoinEntry<C> {\n  return { entry: input, qualifications: [] };\n}\n\nexport function createPTableDef(params: {\n  columns: PColumn<PColumnDataUniversal>[];\n  labelColumns: PColumn<PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: null | PlDataTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> {\n  let coreColumns = params.columns;\n  const secondaryColumns: typeof params.columns = [];\n\n  if (isFunction(params.coreColumnPredicate)) {\n    coreColumns = [];\n    for (const c of params.columns)\n      if (params.coreColumnPredicate(getColumnIdAndSpec(c))) coreColumns.push(c);\n      else secondaryColumns.push(c);\n  }\n\n  secondaryColumns.push(...params.labelColumns);\n\n  // Build SpecQuery directly from columns\n  const coreJoinQuery: SpecQuery<\n    PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>\n  > = {\n    type: params.coreJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: coreColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  let query: SpecQuery<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> = {\n    type: \"outerJoin\",\n    primary: joinEntry(coreJoinQuery),\n    secondary: secondaryColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  // Apply filters\n  if (params.filters !== null) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  // Apply sorting\n  if (params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: !s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\n/** Check if column should be omitted from the table */\nexport function isColumnHidden(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"hidden\";\n}\n\n/** Check if column is hidden by default */\nexport function isColumnOptional(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"optional\";\n}\n\n/** Structured source config — selectors/anchors instead of raw ColumnSource. */\ntype ColumnsSelectorConfig = {\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  exclude?: MultiColumnSelector | MultiColumnSelector[];\n  anchors?: Record<string, PlRef | PObjectId | PColumnSpec>;\n  mode?: MatchingMode;\n  maxHops?: number;\n};\n\nexport type createPlDataTableOptionsV3 = {\n  source?: ColumnSource | ColumnSource[];\n  columns: ColumnsSelectorConfig;\n\n  // Existing from V2\n  filters?: PlDataTableFilters;\n  sorting?: PTableSorting[];\n  coreJoinType?: \"inner\" | \"full\";\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n\n  state?: PlDataTableStateV2;\n};\n\n// interface ColumnDisplayConfig {\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\n// interface ColumnOrderRule {\n//   match: ColumnMatcher;\n//   /** Higher number = further left in table */\n//   priority: number;\n// }\n\n// interface ColumnVisibilityRule {\n//   match: ColumnMatcher;\n//   visibility: \"default\" | \"optional\" | \"hidden\";\n// }\n\n// type ColumnMatcher =\n//   | ((spec: PColumnSpec) => boolean)\n//   | { name: string | string[] }\n//   | { annotation: Record<string, string> }\n//   | { ids: Set<string> };\n\nexport function createPlDataTableV3<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n  const providers = options.source\n    ? normalizeSourceList(options.source).filter(isColumnSnapshotProvider)\n    : collectCtxColumnSnapshotProviders(ctx);\n\n  if (providers.length === 0) return undefined;\n\n  // Step 1: Build collection from sources\n  const builder = new ColumnCollectionBuilder(ctx).addSources(providers);\n  const anchors = options.columns.anchors;\n  const collection = isNil(anchors) ? builder.build() : builder.build({ anchors });\n\n  if (!collection) return undefined;\n\n  // Step 2: Get data columns, excluding annotation-hidden ones\n  const findOptions = options.columns\n    ? {\n        include: options.columns.include,\n        exclude: options.columns.exclude,\n        mode: options.columns.mode,\n        maxHops: options.columns.maxHops,\n      }\n    : undefined;\n  const findResult = collection.findColumns(findOptions);\n  const snapshots = findResult.map((v) => (\"column\" in v ? v.column : v));\n  const dataSnapshots = snapshots.filter((s) => !isColumnHidden(s.spec));\n  if (dataSnapshots.length === 0) return undefined;\n\n  // Convert snapshots to PColumn<PColumnDataUniversal>[]\n  const columns: PColumn<PColumnDataUniversal>[] = [];\n  for (const snap of dataSnapshots) {\n    if (!snap.data) return undefined;\n    const data = snap.data.get();\n    if (data === undefined) return undefined;\n    columns.push({ id: snap.id, spec: snap.spec, data });\n  }\n\n  // Step 3: Normalize table state\n  const tableStateNormalized = upgradePlDataTableStateV2(options.state);\n\n  // Step 4: Get label columns from result pool and match to data columns\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool);\n  if (!allLabelColumns) return undefined;\n\n  const fullLabelColumns = getMatchingLabelColumns(\n    columns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  // Step 5: Build column ID set for filter/sorting validation\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  // Step 6: 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  // Step 7: 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  // Step 8: Build full table definition and handles\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  // Step 9: Determine hidden columns\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  // Step 10: Build visible table definition\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\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\n/** Normalize raw ColumnSource | ColumnSource[] into a flat list of sources. */\nfunction normalizeSourceList(source: ColumnSource | ColumnSource[]): ColumnSource[] {\n  if (\n    Array.isArray(source) &&\n    source.length > 0 &&\n    (Array.isArray(source[0]) || isColumnSnapshotProvider(source[0]))\n  ) {\n    return source as ColumnSource[];\n  }\n  return [source as ColumnSource];\n}\n"],"mappings":"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"}

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

@@ -0,0 +1,39 @@
+import { RenderCtxBase } from "../../../render/api.js";
+import "../../../render/index.js";
+import { PlDataTableFilters, PlDataTableModel } from "../typesV5.js";
+import { PlDataTableStateV2 } from "../state-migration.js";
+import { ColumnSource } from "../../../columns/column_snapshot_provider.js";
+import { MatchingMode } from "../../../columns/column_collection_builder.js";
+import "../../../columns/index.js";
+import { Annotation, DataInfo, MultiColumnSelector, PColumn, PColumnIdAndSpec, PColumnSpec, PColumnValues, PObjectId, PTableColumnId, PTableDefV2, PTableSorting, PlRef, SpecQueryExpression } from "@milaboratories/pl-model-common";
+
+//#region src/components/PlDataTable/createPlDataTable/createPlDataTableV3.d.ts
+/** Check if column should be omitted from the table */
+declare function isColumnHidden(spec: {
+  annotations?: Annotation;
+}): boolean;
+/** Check if column is hidden by default */
+declare function isColumnOptional(spec: {
+  annotations?: Annotation;
+}): boolean;
+/** Structured source config — selectors/anchors instead of raw ColumnSource. */
+type ColumnsSelectorConfig = {
+  include?: MultiColumnSelector | MultiColumnSelector[];
+  exclude?: MultiColumnSelector | MultiColumnSelector[];
+  anchors?: Record<string, PlRef | PObjectId | PColumnSpec>;
+  mode?: MatchingMode;
+  maxHops?: number;
+};
+type createPlDataTableOptionsV3 = {
+  source?: ColumnSource | ColumnSource[];
+  columns: ColumnsSelectorConfig;
+  filters?: PlDataTableFilters;
+  sorting?: PTableSorting[];
+  coreJoinType?: "inner" | "full";
+  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;
+  state?: PlDataTableStateV2;
+};
+declare function createPlDataTableV3<A, U>(ctx: RenderCtxBase<A, U>, options: createPlDataTableOptionsV3): PlDataTableModel | undefined;
+//#endregion
+export { createPlDataTableOptionsV3, createPlDataTableV3, isColumnHidden, isColumnOptional };
+//# sourceMappingURL=createPlDataTableV3.d.ts.map

package/dist/components/PlDataTable/{table.js → createPlDataTable/createPlDataTableV3.js}

@@ -1,17 +1,20 @@
-import { deriveLabels } from "../../render/util/label.js";
-import { allPColumnsReady } from "../../render/util/pcolumn_data.js";
-import "../../render/index.js";
-import { collectFilterSpecColumns } from "../../filters/traverse.js";
-import { filterSpecToSpecQueryExpr } from "../../filters/converters/filterToQuery.js";
-import { distillFilterSpec } from "../../filters/distill.js";
-import "../../filters/index.js";
-import { upgradePlDataTableStateV2 } from "./state-migration.js";
-import { getAllLabelColumns, getMatchingLabelColumns } from "./labels.js";
+import { allPColumnsReady } from "../../../render/util/pcolumn_data.js";
+import "../../../render/index.js";
+import { collectFilterSpecColumns } from "../../../filters/traverse.js";
+import { filterSpecToSpecQueryExpr } from "../../../filters/converters/filterToQuery.js";
+import { distillFilterSpec } from "../../../filters/distill.js";
+import "../../../filters/index.js";
+import { upgradePlDataTableStateV2 } from "../state-migration.js";
+import { getAllLabelColumns, getMatchingLabelColumns } from "../labels.js";
+import { isColumnSnapshotProvider } from "../../../columns/column_snapshot_provider.js";
+import { ColumnCollectionBuilder } from "../../../columns/column_collection_builder.js";
+import { collectCtxColumnSnapshotProviders } from "../../../columns/ctx_column_sources.js";
+import "../../../columns/index.js";
 import { Annotation, canonicalizeJson, getAxisId, getColumnIdAndSpec, isBooleanExpression, isLinkerColumn, parseJson, readAnnotation, uniqueBy } from "@milaboratories/pl-model-common";
 import { isEmpty } from "es-toolkit/compat";
-import { identity, isFunction, isNil } from "es-toolkit";
+import { isFunction, isNil } from "es-toolkit";
 
-//#region src/components/PlDataTable/table.ts
+//#region src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts
 /** Convert a PTableColumnId to a SpecQueryExpression reference. */
 function columnIdToExpr(col) {
 	if (col.type === "axis") return {
@@ -84,32 +87,36 @@ function isColumnHidden(spec) {
 function isColumnOptional(spec) {
 	return readAnnotation(spec, Annotation.Table.Visibility) === "optional";
 }
-/**
-* Create p-table spec and handle given ui table state
-*
-* @param ctx context
-* @param columns column list
-* @param tableState table ui state
-* @returns PlAgDataTableV2 table source
-*/
-function createPlDataTableV2(ctx, columns, tableState, ops) {
-	if (columns.length === 0) return void 0;
-	const tableStateNormalized = upgradePlDataTableStateV2(tableState);
+function createPlDataTableV3(ctx, options) {
+	const providers = options.source ? normalizeSourceList(options.source).filter(isColumnSnapshotProvider) : collectCtxColumnSnapshotProviders(ctx);
+	if (providers.length === 0) return void 0;
+	const builder = new ColumnCollectionBuilder(ctx).addSources(providers);
+	const anchors = options.columns.anchors;
+	const collection = isNil(anchors) ? builder.build() : builder.build({ anchors });
+	if (!collection) return void 0;
+	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
+		});
+	}
+	const tableStateNormalized = upgradePlDataTableStateV2(options.state);
 	const allLabelColumns = getAllLabelColumns(ctx.resultPool);
 	if (!allLabelColumns) return void 0;
-	let fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);
-	fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map((v) => {
-		return {
-			...v.value,
-			spec: {
-				...v.value.spec,
-				annotations: {
-					...v.value.spec.annotations,
-					[Annotation.Label]: v.label
-				}
-			}
-		};
-	});
+	const fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);
 	const fullColumns = [...columns, ...fullLabelColumns];
 	const fullColumnsIds = [...uniqueBy(fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))), (a) => canonicalizeJson(a)).map((a) => ({
 		type: "axis",
@@ -121,7 +128,7 @@ function createPlDataTableV2(ctx, columns, tableState, ops) {
 	const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson(c)));
 	const isValidColumnId = (id) => fullColumnsIdsSet.has(id);
 	const stateFilters = tableStateNormalized.pTableParams.filters;
-	const opsFilters = ops?.filters ?? null;
+	const opsFilters = options?.filters ?? null;
 	const filters = stateFilters != null && opsFilters != null ? {
 		type: "and",
 		filters: [stateFilters, opsFilters]
@@ -129,17 +136,17 @@ function createPlDataTableV2(ctx, columns, tableState, ops) {
 	const firstInvalidFilterColumn = (filters ? 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 = (isEmpty(userSorting) ? ops?.sorting : userSorting) ?? [];
+	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 = ops?.coreJoinType ?? "full";
+	const coreJoinType = options?.coreJoinType ?? "full";
 	const fullDef = createPTableDef({
 		columns,
 		labelColumns: fullLabelColumns,
 		coreJoinType,
 		filters,
 		sorting,
-		coreColumnPredicate: ops?.coreColumnPredicate
+		coreColumnPredicate: options?.coreColumnPredicate
 	});
 	const fullHandle = ctx.createPTableV2(fullDef);
 	const pframeHandle = ctx.createPFrame(fullColumns);
@@ -151,7 +158,7 @@ function createPlDataTableV2(ctx, columns, tableState, ops) {
 		return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);
 	})());
 	columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));
-	const coreColumnPredicate = ops?.coreColumnPredicate;
+	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) => {
@@ -178,19 +185,12 @@ function createPlDataTableV2(ctx, columns, tableState, ops) {
 		visibleTableHandle: visibleHandle
 	};
 }
-/** Create sheet entries for PlDataTable */
-function createPlDataTableSheet(ctx, axis, values) {
-	const labels = ctx.resultPool.findLabels(axis);
-	return {
-		axis,
-		options: values.map((v) => ({
-			value: v,
-			label: labels?.[v] ?? v.toString()
-		})),
-		defaultValue: values[0]
-	};
+/** Normalize raw ColumnSource | ColumnSource[] into a flat list of sources. */
+function normalizeSourceList(source) {
+	if (Array.isArray(source) && source.length > 0 && (Array.isArray(source[0]) || isColumnSnapshotProvider(source[0]))) return source;
+	return [source];
 }
 
 //#endregion
-export { createPlDataTableSheet, createPlDataTableV2, isColumnHidden, isColumnOptional };
-//# sourceMappingURL=table.js.map
+export { createPTableDef, createPlDataTableV3, isColumnHidden, isColumnOptional };
+//# sourceMappingURL=createPlDataTableV3.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createPlDataTableV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  DataInfo,\n  PColumn,\n  PColumnIdAndSpec,\n  PColumnValues,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableDefV2,\n  PTableSorting,\n  SpecQuery,\n  SingleAxisSelector,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PColumnSpec,\n  PlRef,\n  MultiColumnSelector,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  readAnnotation,\n  isBooleanExpression,\n  parseJson,\n  uniqueBy,\n} from \"@milaboratories/pl-model-common\";\nimport { filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from \"../../../render\";\nimport { allPColumnsReady } from \"../../../render\";\nimport { isFunction, isNil } from \"es-toolkit\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport { distillFilterSpec } from \"../../../filters/distill\";\nimport type { PlDataTableFilters, PlDataTableModel } from \"../typesV5\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { ColumnSource, MatchingMode } from \"../../../columns\";\nimport { ColumnCollectionBuilder } from \"../../../columns\";\nimport { isColumnSnapshotProvider } from \"../../../columns/column_snapshot_provider\";\nimport { collectCtxColumnSnapshotProviders } from \"../../../columns/ctx_column_sources\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"../labels\";\n\n/** Convert a PTableColumnId to a SpecQueryExpression reference. */\nexport function columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  if (col.type === \"axis\") {\n    return { type: \"axisRef\", value: col.id as SingleAxisSelector };\n  }\n  return { type: \"columnRef\", value: col.id };\n}\n\n/** Wrap a SpecQuery as a SpecQueryJoinEntry with empty qualifications. */\nexport function joinEntry<C>(input: SpecQuery<C>): SpecQueryJoinEntry<C> {\n  return { entry: input, qualifications: [] };\n}\n\nexport function createPTableDef(params: {\n  columns: PColumn<PColumnDataUniversal>[];\n  labelColumns: PColumn<PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: null | PlDataTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> {\n  let coreColumns = params.columns;\n  const secondaryColumns: typeof params.columns = [];\n\n  if (isFunction(params.coreColumnPredicate)) {\n    coreColumns = [];\n    for (const c of params.columns)\n      if (params.coreColumnPredicate(getColumnIdAndSpec(c))) coreColumns.push(c);\n      else secondaryColumns.push(c);\n  }\n\n  secondaryColumns.push(...params.labelColumns);\n\n  // Build SpecQuery directly from columns\n  const coreJoinQuery: SpecQuery<\n    PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>\n  > = {\n    type: params.coreJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: coreColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  let query: SpecQuery<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> = {\n    type: \"outerJoin\",\n    primary: joinEntry(coreJoinQuery),\n    secondary: secondaryColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  // Apply filters\n  if (params.filters !== null) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  // Apply sorting\n  if (params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: !s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\n/** Check if column should be omitted from the table */\nexport function isColumnHidden(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"hidden\";\n}\n\n/** Check if column is hidden by default */\nexport function isColumnOptional(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"optional\";\n}\n\n/** Structured source config — selectors/anchors instead of raw ColumnSource. */\ntype ColumnsSelectorConfig = {\n  include?: MultiColumnSelector | MultiColumnSelector[];\n  exclude?: MultiColumnSelector | MultiColumnSelector[];\n  anchors?: Record<string, PlRef | PObjectId | PColumnSpec>;\n  mode?: MatchingMode;\n  maxHops?: number;\n};\n\nexport type createPlDataTableOptionsV3 = {\n  source?: ColumnSource | ColumnSource[];\n  columns: ColumnsSelectorConfig;\n\n  // Existing from V2\n  filters?: PlDataTableFilters;\n  sorting?: PTableSorting[];\n  coreJoinType?: \"inner\" | \"full\";\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n\n  state?: PlDataTableStateV2;\n};\n\n// interface ColumnDisplayConfig {\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\n// interface ColumnOrderRule {\n//   match: ColumnMatcher;\n//   /** Higher number = further left in table */\n//   priority: number;\n// }\n\n// interface ColumnVisibilityRule {\n//   match: ColumnMatcher;\n//   visibility: \"default\" | \"optional\" | \"hidden\";\n// }\n\n// type ColumnMatcher =\n//   | ((spec: PColumnSpec) => boolean)\n//   | { name: string | string[] }\n//   | { annotation: Record<string, string> }\n//   | { ids: Set<string> };\n\nexport function createPlDataTableV3<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n  const providers = options.source\n    ? normalizeSourceList(options.source).filter(isColumnSnapshotProvider)\n    : collectCtxColumnSnapshotProviders(ctx);\n\n  if (providers.length === 0) return undefined;\n\n  // Step 1: Build collection from sources\n  const builder = new ColumnCollectionBuilder(ctx).addSources(providers);\n  const anchors = options.columns.anchors;\n  const collection = isNil(anchors) ? builder.build() : builder.build({ anchors });\n\n  if (!collection) return undefined;\n\n  // Step 2: Get data columns, excluding annotation-hidden ones\n  const findOptions = options.columns\n    ? {\n        include: options.columns.include,\n        exclude: options.columns.exclude,\n        mode: options.columns.mode,\n        maxHops: options.columns.maxHops,\n      }\n    : undefined;\n  const findResult = collection.findColumns(findOptions);\n  const snapshots = findResult.map((v) => (\"column\" in v ? v.column : v));\n  const dataSnapshots = snapshots.filter((s) => !isColumnHidden(s.spec));\n  if (dataSnapshots.length === 0) return undefined;\n\n  // Convert snapshots to PColumn<PColumnDataUniversal>[]\n  const columns: PColumn<PColumnDataUniversal>[] = [];\n  for (const snap of dataSnapshots) {\n    if (!snap.data) return undefined;\n    const data = snap.data.get();\n    if (data === undefined) return undefined;\n    columns.push({ id: snap.id, spec: snap.spec, data });\n  }\n\n  // Step 3: Normalize table state\n  const tableStateNormalized = upgradePlDataTableStateV2(options.state);\n\n  // Step 4: Get label columns from result pool and match to data columns\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool);\n  if (!allLabelColumns) return undefined;\n\n  const fullLabelColumns = getMatchingLabelColumns(\n    columns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  // Step 5: Build column ID set for filter/sorting validation\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  // Step 6: 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  // Step 7: 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  // Step 8: Build full table definition and handles\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  // Step 9: Determine hidden columns\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  // Step 10: Build visible table definition\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\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\n/** Normalize raw ColumnSource | ColumnSource[] into a flat list of sources. */\nfunction normalizeSourceList(source: ColumnSource | ColumnSource[]): ColumnSource[] {\n  if (\n    Array.isArray(source) &&\n    source.length > 0 &&\n    (Array.isArray(source[0]) || isColumnSnapshotProvider(source[0]))\n  ) {\n    return source as ColumnSource[];\n  }\n  return [source as ColumnSource];\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAiDA,SAAgB,eAAe,KAA0C;AACvE,KAAI,IAAI,SAAS,OACf,QAAO;EAAE,MAAM;EAAW,OAAO,IAAI;EAA0B;AAEjE,QAAO;EAAE,MAAM;EAAa,OAAO,IAAI;EAAI;;;AAI7C,SAAgB,UAAa,OAA4C;AACvE,QAAO;EAAE,OAAO;EAAO,gBAAgB,EAAE;EAAE;;AAG7C,SAAgB,gBAAgB,QAOwD;CACtF,IAAI,cAAc,OAAO;CACzB,MAAM,mBAA0C,EAAE;AAElD,KAAI,WAAW,OAAO,oBAAoB,EAAE;AAC1C,gBAAc,EAAE;AAChB,OAAK,MAAM,KAAK,OAAO,QACrB,KAAI,OAAO,oBAAoB,mBAAmB,EAAE,CAAC,CAAE,aAAY,KAAK,EAAE;MACrE,kBAAiB,KAAK,EAAE;;AAGjC,kBAAiB,KAAK,GAAG,OAAO,aAAa;CAU7C,IAAI,QAA2F;EAC7F,MAAM;EACN,SAAS,UAPP;GACF,MAAM,OAAO,iBAAiB,UAAU,cAAc;GACtD,SAAS,YAAY,KAAK,MAAM,UAAU;IAAE,MAAM;IAAU,QAAQ;IAAG,CAAC,CAAC;GAC1E,CAIkC;EACjC,WAAW,iBAAiB,KAAK,MAAM,UAAU;GAAE,MAAM;GAAU,QAAQ;GAAG,CAAC,CAAC;EACjF;AAGD,KAAI,OAAO,YAAY,MAAM;EAC3B,MAAM,WAAW,kBAAkB,OAAO,QAAQ;AAElD,MAAI,CAAC,MAAM,SAAS,EAAE;GACpB,MAAM,YAAY,0BAA0B,SAAS;AACrD,OAAI,CAAC,oBAAoB,UAAU,CACjC,OAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,sDAClF;AAEH,WAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;IACZ;;;AAKL,KAAI,OAAO,QAAQ,SAAS,EAC1B,SAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,OAAO;GACpC,WAAW,EAAE;GACb,YAAY,CAAC,EAAE;GAChB,EAAE;EACJ;AAGH,QAAO,EAAE,OAAO;;;AAIlB,SAAgB,eAAe,MAA6C;AAC1E,QAAO,eAAe,MAAM,WAAW,MAAM,WAAW,KAAK;;;AAI/D,SAAgB,iBAAiB,MAA6C;AAC5E,QAAO,eAAe,MAAM,WAAW,MAAM,WAAW,KAAK;;AAiD/D,SAAgB,oBACd,KACA,SAC8B;CAC9B,MAAM,YAAY,QAAQ,SACtB,oBAAoB,QAAQ,OAAO,CAAC,OAAO,yBAAyB,GACpE,kCAAkC,IAAI;AAE1C,KAAI,UAAU,WAAW,EAAG,QAAO;CAGnC,MAAM,UAAU,IAAI,wBAAwB,IAAI,CAAC,WAAW,UAAU;CACtE,MAAM,UAAU,QAAQ,QAAQ;CAChC,MAAM,aAAa,MAAM,QAAQ,GAAG,QAAQ,OAAO,GAAG,QAAQ,MAAM,EAAE,SAAS,CAAC;AAEhF,KAAI,CAAC,WAAY,QAAO;CAGxB,MAAM,cAAc,QAAQ,UACxB;EACE,SAAS,QAAQ,QAAQ;EACzB,SAAS,QAAQ,QAAQ;EACzB,MAAM,QAAQ,QAAQ;EACtB,SAAS,QAAQ,QAAQ;EAC1B,GACD;CAGJ,MAAM,gBAFa,WAAW,YAAY,YAAY,CACzB,KAAK,MAAO,YAAY,IAAI,EAAE,SAAS,EAAG,CACvC,QAAQ,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC;AACtE,KAAI,cAAc,WAAW,EAAG,QAAO;CAGvC,MAAM,UAA2C,EAAE;AACnD,MAAK,MAAM,QAAQ,eAAe;AAChC,MAAI,CAAC,KAAK,KAAM,QAAO;EACvB,MAAM,OAAO,KAAK,KAAK,KAAK;AAC5B,MAAI,SAAS,OAAW,QAAO;AAC/B,UAAQ,KAAK;GAAE,IAAI,KAAK;GAAI,MAAM,KAAK;GAAM;GAAM,CAAC;;CAItD,MAAM,uBAAuB,0BAA0B,QAAQ,MAAM;CAGrE,MAAM,kBAAkB,mBAAmB,IAAI,WAAW;AAC1D,KAAI,CAAC,gBAAiB,QAAO;CAE7B,MAAM,mBAAmB,wBACvB,QAAQ,IAAI,mBAAmB,EAC/B,gBACD;CAED,MAAM,cAAc,CAAC,GAAG,SAAS,GAAG,iBAAiB;CAOrD,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;CAGH,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;CAGzC,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,oBAIF,CAHoB,QAAQ,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;CAI5C,MAAM,iBAAiB,QAAQ,QAAQ,MAAM,CAAC,cAAc,IAAI,EAAE,GAAG,CAAC;CACtE,MAAM,sBAAsB,wBAC1B,eAAe,IAAI,mBAAmB,EACtC,gBACD;AAED,KAAI,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,GAAG,oBAAoB,CAAC,CAAE,QAAO;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;AAE3B,QAAO;EACL,UAAU,qBAAqB,aAAa;EAC5C,iBAAiB;EACjB,kBAAkB;EAClB,oBAAoB;EACrB;;;AAIH,SAAS,oBAAoB,QAAuD;AAClF,KACE,MAAM,QAAQ,OAAO,IACrB,OAAO,SAAS,MACf,MAAM,QAAQ,OAAO,GAAG,IAAI,yBAAyB,OAAO,GAAG,EAEhE,QAAO;AAET,QAAO,CAAC,OAAuB"}

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

@@ -0,0 +1,12 @@
+const require_createPlDataTableV3 = require('./createPlDataTableV3.cjs');
+const require_createPlDataTableV2 = require('./createPlDataTableV2.cjs');
+
+//#region src/components/PlDataTable/createPlDataTable/index.ts
+function createPlDataTable(ctx, options) {
+	if (options.version === "v2") return require_createPlDataTableV2.createPlDataTableV2(ctx, options.columns, options.tableState, options.options);
+	else return require_createPlDataTableV3.createPlDataTableV3(ctx, options);
+}
+
+//#endregion
+exports.createPlDataTable = createPlDataTable;
+//# sourceMappingURL=index.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","names":["createPlDataTableV2","createPlDataTableV3"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/index.ts"],"sourcesContent":["import type { RenderCtxBase } from \"../../../render\";\nimport type { PlDataTableModel } from \"../typesV5\";\nimport { createPlDataTableOptionsV2, createPlDataTableV2 } from \"./createPlDataTableV2\";\nimport { createPlDataTableV3 } from \"./createPlDataTableV3\";\nimport type { createPlDataTableOptionsV3 } from \"./createPlDataTableV3\";\n\nexport function createPlDataTable<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: { version: \"v2\" } & createPlDataTableOptionsV2,\n): ReturnType<typeof createPlDataTableV2>;\nexport function createPlDataTable<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: { version?: \"v3\" } & createPlDataTableOptionsV3,\n): ReturnType<typeof createPlDataTableV3>;\nexport function createPlDataTable<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options:\n    | ({ version: \"v2\" } & createPlDataTableOptionsV2)\n    | ({ version?: \"v3\" } & createPlDataTableOptionsV3),\n): PlDataTableModel | undefined {\n  if (options.version === \"v2\") {\n    return createPlDataTableV2(ctx, options.columns, options.tableState, options.options);\n  } else {\n    // default version is last (v3 at the moment)\n    return createPlDataTableV3(ctx, options);\n  }\n}\n"],"mappings":";;;;AAcA,SAAgB,kBACd,KACA,SAG8B;AAC9B,KAAI,QAAQ,YAAY,KACtB,QAAOA,gDAAoB,KAAK,QAAQ,SAAS,QAAQ,YAAY,QAAQ,QAAQ;KAGrF,QAAOC,gDAAoB,KAAK,QAAQ"}

package/dist/components/PlDataTable/createPlDataTable/index.d.ts

@@ -0,0 +1,15 @@
+import { RenderCtxBase } from "../../../render/api.js";
+import "../../../render/index.js";
+import { createPlDataTableOptionsV2, createPlDataTableV2 } from "./createPlDataTableV2.js";
+import { createPlDataTableOptionsV3, createPlDataTableV3 } from "./createPlDataTableV3.js";
+
+//#region src/components/PlDataTable/createPlDataTable/index.d.ts
+declare function createPlDataTable<A, U>(ctx: RenderCtxBase<A, U>, options: {
+  version: "v2";
+} & createPlDataTableOptionsV2): ReturnType<typeof createPlDataTableV2>;
+declare function createPlDataTable<A, U>(ctx: RenderCtxBase<A, U>, options: {
+  version?: "v3";
+} & createPlDataTableOptionsV3): ReturnType<typeof createPlDataTableV3>;
+//#endregion
+export { createPlDataTable };
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,12 @@
+import { createPlDataTableV3 } from "./createPlDataTableV3.js";
+import { createPlDataTableV2 } from "./createPlDataTableV2.js";
+
+//#region src/components/PlDataTable/createPlDataTable/index.ts
+function createPlDataTable(ctx, options) {
+	if (options.version === "v2") return createPlDataTableV2(ctx, options.columns, options.tableState, options.options);
+	else return createPlDataTableV3(ctx, options);
+}
+
+//#endregion
+export { createPlDataTable };
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/index.ts"],"sourcesContent":["import type { RenderCtxBase } from \"../../../render\";\nimport type { PlDataTableModel } from \"../typesV5\";\nimport { createPlDataTableOptionsV2, createPlDataTableV2 } from \"./createPlDataTableV2\";\nimport { createPlDataTableV3 } from \"./createPlDataTableV3\";\nimport type { createPlDataTableOptionsV3 } from \"./createPlDataTableV3\";\n\nexport function createPlDataTable<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: { version: \"v2\" } & createPlDataTableOptionsV2,\n): ReturnType<typeof createPlDataTableV2>;\nexport function createPlDataTable<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options: { version?: \"v3\" } & createPlDataTableOptionsV3,\n): ReturnType<typeof createPlDataTableV3>;\nexport function createPlDataTable<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  options:\n    | ({ version: \"v2\" } & createPlDataTableOptionsV2)\n    | ({ version?: \"v3\" } & createPlDataTableOptionsV3),\n): PlDataTableModel | undefined {\n  if (options.version === \"v2\") {\n    return createPlDataTableV2(ctx, options.columns, options.tableState, options.options);\n  } else {\n    // default version is last (v3 at the moment)\n    return createPlDataTableV3(ctx, options);\n  }\n}\n"],"mappings":";;;;AAcA,SAAgB,kBACd,KACA,SAG8B;AAC9B,KAAI,QAAQ,YAAY,KACtB,QAAO,oBAAoB,KAAK,QAAQ,SAAS,QAAQ,YAAY,QAAQ,QAAQ;KAGrF,QAAO,oBAAoB,KAAK,QAAQ"}

package/dist/components/PlDataTable/createPlDataTableSheet.cjs

@@ -0,0 +1,18 @@
+
+//#region src/components/PlDataTable/createPlDataTableSheet.ts
+/** Create sheet entries for PlDataTable */
+function createPlDataTableSheet(ctx, axis, values) {
+	const labels = ctx.resultPool.findLabels(axis);
+	return {
+		axis,
+		options: values.map((v) => ({
+			value: v,
+			label: labels?.[v] ?? v.toString()
+		})),
+		defaultValue: values[0]
+	};
+}
+
+//#endregion
+exports.createPlDataTableSheet = createPlDataTableSheet;
+//# sourceMappingURL=createPlDataTableSheet.cjs.map

package/dist/components/PlDataTable/createPlDataTableSheet.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"createPlDataTableSheet.cjs","names":[],"sources":["../../../src/components/PlDataTable/createPlDataTableSheet.ts"],"sourcesContent":["import type { AxisSpec } from \"@milaboratories/pl-model-common\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { PlDataTableSheet } from \"./typesV5\";\n\n/** Create sheet entries for PlDataTable */\nexport function createPlDataTableSheet<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  axis: AxisSpec,\n  values: (string | number)[],\n): PlDataTableSheet {\n  const labels = ctx.resultPool.findLabels(axis);\n  return {\n    axis,\n    options: values.map((v) => ({\n      value: v,\n      label: labels?.[v] ?? v.toString(),\n    })),\n    defaultValue: values[0],\n  };\n}\n"],"mappings":";;;AAKA,SAAgB,uBACd,KACA,MACA,QACkB;CAClB,MAAM,SAAS,IAAI,WAAW,WAAW,KAAK;AAC9C,QAAO;EACL;EACA,SAAS,OAAO,KAAK,OAAO;GAC1B,OAAO;GACP,OAAO,SAAS,MAAM,EAAE,UAAU;GACnC,EAAE;EACH,cAAc,OAAO;EACtB"}

package/dist/components/PlDataTable/createPlDataTableSheet.d.ts

@@ -0,0 +1,11 @@
+import { RenderCtxBase } from "../../render/api.js";
+import "../../render/index.js";
+import { PlDataTableSheet } from "./typesV5.js";
+import { AxisSpec } from "@milaboratories/pl-model-common";
+
+//#region src/components/PlDataTable/createPlDataTableSheet.d.ts
+/** Create sheet entries for PlDataTable */
+declare function createPlDataTableSheet<A, U>(ctx: RenderCtxBase<A, U>, axis: AxisSpec, values: (string | number)[]): PlDataTableSheet;
+//#endregion
+export { createPlDataTableSheet };
+//# sourceMappingURL=createPlDataTableSheet.d.ts.map

package/dist/components/PlDataTable/createPlDataTableSheet.js

@@ -0,0 +1,17 @@
+//#region src/components/PlDataTable/createPlDataTableSheet.ts
+/** Create sheet entries for PlDataTable */
+function createPlDataTableSheet(ctx, axis, values) {
+	const labels = ctx.resultPool.findLabels(axis);
+	return {
+		axis,
+		options: values.map((v) => ({
+			value: v,
+			label: labels?.[v] ?? v.toString()
+		})),
+		defaultValue: values[0]
+	};
+}
+
+//#endregion
+export { createPlDataTableSheet };
+//# sourceMappingURL=createPlDataTableSheet.js.map

package/dist/components/PlDataTable/createPlDataTableSheet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createPlDataTableSheet.js","names":[],"sources":["../../../src/components/PlDataTable/createPlDataTableSheet.ts"],"sourcesContent":["import type { AxisSpec } from \"@milaboratories/pl-model-common\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { PlDataTableSheet } from \"./typesV5\";\n\n/** Create sheet entries for PlDataTable */\nexport function createPlDataTableSheet<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  axis: AxisSpec,\n  values: (string | number)[],\n): PlDataTableSheet {\n  const labels = ctx.resultPool.findLabels(axis);\n  return {\n    axis,\n    options: values.map((v) => ({\n      value: v,\n      label: labels?.[v] ?? v.toString(),\n    })),\n    defaultValue: values[0],\n  };\n}\n"],"mappings":";;AAKA,SAAgB,uBACd,KACA,MACA,QACkB;CAClB,MAAM,SAAS,IAAI,WAAW,WAAW,KAAK;AAC9C,QAAO;EACL;EACA,SAAS,OAAO,KAAK,OAAO;GAC1B,OAAO;GACP,OAAO,SAAS,MAAM,EAAE,UAAU;GACnC,EAAE;EACH,cAAc,OAAO;EACtB"}

package/dist/components/PlDataTable/index.cjs

@@ -1,2 +1,5 @@
 const require_state_migration = require('./state-migration.cjs');
-const require_table = require('./table.cjs');
+const require_createPlDataTableSheet = require('./createPlDataTableSheet.cjs');
+const require_createPlDataTableV3 = require('./createPlDataTable/createPlDataTableV3.cjs');
+const require_createPlDataTableV2 = require('./createPlDataTable/createPlDataTableV2.cjs');
+const require_index = require('./createPlDataTable/index.cjs');

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

@@ -1,3 +1,6 @@
-import { PTableParamsV2, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson } from "./v5.js";
+import { PTableParamsV2, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson } from "./typesV5.js";
 import { PlDataTableStateV2, createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./state-migration.js";
-import { createPlDataTableSheet, createPlDataTableV2, isColumnHidden, isColumnOptional } from "./table.js";
+import { createPlDataTableSheet } from "./createPlDataTableSheet.js";
+import { createPlDataTableV2 } from "./createPlDataTable/createPlDataTableV2.js";
+import { createPlDataTableV3, isColumnHidden, isColumnOptional } from "./createPlDataTable/createPlDataTableV3.js";
+import { createPlDataTable } from "./createPlDataTable/index.js";

package/dist/components/PlDataTable/index.js

@@ -1,2 +1,5 @@
 import { createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./state-migration.js";
-import { createPlDataTableSheet, createPlDataTableV2, isColumnHidden, isColumnOptional } from "./table.js";
+import { createPlDataTableSheet } from "./createPlDataTableSheet.js";
+import { createPlDataTableV3, isColumnHidden, isColumnOptional } from "./createPlDataTable/createPlDataTableV3.js";
+import { createPlDataTableV2 } from "./createPlDataTable/createPlDataTableV2.js";
+import { createPlDataTable } from "./createPlDataTable/index.js";

package/dist/components/PlDataTable/state-migration.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"state-migration.cjs","names":["distillFilterSpec"],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./v4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./v5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilterSpec(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"state-migration.cjs","names":["distillFilterSpec"],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./typesV5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilterSpec(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}

package/dist/components/PlDataTable/state-migration.d.ts

@@ -1,5 +1,5 @@
-import { PTableParamsV2, PlDataTableGridStateCore, PlDataTableSheetState, PlDataTableStateV2Normalized } from "./v5.js";
-import { PlDataTableFilterState } from "./v4.js";
+import { PTableParamsV2, PlDataTableGridStateCore, PlDataTableSheetState, PlDataTableStateV2Normalized } from "./typesV5.js";
+import { PlDataTableFilterState } from "./typesV4.js";
 import { AxisId, CanonicalizedJson, PObjectId, PTableColumnSpec, PTableRecordFilter, PTableSorting } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDataTable/state-migration.d.ts

package/dist/components/PlDataTable/state-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"state-migration.js","names":[],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./v4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./v5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilterSpec(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"state-migration.js","names":[],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./typesV5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilterSpec(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}

package/dist/components/PlDataTable/{v4.d.ts → typesV4.d.ts}

@@ -1,6 +1,6 @@
 import { PTableColumnId } from "@milaboratories/pl-model-common";
 
-//#region src/components/PlDataTable/v4.d.ts
+//#region src/components/PlDataTable/typesV4.d.ts
 type PlDataTableFilterState = {
   id: PTableColumnId;
   alphabetic: boolean;
@@ -119,4 +119,4 @@ type PlTableFilterString = PlTableFilterCommon | PlTableFilterStringEquals | PlT
 type PlTableFilter = PlTableFilterNumber | PlTableFilterString;
 //#endregion
 export { PlDataTableFilterState };
-//# sourceMappingURL=v4.d.ts.map
+//# sourceMappingURL=typesV4.d.ts.map

package/dist/components/PlDataTable/{v5.d.ts → typesV5.d.ts}

@@ -2,7 +2,7 @@ import { FilterSpecLeaf as FilterSpecLeaf$1 } from "../../filters/types.js";
 import "../../filters/index.js";
 import { AxisId, AxisSpec, CanonicalizedJson, ListOptionBase, PColumnIdAndSpec, PFrameHandle, PObjectId, PTableColumnId, PTableColumnSpec, PTableHandle, PTableSorting, RootFilterSpec } from "@milaboratories/pl-model-common";
 
-//#region src/components/PlDataTable/v5.d.ts
+//#region src/components/PlDataTable/typesV5.d.ts
 type PlTableColumnId = {
   /** Original column spec */source: PTableColumnSpec; /** Column spec with labeled axes replaced by label columns */
   labeled: PTableColumnSpec;
@@ -92,4 +92,4 @@ type CreatePlDataTableOps = {
 };
 //#endregion
 export { CreatePlDataTableOps, PTableParamsV2, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson };
-//# sourceMappingURL=v5.d.ts.map
+//# sourceMappingURL=typesV5.d.ts.map