@platforma-sdk/model 1.65.9 → 1.66.2

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

@@ -2,8 +2,9 @@ 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 { isPlRef } from "@milaboratories/pl-model-common";
+import { createDiscoveredPColumnId, isPlRef } from "@milaboratories/pl-model-common";
 import { throwError } from "@milaboratories/helpers";
+import { isNil as isNil$1 } from "es-toolkit";
 //#region src/components/PlDataTable/createPlDataTable/discoverColumns.ts
 /** Discover columns from sources/anchors and normalize into a flat DiscoveredColumn list. */
 function discoverTableColumnSnaphots(ctx, options) {
@@ -13,12 +14,13 @@ function discoverTableColumnSnaphots(ctx, options) {
 	};
 	const providers = resolveProviders(ctx, resolvedOptions.sources);
 	if (providers.length === 0) return void 0;
-	const collection = new ColumnCollectionBuilder(ctx.services.pframeSpec ?? throwError("PFrameSpec service is required for column discovery.")).addSources(providers).build(resolvedOptions);
+	const collection = new ColumnCollectionBuilder(ctx.getService("pframeSpec")).addSources(providers).build(resolvedOptions);
 	if (collection === void 0) return void 0;
 	try {
-		const matched = collection.findColumns(resolvedOptions.columnsSelector ?? void 0);
-		const anchors = collection.getAnchors();
-		return mapToDiscoveredColumns(matched, Array.from(Array.from(anchors.values()).map((v) => v.columnId)));
+		return mapToDiscoveredColumns(collection.findColumns({
+			...resolvedOptions.selector ?? {},
+			exclude: [...Array.isArray(resolvedOptions.selector?.exclude) ? resolvedOptions.selector.exclude : !isNil$1(resolvedOptions.selector.exclude) ? [resolvedOptions.selector.exclude] : [], { name: "pl7.app/label" }]
+		}), collection.getAnchors());
 	} finally {
 		collection.dispose();
 	}
@@ -35,26 +37,33 @@ function resolveProviders(ctx, sources) {
 	return sources !== void 0 ? sources.map(toColumnSnapshotProvider) : collectCtxColumnSnapshotProviders(ctx);
 }
 /** Map matched columns into a flat DiscoveredColumn list with deduped IDs. */
-function mapToDiscoveredColumns(matched, anchorColumnIds) {
-	const hitCounts = matched.reduce((acc, match) => acc.set(match.originalId, (acc.get(match.originalId) ?? 0) + 1), /* @__PURE__ */ new Map());
-	const hitIndices = /* @__PURE__ */ new Map();
-	return matched.map((match) => {
+function mapToDiscoveredColumns(matched, anchors) {
+	const columnIdToAnchorName = new Map(Array.from(anchors.entries(), ([key, { id }]) => [id, key]));
+	return matched.flatMap((match) => {
 		const snap = match.column;
-		let id = snap.id;
-		if ((hitCounts.get(match.originalId) ?? 0) > 1) {
-			const idx = hitIndices.get(match.originalId) ?? 0;
-			hitIndices.set(match.originalId, idx + 1);
-			id = `${snap.id}#q${idx}`;
-		}
-		return {
-			id,
-			originalId: match.originalId,
-			spec: snap.spec,
-			data: snap.data,
-			dataStatus: snap.dataStatus,
-			isPrimary: anchorColumnIds.some((anchor) => snap.id === anchor || match.originalId === anchor),
-			linkerPath: match.path
-		};
+		const isPrimary = columnIdToAnchorName.get(match.column.id) !== void 0;
+		return match.variants.map((variant) => {
+			return {
+				id: createDiscoveredPColumnId({
+					column: snap.id,
+					path: variant.path.map((p) => ({
+						type: "linker",
+						column: p.linker.id,
+						qualifications: p.qualifications
+					})),
+					columnQualifications: variant.qualifications.forHit,
+					queriesQualifications: variant.qualifications.forQueries
+				}),
+				isPrimary,
+				originalId: snap.id,
+				spec: snap.spec,
+				data: snap.data,
+				dataStatus: snap.dataStatus,
+				linkerPath: variant.path,
+				qualifications: variant.qualifications,
+				distinctiveQualifications: variant.distinctiveQualifications
+			};
+		});
 	});
 }
 //#endregion

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 {\n  PColumnSpec,\n  PlRef,\n  PObjectId,\n  RequireServices,\n  Services,\n  SUniversalPColumnId,\n} from \"@milaboratories/pl-model-common\";\nimport { isPlRef } from \"@milaboratories/pl-model-common\";\nimport type { RenderCtxBase } from \"../../../render\";\nimport type { ColumnSource, ColumnMatch, RelaxedColumnSelector } 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, TableColumnSnapshot } from \"./createPlDataTableV3\";\n\nexport type DiscoveredTableColumnOptions = {\n  sources?: ColumnSource[];\n  anchors: Record<string, PlRef | PObjectId | PColumnSpec | RelaxedColumnSelector>;\n  columnsSelector: ColumnsSelectorConfig;\n};\n\n/** Discover columns from sources/anchors and normalize into a flat DiscoveredColumn list. */\nexport function discoverTableColumnSnaphots<\n  A,\n  U,\n  S extends RequireServices<typeof Services.PFrameSpec>,\n>(\n  ctx: RenderCtxBase<A, U, S>,\n  options: DiscoveredTableColumnOptions,\n): TableColumnSnapshot<SUniversalPColumnId>[] | undefined {\n  // Resolve PlRef anchors to PColumnSpec\n  const resolvedOptions = { ...options, anchors: resolveAnchors(ctx, options.anchors) };\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 pframeSpec =\n    ctx.services.pframeSpec ?? throwError(\"PFrameSpec service is required for column discovery.\");\n  const collection = new ColumnCollectionBuilder(pframeSpec)\n    .addSources(providers)\n    .build(resolvedOptions);\n  if (collection === undefined) return undefined;\n\n  try {\n    const matched = collection.findColumns(resolvedOptions.columnsSelector ?? undefined);\n    const anchors = collection.getAnchors();\n    return mapToDiscoveredColumns(\n      matched,\n      Array.from(Array.from(anchors.values()).map((v) => v.columnId)),\n    );\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<A, U>(\n  ctx: RenderCtxBase<A, U>,\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<A, U>(ctx: RenderCtxBase<A, U>, sources: undefined | ColumnSource[]) {\n  return sources !== undefined\n    ? sources.map(toColumnSnapshotProvider)\n    : collectCtxColumnSnapshotProviders(ctx);\n}\n\n/** Map matched columns into a flat DiscoveredColumn list with deduped IDs. */\nfunction mapToDiscoveredColumns(\n  matched: readonly ColumnMatch[],\n  anchorColumnIds: readonly PObjectId[],\n): TableColumnSnapshot<SUniversalPColumnId>[] {\n  const hitCounts = matched.reduce(\n    (acc, match) => acc.set(match.originalId, (acc.get(match.originalId) ?? 0) + 1),\n    new Map<PObjectId, number>(),\n  );\n\n  const hitIndices = new Map<PObjectId, number>();\n  return matched.map((match) => {\n    const snap = match.column;\n\n    let id = snap.id;\n    if ((hitCounts.get(match.originalId) ?? 0) > 1) {\n      const idx = hitIndices.get(match.originalId) ?? 0;\n      hitIndices.set(match.originalId, idx + 1);\n      id = `${snap.id}#q${idx}` as SUniversalPColumnId;\n    }\n\n    return {\n      id,\n      originalId: match.originalId,\n      spec: snap.spec,\n      data: snap.data,\n      dataStatus: snap.dataStatus,\n      isPrimary: anchorColumnIds.some(\n        (anchor) => snap.id === anchor || match.originalId === anchor,\n      ),\n      linkerPath: match.path,\n    };\n  });\n}\n"],"mappings":";;;;;;;;AAwBA,SAAgB,4BAKd,KACA,SACwD;CAExD,MAAM,kBAAkB;EAAE,GAAG;EAAS,SAASA,iBAAe,KAAK,QAAQ,QAAQ;EAAE;CAGrF,MAAM,YAAY,iBAAiB,KAAK,gBAAgB,QAAQ;AAChE,KAAI,UAAU,WAAW,EAAG,QAAO,KAAA;CAKnC,MAAM,aAAa,IAAI,wBADrB,IAAI,SAAS,cAAc,WAAW,uDAAuD,CACrC,CACvD,WAAW,UAAU,CACrB,MAAM,gBAAgB;AACzB,KAAI,eAAe,KAAA,EAAW,QAAO,KAAA;AAErC,KAAI;EACF,MAAM,UAAU,WAAW,YAAY,gBAAgB,mBAAmB,KAAA,EAAU;EACpF,MAAM,UAAU,WAAW,YAAY;AACvC,SAAO,uBACL,SACA,MAAM,KAAK,MAAM,KAAK,QAAQ,QAAQ,CAAC,CAAC,KAAK,MAAM,EAAE,SAAS,CAAC,CAChE;WACO;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,iBAAuB,KAA0B,SAAqC;AAC7F,QAAO,YAAY,KAAA,IACf,QAAQ,IAAI,yBAAyB,GACrC,kCAAkC,IAAI;;;AAI5C,SAAS,uBACP,SACA,iBAC4C;CAC5C,MAAM,YAAY,QAAQ,QACvB,KAAK,UAAU,IAAI,IAAI,MAAM,aAAa,IAAI,IAAI,MAAM,WAAW,IAAI,KAAK,EAAE,kBAC/E,IAAI,KAAwB,CAC7B;CAED,MAAM,6BAAa,IAAI,KAAwB;AAC/C,QAAO,QAAQ,KAAK,UAAU;EAC5B,MAAM,OAAO,MAAM;EAEnB,IAAI,KAAK,KAAK;AACd,OAAK,UAAU,IAAI,MAAM,WAAW,IAAI,KAAK,GAAG;GAC9C,MAAM,MAAM,WAAW,IAAI,MAAM,WAAW,IAAI;AAChD,cAAW,IAAI,MAAM,YAAY,MAAM,EAAE;AACzC,QAAK,GAAG,KAAK,GAAG,IAAI;;AAGtB,SAAO;GACL;GACA,YAAY,MAAM;GAClB,MAAM,KAAK;GACX,MAAM,KAAK;GACX,YAAY,KAAK;GACjB,WAAW,gBAAgB,MACxB,WAAW,KAAK,OAAO,UAAU,MAAM,eAAe,OACxD;GACD,YAAY,MAAM;GACnB;GACD"}
+{"version":3,"file":"discoverColumns.js","names":["resolveAnchors","isNil"],"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  ColumnMatch,\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, TableColumnSnapshot } from \"./createPlDataTableV3\";\nimport { isNil } from \"es-toolkit\";\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 DiscoveredColumn list. */\nexport function discoverTableColumnSnaphots(\n  ctx: RenderCtxBase,\n  options: DiscoverTableColumnOptions,\n): TableColumnSnapshot[] | 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 columns = collection.findColumns({\n      ...(resolvedOptions.selector ?? {}),\n      exclude: [\n        ...(Array.isArray(resolvedOptions.selector?.exclude)\n          ? resolvedOptions.selector.exclude\n          : !isNil(resolvedOptions.selector.exclude)\n            ? [resolvedOptions.selector.exclude]\n            : []),\n        { name: \"pl7.app/label\" },\n      ],\n    });\n    const anchors = collection.getAnchors();\n    return mapToDiscoveredColumns(columns, 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 matched columns into a flat DiscoveredColumn list with deduped IDs. */\nfunction mapToDiscoveredColumns(\n  matched: readonly ColumnMatch[],\n  anchors: Map<string, ColumnSnapshot<PObjectId>>,\n): TableColumnSnapshot[] {\n  const columnIdToAnchorName = new Map<PObjectId, string>(\n    Array.from(anchors.entries(), ([key, { id }]) => [id, key] as const),\n  );\n\n  return matched.flatMap((match) => {\n    const snap = match.column;\n    const isPrimary = columnIdToAnchorName.get(match.column.id) !== undefined;\n\n    return match.variants.map((variant): TableColumnSnapshot => {\n      const discoveredId = createDiscoveredPColumnId({\n        column: snap.id,\n        path: variant.path.map((p) => ({\n          type: \"linker\",\n          column: p.linker.id,\n          qualifications: p.qualifications,\n        })),\n        columnQualifications: variant.qualifications.forHit,\n        queriesQualifications: variant.qualifications.forQueries,\n      });\n      return {\n        id: discoveredId,\n        isPrimary,\n\n        originalId: snap.id,\n        spec: snap.spec,\n        data: snap.data,\n        dataStatus: snap.dataStatus,\n\n        linkerPath: variant.path,\n        qualifications: variant.qualifications,\n        distinctiveQualifications: variant.distinctiveQualifications,\n      };\n    });\n  });\n}\n"],"mappings":";;;;;;;;;AAwBA,SAAgB,4BACd,KACA,SACmC;CAEnC,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;AAaF,SAAO,uBAZS,WAAW,YAAY;GACrC,GAAI,gBAAgB,YAAY,EAAE;GAClC,SAAS,CACP,GAAI,MAAM,QAAQ,gBAAgB,UAAU,QAAQ,GAChD,gBAAgB,SAAS,UACzB,CAACC,QAAM,gBAAgB,SAAS,QAAQ,GACtC,CAAC,gBAAgB,SAAS,QAAQ,GAClC,EAAE,EACR,EAAE,MAAM,iBAAiB,CAC1B;GACF,CAAC,EACc,WAAW,YAAY,CACQ;WACvC;AACR,aAAW,SAAS;;;;AAOxB,SAASD,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,uBACP,SACA,SACuB;CACvB,MAAM,uBAAuB,IAAI,IAC/B,MAAM,KAAK,QAAQ,SAAS,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,IAAI,CAAU,CACrE;AAED,QAAO,QAAQ,SAAS,UAAU;EAChC,MAAM,OAAO,MAAM;EACnB,MAAM,YAAY,qBAAqB,IAAI,MAAM,OAAO,GAAG,KAAK,KAAA;AAEhE,SAAO,MAAM,SAAS,KAAK,YAAiC;AAW1D,UAAO;IACL,IAXmB,0BAA0B;KAC7C,QAAQ,KAAK;KACb,MAAM,QAAQ,KAAK,KAAK,OAAO;MAC7B,MAAM;MACN,QAAQ,EAAE,OAAO;MACjB,gBAAgB,EAAE;MACnB,EAAE;KACH,sBAAsB,QAAQ,eAAe;KAC7C,uBAAuB,QAAQ,eAAe;KAC/C,CAAC;IAGA;IAEA,YAAY,KAAK;IACjB,MAAM,KAAK;IACX,MAAM,KAAK;IACX,YAAY,KAAK;IAEjB,YAAY,QAAQ;IACpB,gBAAgB,QAAQ;IACxB,2BAA2B,QAAQ;IACpC;IACD;GACF"}

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 { Services, type RequireServices } from \"@milaboratories/pl-model-common\";\nimport 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, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\n  options: { version: \"v2\" } & createPlDataTableOptionsV2,\n): ReturnType<typeof createPlDataTableV2>;\nexport function createPlDataTable<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\n  options: { version?: \"v3\" } & createPlDataTableOptionsV3,\n): ReturnType<typeof createPlDataTableV3>;\nexport function createPlDataTable<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\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":";;;;AAeA,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 \"../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"}

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

@@ -2,13 +2,12 @@ import { RenderCtxBase } from "../../../render/api.js";
 import { createPlDataTableOptionsV2, createPlDataTableV2 } from "./createPlDataTableV2.js";
 import { discoverTableColumnSnaphots } from "./discoverColumns.js";
 import { createPlDataTableOptionsV3, createPlDataTableV3 } from "./createPlDataTableV3.js";
-import { RequireServices, Services } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDataTable/createPlDataTable/index.d.ts
-declare function createPlDataTable<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(ctx: RenderCtxBase<A, U, S>, options: {
+declare function createPlDataTable<A, U>(ctx: RenderCtxBase<A, U>, options: {
   version: "v2";
 } & createPlDataTableOptionsV2): ReturnType<typeof createPlDataTableV2>;
-declare function createPlDataTable<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(ctx: RenderCtxBase<A, U, S>, options: {
+declare function createPlDataTable<A, U>(ctx: RenderCtxBase<A, U>, options: {
   version?: "v3";
 } & createPlDataTableOptionsV3): ReturnType<typeof createPlDataTableV3>;
 //#endregion

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/index.ts"],"mappings":";;;;;;;iBAOgB,iBAAA,iBAAkC,eAAA,QAAuB,QAAA,CAAS,UAAA,EAAA,CAChF,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,EAAG,CAAA,GACzB,OAAA;EAAW,OAAA;AAAA,IAAkB,0BAAA,GAC5B,UAAA,QAAkB,mBAAA;AAAA,iBACL,iBAAA,iBAAkC,eAAA,QAAuB,QAAA,CAAS,UAAA,EAAA,CAChF,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,EAAG,CAAA,GACzB,OAAA;EAAW,OAAA;AAAA,IAAmB,0BAAA,GAC7B,UAAA,QAAkB,mBAAA"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/index.ts"],"mappings":";;;;;;iBAMgB,iBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,OAAA;EAAW,OAAA;AAAA,IAAkB,0BAAA,GAC5B,UAAA,QAAkB,mBAAA;AAAA,iBACL,iBAAA,MAAA,CACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,OAAA;EAAW,OAAA;AAAA,IAAmB,0BAAA,GAC7B,UAAA,QAAkB,mBAAA"}

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 { Services, type RequireServices } from \"@milaboratories/pl-model-common\";\nimport 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, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\n  options: { version: \"v2\" } & createPlDataTableOptionsV2,\n): ReturnType<typeof createPlDataTableV2>;\nexport function createPlDataTable<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\n  options: { version?: \"v3\" } & createPlDataTableOptionsV3,\n): ReturnType<typeof createPlDataTableV3>;\nexport function createPlDataTable<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\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":";;;;AAeA,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 \"../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"}

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

@@ -1,5 +1,9 @@
 require("../../../_virtual/_rolldown/runtime.cjs");
 const require_derive_distinct_labels = require("../../../labels/derive_distinct_labels.cjs");
+const require_column_snapshot_provider = require("../../../columns/column_snapshot_provider.cjs");
+const require_column_collection_builder = require("../../../columns/column_collection_builder.cjs");
+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 es_toolkit = require("es-toolkit");
 //#region src/components/PlDataTable/createPlDataTable/utils.ts
@@ -11,20 +15,65 @@ function isColumnHidden(spec) {
 function isColumnOptional(spec) {
 	return (0, _milaboratories_pl_model_common.readAnnotation)(spec, _milaboratories_pl_model_common.Annotation.Table.Visibility) === "optional";
 }
-/** Get effective visibility for a column, considering display config rules first, then annotations. */
-function getEffectiveVisibility(spec, displayConfig) {
-	if (displayConfig?.visibility) {
-		for (const rule of displayConfig.visibility) if (rule.match(spec)) return rule.visibility;
+/** Get effective visibility for a column. Rule map lookup first, then annotation fallback. */
+function getEffectiveVisibility(col, visibilityByColId) {
+	const rule = visibilityByColId?.get(col.id);
+	if (rule !== void 0) return rule.visibility;
+	if (isColumnHidden(col.spec)) return "hidden";
+	if (isColumnOptional(col.spec)) return "optional";
+}
+/** Get ordering priority for a column. Rule map lookup first, then annotation fallback. */
+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);
+}
+/**
+* Evaluate display rules against a set of columns and return a map of `colId → winning rule`
+* (first-match-wins, preserving original rule order).
+*
+* Predicate-based rules (`ColumnMatcher`) are evaluated directly on the spec.
+* Selector-based rules (`ColumnSelector`) are matched via `PFrameSpecDriver.discoverColumns`
+* using the same engine as `ColumnCollection.findColumns` — no client-side matcher.
+*/
+function evaluateRules(rules, columns, pframeSpec) {
+	const result = /* @__PURE__ */ new Map();
+	if (rules.length === 0 || columns.length === 0) return result;
+	const hasSelectorRules = rules.some((rule) => typeof rule.match !== "function");
+	const selectorHitsByRule = /* @__PURE__ */ new Map();
+	if (hasSelectorRules) {
+		const pColumns = dedupeById(columns).map((c) => ({
+			id: c.id,
+			spec: c.spec,
+			data: void 0
+		}));
+		const collection = new require_column_collection_builder.ColumnCollectionBuilder(pframeSpec).addSource(new require_column_snapshot_provider.ArrayColumnProvider(pColumns)).build();
+		if (collection === void 0) return result;
+		try {
+			for (const rule of rules) {
+				if (typeof rule.match === "function") continue;
+				const hits = collection.findColumns({ include: rule.match });
+				selectorHitsByRule.set(rule, new Set(hits.map((h) => h.id)));
+			}
+		} finally {
+			collection.dispose();
+		}
+	}
+	for (const col of columns) for (const rule of rules) if (typeof rule.match === "function" ? rule.match(col.spec) : selectorHitsByRule.get(rule)?.has(col.id) ?? false) {
+		result.set(col.id, rule);
+		break;
 	}
-	if (isColumnHidden(spec)) return "hidden";
-	if (isColumnOptional(spec)) return "optional";
+	return result;
 }
-/** Get ordering priority for a column. Display config rules first, then annotation fallback. */
-function getOrderPriority(spec, displayConfig) {
-	if (displayConfig?.ordering) {
-		for (const rule of displayConfig.ordering) if (rule.match(spec)) return rule.priority;
+function dedupeById(columns) {
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const col of columns) {
+		if (seen.has(col.id)) continue;
+		seen.add(col.id);
+		result.push(col);
 	}
-	return (0, _milaboratories_pl_model_common.readAnnotationJson)(spec, _milaboratories_pl_model_common.Annotation.Table.OrderPriority);
+	return result;
 }
 /**
 * Writes derived labels into column and axis annotations.
@@ -60,16 +109,16 @@ function withLabelAnnotations(derivedLabels, columns) {
 	});
 }
 /**
-* Writes effective display properties (OrderPriority, Visibility) from ColumnDisplayOptions
+* Writes effective display properties (OrderPriority, Visibility) from precomputed rule maps
 * into column annotations. Returns new column objects — originals are not mutated.
 */
-function withTableVisualAnnotations(displayOptions, columns) {
-	if (displayOptions === void 0) return columns;
+function withTableVisualAnnotations(visibilityByColId, orderByColId, columns) {
+	if (visibilityByColId === void 0 && orderByColId === void 0) return columns;
 	return columns.map((col) => {
 		const annotations = { ...col.spec.annotations };
-		const visibility = getEffectiveVisibility(col.spec, displayOptions);
+		const visibility = getEffectiveVisibility(col, visibilityByColId);
 		if (!(0, es_toolkit.isNil)(visibility)) annotations[_milaboratories_pl_model_common.Annotation.Table.Visibility] = visibility;
-		const orderPriority = getOrderPriority(col.spec, displayOptions);
+		const orderPriority = getOrderPriority(col, orderByColId);
 		if (!(0, es_toolkit.isNil)(orderPriority)) annotations[_milaboratories_pl_model_common.Annotation.Table.OrderPriority] = String(orderPriority);
 		return {
 			...col,
@@ -80,6 +129,42 @@ function withTableVisualAnnotations(displayOptions, columns) {
 		};
 	});
 }
+/**
+* Writes derived info annotations into column annotations.
+* Columns without an info entry are passed through unchanged.
+*/
+function withInfoAnnotations(infoById, columns) {
+	if ((0, es_toolkit.isNil)(infoById)) return columns;
+	return columns.map((col) => {
+		const info = infoById[col.id];
+		if ((0, es_toolkit.isNil)(info)) return col;
+		return {
+			...col,
+			spec: {
+				...col.spec,
+				annotations: {
+					...col.spec.annotations,
+					[_milaboratories_pl_model_common.Annotation.Table.Info]: info
+				}
+			}
+		};
+	});
+}
+function withHidenAxesAnnotations(columns) {
+	return columns.map((col) => ({
+		...col,
+		spec: {
+			...col.spec,
+			axesSpec: col.spec.axesSpec.map((axis) => ({
+				...axis,
+				annotations: {
+					...axis.annotations,
+					[_milaboratories_pl_model_common.Annotation.Table.Visibility]: "hidden"
+				}
+			}))
+		}
+	}));
+}
 /** Derive labels for all table elements: columns via deriveDistinctLabels, axes from label columns. */
 function deriveAllLabels(options) {
 	const { columns, labelColumns, deriveLabelsOptions } = options;
@@ -97,12 +182,44 @@ function deriveAxisLabels(columns, labelColumns) {
 	for (const axisKey of axisSpecMap.keys()) result[axisKey] = (0, _milaboratories_pl_model_common.readAnnotation)(labelColumns.find((lc) => (0, _milaboratories_pl_model_common.canonicalizeJson)((0, _milaboratories_pl_model_common.getAxisId)(lc.spec.axesSpec[0])) === axisKey)?.spec ?? axisSpecMap.get(axisKey) ?? {}, _milaboratories_pl_model_common.Annotation.Label)?.trim() ?? "Unlabeled";
 	return result;
 }
+/** Derive origin tooltips for columns whose qualifications or linker path carry info. */
+function deriveAllTooltips(options) {
+	const { columns } = options;
+	const variantCountByOriginal = columns.reduce((acc, c) => {
+		return acc.set(c.originalId, (acc.get(c.originalId) ?? 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));
+		entries.push({
+			spec: c.spec,
+			linkerPath: c.linkerPath,
+			qualifications: c.qualifications,
+			distinctiveQualifications: c.distinctiveQualifications,
+			variantIndex,
+			variantCount
+		});
+		return {
+			entries,
+			variantSeen
+		};
+	}, {
+		entries: [],
+		variantSeen: /* @__PURE__ */ new Map()
+	});
+	const tooltips = require_derive_distinct_tooltips.deriveDistinctTooltips(entries);
+	return Object.fromEntries(tooltips.flatMap((t, i) => (0, es_toolkit.isNil)(t) ? [] : [[columns[i].id, t]]));
+}
 //#endregion
 exports.deriveAllLabels = deriveAllLabels;
+exports.deriveAllTooltips = deriveAllTooltips;
+exports.evaluateRules = evaluateRules;
 exports.getEffectiveVisibility = getEffectiveVisibility;
 exports.getOrderPriority = getOrderPriority;
 exports.isColumnHidden = isColumnHidden;
 exports.isColumnOptional = isColumnOptional;
+exports.withHidenAxesAnnotations = withHidenAxesAnnotations;
+exports.withInfoAnnotations = withInfoAnnotations;
 exports.withLabelAnnotations = withLabelAnnotations;
 exports.withTableVisualAnnotations = withTableVisualAnnotations;
 

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

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","names":["Annotation","deriveDistinctLabels"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/utils.ts"],"sourcesContent":["import {\n  type PColumn,\n  type PColumnSpec,\n  type PObjectId,\n  Annotation,\n  canonicalizeAxisId,\n  canonicalizeJson,\n  getAxisId,\n  readAnnotation,\n  readAnnotationJson,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n} from \"../../../labels/derive_distinct_labels\";\nimport type { ColumnsDisplayOptions } from \"./createPlDataTableV3\";\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/** Get effective visibility for a column, considering display config rules first, then annotations. */\nexport function getEffectiveVisibility(\n  spec: PColumnSpec,\n  displayConfig?: ColumnsDisplayOptions,\n): undefined | \"default\" | \"optional\" | \"hidden\" {\n  if (displayConfig?.visibility) {\n    for (const rule of displayConfig.visibility) {\n      if (rule.match(spec)) {\n        return rule.visibility;\n      }\n    }\n  }\n  if (isColumnHidden(spec)) return \"hidden\";\n  if (isColumnOptional(spec)) return \"optional\";\n  return undefined;\n}\n\n/** Get ordering priority for a column. Display config rules first, then annotation fallback. */\nexport function getOrderPriority(\n  spec: PColumnSpec,\n  displayConfig?: ColumnsDisplayOptions,\n): undefined | number {\n  if (displayConfig?.ordering) {\n    for (const rule of displayConfig.ordering) {\n      if (rule.match(spec)) {\n        return rule.priority;\n      }\n    }\n  }\n  return readAnnotationJson(spec, Annotation.Table.OrderPriority);\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<Data>(\n  derivedLabels: undefined | Record<string, string>,\n  columns: PColumn<Data>[],\n): PColumn<Data>[] {\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    };\n  });\n}\n\n/**\n * Writes effective display properties (OrderPriority, Visibility) from ColumnDisplayOptions\n * into column annotations. Returns new column objects — originals are not mutated.\n */\nexport function withTableVisualAnnotations<Data>(\n  displayOptions: undefined | ColumnsDisplayOptions,\n  columns: PColumn<Data>[],\n): PColumn<Data>[] {\n  if (displayOptions === undefined) return columns;\n  return columns.map((col) => {\n    const annotations = { ...col.spec.annotations };\n\n    const visibility = getEffectiveVisibility(col.spec, displayOptions);\n    if (!isNil(visibility)) annotations[Annotation.Table.Visibility] = visibility;\n\n    const orderPriority = getOrderPriority(col.spec, displayOptions);\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    };\n  });\n}\n\n/** Column shape required by label derivation. */\nexport type LabelableColumn = {\n  readonly id: PObjectId;\n  readonly spec: PColumnSpec;\n  readonly linkerPath?: { spec: PColumnSpec }[];\n};\n\n/** Derive labels for all table elements: columns via deriveDistinctLabels, axes from label columns. */\nexport function deriveAllLabels(options: {\n  columns: LabelableColumn[];\n  labelColumns: { readonly spec: PColumnSpec }[];\n  deriveLabelsOptions?: DeriveLabelsOptions;\n}): Record<string, string> {\n  const { columns, labelColumns, deriveLabelsOptions } = options;\n  const axisLabels = deriveAxisLabels(columns, labelColumns);\n  const columnLabels = deriveDistinctLabels(columns, deriveLabelsOptions).reduce(\n    (acc, label, index) => ((acc[columns[index].id] = label), acc),\n    {} as Record<string, string>,\n  );\n  return { ...axisLabels, ...columnLabels };\n}\n\n/** Derive axis labels from matching label columns, falling back to axis spec annotations. */\nfunction deriveAxisLabels(\n  columns: { readonly spec: PColumnSpec }[],\n  labelColumns: { readonly spec: PColumnSpec }[],\n): Record<string, string> {\n  const axisSpecMap = new Map(\n    columns.flatMap((c) => c.spec.axesSpec).map((a) => [canonicalizeJson(getAxisId(a)), a]),\n  );\n  const result: Record<string, string> = {};\n  for (const axisKey of axisSpecMap.keys()) {\n    const labelCol = labelColumns.find(\n      (lc) => canonicalizeJson(getAxisId(lc.spec.axesSpec[0])) === axisKey,\n    );\n    const source = labelCol?.spec ?? axisSpecMap.get(axisKey);\n    result[axisKey] = readAnnotation(source ?? {}, Annotation.Label)?.trim() ?? \"Unlabeled\";\n  }\n  return result;\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  canonicalizeJson,\n  DiscoveredPColumnId,\n  getAxisId,\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 { 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 { readonly id: PObjectId; readonly spec: PColumnSpec },\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\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?: { spec: PColumnSpec }[];\n};\n\n/** Derive labels for all table elements: columns via deriveDistinctLabels, axes from label columns. */\nexport function deriveAllLabels(options: {\n  columns: LabelableColumn[];\n  labelColumns: { readonly spec: PColumnSpec }[];\n  deriveLabelsOptions?: DeriveLabelsOptions;\n}): Record<string, string> {\n  const { columns, labelColumns, deriveLabelsOptions } = options;\n  const axisLabels = deriveAxisLabels(columns, labelColumns);\n  const columnLabels = deriveDistinctLabels(columns, deriveLabelsOptions).reduce(\n    (acc, label, index) => ((acc[columns[index].id] = label), acc),\n    {} as Record<string, string>,\n  );\n  return { ...axisLabels, ...columnLabels };\n}\n\n/** Derive axis labels from matching label columns, falling back to axis spec annotations. */\nfunction deriveAxisLabels(\n  columns: { readonly spec: PColumnSpec }[],\n  labelColumns: { readonly spec: PColumnSpec }[],\n): Record<string, string> {\n  const axisSpecMap = new Map(\n    columns.flatMap((c) => c.spec.axesSpec).map((a) => [canonicalizeJson(getAxisId(a)), a]),\n  );\n  const result: Record<string, string> = {};\n  for (const axisKey of axisSpecMap.keys()) {\n    const labelCol = labelColumns.find(\n      (lc) => canonicalizeJson(getAxisId(lc.spec.axesSpec[0])) === axisKey,\n    );\n    const source = labelCol?.spec ?? axisSpecMap.get(axisKey);\n    result[axisKey] = readAnnotation(source ?? {}, Annotation.Label)?.trim() ?? \"Unlabeled\";\n  }\n  return result;\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  readonly distinctiveQualifications?: 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        distinctiveQualifications: c.distinctiveQualifications,\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.d.ts

@@ -1,5 +1,5 @@
-import { ColumnsDisplayOptions } from "./createPlDataTableV3.js";
-import { Annotation, PColumn, PColumnSpec, PObjectId } from "@milaboratories/pl-model-common";
+import { ColumnOrderRule, ColumnVisibilityRule } from "./createPlDataTableV3.js";
+import { Annotation, DiscoveredPColumnId, PColumn, PColumnSpec, PFrameSpecDriver, PObjectId } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDataTable/createPlDataTable/utils.d.ts
 /** Check if column should be omitted from the table */
@@ -10,10 +10,12 @@ declare function isColumnHidden(spec: {
 declare function isColumnOptional(spec: {
   annotations?: Annotation;
 }): boolean;
-/** Get effective visibility for a column, considering display config rules first, then annotations. */
-declare function getEffectiveVisibility(spec: PColumnSpec, displayConfig?: ColumnsDisplayOptions): undefined | "default" | "optional" | "hidden";
-/** Get ordering priority for a column. Display config rules first, then annotation fallback. */
-declare function getOrderPriority(spec: PColumnSpec, displayConfig?: ColumnsDisplayOptions): undefined | number;
+/** Column shape consumed by rule evaluation. */
+type RuleColumn = Pick<PColumn<PObjectId>, "id" | "spec">;
+/** Get effective visibility for a column. Rule map lookup first, then annotation fallback. */
+declare function getEffectiveVisibility(col: RuleColumn, visibilityByColId?: Map<PObjectId, ColumnVisibilityRule>): undefined | "default" | "optional" | "hidden";
+/** Get ordering priority for a column. Rule map lookup first, then annotation fallback. */
+declare function getOrderPriority(col: RuleColumn, orderByColId?: Map<PObjectId, ColumnOrderRule>): undefined | number;
 //#endregion
 export { getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional };
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/utils.ts"],"mappings":";;;;;iBAmBgB,cAAA,CAAe,IAAA;EAAQ,WAAA,GAAc,UAAA;AAAA;;iBAKrC,gBAAA,CAAiB,IAAA;EAAQ,WAAA,GAAc,UAAA;AAAA;;iBAKvC,sBAAA,CACd,IAAA,EAAM,WAAA,EACN,aAAA,GAAgB,qBAAA;;iBAeF,gBAAA,CACd,IAAA,EAAM,WAAA,EACN,aAAA,GAAgB,qBAAA"}
+{"version":3,"file":"utils.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/utils.ts"],"mappings":";;;;;iBA4BgB,cAAA,CAAe,IAAA;EAAQ,WAAA,GAAc,UAAA;AAAA;;iBAKrC,gBAAA,CAAiB,IAAA;EAAQ,WAAA,GAAc,UAAA;AAAA;;KAK3C,UAAA,GAAa,IAAA,CAAK,OAAA,CAAQ,SAAA;AALtC;AAAA,iBAQgB,sBAAA,CACd,GAAA,EAAK,UAAA,EACL,iBAAA,GAAoB,GAAA,CAAI,SAAA,EAAW,oBAAA;;iBAUrB,gBAAA,CACd,GAAA,EAAK,UAAA,EACL,YAAA,GAAe,GAAA,CAAI,SAAA,EAAW,eAAA"}