@platforma-sdk/model 1.79.27 → 1.80.2

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

@@ -1 +1 @@
-{"version":3,"file":"filter_discovery.js","names":[],"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;CACrF,OAAO,WAAW,YAAY;EAC5B,MAAM;EACN,SAAS,EACP,aAAa,GAAG,WAAW,WAAW,OAAO,EAC/C;CACF,CAAC;AACH;;;;;;AAqBA,SAAgB,uBACd,SACA,SACU;CACV,IAAI,QAAQ,WAAW,GAAG,OAAO,CAAC;CAElC,MAAM,EAAE,gBAAgB,aAAa,iBAAiB;CAMtD,MAAM,UAAU,QAAQ,SAAS,UAAsC;EACrE,MAAM,MAAM,eAAe,IAAI,MAAM,OAAO,EAAE;EAC9C,IAAI,QAAQ,KAAA,GAAW,OAAO,CAAC;EAC/B,OAAO,MAAM,SAAS,KAAK,aAAa;GACtC;GACA,MAAM,MAAM,OAAO;GACnB,YAAY,QAAQ,KAAK,KAAK,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,EAAE;EAC/D,EAAE;CACJ,CAAC;CAQD,MAAM,SAAS,qBAAqB,CAAC,GAAG,SAAS,EAAE,MAAM,YAAY,CAAC,GAAG;EACvE,GAAG;EACH,YAAY;GAAE,GAAG,cAAc;GAAY,cAAc,KAAA;EAAU;CACrE,CAAC;CAED,OAAO,QAAQ,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;CAAG,EAAE;AAChE;;AAGA,SAAgB,YAAY,SAAoE;CAC9F,OAAO,IAAI,IAAI,QAAQ,KAAK,MAAM,CAAC,aAAa,EAAE,GAAG,GAAiB,EAAE,GAAG,CAAC,CAAC;AAC/E"}
+{"version":3,"file":"filter_discovery.js","names":[],"sources":["../../../src/components/PlDatasetSelector/filter_discovery.ts"],"sourcesContent":["import { Annotation, extractPObjectId } from \"@milaboratories/pl-model-common\";\nimport type {\n  ColumnsCollectionDriverModel,\n  Option,\n  PColumnSpec,\n  PlRef,\n  PObjectId,\n  PObjectSpec,\n} from \"@milaboratories/pl-model-common\";\nimport canonicalize from \"canonicalize\";\nimport type { ColumnRecipe, ColumnsSource } from \"../../columns\";\nimport { ColumnsCollection, collectLinkerColumns } from \"../../columns\";\nimport {\n  deriveDistinctLabels,\n  type DeriveLabelsOptions,\n  type Entry,\n} from \"../../labels/derive_distinct_labels\";\n\nexport interface FindFilterColumnsOptions {\n  sources: ReadonlyArray<ColumnsSource>;\n  anchorSpec: PColumnSpec;\n  /** Override the resolved `columnsCollection` service (primarily for tests). */\n  driver?: ColumnsCollectionDriverModel;\n}\n\n/**\n * Matches columns annotated `pl7.app/isSubset: \"true\"` whose axes ⊆ anchor axes.\n *\n * Filter-intent: only the dataset's own direct subset columns, no linker\n * traversal — so this uses `.filter()` (pins `maxHops: 0`), not `.discover()`\n * (which would default to 4 hops and surface subset columns from other,\n * linker-reachable datasets). `.filter()` still applies the default\n * `enrichment` matching mode (`allowFloatingHitAxes: false`), which enforces\n * the axes-subset constraint. See `matchingModeToConstraints()`.\n */\nexport function findFilterColumns(options: FindFilterColumnsOptions): ColumnRecipe[] {\n  return ColumnsCollection([...options.sources], { driver: options.driver })\n    .filter({\n      anchors: { main: options.anchorSpec },\n      include: { annotations: { [Annotation.IsSubset]: \"true\" } },\n    })\n    .getColumns();\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 labeled options from filter column variants, 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 */\nexport function filterMatchesToOptions(\n  variants: ColumnRecipe[],\n  options: FilterMatchOptions,\n): Option[] {\n  if (variants.length === 0) return [];\n\n  const { refsByObjectId, datasetSpec, labelOptions } = options;\n\n  // One Option per variant — `deriveDistinctLabels` disambiguates labels by\n  // path. All variants of the same column share a terminal PObjectId, so the\n  // ref lookup happens once per variant.\n  const entries: (Entry & { ref: PlRef })[] = variants.flatMap((variant) => {\n    const ref = refsByObjectId.get(extractPObjectId(variant.id));\n    if (ref === undefined) return [];\n    return [\n      {\n        ref,\n        spec: variant.getSpec(),\n        linkerPath: collectLinkerColumns(variant).map((linker) => ({ spec: linker.getSpec() })),\n      },\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":";;;;;;;;;;;;;;;;;AAmCA,SAAgB,kBAAkB,SAAmD;CACnF,OAAO,kBAAkB,CAAC,GAAG,QAAQ,OAAO,GAAG,EAAE,QAAQ,QAAQ,OAAO,CAAC,CAAC,CACvE,OAAO;EACN,SAAS,EAAE,MAAM,QAAQ,WAAW;EACpC,SAAS,EAAE,aAAa,GAAG,WAAW,WAAW,OAAO,EAAE;CAC5D,CAAC,CAAC,CACD,WAAW;AAChB;;;;;;;AAsBA,SAAgB,uBACd,UACA,SACU;CACV,IAAI,SAAS,WAAW,GAAG,OAAO,CAAC;CAEnC,MAAM,EAAE,gBAAgB,aAAa,iBAAiB;CAKtD,MAAM,UAAsC,SAAS,SAAS,YAAY;EACxE,MAAM,MAAM,eAAe,IAAI,iBAAiB,QAAQ,EAAE,CAAC;EAC3D,IAAI,QAAQ,KAAA,GAAW,OAAO,CAAC;EAC/B,OAAO,CACL;GACE;GACA,MAAM,QAAQ,QAAQ;GACtB,YAAY,qBAAqB,OAAO,CAAC,CAAC,KAAK,YAAY,EAAE,MAAM,OAAO,QAAQ,EAAE,EAAE;EACxF,CACF;CACF,CAAC;CAQD,MAAM,SAAS,qBAAqB,CAAC,GAAG,SAAS,EAAE,MAAM,YAAY,CAAC,GAAG;EACvE,GAAG;EACH,YAAY;GAAE,GAAG,cAAc;GAAY,cAAc,KAAA;EAAU;CACrE,CAAC;CAED,OAAO,QAAQ,KAAK,EAAE,OAAO,OAAO;EAAE;EAAK,OAAO,OAAO;CAAG,EAAE;AAChE;;AAGA,SAAgB,YAAY,SAAoE;CAC9F,OAAO,IAAI,IAAI,QAAQ,KAAK,MAAM,CAAC,aAAa,EAAE,GAAG,GAAiB,EAAE,GAAG,CAAC,CAAC;AAC/E"}

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

@@ -1,4 +1,4 @@
 import { DatasetOption, DatasetSelection, createDatasetSelection, isDatasetSelection } from "./dataset_selection.js";
-import { FilterMatchOptions, buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
+import { FilterMatchOptions, FindFilterColumnsOptions, buildRefMap, filterMatchesToOptions, findFilterColumns } from "./filter_discovery.js";
 import { BuildDatasetOptions, buildDatasetOptions } from "./build_dataset_options.js";
-export { BuildDatasetOptions, DatasetOption, DatasetSelection, FilterMatchOptions, buildDatasetOptions, buildRefMap, createDatasetSelection, filterMatchesToOptions, findFilterColumns, isDatasetSelection };
+export { BuildDatasetOptions, DatasetOption, DatasetSelection, FilterMatchOptions, FindFilterColumnsOptions, buildDatasetOptions, buildRefMap, createDatasetSelection, filterMatchesToOptions, findFilterColumns, isDatasetSelection };

package/dist/components/index.cjs

@@ -30,7 +30,7 @@ exports.createPlDataTableV2 = require_createPlDataTableV2.createPlDataTableV2;
 exports.createPlDataTableV3 = require_createPlDataTableV3.createPlDataTableV3;
 exports.createPlSelectionModel = require_PlSelectionModel.createPlSelectionModel;
 exports.createRowSelectionColumn = require_PlMultiSequenceAlignment.createRowSelectionColumn;
-exports.discoverTableColumnSnaphots = require_discoverColumns.discoverTableColumnSnaphots;
+exports.discoverTableColumnSnaphots = require_discoverColumns.discoverTableColumns;
 exports.enrichCompatible = require_axes.enrichCompatible;
 exports.filterMatchesToOptions = require_filter_discovery.filterMatchesToOptions;
 exports.findFilterColumns = require_filter_discovery.findFilterColumns;

package/dist/components/index.d.ts

@@ -3,16 +3,16 @@ import { createPFrameForGraphs, isHiddenFromGraphColumn, isHiddenFromUIColumn }
 import { AndFilter, AnnotationFilter, AnnotationMode, AnnotationScript, AnnotationScript2, AnnotationStep, IsNA, Log10, NotFilter, NumericalComparisonFilter, OrFilter, PatternFilter, PatternPredicate, PatternPredicateContainSubsequence, PatternPredicateEquals, SortedCumulativeSum, TransformedColumn, ValueRank } from "./PlAnnotations/filter.js";
 import { AnnotationScriptUi, AnnotationStepUi, AnyForm, FilterUi, FilterUiOfType, FilterUiType, FormField, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, compileAnnotationScript, compileFilter, compileFilters, unreachable } from "./PlAnnotations/filters_ui.js";
 import { DatasetOption, DatasetSelection, createDatasetSelection, isDatasetSelection } from "./PlDatasetSelector/dataset_selection.js";
-import { FilterMatchOptions, buildRefMap, filterMatchesToOptions, findFilterColumns } from "./PlDatasetSelector/filter_discovery.js";
+import { FilterMatchOptions, FindFilterColumnsOptions, buildRefMap, filterMatchesToOptions, findFilterColumns } from "./PlDatasetSelector/filter_discovery.js";
 import { BuildDatasetOptions, buildDatasetOptions } from "./PlDatasetSelector/build_dataset_options.js";
-import { PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnIdJson } from "./PlDataTable/typesV7.js";
+import { PTableParamsV2, PlDataTableAxisMeta, PlDataTableColumnMeta, PlDataTableColumnsMeta, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnIdJson } from "./PlDataTable/typesV8.js";
 import { PlDataTableStateV2, createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./PlDataTable/state-migration.js";
 import { createPlDataTableSheet } from "./PlDataTable/createPlDataTableSheet.js";
 import { createPlDataTableV2 } from "./PlDataTable/createPlDataTable/createPlDataTableV2.js";
-import { discoverTableColumnSnaphots } from "./PlDataTable/createPlDataTable/discoverColumns.js";
-import { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule, ColumnsDisplayOptions, ColumnsSelectorConfig, createPlDataTableOptionsV3, createPlDataTableV3 } from "./PlDataTable/createPlDataTable/createPlDataTableV3.js";
+import { discoverTableColumns } from "./PlDataTable/createPlDataTable/discoverColumns.js";
+import { ColumnOrderRule, ColumnVisibilityRule, ColumnsDisplayOptions, ColumnsSelectorConfig, createPlDataTableOptionsV3, createPlDataTableV3 } from "./PlDataTable/createPlDataTable/createPlDataTableV3.js";
 import { createPlDataTable } from "./PlDataTable/createPlDataTable/index.js";
 import { getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional } from "./PlDataTable/createPlDataTable/utils.js";
 import { PTableKey, PlSelectionModel, createPlSelectionModel } from "./PlSelectionModel.js";
 import { PColumnPredicate, PlMultiSequenceAlignmentColorSchemeOption, PlMultiSequenceAlignmentModel, PlMultiSequenceAlignmentSettings, PlMultiSequenceAlignmentWidget, createRowSelectionColumn } from "./PlMultiSequenceAlignment.js";
-export { AndFilter, AnnotationFilter, AnnotationMode, AnnotationScript, AnnotationScript2, AnnotationScriptUi, AnnotationStep, AnnotationStepUi, AnyForm, type AxesVault, BuildDatasetOptions, type ColumnMatcher, type ColumnOrderRule, type ColumnVisibilityRule, type ColumnsDisplayOptions, type ColumnsSelectorConfig, DatasetOption, DatasetSelection, FilterMatchOptions, FilterUi, FilterUiOfType, FilterUiType, FormField, IsNA, Log10, NotFilter, NumericalComparisonFilter, OrFilter, PColumnPredicate, PTableKey, type PTableParamsV2, PatternFilter, PatternPredicate, PatternPredicateContainSubsequence, PatternPredicateEquals, type PlDataTableFilterMeta, type PlDataTableFilterSpecLeaf, type PlDataTableFilters, type PlDataTableFiltersWithMeta, type PlDataTableGridStateCore, type PlDataTableModel, type PlDataTableSheet, type PlDataTableSheetState, type PlDataTableStateV2, type PlDataTableStateV2CacheEntry, type PlDataTableStateV2Normalized, PlMultiSequenceAlignmentColorSchemeOption, PlMultiSequenceAlignmentModel, PlMultiSequenceAlignmentSettings, PlMultiSequenceAlignmentWidget, PlSelectionModel, type PlTableColumnIdJson, SortedCumulativeSum, TransformedColumn, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, ValueRank, buildDatasetOptions, buildRefMap, compileAnnotationScript, compileFilter, compileFilters, createDatasetSelection, createDefaultPTableParams, createPFrameForGraphs, createPlDataTable, type createPlDataTableOptionsV3, createPlDataTableSheet, createPlDataTableStateV2, createPlDataTableV2, createPlDataTableV3, createPlSelectionModel, createRowSelectionColumn, discoverTableColumnSnaphots, enrichCompatible, filterMatchesToOptions, findFilterColumns, getAvailableWithLinkersAxes, getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional, isDatasetSelection, isHiddenFromGraphColumn, isHiddenFromUIColumn, unreachable, upgradePlDataTableStateV2 };
+export { AndFilter, AnnotationFilter, AnnotationMode, AnnotationScript, AnnotationScript2, AnnotationScriptUi, AnnotationStep, AnnotationStepUi, AnyForm, type AxesVault, BuildDatasetOptions, type ColumnOrderRule, type ColumnVisibilityRule, type ColumnsDisplayOptions, type ColumnsSelectorConfig, DatasetOption, DatasetSelection, FilterMatchOptions, FilterUi, FilterUiOfType, FilterUiType, FindFilterColumnsOptions, FormField, IsNA, Log10, NotFilter, NumericalComparisonFilter, OrFilter, PColumnPredicate, PTableKey, type PTableParamsV2, PatternFilter, PatternPredicate, PatternPredicateContainSubsequence, PatternPredicateEquals, type PlDataTableAxisMeta, type PlDataTableColumnMeta, type PlDataTableColumnsMeta, type PlDataTableFilterMeta, type PlDataTableFilterSpecLeaf, type PlDataTableFilters, type PlDataTableFiltersWithMeta, type PlDataTableGridStateCore, type PlDataTableModel, type PlDataTableSheet, type PlDataTableSheetState, type PlDataTableStateV2, type PlDataTableStateV2CacheEntry, type PlDataTableStateV2Normalized, PlMultiSequenceAlignmentColorSchemeOption, PlMultiSequenceAlignmentModel, PlMultiSequenceAlignmentSettings, PlMultiSequenceAlignmentWidget, PlSelectionModel, type PlTableColumnIdJson, SortedCumulativeSum, TransformedColumn, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, ValueRank, buildDatasetOptions, buildRefMap, compileAnnotationScript, compileFilter, compileFilters, createDatasetSelection, createDefaultPTableParams, createPFrameForGraphs, createPlDataTable, type createPlDataTableOptionsV3, createPlDataTableSheet, createPlDataTableStateV2, createPlDataTableV2, createPlDataTableV3, createPlSelectionModel, createRowSelectionColumn, discoverTableColumns as discoverTableColumnSnaphots, enrichCompatible, filterMatchesToOptions, findFilterColumns, getAvailableWithLinkersAxes, getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional, isDatasetSelection, isHiddenFromGraphColumn, isHiddenFromUIColumn, unreachable, upgradePlDataTableStateV2 };

package/dist/components/index.js

@@ -9,10 +9,10 @@ import { createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTable
 import { createPlDataTableSheet } from "./PlDataTable/createPlDataTableSheet.js";
 import { getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional } from "./PlDataTable/createPlDataTable/utils.js";
 import { createPlDataTableV2 } from "./PlDataTable/createPlDataTable/createPlDataTableV2.js";
-import { discoverTableColumnSnaphots } from "./PlDataTable/createPlDataTable/discoverColumns.js";
+import { discoverTableColumns } from "./PlDataTable/createPlDataTable/discoverColumns.js";
 import { createPlDataTableV3 } from "./PlDataTable/createPlDataTable/createPlDataTableV3.js";
 import { createPlDataTable } from "./PlDataTable/createPlDataTable/index.js";
 import "./PlDataTable/index.js";
 import { createRowSelectionColumn } from "./PlMultiSequenceAlignment.js";
 import { createPlSelectionModel } from "./PlSelectionModel.js";
-export { buildDatasetOptions, buildRefMap, compileAnnotationScript, compileFilter, compileFilters, createDatasetSelection, createDefaultPTableParams, createPFrameForGraphs, createPlDataTable, createPlDataTableSheet, createPlDataTableStateV2, createPlDataTableV2, createPlDataTableV3, createPlSelectionModel, createRowSelectionColumn, discoverTableColumnSnaphots, enrichCompatible, filterMatchesToOptions, findFilterColumns, getAvailableWithLinkersAxes, getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional, isDatasetSelection, isHiddenFromGraphColumn, isHiddenFromUIColumn, unreachable, upgradePlDataTableStateV2 };
+export { buildDatasetOptions, buildRefMap, compileAnnotationScript, compileFilter, compileFilters, createDatasetSelection, createDefaultPTableParams, createPFrameForGraphs, createPlDataTable, createPlDataTableSheet, createPlDataTableStateV2, createPlDataTableV2, createPlDataTableV3, createPlSelectionModel, createRowSelectionColumn, discoverTableColumns as discoverTableColumnSnaphots, enrichCompatible, filterMatchesToOptions, findFilterColumns, getAvailableWithLinkersAxes, getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional, isDatasetSelection, isHiddenFromGraphColumn, isHiddenFromUIColumn, unreachable, upgradePlDataTableStateV2 };

package/dist/filters/converters/filterToQuery.cjs

@@ -1,15 +1,14 @@
 const require_traverse = require("../traverse.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 //#region src/filters/converters/filterToQuery.ts
-/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */
-function resolveColumnRef(columnStr) {
-	const parsed = JSON.parse(columnStr);
-	return parsed.type === "axis" ? {
+/** Converts a QueryColumnId object into a SpecQueryExpression reference. */
+function resolveColumnRef(col) {
+	return col.type === "axis" ? {
 		type: "axisRef",
-		value: parsed.id
+		value: col.id
 	} : {
 		type: "columnRef",
-		value: parsed.id
+		value: col.id
 	};
 }
 /** Converts a FilterSpec tree into a SpecQueryExpression. */

package/dist/filters/converters/filterToQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"filterToQuery.cjs","names":["traverseFilterSpec"],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  return parsed.type === \"axis\"\n    ? { type: \"axisRef\", value: parsed.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: false,\n      };\n    case \"notInSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: true,\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"fillNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"filterToQuery.cjs","names":["traverseFilterSpec"],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  AxisId,\n  ColumnUniversalId,\n  FilterSpec,\n  FilterSpecLeaf,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\nexport type QueryColumnIdAxis = {\n  type: \"axis\";\n  id: AxisId;\n};\n\nexport type QueryColumnIdColumn = {\n  type: \"column\";\n  /** May be a rich {@link ColumnUniversalId} (Discovered / Overridden / Filtered) or bare PObjectId. */\n  id: ColumnUniversalId;\n};\n\nexport type QueryColumnId = QueryColumnIdAxis | QueryColumnIdColumn;\n\n/** Converts a QueryColumnId object into a SpecQueryExpression reference. */\nfunction resolveColumnRef(col: QueryColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<QueryColumnId>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<QueryColumnId>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: false,\n      };\n    case \"notInSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: true,\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"fillNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}

package/dist/filters/converters/filterToQuery.d.ts

@@ -1,8 +1,17 @@
-import { FilterSpec, FilterSpecLeaf, SpecQueryExpression } from "@milaboratories/pl-model-common";
+import { AxisId, ColumnUniversalId, FilterSpec, FilterSpecLeaf, SpecQueryExpression } from "@milaboratories/pl-model-common";
 
 //#region src/filters/converters/filterToQuery.d.ts
+type QueryColumnIdAxis = {
+  type: "axis";
+  id: AxisId;
+};
+type QueryColumnIdColumn = {
+  type: "column"; /** May be a rich {@link ColumnUniversalId} (Discovered / Overridden / Filtered) or bare PObjectId. */
+  id: ColumnUniversalId;
+};
+type QueryColumnId = QueryColumnIdAxis | QueryColumnIdColumn;
 /** Converts a FilterSpec tree into a SpecQueryExpression. */
-declare function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(filter: FilterSpec<Leaf>): SpecQueryExpression;
+declare function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<QueryColumnId>>(filter: FilterSpec<Leaf>): SpecQueryExpression;
 //#endregion
-export { filterSpecToSpecQueryExpr };
+export { QueryColumnId, QueryColumnIdAxis, QueryColumnIdColumn, filterSpecToSpecQueryExpr };
 //# sourceMappingURL=filterToQuery.d.ts.map

package/dist/filters/converters/filterToQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterToQuery.d.ts","names":[],"sources":["../../../src/filters/converters/filterToQuery.ts"],"mappings":";;;;iBAmBgB,yBAAA,cAAuC,cAAA,UACrD,MAAA,EAAQ,UAAA,CAAW,IAAA,IAClB,mBAAA"}
+{"version":3,"file":"filterToQuery.d.ts","names":[],"sources":["../../../src/filters/converters/filterToQuery.ts"],"mappings":";;;KAWY,iBAAA;EACV,IAAA;EACA,EAAA,EAAI,MAAM;AAAA;AAAA,KAGA,mBAAA;EACV,IAAA,YALA;EAOA,EAAA,EAAI,iBAAiB;AAAA;AAAA,KAGX,aAAA,GAAgB,iBAAA,GAAoB,mBAAmB;AATvD;AAAA,iBAmBI,yBAAA,cAAuC,cAAA,CAAe,aAAA,GACpE,MAAA,EAAQ,UAAA,CAAW,IAAA,IAClB,mBAAA"}

package/dist/filters/converters/filterToQuery.js

@@ -1,15 +1,14 @@
 import { traverseFilterSpec } from "../traverse.js";
 import { assertNever } from "@milaboratories/pl-model-common";
 //#region src/filters/converters/filterToQuery.ts
-/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */
-function resolveColumnRef(columnStr) {
-	const parsed = JSON.parse(columnStr);
-	return parsed.type === "axis" ? {
+/** Converts a QueryColumnId object into a SpecQueryExpression reference. */
+function resolveColumnRef(col) {
+	return col.type === "axis" ? {
 		type: "axisRef",
-		value: parsed.id
+		value: col.id
 	} : {
 		type: "columnRef",
-		value: parsed.id
+		value: col.id
 	};
 }
 /** Converts a FilterSpec tree into a SpecQueryExpression. */

package/dist/filters/converters/filterToQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterToQuery.js","names":[],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  return parsed.type === \"axis\"\n    ? { type: \"axisRef\", value: parsed.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: false,\n      };\n    case \"notInSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: true,\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"fillNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"filterToQuery.js","names":[],"sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  AxisId,\n  ColumnUniversalId,\n  FilterSpec,\n  FilterSpecLeaf,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\nexport type QueryColumnIdAxis = {\n  type: \"axis\";\n  id: AxisId;\n};\n\nexport type QueryColumnIdColumn = {\n  type: \"column\";\n  /** May be a rich {@link ColumnUniversalId} (Discovered / Overridden / Filtered) or bare PObjectId. */\n  id: ColumnUniversalId;\n};\n\nexport type QueryColumnId = QueryColumnIdAxis | QueryColumnIdColumn;\n\n/** Converts a QueryColumnId object into a SpecQueryExpression reference. */\nfunction resolveColumnRef(col: QueryColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<QueryColumnId>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<QueryColumnId>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: false,\n      };\n    case \"notInSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n        negate: true,\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"fillNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"mappings":"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"}

package/dist/filters/converters/index.d.ts

@@ -1,3 +1,3 @@
-import { filterSpecToSpecQueryExpr } from "./filterToQuery.js";
+import { QueryColumnId, QueryColumnIdAxis, QueryColumnIdColumn, filterSpecToSpecQueryExpr } from "./filterToQuery.js";
 import { convertFilterUiToExpressionImpl, convertFilterUiToExpressions } from "./filterUiToExpressionImpl.js";
-export { convertFilterUiToExpressionImpl, convertFilterUiToExpressions, filterSpecToSpecQueryExpr };
+export { QueryColumnId, QueryColumnIdAxis, QueryColumnIdColumn, convertFilterUiToExpressionImpl, convertFilterUiToExpressions, filterSpecToSpecQueryExpr };

package/dist/filters/index.d.ts

@@ -1,5 +1,5 @@
-import { filterSpecToSpecQueryExpr } from "./converters/filterToQuery.js";
+import { QueryColumnId, QueryColumnIdAxis, QueryColumnIdColumn, filterSpecToSpecQueryExpr } from "./converters/filterToQuery.js";
 import { FilterSpec, FilterSpecLeaf, FilterSpecNode, FilterSpecOfType, FilterSpecType, SimplifiedPColumnSpec, SimplifiedUniversalPColumnEntry } from "./types.js";
 import { convertFilterUiToExpressionImpl, convertFilterUiToExpressions } from "./converters/filterUiToExpressionImpl.js";
 import { distillFilterSpec } from "./distill.js";
-export { type FilterSpec, type FilterSpecLeaf, type FilterSpecNode, type FilterSpecOfType, type FilterSpecType, SimplifiedPColumnSpec, SimplifiedUniversalPColumnEntry, convertFilterUiToExpressionImpl, convertFilterUiToExpressions, distillFilterSpec, filterSpecToSpecQueryExpr };
+export { type FilterSpec, type FilterSpecLeaf, type FilterSpecNode, type FilterSpecOfType, type FilterSpecType, QueryColumnId, QueryColumnIdAxis, QueryColumnIdColumn, SimplifiedPColumnSpec, SimplifiedUniversalPColumnEntry, convertFilterUiToExpressionImpl, convertFilterUiToExpressions, distillFilterSpec, filterSpecToSpecQueryExpr };

package/dist/index.cjs

@@ -28,12 +28,18 @@ const require_block_model_legacy = require("./block_model_legacy.cjs");
 const require_plugin_model = require("./plugin_model.cjs");
 const require_block_model = require("./block_model.cjs");
 const require_axes = require("./pframe_utils/axes.cjs");
-const require_column_snapshot = require("./columns/column_snapshot.cjs");
-const require_column_snapshot_provider = require("./columns/column_snapshot_provider.cjs");
-const require_column_selector = require("./columns/column_selector.cjs");
-const require_column_collection_builder = require("./columns/column_collection_builder.cjs");
-const require_ctx_column_sources = require("./columns/ctx_column_sources.cjs");
+const require_column = require("./columns/column.cjs");
+const require_column_discovered_recipe = require("./columns/column_recipes/column_discovered_recipe.cjs");
+const require_column_filtered_recipe = require("./columns/column_recipes/column_filtered_recipe.cjs");
+const require_index$4 = require("./columns/column_recipes/index.cjs");
+const require_column_overrided_recipe = require("./columns/column_recipes/column_overrided_recipe.cjs");
+const require_column_lazy = require("./columns/column_lazy.cjs");
+const require_providers = require("./columns/column_providers/providers.cjs");
+const require_index$5 = require("./columns/column_providers/index.cjs");
+const require_columns_collection = require("./columns/columns_collection.cjs");
+const require_utils = require("./columns/utils.cjs");
 const require_expand_by_partition = require("./columns/expand_by_partition.cjs");
+const require_derive_axis_values_labels = require("./columns/derive_axis_values_labels.cjs");
 require("./columns/index.cjs");
 const require_columns = require("./pframe_utils/columns.cjs");
 const require_PFrameForGraphs = require("./components/PFrameForGraphs.cjs");
@@ -48,11 +54,11 @@ require("./filters/index.cjs");
 const require_state_migration = require("./components/PlDataTable/state-migration.cjs");
 const require_createPlDataTableSheet = require("./components/PlDataTable/createPlDataTableSheet.cjs");
 const require_derive_distinct_tooltips = require("./labels/derive_distinct_tooltips.cjs");
-const require_utils = require("./components/PlDataTable/createPlDataTable/utils.cjs");
+const require_utils$1 = require("./components/PlDataTable/createPlDataTable/utils.cjs");
 const require_createPlDataTableV2 = require("./components/PlDataTable/createPlDataTable/createPlDataTableV2.cjs");
 const require_discoverColumns = require("./components/PlDataTable/createPlDataTable/discoverColumns.cjs");
 const require_createPlDataTableV3 = require("./components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs");
-const require_index$6 = require("./components/PlDataTable/createPlDataTable/index.cjs");
+const require_index$8 = require("./components/PlDataTable/createPlDataTable/index.cjs");
 const require_PlMultiSequenceAlignment = require("./components/PlMultiSequenceAlignment.cjs");
 const require_PlSelectionModel = require("./components/PlSelectionModel.cjs");
 require("./components/index.cjs");
@@ -62,10 +68,12 @@ const require_ref_util = require("./ref_util.cjs");
 const require_raw_globals = require("./raw_globals.cjs");
 const require_converter = require("./annotations/converter.cjs");
 require("./annotations/index.cjs");
-const require_index$10 = require("./pframe_utils/index.cjs");
+const require_index$12 = require("./pframe_utils/index.cjs");
 const require_env_value = require("./env_value.cjs");
+exports.AccessorColumnsProvider = require_providers.AccessorColumnsProvider;
+exports.AccessorColumnsProviderImpl = require_providers.AccessorColumnsProviderImpl;
 exports.Args = require_actions.Args;
-exports.ArrayColumnProvider = require_column_snapshot_provider.ArrayColumnProvider;
+exports.ArrayColumnsProvider = require_providers.ArrayColumnsProvider;
 exports.BLOCK_SERVICE_FLAGS = require_block_services.BLOCK_SERVICE_FLAGS;
 exports.BLOCK_STORAGE_FACADE_VERSION = require_block_storage_facade.BLOCK_STORAGE_FACADE_VERSION;
 exports.BlockModel = require_block_model_legacy.BlockModel;
@@ -73,7 +81,17 @@ exports.BlockModelV3 = require_block_model.BlockModelV3;
 exports.BlockRenderCtx = require_api.BlockRenderCtx;
 exports.BlockStorageFacadeCallbacks = require_block_storage_facade.BlockStorageFacadeCallbacks;
 exports.BlockStorageFacadeHandles = require_block_storage_facade.BlockStorageFacadeHandles;
-exports.ColumnCollectionBuilder = require_column_collection_builder.ColumnCollectionBuilder;
+exports.Column = require_column.Column;
+exports.ColumnAbsentError = require_column_lazy.ColumnAbsentError;
+exports.ColumnDiscoveredRecipe = require_column_discovered_recipe.ColumnDiscoveredRecipe;
+exports.ColumnFilteredRecipe = require_column_filtered_recipe.ColumnFilteredRecipe;
+exports.ColumnLazy = require_column_lazy.ColumnLazy;
+exports.ColumnLazyImpl = require_column_lazy.ColumnLazyImpl;
+exports.ColumnOverriddenRecipe = require_column_overrided_recipe.ColumnOverriddenRecipe;
+exports.ColumnRecipe = require_index$4.ColumnRecipe;
+exports.ColumnsCollection = require_columns_collection.ColumnsCollection;
+exports.ColumnsCollectionImpl = require_columns_collection.ColumnsCollectionImpl;
+exports.ColumnsProvider = require_providers.ColumnsProvider;
 exports.CurrentSdkInfo = require_version.CurrentSdkInfo;
 exports.DataModel = require_block_migrations.DataModel;
 exports.DataModelBuilder = require_block_migrations.DataModelBuilder;
@@ -85,8 +103,8 @@ Object.defineProperty(exports, "JsRenderInternal", {
 		return require_internal.internal_exports;
 	}
 });
+exports.MainAccessorName = require_internal.MainAccessorName;
 exports.MainOutputs = require_actions.MainOutputs;
-exports.OutputColumnProvider = require_column_snapshot_provider.OutputColumnProvider;
 exports.OutputError = require_block_state_util.OutputError;
 exports.PColumnCollection = require_column_collection.PColumnCollection;
 exports.PFrameImpl = require_pframe.PFrameImpl;
@@ -107,47 +125,47 @@ exports.RT_RESOURCE_MAP_PARTITIONED = require_pcolumn_data.RT_RESOURCE_MAP_PARTI
 exports.RenderCtxBase = require_api.RenderCtxBase;
 exports.RenderCtxLegacy = require_api.RenderCtxLegacy;
 exports.ResultPool = require_api.ResultPool;
-exports.ResultPoolColumnSnapshotProvider = require_ctx_column_sources.ResultPoolColumnSnapshotProvider;
-exports.SnapshotColumnProvider = require_column_snapshot_provider.SnapshotColumnProvider;
+exports.ResultPoolColumnsProvider = require_providers.ResultPoolColumnsProvider;
+exports.ResultPoolColumnsProviderImpl = require_providers.ResultPoolColumnsProviderImpl;
+exports.StagingAccessorName = require_internal.StagingAccessorName;
 exports.StagingOutputs = require_actions.StagingOutputs;
 exports.TreeNodeAccessor = require_accessor.TreeNodeAccessor;
 exports.UiState = require_actions.UiState;
+exports._ctxProvidersCache = require_index$5._ctxProvidersCache;
 exports.allPColumnsReady = require_pcolumn_data.allPColumnsReady;
 exports.and = require_actions.and;
 exports.blockServiceNames = require_block_services.blockServiceNames;
 exports.buildDatasetOptions = require_build_dataset_options.buildDatasetOptions;
 exports.buildRefMap = require_filter_discovery.buildRefMap;
 exports.buildServices = require_service_bridge.buildServices;
-exports.collectCtxColumnSnapshotProviders = require_ctx_column_sources.collectCtxColumnSnapshotProviders;
+exports.collectLinkerColumns = require_utils.collectLinkerColumns;
+exports.collectLinkerIds = require_utils.collectLinkerIds;
 exports.compileAnnotationScript = require_filters_ui.compileAnnotationScript;
 exports.compileFilter = require_filters_ui.compileFilter;
 exports.compileFilters = require_filters_ui.compileFilters;
-exports.convertColumnSelectorToMultiColumnSelector = require_column_selector.convertColumnSelectorToMultiColumnSelector;
 exports.convertFilterSpecsToExpressionSpecs = require_converter.convertFilterSpecsToExpressionSpecs;
 exports.convertFilterUiToExpressionImpl = require_filterUiToExpressionImpl.convertFilterUiToExpressionImpl;
 exports.convertFilterUiToExpressions = require_filterUiToExpressionImpl.convertFilterUiToExpressions;
 exports.convertOrParsePColumnData = require_pcolumn_data.convertOrParsePColumnData;
-exports.convertRelaxedAxisSelectorToMultiAxisSelector = require_column_selector.convertRelaxedAxisSelectorToMultiAxisSelector;
-exports.convertRelaxedColumnSelectorToMultiColumnSelector = require_column_selector.convertRelaxedColumnSelectorToMultiColumnSelector;
 exports.createBlockStorage = require_block_storage.createBlockStorage;
-exports.createColumnSnapshot = require_column_snapshot.createColumnSnapshot;
 exports.createDatasetSelection = require_dataset_selection.createDatasetSelection;
 exports.createDefaultPTableParams = require_state_migration.createDefaultPTableParams;
 exports.createPFrameForGraphs = require_PFrameForGraphs.createPFrameForGraphs;
-exports.createPlDataTable = require_index$6.createPlDataTable;
+exports.createPlDataTable = require_index$8.createPlDataTable;
 exports.createPlDataTableSheet = require_createPlDataTableSheet.createPlDataTableSheet;
 exports.createPlDataTableStateV2 = require_state_migration.createPlDataTableStateV2;
 exports.createPlDataTableV2 = require_createPlDataTableV2.createPlDataTableV2;
 exports.createPlDataTableV3 = require_createPlDataTableV3.createPlDataTableV3;
 exports.createPlSelectionModel = require_PlSelectionModel.createPlSelectionModel;
-exports.createReadyColumnData = require_column_snapshot.createReadyColumnData;
 exports.createRowSelectionColumn = require_PlMultiSequenceAlignment.createRowSelectionColumn;
 exports.createServiceProxy = require_service_bridge.createServiceProxy;
+exports.deriveAxisValuesLabels = require_derive_axis_values_labels.deriveAxisValuesLabels;
+exports.deriveColumnOptions = require_utils.deriveColumnOptions;
 exports.deriveDataFromStorage = require_block_storage.deriveDataFromStorage;
 exports.deriveDistinctLabels = require_derive_distinct_labels.deriveDistinctLabels;
 exports.deriveDistinctTooltips = require_derive_distinct_tooltips.deriveDistinctTooltips;
 exports.deriveLabels = require_label.deriveLabels;
-exports.discoverTableColumnSnaphots = require_discoverColumns.discoverTableColumnSnaphots;
+exports.discoverTableColumnSnaphots = require_discoverColumns.discoverTableColumns;
 exports.distillFilterSpec = require_distill.distillFilterSpec;
 exports.downgradeCfgOrLambda = require_normalization.downgradeCfgOrLambda;
 exports.enrichCompatible = require_axes.enrichCompatible;
@@ -157,32 +175,35 @@ exports.extractConfig = require_normalization.extractConfig;
 exports.filterDataInfoEntries = require_axis_filtering.filterDataInfoEntries;
 exports.filterMatchesToOptions = require_filter_discovery.filterMatchesToOptions;
 exports.filterSpecToSpecQueryExpr = require_filterToQuery.filterSpecToSpecQueryExpr;
+exports.finalizePColumnData = require_api.finalizePColumnData;
 exports.findFilterColumns = require_filter_discovery.findFilterColumns;
 exports.flatten = require_actions.flatten;
 exports.fromPlOption = require_ref_util.fromPlOption;
 exports.fromPlRef = require_ref_util.fromPlRef;
 exports.getAllRelatedColumns = require_columns.getAllRelatedColumns;
 exports.getAvailableWithLinkersAxes = require_axes.getAvailableWithLinkersAxes;
-exports.getAxisUniqueValues = require_index$10.getAxisUniqueValues;
+exports.getAxisUniqueValues = require_index$12.getAxisUniqueValues;
 exports.getBlobContent = require_actions.getBlobContent;
 exports.getBlobContentAsJson = require_actions.getBlobContentAsJson;
 exports.getBlobContentAsString = require_actions.getBlobContentAsString;
-exports.getColumnOrAxisValueLabelsId = require_index$10.getColumnOrAxisValueLabelsId;
-exports.getColumnSpecById = require_index$10.getColumnSpecById;
-exports.getColumnUniqueValues = require_index$10.getColumnUniqueValues;
-exports.getColumnsFull = require_index$10.getColumnsFull;
+exports.getColumnOrAxisValueLabelsId = require_index$12.getColumnOrAxisValueLabelsId;
+exports.getColumnSpecById = require_index$12.getColumnSpecById;
+exports.getColumnUniqueValues = require_index$12.getColumnUniqueValues;
+exports.getColumnsFull = require_index$12.getColumnsFull;
+exports.getCtxProviders = require_index$5.getCtxProviders;
 exports.getDownloadedBlobContent = require_actions.getDownloadedBlobContent;
-exports.getEffectiveVisibility = require_utils.getEffectiveVisibility;
+exports.getEffectiveVisibility = require_utils$1.getEffectiveVisibility;
 exports.getEnvironmentValue = require_env_value.getEnvironmentValue;
 exports.getFromCfg = require_actions.getFromCfg;
 exports.getImmediate = require_actions.getImmediate;
 exports.getImportProgress = require_actions.getImportProgress;
 exports.getJsonField = require_actions.getJsonField;
 exports.getLastLogs = require_actions.getLastLogs;
+exports.getLeafColumnData = require_utils.getLeafColumnData;
 exports.getLogHandle = require_actions.getLogHandle;
 exports.getNumberOfRows = require_pcolumn_data.getNumberOfRows;
 exports.getOnDemandBlobContent = require_actions.getOnDemandBlobContent;
-exports.getOrderPriority = require_utils.getOrderPriority;
+exports.getOrderPriority = require_utils$1.getOrderPriority;
 exports.getPartitionKeysList = require_pcolumn_data.getPartitionKeysList;
 exports.getPlatformaApiVersion = require_raw_globals.getPlatformaApiVersion;
 exports.getPluginData = require_block_storage.getPluginData;
@@ -190,24 +211,31 @@ exports.getProgressLog = require_actions.getProgressLog;
 exports.getProgressLogWithInfo = require_actions.getProgressLogWithInfo;
 exports.getRawPlatformaInstance = require_raw_globals.getRawPlatformaInstance;
 exports.getRelatedColumns = require_columns.getRelatedColumns;
-exports.getRequestColumnsFromSelectedSources = require_index$10.getRequestColumnsFromSelectedSources;
+exports.getRequestColumnsFromSelectedSources = require_index$12.getRequestColumnsFromSelectedSources;
 exports.getResourceField = require_actions.getResourceField;
 exports.getResourceValueAsJson = require_actions.getResourceValueAsJson;
 exports.getService = require_get_services.getService;
-exports.getSingleColumnData = require_index$10.getSingleColumnData;
+exports.getSingleColumnData = require_index$12.getSingleColumnData;
 exports.getStorageData = require_block_storage.getStorageData;
 exports.getUniquePartitionKeys = require_pcolumn_data.getUniquePartitionKeys;
-exports.getUniqueSourceValuesWithLabels = require_index$10.getUniqueSourceValuesWithLabels;
+exports.getUniqueSourceValuesWithLabels = require_index$12.getUniqueSourceValuesWithLabels;
+exports.hasColumnData = require_utils.hasColumnData;
+exports.hitQualifications = require_utils.hitQualifications;
 exports.ifDef = require_accessor.ifDef;
 exports.isBlockStorage = require_block_storage.isBlockStorage;
-exports.isColumnHidden = require_utils.isColumnHidden;
-exports.isColumnOptional = require_utils.isColumnOptional;
-exports.isColumnSnapshotProvider = require_column_snapshot_provider.isColumnSnapshotProvider;
+exports.isColumn = require_column.isColumn;
+exports.isColumnHidden = require_utils$1.isColumnHidden;
+exports.isColumnLazy = require_column_lazy.isColumnLazy;
+exports.isColumnOptional = require_utils$1.isColumnOptional;
+exports.isColumnProvider = require_index$5.isColumnProvider;
+exports.isColumnRecipe = require_index$4.isColumnRecipe;
+exports.isColumnsCollection = require_columns_collection.isColumnsCollection;
 exports.isConfigLambda = require_types.isConfigLambda;
 exports.isDatasetSelection = require_dataset_selection.isDatasetSelection;
 exports.isEmpty = require_actions.isEmpty;
 exports.isHiddenFromGraphColumn = require_PFrameForGraphs.isHiddenFromGraphColumn;
 exports.isHiddenFromUIColumn = require_PFrameForGraphs.isHiddenFromUIColumn;
+exports.isLeafColumn = require_utils.isLeafColumn;
 exports.isPColumnReady = require_pcolumn_data.isPColumnReady;
 exports.isPluginOutputKey = require_plugin_handle.isPluginOutputKey;
 exports.isolate = require_actions.isolate;
@@ -224,9 +252,10 @@ exports.parsePColumnData = require_pcolumn_data.parsePColumnData;
 exports.parseResourceMap = require_pcolumn_data.parseResourceMap;
 exports.pluginOutputKey = require_plugin_handle.pluginOutputKey;
 exports.pluginOutputPrefix = require_plugin_handle.pluginOutputPrefix;
+exports.queriesQualifications = require_utils.queriesQualifications;
 exports.readOutput = require_block_state_util.readOutput;
 exports.registerFacadeCallbacks = require_block_storage_facade.registerFacadeCallbacks;
-exports.toColumnSnapshotProvider = require_column_snapshot_provider.toColumnSnapshotProvider;
+exports.toColumnProvider = require_index$5.toColumnProvider;
 exports.unreachable = require_filters_ui.unreachable;
 exports.updateStorageData = require_block_storage.updateStorageData;
 exports.upgradePlDataTableStateV2 = require_state_migration.upgradePlDataTableStateV2;