@platforma-sdk/model 1.80.8 → 1.80.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs +6 -3
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs.map +1 -1
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.js +6 -4
- package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.js.map +1 -1
- package/dist/package.cjs +1 -1
- package/dist/package.js +1 -1
- package/package.json +7 -7
- package/src/components/PlDataTable/createPlDataTable/createPlDataTableV3.test.ts +61 -0
- package/src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts +6 -111
|
@@ -215,13 +215,15 @@ function filterFilters(filters, resolver) {
|
|
|
215
215
|
};
|
|
216
216
|
return prune(filters);
|
|
217
217
|
}
|
|
218
|
-
/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.
|
|
218
|
+
/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.
|
|
219
|
+
* Exported for unit testing. */
|
|
219
220
|
function concatFilters(a, b) {
|
|
220
221
|
if ((0, _milaboratories_helpers.isNil)(a)) return b;
|
|
221
222
|
if ((0, _milaboratories_helpers.isNil)(b)) return a;
|
|
223
|
+
const operands = (f) => f.type === "and" ? f.filters : [f];
|
|
222
224
|
return {
|
|
223
|
-
|
|
224
|
-
filters: [...a
|
|
225
|
+
type: "and",
|
|
226
|
+
filters: [...operands(a), ...operands(b)]
|
|
225
227
|
};
|
|
226
228
|
}
|
|
227
229
|
/** Pick user sorting from state if set, otherwise fall back to options default.
|
|
@@ -319,6 +321,7 @@ function remapFilterColumnIds(filters, resolver) {
|
|
|
319
321
|
return prune(filters);
|
|
320
322
|
}
|
|
321
323
|
//#endregion
|
|
324
|
+
exports.concatFilters = concatFilters;
|
|
322
325
|
exports.createPlDataTableV3 = createPlDataTableV3;
|
|
323
326
|
|
|
324
327
|
//# sourceMappingURL=createPlDataTableV3.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPlDataTableV3.cjs","names":["upgradePlDataTableStateV2","deriveAllLabels","isColumnHidden","evaluateRules","createColumnResolver","collectLinkerColumns","createPTableDefV3","discoverLabelColumns","discoverTableColumns","isLeafColumn","hitQualifications","queriesQualifications","buildDataStatusMap","toRuleColumn","getEffectiveVisibility","getOrderPriority","collectFilterSpecColumns"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n ColumnUniversalId,\n FilterSpecNode,\n PObjectId,\n PTableColumnId,\n PTableColumnIdColumn,\n PTableSorting,\n MultiColumnSelector,\n ColumnSelector,\n} from \"@milaboratories/pl-model-common\";\nimport {\n canonicalizeAxisId,\n dedupColumns,\n extractPObjectId,\n uniqueBy,\n} from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport { createColumnResolver, type ColumnResolver } from \"../columnResolver\";\nimport type { RenderCtxBase } from \"../../../render\";\nimport type {\n PlDataTableColumnsMeta,\n PlDataTableFilters,\n PlDataTableFilterSpecLeaf,\n PlDataTableModel,\n} from \"../typesV8\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { MatchingMode } from \"@milaboratories/pl-model-common\";\nimport {\n isLeafColumn,\n hitQualifications,\n collectLinkerColumns,\n queriesQualifications,\n type ColumnRecipe,\n} from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n deriveAllLabels,\n evaluateRules,\n getEffectiveVisibility,\n getOrderPriority,\n isColumnHidden,\n buildDataStatusMap,\n toRuleColumn,\n} from \"./utils\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport {\n discoverLabelColumns,\n discoverTableColumns,\n type DiscoverTableColumnOptions,\n} from \"./discoverColumns\";\nimport { isNil, isPlainObject, type Nil } from \"@milaboratories/helpers\";\nimport { uniq } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = (\n | {\n columns: Nil | DiscoverTableColumnOptions;\n }\n | {\n primaryColumns: ColumnRecipe[];\n columns: Nil | ColumnRecipe[];\n }\n) & {\n tableState?: PlDataTableStateV2;\n\n filters?: PlDataTableFilters;\n sorting?: PTableSorting[];\n primaryJoinType?: \"inner\" | \"full\";\n\n labelsOptions?: DeriveLabelsOptions;\n displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnsSource. */\nexport type ColumnsSelectorConfig = {\n include?: MultiColumnSelector | MultiColumnSelector[];\n exclude?: MultiColumnSelector | MultiColumnSelector[];\n mode?: MatchingMode;\n maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n ordering?: ColumnOrderRule[];\n /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n match: ColumnSelector;\n /** Higher number = further left in table */\n priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n match: ColumnSelector;\n visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport function createPlDataTableV3<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n const state = upgradePlDataTableStateV2(options.tableState);\n const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n const resolved = resolveInputColumns(ctx, options);\n if (resolved === undefined) return undefined;\n const { primary, secondary } = resolved;\n if (primary.length === 0) return undefined;\n\n const { direct, linked } = splitByTopology(secondary);\n\n const allColumns = [...primary, ...secondary];\n const derivedLabels = deriveAllLabels({\n // Skip hidden columns when deriving labels — they don't appear in the\n // table, so they shouldn't influence label disambiguation (#1623).\n columns: allColumns.filter((c) => !isColumnHidden(c.getSpec())).map(toLabelableColumn),\n deriveLabelsOptions: {\n includeNativeLabel: true,\n ...options.labelsOptions,\n },\n });\n\n // Rule-based visibility/order maps (keyed by bare PObjectId). Computed once\n // here: `computeHiddenColumns` needs visibility to decide the visible set,\n // and `buildColumnsMeta` (below, once the visible set is known) reuses both.\n const allColumnsForRules = [...primary, ...direct, ...linked, ...collectLinkerSnapshots(linked)];\n const visibilityByColId = evaluateRules(\n options.displayOptions?.visibility ?? [],\n allColumnsForRules,\n );\n const orderByColId = evaluateRules(options.displayOptions?.ordering ?? [], allColumnsForRules);\n\n const resolver = createColumnResolver(\n [...primary, ...direct, ...linked.flatMap((lc) => [...collectLinkerColumns(lc), lc])],\n { warn: ctx.logWarn.bind(ctx) },\n );\n\n const remapedDefaultFilters = remapFilterColumnIds(options.filters, resolver);\n const filters = filterFilters(\n concatFilters(\n state.pTableParams.filters,\n state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n ),\n resolver,\n );\n\n const sorting = filterSorting(\n resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, resolver)),\n resolver,\n );\n\n const fullDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...direct, ...linked],\n filters,\n sorting,\n });\n\n const fullHandle = ctx.createPTableV2(fullDef);\n // TODO: is workaround for dropdown suggestions.\n // Pframe have not equivalent data for columns relativly to Ptable.\n // PFrame is the physical column registry — one entry per bare PObjectId,\n // so strip the rich recipe ids down to their physical leaf id and dedupe:\n // multiple discovered variants of the same hit collapse to the same bare id.\n const pframeHandle = ctx.createPFrame(\n uniq([\n ...primary.map((v) => extractPObjectId(v.id)),\n ...direct.map((v) => extractPObjectId(v.id)),\n ...linked.map((v) => extractPObjectId(v.id)),\n ]),\n );\n\n const hiddenSpecs = state.pTableParams.hiddenColIds;\n const hiddenColumnIds = computeHiddenColumns({\n columns: [...primary, ...direct, ...linked],\n visibilityByColId,\n sorting,\n filters,\n hiddenSpecs,\n });\n\n const visible = {\n primary,\n direct: direct.filter((c) => !hiddenColumnIds.has(c.id)),\n linked: linked.filter((c) => !hiddenColumnIds.has(c.id)),\n };\n const visibleDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...visible.direct, ...visible.linked],\n filters,\n sorting,\n });\n const visibleHandle = ctx.createPTableV2(visibleDef);\n\n // Built here, where the visible set is known: per-column data status is\n // computed for visible columns only (the probe is meaningful only for what\n // the user sees), while label/visibility/order/axes cover all columns.\n const columnsMeta = buildColumnsMeta({\n fullColumns: [...primary, ...direct, ...linked],\n visibleColumns: [...visible.primary, ...visible.direct, ...visible.linked],\n primaryColumns: primary,\n derivedLabels,\n visibilityByColId,\n orderByColId,\n });\n\n return {\n sourceId: state.pTableParams.sourceId,\n fullTableHandle: fullHandle,\n fullPframeHandle: pframeHandle,\n visibleTableHandle: visibleHandle,\n defaultFilters: remapedDefaultFilters,\n columnsMeta,\n } satisfies PlDataTableModel;\n}\n\ntype ResolvedColumns = {\n readonly primary: ColumnRecipe[];\n readonly secondary: ColumnRecipe[];\n};\n\n/** Normalize either option branch into a {primary, secondary} pair of recipes. */\nfunction resolveInputColumns<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): undefined | ResolvedColumns {\n if (\"primaryColumns\" in options) {\n const primary = options.primaryColumns;\n const secondary = options.columns ?? [];\n const labels = discoverLabelColumns(ctx, primary);\n // Exclude from secondary anything already present in primary: a label\n // column the block hands in as primary can be re-discovered here as a\n // label for that same axis, landing in the table twice with the same id.\n const primaryIds = new Set(primary.map((c) => c.id));\n return {\n primary,\n secondary: dedupColumns(\n [...secondary, ...labels].filter((c) => !primaryIds.has(c.id)),\n (c) => c.id,\n (c) => c.getSpec(),\n ),\n };\n }\n\n if (isPlainObject(options.columns)) {\n return discoverTableColumns(ctx, options.columns);\n }\n\n return undefined;\n}\n\n/** Split secondary recipes by query topology: leaves (no linker chain) vs joined. */\nfunction splitByTopology(columns: ColumnRecipe[]): {\n direct: ColumnRecipe[];\n linked: ColumnRecipe[];\n} {\n const direct: ColumnRecipe[] = [];\n const linked: ColumnRecipe[] = [];\n for (const c of columns) {\n if (isLeafColumn(c)) direct.push(c);\n else linked.push(c);\n }\n return { direct, linked };\n}\n\n/** All linker recipes across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: ColumnRecipe[]): ColumnRecipe[] {\n return uniqueBy(\n linked.flatMap((c) => collectLinkerColumns(c)),\n (c) => c.id,\n );\n}\n\nfunction toLabelableColumn(col: ColumnRecipe) {\n return {\n id: col.id,\n spec: col.getSpec(),\n linkerPath: collectLinkerColumns(col).map((linker) => ({\n linker: { spec: linker.getSpec() },\n })),\n qualifications: {\n forHit: [...hitQualifications(col)],\n forQueries: queriesQualifications(col),\n },\n };\n}\n\n/**\n * Compute display metadata as a sidecar keyed by each emitted column's\n * `ColumnUniversalId` (and axis `AxisId`), instead of baking it into the specs\n * via `withSpecs`. Spec overrides change a recipe's id, so the same physical\n * column reached two ways would diverge into two ids and render twice; keeping\n * meta out of the spec preserves identity and lets dedup collapse such cases.\n * The UI overlays this onto the engine-emitted specs at render time.\n */\nfunction buildColumnsMeta(params: {\n /** Every column in the table (primary + secondary) — drives `columns` and `axes`. */\n fullColumns: ColumnRecipe[];\n /** The visible subset — `status` is probed for these only. */\n visibleColumns: ColumnRecipe[];\n /** The primary join columns — their axes are the visible index; all other axes are hidden. */\n primaryColumns: ColumnRecipe[];\n derivedLabels: Record<string, string>;\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n orderByColId: Map<PObjectId, ColumnOrderRule>;\n}): PlDataTableColumnsMeta {\n const { fullColumns, visibleColumns, primaryColumns, derivedLabels } = params;\n const { visibilityByColId, orderByColId } = params;\n // Status only for visible columns — the probe is meaningful only for what the\n // user actually sees; non-visible columns get no `status`.\n const visibleStatus = buildDataStatusMap(visibleColumns);\n\n const columns = fullColumns.reduce<PlDataTableColumnsMeta[\"columns\"]>((acc, c) => {\n const rc = toRuleColumn(c);\n acc[c.id] = {\n label: derivedLabels[c.id],\n visibility: getEffectiveVisibility(rc, visibilityByColId),\n order: getOrderPriority(rc, orderByColId),\n status: visibleStatus[c.id],\n };\n return acc;\n }, {});\n\n // Only primary columns declare the table's visible axes. Any axis introduced\n // solely by a secondary column (a linker-bridge axis, or a distinct-domain\n // copy) is flagged hidden — otherwise it renders as a second index axis.\n const primaryAxisKeys = new Set(\n primaryColumns.flatMap((c) => c.getSpec().axesSpec.map((a) => canonicalizeAxisId(a))),\n );\n const axes = fullColumns.reduce<PlDataTableColumnsMeta[\"axes\"]>(\n (acc, c) =>\n c.getSpec().axesSpec.reduce((inner, ax) => {\n const key = canonicalizeAxisId(ax);\n if (inner[key] === undefined) inner[key] = { hidden: !primaryAxisKeys.has(key) };\n return inner;\n }, acc),\n {},\n );\n\n return { columns, axes };\n}\n\n/** Drop filter leaves whose column references cannot be resolved; rewrite the\n * resolvable ones through the resolver. Prune empty and/or/not groups. */\nfunction filterFilters(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const rewriteLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) return undefined;\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) return undefined;\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return rewriteLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */\nfunction concatFilters(\n a: Nil | PlDataTableFilters,\n b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n if (isNil(a)) return b;\n if (isNil(b)) return a;\n return { ...a, filters: [...a.filters, ...b.filters] };\n}\n\n/** Pick user sorting from state if set, otherwise fall back to options default.\n * null = user has not touched sorting → use default;\n * [] = user has explicitly cleared sorting → no sorting (default ignored). */\nfunction resolveSorting(\n userSorting: Nil | PTableSorting[],\n defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n return (isNil(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Rewrite sorting entries through the resolver; drop those that fail to resolve. */\nfunction filterSorting(sorting: PTableSorting[], resolver: ColumnResolver): PTableSorting[] {\n return sorting.flatMap((s) => {\n const col = resolver(s.column);\n return isNil(col) ? [] : [{ ...s, column: col }];\n });\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults.\n * Keyed by the recipe's logical {@link ColumnUniversalId} (rich) — variants of\n * the same physical column are independently visible/hidden. */\nfunction computeHiddenColumns(params: {\n columns: ColumnRecipe[];\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n sorting: Nil | PTableSorting[];\n filters: Nil | PlDataTableFilters;\n hiddenSpecs: Nil | PTableColumnId[];\n}): Set<ColumnUniversalId> {\n const { columns, visibilityByColId, sorting, filters, hiddenSpecs } = params;\n const visibilityOf = (c: ColumnRecipe) =>\n getEffectiveVisibility(toRuleColumn(c), visibilityByColId);\n const alwaysHidden = columns.filter((c) => visibilityOf(c) === \"hidden\").map((c) => c.id);\n const optionalHidden = !isNil(hiddenSpecs)\n ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n : columns.filter((c) => visibilityOf(c) === \"optional\").map((c) => c.id);\n const initial = [...alwaysHidden, ...optionalHidden];\n const preserved = collectPreservedColumnIds(sorting, filters);\n\n return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n sorting: Nil | PTableSorting[],\n filters: Nil | PlDataTableFilters,\n): Set<ColumnUniversalId> {\n const sortedIds = (sorting ?? [])\n .map((s) => s.column)\n .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n .map((c) => c.id);\n\n const filterIds = !isNil(filters)\n ? collectFilterSpecColumns(filters).flatMap((c) => (c.type === \"column\" ? [c.id] : []))\n : [];\n\n return new Set<ColumnUniversalId>([...sortedIds, ...filterIds]);\n}\n\n/** Remap column references in sorting entries through the resolver.\n * Unresolved entries are dropped with a warning (best-effort contract). */\nfunction remapSortingColumnIds(\n sorting: Nil | PTableSorting[],\n resolver: ColumnResolver,\n): Nil | PTableSorting[] {\n return sorting?.flatMap((s) => {\n const col = resolver(s.column);\n if (isNil(col)) {\n console.warn(\n `Sorting column ${JSON.stringify(s.column)} does not match any discovered column — dropped.`,\n );\n return [];\n }\n return [{ ...s, column: col }];\n });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree through the resolver.\n * Unresolved leaves are dropped with a warning; empty groups are pruned. */\nfunction remapFilterColumnIds(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const mapLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) {\n console.warn(\n `Filter column ${JSON.stringify(result.column)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) {\n console.warn(\n `Filter rhs ${JSON.stringify(result.rhs)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return mapLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n\nconst _ = [\n {\n type: \"column\",\n id: '{\"__isRef\":true,\"blockId\":\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\"name\":\"clusters.assign.clusterLabel\"}',\n spec: {\n kind: \"PColumn\",\n axesSpec: [\n {\n name: \"pl7.app/vdj/clonotypeKey\",\n type: \"String\",\n domain: {\n \"pl7.app/redefined-by\": \"aabfc81f-0fc9-4699-84e8-6e749a3e384d\",\n \"pl7.app/vdj/chain\": \"IGHeavy\",\n \"pl7.app/vdj/clonotypeKey/structure\":\n '[[\"pl7.app/vdj/sequence\",[\"pl7.app/alphabet\",\"aminoacid\"],[\"pl7.app/vdj/feature\",\"VDJRegion\"]]]',\n \"pl7.app/vdj/clonotypingRunId\": \"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\n },\n annotations: {\n \"pl7.app/label\": \"Clonotype ID\",\n \"pl7.app/segmentedBy\": '[\"pl7.app/vdj/clonotypingRunId\"]',\n \"pl7.app/table/fontFamily\": \"monospace\",\n \"pl7.app/table/orderPriority\": \"110000\",\n \"pl7.app/table/visibility\": \"default\",\n },\n },\n ],\n name: \"pl7.app/clusterId\",\n valueType: \"String\",\n domain: {\n \"pl7.app/clustering/algorithm\": \"foldseek\",\n \"pl7.app/clustering/blockId\": \"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\n },\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/structure/clusteringSource\": \"foldseek\",\n \"pl7.app/trace\":\n '[{\"type\":\"milaboratories.samples-and-data\",\"id\":\"0189e23b-5e8d-4648-8c6d-70caa5c26958\",\"importance\":10,\"label\":\"Samples & Data\"},{\"type\":\"milaboratories.samples-and-data/dataset\",\"id\":\"34U3GEP5PGJF45UG3A2WZ3JO\",\"importance\":100,\"label\":\"MB135 + Podocytes\"},{\"label\":\"MiXCR generic amplicon\",\"type\":\"milaboratories.mixcr-amplicon-alignment\",\"id\":\"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\"importance\":20},{\"type\":\"milaboratories.redefine-clonotypes\",\"importance\":30,\"label\":\"Imputed VDJRegion aa\"},{\"type\":\"milaboratories.antibody-tcr-lead-selection\",\"importance\":30,\"label\":\"Selected Leads\"},{\"type\":\"milaboratories.3d-structure-prediction\",\"id\":\"d204391a-e7dd-434d-9c24-ef77b5da81e0\",\"importance\":20,\"label\":\"Camelid (VHH/nanobody) NBB2, CDRH3 ≤ 2.5 Å\"},{\"type\":\"milaboratories.3d-structure-clustering.clustering\",\"id\":\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\"importance\":30,\"label\":\"Full Structure+AA, TM≥0.95, cov≥0.95\"}]',\n },\n },\n },\n {\n type: \"column\",\n id: '{\"__isDiscovered\":true,\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\\\\\",\\\\\"name\\\\\":\\\\\"pf.clusterLabel4\\\\\"}\",\"path\":[{\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\\\\\",\\\\\"name\\\\\":\\\\\"pf.link3\\\\\"}\",\"type\":\"linker\"}]}',\n spec: {\n kind: \"PColumn\",\n axesSpec: [\n {\n name: \"pl7.app/clusterId\",\n type: \"String\",\n domain: {\n \"pl7.app/clustering/algorithm\": \"mmseqs2\",\n \"pl7.app/clustering/blockId\": \"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\",\n \"pl7.app/redefined-by\": \"aabfc81f-0fc9-4699-84e8-6e749a3e384d\",\n \"pl7.app/vdj/chain\": \"IGHeavy\",\n \"pl7.app/vdj/clonotypeKey/structure\":\n '[[\"pl7.app/vdj/sequence\",[\"pl7.app/alphabet\",\"aminoacid\"],[\"pl7.app/vdj/feature\",\"VDJRegion\"]]]',\n \"pl7.app/vdj/clonotypingRunId\": \"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\n },\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/orderPriority\": \"990000\",\n \"pl7.app/table/visibility\": \"default\",\n },\n },\n ],\n name: \"pl7.app/label\",\n valueType: \"String\",\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/visibility\": \"default\",\n \"pl7.app/trace\":\n '[{\"importance\":10,\"label\":\"Samples & Data\",\"type\":\"milaboratories.samples-and-data\",\"id\":\"0189e23b-5e8d-4648-8c6d-70caa5c26958\"},{\"id\":\"34U3GEP5PGJF45UG3A2WZ3JO\",\"importance\":100,\"label\":\"MB135 + Podocytes\",\"type\":\"milaboratories.samples-and-data/dataset\"},{\"label\":\"MiXCR generic amplicon\",\"type\":\"milaboratories.mixcr-amplicon-alignment\",\"id\":\"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\"importance\":20},{\"type\":\"milaboratories.redefine-clonotypes\",\"importance\":30,\"label\":\"Imputed VDJRegion aa\"},{\"type\":\"milaboratories.clonotype-clustering.clustering\",\"importance\":30,\"label\":\"Imputed VDJRegion aa, BLOSUM62, ident:0.95, cov:0.95\"}]',\n },\n },\n },\n {\n type: \"column\",\n id: '{\"__isDiscovered\":true,\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\\\\\",\\\\\"name\\\\\":\\\\\"clusters.summary.clusterLabel\\\\\"}\",\"path\":[{\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\\\\\",\\\\\"name\\\\\":\\\\\"clusters.link.isCentroid\\\\\"}\",\"type\":\"linker\"}]}',\n spec: {\n kind: \"PColumn\",\n axesSpec: [\n {\n name: \"pl7.app/clusterId\",\n type: \"String\",\n domain: {\n \"pl7.app/clustering/algorithm\": \"foldseek\",\n \"pl7.app/clustering/blockId\": \"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\n },\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/orderPriority\": \"990000\",\n \"pl7.app/table/visibility\": \"default\",\n },\n },\n ],\n name: \"pl7.app/label\",\n valueType: \"String\",\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/orderPriority\": \"990000\",\n \"pl7.app/table/visibility\": \"default\",\n \"pl7.app/trace\":\n '[{\"type\":\"milaboratories.samples-and-data\",\"id\":\"0189e23b-5e8d-4648-8c6d-70caa5c26958\",\"importance\":10,\"label\":\"Samples & Data\"},{\"type\":\"milaboratories.samples-and-data/dataset\",\"id\":\"34U3GEP5PGJF45UG3A2WZ3JO\",\"importance\":100,\"label\":\"MB135 + Podocytes\"},{\"label\":\"MiXCR generic amplicon\",\"type\":\"milaboratories.mixcr-amplicon-alignment\",\"id\":\"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\"importance\":20},{\"type\":\"milaboratories.redefine-clonotypes\",\"importance\":30,\"label\":\"Imputed VDJRegion aa\"},{\"type\":\"milaboratories.antibody-tcr-lead-selection\",\"importance\":30,\"label\":\"Selected Leads\"},{\"type\":\"milaboratories.3d-structure-prediction\",\"id\":\"d204391a-e7dd-434d-9c24-ef77b5da81e0\",\"importance\":20,\"label\":\"Camelid (VHH/nanobody) NBB2, CDRH3 ≤ 2.5 Å\"},{\"type\":\"milaboratories.3d-structure-clustering.clustering\",\"id\":\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\"importance\":30,\"label\":\"Full Structure+AA, TM≥0.95, cov≥0.95\"}]',\n },\n },\n },\n];\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createPlDataTableV3.cjs","names":["upgradePlDataTableStateV2","deriveAllLabels","isColumnHidden","evaluateRules","createColumnResolver","collectLinkerColumns","createPTableDefV3","discoverLabelColumns","discoverTableColumns","isLeafColumn","hitQualifications","queriesQualifications","buildDataStatusMap","toRuleColumn","getEffectiveVisibility","getOrderPriority","collectFilterSpecColumns"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n ColumnUniversalId,\n FilterSpecNode,\n PObjectId,\n PTableColumnId,\n PTableColumnIdColumn,\n PTableSorting,\n MultiColumnSelector,\n ColumnSelector,\n} from \"@milaboratories/pl-model-common\";\nimport {\n canonicalizeAxisId,\n dedupColumns,\n extractPObjectId,\n uniqueBy,\n} from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport { createColumnResolver, type ColumnResolver } from \"../columnResolver\";\nimport type { RenderCtxBase } from \"../../../render\";\nimport type {\n PlDataTableColumnsMeta,\n PlDataTableFilters,\n PlDataTableFilterSpecLeaf,\n PlDataTableModel,\n} from \"../typesV8\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { MatchingMode } from \"@milaboratories/pl-model-common\";\nimport {\n isLeafColumn,\n hitQualifications,\n collectLinkerColumns,\n queriesQualifications,\n type ColumnRecipe,\n} from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n deriveAllLabels,\n evaluateRules,\n getEffectiveVisibility,\n getOrderPriority,\n isColumnHidden,\n buildDataStatusMap,\n toRuleColumn,\n} from \"./utils\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport {\n discoverLabelColumns,\n discoverTableColumns,\n type DiscoverTableColumnOptions,\n} from \"./discoverColumns\";\nimport { isNil, isPlainObject, type Nil } from \"@milaboratories/helpers\";\nimport { uniq } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = (\n | {\n columns: Nil | DiscoverTableColumnOptions;\n }\n | {\n primaryColumns: ColumnRecipe[];\n columns: Nil | ColumnRecipe[];\n }\n) & {\n tableState?: PlDataTableStateV2;\n\n filters?: PlDataTableFilters;\n sorting?: PTableSorting[];\n primaryJoinType?: \"inner\" | \"full\";\n\n labelsOptions?: DeriveLabelsOptions;\n displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnsSource. */\nexport type ColumnsSelectorConfig = {\n include?: MultiColumnSelector | MultiColumnSelector[];\n exclude?: MultiColumnSelector | MultiColumnSelector[];\n mode?: MatchingMode;\n maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n ordering?: ColumnOrderRule[];\n /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n match: ColumnSelector;\n /** Higher number = further left in table */\n priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n match: ColumnSelector;\n visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport function createPlDataTableV3<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n const state = upgradePlDataTableStateV2(options.tableState);\n const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n const resolved = resolveInputColumns(ctx, options);\n if (resolved === undefined) return undefined;\n const { primary, secondary } = resolved;\n if (primary.length === 0) return undefined;\n\n const { direct, linked } = splitByTopology(secondary);\n\n const allColumns = [...primary, ...secondary];\n const derivedLabels = deriveAllLabels({\n // Skip hidden columns when deriving labels — they don't appear in the\n // table, so they shouldn't influence label disambiguation (#1623).\n columns: allColumns.filter((c) => !isColumnHidden(c.getSpec())).map(toLabelableColumn),\n deriveLabelsOptions: {\n includeNativeLabel: true,\n ...options.labelsOptions,\n },\n });\n\n // Rule-based visibility/order maps (keyed by bare PObjectId). Computed once\n // here: `computeHiddenColumns` needs visibility to decide the visible set,\n // and `buildColumnsMeta` (below, once the visible set is known) reuses both.\n const allColumnsForRules = [...primary, ...direct, ...linked, ...collectLinkerSnapshots(linked)];\n const visibilityByColId = evaluateRules(\n options.displayOptions?.visibility ?? [],\n allColumnsForRules,\n );\n const orderByColId = evaluateRules(options.displayOptions?.ordering ?? [], allColumnsForRules);\n\n const resolver = createColumnResolver(\n [...primary, ...direct, ...linked.flatMap((lc) => [...collectLinkerColumns(lc), lc])],\n { warn: ctx.logWarn.bind(ctx) },\n );\n\n const remapedDefaultFilters = remapFilterColumnIds(options.filters, resolver);\n const filters = filterFilters(\n concatFilters(\n state.pTableParams.filters,\n state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n ),\n resolver,\n );\n\n const sorting = filterSorting(\n resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, resolver)),\n resolver,\n );\n\n const fullDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...direct, ...linked],\n filters,\n sorting,\n });\n\n const fullHandle = ctx.createPTableV2(fullDef);\n // TODO: is workaround for dropdown suggestions.\n // Pframe have not equivalent data for columns relativly to Ptable.\n // PFrame is the physical column registry — one entry per bare PObjectId,\n // so strip the rich recipe ids down to their physical leaf id and dedupe:\n // multiple discovered variants of the same hit collapse to the same bare id.\n const pframeHandle = ctx.createPFrame(\n uniq([\n ...primary.map((v) => extractPObjectId(v.id)),\n ...direct.map((v) => extractPObjectId(v.id)),\n ...linked.map((v) => extractPObjectId(v.id)),\n ]),\n );\n\n const hiddenSpecs = state.pTableParams.hiddenColIds;\n const hiddenColumnIds = computeHiddenColumns({\n columns: [...primary, ...direct, ...linked],\n visibilityByColId,\n sorting,\n filters,\n hiddenSpecs,\n });\n\n const visible = {\n primary,\n direct: direct.filter((c) => !hiddenColumnIds.has(c.id)),\n linked: linked.filter((c) => !hiddenColumnIds.has(c.id)),\n };\n const visibleDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...visible.direct, ...visible.linked],\n filters,\n sorting,\n });\n const visibleHandle = ctx.createPTableV2(visibleDef);\n\n // Built here, where the visible set is known: per-column data status is\n // computed for visible columns only (the probe is meaningful only for what\n // the user sees), while label/visibility/order/axes cover all columns.\n const columnsMeta = buildColumnsMeta({\n fullColumns: [...primary, ...direct, ...linked],\n visibleColumns: [...visible.primary, ...visible.direct, ...visible.linked],\n primaryColumns: primary,\n derivedLabels,\n visibilityByColId,\n orderByColId,\n });\n\n return {\n sourceId: state.pTableParams.sourceId,\n fullTableHandle: fullHandle,\n fullPframeHandle: pframeHandle,\n visibleTableHandle: visibleHandle,\n defaultFilters: remapedDefaultFilters,\n columnsMeta,\n } satisfies PlDataTableModel;\n}\n\ntype ResolvedColumns = {\n readonly primary: ColumnRecipe[];\n readonly secondary: ColumnRecipe[];\n};\n\n/** Normalize either option branch into a {primary, secondary} pair of recipes. */\nfunction resolveInputColumns<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): undefined | ResolvedColumns {\n if (\"primaryColumns\" in options) {\n const primary = options.primaryColumns;\n const secondary = options.columns ?? [];\n const labels = discoverLabelColumns(ctx, primary);\n // Exclude from secondary anything already present in primary: a label\n // column the block hands in as primary can be re-discovered here as a\n // label for that same axis, landing in the table twice with the same id.\n const primaryIds = new Set(primary.map((c) => c.id));\n return {\n primary,\n secondary: dedupColumns(\n [...secondary, ...labels].filter((c) => !primaryIds.has(c.id)),\n (c) => c.id,\n (c) => c.getSpec(),\n ),\n };\n }\n\n if (isPlainObject(options.columns)) {\n return discoverTableColumns(ctx, options.columns);\n }\n\n return undefined;\n}\n\n/** Split secondary recipes by query topology: leaves (no linker chain) vs joined. */\nfunction splitByTopology(columns: ColumnRecipe[]): {\n direct: ColumnRecipe[];\n linked: ColumnRecipe[];\n} {\n const direct: ColumnRecipe[] = [];\n const linked: ColumnRecipe[] = [];\n for (const c of columns) {\n if (isLeafColumn(c)) direct.push(c);\n else linked.push(c);\n }\n return { direct, linked };\n}\n\n/** All linker recipes across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: ColumnRecipe[]): ColumnRecipe[] {\n return uniqueBy(\n linked.flatMap((c) => collectLinkerColumns(c)),\n (c) => c.id,\n );\n}\n\nfunction toLabelableColumn(col: ColumnRecipe) {\n return {\n id: col.id,\n spec: col.getSpec(),\n linkerPath: collectLinkerColumns(col).map((linker) => ({\n linker: { spec: linker.getSpec() },\n })),\n qualifications: {\n forHit: [...hitQualifications(col)],\n forQueries: queriesQualifications(col),\n },\n };\n}\n\n/**\n * Compute display metadata as a sidecar keyed by each emitted column's\n * `ColumnUniversalId` (and axis `AxisId`), instead of baking it into the specs\n * via `withSpecs`. Spec overrides change a recipe's id, so the same physical\n * column reached two ways would diverge into two ids and render twice; keeping\n * meta out of the spec preserves identity and lets dedup collapse such cases.\n * The UI overlays this onto the engine-emitted specs at render time.\n */\nfunction buildColumnsMeta(params: {\n /** Every column in the table (primary + secondary) — drives `columns` and `axes`. */\n fullColumns: ColumnRecipe[];\n /** The visible subset — `status` is probed for these only. */\n visibleColumns: ColumnRecipe[];\n /** The primary join columns — their axes are the visible index; all other axes are hidden. */\n primaryColumns: ColumnRecipe[];\n derivedLabels: Record<string, string>;\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n orderByColId: Map<PObjectId, ColumnOrderRule>;\n}): PlDataTableColumnsMeta {\n const { fullColumns, visibleColumns, primaryColumns, derivedLabels } = params;\n const { visibilityByColId, orderByColId } = params;\n // Status only for visible columns — the probe is meaningful only for what the\n // user actually sees; non-visible columns get no `status`.\n const visibleStatus = buildDataStatusMap(visibleColumns);\n\n const columns = fullColumns.reduce<PlDataTableColumnsMeta[\"columns\"]>((acc, c) => {\n const rc = toRuleColumn(c);\n acc[c.id] = {\n label: derivedLabels[c.id],\n visibility: getEffectiveVisibility(rc, visibilityByColId),\n order: getOrderPriority(rc, orderByColId),\n status: visibleStatus[c.id],\n };\n return acc;\n }, {});\n\n // Only primary columns declare the table's visible axes. Any axis introduced\n // solely by a secondary column (a linker-bridge axis, or a distinct-domain\n // copy) is flagged hidden — otherwise it renders as a second index axis.\n const primaryAxisKeys = new Set(\n primaryColumns.flatMap((c) => c.getSpec().axesSpec.map((a) => canonicalizeAxisId(a))),\n );\n const axes = fullColumns.reduce<PlDataTableColumnsMeta[\"axes\"]>(\n (acc, c) =>\n c.getSpec().axesSpec.reduce((inner, ax) => {\n const key = canonicalizeAxisId(ax);\n if (inner[key] === undefined) inner[key] = { hidden: !primaryAxisKeys.has(key) };\n return inner;\n }, acc),\n {},\n );\n\n return { columns, axes };\n}\n\n/** Drop filter leaves whose column references cannot be resolved; rewrite the\n * resolvable ones through the resolver. Prune empty and/or/not groups. */\nfunction filterFilters(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const rewriteLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) return undefined;\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) return undefined;\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return rewriteLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.\n * Exported for unit testing. */\nexport function concatFilters(\n a: Nil | PlDataTableFilters,\n b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n if (isNil(a)) return b;\n if (isNil(b)) return a;\n const operands = (f: PlDataTableFilters): PlDataTableFilterNode[] =>\n f.type === \"and\" ? f.filters : [f as PlDataTableFilterNode];\n return { type: \"and\", filters: [...operands(a), ...operands(b)] };\n}\n\n/** Pick user sorting from state if set, otherwise fall back to options default.\n * null = user has not touched sorting → use default;\n * [] = user has explicitly cleared sorting → no sorting (default ignored). */\nfunction resolveSorting(\n userSorting: Nil | PTableSorting[],\n defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n return (isNil(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Rewrite sorting entries through the resolver; drop those that fail to resolve. */\nfunction filterSorting(sorting: PTableSorting[], resolver: ColumnResolver): PTableSorting[] {\n return sorting.flatMap((s) => {\n const col = resolver(s.column);\n return isNil(col) ? [] : [{ ...s, column: col }];\n });\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults.\n * Keyed by the recipe's logical {@link ColumnUniversalId} (rich) — variants of\n * the same physical column are independently visible/hidden. */\nfunction computeHiddenColumns(params: {\n columns: ColumnRecipe[];\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n sorting: Nil | PTableSorting[];\n filters: Nil | PlDataTableFilters;\n hiddenSpecs: Nil | PTableColumnId[];\n}): Set<ColumnUniversalId> {\n const { columns, visibilityByColId, sorting, filters, hiddenSpecs } = params;\n const visibilityOf = (c: ColumnRecipe) =>\n getEffectiveVisibility(toRuleColumn(c), visibilityByColId);\n const alwaysHidden = columns.filter((c) => visibilityOf(c) === \"hidden\").map((c) => c.id);\n const optionalHidden = !isNil(hiddenSpecs)\n ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n : columns.filter((c) => visibilityOf(c) === \"optional\").map((c) => c.id);\n const initial = [...alwaysHidden, ...optionalHidden];\n const preserved = collectPreservedColumnIds(sorting, filters);\n\n return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n sorting: Nil | PTableSorting[],\n filters: Nil | PlDataTableFilters,\n): Set<ColumnUniversalId> {\n const sortedIds = (sorting ?? [])\n .map((s) => s.column)\n .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n .map((c) => c.id);\n\n const filterIds = !isNil(filters)\n ? collectFilterSpecColumns(filters).flatMap((c) => (c.type === \"column\" ? [c.id] : []))\n : [];\n\n return new Set<ColumnUniversalId>([...sortedIds, ...filterIds]);\n}\n\n/** Remap column references in sorting entries through the resolver.\n * Unresolved entries are dropped with a warning (best-effort contract). */\nfunction remapSortingColumnIds(\n sorting: Nil | PTableSorting[],\n resolver: ColumnResolver,\n): Nil | PTableSorting[] {\n return sorting?.flatMap((s) => {\n const col = resolver(s.column);\n if (isNil(col)) {\n console.warn(\n `Sorting column ${JSON.stringify(s.column)} does not match any discovered column — dropped.`,\n );\n return [];\n }\n return [{ ...s, column: col }];\n });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree through the resolver.\n * Unresolved leaves are dropped with a warning; empty groups are pruned. */\nfunction remapFilterColumnIds(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const mapLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) {\n console.warn(\n `Filter column ${JSON.stringify(result.column)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) {\n console.warn(\n `Filter rhs ${JSON.stringify(result.rhs)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return mapLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n"],"mappings":"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"}
|
|
@@ -215,13 +215,15 @@ function filterFilters(filters, resolver) {
|
|
|
215
215
|
};
|
|
216
216
|
return prune(filters);
|
|
217
217
|
}
|
|
218
|
-
/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.
|
|
218
|
+
/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.
|
|
219
|
+
* Exported for unit testing. */
|
|
219
220
|
function concatFilters(a, b) {
|
|
220
221
|
if (isNil(a)) return b;
|
|
221
222
|
if (isNil(b)) return a;
|
|
223
|
+
const operands = (f) => f.type === "and" ? f.filters : [f];
|
|
222
224
|
return {
|
|
223
|
-
|
|
224
|
-
filters: [...a
|
|
225
|
+
type: "and",
|
|
226
|
+
filters: [...operands(a), ...operands(b)]
|
|
225
227
|
};
|
|
226
228
|
}
|
|
227
229
|
/** Pick user sorting from state if set, otherwise fall back to options default.
|
|
@@ -319,6 +321,6 @@ function remapFilterColumnIds(filters, resolver) {
|
|
|
319
321
|
return prune(filters);
|
|
320
322
|
}
|
|
321
323
|
//#endregion
|
|
322
|
-
export { createPlDataTableV3 };
|
|
324
|
+
export { concatFilters, createPlDataTableV3 };
|
|
323
325
|
|
|
324
326
|
//# sourceMappingURL=createPlDataTableV3.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPlDataTableV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n ColumnUniversalId,\n FilterSpecNode,\n PObjectId,\n PTableColumnId,\n PTableColumnIdColumn,\n PTableSorting,\n MultiColumnSelector,\n ColumnSelector,\n} from \"@milaboratories/pl-model-common\";\nimport {\n canonicalizeAxisId,\n dedupColumns,\n extractPObjectId,\n uniqueBy,\n} from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport { createColumnResolver, type ColumnResolver } from \"../columnResolver\";\nimport type { RenderCtxBase } from \"../../../render\";\nimport type {\n PlDataTableColumnsMeta,\n PlDataTableFilters,\n PlDataTableFilterSpecLeaf,\n PlDataTableModel,\n} from \"../typesV8\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { MatchingMode } from \"@milaboratories/pl-model-common\";\nimport {\n isLeafColumn,\n hitQualifications,\n collectLinkerColumns,\n queriesQualifications,\n type ColumnRecipe,\n} from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n deriveAllLabels,\n evaluateRules,\n getEffectiveVisibility,\n getOrderPriority,\n isColumnHidden,\n buildDataStatusMap,\n toRuleColumn,\n} from \"./utils\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport {\n discoverLabelColumns,\n discoverTableColumns,\n type DiscoverTableColumnOptions,\n} from \"./discoverColumns\";\nimport { isNil, isPlainObject, type Nil } from \"@milaboratories/helpers\";\nimport { uniq } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = (\n | {\n columns: Nil | DiscoverTableColumnOptions;\n }\n | {\n primaryColumns: ColumnRecipe[];\n columns: Nil | ColumnRecipe[];\n }\n) & {\n tableState?: PlDataTableStateV2;\n\n filters?: PlDataTableFilters;\n sorting?: PTableSorting[];\n primaryJoinType?: \"inner\" | \"full\";\n\n labelsOptions?: DeriveLabelsOptions;\n displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnsSource. */\nexport type ColumnsSelectorConfig = {\n include?: MultiColumnSelector | MultiColumnSelector[];\n exclude?: MultiColumnSelector | MultiColumnSelector[];\n mode?: MatchingMode;\n maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n ordering?: ColumnOrderRule[];\n /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n match: ColumnSelector;\n /** Higher number = further left in table */\n priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n match: ColumnSelector;\n visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport function createPlDataTableV3<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n const state = upgradePlDataTableStateV2(options.tableState);\n const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n const resolved = resolveInputColumns(ctx, options);\n if (resolved === undefined) return undefined;\n const { primary, secondary } = resolved;\n if (primary.length === 0) return undefined;\n\n const { direct, linked } = splitByTopology(secondary);\n\n const allColumns = [...primary, ...secondary];\n const derivedLabels = deriveAllLabels({\n // Skip hidden columns when deriving labels — they don't appear in the\n // table, so they shouldn't influence label disambiguation (#1623).\n columns: allColumns.filter((c) => !isColumnHidden(c.getSpec())).map(toLabelableColumn),\n deriveLabelsOptions: {\n includeNativeLabel: true,\n ...options.labelsOptions,\n },\n });\n\n // Rule-based visibility/order maps (keyed by bare PObjectId). Computed once\n // here: `computeHiddenColumns` needs visibility to decide the visible set,\n // and `buildColumnsMeta` (below, once the visible set is known) reuses both.\n const allColumnsForRules = [...primary, ...direct, ...linked, ...collectLinkerSnapshots(linked)];\n const visibilityByColId = evaluateRules(\n options.displayOptions?.visibility ?? [],\n allColumnsForRules,\n );\n const orderByColId = evaluateRules(options.displayOptions?.ordering ?? [], allColumnsForRules);\n\n const resolver = createColumnResolver(\n [...primary, ...direct, ...linked.flatMap((lc) => [...collectLinkerColumns(lc), lc])],\n { warn: ctx.logWarn.bind(ctx) },\n );\n\n const remapedDefaultFilters = remapFilterColumnIds(options.filters, resolver);\n const filters = filterFilters(\n concatFilters(\n state.pTableParams.filters,\n state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n ),\n resolver,\n );\n\n const sorting = filterSorting(\n resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, resolver)),\n resolver,\n );\n\n const fullDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...direct, ...linked],\n filters,\n sorting,\n });\n\n const fullHandle = ctx.createPTableV2(fullDef);\n // TODO: is workaround for dropdown suggestions.\n // Pframe have not equivalent data for columns relativly to Ptable.\n // PFrame is the physical column registry — one entry per bare PObjectId,\n // so strip the rich recipe ids down to their physical leaf id and dedupe:\n // multiple discovered variants of the same hit collapse to the same bare id.\n const pframeHandle = ctx.createPFrame(\n uniq([\n ...primary.map((v) => extractPObjectId(v.id)),\n ...direct.map((v) => extractPObjectId(v.id)),\n ...linked.map((v) => extractPObjectId(v.id)),\n ]),\n );\n\n const hiddenSpecs = state.pTableParams.hiddenColIds;\n const hiddenColumnIds = computeHiddenColumns({\n columns: [...primary, ...direct, ...linked],\n visibilityByColId,\n sorting,\n filters,\n hiddenSpecs,\n });\n\n const visible = {\n primary,\n direct: direct.filter((c) => !hiddenColumnIds.has(c.id)),\n linked: linked.filter((c) => !hiddenColumnIds.has(c.id)),\n };\n const visibleDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...visible.direct, ...visible.linked],\n filters,\n sorting,\n });\n const visibleHandle = ctx.createPTableV2(visibleDef);\n\n // Built here, where the visible set is known: per-column data status is\n // computed for visible columns only (the probe is meaningful only for what\n // the user sees), while label/visibility/order/axes cover all columns.\n const columnsMeta = buildColumnsMeta({\n fullColumns: [...primary, ...direct, ...linked],\n visibleColumns: [...visible.primary, ...visible.direct, ...visible.linked],\n primaryColumns: primary,\n derivedLabels,\n visibilityByColId,\n orderByColId,\n });\n\n return {\n sourceId: state.pTableParams.sourceId,\n fullTableHandle: fullHandle,\n fullPframeHandle: pframeHandle,\n visibleTableHandle: visibleHandle,\n defaultFilters: remapedDefaultFilters,\n columnsMeta,\n } satisfies PlDataTableModel;\n}\n\ntype ResolvedColumns = {\n readonly primary: ColumnRecipe[];\n readonly secondary: ColumnRecipe[];\n};\n\n/** Normalize either option branch into a {primary, secondary} pair of recipes. */\nfunction resolveInputColumns<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): undefined | ResolvedColumns {\n if (\"primaryColumns\" in options) {\n const primary = options.primaryColumns;\n const secondary = options.columns ?? [];\n const labels = discoverLabelColumns(ctx, primary);\n // Exclude from secondary anything already present in primary: a label\n // column the block hands in as primary can be re-discovered here as a\n // label for that same axis, landing in the table twice with the same id.\n const primaryIds = new Set(primary.map((c) => c.id));\n return {\n primary,\n secondary: dedupColumns(\n [...secondary, ...labels].filter((c) => !primaryIds.has(c.id)),\n (c) => c.id,\n (c) => c.getSpec(),\n ),\n };\n }\n\n if (isPlainObject(options.columns)) {\n return discoverTableColumns(ctx, options.columns);\n }\n\n return undefined;\n}\n\n/** Split secondary recipes by query topology: leaves (no linker chain) vs joined. */\nfunction splitByTopology(columns: ColumnRecipe[]): {\n direct: ColumnRecipe[];\n linked: ColumnRecipe[];\n} {\n const direct: ColumnRecipe[] = [];\n const linked: ColumnRecipe[] = [];\n for (const c of columns) {\n if (isLeafColumn(c)) direct.push(c);\n else linked.push(c);\n }\n return { direct, linked };\n}\n\n/** All linker recipes across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: ColumnRecipe[]): ColumnRecipe[] {\n return uniqueBy(\n linked.flatMap((c) => collectLinkerColumns(c)),\n (c) => c.id,\n );\n}\n\nfunction toLabelableColumn(col: ColumnRecipe) {\n return {\n id: col.id,\n spec: col.getSpec(),\n linkerPath: collectLinkerColumns(col).map((linker) => ({\n linker: { spec: linker.getSpec() },\n })),\n qualifications: {\n forHit: [...hitQualifications(col)],\n forQueries: queriesQualifications(col),\n },\n };\n}\n\n/**\n * Compute display metadata as a sidecar keyed by each emitted column's\n * `ColumnUniversalId` (and axis `AxisId`), instead of baking it into the specs\n * via `withSpecs`. Spec overrides change a recipe's id, so the same physical\n * column reached two ways would diverge into two ids and render twice; keeping\n * meta out of the spec preserves identity and lets dedup collapse such cases.\n * The UI overlays this onto the engine-emitted specs at render time.\n */\nfunction buildColumnsMeta(params: {\n /** Every column in the table (primary + secondary) — drives `columns` and `axes`. */\n fullColumns: ColumnRecipe[];\n /** The visible subset — `status` is probed for these only. */\n visibleColumns: ColumnRecipe[];\n /** The primary join columns — their axes are the visible index; all other axes are hidden. */\n primaryColumns: ColumnRecipe[];\n derivedLabels: Record<string, string>;\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n orderByColId: Map<PObjectId, ColumnOrderRule>;\n}): PlDataTableColumnsMeta {\n const { fullColumns, visibleColumns, primaryColumns, derivedLabels } = params;\n const { visibilityByColId, orderByColId } = params;\n // Status only for visible columns — the probe is meaningful only for what the\n // user actually sees; non-visible columns get no `status`.\n const visibleStatus = buildDataStatusMap(visibleColumns);\n\n const columns = fullColumns.reduce<PlDataTableColumnsMeta[\"columns\"]>((acc, c) => {\n const rc = toRuleColumn(c);\n acc[c.id] = {\n label: derivedLabels[c.id],\n visibility: getEffectiveVisibility(rc, visibilityByColId),\n order: getOrderPriority(rc, orderByColId),\n status: visibleStatus[c.id],\n };\n return acc;\n }, {});\n\n // Only primary columns declare the table's visible axes. Any axis introduced\n // solely by a secondary column (a linker-bridge axis, or a distinct-domain\n // copy) is flagged hidden — otherwise it renders as a second index axis.\n const primaryAxisKeys = new Set(\n primaryColumns.flatMap((c) => c.getSpec().axesSpec.map((a) => canonicalizeAxisId(a))),\n );\n const axes = fullColumns.reduce<PlDataTableColumnsMeta[\"axes\"]>(\n (acc, c) =>\n c.getSpec().axesSpec.reduce((inner, ax) => {\n const key = canonicalizeAxisId(ax);\n if (inner[key] === undefined) inner[key] = { hidden: !primaryAxisKeys.has(key) };\n return inner;\n }, acc),\n {},\n );\n\n return { columns, axes };\n}\n\n/** Drop filter leaves whose column references cannot be resolved; rewrite the\n * resolvable ones through the resolver. Prune empty and/or/not groups. */\nfunction filterFilters(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const rewriteLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) return undefined;\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) return undefined;\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return rewriteLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil. */\nfunction concatFilters(\n a: Nil | PlDataTableFilters,\n b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n if (isNil(a)) return b;\n if (isNil(b)) return a;\n return { ...a, filters: [...a.filters, ...b.filters] };\n}\n\n/** Pick user sorting from state if set, otherwise fall back to options default.\n * null = user has not touched sorting → use default;\n * [] = user has explicitly cleared sorting → no sorting (default ignored). */\nfunction resolveSorting(\n userSorting: Nil | PTableSorting[],\n defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n return (isNil(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Rewrite sorting entries through the resolver; drop those that fail to resolve. */\nfunction filterSorting(sorting: PTableSorting[], resolver: ColumnResolver): PTableSorting[] {\n return sorting.flatMap((s) => {\n const col = resolver(s.column);\n return isNil(col) ? [] : [{ ...s, column: col }];\n });\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults.\n * Keyed by the recipe's logical {@link ColumnUniversalId} (rich) — variants of\n * the same physical column are independently visible/hidden. */\nfunction computeHiddenColumns(params: {\n columns: ColumnRecipe[];\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n sorting: Nil | PTableSorting[];\n filters: Nil | PlDataTableFilters;\n hiddenSpecs: Nil | PTableColumnId[];\n}): Set<ColumnUniversalId> {\n const { columns, visibilityByColId, sorting, filters, hiddenSpecs } = params;\n const visibilityOf = (c: ColumnRecipe) =>\n getEffectiveVisibility(toRuleColumn(c), visibilityByColId);\n const alwaysHidden = columns.filter((c) => visibilityOf(c) === \"hidden\").map((c) => c.id);\n const optionalHidden = !isNil(hiddenSpecs)\n ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n : columns.filter((c) => visibilityOf(c) === \"optional\").map((c) => c.id);\n const initial = [...alwaysHidden, ...optionalHidden];\n const preserved = collectPreservedColumnIds(sorting, filters);\n\n return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n sorting: Nil | PTableSorting[],\n filters: Nil | PlDataTableFilters,\n): Set<ColumnUniversalId> {\n const sortedIds = (sorting ?? [])\n .map((s) => s.column)\n .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n .map((c) => c.id);\n\n const filterIds = !isNil(filters)\n ? collectFilterSpecColumns(filters).flatMap((c) => (c.type === \"column\" ? [c.id] : []))\n : [];\n\n return new Set<ColumnUniversalId>([...sortedIds, ...filterIds]);\n}\n\n/** Remap column references in sorting entries through the resolver.\n * Unresolved entries are dropped with a warning (best-effort contract). */\nfunction remapSortingColumnIds(\n sorting: Nil | PTableSorting[],\n resolver: ColumnResolver,\n): Nil | PTableSorting[] {\n return sorting?.flatMap((s) => {\n const col = resolver(s.column);\n if (isNil(col)) {\n console.warn(\n `Sorting column ${JSON.stringify(s.column)} does not match any discovered column — dropped.`,\n );\n return [];\n }\n return [{ ...s, column: col }];\n });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree through the resolver.\n * Unresolved leaves are dropped with a warning; empty groups are pruned. */\nfunction remapFilterColumnIds(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const mapLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) {\n console.warn(\n `Filter column ${JSON.stringify(result.column)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) {\n console.warn(\n `Filter rhs ${JSON.stringify(result.rhs)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return mapLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n\nconst _ = [\n {\n type: \"column\",\n id: '{\"__isRef\":true,\"blockId\":\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\"name\":\"clusters.assign.clusterLabel\"}',\n spec: {\n kind: \"PColumn\",\n axesSpec: [\n {\n name: \"pl7.app/vdj/clonotypeKey\",\n type: \"String\",\n domain: {\n \"pl7.app/redefined-by\": \"aabfc81f-0fc9-4699-84e8-6e749a3e384d\",\n \"pl7.app/vdj/chain\": \"IGHeavy\",\n \"pl7.app/vdj/clonotypeKey/structure\":\n '[[\"pl7.app/vdj/sequence\",[\"pl7.app/alphabet\",\"aminoacid\"],[\"pl7.app/vdj/feature\",\"VDJRegion\"]]]',\n \"pl7.app/vdj/clonotypingRunId\": \"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\n },\n annotations: {\n \"pl7.app/label\": \"Clonotype ID\",\n \"pl7.app/segmentedBy\": '[\"pl7.app/vdj/clonotypingRunId\"]',\n \"pl7.app/table/fontFamily\": \"monospace\",\n \"pl7.app/table/orderPriority\": \"110000\",\n \"pl7.app/table/visibility\": \"default\",\n },\n },\n ],\n name: \"pl7.app/clusterId\",\n valueType: \"String\",\n domain: {\n \"pl7.app/clustering/algorithm\": \"foldseek\",\n \"pl7.app/clustering/blockId\": \"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\n },\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/structure/clusteringSource\": \"foldseek\",\n \"pl7.app/trace\":\n '[{\"type\":\"milaboratories.samples-and-data\",\"id\":\"0189e23b-5e8d-4648-8c6d-70caa5c26958\",\"importance\":10,\"label\":\"Samples & Data\"},{\"type\":\"milaboratories.samples-and-data/dataset\",\"id\":\"34U3GEP5PGJF45UG3A2WZ3JO\",\"importance\":100,\"label\":\"MB135 + Podocytes\"},{\"label\":\"MiXCR generic amplicon\",\"type\":\"milaboratories.mixcr-amplicon-alignment\",\"id\":\"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\"importance\":20},{\"type\":\"milaboratories.redefine-clonotypes\",\"importance\":30,\"label\":\"Imputed VDJRegion aa\"},{\"type\":\"milaboratories.antibody-tcr-lead-selection\",\"importance\":30,\"label\":\"Selected Leads\"},{\"type\":\"milaboratories.3d-structure-prediction\",\"id\":\"d204391a-e7dd-434d-9c24-ef77b5da81e0\",\"importance\":20,\"label\":\"Camelid (VHH/nanobody) NBB2, CDRH3 ≤ 2.5 Å\"},{\"type\":\"milaboratories.3d-structure-clustering.clustering\",\"id\":\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\"importance\":30,\"label\":\"Full Structure+AA, TM≥0.95, cov≥0.95\"}]',\n },\n },\n },\n {\n type: \"column\",\n id: '{\"__isDiscovered\":true,\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\\\\\",\\\\\"name\\\\\":\\\\\"pf.clusterLabel4\\\\\"}\",\"path\":[{\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\\\\\",\\\\\"name\\\\\":\\\\\"pf.link3\\\\\"}\",\"type\":\"linker\"}]}',\n spec: {\n kind: \"PColumn\",\n axesSpec: [\n {\n name: \"pl7.app/clusterId\",\n type: \"String\",\n domain: {\n \"pl7.app/clustering/algorithm\": \"mmseqs2\",\n \"pl7.app/clustering/blockId\": \"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\",\n \"pl7.app/redefined-by\": \"aabfc81f-0fc9-4699-84e8-6e749a3e384d\",\n \"pl7.app/vdj/chain\": \"IGHeavy\",\n \"pl7.app/vdj/clonotypeKey/structure\":\n '[[\"pl7.app/vdj/sequence\",[\"pl7.app/alphabet\",\"aminoacid\"],[\"pl7.app/vdj/feature\",\"VDJRegion\"]]]',\n \"pl7.app/vdj/clonotypingRunId\": \"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\n },\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/orderPriority\": \"990000\",\n \"pl7.app/table/visibility\": \"default\",\n },\n },\n ],\n name: \"pl7.app/label\",\n valueType: \"String\",\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/visibility\": \"default\",\n \"pl7.app/trace\":\n '[{\"importance\":10,\"label\":\"Samples & Data\",\"type\":\"milaboratories.samples-and-data\",\"id\":\"0189e23b-5e8d-4648-8c6d-70caa5c26958\"},{\"id\":\"34U3GEP5PGJF45UG3A2WZ3JO\",\"importance\":100,\"label\":\"MB135 + Podocytes\",\"type\":\"milaboratories.samples-and-data/dataset\"},{\"label\":\"MiXCR generic amplicon\",\"type\":\"milaboratories.mixcr-amplicon-alignment\",\"id\":\"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\"importance\":20},{\"type\":\"milaboratories.redefine-clonotypes\",\"importance\":30,\"label\":\"Imputed VDJRegion aa\"},{\"type\":\"milaboratories.clonotype-clustering.clustering\",\"importance\":30,\"label\":\"Imputed VDJRegion aa, BLOSUM62, ident:0.95, cov:0.95\"}]',\n },\n },\n },\n {\n type: \"column\",\n id: '{\"__isDiscovered\":true,\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\\\\\",\\\\\"name\\\\\":\\\\\"clusters.summary.clusterLabel\\\\\"}\",\"path\":[{\"column\":\"{\\\\\"__isRef\\\\\":true,\\\\\"blockId\\\\\":\\\\\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\\\\\",\\\\\"name\\\\\":\\\\\"clusters.link.isCentroid\\\\\"}\",\"type\":\"linker\"}]}',\n spec: {\n kind: \"PColumn\",\n axesSpec: [\n {\n name: \"pl7.app/clusterId\",\n type: \"String\",\n domain: {\n \"pl7.app/clustering/algorithm\": \"foldseek\",\n \"pl7.app/clustering/blockId\": \"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\n },\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/orderPriority\": \"990000\",\n \"pl7.app/table/visibility\": \"default\",\n },\n },\n ],\n name: \"pl7.app/label\",\n valueType: \"String\",\n annotations: {\n \"pl7.app/label\": \"Cluster Id\",\n \"pl7.app/table/orderPriority\": \"990000\",\n \"pl7.app/table/visibility\": \"default\",\n \"pl7.app/trace\":\n '[{\"type\":\"milaboratories.samples-and-data\",\"id\":\"0189e23b-5e8d-4648-8c6d-70caa5c26958\",\"importance\":10,\"label\":\"Samples & Data\"},{\"type\":\"milaboratories.samples-and-data/dataset\",\"id\":\"34U3GEP5PGJF45UG3A2WZ3JO\",\"importance\":100,\"label\":\"MB135 + Podocytes\"},{\"label\":\"MiXCR generic amplicon\",\"type\":\"milaboratories.mixcr-amplicon-alignment\",\"id\":\"6cfab875-649e-4c52-bb69-fe976c2b57a0\",\"importance\":20},{\"type\":\"milaboratories.redefine-clonotypes\",\"importance\":30,\"label\":\"Imputed VDJRegion aa\"},{\"type\":\"milaboratories.antibody-tcr-lead-selection\",\"importance\":30,\"label\":\"Selected Leads\"},{\"type\":\"milaboratories.3d-structure-prediction\",\"id\":\"d204391a-e7dd-434d-9c24-ef77b5da81e0\",\"importance\":20,\"label\":\"Camelid (VHH/nanobody) NBB2, CDRH3 ≤ 2.5 Å\"},{\"type\":\"milaboratories.3d-structure-clustering.clustering\",\"id\":\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\",\"importance\":30,\"label\":\"Full Structure+AA, TM≥0.95, cov≥0.95\"}]',\n },\n },\n },\n];\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createPlDataTableV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts"],"sourcesContent":["import type {\n ColumnUniversalId,\n FilterSpecNode,\n PObjectId,\n PTableColumnId,\n PTableColumnIdColumn,\n PTableSorting,\n MultiColumnSelector,\n ColumnSelector,\n} from \"@milaboratories/pl-model-common\";\nimport {\n canonicalizeAxisId,\n dedupColumns,\n extractPObjectId,\n uniqueBy,\n} from \"@milaboratories/pl-model-common\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport { createColumnResolver, type ColumnResolver } from \"../columnResolver\";\nimport type { RenderCtxBase } from \"../../../render\";\nimport type {\n PlDataTableColumnsMeta,\n PlDataTableFilters,\n PlDataTableFilterSpecLeaf,\n PlDataTableModel,\n} from \"../typesV8\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport type { MatchingMode } from \"@milaboratories/pl-model-common\";\nimport {\n isLeafColumn,\n hitQualifications,\n collectLinkerColumns,\n queriesQualifications,\n type ColumnRecipe,\n} from \"../../../columns\";\nimport type { DeriveLabelsOptions } from \"../../../labels/derive_distinct_labels\";\nimport {\n deriveAllLabels,\n evaluateRules,\n getEffectiveVisibility,\n getOrderPriority,\n isColumnHidden,\n buildDataStatusMap,\n toRuleColumn,\n} from \"./utils\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport {\n discoverLabelColumns,\n discoverTableColumns,\n type DiscoverTableColumnOptions,\n} from \"./discoverColumns\";\nimport { isNil, isPlainObject, type Nil } from \"@milaboratories/helpers\";\nimport { uniq } from \"es-toolkit\";\n\nexport type createPlDataTableOptionsV3 = (\n | {\n columns: Nil | DiscoverTableColumnOptions;\n }\n | {\n primaryColumns: ColumnRecipe[];\n columns: Nil | ColumnRecipe[];\n }\n) & {\n tableState?: PlDataTableStateV2;\n\n filters?: PlDataTableFilters;\n sorting?: PTableSorting[];\n primaryJoinType?: \"inner\" | \"full\";\n\n labelsOptions?: DeriveLabelsOptions;\n displayOptions?: ColumnsDisplayOptions;\n};\n\n/** Structured source config — selectors/anchors instead of raw ColumnsSource. */\nexport type ColumnsSelectorConfig = {\n include?: MultiColumnSelector | MultiColumnSelector[];\n exclude?: MultiColumnSelector | MultiColumnSelector[];\n mode?: MatchingMode;\n maxHops?: number;\n};\n\nexport type ColumnsDisplayOptions = {\n /** Column ordering rules. Higher priority = further left. First matching rule wins. */\n ordering?: ColumnOrderRule[];\n /** Column visibility rules. First matching rule wins. Unmatched columns use default visibility. */\n visibility?: ColumnVisibilityRule[];\n};\n\nexport type ColumnOrderRule = {\n match: ColumnSelector;\n /** Higher number = further left in table */\n priority: number;\n};\n\nexport type ColumnVisibilityRule = {\n match: ColumnSelector;\n visibility: \"default\" | \"optional\" | \"hidden\";\n};\n\nexport function createPlDataTableV3<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): PlDataTableModel | undefined {\n const state = upgradePlDataTableStateV2(options.tableState);\n const primaryJoinType = options.primaryJoinType ?? \"full\";\n\n const resolved = resolveInputColumns(ctx, options);\n if (resolved === undefined) return undefined;\n const { primary, secondary } = resolved;\n if (primary.length === 0) return undefined;\n\n const { direct, linked } = splitByTopology(secondary);\n\n const allColumns = [...primary, ...secondary];\n const derivedLabels = deriveAllLabels({\n // Skip hidden columns when deriving labels — they don't appear in the\n // table, so they shouldn't influence label disambiguation (#1623).\n columns: allColumns.filter((c) => !isColumnHidden(c.getSpec())).map(toLabelableColumn),\n deriveLabelsOptions: {\n includeNativeLabel: true,\n ...options.labelsOptions,\n },\n });\n\n // Rule-based visibility/order maps (keyed by bare PObjectId). Computed once\n // here: `computeHiddenColumns` needs visibility to decide the visible set,\n // and `buildColumnsMeta` (below, once the visible set is known) reuses both.\n const allColumnsForRules = [...primary, ...direct, ...linked, ...collectLinkerSnapshots(linked)];\n const visibilityByColId = evaluateRules(\n options.displayOptions?.visibility ?? [],\n allColumnsForRules,\n );\n const orderByColId = evaluateRules(options.displayOptions?.ordering ?? [], allColumnsForRules);\n\n const resolver = createColumnResolver(\n [...primary, ...direct, ...linked.flatMap((lc) => [...collectLinkerColumns(lc), lc])],\n { warn: ctx.logWarn.bind(ctx) },\n );\n\n const remapedDefaultFilters = remapFilterColumnIds(options.filters, resolver);\n const filters = filterFilters(\n concatFilters(\n state.pTableParams.filters,\n state.pTableParams.defaultFilters ?? remapedDefaultFilters,\n ),\n resolver,\n );\n\n const sorting = filterSorting(\n resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, resolver)),\n resolver,\n );\n\n const fullDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...direct, ...linked],\n filters,\n sorting,\n });\n\n const fullHandle = ctx.createPTableV2(fullDef);\n // TODO: is workaround for dropdown suggestions.\n // Pframe have not equivalent data for columns relativly to Ptable.\n // PFrame is the physical column registry — one entry per bare PObjectId,\n // so strip the rich recipe ids down to their physical leaf id and dedupe:\n // multiple discovered variants of the same hit collapse to the same bare id.\n const pframeHandle = ctx.createPFrame(\n uniq([\n ...primary.map((v) => extractPObjectId(v.id)),\n ...direct.map((v) => extractPObjectId(v.id)),\n ...linked.map((v) => extractPObjectId(v.id)),\n ]),\n );\n\n const hiddenSpecs = state.pTableParams.hiddenColIds;\n const hiddenColumnIds = computeHiddenColumns({\n columns: [...primary, ...direct, ...linked],\n visibilityByColId,\n sorting,\n filters,\n hiddenSpecs,\n });\n\n const visible = {\n primary,\n direct: direct.filter((c) => !hiddenColumnIds.has(c.id)),\n linked: linked.filter((c) => !hiddenColumnIds.has(c.id)),\n };\n const visibleDef = createPTableDefV3({\n primaryJoinType,\n primary,\n secondary: [...visible.direct, ...visible.linked],\n filters,\n sorting,\n });\n const visibleHandle = ctx.createPTableV2(visibleDef);\n\n // Built here, where the visible set is known: per-column data status is\n // computed for visible columns only (the probe is meaningful only for what\n // the user sees), while label/visibility/order/axes cover all columns.\n const columnsMeta = buildColumnsMeta({\n fullColumns: [...primary, ...direct, ...linked],\n visibleColumns: [...visible.primary, ...visible.direct, ...visible.linked],\n primaryColumns: primary,\n derivedLabels,\n visibilityByColId,\n orderByColId,\n });\n\n return {\n sourceId: state.pTableParams.sourceId,\n fullTableHandle: fullHandle,\n fullPframeHandle: pframeHandle,\n visibleTableHandle: visibleHandle,\n defaultFilters: remapedDefaultFilters,\n columnsMeta,\n } satisfies PlDataTableModel;\n}\n\ntype ResolvedColumns = {\n readonly primary: ColumnRecipe[];\n readonly secondary: ColumnRecipe[];\n};\n\n/** Normalize either option branch into a {primary, secondary} pair of recipes. */\nfunction resolveInputColumns<A, U>(\n ctx: RenderCtxBase<A, U>,\n options: createPlDataTableOptionsV3,\n): undefined | ResolvedColumns {\n if (\"primaryColumns\" in options) {\n const primary = options.primaryColumns;\n const secondary = options.columns ?? [];\n const labels = discoverLabelColumns(ctx, primary);\n // Exclude from secondary anything already present in primary: a label\n // column the block hands in as primary can be re-discovered here as a\n // label for that same axis, landing in the table twice with the same id.\n const primaryIds = new Set(primary.map((c) => c.id));\n return {\n primary,\n secondary: dedupColumns(\n [...secondary, ...labels].filter((c) => !primaryIds.has(c.id)),\n (c) => c.id,\n (c) => c.getSpec(),\n ),\n };\n }\n\n if (isPlainObject(options.columns)) {\n return discoverTableColumns(ctx, options.columns);\n }\n\n return undefined;\n}\n\n/** Split secondary recipes by query topology: leaves (no linker chain) vs joined. */\nfunction splitByTopology(columns: ColumnRecipe[]): {\n direct: ColumnRecipe[];\n linked: ColumnRecipe[];\n} {\n const direct: ColumnRecipe[] = [];\n const linked: ColumnRecipe[] = [];\n for (const c of columns) {\n if (isLeafColumn(c)) direct.push(c);\n else linked.push(c);\n }\n return { direct, linked };\n}\n\n/** All linker recipes across the given linked columns, deduped by id. */\nfunction collectLinkerSnapshots(linked: ColumnRecipe[]): ColumnRecipe[] {\n return uniqueBy(\n linked.flatMap((c) => collectLinkerColumns(c)),\n (c) => c.id,\n );\n}\n\nfunction toLabelableColumn(col: ColumnRecipe) {\n return {\n id: col.id,\n spec: col.getSpec(),\n linkerPath: collectLinkerColumns(col).map((linker) => ({\n linker: { spec: linker.getSpec() },\n })),\n qualifications: {\n forHit: [...hitQualifications(col)],\n forQueries: queriesQualifications(col),\n },\n };\n}\n\n/**\n * Compute display metadata as a sidecar keyed by each emitted column's\n * `ColumnUniversalId` (and axis `AxisId`), instead of baking it into the specs\n * via `withSpecs`. Spec overrides change a recipe's id, so the same physical\n * column reached two ways would diverge into two ids and render twice; keeping\n * meta out of the spec preserves identity and lets dedup collapse such cases.\n * The UI overlays this onto the engine-emitted specs at render time.\n */\nfunction buildColumnsMeta(params: {\n /** Every column in the table (primary + secondary) — drives `columns` and `axes`. */\n fullColumns: ColumnRecipe[];\n /** The visible subset — `status` is probed for these only. */\n visibleColumns: ColumnRecipe[];\n /** The primary join columns — their axes are the visible index; all other axes are hidden. */\n primaryColumns: ColumnRecipe[];\n derivedLabels: Record<string, string>;\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n orderByColId: Map<PObjectId, ColumnOrderRule>;\n}): PlDataTableColumnsMeta {\n const { fullColumns, visibleColumns, primaryColumns, derivedLabels } = params;\n const { visibilityByColId, orderByColId } = params;\n // Status only for visible columns — the probe is meaningful only for what the\n // user actually sees; non-visible columns get no `status`.\n const visibleStatus = buildDataStatusMap(visibleColumns);\n\n const columns = fullColumns.reduce<PlDataTableColumnsMeta[\"columns\"]>((acc, c) => {\n const rc = toRuleColumn(c);\n acc[c.id] = {\n label: derivedLabels[c.id],\n visibility: getEffectiveVisibility(rc, visibilityByColId),\n order: getOrderPriority(rc, orderByColId),\n status: visibleStatus[c.id],\n };\n return acc;\n }, {});\n\n // Only primary columns declare the table's visible axes. Any axis introduced\n // solely by a secondary column (a linker-bridge axis, or a distinct-domain\n // copy) is flagged hidden — otherwise it renders as a second index axis.\n const primaryAxisKeys = new Set(\n primaryColumns.flatMap((c) => c.getSpec().axesSpec.map((a) => canonicalizeAxisId(a))),\n );\n const axes = fullColumns.reduce<PlDataTableColumnsMeta[\"axes\"]>(\n (acc, c) =>\n c.getSpec().axesSpec.reduce((inner, ax) => {\n const key = canonicalizeAxisId(ax);\n if (inner[key] === undefined) inner[key] = { hidden: !primaryAxisKeys.has(key) };\n return inner;\n }, acc),\n {},\n );\n\n return { columns, axes };\n}\n\n/** Drop filter leaves whose column references cannot be resolved; rewrite the\n * resolvable ones through the resolver. Prune empty and/or/not groups. */\nfunction filterFilters(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const rewriteLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) return undefined;\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) return undefined;\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return rewriteLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n\n/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.\n * Exported for unit testing. */\nexport function concatFilters(\n a: Nil | PlDataTableFilters,\n b: Nil | PlDataTableFilters,\n): Nil | PlDataTableFilters {\n if (isNil(a)) return b;\n if (isNil(b)) return a;\n const operands = (f: PlDataTableFilters): PlDataTableFilterNode[] =>\n f.type === \"and\" ? f.filters : [f as PlDataTableFilterNode];\n return { type: \"and\", filters: [...operands(a), ...operands(b)] };\n}\n\n/** Pick user sorting from state if set, otherwise fall back to options default.\n * null = user has not touched sorting → use default;\n * [] = user has explicitly cleared sorting → no sorting (default ignored). */\nfunction resolveSorting(\n userSorting: Nil | PTableSorting[],\n defaultSorting: Nil | PTableSorting[],\n): PTableSorting[] {\n return (isNil(userSorting) ? defaultSorting : userSorting) ?? [];\n}\n\n/** Rewrite sorting entries through the resolver; drop those that fail to resolve. */\nfunction filterSorting(sorting: PTableSorting[], resolver: ColumnResolver): PTableSorting[] {\n return sorting.flatMap((s) => {\n const col = resolver(s.column);\n return isNil(col) ? [] : [{ ...s, column: col }];\n });\n}\n\n/** Determine which columns should be hidden based on state or optional-column defaults.\n * Keyed by the recipe's logical {@link ColumnUniversalId} (rich) — variants of\n * the same physical column are independently visible/hidden. */\nfunction computeHiddenColumns(params: {\n columns: ColumnRecipe[];\n visibilityByColId: Map<PObjectId, ColumnVisibilityRule>;\n sorting: Nil | PTableSorting[];\n filters: Nil | PlDataTableFilters;\n hiddenSpecs: Nil | PTableColumnId[];\n}): Set<ColumnUniversalId> {\n const { columns, visibilityByColId, sorting, filters, hiddenSpecs } = params;\n const visibilityOf = (c: ColumnRecipe) =>\n getEffectiveVisibility(toRuleColumn(c), visibilityByColId);\n const alwaysHidden = columns.filter((c) => visibilityOf(c) === \"hidden\").map((c) => c.id);\n const optionalHidden = !isNil(hiddenSpecs)\n ? hiddenSpecs.filter((s): s is PTableColumnIdColumn => s.type === \"column\").map((s) => s.id)\n : columns.filter((c) => visibilityOf(c) === \"optional\").map((c) => c.id);\n const initial = [...alwaysHidden, ...optionalHidden];\n const preserved = collectPreservedColumnIds(sorting, filters);\n\n return new Set(initial.filter((id) => !preserved.has(id)));\n}\n\n/** Collect IDs of columns that must remain visible (sorted, filtered). */\nfunction collectPreservedColumnIds(\n sorting: Nil | PTableSorting[],\n filters: Nil | PlDataTableFilters,\n): Set<ColumnUniversalId> {\n const sortedIds = (sorting ?? [])\n .map((s) => s.column)\n .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n .map((c) => c.id);\n\n const filterIds = !isNil(filters)\n ? collectFilterSpecColumns(filters).flatMap((c) => (c.type === \"column\" ? [c.id] : []))\n : [];\n\n return new Set<ColumnUniversalId>([...sortedIds, ...filterIds]);\n}\n\n/** Remap column references in sorting entries through the resolver.\n * Unresolved entries are dropped with a warning (best-effort contract). */\nfunction remapSortingColumnIds(\n sorting: Nil | PTableSorting[],\n resolver: ColumnResolver,\n): Nil | PTableSorting[] {\n return sorting?.flatMap((s) => {\n const col = resolver(s.column);\n if (isNil(col)) {\n console.warn(\n `Sorting column ${JSON.stringify(s.column)} does not match any discovered column — dropped.`,\n );\n return [];\n }\n return [{ ...s, column: col }];\n });\n}\n\ntype PlDataTableFilterNode = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n\n/** Remap column references in a filter tree through the resolver.\n * Unresolved leaves are dropped with a warning; empty groups are pruned. */\nfunction remapFilterColumnIds(\n filters: Nil | PlDataTableFilters,\n resolver: ColumnResolver,\n): Nil | PlDataTableFilters {\n if (isNil(filters)) return filters;\n\n const mapLeaf = (leaf: PlDataTableFilterSpecLeaf): Nil | PlDataTableFilterSpecLeaf => {\n if (leaf.type === undefined) return leaf;\n const result = { ...leaf };\n if (\"column\" in result) {\n const c = resolver(result.column);\n if (isNil(c)) {\n console.warn(\n `Filter column ${JSON.stringify(result.column)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.column = c;\n }\n if (\"rhs\" in result) {\n const c = resolver(result.rhs);\n if (isNil(c)) {\n console.warn(\n `Filter rhs ${JSON.stringify(result.rhs)} does not match any discovered column — dropped.`,\n );\n return undefined;\n }\n result.rhs = c;\n }\n return result;\n };\n\n const prune = (node: PlDataTableFilterNode): Nil | PlDataTableFilterNode => {\n if (node.type === \"and\" || node.type === \"or\") {\n const kept = node.filters\n .map((f) => prune(f))\n .filter((f): f is PlDataTableFilterNode => !isNil(f));\n if (kept.length === 0) return undefined;\n return { type: node.type, filters: kept };\n }\n if (node.type === \"not\") {\n const inner = prune(node.filter);\n return isNil(inner) ? undefined : { type: \"not\", filter: inner };\n }\n return mapLeaf(node);\n };\n\n return prune(filters) as Nil | PlDataTableFilters;\n}\n"],"mappings":"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"}
|
package/dist/package.cjs
CHANGED
package/dist/package.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@platforma-sdk/model",
|
|
3
|
-
"version": "1.80.
|
|
3
|
+
"version": "1.80.13",
|
|
4
4
|
"description": "Platforma.bio SDK / Block Model",
|
|
5
5
|
"files": [
|
|
6
6
|
"./dist/**/*",
|
|
@@ -32,10 +32,10 @@
|
|
|
32
32
|
"utility-types": "^3.11.0",
|
|
33
33
|
"zod": "~3.25.76",
|
|
34
34
|
"@milaboratories/helpers": "1.14.5",
|
|
35
|
-
"@milaboratories/pl-model-common": "1.47.2",
|
|
36
|
-
"@milaboratories/ptabler-expression-js": "1.2.36",
|
|
37
35
|
"@milaboratories/pl-error-like": "1.12.10",
|
|
38
|
-
"@milaboratories/pl-model-middle-layer": "1.30.
|
|
36
|
+
"@milaboratories/pl-model-middle-layer": "1.30.15",
|
|
37
|
+
"@milaboratories/ptabler-expression-js": "1.2.37",
|
|
38
|
+
"@milaboratories/pl-model-common": "1.47.3"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@vitest/coverage-istanbul": "^4.1.3",
|
|
@@ -43,9 +43,9 @@
|
|
|
43
43
|
"typescript": "~5.9.3",
|
|
44
44
|
"vitest": "^4.1.3",
|
|
45
45
|
"@milaboratories/build-configs": "2.0.0",
|
|
46
|
-
"@milaboratories/columns-collection-driver": "0.2.
|
|
47
|
-
"@milaboratories/pf-driver": "1.8.
|
|
48
|
-
"@milaboratories/pf-spec-driver": "1.4.
|
|
46
|
+
"@milaboratories/columns-collection-driver": "0.2.3",
|
|
47
|
+
"@milaboratories/pf-driver": "1.8.5",
|
|
48
|
+
"@milaboratories/pf-spec-driver": "1.4.24",
|
|
49
49
|
"@milaboratories/ts-configs": "1.3.1",
|
|
50
50
|
"@milaboratories/ts-builder": "1.6.1"
|
|
51
51
|
},
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { describe, expect, test } from "vitest";
|
|
2
|
+
import { concatFilters } from "./createPlDataTableV3";
|
|
3
|
+
import type { PlDataTableFilters, PlDataTableFilterSpecLeaf } from "../typesV8";
|
|
4
|
+
|
|
5
|
+
// concatFilters only inspects each operand's `.type` (and spreads `.filters` of
|
|
6
|
+
// an "and" node), so the leaf payload is irrelevant — minimal shapes suffice.
|
|
7
|
+
type Node = PlDataTableFilters | PlDataTableFilterSpecLeaf;
|
|
8
|
+
|
|
9
|
+
const leaf = (id: string): PlDataTableFilterSpecLeaf =>
|
|
10
|
+
({ type: "isNA", column: { type: "column", id } }) as unknown as PlDataTableFilterSpecLeaf;
|
|
11
|
+
const and = (...filters: Node[]): PlDataTableFilters =>
|
|
12
|
+
({ type: "and", filters }) as unknown as PlDataTableFilters;
|
|
13
|
+
const or = (...filters: Node[]): PlDataTableFilters =>
|
|
14
|
+
({ type: "or", filters }) as unknown as PlDataTableFilters;
|
|
15
|
+
const not = (filter: Node): PlDataTableFilters =>
|
|
16
|
+
({ type: "not", filter }) as unknown as PlDataTableFilters;
|
|
17
|
+
|
|
18
|
+
describe("concatFilters", () => {
|
|
19
|
+
test("a nil operand returns the other side unchanged", () => {
|
|
20
|
+
const a = and(leaf("x"));
|
|
21
|
+
expect(concatFilters(null, a)).toBe(a);
|
|
22
|
+
expect(concatFilters(a, null)).toBe(a);
|
|
23
|
+
expect(concatFilters(null, null)).toBeNull();
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
test("two AND groups merge their children", () => {
|
|
27
|
+
expect(concatFilters(and(leaf("u1"), leaf("u2")), and(leaf("d1")))).toEqual(
|
|
28
|
+
and(leaf("u1"), leaf("u2"), leaf("d1")),
|
|
29
|
+
);
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
test("a bare leaf is combined as a single AND operand (no crash)", () => {
|
|
33
|
+
// Regression: a lone sheet-selection leaf used to throw on `[...a.filters]`.
|
|
34
|
+
expect(concatFilters(leaf("sheet"), and(leaf("d1"), leaf("d2")))).toEqual(
|
|
35
|
+
and(leaf("sheet"), leaf("d1"), leaf("d2")),
|
|
36
|
+
);
|
|
37
|
+
// ...and on either side.
|
|
38
|
+
expect(concatFilters(and(leaf("u1")), leaf("d"))).toEqual(and(leaf("u1"), leaf("d")));
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
test("an OR group is preserved as one operand, not flattened into AND", () => {
|
|
42
|
+
// Regression: old code kept type "or" (or spread the OR's children into the
|
|
43
|
+
// AND), turning "d1 OR d2" into "d1 AND d2".
|
|
44
|
+
expect(concatFilters(or(leaf("u1"), leaf("u2")), and(leaf("d1")))).toEqual(
|
|
45
|
+
and(or(leaf("u1"), leaf("u2")), leaf("d1")),
|
|
46
|
+
);
|
|
47
|
+
expect(concatFilters(and(leaf("u1")), or(leaf("d1"), leaf("d2")))).toEqual(
|
|
48
|
+
and(leaf("u1"), or(leaf("d1"), leaf("d2"))),
|
|
49
|
+
);
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
test("an empty AND group contributes nothing", () => {
|
|
53
|
+
expect(concatFilters(and(), and(leaf("d1")))).toEqual(and(leaf("d1")));
|
|
54
|
+
expect(concatFilters(and(leaf("u1")), and())).toEqual(and(leaf("u1")));
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
test("a NOT node is combined as a single operand (no crash)", () => {
|
|
58
|
+
const n = not(leaf("x"));
|
|
59
|
+
expect(concatFilters(n, and(leaf("d1")))).toEqual(and(n, leaf("d1")));
|
|
60
|
+
});
|
|
61
|
+
});
|
|
@@ -386,14 +386,17 @@ function filterFilters(
|
|
|
386
386
|
return prune(filters) as Nil | PlDataTableFilters;
|
|
387
387
|
}
|
|
388
388
|
|
|
389
|
-
/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.
|
|
390
|
-
|
|
389
|
+
/** Merge two filter trees into one AND-combined tree. Returns the non-nil one if the other is nil.
|
|
390
|
+
* Exported for unit testing. */
|
|
391
|
+
export function concatFilters(
|
|
391
392
|
a: Nil | PlDataTableFilters,
|
|
392
393
|
b: Nil | PlDataTableFilters,
|
|
393
394
|
): Nil | PlDataTableFilters {
|
|
394
395
|
if (isNil(a)) return b;
|
|
395
396
|
if (isNil(b)) return a;
|
|
396
|
-
|
|
397
|
+
const operands = (f: PlDataTableFilters): PlDataTableFilterNode[] =>
|
|
398
|
+
f.type === "and" ? f.filters : [f as PlDataTableFilterNode];
|
|
399
|
+
return { type: "and", filters: [...operands(a), ...operands(b)] };
|
|
397
400
|
}
|
|
398
401
|
|
|
399
402
|
/** Pick user sorting from state if set, otherwise fall back to options default.
|
|
@@ -525,111 +528,3 @@ function remapFilterColumnIds(
|
|
|
525
528
|
|
|
526
529
|
return prune(filters) as Nil | PlDataTableFilters;
|
|
527
530
|
}
|
|
528
|
-
|
|
529
|
-
const _ = [
|
|
530
|
-
{
|
|
531
|
-
type: "column",
|
|
532
|
-
id: '{"__isRef":true,"blockId":"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07","name":"clusters.assign.clusterLabel"}',
|
|
533
|
-
spec: {
|
|
534
|
-
kind: "PColumn",
|
|
535
|
-
axesSpec: [
|
|
536
|
-
{
|
|
537
|
-
name: "pl7.app/vdj/clonotypeKey",
|
|
538
|
-
type: "String",
|
|
539
|
-
domain: {
|
|
540
|
-
"pl7.app/redefined-by": "aabfc81f-0fc9-4699-84e8-6e749a3e384d",
|
|
541
|
-
"pl7.app/vdj/chain": "IGHeavy",
|
|
542
|
-
"pl7.app/vdj/clonotypeKey/structure":
|
|
543
|
-
'[["pl7.app/vdj/sequence",["pl7.app/alphabet","aminoacid"],["pl7.app/vdj/feature","VDJRegion"]]]',
|
|
544
|
-
"pl7.app/vdj/clonotypingRunId": "6cfab875-649e-4c52-bb69-fe976c2b57a0",
|
|
545
|
-
},
|
|
546
|
-
annotations: {
|
|
547
|
-
"pl7.app/label": "Clonotype ID",
|
|
548
|
-
"pl7.app/segmentedBy": '["pl7.app/vdj/clonotypingRunId"]',
|
|
549
|
-
"pl7.app/table/fontFamily": "monospace",
|
|
550
|
-
"pl7.app/table/orderPriority": "110000",
|
|
551
|
-
"pl7.app/table/visibility": "default",
|
|
552
|
-
},
|
|
553
|
-
},
|
|
554
|
-
],
|
|
555
|
-
name: "pl7.app/clusterId",
|
|
556
|
-
valueType: "String",
|
|
557
|
-
domain: {
|
|
558
|
-
"pl7.app/clustering/algorithm": "foldseek",
|
|
559
|
-
"pl7.app/clustering/blockId": "6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07",
|
|
560
|
-
},
|
|
561
|
-
annotations: {
|
|
562
|
-
"pl7.app/label": "Cluster Id",
|
|
563
|
-
"pl7.app/structure/clusteringSource": "foldseek",
|
|
564
|
-
"pl7.app/trace":
|
|
565
|
-
'[{"type":"milaboratories.samples-and-data","id":"0189e23b-5e8d-4648-8c6d-70caa5c26958","importance":10,"label":"Samples & Data"},{"type":"milaboratories.samples-and-data/dataset","id":"34U3GEP5PGJF45UG3A2WZ3JO","importance":100,"label":"MB135 + Podocytes"},{"label":"MiXCR generic amplicon","type":"milaboratories.mixcr-amplicon-alignment","id":"6cfab875-649e-4c52-bb69-fe976c2b57a0","importance":20},{"type":"milaboratories.redefine-clonotypes","importance":30,"label":"Imputed VDJRegion aa"},{"type":"milaboratories.antibody-tcr-lead-selection","importance":30,"label":"Selected Leads"},{"type":"milaboratories.3d-structure-prediction","id":"d204391a-e7dd-434d-9c24-ef77b5da81e0","importance":20,"label":"Camelid (VHH/nanobody) NBB2, CDRH3 ≤ 2.5 Å"},{"type":"milaboratories.3d-structure-clustering.clustering","id":"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07","importance":30,"label":"Full Structure+AA, TM≥0.95, cov≥0.95"}]',
|
|
566
|
-
},
|
|
567
|
-
},
|
|
568
|
-
},
|
|
569
|
-
{
|
|
570
|
-
type: "column",
|
|
571
|
-
id: '{"__isDiscovered":true,"column":"{\\"__isRef\\":true,\\"blockId\\":\\"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\\",\\"name\\":\\"pf.clusterLabel4\\"}","path":[{"column":"{\\"__isRef\\":true,\\"blockId\\":\\"440a489a-8ae8-4982-9d1e-6297e7b8b8d0\\",\\"name\\":\\"pf.link3\\"}","type":"linker"}]}',
|
|
572
|
-
spec: {
|
|
573
|
-
kind: "PColumn",
|
|
574
|
-
axesSpec: [
|
|
575
|
-
{
|
|
576
|
-
name: "pl7.app/clusterId",
|
|
577
|
-
type: "String",
|
|
578
|
-
domain: {
|
|
579
|
-
"pl7.app/clustering/algorithm": "mmseqs2",
|
|
580
|
-
"pl7.app/clustering/blockId": "440a489a-8ae8-4982-9d1e-6297e7b8b8d0",
|
|
581
|
-
"pl7.app/redefined-by": "aabfc81f-0fc9-4699-84e8-6e749a3e384d",
|
|
582
|
-
"pl7.app/vdj/chain": "IGHeavy",
|
|
583
|
-
"pl7.app/vdj/clonotypeKey/structure":
|
|
584
|
-
'[["pl7.app/vdj/sequence",["pl7.app/alphabet","aminoacid"],["pl7.app/vdj/feature","VDJRegion"]]]',
|
|
585
|
-
"pl7.app/vdj/clonotypingRunId": "6cfab875-649e-4c52-bb69-fe976c2b57a0",
|
|
586
|
-
},
|
|
587
|
-
annotations: {
|
|
588
|
-
"pl7.app/label": "Cluster Id",
|
|
589
|
-
"pl7.app/table/orderPriority": "990000",
|
|
590
|
-
"pl7.app/table/visibility": "default",
|
|
591
|
-
},
|
|
592
|
-
},
|
|
593
|
-
],
|
|
594
|
-
name: "pl7.app/label",
|
|
595
|
-
valueType: "String",
|
|
596
|
-
annotations: {
|
|
597
|
-
"pl7.app/label": "Cluster Id",
|
|
598
|
-
"pl7.app/table/visibility": "default",
|
|
599
|
-
"pl7.app/trace":
|
|
600
|
-
'[{"importance":10,"label":"Samples & Data","type":"milaboratories.samples-and-data","id":"0189e23b-5e8d-4648-8c6d-70caa5c26958"},{"id":"34U3GEP5PGJF45UG3A2WZ3JO","importance":100,"label":"MB135 + Podocytes","type":"milaboratories.samples-and-data/dataset"},{"label":"MiXCR generic amplicon","type":"milaboratories.mixcr-amplicon-alignment","id":"6cfab875-649e-4c52-bb69-fe976c2b57a0","importance":20},{"type":"milaboratories.redefine-clonotypes","importance":30,"label":"Imputed VDJRegion aa"},{"type":"milaboratories.clonotype-clustering.clustering","importance":30,"label":"Imputed VDJRegion aa, BLOSUM62, ident:0.95, cov:0.95"}]',
|
|
601
|
-
},
|
|
602
|
-
},
|
|
603
|
-
},
|
|
604
|
-
{
|
|
605
|
-
type: "column",
|
|
606
|
-
id: '{"__isDiscovered":true,"column":"{\\"__isRef\\":true,\\"blockId\\":\\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\\",\\"name\\":\\"clusters.summary.clusterLabel\\"}","path":[{"column":"{\\"__isRef\\":true,\\"blockId\\":\\"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07\\",\\"name\\":\\"clusters.link.isCentroid\\"}","type":"linker"}]}',
|
|
607
|
-
spec: {
|
|
608
|
-
kind: "PColumn",
|
|
609
|
-
axesSpec: [
|
|
610
|
-
{
|
|
611
|
-
name: "pl7.app/clusterId",
|
|
612
|
-
type: "String",
|
|
613
|
-
domain: {
|
|
614
|
-
"pl7.app/clustering/algorithm": "foldseek",
|
|
615
|
-
"pl7.app/clustering/blockId": "6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07",
|
|
616
|
-
},
|
|
617
|
-
annotations: {
|
|
618
|
-
"pl7.app/label": "Cluster Id",
|
|
619
|
-
"pl7.app/table/orderPriority": "990000",
|
|
620
|
-
"pl7.app/table/visibility": "default",
|
|
621
|
-
},
|
|
622
|
-
},
|
|
623
|
-
],
|
|
624
|
-
name: "pl7.app/label",
|
|
625
|
-
valueType: "String",
|
|
626
|
-
annotations: {
|
|
627
|
-
"pl7.app/label": "Cluster Id",
|
|
628
|
-
"pl7.app/table/orderPriority": "990000",
|
|
629
|
-
"pl7.app/table/visibility": "default",
|
|
630
|
-
"pl7.app/trace":
|
|
631
|
-
'[{"type":"milaboratories.samples-and-data","id":"0189e23b-5e8d-4648-8c6d-70caa5c26958","importance":10,"label":"Samples & Data"},{"type":"milaboratories.samples-and-data/dataset","id":"34U3GEP5PGJF45UG3A2WZ3JO","importance":100,"label":"MB135 + Podocytes"},{"label":"MiXCR generic amplicon","type":"milaboratories.mixcr-amplicon-alignment","id":"6cfab875-649e-4c52-bb69-fe976c2b57a0","importance":20},{"type":"milaboratories.redefine-clonotypes","importance":30,"label":"Imputed VDJRegion aa"},{"type":"milaboratories.antibody-tcr-lead-selection","importance":30,"label":"Selected Leads"},{"type":"milaboratories.3d-structure-prediction","id":"d204391a-e7dd-434d-9c24-ef77b5da81e0","importance":20,"label":"Camelid (VHH/nanobody) NBB2, CDRH3 ≤ 2.5 Å"},{"type":"milaboratories.3d-structure-clustering.clustering","id":"6b2ae9f7-526d-4fd9-8a28-c0e3756c0b07","importance":30,"label":"Full Structure+AA, TM≥0.95, cov≥0.95"}]',
|
|
632
|
-
},
|
|
633
|
-
},
|
|
634
|
-
},
|
|
635
|
-
];
|