@platforma-sdk/model 1.73.3 → 1.75.0

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

@@ -2,7 +2,7 @@ import { toColumnSnapshotProvider } from "../../../columns/column_snapshot_provi
 import { ColumnCollectionBuilder } from "../../../columns/column_collection_builder.js";
 import { collectCtxColumnSnapshotProviders } from "../../../columns/ctx_column_sources.js";
 import "../../../columns/index.js";
-import { createDiscoveredPColumnId, isPlRef } from "@milaboratories/pl-model-common";
+import { PColumnName, createDiscoveredPColumnId, isPlRef } from "@milaboratories/pl-model-common";
 import { throwError } from "@milaboratories/helpers";
 //#region src/components/PlDataTable/createPlDataTable/discoverColumns.ts
 /** Discover columns from sources/anchors and normalize into a flat TableColumnVariant list. */
@@ -16,7 +16,52 @@ function discoverTableColumnSnaphots(ctx, options) {
 	const collection = new ColumnCollectionBuilder(ctx.getService("pframeSpec")).addSources(providers).build(resolvedOptions);
 	if (collection === void 0) return void 0;
 	try {
-		return mapToTableColumnVariants(collection.findColumnVariants({ ...resolvedOptions.selector ?? {} }), collection.getAnchors());
+		return mapToTableColumnVariants(collection.findColumnVariants(resolvedOptions.selector), collection.getAnchors());
+	} finally {
+		collection.dispose();
+	}
+}
+/**
+* Discover label columns matching the axes of the given value columns from
+* ctx providers. Returns label snapshots wrapped as direct TableColumnVariants
+* (path: [], empty qualifications, isPrimary: false).
+*/
+function discoverLabelColumnVariants(ctx, columns) {
+	if (columns.length === 0) return [];
+	const collection = new ColumnCollectionBuilder(ctx.getService("pframeSpec")).addSources(collectCtxColumnSnapshotProviders(ctx)).addSource(columns.map((c) => c.column)).build({
+		allowPartialColumnList: true,
+		anchors: Object.fromEntries(columns.filter((col) => (col.path?.length ?? 0) === 0 && col.isPrimary).map((col, i) => [`anchor_${i}`, col.column.spec]))
+	});
+	try {
+		const axes = columns.flatMap((col) => col.column.spec.axesSpec);
+		return collection.findColumnVariants({
+			include: axes.map((a) => ({
+				name: {
+					type: "exact",
+					value: PColumnName.Label
+				},
+				axes: [{ name: {
+					type: "exact",
+					value: a.name
+				} }]
+			})),
+			maxHops: columns.reduce((acc, c) => Math.max(acc, c.path?.length ?? 0), 0)
+		}).map((variant) => ({
+			...variant,
+			column: {
+				...variant.column,
+				id: createDiscoveredPColumnId({
+					column: variant.column.id,
+					path: variant.path?.map((p) => ({
+						type: "linker",
+						column: p.linker.id
+					})),
+					columnQualifications: variant.qualifications?.forHit,
+					queriesQualifications: variant.qualifications?.forQueries
+				}),
+				originalId: variant.column.id
+			}
+		}));
 	} finally {
 		collection.dispose();
 	}
@@ -42,12 +87,12 @@ function mapToTableColumnVariants(variants, anchors) {
 			column: {
 				id: createDiscoveredPColumnId({
 					column: snap.id,
-					path: variant.path.map((p) => ({
+					path: variant.path?.map((p) => ({
 						type: "linker",
 						column: p.linker.id
 					})),
-					columnQualifications: variant.qualifications.forHit,
-					queriesQualifications: variant.qualifications.forQueries
+					columnQualifications: variant.qualifications?.forHit,
+					queriesQualifications: variant.qualifications?.forQueries
 				}),
 				spec: snap.spec,
 				data: snap.data,
@@ -61,6 +106,6 @@ function mapToTableColumnVariants(variants, anchors) {
 	});
 }
 //#endregion
-export { discoverTableColumnSnaphots };
+export { discoverLabelColumnVariants, discoverTableColumnSnaphots };
 
 //# sourceMappingURL=discoverColumns.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"discoverColumns.js","names":["resolveAnchors"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/discoverColumns.ts"],"sourcesContent":["import type { PColumnSpec, PlRef, PObjectId } from \"@milaboratories/pl-model-common\";\nimport { createDiscoveredPColumnId, isPlRef } from \"@milaboratories/pl-model-common\";\nimport type { RenderCtxBase } from \"../../../render\";\nimport type {\n  ColumnSource,\n  ColumnVariant,\n  RelaxedColumnSelector,\n  ColumnSnapshotProvider,\n  ColumnSnapshot,\n} from \"../../../columns\";\nimport { ColumnCollectionBuilder } from \"../../../columns\";\nimport { toColumnSnapshotProvider } from \"../../../columns/column_snapshot_provider\";\nimport { collectCtxColumnSnapshotProviders } from \"../../../columns/ctx_column_sources\";\nimport { throwError } from \"@milaboratories/helpers\";\nimport type { ColumnsSelectorConfig, TableColumnVariant } from \"./createPlDataTableV3\";\n\nexport type DiscoverTableColumnOptions = {\n  sources?: ColumnSource[];\n  anchors: Record<string, PlRef | PObjectId | PColumnSpec | RelaxedColumnSelector>;\n  selector: ColumnsSelectorConfig;\n};\n\n/** Discover columns from sources/anchors and normalize into a flat TableColumnVariant list. */\nexport function discoverTableColumnSnaphots(\n  ctx: RenderCtxBase,\n  options: DiscoverTableColumnOptions,\n): TableColumnVariant[] | undefined {\n  // Resolve PlRef anchors to PColumnSpec\n  const resolvedOptions = {\n    ...options,\n    anchors: resolveAnchors(ctx, options.anchors),\n  };\n\n  // Resolve providers\n  const providers = resolveProviders(ctx, resolvedOptions.sources);\n  if (providers.length === 0) return undefined;\n\n  // Build collection (anchored or plain)\n  const collection = new ColumnCollectionBuilder(ctx.getService(\"pframeSpec\"))\n    .addSources(providers)\n    .build(resolvedOptions);\n  if (collection === undefined) return undefined;\n\n  try {\n    const variants = collection.findColumnVariants({\n      ...(resolvedOptions.selector ?? {}),\n    });\n    const anchors = collection.getAnchors();\n    return mapToTableColumnVariants(variants, anchors);\n  } finally {\n    collection.dispose();\n  }\n}\n\n// --- Pure helper functions ---\n\n/** Resolve PlRef values in anchors to PColumnSpec via the result pool. */\nfunction resolveAnchors(\n  ctx: RenderCtxBase,\n  anchors: Record<string, PlRef | PObjectId | PColumnSpec | RelaxedColumnSelector>,\n): Record<string, PObjectId | PColumnSpec | RelaxedColumnSelector> {\n  const result: Record<string, PObjectId | PColumnSpec | RelaxedColumnSelector> = {};\n  for (const [key, value] of Object.entries(anchors)) {\n    if (isPlRef(value)) {\n      result[key] =\n        ctx.resultPool.getPColumnSpecByRef(value) ??\n        throwError(\n          `Anchor ${key} with ref ${JSON.stringify(value)} could not be resolved to a PColumnSpec`,\n        );\n    } else {\n      result[key] = value;\n    }\n  }\n  return result;\n}\n\n/** Resolve column snapshot providers from explicit sources or context. */\nfunction resolveProviders(\n  ctx: RenderCtxBase,\n  sources: undefined | ColumnSource[],\n): ColumnSnapshotProvider[] {\n  return sources !== undefined\n    ? sources.map(toColumnSnapshotProvider)\n    : collectCtxColumnSnapshotProviders(ctx);\n}\n\n/** Map column variants into TableColumnVariant list with anchor-derived isPrimary flag. */\nfunction mapToTableColumnVariants(\n  variants: readonly ColumnVariant[],\n  anchors: Map<string, ColumnSnapshot<PObjectId>>,\n): TableColumnVariant[] {\n  const columnIdToAnchorName = new Map<PObjectId, string>(\n    Array.from(anchors.entries(), ([key, { id }]) => [id, key] as const),\n  );\n\n  return variants.map((variant): TableColumnVariant => {\n    const snap = variant.column;\n    const isPrimary = columnIdToAnchorName.get(snap.id) !== undefined;\n\n    const discoveredId = createDiscoveredPColumnId({\n      column: snap.id,\n      path: variant.path.map((p) => ({\n        type: \"linker\",\n        column: p.linker.id,\n      })),\n      columnQualifications: variant.qualifications.forHit,\n      queriesQualifications: variant.qualifications.forQueries,\n    });\n    return {\n      column: {\n        id: discoveredId,\n        spec: snap.spec,\n        data: snap.data,\n        dataStatus: snap.dataStatus,\n      },\n      path: variant.path,\n      qualifications: variant.qualifications,\n      originalId: snap.id,\n      isPrimary,\n    };\n  });\n}\n"],"mappings":";;;;;;;;AAuBA,SAAgB,4BACd,KACA,SACkC;CAElC,MAAM,kBAAkB;EACtB,GAAG;EACH,SAASA,iBAAe,KAAK,QAAQ,QAAQ;EAC9C;CAGD,MAAM,YAAY,iBAAiB,KAAK,gBAAgB,QAAQ;AAChE,KAAI,UAAU,WAAW,EAAG,QAAO,KAAA;CAGnC,MAAM,aAAa,IAAI,wBAAwB,IAAI,WAAW,aAAa,CAAC,CACzE,WAAW,UAAU,CACrB,MAAM,gBAAgB;AACzB,KAAI,eAAe,KAAA,EAAW,QAAO,KAAA;AAErC,KAAI;AAKF,SAAO,yBAJU,WAAW,mBAAmB,EAC7C,GAAI,gBAAgB,YAAY,EAAE,EACnC,CAAC,EACc,WAAW,YAAY,CACW;WAC1C;AACR,aAAW,SAAS;;;;AAOxB,SAASA,iBACP,KACA,SACiE;CACjE,MAAM,SAA0E,EAAE;AAClF,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,QAAQ,CAChD,KAAI,QAAQ,MAAM,CAChB,QAAO,OACL,IAAI,WAAW,oBAAoB,MAAM,IACzC,WACE,UAAU,IAAI,YAAY,KAAK,UAAU,MAAM,CAAC,yCACjD;KAEH,QAAO,OAAO;AAGlB,QAAO;;;AAIT,SAAS,iBACP,KACA,SAC0B;AAC1B,QAAO,YAAY,KAAA,IACf,QAAQ,IAAI,yBAAyB,GACrC,kCAAkC,IAAI;;;AAI5C,SAAS,yBACP,UACA,SACsB;CACtB,MAAM,uBAAuB,IAAI,IAC/B,MAAM,KAAK,QAAQ,SAAS,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,IAAI,CAAU,CACrE;AAED,QAAO,SAAS,KAAK,YAAgC;EACnD,MAAM,OAAO,QAAQ;EACrB,MAAM,YAAY,qBAAqB,IAAI,KAAK,GAAG,KAAK,KAAA;AAWxD,SAAO;GACL,QAAQ;IACN,IAXiB,0BAA0B;KAC7C,QAAQ,KAAK;KACb,MAAM,QAAQ,KAAK,KAAK,OAAO;MAC7B,MAAM;MACN,QAAQ,EAAE,OAAO;MAClB,EAAE;KACH,sBAAsB,QAAQ,eAAe;KAC7C,uBAAuB,QAAQ,eAAe;KAC/C,CAAC;IAIE,MAAM,KAAK;IACX,MAAM,KAAK;IACX,YAAY,KAAK;IAClB;GACD,MAAM,QAAQ;GACd,gBAAgB,QAAQ;GACxB,YAAY,KAAK;GACjB;GACD;GACD"}
+{"version":3,"file":"discoverColumns.js","names":["resolveAnchors"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/discoverColumns.ts"],"sourcesContent":["import type { PColumnSpec, PlRef, PObjectId } from \"@milaboratories/pl-model-common\";\nimport { createDiscoveredPColumnId, isPlRef, PColumnName } from \"@milaboratories/pl-model-common\";\nimport type { RenderCtxBase } from \"../../../render\";\nimport type {\n  ColumnSource,\n  ColumnVariant,\n  RelaxedColumnSelector,\n  ColumnSnapshotProvider,\n  ColumnSnapshot,\n} from \"../../../columns\";\nimport { ColumnCollectionBuilder } from \"../../../columns\";\nimport { toColumnSnapshotProvider } from \"../../../columns/column_snapshot_provider\";\nimport { collectCtxColumnSnapshotProviders } from \"../../../columns/ctx_column_sources\";\nimport { throwError } from \"@milaboratories/helpers\";\nimport type { ColumnsSelectorConfig, TableColumnVariant } from \"./createPlDataTableV3\";\n\nexport type DiscoverTableColumnOptions = {\n  sources?: ColumnSource[];\n  anchors: Record<string, PlRef | PObjectId | PColumnSpec | RelaxedColumnSelector>;\n  selector: ColumnsSelectorConfig;\n};\n\n/** Discover columns from sources/anchors and normalize into a flat TableColumnVariant list. */\nexport function discoverTableColumnSnaphots(\n  ctx: RenderCtxBase,\n  options: DiscoverTableColumnOptions,\n): TableColumnVariant[] | undefined {\n  // Resolve PlRef anchors to PColumnSpec\n  const resolvedOptions = {\n    ...options,\n    anchors: resolveAnchors(ctx, options.anchors),\n  };\n\n  // Resolve providers\n  const providers = resolveProviders(ctx, resolvedOptions.sources);\n  if (providers.length === 0) return undefined;\n\n  // Build collection (anchored or plain)\n  const collection = new ColumnCollectionBuilder(ctx.getService(\"pframeSpec\"))\n    .addSources(providers)\n    .build(resolvedOptions);\n  if (collection === undefined) return undefined;\n\n  try {\n    const variants = collection.findColumnVariants(resolvedOptions.selector);\n    const anchors = collection.getAnchors();\n    return mapToTableColumnVariants(variants, anchors);\n  } finally {\n    collection.dispose();\n  }\n}\n\n/**\n * Discover label columns matching the axes of the given value columns from\n * ctx providers. Returns label snapshots wrapped as direct TableColumnVariants\n * (path: [], empty qualifications, isPrimary: false).\n */\nexport function discoverLabelColumnVariants<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  columns: TableColumnVariant[],\n): TableColumnVariant[] {\n  if (columns.length === 0) return [];\n  const collection = new ColumnCollectionBuilder(ctx.getService(\"pframeSpec\"))\n    .addSources(collectCtxColumnSnapshotProviders(ctx))\n    .addSource(columns.map((c) => c.column))\n    .build({\n      allowPartialColumnList: true,\n      anchors: Object.fromEntries(\n        columns\n          .filter((col) => (col.path?.length ?? 0) === 0 && col.isPrimary)\n          .map((col, i) => [`anchor_${i}`, col.column.spec]),\n      ),\n    });\n\n  try {\n    const axes = columns.flatMap((col) => col.column.spec.axesSpec);\n    return collection\n      .findColumnVariants({\n        include: axes.map((a) => ({\n          name: { type: \"exact\", value: PColumnName.Label },\n          axes: [{ name: { type: \"exact\", value: a.name } }],\n        })),\n        maxHops: columns.reduce((acc, c) => Math.max(acc, c.path?.length ?? 0), 0),\n      })\n      .map((variant) => ({\n        ...variant,\n        column: {\n          ...variant.column,\n          id: createDiscoveredPColumnId({\n            column: variant.column.id,\n            path: variant.path?.map((p) => ({\n              type: \"linker\",\n              column: p.linker.id,\n            })),\n            columnQualifications: variant.qualifications?.forHit,\n            queriesQualifications: variant.qualifications?.forQueries,\n          }),\n          originalId: variant.column.id,\n        },\n      }));\n  } finally {\n    collection.dispose();\n  }\n}\n\n/** Resolve PlRef values in anchors to PColumnSpec via the result pool. */\nfunction resolveAnchors(\n  ctx: RenderCtxBase,\n  anchors: Record<string, PlRef | PObjectId | PColumnSpec | RelaxedColumnSelector>,\n): Record<string, PObjectId | PColumnSpec | RelaxedColumnSelector> {\n  const result: Record<string, PObjectId | PColumnSpec | RelaxedColumnSelector> = {};\n  for (const [key, value] of Object.entries(anchors)) {\n    if (isPlRef(value)) {\n      result[key] =\n        ctx.resultPool.getPColumnSpecByRef(value) ??\n        throwError(\n          `Anchor ${key} with ref ${JSON.stringify(value)} could not be resolved to a PColumnSpec`,\n        );\n    } else {\n      result[key] = value;\n    }\n  }\n  return result;\n}\n\n/** Resolve column snapshot providers from explicit sources or context. */\nfunction resolveProviders(\n  ctx: RenderCtxBase,\n  sources: undefined | ColumnSource[],\n): ColumnSnapshotProvider[] {\n  return sources !== undefined\n    ? sources.map(toColumnSnapshotProvider)\n    : collectCtxColumnSnapshotProviders(ctx);\n}\n\n/** Map column variants into TableColumnVariant list with anchor-derived isPrimary flag. */\nfunction mapToTableColumnVariants(\n  variants: readonly ColumnVariant[],\n  anchors: Map<string, ColumnSnapshot<PObjectId>>,\n): TableColumnVariant[] {\n  const columnIdToAnchorName = new Map<PObjectId, string>(\n    Array.from(anchors.entries(), ([key, { id }]) => [id, key] as const),\n  );\n\n  return variants.map((variant): TableColumnVariant => {\n    const snap = variant.column;\n    const isPrimary = columnIdToAnchorName.get(snap.id) !== undefined;\n\n    const discoveredId = createDiscoveredPColumnId({\n      column: snap.id,\n      path: variant.path?.map((p) => ({\n        type: \"linker\",\n        column: p.linker.id,\n      })),\n      columnQualifications: variant.qualifications?.forHit,\n      queriesQualifications: variant.qualifications?.forQueries,\n    });\n    return {\n      column: {\n        id: discoveredId,\n        spec: snap.spec,\n        data: snap.data,\n        dataStatus: snap.dataStatus,\n      },\n      path: variant.path,\n      qualifications: variant.qualifications,\n      originalId: snap.id,\n      isPrimary,\n    };\n  });\n}\n"],"mappings":"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"}

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

@@ -1 +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\nexport { discoverTableColumnSnaphots } from \"./discoverColumns\";\n"],"mappings":";;;;AAcA,SAAgB,kBACd,KACA,SAG8B;AAC9B,KAAI,QAAQ,YAAY,KACtB,QAAOA,4BAAAA,oBAAoB,KAAK,QAAQ,SAAS,QAAQ,YAAY,QAAQ,QAAQ;KAGrF,QAAOC,4BAAAA,oBAAoB,KAAK,QAAQ"}
+{"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 \"../typesV6\";\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\nexport { discoverTableColumnSnaphots } from \"./discoverColumns\";\n"],"mappings":";;;;AAcA,SAAgB,kBACd,KACA,SAG8B;AAC9B,KAAI,QAAQ,YAAY,KACtB,QAAOA,4BAAAA,oBAAoB,KAAK,QAAQ,SAAS,QAAQ,YAAY,QAAQ,QAAQ;KAGrF,QAAOC,4BAAAA,oBAAoB,KAAK,QAAQ"}

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

@@ -1 +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\nexport { discoverTableColumnSnaphots } from \"./discoverColumns\";\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"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/index.ts"],"sourcesContent":["import type { RenderCtxBase } from \"../../../render\";\nimport type { PlDataTableModel } from \"../typesV6\";\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\nexport { discoverTableColumnSnaphots } from \"./discoverColumns\";\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/createPlDataTable/utils.cjs

@@ -5,6 +5,7 @@ const require_column_collection_builder = require("../../../columns/column_colle
 require("../../../columns/index.cjs");
 const require_derive_distinct_tooltips = require("../../../labels/derive_distinct_tooltips.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 let es_toolkit = require("es-toolkit");
 //#region src/components/PlDataTable/createPlDataTable/utils.ts
 /** Check if column should be omitted from the table */
@@ -26,7 +27,8 @@ function getEffectiveVisibility(col, visibilityByColId) {
 function getOrderPriority(col, orderByColId) {
 	const rule = orderByColId?.get(col.id);
 	if (rule !== void 0) return rule.priority;
-	return (0, _milaboratories_pl_model_common.readAnnotationJson)(col.spec, _milaboratories_pl_model_common.Annotation.Table.OrderPriority);
+	const annotation = Number((0, _milaboratories_pl_model_common.readAnnotation)(col.spec, _milaboratories_pl_model_common.Annotation.Table.OrderPriority));
+	return isNaN(annotation) ? void 0 : annotation;
 }
 /**
 * Evaluate display rules against a set of columns and return a map of `colId → winning rule`
@@ -192,11 +194,12 @@ function deriveAllLabels(options) {
 function deriveAllTooltips(options) {
 	const { columns } = options;
 	const variantCountByOriginal = columns.reduce((acc, c) => {
-		return acc.set(c.originalId, (acc.get(c.originalId) ?? 0) + 1);
+		return acc.set((0, _milaboratories_helpers.getField)(c, "originalId") ?? c.id, (acc.get(c.originalId ?? c.id) ?? 0) + 1);
 	}, /* @__PURE__ */ new Map());
 	const { entries } = columns.reduce(({ entries, variantSeen }, c) => {
-		const variantCount = variantCountByOriginal.get(c.originalId);
-		const variantIndex = (variantSeen.set(c.originalId, (variantSeen.get(c.originalId) ?? 0) + 1), variantSeen.get(c.originalId));
+		const id = (0, _milaboratories_helpers.getField)(c, "originalId") ?? c.id;
+		const variantCount = variantCountByOriginal.get(id);
+		const variantIndex = (variantSeen.set(id, (variantSeen.get(id) ?? 0) + 1), variantSeen.get(id));
 		entries.push({
 			spec: c.spec,
 			linkerPath: c.linkerPath,

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

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","names":["Annotation","ColumnCollectionBuilder","ArrayColumnProvider","deriveDistinctLabels","deriveDistinctTooltips"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/utils.ts"],"sourcesContent":["import {\n  type PColumn,\n  type PColumnSpec,\n  type PFrameSpecDriver,\n  type PObjectId,\n  Annotation,\n  canonicalizeAxisId,\n  DiscoveredPColumnId,\n  readAnnotation,\n  readAnnotationJson,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n} from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveDistinctTooltips,\n  type TooltipEntry,\n} from \"../../../labels/derive_distinct_tooltips\";\nimport type { ColumnDataStatus, MatchQualifications, MatchVariant } from \"../../../columns\";\nimport type { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule } from \"./createPlDataTableV3\";\nimport type { ColumnSelector } from \"../../../columns\";\nimport { ArrayColumnProvider, ColumnCollectionBuilder } from \"../../../columns\";\nimport { isNil } from \"es-toolkit\";\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/** Column shape consumed by rule evaluation. */\nexport type RuleColumn = Pick<PColumn<PObjectId>, \"id\" | \"spec\">;\n\n/** Get effective visibility for a column. Rule map lookup first, then annotation fallback. */\nexport function getEffectiveVisibility(\n  col: RuleColumn,\n  visibilityByColId?: Map<PObjectId, ColumnVisibilityRule>,\n): undefined | \"default\" | \"optional\" | \"hidden\" {\n  const rule = visibilityByColId?.get(col.id);\n  if (rule !== undefined) return rule.visibility;\n  if (isColumnHidden(col.spec)) return \"hidden\";\n  if (isColumnOptional(col.spec)) return \"optional\";\n  return undefined;\n}\n\n/** Get ordering priority for a column. Rule map lookup first, then annotation fallback. */\nexport function getOrderPriority(\n  col: RuleColumn,\n  orderByColId?: Map<PObjectId, ColumnOrderRule>,\n): undefined | number {\n  const rule = orderByColId?.get(col.id);\n  if (rule !== undefined) return rule.priority;\n  return readAnnotationJson(col.spec, Annotation.Table.OrderPriority);\n}\n\n/**\n * Evaluate display rules against a set of columns and return a map of `colId → winning rule`\n * (first-match-wins, preserving original rule order).\n *\n * Predicate-based rules (`ColumnMatcher`) are evaluated directly on the spec.\n * Selector-based rules (`ColumnSelector`) are matched via `PFrameSpecDriver.discoverColumns`\n * using the same engine as `ColumnCollection.findColumns` — no client-side matcher.\n */\nexport function evaluateRules<R extends { match: ColumnMatcher | ColumnSelector }>(\n  rules: R[],\n  columns: RuleColumn[],\n  pframeSpec: PFrameSpecDriver,\n): Map<PObjectId, R> {\n  const result = new Map<PObjectId, R>();\n  if (rules.length === 0 || columns.length === 0) return result;\n\n  const hasSelectorRules = rules.some((rule) => typeof rule.match !== \"function\");\n  const selectorHitsByRule = new Map<R, Set<PObjectId>>();\n\n  if (hasSelectorRules) {\n    const dedupedColumns = dedupeById(columns);\n    const pColumns = dedupedColumns.map((c) => ({ id: c.id, spec: c.spec, data: undefined }));\n    const collection = new ColumnCollectionBuilder(pframeSpec)\n      .addSource(new ArrayColumnProvider(pColumns))\n      .build();\n    if (collection === undefined) return result;\n\n    try {\n      for (const rule of rules) {\n        if (typeof rule.match === \"function\") continue;\n        const hits = collection.findColumns({ include: rule.match });\n        selectorHitsByRule.set(rule, new Set(hits.map((h) => h.id)));\n      }\n    } finally {\n      collection.dispose();\n    }\n  }\n\n  for (const col of columns) {\n    for (const rule of rules) {\n      const matches =\n        typeof rule.match === \"function\"\n          ? rule.match(col.spec)\n          : (selectorHitsByRule.get(rule)?.has(col.id) ?? false);\n      if (matches) {\n        result.set(col.id, rule);\n        break;\n      }\n    }\n  }\n  return result;\n}\n\nfunction dedupeById(columns: RuleColumn[]): RuleColumn[] {\n  const seen = new Set<PObjectId>();\n  const result: RuleColumn[] = [];\n  for (const col of columns) {\n    if (seen.has(col.id)) continue;\n    seen.add(col.id);\n    result.push(col);\n  }\n  return result;\n}\n\n/**\n * Writes derived labels into column and axis annotations.\n * Returns new column objects with modified specs — original columns are not mutated.\n *\n * For each column: writes derived label into Annotation.Label (if present in derivedLabels).\n * For each axis in column specs: writes derived axis label into AxisSpec annotations.\n */\nexport function withLabelAnnotations<\n  T extends {\n    readonly id: PObjectId;\n    readonly spec: PColumnSpec;\n  },\n>(derivedLabels: undefined | Record<string, string>, columns: T[]): T[] {\n  if (derivedLabels === undefined) return columns;\n  return columns.map((col) => {\n    const colLabel = derivedLabels[col.id];\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        ...(isNil(colLabel)\n          ? {}\n          : { annotations: { ...col.spec.annotations, [Annotation.Label]: colLabel } }),\n        axesSpec: col.spec.axesSpec.map((axis) => {\n          const label = derivedLabels[canonicalizeAxisId(axis)];\n          return isNil(label)\n            ? axis\n            : { ...axis, annotations: { ...axis.annotations, [Annotation.Label]: label } };\n        }),\n      },\n    } as T;\n  });\n}\n\nexport function withDataStatusAnnotations<\n  T extends {\n    readonly spec: PColumnSpec;\n    readonly dataStatus: ColumnDataStatus;\n  },\n>(columns: T[]): T[] {\n  return columns.map((col) => {\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: {\n          ...col.spec.annotations,\n          [Annotation.DataStatus]: col.dataStatus,\n        },\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes effective display properties (OrderPriority, Visibility) from precomputed rule maps\n * into column annotations. Returns new column objects — originals are not mutated.\n */\nexport function withTableVisualAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(\n  visibilityByColId: undefined | Map<PObjectId, ColumnVisibilityRule>,\n  orderByColId: undefined | Map<PObjectId, ColumnOrderRule>,\n  columns: T[],\n): T[] {\n  if (visibilityByColId === undefined && orderByColId === undefined) return columns;\n  return columns.map((col) => {\n    const annotations = { ...col.spec.annotations };\n\n    const visibility = getEffectiveVisibility(col, visibilityByColId);\n    if (!isNil(visibility)) annotations[Annotation.Table.Visibility] = visibility;\n\n    const orderPriority = getOrderPriority(col, orderByColId);\n    if (!isNil(orderPriority)) annotations[Annotation.Table.OrderPriority] = String(orderPriority);\n\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: annotations,\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes derived info annotations into column annotations.\n * Columns without an info entry are passed through unchanged.\n */\nexport function withInfoAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(infoById: undefined | Record<string, string>, columns: T[]): T[] {\n  if (isNil(infoById)) return columns;\n  return columns.map((col) => {\n    const info = infoById[col.id];\n    if (isNil(info)) return col;\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: { ...col.spec.annotations, [Annotation.Table.Info]: info },\n      },\n    } as T;\n  });\n}\n\nexport function withHidenAxesAnnotations<T extends { readonly spec: PColumnSpec }>(\n  columns: T[],\n): T[] {\n  return columns.map(\n    (col) =>\n      ({\n        ...col,\n        spec: {\n          ...col.spec,\n          axesSpec: col.spec.axesSpec.map((axis) => ({\n            ...axis,\n            annotations: { ...axis.annotations, [Annotation.Table.Visibility]: \"hidden\" },\n          })),\n        },\n      }) as T,\n  );\n}\n\n/** Column shape required by label derivation. */\nexport type LabelableColumn = {\n  readonly id: PObjectId;\n  readonly spec: PColumnSpec;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive labels for all table elements: columns via deriveDistinctLabels, axes from label columns. */\nexport function deriveAllLabels(options: {\n  columns: LabelableColumn[];\n  deriveLabelsOptions?: DeriveLabelsOptions;\n}): Record<string, string> {\n  const { columns, deriveLabelsOptions } = options;\n  const entries = columns.map((c) => ({\n    spec: c.spec,\n    linkerPath: c.linkerPath?.map((step) => ({\n      spec: step.linker.spec,\n    })),\n    qualifications: c.qualifications,\n  }));\n  const columnLabels = deriveDistinctLabels(entries, deriveLabelsOptions).reduce(\n    (acc, label, index) => ((acc[columns[index].id] = label), acc),\n    {} as Record<string, string>,\n  );\n  return columnLabels;\n}\n\n/** Column shape required by tooltip derivation. */\nexport type TooltipableColumn = {\n  readonly id: DiscoveredPColumnId;\n  readonly spec: PColumnSpec;\n  readonly originalId: PObjectId;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive origin tooltips for columns whose qualifications or linker path carry info. */\nexport function deriveAllTooltips(options: {\n  columns: TooltipableColumn[];\n}): Record<DiscoveredPColumnId, string> {\n  const { columns } = options;\n\n  const variantCountByOriginal = columns.reduce<Map<PObjectId, number>>((acc, c) => {\n    return acc.set(c.originalId, (acc.get(c.originalId) ?? 0) + 1);\n  }, new Map());\n\n  const { entries } = columns.reduce(\n    ({ entries, variantSeen }, c) => {\n      const variantCount = variantCountByOriginal.get(c.originalId);\n      const variantIndex =\n        (variantSeen.set(c.originalId, (variantSeen.get(c.originalId) ?? 0) + 1),\n        variantSeen.get(c.originalId));\n\n      entries.push({\n        spec: c.spec,\n        linkerPath: c.linkerPath,\n        qualifications: c.qualifications,\n        variantIndex,\n        variantCount,\n      });\n\n      return { entries, variantSeen };\n    },\n    { entries: [] as TooltipEntry[], variantSeen: new Map<PObjectId, number>() },\n  );\n\n  const tooltips = deriveDistinctTooltips(entries);\n\n  return Object.fromEntries(\n    tooltips.flatMap((t, i) => (isNil(t) ? [] : [[columns[i].id, t] as const])),\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"utils.cjs","names":["Annotation","ColumnCollectionBuilder","ArrayColumnProvider","deriveDistinctLabels","deriveDistinctTooltips"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/utils.ts"],"sourcesContent":["import {\n  type PColumn,\n  type PColumnSpec,\n  type PFrameSpecDriver,\n  type PObjectId,\n  Annotation,\n  canonicalizeAxisId,\n  DiscoveredPColumnId,\n  readAnnotation,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n} from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveDistinctTooltips,\n  type TooltipEntry,\n} from \"../../../labels/derive_distinct_tooltips\";\nimport type { ColumnDataStatus, MatchQualifications, MatchVariant } from \"../../../columns\";\nimport type { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule } from \"./createPlDataTableV3\";\nimport type { ColumnSelector } from \"../../../columns\";\nimport { ArrayColumnProvider, ColumnCollectionBuilder } from \"../../../columns\";\nimport { isNil } from \"es-toolkit\";\nimport { getField } from \"@milaboratories/helpers\";\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/** Column shape consumed by rule evaluation. */\nexport type RuleColumn = Pick<PColumn<PObjectId>, \"id\" | \"spec\">;\n\n/** Get effective visibility for a column. Rule map lookup first, then annotation fallback. */\nexport function getEffectiveVisibility(\n  col: RuleColumn,\n  visibilityByColId?: Map<PObjectId, ColumnVisibilityRule>,\n): undefined | \"default\" | \"optional\" | \"hidden\" {\n  const rule = visibilityByColId?.get(col.id);\n  if (rule !== undefined) return rule.visibility;\n  if (isColumnHidden(col.spec)) return \"hidden\";\n  if (isColumnOptional(col.spec)) return \"optional\";\n  return undefined;\n}\n\n/** Get ordering priority for a column. Rule map lookup first, then annotation fallback. */\nexport function getOrderPriority(\n  col: RuleColumn,\n  orderByColId?: Map<PObjectId, ColumnOrderRule>,\n): undefined | number {\n  const rule = orderByColId?.get(col.id);\n  if (rule !== undefined) return rule.priority;\n  const annotation = Number(readAnnotation(col.spec, Annotation.Table.OrderPriority));\n  return isNaN(annotation) ? undefined : annotation;\n}\n\n/**\n * Evaluate display rules against a set of columns and return a map of `colId → winning rule`\n * (first-match-wins, preserving original rule order).\n *\n * Predicate-based rules (`ColumnMatcher`) are evaluated directly on the spec.\n * Selector-based rules (`ColumnSelector`) are matched via `PFrameSpecDriver.discoverColumns`\n * using the same engine as `ColumnCollection.findColumns` — no client-side matcher.\n */\nexport function evaluateRules<R extends { match: ColumnMatcher | ColumnSelector }>(\n  rules: R[],\n  columns: RuleColumn[],\n  pframeSpec: PFrameSpecDriver,\n): Map<PObjectId, R> {\n  const result = new Map<PObjectId, R>();\n  if (rules.length === 0 || columns.length === 0) return result;\n\n  const hasSelectorRules = rules.some((rule) => typeof rule.match !== \"function\");\n  const selectorHitsByRule = new Map<R, Set<PObjectId>>();\n\n  if (hasSelectorRules) {\n    const dedupedColumns = dedupeById(columns);\n    const pColumns = dedupedColumns.map((c) => ({ id: c.id, spec: c.spec, data: undefined }));\n    const collection = new ColumnCollectionBuilder(pframeSpec)\n      .addSource(new ArrayColumnProvider(pColumns))\n      .build();\n    if (collection === undefined) return result;\n\n    try {\n      for (const rule of rules) {\n        if (typeof rule.match === \"function\") continue;\n        const hits = collection.findColumns({ include: rule.match });\n        selectorHitsByRule.set(rule, new Set(hits.map((h) => h.id)));\n      }\n    } finally {\n      collection.dispose();\n    }\n  }\n\n  for (const col of columns) {\n    for (const rule of rules) {\n      const matches =\n        typeof rule.match === \"function\"\n          ? rule.match(col.spec)\n          : (selectorHitsByRule.get(rule)?.has(col.id) ?? false);\n      if (matches) {\n        result.set(col.id, rule);\n        break;\n      }\n    }\n  }\n  return result;\n}\n\nfunction dedupeById(columns: RuleColumn[]): RuleColumn[] {\n  const seen = new Set<PObjectId>();\n  const result: RuleColumn[] = [];\n  for (const col of columns) {\n    if (seen.has(col.id)) continue;\n    seen.add(col.id);\n    result.push(col);\n  }\n  return result;\n}\n\n/**\n * Writes derived labels into column and axis annotations.\n * Returns new column objects with modified specs — original columns are not mutated.\n *\n * For each column: writes derived label into Annotation.Label (if present in derivedLabels).\n * For each axis in column specs: writes derived axis label into AxisSpec annotations.\n */\nexport function withLabelAnnotations<\n  T extends {\n    readonly id: PObjectId;\n    readonly spec: PColumnSpec;\n  },\n>(derivedLabels: undefined | Record<string, string>, columns: T[]): T[] {\n  if (derivedLabels === undefined) return columns;\n  return columns.map((col) => {\n    const colLabel = derivedLabels[col.id];\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        ...(isNil(colLabel)\n          ? {}\n          : { annotations: { ...col.spec.annotations, [Annotation.Label]: colLabel } }),\n        axesSpec: col.spec.axesSpec.map((axis) => {\n          const label = derivedLabels[canonicalizeAxisId(axis)];\n          return isNil(label)\n            ? axis\n            : { ...axis, annotations: { ...axis.annotations, [Annotation.Label]: label } };\n        }),\n      },\n    } as T;\n  });\n}\n\nexport function withDataStatusAnnotations<\n  T extends {\n    readonly spec: PColumnSpec;\n    readonly dataStatus: ColumnDataStatus;\n  },\n>(columns: T[]): T[] {\n  return columns.map((col) => {\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: {\n          ...col.spec.annotations,\n          [Annotation.DataStatus]: col.dataStatus,\n        },\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes effective display properties (OrderPriority, Visibility) from precomputed rule maps\n * into column annotations. Returns new column objects — originals are not mutated.\n */\nexport function withTableVisualAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(\n  visibilityByColId: undefined | Map<PObjectId, ColumnVisibilityRule>,\n  orderByColId: undefined | Map<PObjectId, ColumnOrderRule>,\n  columns: T[],\n): T[] {\n  if (visibilityByColId === undefined && orderByColId === undefined) return columns;\n  return columns.map((col) => {\n    const annotations = { ...col.spec.annotations };\n\n    const visibility = getEffectiveVisibility(col, visibilityByColId);\n    if (!isNil(visibility)) annotations[Annotation.Table.Visibility] = visibility;\n\n    const orderPriority = getOrderPriority(col, orderByColId);\n    if (!isNil(orderPriority)) annotations[Annotation.Table.OrderPriority] = String(orderPriority);\n\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: annotations,\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes derived info annotations into column annotations.\n * Columns without an info entry are passed through unchanged.\n */\nexport function withInfoAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(infoById: undefined | Record<string, string>, columns: T[]): T[] {\n  if (isNil(infoById)) return columns;\n  return columns.map((col) => {\n    const info = infoById[col.id];\n    if (isNil(info)) return col;\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: { ...col.spec.annotations, [Annotation.Table.Info]: info },\n      },\n    } as T;\n  });\n}\n\nexport function withHidenAxesAnnotations<T extends { readonly spec: PColumnSpec }>(\n  columns: T[],\n): T[] {\n  return columns.map(\n    (col) =>\n      ({\n        ...col,\n        spec: {\n          ...col.spec,\n          axesSpec: col.spec.axesSpec.map((axis) => ({\n            ...axis,\n            annotations: { ...axis.annotations, [Annotation.Table.Visibility]: \"hidden\" },\n          })),\n        },\n      }) as T,\n  );\n}\n\n/** Column shape required by label derivation. */\nexport type LabelableColumn = {\n  readonly id: PObjectId;\n  readonly spec: PColumnSpec;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive labels for all table elements: columns via deriveDistinctLabels, axes from label columns. */\nexport function deriveAllLabels(options: {\n  columns: LabelableColumn[];\n  deriveLabelsOptions?: DeriveLabelsOptions;\n}): Record<string, string> {\n  const { columns, deriveLabelsOptions } = options;\n  const entries = columns.map((c) => ({\n    spec: c.spec,\n    linkerPath: c.linkerPath?.map((step) => ({\n      spec: step.linker.spec,\n    })),\n    qualifications: c.qualifications,\n  }));\n  const columnLabels = deriveDistinctLabels(entries, deriveLabelsOptions).reduce(\n    (acc, label, index) => ((acc[columns[index].id] = label), acc),\n    {} as Record<string, string>,\n  );\n  return columnLabels;\n}\n\n/** Column shape required by tooltip derivation. */\nexport type TooltipableColumn = {\n  readonly id: PObjectId | DiscoveredPColumnId;\n  readonly spec: PColumnSpec;\n  readonly originalId?: PObjectId;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive origin tooltips for columns whose qualifications or linker path carry info. */\nexport function deriveAllTooltips(options: {\n  columns: TooltipableColumn[];\n}): Record<DiscoveredPColumnId, string> {\n  const { columns } = options;\n\n  const variantCountByOriginal = columns.reduce<Map<PObjectId, number>>((acc, c) => {\n    return acc.set(getField(c, \"originalId\") ?? c.id, (acc.get(c.originalId ?? c.id) ?? 0) + 1);\n  }, new Map());\n\n  const { entries } = columns.reduce(\n    ({ entries, variantSeen }, c) => {\n      const id = getField(c, \"originalId\") ?? c.id;\n      const variantCount = variantCountByOriginal.get(id);\n      const variantIndex =\n        (variantSeen.set(id, (variantSeen.get(id) ?? 0) + 1), variantSeen.get(id));\n\n      entries.push({\n        spec: c.spec,\n        linkerPath: c.linkerPath,\n        qualifications: c.qualifications,\n        variantIndex,\n        variantCount,\n      });\n\n      return { entries, variantSeen };\n    },\n    { entries: [] as TooltipEntry[], variantSeen: new Map<PObjectId, number>() },\n  );\n\n  const tooltips = deriveDistinctTooltips(entries);\n\n  return Object.fromEntries(\n    tooltips.flatMap((t, i) => (isNil(t) ? [] : [[columns[i].id, t] as const])),\n  );\n}\n"],"mappings":"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"}

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

@@ -3,8 +3,9 @@ import { ArrayColumnProvider } from "../../../columns/column_snapshot_provider.j
 import { ColumnCollectionBuilder } from "../../../columns/column_collection_builder.js";
 import "../../../columns/index.js";
 import { deriveDistinctTooltips } from "../../../labels/derive_distinct_tooltips.js";
-import { Annotation, canonicalizeAxisId, readAnnotation, readAnnotationJson } from "@milaboratories/pl-model-common";
-import { isNil } from "es-toolkit";
+import { Annotation, canonicalizeAxisId, readAnnotation } from "@milaboratories/pl-model-common";
+import { getField } from "@milaboratories/helpers";
+import { isNil as isNil$1 } from "es-toolkit";
 //#region src/components/PlDataTable/createPlDataTable/utils.ts
 /** Check if column should be omitted from the table */
 function isColumnHidden(spec) {
@@ -25,7 +26,8 @@ function getEffectiveVisibility(col, visibilityByColId) {
 function getOrderPriority(col, orderByColId) {
 	const rule = orderByColId?.get(col.id);
 	if (rule !== void 0) return rule.priority;
-	return readAnnotationJson(col.spec, Annotation.Table.OrderPriority);
+	const annotation = Number(readAnnotation(col.spec, Annotation.Table.OrderPriority));
+	return isNaN(annotation) ? void 0 : annotation;
 }
 /**
 * Evaluate display rules against a set of columns and return a map of `colId → winning rule`
@@ -89,13 +91,13 @@ function withLabelAnnotations(derivedLabels, columns) {
 			...col,
 			spec: {
 				...col.spec,
-				...isNil(colLabel) ? {} : { annotations: {
+				...isNil$1(colLabel) ? {} : { annotations: {
 					...col.spec.annotations,
 					[Annotation.Label]: colLabel
 				} },
 				axesSpec: col.spec.axesSpec.map((axis) => {
 					const label = derivedLabels[canonicalizeAxisId(axis)];
-					return isNil(label) ? axis : {
+					return isNil$1(label) ? axis : {
 						...axis,
 						annotations: {
 							...axis.annotations,
@@ -130,9 +132,9 @@ function withTableVisualAnnotations(visibilityByColId, orderByColId, columns) {
 	return columns.map((col) => {
 		const annotations = { ...col.spec.annotations };
 		const visibility = getEffectiveVisibility(col, visibilityByColId);
-		if (!isNil(visibility)) annotations[Annotation.Table.Visibility] = visibility;
+		if (!isNil$1(visibility)) annotations[Annotation.Table.Visibility] = visibility;
 		const orderPriority = getOrderPriority(col, orderByColId);
-		if (!isNil(orderPriority)) annotations[Annotation.Table.OrderPriority] = String(orderPriority);
+		if (!isNil$1(orderPriority)) annotations[Annotation.Table.OrderPriority] = String(orderPriority);
 		return {
 			...col,
 			spec: {
@@ -147,10 +149,10 @@ function withTableVisualAnnotations(visibilityByColId, orderByColId, columns) {
 * Columns without an info entry are passed through unchanged.
 */
 function withInfoAnnotations(infoById, columns) {
-	if (isNil(infoById)) return columns;
+	if (isNil$1(infoById)) return columns;
 	return columns.map((col) => {
 		const info = infoById[col.id];
-		if (isNil(info)) return col;
+		if (isNil$1(info)) return col;
 		return {
 			...col,
 			spec: {
@@ -191,11 +193,12 @@ function deriveAllLabels(options) {
 function deriveAllTooltips(options) {
 	const { columns } = options;
 	const variantCountByOriginal = columns.reduce((acc, c) => {
-		return acc.set(c.originalId, (acc.get(c.originalId) ?? 0) + 1);
+		return acc.set(getField(c, "originalId") ?? c.id, (acc.get(c.originalId ?? c.id) ?? 0) + 1);
 	}, /* @__PURE__ */ new Map());
 	const { entries } = columns.reduce(({ entries, variantSeen }, c) => {
-		const variantCount = variantCountByOriginal.get(c.originalId);
-		const variantIndex = (variantSeen.set(c.originalId, (variantSeen.get(c.originalId) ?? 0) + 1), variantSeen.get(c.originalId));
+		const id = getField(c, "originalId") ?? c.id;
+		const variantCount = variantCountByOriginal.get(id);
+		const variantIndex = (variantSeen.set(id, (variantSeen.get(id) ?? 0) + 1), variantSeen.get(id));
 		entries.push({
 			spec: c.spec,
 			linkerPath: c.linkerPath,
@@ -212,7 +215,7 @@ function deriveAllTooltips(options) {
 		variantSeen: /* @__PURE__ */ new Map()
 	});
 	const tooltips = deriveDistinctTooltips(entries);
-	return Object.fromEntries(tooltips.flatMap((t, i) => isNil(t) ? [] : [[columns[i].id, t]]));
+	return Object.fromEntries(tooltips.flatMap((t, i) => isNil$1(t) ? [] : [[columns[i].id, t]]));
 }
 //#endregion
 export { deriveAllLabels, deriveAllTooltips, evaluateRules, getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional, withDataStatusAnnotations, withHidenAxesAnnotations, withInfoAnnotations, withLabelAnnotations, withTableVisualAnnotations };

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/utils.ts"],"sourcesContent":["import {\n  type PColumn,\n  type PColumnSpec,\n  type PFrameSpecDriver,\n  type PObjectId,\n  Annotation,\n  canonicalizeAxisId,\n  DiscoveredPColumnId,\n  readAnnotation,\n  readAnnotationJson,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n} from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveDistinctTooltips,\n  type TooltipEntry,\n} from \"../../../labels/derive_distinct_tooltips\";\nimport type { ColumnDataStatus, MatchQualifications, MatchVariant } from \"../../../columns\";\nimport type { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule } from \"./createPlDataTableV3\";\nimport type { ColumnSelector } from \"../../../columns\";\nimport { ArrayColumnProvider, ColumnCollectionBuilder } from \"../../../columns\";\nimport { isNil } from \"es-toolkit\";\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/** Column shape consumed by rule evaluation. */\nexport type RuleColumn = Pick<PColumn<PObjectId>, \"id\" | \"spec\">;\n\n/** Get effective visibility for a column. Rule map lookup first, then annotation fallback. */\nexport function getEffectiveVisibility(\n  col: RuleColumn,\n  visibilityByColId?: Map<PObjectId, ColumnVisibilityRule>,\n): undefined | \"default\" | \"optional\" | \"hidden\" {\n  const rule = visibilityByColId?.get(col.id);\n  if (rule !== undefined) return rule.visibility;\n  if (isColumnHidden(col.spec)) return \"hidden\";\n  if (isColumnOptional(col.spec)) return \"optional\";\n  return undefined;\n}\n\n/** Get ordering priority for a column. Rule map lookup first, then annotation fallback. */\nexport function getOrderPriority(\n  col: RuleColumn,\n  orderByColId?: Map<PObjectId, ColumnOrderRule>,\n): undefined | number {\n  const rule = orderByColId?.get(col.id);\n  if (rule !== undefined) return rule.priority;\n  return readAnnotationJson(col.spec, Annotation.Table.OrderPriority);\n}\n\n/**\n * Evaluate display rules against a set of columns and return a map of `colId → winning rule`\n * (first-match-wins, preserving original rule order).\n *\n * Predicate-based rules (`ColumnMatcher`) are evaluated directly on the spec.\n * Selector-based rules (`ColumnSelector`) are matched via `PFrameSpecDriver.discoverColumns`\n * using the same engine as `ColumnCollection.findColumns` — no client-side matcher.\n */\nexport function evaluateRules<R extends { match: ColumnMatcher | ColumnSelector }>(\n  rules: R[],\n  columns: RuleColumn[],\n  pframeSpec: PFrameSpecDriver,\n): Map<PObjectId, R> {\n  const result = new Map<PObjectId, R>();\n  if (rules.length === 0 || columns.length === 0) return result;\n\n  const hasSelectorRules = rules.some((rule) => typeof rule.match !== \"function\");\n  const selectorHitsByRule = new Map<R, Set<PObjectId>>();\n\n  if (hasSelectorRules) {\n    const dedupedColumns = dedupeById(columns);\n    const pColumns = dedupedColumns.map((c) => ({ id: c.id, spec: c.spec, data: undefined }));\n    const collection = new ColumnCollectionBuilder(pframeSpec)\n      .addSource(new ArrayColumnProvider(pColumns))\n      .build();\n    if (collection === undefined) return result;\n\n    try {\n      for (const rule of rules) {\n        if (typeof rule.match === \"function\") continue;\n        const hits = collection.findColumns({ include: rule.match });\n        selectorHitsByRule.set(rule, new Set(hits.map((h) => h.id)));\n      }\n    } finally {\n      collection.dispose();\n    }\n  }\n\n  for (const col of columns) {\n    for (const rule of rules) {\n      const matches =\n        typeof rule.match === \"function\"\n          ? rule.match(col.spec)\n          : (selectorHitsByRule.get(rule)?.has(col.id) ?? false);\n      if (matches) {\n        result.set(col.id, rule);\n        break;\n      }\n    }\n  }\n  return result;\n}\n\nfunction dedupeById(columns: RuleColumn[]): RuleColumn[] {\n  const seen = new Set<PObjectId>();\n  const result: RuleColumn[] = [];\n  for (const col of columns) {\n    if (seen.has(col.id)) continue;\n    seen.add(col.id);\n    result.push(col);\n  }\n  return result;\n}\n\n/**\n * Writes derived labels into column and axis annotations.\n * Returns new column objects with modified specs — original columns are not mutated.\n *\n * For each column: writes derived label into Annotation.Label (if present in derivedLabels).\n * For each axis in column specs: writes derived axis label into AxisSpec annotations.\n */\nexport function withLabelAnnotations<\n  T extends {\n    readonly id: PObjectId;\n    readonly spec: PColumnSpec;\n  },\n>(derivedLabels: undefined | Record<string, string>, columns: T[]): T[] {\n  if (derivedLabels === undefined) return columns;\n  return columns.map((col) => {\n    const colLabel = derivedLabels[col.id];\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        ...(isNil(colLabel)\n          ? {}\n          : { annotations: { ...col.spec.annotations, [Annotation.Label]: colLabel } }),\n        axesSpec: col.spec.axesSpec.map((axis) => {\n          const label = derivedLabels[canonicalizeAxisId(axis)];\n          return isNil(label)\n            ? axis\n            : { ...axis, annotations: { ...axis.annotations, [Annotation.Label]: label } };\n        }),\n      },\n    } as T;\n  });\n}\n\nexport function withDataStatusAnnotations<\n  T extends {\n    readonly spec: PColumnSpec;\n    readonly dataStatus: ColumnDataStatus;\n  },\n>(columns: T[]): T[] {\n  return columns.map((col) => {\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: {\n          ...col.spec.annotations,\n          [Annotation.DataStatus]: col.dataStatus,\n        },\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes effective display properties (OrderPriority, Visibility) from precomputed rule maps\n * into column annotations. Returns new column objects — originals are not mutated.\n */\nexport function withTableVisualAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(\n  visibilityByColId: undefined | Map<PObjectId, ColumnVisibilityRule>,\n  orderByColId: undefined | Map<PObjectId, ColumnOrderRule>,\n  columns: T[],\n): T[] {\n  if (visibilityByColId === undefined && orderByColId === undefined) return columns;\n  return columns.map((col) => {\n    const annotations = { ...col.spec.annotations };\n\n    const visibility = getEffectiveVisibility(col, visibilityByColId);\n    if (!isNil(visibility)) annotations[Annotation.Table.Visibility] = visibility;\n\n    const orderPriority = getOrderPriority(col, orderByColId);\n    if (!isNil(orderPriority)) annotations[Annotation.Table.OrderPriority] = String(orderPriority);\n\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: annotations,\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes derived info annotations into column annotations.\n * Columns without an info entry are passed through unchanged.\n */\nexport function withInfoAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(infoById: undefined | Record<string, string>, columns: T[]): T[] {\n  if (isNil(infoById)) return columns;\n  return columns.map((col) => {\n    const info = infoById[col.id];\n    if (isNil(info)) return col;\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: { ...col.spec.annotations, [Annotation.Table.Info]: info },\n      },\n    } as T;\n  });\n}\n\nexport function withHidenAxesAnnotations<T extends { readonly spec: PColumnSpec }>(\n  columns: T[],\n): T[] {\n  return columns.map(\n    (col) =>\n      ({\n        ...col,\n        spec: {\n          ...col.spec,\n          axesSpec: col.spec.axesSpec.map((axis) => ({\n            ...axis,\n            annotations: { ...axis.annotations, [Annotation.Table.Visibility]: \"hidden\" },\n          })),\n        },\n      }) as T,\n  );\n}\n\n/** Column shape required by label derivation. */\nexport type LabelableColumn = {\n  readonly id: PObjectId;\n  readonly spec: PColumnSpec;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive labels for all table elements: columns via deriveDistinctLabels, axes from label columns. */\nexport function deriveAllLabels(options: {\n  columns: LabelableColumn[];\n  deriveLabelsOptions?: DeriveLabelsOptions;\n}): Record<string, string> {\n  const { columns, deriveLabelsOptions } = options;\n  const entries = columns.map((c) => ({\n    spec: c.spec,\n    linkerPath: c.linkerPath?.map((step) => ({\n      spec: step.linker.spec,\n    })),\n    qualifications: c.qualifications,\n  }));\n  const columnLabels = deriveDistinctLabels(entries, deriveLabelsOptions).reduce(\n    (acc, label, index) => ((acc[columns[index].id] = label), acc),\n    {} as Record<string, string>,\n  );\n  return columnLabels;\n}\n\n/** Column shape required by tooltip derivation. */\nexport type TooltipableColumn = {\n  readonly id: DiscoveredPColumnId;\n  readonly spec: PColumnSpec;\n  readonly originalId: PObjectId;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive origin tooltips for columns whose qualifications or linker path carry info. */\nexport function deriveAllTooltips(options: {\n  columns: TooltipableColumn[];\n}): Record<DiscoveredPColumnId, string> {\n  const { columns } = options;\n\n  const variantCountByOriginal = columns.reduce<Map<PObjectId, number>>((acc, c) => {\n    return acc.set(c.originalId, (acc.get(c.originalId) ?? 0) + 1);\n  }, new Map());\n\n  const { entries } = columns.reduce(\n    ({ entries, variantSeen }, c) => {\n      const variantCount = variantCountByOriginal.get(c.originalId);\n      const variantIndex =\n        (variantSeen.set(c.originalId, (variantSeen.get(c.originalId) ?? 0) + 1),\n        variantSeen.get(c.originalId));\n\n      entries.push({\n        spec: c.spec,\n        linkerPath: c.linkerPath,\n        qualifications: c.qualifications,\n        variantIndex,\n        variantCount,\n      });\n\n      return { entries, variantSeen };\n    },\n    { entries: [] as TooltipEntry[], variantSeen: new Map<PObjectId, number>() },\n  );\n\n  const tooltips = deriveDistinctTooltips(entries);\n\n  return Object.fromEntries(\n    tooltips.flatMap((t, i) => (isNil(t) ? [] : [[columns[i].id, t] as const])),\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"utils.js","names":["isNil"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/utils.ts"],"sourcesContent":["import {\n  type PColumn,\n  type PColumnSpec,\n  type PFrameSpecDriver,\n  type PObjectId,\n  Annotation,\n  canonicalizeAxisId,\n  DiscoveredPColumnId,\n  readAnnotation,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n} from \"../../../labels/derive_distinct_labels\";\nimport {\n  deriveDistinctTooltips,\n  type TooltipEntry,\n} from \"../../../labels/derive_distinct_tooltips\";\nimport type { ColumnDataStatus, MatchQualifications, MatchVariant } from \"../../../columns\";\nimport type { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule } from \"./createPlDataTableV3\";\nimport type { ColumnSelector } from \"../../../columns\";\nimport { ArrayColumnProvider, ColumnCollectionBuilder } from \"../../../columns\";\nimport { isNil } from \"es-toolkit\";\nimport { getField } from \"@milaboratories/helpers\";\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/** Column shape consumed by rule evaluation. */\nexport type RuleColumn = Pick<PColumn<PObjectId>, \"id\" | \"spec\">;\n\n/** Get effective visibility for a column. Rule map lookup first, then annotation fallback. */\nexport function getEffectiveVisibility(\n  col: RuleColumn,\n  visibilityByColId?: Map<PObjectId, ColumnVisibilityRule>,\n): undefined | \"default\" | \"optional\" | \"hidden\" {\n  const rule = visibilityByColId?.get(col.id);\n  if (rule !== undefined) return rule.visibility;\n  if (isColumnHidden(col.spec)) return \"hidden\";\n  if (isColumnOptional(col.spec)) return \"optional\";\n  return undefined;\n}\n\n/** Get ordering priority for a column. Rule map lookup first, then annotation fallback. */\nexport function getOrderPriority(\n  col: RuleColumn,\n  orderByColId?: Map<PObjectId, ColumnOrderRule>,\n): undefined | number {\n  const rule = orderByColId?.get(col.id);\n  if (rule !== undefined) return rule.priority;\n  const annotation = Number(readAnnotation(col.spec, Annotation.Table.OrderPriority));\n  return isNaN(annotation) ? undefined : annotation;\n}\n\n/**\n * Evaluate display rules against a set of columns and return a map of `colId → winning rule`\n * (first-match-wins, preserving original rule order).\n *\n * Predicate-based rules (`ColumnMatcher`) are evaluated directly on the spec.\n * Selector-based rules (`ColumnSelector`) are matched via `PFrameSpecDriver.discoverColumns`\n * using the same engine as `ColumnCollection.findColumns` — no client-side matcher.\n */\nexport function evaluateRules<R extends { match: ColumnMatcher | ColumnSelector }>(\n  rules: R[],\n  columns: RuleColumn[],\n  pframeSpec: PFrameSpecDriver,\n): Map<PObjectId, R> {\n  const result = new Map<PObjectId, R>();\n  if (rules.length === 0 || columns.length === 0) return result;\n\n  const hasSelectorRules = rules.some((rule) => typeof rule.match !== \"function\");\n  const selectorHitsByRule = new Map<R, Set<PObjectId>>();\n\n  if (hasSelectorRules) {\n    const dedupedColumns = dedupeById(columns);\n    const pColumns = dedupedColumns.map((c) => ({ id: c.id, spec: c.spec, data: undefined }));\n    const collection = new ColumnCollectionBuilder(pframeSpec)\n      .addSource(new ArrayColumnProvider(pColumns))\n      .build();\n    if (collection === undefined) return result;\n\n    try {\n      for (const rule of rules) {\n        if (typeof rule.match === \"function\") continue;\n        const hits = collection.findColumns({ include: rule.match });\n        selectorHitsByRule.set(rule, new Set(hits.map((h) => h.id)));\n      }\n    } finally {\n      collection.dispose();\n    }\n  }\n\n  for (const col of columns) {\n    for (const rule of rules) {\n      const matches =\n        typeof rule.match === \"function\"\n          ? rule.match(col.spec)\n          : (selectorHitsByRule.get(rule)?.has(col.id) ?? false);\n      if (matches) {\n        result.set(col.id, rule);\n        break;\n      }\n    }\n  }\n  return result;\n}\n\nfunction dedupeById(columns: RuleColumn[]): RuleColumn[] {\n  const seen = new Set<PObjectId>();\n  const result: RuleColumn[] = [];\n  for (const col of columns) {\n    if (seen.has(col.id)) continue;\n    seen.add(col.id);\n    result.push(col);\n  }\n  return result;\n}\n\n/**\n * Writes derived labels into column and axis annotations.\n * Returns new column objects with modified specs — original columns are not mutated.\n *\n * For each column: writes derived label into Annotation.Label (if present in derivedLabels).\n * For each axis in column specs: writes derived axis label into AxisSpec annotations.\n */\nexport function withLabelAnnotations<\n  T extends {\n    readonly id: PObjectId;\n    readonly spec: PColumnSpec;\n  },\n>(derivedLabels: undefined | Record<string, string>, columns: T[]): T[] {\n  if (derivedLabels === undefined) return columns;\n  return columns.map((col) => {\n    const colLabel = derivedLabels[col.id];\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        ...(isNil(colLabel)\n          ? {}\n          : { annotations: { ...col.spec.annotations, [Annotation.Label]: colLabel } }),\n        axesSpec: col.spec.axesSpec.map((axis) => {\n          const label = derivedLabels[canonicalizeAxisId(axis)];\n          return isNil(label)\n            ? axis\n            : { ...axis, annotations: { ...axis.annotations, [Annotation.Label]: label } };\n        }),\n      },\n    } as T;\n  });\n}\n\nexport function withDataStatusAnnotations<\n  T extends {\n    readonly spec: PColumnSpec;\n    readonly dataStatus: ColumnDataStatus;\n  },\n>(columns: T[]): T[] {\n  return columns.map((col) => {\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: {\n          ...col.spec.annotations,\n          [Annotation.DataStatus]: col.dataStatus,\n        },\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes effective display properties (OrderPriority, Visibility) from precomputed rule maps\n * into column annotations. Returns new column objects — originals are not mutated.\n */\nexport function withTableVisualAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(\n  visibilityByColId: undefined | Map<PObjectId, ColumnVisibilityRule>,\n  orderByColId: undefined | Map<PObjectId, ColumnOrderRule>,\n  columns: T[],\n): T[] {\n  if (visibilityByColId === undefined && orderByColId === undefined) return columns;\n  return columns.map((col) => {\n    const annotations = { ...col.spec.annotations };\n\n    const visibility = getEffectiveVisibility(col, visibilityByColId);\n    if (!isNil(visibility)) annotations[Annotation.Table.Visibility] = visibility;\n\n    const orderPriority = getOrderPriority(col, orderByColId);\n    if (!isNil(orderPriority)) annotations[Annotation.Table.OrderPriority] = String(orderPriority);\n\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: annotations,\n      },\n    } as T;\n  });\n}\n\n/**\n * Writes derived info annotations into column annotations.\n * Columns without an info entry are passed through unchanged.\n */\nexport function withInfoAnnotations<\n  T extends { readonly id: PObjectId; readonly spec: PColumnSpec },\n>(infoById: undefined | Record<string, string>, columns: T[]): T[] {\n  if (isNil(infoById)) return columns;\n  return columns.map((col) => {\n    const info = infoById[col.id];\n    if (isNil(info)) return col;\n    return {\n      ...col,\n      spec: {\n        ...col.spec,\n        annotations: { ...col.spec.annotations, [Annotation.Table.Info]: info },\n      },\n    } as T;\n  });\n}\n\nexport function withHidenAxesAnnotations<T extends { readonly spec: PColumnSpec }>(\n  columns: T[],\n): T[] {\n  return columns.map(\n    (col) =>\n      ({\n        ...col,\n        spec: {\n          ...col.spec,\n          axesSpec: col.spec.axesSpec.map((axis) => ({\n            ...axis,\n            annotations: { ...axis.annotations, [Annotation.Table.Visibility]: \"hidden\" },\n          })),\n        },\n      }) as T,\n  );\n}\n\n/** Column shape required by label derivation. */\nexport type LabelableColumn = {\n  readonly id: PObjectId;\n  readonly spec: PColumnSpec;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive labels for all table elements: columns via deriveDistinctLabels, axes from label columns. */\nexport function deriveAllLabels(options: {\n  columns: LabelableColumn[];\n  deriveLabelsOptions?: DeriveLabelsOptions;\n}): Record<string, string> {\n  const { columns, deriveLabelsOptions } = options;\n  const entries = columns.map((c) => ({\n    spec: c.spec,\n    linkerPath: c.linkerPath?.map((step) => ({\n      spec: step.linker.spec,\n    })),\n    qualifications: c.qualifications,\n  }));\n  const columnLabels = deriveDistinctLabels(entries, deriveLabelsOptions).reduce(\n    (acc, label, index) => ((acc[columns[index].id] = label), acc),\n    {} as Record<string, string>,\n  );\n  return columnLabels;\n}\n\n/** Column shape required by tooltip derivation. */\nexport type TooltipableColumn = {\n  readonly id: PObjectId | DiscoveredPColumnId;\n  readonly spec: PColumnSpec;\n  readonly originalId?: PObjectId;\n  readonly linkerPath?: MatchVariant[\"path\"];\n  readonly qualifications?: MatchQualifications;\n};\n\n/** Derive origin tooltips for columns whose qualifications or linker path carry info. */\nexport function deriveAllTooltips(options: {\n  columns: TooltipableColumn[];\n}): Record<DiscoveredPColumnId, string> {\n  const { columns } = options;\n\n  const variantCountByOriginal = columns.reduce<Map<PObjectId, number>>((acc, c) => {\n    return acc.set(getField(c, \"originalId\") ?? c.id, (acc.get(c.originalId ?? c.id) ?? 0) + 1);\n  }, new Map());\n\n  const { entries } = columns.reduce(\n    ({ entries, variantSeen }, c) => {\n      const id = getField(c, \"originalId\") ?? c.id;\n      const variantCount = variantCountByOriginal.get(id);\n      const variantIndex =\n        (variantSeen.set(id, (variantSeen.get(id) ?? 0) + 1), variantSeen.get(id));\n\n      entries.push({\n        spec: c.spec,\n        linkerPath: c.linkerPath,\n        qualifications: c.qualifications,\n        variantIndex,\n        variantCount,\n      });\n\n      return { entries, variantSeen };\n    },\n    { entries: [] as TooltipEntry[], variantSeen: new Map<PObjectId, number>() },\n  );\n\n  const tooltips = deriveDistinctTooltips(entries);\n\n  return Object.fromEntries(\n    tooltips.flatMap((t, i) => (isNil(t) ? [] : [[columns[i].id, t] as const])),\n  );\n}\n"],"mappings":"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"}

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

@@ -1 +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"}
+{"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 \"./typesV6\";\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

@@ -1,5 +1,5 @@
 import { RenderCtxBase } from "../../render/api.js";
-import { PlDataTableSheet } from "./typesV5.js";
+import { PlDataTableSheet } from "./typesV6.js";
 import { AxisSpec } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDataTable/createPlDataTableSheet.d.ts

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

@@ -1 +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"}
+{"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 \"./typesV6\";\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.d.ts

@@ -1,4 +1,4 @@
-import { PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson } from "./typesV5.js";
+import { PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnIdJson } from "./typesV6.js";
 import { PlDataTableStateV2, createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./state-migration.js";
 import { createPlDataTableSheet } from "./createPlDataTableSheet.js";
 import { createPlDataTableV2 } from "./createPlDataTable/createPlDataTableV2.js";

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

@@ -16,11 +16,37 @@ function upgradePlDataTableStateV2(state) {
 		pTableParams: createDefaultPTableParams()
 	};
 	if (state.version === 3) state = createPlDataTableStateV2();
-	if (state.version === 4) state = migrateV4toV5(state);
+	if (state.version === 4) state = migrateV4toV6(state);
+	if (state.version === 5) state = migrateV5toV6(state);
 	return state;
 }
-/** Migrate v4 state to v5: convert per-column filters to tree-based format */
-function migrateV4toV5(state) {
+/** Migrate v5 to v6: unwrap `{source, labeled}` colIds in gridState. */
+function migrateV5toV6(state) {
+	return {
+		version: 6,
+		stateCache: state.stateCache.map((entry) => ({
+			...entry,
+			gridState: unwrapV5GridState(entry.gridState)
+		})),
+		pTableParams: createDefaultPTableParams()
+	};
+}
+/** Convert v5 wrapped colId JSON to bare PTableColumnSpec JSON, taking `.source`. */
+function unwrapV5ColId(json) {
+	return (0, _milaboratories_pl_model_common.canonicalizeJson)((0, _milaboratories_pl_model_common.parseJson)(json).source);
+}
+function unwrapV5GridState(gridState) {
+	return {
+		columnOrder: gridState.columnOrder ? { orderedColIds: gridState.columnOrder.orderedColIds.map(unwrapV5ColId) } : void 0,
+		sort: gridState.sort ? { sortModel: gridState.sort.sortModel.map((s) => ({
+			colId: unwrapV5ColId(s.colId),
+			sort: s.sort
+		})) } : void 0,
+		columnVisibility: gridState.columnVisibility ? { hiddenColIds: gridState.columnVisibility.hiddenColIds.map(unwrapV5ColId) } : void 0
+	};
+}
+/** Migrate v4 state to v6: convert per-column filters to tree-based format (skips v5). */
+function migrateV4toV6(state) {
 	let idCounter = 0;
 	const nextId = () => ++idCounter;
 	const migratedCache = state.stateCache.map((entry) => {
@@ -45,7 +71,7 @@ function migrateV4toV5(state) {
 	const oldSourceId = state.pTableParams.sourceId;
 	const currentCache = oldSourceId ? migratedCache.find((e) => e.sourceId === oldSourceId) : void 0;
 	return {
-		version: 5,
+		version: 6,
 		stateCache: migratedCache,
 		pTableParams: currentCache && oldSourceId ? {
 			sourceId: oldSourceId,
@@ -196,7 +222,7 @@ function createDefaultPTableParams() {
 }
 function createPlDataTableStateV2() {
 	return {
-		version: 5,
+		version: 6,
 		stateCache: [],
 		pTableParams: createDefaultPTableParams()
 	};

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 \"./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      defaultFiltersState: null,\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:\n              state.pTableParams.hiddenColIds?.map((id) => ({ type: \"column\" as const, id })) ??\n              null,\n            filters: distillFilterSpec(currentCache.filtersState),\n            defaultFilters: null,\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    defaultFilters: 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, parseJson } 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 \"./typesV6\";\nimport type { PlDataTableGridStateV5, PlDataTableV5ColIdJson } 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  // v5 stored colIds as `{source, labeled}` wrappers; only the gridState shape differs.\n  | {\n      version: 5;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateV5;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: null | PlDataTableFiltersWithMeta;\n        defaultFiltersState: null | PlDataTableFiltersWithMeta;\n        searchString?: string;\n      }[];\n      pTableParams: PTableParamsV2;\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 -> v6: migrate per-column filters to tree-based format (skips v5).\n  // v4 gridState already used bare PTableColumnSpec colIds, so we jump\n  // straight to v6 without going through the v5 wrapper format.\n  if (state.version === 4) {\n    state = migrateV4toV6(state);\n  }\n  // v5 -> v6: unwrap `{source, labeled}` colIds in gridState back to bare PTableColumnSpec.\n  if (state.version === 5) {\n    state = migrateV5toV6(state);\n  }\n  return state;\n}\n\n/** Migrate v5 to v6: unwrap `{source, labeled}` colIds in gridState. */\nfunction migrateV5toV6(\n  state: Extract<PlDataTableStateV2, { version: 5 }>,\n): PlDataTableStateV2Normalized {\n  // pTableParams reset: v5 stored DiscoveredPColumnId-based hiddenColIds with\n  // empty-array fields (e.g. `{column, path: [], columnQualifications: [], ...}`).\n  // v6 distills empty fields, so the same logical column serialises differently\n  // and lookups would silently miss every previously-hidden discovered column.\n  // gridState colIds are derived from PTableColumnSpec and unaffected.\n  return {\n    version: 6,\n    stateCache: state.stateCache.map((entry) => ({\n      ...entry,\n      gridState: unwrapV5GridState(entry.gridState),\n    })),\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n\n/** Convert v5 wrapped colId JSON to bare PTableColumnSpec JSON, taking `.source`. */\nfunction unwrapV5ColId(json: PlDataTableV5ColIdJson): CanonicalizedJson<PTableColumnSpec> {\n  return canonicalizeJson(parseJson(json).source);\n}\n\nfunction unwrapV5GridState(gridState: PlDataTableGridStateV5): PlDataTableGridStateCore {\n  return {\n    columnOrder: gridState.columnOrder\n      ? { orderedColIds: gridState.columnOrder.orderedColIds.map(unwrapV5ColId) }\n      : undefined,\n    sort: gridState.sort\n      ? {\n          sortModel: gridState.sort.sortModel.map((s) => ({\n            colId: unwrapV5ColId(s.colId),\n            sort: s.sort,\n          })),\n        }\n      : undefined,\n    columnVisibility: gridState.columnVisibility\n      ? { hiddenColIds: gridState.columnVisibility.hiddenColIds.map(unwrapV5ColId) }\n      : undefined,\n  };\n}\n\n/** Migrate v4 state to v6: convert per-column filters to tree-based format (skips v5). */\nfunction migrateV4toV6(\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      defaultFiltersState: null,\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: 6,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds:\n              state.pTableParams.hiddenColIds?.map((id) => ({ type: \"column\" as const, id })) ??\n              null,\n            filters: distillFilterSpec(currentCache.filtersState),\n            defaultFilters: null,\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    defaultFilters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 6,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}

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

@@ -1,5 +1,6 @@
-import { PTableParamsV2, PlDataTableGridStateCore, PlDataTableSheetState, PlDataTableStateV2Normalized } from "./typesV5.js";
+import { PTableParamsV2, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableSheetState, PlDataTableStateV2Normalized } from "./typesV6.js";
 import { PlDataTableFilterState } from "./typesV4.js";
+import { PlDataTableGridStateV5 } from "./typesV5.js";
 import { AxisId, CanonicalizedJson, PObjectId, PTableColumnSpec, PTableRecordFilter, PTableSorting } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDataTable/state-migration.d.ts
@@ -87,6 +88,17 @@ type PlDataTableStateV2 = {
     hiddenColIds: PObjectId[] | null;
     sorting: PTableSorting[];
   };
+} | {
+  version: 5;
+  stateCache: {
+    sourceId: string;
+    gridState: PlDataTableGridStateV5;
+    sheetsState: PlDataTableSheetState[];
+    filtersState: null | PlDataTableFiltersWithMeta;
+    defaultFiltersState: null | PlDataTableFiltersWithMeta;
+    searchString?: string;
+  }[];
+  pTableParams: PTableParamsV2;
 } | PlDataTableStateV2Normalized;
 /** Upgrade PlDataTableStateV2 to the latest version */
 declare function upgradePlDataTableStateV2(state: PlDataTableStateV2 | undefined): PlDataTableStateV2Normalized;