@platforma-sdk/model 1.76.4 → 1.77.0

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

@@ -1 +1 @@
-{"version":3,"file":"state-migration.js","names":[],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson, parseJsonSafely } from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./typesV6\";\nimport type {\n  PlDataTableGridStateV5,\n  PlDataTableV5ColIdJson,\n  PlDataTableV5ColIdWrapper,\n} from \"./typesV5\";\nimport { isNil } from \"es-toolkit\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // v5 stored colIds as `{source, labeled}` wrappers; only the gridState shape differs.\n  | {\n      version: 5;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateV5;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: null | PlDataTableFiltersWithMeta;\n        defaultFiltersState: null | PlDataTableFiltersWithMeta;\n        searchString?: string;\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v6: migrate per-column filters to tree-based format (skips v5).\n  // v4 gridState already used bare PTableColumnSpec colIds, so we jump\n  // straight to v6 without going through the v5 wrapper format.\n  if (state.version === 4) {\n    state = migrateV4toV6(state);\n  }\n  // v5 -> v6: unwrap `{source, labeled}` colIds in gridState back to bare PTableColumnSpec.\n  if (state.version === 5) {\n    state = migrateV5toV6(state);\n  }\n  return state;\n}\n\n/** Migrate v5 to v6: unwrap `{source, labeled}` colIds in gridState. */\nfunction migrateV5toV6(\n  state: Extract<PlDataTableStateV2, { version: 5 }>,\n): PlDataTableStateV2Normalized {\n  // pTableParams reset: v5 stored DiscoveredPColumnId-based hiddenColIds with\n  // empty-array fields (e.g. `{column, path: [], columnQualifications: [], ...}`).\n  // v6 distills empty fields, so the same logical column serialises differently\n  // and lookups would silently miss every previously-hidden discovered column.\n  // gridState colIds are derived from PTableColumnSpec and unaffected.\n  return {\n    version: 6,\n    stateCache: state.stateCache.map((entry) => ({\n      ...entry,\n      gridState: unwrapV5GridState(entry.gridState),\n    })),\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n\n/** Convert v5 wrapped colId JSON to bare PTableColumnSpec JSON, taking `.source`.\n * gridState colIds may include the row-number sentinel (a JSON-stringified\n * literal, not a wrapped spec) — those pass through unchanged. */\nfunction unwrapV5ColId(json: string): string {\n  const parsed: unknown = parseJsonSafely(json as CanonicalizedJson<unknown>);\n  return !isNil(parsed) && typeof parsed === \"object\" && \"source\" in parsed\n    ? canonicalizeJson((parsed as PlDataTableV5ColIdWrapper).source)\n    : json;\n}\n\nfunction unwrapV5GridState(gridState: PlDataTableGridStateV5): PlDataTableGridStateCore {\n  const unwrapAs = (json: PlDataTableV5ColIdJson) =>\n    unwrapV5ColId(json) as CanonicalizedJson<PTableColumnSpec>;\n  return {\n    columnOrder: gridState.columnOrder\n      ? { orderedColIds: gridState.columnOrder.orderedColIds.map(unwrapAs) }\n      : undefined,\n    sort: gridState.sort\n      ? {\n          sortModel: gridState.sort.sortModel.map((s) => ({\n            colId: unwrapAs(s.colId),\n            sort: s.sort,\n          })),\n        }\n      : undefined,\n    columnVisibility: gridState.columnVisibility\n      ? { hiddenColIds: gridState.columnVisibility.hiddenColIds.map(unwrapAs) }\n      : undefined,\n  };\n}\n\n/** Migrate v4 state to v6: convert per-column filters to tree-based format (skips v5). */\nfunction migrateV4toV6(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n      defaultFiltersState: null,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 6,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds:\n              state.pTableParams.hiddenColIds?.map((id) => ({ type: \"column\" as const, id })) ??\n              null,\n            filters: distillFilterSpec(currentCache.filtersState),\n            defaultFilters: null,\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    defaultFilters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 6,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"state-migration.js","names":[],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  canonicalizeJson,\n  getPTableColumnId,\n  parseJsonSafely,\n} from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PlTableColumnIdJson,\n  PTableParamsV2,\n} from \"./typesV7\";\nimport type {\n  PlDataTableGridStateV6,\n  PlDataTableStateV2V6,\n  PlDataTableStateV2V6CacheEntry,\n  PlDataTableV6ColIdJson,\n} from \"./typesV6\";\nimport type {\n  PlDataTableGridStateV5,\n  PlDataTableV5ColIdJson,\n  PlDataTableV5ColIdWrapper,\n} from \"./typesV5\";\nimport { isNil } from \"es-toolkit\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateV6;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // v5 stored colIds as `{source, labeled}` wrappers; only the gridState shape differs.\n  | {\n      version: 5;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateV5;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: null | PlDataTableFiltersWithMeta;\n        defaultFiltersState: null | PlDataTableFiltersWithMeta;\n        searchString?: string;\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  // v6 stored colIds as canonicalized full `PTableColumnSpec` (including\n  // annotations + `pl7.app/trace`). v7 strips down to `PTableColumnId`.\n  | PlDataTableStateV2V6\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v6: migrate per-column filters to tree-based format (skips v5).\n  // v4 gridState already used bare PTableColumnSpec colIds, so we jump\n  // straight to v6 without going through the v5 wrapper format.\n  if (state.version === 4) {\n    state = migrateV4toV6(state);\n  }\n  // v5 -> v6: unwrap `{source, labeled}` colIds in gridState back to bare PTableColumnSpec.\n  if (state.version === 5) {\n    state = migrateV5toV6(state);\n  }\n  // v6 -> v7: shrink colIds from full PTableColumnSpec to PTableColumnId.\n  if (state.version === 6) {\n    state = migrateV6toV7(state);\n  }\n  return state;\n}\n\n/** Migrate v5 to v6: unwrap `{source, labeled}` colIds in gridState. */\nfunction migrateV5toV6(state: Extract<PlDataTableStateV2, { version: 5 }>): PlDataTableStateV2V6 {\n  // pTableParams reset: v5 stored DiscoveredPColumnId-based hiddenColIds with\n  // empty-array fields (e.g. `{column, path: [], columnQualifications: [], ...}`).\n  // v6 distills empty fields, so the same logical column serialises differently\n  // and lookups would silently miss every previously-hidden discovered column.\n  // gridState colIds are derived from PTableColumnSpec and unaffected.\n  return {\n    version: 6,\n    stateCache: state.stateCache.map((entry) => ({\n      ...entry,\n      gridState: unwrapV5GridState(entry.gridState),\n    })),\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n\n/** Convert v5 wrapped colId JSON to bare PTableColumnSpec JSON, taking `.source`.\n * gridState colIds may include the row-number sentinel (a JSON-stringified\n * literal, not a wrapped spec) — those pass through unchanged. */\nfunction unwrapV5ColId(json: string): string {\n  const parsed: unknown = parseJsonSafely(json as CanonicalizedJson<unknown>);\n  return !isNil(parsed) && typeof parsed === \"object\" && \"source\" in parsed\n    ? canonicalizeJson((parsed as PlDataTableV5ColIdWrapper).source)\n    : json;\n}\n\nfunction unwrapV5GridState(gridState: PlDataTableGridStateV5): PlDataTableGridStateV6 {\n  const unwrapAs = (json: PlDataTableV5ColIdJson) => unwrapV5ColId(json) as PlDataTableV6ColIdJson;\n  return {\n    columnOrder: gridState.columnOrder\n      ? { orderedColIds: gridState.columnOrder.orderedColIds.map(unwrapAs) }\n      : undefined,\n    sort: gridState.sort\n      ? {\n          sortModel: gridState.sort.sortModel.map((s) => ({\n            colId: unwrapAs(s.colId),\n            sort: s.sort,\n          })),\n        }\n      : undefined,\n    columnVisibility: gridState.columnVisibility\n      ? { hiddenColIds: gridState.columnVisibility.hiddenColIds.map(unwrapAs) }\n      : undefined,\n  };\n}\n\n/** Migrate v6 to v7: rewrite each colId from a full PTableColumnSpec to its\n * compact PTableColumnId (drops annotations/spec body, ~16× smaller per column). */\nfunction migrateV6toV7(state: PlDataTableStateV2V6): PlDataTableStateV2Normalized {\n  return {\n    version: 7,\n    stateCache: state.stateCache.map(\n      (entry): PlDataTableStateV2CacheEntry => ({\n        ...entry,\n        gridState: shrinkV6GridState(entry.gridState),\n      }),\n    ),\n    pTableParams: state.pTableParams,\n  };\n}\n\n/** Convert a v6 fat colId (canonicalized PTableColumnSpec) to a v7 compact colId\n * (canonicalized PTableColumnId). The row-number sentinel is a string literal,\n * not a spec — pass it through unchanged. */\nfunction shrinkV6ColId(json: PlDataTableV6ColIdJson): PlTableColumnIdJson {\n  const parsed: unknown = parseJsonSafely(json);\n  if (!isNil(parsed) && typeof parsed === \"object\" && \"type\" in parsed && \"id\" in parsed) {\n    return canonicalizeJson(getPTableColumnId(parsed as PTableColumnSpec));\n  }\n  return json as unknown as PlTableColumnIdJson;\n}\n\nfunction shrinkV6GridState(gridState: PlDataTableGridStateV6): PlDataTableGridStateCore {\n  return {\n    columnOrder: gridState.columnOrder\n      ? { orderedColIds: gridState.columnOrder.orderedColIds.map(shrinkV6ColId) }\n      : undefined,\n    sort: gridState.sort\n      ? {\n          sortModel: gridState.sort.sortModel.map((s) => ({\n            colId: shrinkV6ColId(s.colId),\n            sort: s.sort,\n          })),\n        }\n      : undefined,\n    columnVisibility: gridState.columnVisibility\n      ? { hiddenColIds: gridState.columnVisibility.hiddenColIds.map(shrinkV6ColId) }\n      : undefined,\n  };\n}\n\n/** Migrate v4 state to v6: convert per-column filters to tree-based format (skips v5). */\nfunction migrateV4toV6(state: Extract<PlDataTableStateV2, { version: 4 }>): PlDataTableStateV2V6 {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2V6CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n      defaultFiltersState: null,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 6,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds:\n              state.pTableParams.hiddenColIds?.map((id) => ({ type: \"column\" as const, id })) ??\n              null,\n            filters: distillFilterSpec(currentCache.filtersState),\n            defaultFilters: null,\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    defaultFilters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 7,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":";;;;;;AAsJA,SAAgB,0BACd,OAC8B;AAE9B,KAAI,CAAC,MACH,QAAO,0BAA0B;AAGnC,KAAI,EAAE,aAAa,OAEjB,SAAQ,0BAA0B;AAGpC,KAAI,MAAM,YAAY,EACpB,SAAQ;EACN,SAAS;EACT,YAAY,MAAM,WAAW,KAAK,WAAW;GAC3C,GAAG;GACH,cAAc,EAAE;GACjB,EAAE;EACH,cAAc,2BAA2B;EAC1C;AAGH,KAAI,MAAM,YAAY,EAEpB,SAAQ,0BAA0B;AAKpC,KAAI,MAAM,YAAY,EACpB,SAAQ,cAAc,MAAM;AAG9B,KAAI,MAAM,YAAY,EACpB,SAAQ,cAAc,MAAM;AAG9B,KAAI,MAAM,YAAY,EACpB,SAAQ,cAAc,MAAM;AAE9B,QAAO;;;AAIT,SAAS,cAAc,OAA0E;AAM/F,QAAO;EACL,SAAS;EACT,YAAY,MAAM,WAAW,KAAK,WAAW;GAC3C,GAAG;GACH,WAAW,kBAAkB,MAAM,UAAU;GAC9C,EAAE;EACH,cAAc,2BAA2B;EAC1C;;;;;AAMH,SAAS,cAAc,MAAsB;CAC3C,MAAM,SAAkB,gBAAgB,KAAmC;AAC3E,QAAO,CAAC,MAAM,OAAO,IAAI,OAAO,WAAW,YAAY,YAAY,SAC/D,iBAAkB,OAAqC,OAAO,GAC9D;;AAGN,SAAS,kBAAkB,WAA2D;CACpF,MAAM,YAAY,SAAiC,cAAc,KAAK;AACtE,QAAO;EACL,aAAa,UAAU,cACnB,EAAE,eAAe,UAAU,YAAY,cAAc,IAAI,SAAS,EAAE,GACpE,KAAA;EACJ,MAAM,UAAU,OACZ,EACE,WAAW,UAAU,KAAK,UAAU,KAAK,OAAO;GAC9C,OAAO,SAAS,EAAE,MAAM;GACxB,MAAM,EAAE;GACT,EAAE,EACJ,GACD,KAAA;EACJ,kBAAkB,UAAU,mBACxB,EAAE,cAAc,UAAU,iBAAiB,aAAa,IAAI,SAAS,EAAE,GACvE,KAAA;EACL;;;;AAKH,SAAS,cAAc,OAA2D;AAChF,QAAO;EACL,SAAS;EACT,YAAY,MAAM,WAAW,KAC1B,WAAyC;GACxC,GAAG;GACH,WAAW,kBAAkB,MAAM,UAAU;GAC9C,EACF;EACD,cAAc,MAAM;EACrB;;;;;AAMH,SAAS,cAAc,MAAmD;CACxE,MAAM,SAAkB,gBAAgB,KAAK;AAC7C,KAAI,CAAC,MAAM,OAAO,IAAI,OAAO,WAAW,YAAY,UAAU,UAAU,QAAQ,OAC9E,QAAO,iBAAiB,kBAAkB,OAA2B,CAAC;AAExE,QAAO;;AAGT,SAAS,kBAAkB,WAA6D;AACtF,QAAO;EACL,aAAa,UAAU,cACnB,EAAE,eAAe,UAAU,YAAY,cAAc,IAAI,cAAc,EAAE,GACzE,KAAA;EACJ,MAAM,UAAU,OACZ,EACE,WAAW,UAAU,KAAK,UAAU,KAAK,OAAO;GAC9C,OAAO,cAAc,EAAE,MAAM;GAC7B,MAAM,EAAE;GACT,EAAE,EACJ,GACD,KAAA;EACJ,kBAAkB,UAAU,mBACxB,EAAE,cAAc,UAAU,iBAAiB,aAAa,IAAI,cAAc,EAAE,GAC5E,KAAA;EACL;;;AAIH,SAAS,cAAc,OAA0E;CAC/F,IAAI,YAAY;CAChB,MAAM,eAAe,EAAE;CAEvB,MAAM,gBAAkD,MAAM,WAAW,KAAK,UAAU;EACtF,MAAM,SAAgD,EAAE;AACxD,OAAK,MAAM,KAAK,MAAM,aACpB,KAAI,EAAE,WAAW,QAAQ,CAAC,EAAE,OAAO,UAAU;GAC3C,MAAM,SAAS,iBAAiB,EAAE,GAAG;AACrC,UAAO,KAAK,mBAAmB,QAAQ,EAAE,OAAO,OAAO,OAAO,CAAC;;EAGnE,MAAM,eACJ,OAAO,SAAS,IAAI;GAAE,IAAI,QAAQ;GAAE,MAAM;GAAO,SAAS;GAAQ,GAAG;AAEvE,SAAO;GACL,UAAU,MAAM;GAChB,WAAW,MAAM;GACjB,aAAa,MAAM;GACnB;GACA,qBAAqB;GACtB;GACD;CAEF,MAAM,cAAc,MAAM,aAAa;CACvC,MAAM,eAAe,cACjB,cAAc,MAAM,MAAM,EAAE,aAAa,YAAY,GACrD,KAAA;AAEJ,QAAO;EACL,SAAS;EACT,YAAY;EACZ,cACE,gBAAgB,cACZ;GACE,UAAU;GACV,cACE,MAAM,aAAa,cAAc,KAAK,QAAQ;IAAE,MAAM;IAAmB;IAAI,EAAE,IAC/E;GACF,SAAS,kBAAkB,aAAa,aAAa;GACrD,gBAAgB;GAChB,SAAS,MAAM,aAAa;GAC7B,GACD,2BAA2B;EAClC;;;AAIH,SAAS,mBACP,QACA,QACA,QAC+C;CAC/C,MAAM,KAAK,QAAQ;AACnB,SAAQ,OAAO,MAAf;EACE,KAAK,OACH,QAAO;GAAE;GAAI,MAAM;GAAQ;GAAQ;EACrC,KAAK,UACH,QAAO;GAAE;GAAI,MAAM;GAAW;GAAQ;EACxC,KAAK,gBACH,QAAO;GAAE;GAAI,MAAM;GAAS;GAAQ,GAAG,OAAO;GAAW;EAC3D,KAAK,mBACH,QAAO;GAAE;GAAI,MAAM;GAAY;GAAQ,GAAG,OAAO;GAAW;EAC9D,KAAK,qBACH,QAAO;GAAE;GAAI,MAAM;GAAe;GAAQ,GAAG,OAAO;GAAW;EACjE,KAAK,8BACH,QAAO;GAAE;GAAI,MAAM;GAAsB;GAAQ,GAAG,OAAO;GAAW;EACxE,KAAK,kBACH,QAAO;GAAE;GAAI,MAAM;GAAY;GAAQ,GAAG,OAAO;GAAW;EAC9D,KAAK,2BACH,QAAO;GAAE;GAAI,MAAM;GAAmB;GAAQ,GAAG,OAAO;GAAW;EACrE,KAAK,iBACH,QAAO;GACL;GACA,MAAM;GACN,SAAS,CACP,OAAO,oBACH;IAAE,IAAI,QAAQ;IAAE,MAAM;IAA+B;IAAQ,GAAG,OAAO;IAAY,GACnF;IAAE,IAAI,QAAQ;IAAE,MAAM;IAAwB;IAAQ,GAAG,OAAO;IAAY,EAChF,OAAO,oBACH;IAAE,IAAI,QAAQ;IAAE,MAAM;IAA4B;IAAQ,GAAG,OAAO;IAAY,GAChF;IAAE,IAAI,QAAQ;IAAE,MAAM;IAAqB;IAAQ,GAAG,OAAO;IAAY,CAC9E;GACF;EACH,KAAK,gBACH,QAAO;GAAE;GAAI,MAAM;GAAiB;GAAQ,OAAO,OAAO;GAAW;EACvE,KAAK,mBACH,QAAO;GAAE;GAAI,MAAM;GAAoB;GAAQ,OAAO,OAAO;GAAW;EAC1E,KAAK,kBACH,QAAO;GAAE;GAAI,MAAM;GAA6B;GAAQ,OAAO,OAAO;GAAW;EACnF,KAAK,wBACH,QAAO;GAAE;GAAI,MAAM;GAAgC;GAAQ,OAAO,OAAO;GAAW;EACtF,KAAK,iBACH,QAAO;GAAE;GAAI,MAAM;GAAmC;GAAQ,OAAO,OAAO;GAAW;EACzF,KAAK,sBACH,QAAO;GACL;GACA,MAAM;GACN,QAAQ;IACN,IAAI,QAAQ;IACZ,MAAM;IACN;IACA,OAAO,OAAO;IACf;GACF;EACH,KAAK,4BACH,QAAO;GACL;GACA,MAAM;GACN;GACA,OAAO,OAAO;GACd,UAAU,OAAO;GACjB,mBAAmB,OAAO;GAC1B,GAAI,OAAO,aAAa,KAAA,IAAY,EAAE,UAAU,OAAO,UAAU,GAAG,EAAE;GACvE;;;AAIP,SAAgB,4BAA4C;AAC1D,QAAO;EACL,UAAU;EACV,cAAc;EACd,SAAS;EACT,gBAAgB;EAChB,SAAS,EAAE;EACZ;;AAGH,SAAgB,2BAAyD;AACvE,QAAO;EACL,SAAS;EACT,YAAY,EAAE;EACd,cAAc,2BAA2B;EAC1C"}

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

@@ -1,98 +1,40 @@
-import { FilterSpecLeaf as FilterSpecLeaf$1 } from "../../filters/types.js";
-import { AxisId, AxisSpec, CanonicalizedJson, ListOptionBase, PColumnIdAndSpec, PFrameHandle, PTableColumnId, PTableColumnSpec, PTableHandle, PTableSorting, RootFilterSpec } from "@milaboratories/pl-model-common";
-import { Nil } from "@milaboratories/helpers";
+import { PTableParamsV2, PlDataTableFiltersWithMeta, PlDataTableSheetState } from "./typesV7.js";
+import { CanonicalizedJson, PTableColumnSpec } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDataTable/typesV6.d.ts
-type PlTableColumnIdJson = CanonicalizedJson<PTableColumnSpec>;
-type PlDataTableGridStateCore = {
-  /** Includes column ordering */columnOrder?: {
-    /** All colIds in order */orderedColIds: PlTableColumnIdJson[];
-  }; /** Includes current sort columns and direction */
+/**
+ * v6 colId scheme: bare canonicalized `PTableColumnSpec` (full spec including
+ * all annotations and `pl7.app/trace`). v7 dropped the spec body and now uses
+ * `CanonicalizedJson<PTableColumnId>` — orders of magnitude smaller.
+ */
+type PlDataTableV6ColIdJson = CanonicalizedJson<PTableColumnSpec>;
+type PlDataTableGridStateV6 = {
+  columnOrder?: {
+    orderedColIds: PlDataTableV6ColIdJson[];
+  };
   sort?: {
-    /** Sorted columns and directions in order */sortModel: {
-      /** Column Id to apply the sort to. */colId: PlTableColumnIdJson; /** Sort direction */
+    sortModel: {
+      colId: PlDataTableV6ColIdJson;
       sort: "asc" | "desc";
     }[];
-  }; /** Includes column visibility */
+  };
   columnVisibility?: {
-    /** All colIds which were hidden */hiddenColIds: PlTableColumnIdJson[];
+    hiddenColIds: PlDataTableV6ColIdJson[];
   };
 };
-type PlDataTableSheet = {
-  /** spec of the axis to use */axis: AxisSpec; /** options to show in the filter dropdown */
-  options: ListOptionBase<string | number>[]; /** default (selected) value */
-  defaultValue?: string | number;
-};
-type PlDataTableSheetState = {
-  /** id of the axis */axisId: AxisId; /** selected value */
-  value: string | number;
-};
-/** Tree-based filter state compatible with PlAdvancedFilter's RootFilter */
-type PlDataTableFilterMeta = {
-  id: number;
-  source?: "table-filter" | "table-search";
-  isExpanded?: boolean;
-  isSuppressed?: boolean;
-};
-type PlDataTableFilterSpecLeaf = FilterSpecLeaf$1<CanonicalizedJson<PTableColumnId>>;
-type PlDataTableFilters = RootFilterSpec<PlDataTableFilterSpecLeaf>;
-type PlDataTableFiltersWithMeta = RootFilterSpec<PlDataTableFilterSpecLeaf, PlDataTableFilterMeta>;
-type PlDataTableStateV2CacheEntry = {
-  /** DataSource identifier for state management */sourceId: string; /** Internal ag-grid state */
-  gridState: PlDataTableGridStateCore; /** Sheets state */
-  sheetsState: PlDataTableSheetState[]; /** User filters state (tree-based, compatible with PlAdvancedFilter) */
-  filtersState: null | PlDataTableFiltersWithMeta; /** Default filters state from model (snapshot of defaults) */
-  defaultFiltersState: null | PlDataTableFiltersWithMeta; /** Fast search string */
-  searchString?: string;
-};
-type PTableParamsV2 = {
-  sourceId: null;
-  hiddenColIds: null;
-  sorting: [];
-  filters: null;
-  defaultFilters: null;
-} | {
+type PlDataTableStateV2V6CacheEntry = {
   sourceId: string;
-  hiddenColIds: null | PTableColumnId[];
-  sorting: PTableSorting[];
-  filters: null | PlDataTableFilters;
-  defaultFilters: null | PlDataTableFilters;
+  gridState: PlDataTableGridStateV6;
+  sheetsState: PlDataTableSheetState[];
+  filtersState: null | PlDataTableFiltersWithMeta;
+  defaultFiltersState: null | PlDataTableFiltersWithMeta;
+  searchString?: string;
 };
-type PlDataTableStateV2Normalized = {
-  /** Version for upgrades */version: 6; /** Internal states, LRU cache for 5 sourceId-s */
-  stateCache: PlDataTableStateV2CacheEntry[]; /** PTable params derived from the cache state for the current sourceId */
+type PlDataTableStateV2V6 = {
+  version: 6;
+  stateCache: PlDataTableStateV2V6CacheEntry[];
   pTableParams: PTableParamsV2;
 };
-/** PlAgDataTable model */
-type PlDataTableModel = {
-  /** DataSource identifier for state management */sourceId: null | string; /** p-table including all columns, used to show the full specification of the table */
-  fullTableHandle?: PTableHandle; /** p-frame handle */
-  fullPframeHandle?: PFrameHandle; /** p-table including only visible columns, used to get the data */
-  visibleTableHandle?: PTableHandle; /** Default filters from model options, surfaced for UI display */
-  defaultFilters?: Nil | PlDataTableFilters;
-};
-type CreatePlDataTableOps = {
-  /** Filters for columns and non-partitioned axes */filters?: PlDataTableFilters; /** Sorting to columns hidden from user */
-  sorting?: PTableSorting[];
-  /**
-   * Selects columns for which will be inner-joined to the table.
-   *
-   * Default behaviour: all columns are considered to be core
-   */
-  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;
-  /**
-   * Determines how core columns should be joined together:
-   *   inner - so user will only see records present in all core columns
-   *   full - so user will only see records present in any of the core columns
-   *
-   * All non-core columns will be left joined to the table produced by the core
-   * columns, in other words records form the pool of non-core columns will only
-   * make their way into the final table if core table contains corresponding key.
-   *
-   * Default: 'full'
-   */
-  coreJoinType?: "inner" | "full";
-};
 //#endregion
-export { CreatePlDataTableOps, PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnIdJson };
+export { PlDataTableGridStateV6, PlDataTableStateV2V6 };
 //# sourceMappingURL=typesV6.d.ts.map

package/dist/components/PlDataTable/typesV6.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typesV6.d.ts","names":[],"sources":["../../../src/components/PlDataTable/typesV6.ts"],"mappings":";;;;;KAgBY,mBAAA,GAAsB,iBAAA,CAAkB,gBAAA;AAAA,KAExC,wBAAA;iCAEV,WAAA;IAJ6B,0BAM3B,aAAA,EAAe,mBAAA;EAAA,GANiD;EASlE,IAAA;IAPkC,6CAShC,SAAA;MALe,sCAOb,KAAA,EAAO,mBAAA,EAQK;MANZ,IAAA;IAAA;EAAA,GATF;EAaF,gBAAA;IAVA,mCAYE,YAAA,EAAc,mBAAA;EAAA;AAAA;AAAA,KAIN,gBAAA;EANV,8BAQA,IAAA,EAAM,QAAA,EANU;EAQhB,OAAA,EAAS,cAAA,qBAR0B;EAUnC,YAAA;AAAA;AAAA,KAGU,qBAAA;EALa,qBAOvB,MAAA,EAAQ,MAAA,EATF;EAWN,KAAA;AAAA;;KAIU,qBAAA;EACV,EAAA;EACA,MAAA;EACA,UAAA;EACA,YAAA;AAAA;AAAA,KAEU,yBAAA,GAA4B,gBAAA,CAAe,iBAAA,CAAkB,cAAA;AAAA,KAC7D,kBAAA,GAAqB,cAAA,CAAe,yBAAA;AAAA,KACpC,0BAAA,GAA6B,cAAA,CACvC,yBAAA,EACA,qBAAA;AAAA,KAGU,4BAAA;EAjBL,iDAmBL,QAAA,UAf+B;EAiB/B,SAAA,EAAW,wBAAA,EAjBoB;EAmB/B,WAAA,EAAa,qBAAA,IAjBb;EAmBA,YAAA,SAAqB,0BAAA,EAjBrB;EAmBA,mBAAA,SAA4B,0BAAA,EAnBhB;EAqBZ,YAAA;AAAA;AAAA,KAGU,cAAA;EAEN,QAAA;EACA,YAAA;EACA,OAAA;EACA,OAAA;EACA,cAAA;AAAA;EAGA,QAAA;EACA,YAAA,SAAqB,cAAA;EACrB,OAAA,EAAS,aAAA;EACT,OAAA,SAAgB,kBAAA;EAChB,cAAA,SAAuB,kBAAA;AAAA;AAAA,KAGjB,4BAAA;EArCqB,2BAuC/B,OAAA,KAtCU;EAwCV,UAAA,EAAY,4BAAA;EAEZ,YAAA,EAAc,cAAA;AAAA;;KAIJ,gBAAA;EA9C2C,iDAgDrD,QAAA,iBA/CA;EAiDA,eAAA,GAAkB,YAAA,EAhDG;EAkDrB,gBAAA,GAAmB,YAAA,EA/CT;EAiDV,kBAAA,GAAqB,YAAA;EAErB,cAAA,GAAiB,GAAA,GAAM,kBAAA;AAAA;AAAA,KAGb,oBAAA;EA5CkB,mDA8C5B,OAAA,GAAU,kBAAA,EA9C4C;EAiDtD,OAAA,GAAU,aAAA;EAvDV;;;;;EA8DA,mBAAA,IAAuB,IAAA,EAAM,gBAAA;EAxD7B;;;;;AAKF;;;;;;EAgEE,YAAA;AAAA"}
+{"version":3,"file":"typesV6.d.ts","names":[],"sources":["../../../src/components/PlDataTable/typesV6.ts"],"mappings":";;;;;;AAQA;;;KAAY,sBAAA,GAAyB,iBAAA,CAAkB,gBAAA;AAAA,KAE3C,sBAAA;EACV,WAAA;IAAgB,aAAA,EAAe,sBAAA;EAAA;EAC/B,IAAA;IAAS,SAAA;MAAa,KAAA,EAAO,sBAAA;MAAwB,IAAA;IAAA;EAAA;EACrD,gBAAA;IAAqB,YAAA,EAAc,sBAAA;EAAA;AAAA;AAAA,KAGzB,8BAAA;EACV,QAAA;EACA,SAAA,EAAW,sBAAA;EACX,WAAA,EAAa,qBAAA;EACb,YAAA,SAAqB,0BAAA;EACrB,mBAAA,SAA4B,0BAAA;EAC5B,YAAA;AAAA;AAAA,KAGU,oBAAA;EACV,OAAA;EACA,UAAA,EAAY,8BAAA;EACZ,YAAA,EAAc,cAAA;AAAA"}

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

@@ -0,0 +1,98 @@
+import { FilterSpecLeaf as FilterSpecLeaf$1 } from "../../filters/types.js";
+import { AxisId, AxisSpec, CanonicalizedJson, ListOptionBase, PColumnIdAndSpec, PFrameHandle, PTableColumnId, PTableHandle, PTableSorting, RootFilterSpec } from "@milaboratories/pl-model-common";
+import { Nil } from "@milaboratories/helpers";
+
+//#region src/components/PlDataTable/typesV7.d.ts
+type PlTableColumnIdJson = CanonicalizedJson<PTableColumnId>;
+type PlDataTableGridStateCore = {
+  /** Includes column ordering */columnOrder?: {
+    /** All colIds in order */orderedColIds: PlTableColumnIdJson[];
+  }; /** Includes current sort columns and direction */
+  sort?: {
+    /** Sorted columns and directions in order */sortModel: {
+      /** Column Id to apply the sort to. */colId: PlTableColumnIdJson; /** Sort direction */
+      sort: "asc" | "desc";
+    }[];
+  }; /** Includes column visibility */
+  columnVisibility?: {
+    /** All colIds which were hidden */hiddenColIds: PlTableColumnIdJson[];
+  };
+};
+type PlDataTableSheet = {
+  /** spec of the axis to use */axis: AxisSpec; /** options to show in the filter dropdown */
+  options: ListOptionBase<string | number>[]; /** default (selected) value */
+  defaultValue?: string | number;
+};
+type PlDataTableSheetState = {
+  /** id of the axis */axisId: AxisId; /** selected value */
+  value: string | number;
+};
+/** Tree-based filter state compatible with PlAdvancedFilter's RootFilter */
+type PlDataTableFilterMeta = {
+  id: number;
+  source?: "table-filter" | "table-search";
+  isExpanded?: boolean;
+  isSuppressed?: boolean;
+};
+type PlDataTableFilterSpecLeaf = FilterSpecLeaf$1<CanonicalizedJson<PTableColumnId>>;
+type PlDataTableFilters = RootFilterSpec<PlDataTableFilterSpecLeaf>;
+type PlDataTableFiltersWithMeta = RootFilterSpec<PlDataTableFilterSpecLeaf, PlDataTableFilterMeta>;
+type PlDataTableStateV2CacheEntry = {
+  /** DataSource identifier for state management */sourceId: string; /** Internal ag-grid state */
+  gridState: PlDataTableGridStateCore; /** Sheets state */
+  sheetsState: PlDataTableSheetState[]; /** User filters state (tree-based, compatible with PlAdvancedFilter) */
+  filtersState: null | PlDataTableFiltersWithMeta; /** Default filters state from model (snapshot of defaults) */
+  defaultFiltersState: null | PlDataTableFiltersWithMeta; /** Fast search string */
+  searchString?: string;
+};
+type PTableParamsV2 = {
+  sourceId: null;
+  hiddenColIds: null;
+  sorting: [];
+  filters: null;
+  defaultFilters: null;
+} | {
+  sourceId: string;
+  hiddenColIds: null | PTableColumnId[];
+  sorting: PTableSorting[];
+  filters: null | PlDataTableFilters;
+  defaultFilters: null | PlDataTableFilters;
+};
+type PlDataTableStateV2Normalized = {
+  /** Version for upgrades */version: 7; /** Internal states, LRU cache for 5 sourceId-s */
+  stateCache: PlDataTableStateV2CacheEntry[]; /** PTable params derived from the cache state for the current sourceId */
+  pTableParams: PTableParamsV2;
+};
+/** PlAgDataTable model */
+type PlDataTableModel = {
+  /** DataSource identifier for state management */sourceId: null | string; /** p-table including all columns, used to show the full specification of the table */
+  fullTableHandle?: PTableHandle; /** p-frame handle */
+  fullPframeHandle?: PFrameHandle; /** p-table including only visible columns, used to get the data */
+  visibleTableHandle?: PTableHandle; /** Default filters from model options, surfaced for UI display */
+  defaultFilters?: Nil | PlDataTableFilters;
+};
+type CreatePlDataTableOps = {
+  /** Filters for columns and non-partitioned axes */filters?: PlDataTableFilters; /** Sorting to columns hidden from user */
+  sorting?: PTableSorting[];
+  /**
+   * Selects columns for which will be inner-joined to the table.
+   *
+   * Default behaviour: all columns are considered to be core
+   */
+  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;
+  /**
+   * Determines how core columns should be joined together:
+   *   inner - so user will only see records present in all core columns
+   *   full - so user will only see records present in any of the core columns
+   *
+   * All non-core columns will be left joined to the table produced by the core
+   * columns, in other words records form the pool of non-core columns will only
+   * make their way into the final table if core table contains corresponding key.
+   *
+   * Default: 'full'
+   */
+  coreJoinType?: "inner" | "full";
+};
+//#endregion
+export { CreatePlDataTableOps, PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnIdJson };
+//# sourceMappingURL=typesV7.d.ts.map

package/dist/components/PlDataTable/typesV7.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typesV7.d.ts","names":[],"sources":["../../../src/components/PlDataTable/typesV7.ts"],"mappings":";;;;;KAeY,mBAAA,GAAsB,iBAAA,CAAkB,cAAA;AAAA,KAExC,wBAAA;iCAEV,WAAA;IAJ6B,0BAM3B,aAAA,EAAe,mBAAA;EAAA,GAN+C;EAShE,IAAA;IAPkC,6CAShC,SAAA;MALe,sCAOb,KAAA,EAAO,mBAAA,EAQK;MANZ,IAAA;IAAA;EAAA,GATF;EAaF,gBAAA;IAVA,mCAYE,YAAA,EAAc,mBAAA;EAAA;AAAA;AAAA,KAIN,gBAAA;EANV,8BAQA,IAAA,EAAM,QAAA,EANU;EAQhB,OAAA,EAAS,cAAA,qBAR0B;EAUnC,YAAA;AAAA;AAAA,KAGU,qBAAA;EALa,qBAOvB,MAAA,EAAQ,MAAA,EATF;EAWN,KAAA;AAAA;;KAIU,qBAAA;EACV,EAAA;EACA,MAAA;EACA,UAAA;EACA,YAAA;AAAA;AAAA,KAEU,yBAAA,GAA4B,gBAAA,CAAe,iBAAA,CAAkB,cAAA;AAAA,KAC7D,kBAAA,GAAqB,cAAA,CAAe,yBAAA;AAAA,KACpC,0BAAA,GAA6B,cAAA,CACvC,yBAAA,EACA,qBAAA;AAAA,KAGU,4BAAA;EAjBL,iDAmBL,QAAA,UAf+B;EAiB/B,SAAA,EAAW,wBAAA,EAjBoB;EAmB/B,WAAA,EAAa,qBAAA,IAjBb;EAmBA,YAAA,SAAqB,0BAAA,EAjBrB;EAmBA,mBAAA,SAA4B,0BAAA,EAnBhB;EAqBZ,YAAA;AAAA;AAAA,KAGU,cAAA;EAEN,QAAA;EACA,YAAA;EACA,OAAA;EACA,OAAA;EACA,cAAA;AAAA;EAGA,QAAA;EACA,YAAA,SAAqB,cAAA;EACrB,OAAA,EAAS,aAAA;EACT,OAAA,SAAgB,kBAAA;EAChB,cAAA,SAAuB,kBAAA;AAAA;AAAA,KAGjB,4BAAA;EArCqB,2BAuC/B,OAAA,KAtCU;EAwCV,UAAA,EAAY,4BAAA;EAEZ,YAAA,EAAc,cAAA;AAAA;;KAIJ,gBAAA;EA9C2C,iDAgDrD,QAAA,iBA/CA;EAiDA,eAAA,GAAkB,YAAA,EAhDG;EAkDrB,gBAAA,GAAmB,YAAA,EA/CT;EAiDV,kBAAA,GAAqB,YAAA;EAErB,cAAA,GAAiB,GAAA,GAAM,kBAAA;AAAA;AAAA,KAGb,oBAAA;EA5CkB,mDA8C5B,OAAA,GAAU,kBAAA,EA9C4C;EAiDtD,OAAA,GAAU,aAAA;EAvDV;;;;;EA8DA,mBAAA,IAAuB,IAAA,EAAM,gBAAA;EAxD7B;;;;;AAKF;;;;;;EAgEE,YAAA;AAAA"}

package/dist/components/PlDatasetSelector/build_dataset_options.cjs

@@ -37,7 +37,11 @@ function buildDatasetOptions(ctx, opts) {
 			});
 			enrichmentCollection = enrichmentSources !== void 0 ? new require_column_collection_builder.ColumnCollectionBuilder(pframeSpec).addSources(enrichmentSources).build({ anchors: { main: datasetSpec } }) : void 0;
 			const filterMatches = require_filter_discovery.findFilterColumns(filterCollection).filter((m) => filterPredicate(m.column.spec));
-			const filters = filterMatches.length === 0 ? void 0 : require_filter_discovery.filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);
+			const filters = filterMatches.length === 0 ? void 0 : require_filter_discovery.filterMatchesToOptions(filterMatches, {
+				refsByObjectId: refMap,
+				datasetSpec,
+				labelOptions: opts?.labelOptions
+			});
 			let enrichments;
 			if (enrichmentCollection && withEnrichments) {
 				const enrichmentVariants = require_enrichment_discovery.findEnrichmentColumns(enrichmentCollection, {

package/dist/components/PlDatasetSelector/build_dataset_options.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"build_dataset_options.cjs","names":["buildRefMap","ResultPoolColumnSnapshotProvider","collectCtxColumnSnapshotProviders","ColumnCollectionBuilder","findFilterColumns","filterMatchesToOptions","findEnrichmentColumns","enrichmentVariantsToRefs"],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { AnchoredColumnCollection } from \"../../columns/column_collection_builder\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport {\n  ResultPoolColumnSnapshotProvider,\n  collectCtxColumnSnapshotProviders,\n} from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\ntype SpecPredicateOption =\n  | MultiColumnSelector\n  | MultiColumnSelector[]\n  | ((spec: PObjectSpec) => boolean);\n\nfunction toPredicate(opt: SpecPredicateOption | undefined): (spec: PObjectSpec) => boolean {\n  if (opt === undefined) return () => true;\n  return typeof opt === \"function\" ? opt : multiColumnSelectorsToPredicate(opt);\n}\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: SpecPredicateOption;\n  /**\n   * Restricts which result pool columns are considered as filters. Intersected\n   * with the built-in `pl7.app/isSubset: \"true\"` constraint. Defaults to\n   * accept-all.\n   */\n  filter?: SpecPredicateOption;\n  /** Formatting options for filter labels. */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: SpecPredicateOption;\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primaryPredicate = toPredicate(opts?.primary);\n  const filterPredicate = toPredicate(opts?.filter);\n\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  const withEnrichments = opts?.withEnrichments ?? false;\n  const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);\n  // Hoisted out of the per-option loop: collectCtxColumnSnapshotProviders\n  // walks the entire output tree, so calling it once per dataset option would\n  // be O(N × tree).\n  const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : undefined;\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    // Allocations happen inside try so a throw on the second build()\n    // still disposes the first collection.\n    let filterCollection: AnchoredColumnCollection | undefined;\n    let enrichmentCollection: AnchoredColumnCollection | undefined;\n    try {\n      // ResultPoolColumnSnapshotProvider is always complete;\n      // allowPartialColumnList narrows the return type to non-undefined.\n      filterCollection = new ColumnCollectionBuilder(pframeSpec)\n        .addSource(filterSource)\n        .build({ anchors: { main: datasetSpec }, allowPartialColumnList: true });\n\n      enrichmentCollection =\n        enrichmentSources !== undefined\n          ? new ColumnCollectionBuilder(pframeSpec)\n              .addSources(enrichmentSources)\n              .build({ anchors: { main: datasetSpec } })\n          : undefined;\n\n      const filterMatches = findFilterColumns(filterCollection).filter((m) =>\n        filterPredicate(m.column.spec),\n      );\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);\n\n      let enrichments;\n      if (enrichmentCollection && withEnrichments) {\n        const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {\n          maxHops: opts?.enrichmentMaxHops,\n          ...(typeof withEnrichments === \"function\"\n            ? { predicate: withEnrichments }\n            : { include: withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      filterCollection?.dispose();\n      enrichmentCollection?.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;;AAmBA,SAAS,YAAY,KAAsE;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,OAAA,GAAA,gCAAA,iCAAsC,IAAI;;;;;;;;AA6B/E,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,QAAQ;CACnD,MAAM,kBAAkB,YAAY,MAAM,OAAO;CAEjD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,SAASA,yBAAAA,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;CAE/C,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,IAAIC,2BAAAA,iCAAiC,IAAI,WAAW;CAIzE,MAAM,oBAAoB,kBAAkBC,2BAAAA,kCAAkC,IAAI,GAAG,KAAA;AAErF,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAIpC,IAAI;EACJ,IAAI;AACJ,MAAI;AAGF,sBAAmB,IAAIC,kCAAAA,wBAAwB,WAAW,CACvD,UAAU,aAAa,CACvB,MAAM;IAAE,SAAS,EAAE,MAAM,aAAa;IAAE,wBAAwB;IAAM,CAAC;AAE1E,0BACE,sBAAsB,KAAA,IAClB,IAAIA,kCAAAA,wBAAwB,WAAW,CACpC,WAAW,kBAAkB,CAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC,GAC5C,KAAA;GAEN,MAAM,gBAAgBC,yBAAAA,kBAAkB,iBAAiB,CAAC,QAAQ,MAChE,gBAAgB,EAAE,OAAO,KAAK,CAC/B;GACD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACAC,yBAAAA,uBAAuB,eAAe,QAAQ,MAAM,aAAa;GAEvE,IAAI;AACJ,OAAI,wBAAwB,iBAAiB;IAC3C,MAAM,qBAAqBC,6BAAAA,sBAAsB,sBAAsB;KACrE,SAAS,MAAM;KACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,iBAAiB,GAC9B,EAAE,SAAS,iBAAiB;KACjC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAcC,6BAAAA,yBAAyB,oBAAoB,MAAM,aAAa;;AAIlF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,qBAAkB,SAAS;AAC3B,yBAAsB,SAAS;;GAEjC"}
+{"version":3,"file":"build_dataset_options.cjs","names":["buildRefMap","ResultPoolColumnSnapshotProvider","collectCtxColumnSnapshotProviders","ColumnCollectionBuilder","findFilterColumns","filterMatchesToOptions","findEnrichmentColumns","enrichmentVariantsToRefs"],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { AnchoredColumnCollection } from \"../../columns/column_collection_builder\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport {\n  ResultPoolColumnSnapshotProvider,\n  collectCtxColumnSnapshotProviders,\n} from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\ntype SpecPredicateOption =\n  | MultiColumnSelector\n  | MultiColumnSelector[]\n  | ((spec: PObjectSpec) => boolean);\n\nfunction toPredicate(opt: SpecPredicateOption | undefined): (spec: PObjectSpec) => boolean {\n  if (opt === undefined) return () => true;\n  return typeof opt === \"function\" ? opt : multiColumnSelectorsToPredicate(opt);\n}\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: SpecPredicateOption;\n  /**\n   * Restricts which result pool columns are considered as filters. Intersected\n   * with the built-in `pl7.app/isSubset: \"true\"` constraint. Defaults to\n   * accept-all.\n   */\n  filter?: SpecPredicateOption;\n  /**\n   * Formatting options forwarded to label derivation for both filter and\n   * enrichment rows. `formatters.native` on the filter path is overridden\n   * — see `FilterMatchOptions.labelOptions`.\n   */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: SpecPredicateOption;\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primaryPredicate = toPredicate(opts?.primary);\n  const filterPredicate = toPredicate(opts?.filter);\n\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  const withEnrichments = opts?.withEnrichments ?? false;\n  const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);\n  // Hoisted out of the per-option loop: collectCtxColumnSnapshotProviders\n  // walks the entire output tree, so calling it once per dataset option would\n  // be O(N × tree).\n  const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : undefined;\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    // Allocations happen inside try so a throw on the second build()\n    // still disposes the first collection.\n    let filterCollection: AnchoredColumnCollection | undefined;\n    let enrichmentCollection: AnchoredColumnCollection | undefined;\n    try {\n      // ResultPoolColumnSnapshotProvider is always complete;\n      // allowPartialColumnList narrows the return type to non-undefined.\n      filterCollection = new ColumnCollectionBuilder(pframeSpec)\n        .addSource(filterSource)\n        .build({ anchors: { main: datasetSpec }, allowPartialColumnList: true });\n\n      enrichmentCollection =\n        enrichmentSources !== undefined\n          ? new ColumnCollectionBuilder(pframeSpec)\n              .addSources(enrichmentSources)\n              .build({ anchors: { main: datasetSpec } })\n          : undefined;\n\n      const filterMatches = findFilterColumns(filterCollection).filter((m) =>\n        filterPredicate(m.column.spec),\n      );\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, {\n              refsByObjectId: refMap,\n              datasetSpec,\n              labelOptions: opts?.labelOptions,\n            });\n\n      let enrichments;\n      if (enrichmentCollection && withEnrichments) {\n        const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {\n          maxHops: opts?.enrichmentMaxHops,\n          ...(typeof withEnrichments === \"function\"\n            ? { predicate: withEnrichments }\n            : { include: withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      filterCollection?.dispose();\n      enrichmentCollection?.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;;AAmBA,SAAS,YAAY,KAAsE;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,OAAA,GAAA,gCAAA,iCAAsC,IAAI;;;;;;;;AAiC/E,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,QAAQ;CACnD,MAAM,kBAAkB,YAAY,MAAM,OAAO;CAEjD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,SAASA,yBAAAA,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;CAE/C,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,IAAIC,2BAAAA,iCAAiC,IAAI,WAAW;CAIzE,MAAM,oBAAoB,kBAAkBC,2BAAAA,kCAAkC,IAAI,GAAG,KAAA;AAErF,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAIpC,IAAI;EACJ,IAAI;AACJ,MAAI;AAGF,sBAAmB,IAAIC,kCAAAA,wBAAwB,WAAW,CACvD,UAAU,aAAa,CACvB,MAAM;IAAE,SAAS,EAAE,MAAM,aAAa;IAAE,wBAAwB;IAAM,CAAC;AAE1E,0BACE,sBAAsB,KAAA,IAClB,IAAIA,kCAAAA,wBAAwB,WAAW,CACpC,WAAW,kBAAkB,CAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC,GAC5C,KAAA;GAEN,MAAM,gBAAgBC,yBAAAA,kBAAkB,iBAAiB,CAAC,QAAQ,MAChE,gBAAgB,EAAE,OAAO,KAAK,CAC/B;GACD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACAC,yBAAAA,uBAAuB,eAAe;IACpC,gBAAgB;IAChB;IACA,cAAc,MAAM;IACrB,CAAC;GAER,IAAI;AACJ,OAAI,wBAAwB,iBAAiB;IAC3C,MAAM,qBAAqBC,6BAAAA,sBAAsB,sBAAsB;KACrE,SAAS,MAAM;KACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,iBAAiB,GAC9B,EAAE,SAAS,iBAAiB;KACjC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAcC,6BAAAA,yBAAyB,oBAAoB,MAAM,aAAa;;AAIlF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,qBAAkB,SAAS;AAC3B,yBAAsB,SAAS;;GAEjC"}

package/dist/components/PlDatasetSelector/build_dataset_options.d.ts

@@ -12,7 +12,12 @@ type BuildDatasetOptions = {
    * with the built-in `pl7.app/isSubset: "true"` constraint. Defaults to
    * accept-all.
    */
-  filter?: SpecPredicateOption; /** Formatting options for filter labels. */
+  filter?: SpecPredicateOption;
+  /**
+   * Formatting options forwarded to label derivation for both filter and
+   * enrichment rows. `formatters.native` on the filter path is overridden
+   * — see `FilterMatchOptions.labelOptions`.
+   */
   labelOptions?: DeriveLabelsOptions;
   /**
    * Enables enrichment discovery and filters hits attached to

package/dist/components/PlDatasetSelector/build_dataset_options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_dataset_options.d.ts","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"mappings":";;;;;;KAcK,mBAAA,GACD,mBAAA,GACA,mBAAA,OACE,IAAA,EAAM,WAAA;AAAA,KAOA,mBAAA;wEAEV,OAAA,GAAU,mBAAA;EAZY;;;;;EAkBtB,MAAA,GAAS,mBAAA,EAfY;EAiBrB,YAAA,GAAe,mBAAA;EAlBb;;;;EAuBF,eAAA,GAAkB,mBAAA,EAfR;EAiBV,iBAAA;AAAA;;;;;;;iBASc,mBAAA,CACd,GAAA,EAAK,aAAA,EACL,IAAA,GAAO,mBAAA,GACN,aAAA"}
+{"version":3,"file":"build_dataset_options.d.ts","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"mappings":";;;;;;KAcK,mBAAA,GACD,mBAAA,GACA,mBAAA,OACE,IAAA,EAAM,WAAA;AAAA,KAOA,mBAAA;wEAEV,OAAA,GAAU,mBAAA;EAZY;;;;;EAkBtB,MAAA,GAAS,mBAAA;EAfY;;;;;EAqBrB,YAAA,GAAe,mBAAA;EArBM;AAOvB;;;EAmBE,eAAA,GAAkB,mBAAA,EAXT;EAaT,iBAAA;AAAA;;;;;;;iBASc,mBAAA,CACd,GAAA,EAAK,aAAA,EACL,IAAA,GAAO,mBAAA,GACN,aAAA"}

package/dist/components/PlDatasetSelector/build_dataset_options.js

@@ -36,7 +36,11 @@ function buildDatasetOptions(ctx, opts) {
 			});
 			enrichmentCollection = enrichmentSources !== void 0 ? new ColumnCollectionBuilder(pframeSpec).addSources(enrichmentSources).build({ anchors: { main: datasetSpec } }) : void 0;
 			const filterMatches = findFilterColumns(filterCollection).filter((m) => filterPredicate(m.column.spec));
-			const filters = filterMatches.length === 0 ? void 0 : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);
+			const filters = filterMatches.length === 0 ? void 0 : filterMatchesToOptions(filterMatches, {
+				refsByObjectId: refMap,
+				datasetSpec,
+				labelOptions: opts?.labelOptions
+			});
 			let enrichments;
 			if (enrichmentCollection && withEnrichments) {
 				const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {

package/dist/components/PlDatasetSelector/build_dataset_options.js.map

@@ -1 +1 @@
-{"version":3,"file":"build_dataset_options.js","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { AnchoredColumnCollection } from \"../../columns/column_collection_builder\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport {\n  ResultPoolColumnSnapshotProvider,\n  collectCtxColumnSnapshotProviders,\n} from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\ntype SpecPredicateOption =\n  | MultiColumnSelector\n  | MultiColumnSelector[]\n  | ((spec: PObjectSpec) => boolean);\n\nfunction toPredicate(opt: SpecPredicateOption | undefined): (spec: PObjectSpec) => boolean {\n  if (opt === undefined) return () => true;\n  return typeof opt === \"function\" ? opt : multiColumnSelectorsToPredicate(opt);\n}\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: SpecPredicateOption;\n  /**\n   * Restricts which result pool columns are considered as filters. Intersected\n   * with the built-in `pl7.app/isSubset: \"true\"` constraint. Defaults to\n   * accept-all.\n   */\n  filter?: SpecPredicateOption;\n  /** Formatting options for filter labels. */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: SpecPredicateOption;\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primaryPredicate = toPredicate(opts?.primary);\n  const filterPredicate = toPredicate(opts?.filter);\n\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  const withEnrichments = opts?.withEnrichments ?? false;\n  const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);\n  // Hoisted out of the per-option loop: collectCtxColumnSnapshotProviders\n  // walks the entire output tree, so calling it once per dataset option would\n  // be O(N × tree).\n  const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : undefined;\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    // Allocations happen inside try so a throw on the second build()\n    // still disposes the first collection.\n    let filterCollection: AnchoredColumnCollection | undefined;\n    let enrichmentCollection: AnchoredColumnCollection | undefined;\n    try {\n      // ResultPoolColumnSnapshotProvider is always complete;\n      // allowPartialColumnList narrows the return type to non-undefined.\n      filterCollection = new ColumnCollectionBuilder(pframeSpec)\n        .addSource(filterSource)\n        .build({ anchors: { main: datasetSpec }, allowPartialColumnList: true });\n\n      enrichmentCollection =\n        enrichmentSources !== undefined\n          ? new ColumnCollectionBuilder(pframeSpec)\n              .addSources(enrichmentSources)\n              .build({ anchors: { main: datasetSpec } })\n          : undefined;\n\n      const filterMatches = findFilterColumns(filterCollection).filter((m) =>\n        filterPredicate(m.column.spec),\n      );\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, refMap, opts?.labelOptions);\n\n      let enrichments;\n      if (enrichmentCollection && withEnrichments) {\n        const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {\n          maxHops: opts?.enrichmentMaxHops,\n          ...(typeof withEnrichments === \"function\"\n            ? { predicate: withEnrichments }\n            : { include: withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      filterCollection?.dispose();\n      enrichmentCollection?.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;AAmBA,SAAS,YAAY,KAAsE;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,MAAM,gCAAgC,IAAI;;;;;;;;AA6B/E,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,QAAQ;CACnD,MAAM,kBAAkB,YAAY,MAAM,OAAO;CAEjD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,SAAS,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;CAE/C,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,IAAI,iCAAiC,IAAI,WAAW;CAIzE,MAAM,oBAAoB,kBAAkB,kCAAkC,IAAI,GAAG,KAAA;AAErF,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAIpC,IAAI;EACJ,IAAI;AACJ,MAAI;AAGF,sBAAmB,IAAI,wBAAwB,WAAW,CACvD,UAAU,aAAa,CACvB,MAAM;IAAE,SAAS,EAAE,MAAM,aAAa;IAAE,wBAAwB;IAAM,CAAC;AAE1E,0BACE,sBAAsB,KAAA,IAClB,IAAI,wBAAwB,WAAW,CACpC,WAAW,kBAAkB,CAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC,GAC5C,KAAA;GAEN,MAAM,gBAAgB,kBAAkB,iBAAiB,CAAC,QAAQ,MAChE,gBAAgB,EAAE,OAAO,KAAK,CAC/B;GACD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACA,uBAAuB,eAAe,QAAQ,MAAM,aAAa;GAEvE,IAAI;AACJ,OAAI,wBAAwB,iBAAiB;IAC3C,MAAM,qBAAqB,sBAAsB,sBAAsB;KACrE,SAAS,MAAM;KACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,iBAAiB,GAC9B,EAAE,SAAS,iBAAiB;KACjC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAc,yBAAyB,oBAAoB,MAAM,aAAa;;AAIlF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,qBAAkB,SAAS;AAC3B,yBAAsB,SAAS;;GAEjC"}
+{"version":3,"file":"build_dataset_options.js","names":[],"sources":["../../../src/components/PlDatasetSelector/build_dataset_options.ts"],"sourcesContent":["import type { MultiColumnSelector, Option, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport { multiColumnSelectorsToPredicate } from \"@milaboratories/pl-model-common\";\nimport type { DeriveLabelsOptions } from \"../../labels/derive_distinct_labels\";\nimport type { RenderCtxBase } from \"../../render\";\nimport type { AnchoredColumnCollection } from \"../../columns/column_collection_builder\";\nimport { ColumnCollectionBuilder } from \"../../columns/column_collection_builder\";\nimport {\n  ResultPoolColumnSnapshotProvider,\n  collectCtxColumnSnapshotProviders,\n} from \"../../columns/ctx_column_sources\";\nimport type { DatasetOption } from \"./dataset_selection\";\nimport { buildRefMap, filterMatchesToOptions, findFilterColumns } from \"./filter_discovery\";\nimport { enrichmentVariantsToRefs, findEnrichmentColumns } from \"./enrichment_discovery\";\n\ntype SpecPredicateOption =\n  | MultiColumnSelector\n  | MultiColumnSelector[]\n  | ((spec: PObjectSpec) => boolean);\n\nfunction toPredicate(opt: SpecPredicateOption | undefined): (spec: PObjectSpec) => boolean {\n  if (opt === undefined) return () => true;\n  return typeof opt === \"function\" ? opt : multiColumnSelectorsToPredicate(opt);\n}\n\nexport type BuildDatasetOptions = {\n  /** Which result pool columns qualify as datasets. Defaults to all. */\n  primary?: SpecPredicateOption;\n  /**\n   * Restricts which result pool columns are considered as filters. Intersected\n   * with the built-in `pl7.app/isSubset: \"true\"` constraint. Defaults to\n   * accept-all.\n   */\n  filter?: SpecPredicateOption;\n  /**\n   * Formatting options forwarded to label derivation for both filter and\n   * enrichment rows. `formatters.native` on the filter path is overridden\n   * — see `FilterMatchOptions.labelOptions`.\n   */\n  labelOptions?: DeriveLabelsOptions;\n  /**\n   * Enables enrichment discovery and filters hits attached to\n   * `DatasetOption.enrichments`. Use `() => true` to accept all; omit to disable.\n   */\n  withEnrichments?: SpecPredicateOption;\n  /** Maximum linker hops considered. Only used when `withEnrichments` is set. */\n  enrichmentMaxHops?: number;\n};\n\n/**\n * Usage:\n * ```ts\n * .output(\"datasetOptions\", (ctx) => buildDatasetOptions(ctx))\n * ```\n */\nexport function buildDatasetOptions(\n  ctx: RenderCtxBase,\n  opts?: BuildDatasetOptions,\n): DatasetOption[] | undefined {\n  const primaryPredicate = toPredicate(opts?.primary);\n  const filterPredicate = toPredicate(opts?.filter);\n\n  const options = ctx.resultPool.getOptions(primaryPredicate, { refsWithEnrichments: true });\n  if (options.length === 0) return [];\n\n  const refMap = buildRefMap(ctx.resultPool.getSpecs().entries);\n  const pframeSpec = ctx.getService(\"pframeSpec\");\n\n  const withEnrichments = opts?.withEnrichments ?? false;\n  const filterSource = new ResultPoolColumnSnapshotProvider(ctx.resultPool);\n  // Hoisted out of the per-option loop: collectCtxColumnSnapshotProviders\n  // walks the entire output tree, so calling it once per dataset option would\n  // be O(N × tree).\n  const enrichmentSources = withEnrichments ? collectCtxColumnSnapshotProviders(ctx) : undefined;\n\n  return options.map((primary: Option): DatasetOption => {\n    const datasetSpec = ctx.resultPool.getPColumnSpecByRef(primary.ref);\n    if (!datasetSpec) return { primary };\n\n    // Allocations happen inside try so a throw on the second build()\n    // still disposes the first collection.\n    let filterCollection: AnchoredColumnCollection | undefined;\n    let enrichmentCollection: AnchoredColumnCollection | undefined;\n    try {\n      // ResultPoolColumnSnapshotProvider is always complete;\n      // allowPartialColumnList narrows the return type to non-undefined.\n      filterCollection = new ColumnCollectionBuilder(pframeSpec)\n        .addSource(filterSource)\n        .build({ anchors: { main: datasetSpec }, allowPartialColumnList: true });\n\n      enrichmentCollection =\n        enrichmentSources !== undefined\n          ? new ColumnCollectionBuilder(pframeSpec)\n              .addSources(enrichmentSources)\n              .build({ anchors: { main: datasetSpec } })\n          : undefined;\n\n      const filterMatches = findFilterColumns(filterCollection).filter((m) =>\n        filterPredicate(m.column.spec),\n      );\n      const filters =\n        filterMatches.length === 0\n          ? undefined\n          : filterMatchesToOptions(filterMatches, {\n              refsByObjectId: refMap,\n              datasetSpec,\n              labelOptions: opts?.labelOptions,\n            });\n\n      let enrichments;\n      if (enrichmentCollection && withEnrichments) {\n        const enrichmentVariants = findEnrichmentColumns(enrichmentCollection, {\n          maxHops: opts?.enrichmentMaxHops,\n          ...(typeof withEnrichments === \"function\"\n            ? { predicate: withEnrichments }\n            : { include: withEnrichments }),\n        });\n        if (enrichmentVariants.length > 0) {\n          enrichments = enrichmentVariantsToRefs(enrichmentVariants, opts?.labelOptions);\n        }\n      }\n\n      return {\n        primary,\n        ...(filters !== undefined && filters.length > 0 ? { filters } : {}),\n        ...(enrichments !== undefined && enrichments.length > 0 ? { enrichments } : {}),\n      };\n    } finally {\n      filterCollection?.dispose();\n      enrichmentCollection?.dispose();\n    }\n  });\n}\n"],"mappings":";;;;;;AAmBA,SAAS,YAAY,KAAsE;AACzF,KAAI,QAAQ,KAAA,EAAW,cAAa;AACpC,QAAO,OAAO,QAAQ,aAAa,MAAM,gCAAgC,IAAI;;;;;;;;AAiC/E,SAAgB,oBACd,KACA,MAC6B;CAC7B,MAAM,mBAAmB,YAAY,MAAM,QAAQ;CACnD,MAAM,kBAAkB,YAAY,MAAM,OAAO;CAEjD,MAAM,UAAU,IAAI,WAAW,WAAW,kBAAkB,EAAE,qBAAqB,MAAM,CAAC;AAC1F,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,SAAS,YAAY,IAAI,WAAW,UAAU,CAAC,QAAQ;CAC7D,MAAM,aAAa,IAAI,WAAW,aAAa;CAE/C,MAAM,kBAAkB,MAAM,mBAAmB;CACjD,MAAM,eAAe,IAAI,iCAAiC,IAAI,WAAW;CAIzE,MAAM,oBAAoB,kBAAkB,kCAAkC,IAAI,GAAG,KAAA;AAErF,QAAO,QAAQ,KAAK,YAAmC;EACrD,MAAM,cAAc,IAAI,WAAW,oBAAoB,QAAQ,IAAI;AACnE,MAAI,CAAC,YAAa,QAAO,EAAE,SAAS;EAIpC,IAAI;EACJ,IAAI;AACJ,MAAI;AAGF,sBAAmB,IAAI,wBAAwB,WAAW,CACvD,UAAU,aAAa,CACvB,MAAM;IAAE,SAAS,EAAE,MAAM,aAAa;IAAE,wBAAwB;IAAM,CAAC;AAE1E,0BACE,sBAAsB,KAAA,IAClB,IAAI,wBAAwB,WAAW,CACpC,WAAW,kBAAkB,CAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,EAAE,CAAC,GAC5C,KAAA;GAEN,MAAM,gBAAgB,kBAAkB,iBAAiB,CAAC,QAAQ,MAChE,gBAAgB,EAAE,OAAO,KAAK,CAC/B;GACD,MAAM,UACJ,cAAc,WAAW,IACrB,KAAA,IACA,uBAAuB,eAAe;IACpC,gBAAgB;IAChB;IACA,cAAc,MAAM;IACrB,CAAC;GAER,IAAI;AACJ,OAAI,wBAAwB,iBAAiB;IAC3C,MAAM,qBAAqB,sBAAsB,sBAAsB;KACrE,SAAS,MAAM;KACf,GAAI,OAAO,oBAAoB,aAC3B,EAAE,WAAW,iBAAiB,GAC9B,EAAE,SAAS,iBAAiB;KACjC,CAAC;AACF,QAAI,mBAAmB,SAAS,EAC9B,eAAc,yBAAyB,oBAAoB,MAAM,aAAa;;AAIlF,UAAO;IACL;IACA,GAAI,YAAY,KAAA,KAAa,QAAQ,SAAS,IAAI,EAAE,SAAS,GAAG,EAAE;IAClE,GAAI,gBAAgB,KAAA,KAAa,YAAY,SAAS,IAAI,EAAE,aAAa,GAAG,EAAE;IAC/E;YACO;AACR,qBAAkB,SAAS;AAC3B,yBAAsB,SAAS;;GAEjC"}

package/dist/components/PlDatasetSelector/filter_discovery.cjs

@@ -5,12 +5,8 @@ let canonicalize = require("canonicalize");
 canonicalize = require_runtime.__toESM(canonicalize);
 //#region src/components/PlDatasetSelector/filter_discovery.ts
 /**
-* Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
-*
-* The axes-subset constraint is enforced by `mode: "enrichment"`, which sets
-* `allowFloatingHitAxes: false` — every axis of the matched column must be
-* present in the anchor's axes. See `matchingModeToConstraints()` in
-* `column_collection_builder.ts`.
+* Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+* The axes-subset constraint comes from `mode: "enrichment"`.
 */
 function findFilterColumns(collection) {
 	return collection.findColumns({
@@ -19,42 +15,37 @@ function findFilterColumns(collection) {
 	});
 }
 /**
-* Derive labeled options from filter column matches, for use in DatasetOption.filters.
-*
-* Entries whose column id has no PlRef in `refsByObjectId` are silently
-* skipped — they cannot be exposed as user-selectable options.
-*
-* @param matches - from findFilterColumns()
-* @param refsByObjectId - from {@link buildRefMap}
-* @param labelOptions - forwarded to deriveDistinctLabels()
+* Derive labels for filter column matches (for `DatasetOption.filters`).
+* Matches whose column id is missing from `refsByObjectId` are silently
+* dropped — they cannot be exposed as selectable options.
 */
-function filterMatchesToOptions(matches, refsByObjectId, labelOptions) {
+function filterMatchesToOptions(matches, options) {
 	if (matches.length === 0) return [];
-	const flattened = matches.flatMap((match) => {
+	const { refsByObjectId, datasetSpec, labelOptions } = options;
+	const entries = matches.flatMap((match) => {
 		const ref = refsByObjectId.get(match.column.id);
 		if (ref === void 0) return [];
 		return match.variants.map((variant) => ({
-			match,
-			variant,
-			ref
+			ref,
+			spec: match.column.spec,
+			linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
 		}));
 	});
-	const labels = require_derive_distinct_labels.deriveDistinctLabels(flattened.map(({ match, variant }) => ({
-		spec: match.column.spec,
-		linkerPath: variant.path.map((p) => ({ spec: p.linker.spec }))
-	})), labelOptions);
-	return flattened.map(({ ref }, i) => ({
+	const labels = require_derive_distinct_labels.deriveDistinctLabels([...entries, { spec: datasetSpec }], {
+		...labelOptions,
+		formatters: {
+			...labelOptions?.formatters,
+			native: () => void 0
+		}
+	});
+	return entries.map(({ ref }, i) => ({
 		ref,
 		label: labels[i]
 	}));
 }
-/**
-* Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`
-*/
+/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */
 function buildRefMap(entries) {
-	const map = /* @__PURE__ */ new Map();
-	for (const entry of entries) map.set((0, canonicalize.default)(entry.ref), entry.ref);
-	return map;
+	return new Map(entries.map((e) => [(0, canonicalize.default)(e.ref), e.ref]));
 }
 //#endregion
 exports.buildRefMap = buildRefMap;

package/dist/components/PlDatasetSelector/filter_discovery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"filter_discovery.cjs","names":["Annotation","deriveDistinctLabels"],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { Option, PlRef, PObjectId } from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnMatch,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * Matches columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n *\n * The axes-subset constraint is enforced by `mode: \"enrichment\"`, which sets\n * `allowFloatingHitAxes: false` — every axis of the matched column must be\n * present in the anchor's axes. See `matchingModeToConstraints()` in\n * `column_collection_builder.ts`.\n */\nexport function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[] {\n  return collection.findColumns({\n    mode: \"enrichment\",\n    include: {\n      annotations: { [Annotation.IsSubset]: \"true\" },\n    },\n  });\n}\n\n/**\n * Derive labeled options from filter column matches, for use in DatasetOption.filters.\n *\n * Entries whose column id has no PlRef in `refsByObjectId` are silently\n * skipped — they cannot be exposed as user-selectable options.\n *\n * @param matches - from findFilterColumns()\n * @param refsByObjectId - from {@link buildRefMap}\n * @param labelOptions - forwarded to deriveDistinctLabels()\n */\nexport function filterMatchesToOptions(\n  matches: ColumnMatch[],\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>,\n  labelOptions?: DeriveLabelsOptions,\n): Option[] {\n  if (matches.length === 0) return [];\n\n  // Each ColumnMatch can be reached via multiple variants (different linker\n  // paths / qualifications). We emit one Option per variant so the user can\n  // pick a specific path — `deriveDistinctLabels` disambiguates labels by\n  // path. All variants of a match share a column id, so the ref lookup\n  // happens once per match.\n  const flattened = matches.flatMap((match) => {\n    const ref = refsByObjectId.get(match.column.id);\n    if (ref === undefined) return [];\n    return match.variants.map((variant) => ({ match, variant, ref }));\n  });\n\n  const entries: Entry[] = flattened.map(({ match, variant }) => ({\n    spec: match.column.spec,\n    linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),\n  }));\n\n  const labels = deriveDistinctLabels(entries, labelOptions);\n\n  return flattened.map(({ ref }, i) => ({ ref, label: labels[i] }));\n}\n\n/**\n * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`\n */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  const map = new Map<PObjectId, PlRef>();\n  for (const entry of entries) {\n    map.set(canonicalize(entry.ref)! as PObjectId, entry.ref);\n  }\n  return map;\n}\n"],"mappings":";;;;;;;;;;;;;;AAqBA,SAAgB,kBAAkB,YAAqD;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAGA,gCAAAA,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;;;;;;AAaJ,SAAgB,uBACd,SACA,gBACA,cACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAOnC,MAAM,YAAY,QAAQ,SAAS,UAAU;EAC3C,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EAAW,QAAO,EAAE;AAChC,SAAO,MAAM,SAAS,KAAK,aAAa;GAAE;GAAO;GAAS;GAAK,EAAE;GACjE;CAOF,MAAM,SAASC,+BAAAA,qBALU,UAAU,KAAK,EAAE,OAAO,eAAe;EAC9D,MAAM,MAAM,OAAO;EACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;EAC/D,EAAE,EAE0C,aAAa;AAE1D,QAAO,UAAU,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;EAAI,EAAE;;;;;AAMnE,SAAgB,YAAY,SAAoE;CAC9F,MAAM,sBAAM,IAAI,KAAuB;AACvC,MAAK,MAAM,SAAS,QAClB,KAAI,KAAA,GAAA,aAAA,SAAiB,MAAM,IAAI,EAAgB,MAAM,IAAI;AAE3D,QAAO"}
+{"version":3,"file":"filter_discovery.cjs","names":["Annotation","deriveDistinctLabels"],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { Option, PlRef, PObjectId, PObjectSpec } from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type {\n  AnchoredColumnCollection,\n  ColumnMatch,\n} from \"../../columns/column_collection_builder\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\n/**\n * Columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n * The axes-subset constraint comes from `mode: \"enrichment\"`.\n */\nexport function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[] {\n  return collection.findColumns({\n    mode: \"enrichment\",\n    include: {\n      annotations: { [Annotation.IsSubset]: \"true\" },\n    },\n  });\n}\n\nexport type FilterMatchOptions = {\n  /** Maps result-pool column id back to its source PlRef (see {@link buildRefMap}). */\n  refsByObjectId: ReadonlyMap<PObjectId, PlRef>;\n  /** Spec of the dataset the filters are subsets of. */\n  datasetSpec: PObjectSpec;\n  /**\n   * Forwarded to `deriveDistinctLabels`. Any `formatters.native` caller\n   * sets is silently overridden — the function relies on a no-op native\n   * formatter to keep the algorithm from short-circuiting on filters'\n   * inherited `pl7.app/label`.\n   */\n  labelOptions?: DeriveLabelsOptions;\n};\n\n/**\n * Derive labels for filter column matches (for `DatasetOption.filters`).\n * Matches whose column id is missing from `refsByObjectId` are silently\n * dropped — they cannot be exposed as selectable options.\n */\nexport function filterMatchesToOptions(\n  matches: ColumnMatch[],\n  options: FilterMatchOptions,\n): Option[] {\n  if (matches.length === 0) return [];\n\n  const { refsByObjectId, datasetSpec, labelOptions } = options;\n\n  // One entry per match-variant (different paths to the same column are\n  // exposed as separate Options). The `ref` field rides along on the\n  // Entry-shaped objects via structural typing; `deriveDistinctLabels`\n  // ignores extra fields.\n  const entries = matches.flatMap((match): (Entry & { ref: PlRef })[] => {\n    const ref = refsByObjectId.get(match.column.id);\n    if (ref === undefined) return [];\n    return match.variants.map((variant) => ({\n      ref,\n      spec: match.column.spec,\n      linkerPath: variant.path.map((p) => ({ spec: p.linker.spec })),\n    }));\n  });\n\n  // Appending the dataset forces a discriminating trace step into every\n  // filter label (yielding e.g. \"Bulk / Top 10\"); the dataset's own label\n  // is dropped because we only zip `entries`. Native label is force-\n  // suppressed (the override sits after caller's spread) — filters\n  // inherit the dataset's `pl7.app/label` and would otherwise satisfy\n  // uniqueness before any trace step is consulted.\n  const labels = deriveDistinctLabels([...entries, { spec: datasetSpec }], {\n    ...labelOptions,\n    formatters: { ...labelOptions?.formatters, native: () => undefined },\n  });\n\n  return entries.map(({ ref }, i) => ({ ref, label: labels[i] }));\n}\n\n/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */\nexport function buildRefMap(entries: readonly { readonly ref: PlRef }[]): Map<PObjectId, PlRef> {\n  return new Map(entries.map((e) => [canonicalize(e.ref)! as PObjectId, e.ref]));\n}\n"],"mappings":";;;;;;;;;;AAiBA,SAAgB,kBAAkB,YAAqD;AACrF,QAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAGA,gCAAAA,WAAW,WAAW,QAAQ,EAC/C;EACF,CAAC;;;;;;;AAsBJ,SAAgB,uBACd,SACA,SACU;AACV,KAAI,QAAQ,WAAW,EAAG,QAAO,EAAE;CAEnC,MAAM,EAAE,gBAAgB,aAAa,iBAAiB;CAMtD,MAAM,UAAU,QAAQ,SAAS,UAAsC;EACrE,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,GAAG;AAC/C,MAAI,QAAQ,KAAA,EAAW,QAAO,EAAE;AAChC,SAAO,MAAM,SAAS,KAAK,aAAa;GACtC;GACA,MAAM,MAAM,OAAO;GACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,MAAM,EAAE;GAC/D,EAAE;GACH;CAQF,MAAM,SAASC,+BAAAA,qBAAqB,CAAC,GAAG,SAAS,EAAE,MAAM,aAAa,CAAC,EAAE;EACvE,GAAG;EACH,YAAY;GAAE,GAAG,cAAc;GAAY,cAAc,KAAA;GAAW;EACrE,CAAC;AAEF,QAAO,QAAQ,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;EAAI,EAAE;;;AAIjE,SAAgB,YAAY,SAAoE;AAC9F,QAAO,IAAI,IAAI,QAAQ,KAAK,MAAM,EAAA,GAAA,aAAA,SAAc,EAAE,IAAI,EAAgB,EAAE,IAAI,CAAC,CAAC"}

package/dist/components/PlDatasetSelector/filter_discovery.d.ts

@@ -1,34 +1,34 @@
 import { AnchoredColumnCollection, ColumnMatch } from "../../columns/column_collection_builder.js";
 import { DeriveLabelsOptions } from "../../labels/derive_distinct_labels.js";
-import { Option, PObjectId, PlRef } from "@milaboratories/pl-model-common";
+import { Option, PObjectId, PObjectSpec, PlRef } from "@milaboratories/pl-model-common";
 
 //#region src/components/PlDatasetSelector/filter_discovery.d.ts
 /**
- * Matches columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
- *
- * The axes-subset constraint is enforced by `mode: "enrichment"`, which sets
- * `allowFloatingHitAxes: false` — every axis of the matched column must be
- * present in the anchor's axes. See `matchingModeToConstraints()` in
- * `column_collection_builder.ts`.
+ * Columns annotated `pl7.app/isSubset: "true"` whose axes ⊆ anchor axes.
+ * The axes-subset constraint comes from `mode: "enrichment"`.
  */
 declare function findFilterColumns(collection: AnchoredColumnCollection): ColumnMatch[];
+type FilterMatchOptions = {
+  /** Maps result-pool column id back to its source PlRef (see {@link buildRefMap}). */refsByObjectId: ReadonlyMap<PObjectId, PlRef>; /** Spec of the dataset the filters are subsets of. */
+  datasetSpec: PObjectSpec;
+  /**
+   * Forwarded to `deriveDistinctLabels`. Any `formatters.native` caller
+   * sets is silently overridden — the function relies on a no-op native
+   * formatter to keep the algorithm from short-circuiting on filters'
+   * inherited `pl7.app/label`.
+   */
+  labelOptions?: DeriveLabelsOptions;
+};
 /**
- * Derive labeled options from filter column matches, for use in DatasetOption.filters.
- *
- * Entries whose column id has no PlRef in `refsByObjectId` are silently
- * skipped — they cannot be exposed as user-selectable options.
- *
- * @param matches - from findFilterColumns()
- * @param refsByObjectId - from {@link buildRefMap}
- * @param labelOptions - forwarded to deriveDistinctLabels()
- */
-declare function filterMatchesToOptions(matches: ColumnMatch[], refsByObjectId: ReadonlyMap<PObjectId, PlRef>, labelOptions?: DeriveLabelsOptions): Option[];
-/**
- * Usage: `buildRefMap(ctx.resultPool.getSpecs().entries)`
+ * Derive labels for filter column matches (for `DatasetOption.filters`).
+ * Matches whose column id is missing from `refsByObjectId` are silently
+ * dropped — they cannot be exposed as selectable options.
  */
+declare function filterMatchesToOptions(matches: ColumnMatch[], options: FilterMatchOptions): Option[];
+/** Build the `refsByObjectId` map from `ctx.resultPool.getSpecs().entries`. */
 declare function buildRefMap(entries: readonly {
   readonly ref: PlRef;
 }[]): Map<PObjectId, PlRef>;
 //#endregion
-export { buildRefMap, filterMatchesToOptions, findFilterColumns };
+export { FilterMatchOptions, buildRefMap, filterMatchesToOptions, findFilterColumns };
 //# sourceMappingURL=filter_discovery.d.ts.map