@platforma-sdk/model 1.63.12 → 1.64.0

package/src/columns/column_selector.test.ts

@@ -1,47 +1,28 @@
-import type { MultiColumnSelector, PColumnSpec } from "@milaboratories/pl-model-common";
 import { describe, expect, test } from "vitest";
-import type { RelaxedColumnSelector } from "./column_selector";
-import {
-  matchColumn,
-  matchColumnSelectors,
-  normalizeSelectors,
-  columnSelectorsToPredicate,
-} from "./column_selector";
+import { convertColumnSelectorToMultiColumnSelector } from "./column_selector";
 import type { RegExpString } from "@milaboratories/helpers";
 
-// --- Helpers ---
+// --- convertColumnSelectorToMultiColumnSelector ---
 
-function spec(overrides: Partial<PColumnSpec> & { name: string }): PColumnSpec {
-  return {
-    kind: "PColumn",
-    valueType: "Int",
-    axesSpec: [],
-    annotations: {},
-    ...overrides,
-  } as PColumnSpec;
-}
-
-// --- normalizeSelectors ---
-
-describe("normalizeSelectors", () => {
+describe("convertColumnSelectorToMultiColumnSelector", () => {
   test("wraps single selector in array", () => {
-    const result = normalizeSelectors({ name: "foo" });
+    const result = convertColumnSelectorToMultiColumnSelector({ name: "foo" });
     expect(result).toHaveLength(1);
     expect(result[0].name).toEqual([{ type: "regex", value: "foo" }]);
   });
 
   test("passes through array of selectors", () => {
-    const result = normalizeSelectors([{ name: "a" }, { name: "b" }]);
+    const result = convertColumnSelectorToMultiColumnSelector([{ name: "a" }, { name: "b" }]);
     expect(result).toHaveLength(2);
   });
 
   test("normalizes plain string name to RegexMatcher[]", () => {
-    const [sel] = normalizeSelectors({ name: "foo" });
+    const [sel] = convertColumnSelectorToMultiColumnSelector({ name: "foo" });
     expect(sel.name).toEqual([{ type: "regex", value: "foo" }]);
   });
 
   test("normalizes array of mixed strings and matchers", () => {
-    const [sel] = normalizeSelectors({
+    const [sel] = convertColumnSelectorToMultiColumnSelector({
       name: ["foo", { type: "regex", value: "bar.*" as RegExpString }],
     });
     expect(sel.name).toEqual([
@@ -51,22 +32,24 @@ describe("normalizeSelectors", () => {
   });
 
   test("normalizes single StringMatcher object", () => {
-    const [sel] = normalizeSelectors({ name: { type: "exact", value: "foo" } });
+    const [sel] = convertColumnSelectorToMultiColumnSelector({
+      name: { type: "exact", value: "foo" },
+    });
     expect(sel.name).toEqual([{ type: "exact", value: "foo" }]);
   });
 
   test("normalizes single ValueType to array", () => {
-    const [sel] = normalizeSelectors({ type: "Int" });
+    const [sel] = convertColumnSelectorToMultiColumnSelector({ type: "Int" });
     expect(sel.type).toEqual(["Int"]);
   });
 
   test("passes through ValueType array", () => {
-    const [sel] = normalizeSelectors({ type: ["Int", "Long"] });
+    const [sel] = convertColumnSelectorToMultiColumnSelector({ type: ["Int", "Long"] });
     expect(sel.type).toEqual(["Int", "Long"]);
   });
 
   test("normalizes record with plain string values", () => {
-    const [sel] = normalizeSelectors({
+    const [sel] = convertColumnSelectorToMultiColumnSelector({
       domain: { "pl7.app/chain": "IGHeavy" },
     });
     expect(sel.domain).toEqual({
@@ -75,7 +58,7 @@ describe("normalizeSelectors", () => {
   });
 
   test("normalizes record with mixed array values", () => {
-    const [sel] = normalizeSelectors({
+    const [sel] = convertColumnSelectorToMultiColumnSelector({
       annotations: { label: ["a", { type: "regex", value: "b.*" as RegExpString }] },
     });
     expect(sel.annotations).toEqual({
@@ -87,386 +70,21 @@ describe("normalizeSelectors", () => {
   });
 
   test("normalizes axes", () => {
-    const [sel] = normalizeSelectors({
+    const [sel] = convertColumnSelectorToMultiColumnSelector({
       axes: [{ name: "axisName", type: "String" }],
     });
     expect(sel.axes).toEqual([{ name: [{ type: "regex", value: "axisName" }], type: ["String"] }]);
   });
 
   test("preserves partialAxesMatch", () => {
-    const [sel] = normalizeSelectors({ partialAxesMatch: false });
+    const [sel] = convertColumnSelectorToMultiColumnSelector({ partialAxesMatch: false });
     expect(sel.partialAxesMatch).toBe(false);
   });
 
   test("omits undefined fields", () => {
-    const [sel] = normalizeSelectors({ name: "foo" });
+    const [sel] = convertColumnSelectorToMultiColumnSelector({ name: "foo" });
     expect(sel.type).toBeUndefined();
     expect(sel.domain).toBeUndefined();
     expect(sel.axes).toBeUndefined();
   });
 });
-
-// --- matchColumn ---
-
-describe("matchColumn", () => {
-  describe("name matching", () => {
-    test("exact name match", () => {
-      const s = spec({ name: "pl7.app/vdj/sequence" });
-      const sel: MultiColumnSelector = { name: [{ type: "exact", value: "pl7.app/vdj/sequence" }] };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("exact name mismatch", () => {
-      const s = spec({ name: "pl7.app/vdj/sequence" });
-      const sel: MultiColumnSelector = { name: [{ type: "exact", value: "pl7.app/vdj/other" }] };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-
-    test("regex name match", () => {
-      const s = spec({ name: "pl7.app/vdj/sequence" });
-      const sel: MultiColumnSelector = {
-        name: [{ type: "regex", value: "pl7\\.app/vdj/.*" as RegExpString }],
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("regex full match required", () => {
-      const s = spec({ name: "pl7.app/vdj/sequence" });
-      const sel: MultiColumnSelector = { name: [{ type: "regex", value: "vdj" as RegExpString }] };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-
-    test("OR across name matchers", () => {
-      const s = spec({ name: "colB" });
-      const sel: MultiColumnSelector = {
-        name: [
-          { type: "exact", value: "colA" },
-          { type: "exact", value: "colB" },
-        ],
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-  });
-
-  describe("type matching", () => {
-    test("single type match", () => {
-      const s = spec({ name: "c", valueType: "Int" });
-      const sel: MultiColumnSelector = { type: ["Int"] };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("type mismatch", () => {
-      const s = spec({ name: "c", valueType: "String" });
-      const sel: MultiColumnSelector = { type: ["Int"] };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-
-    test("OR across types", () => {
-      const s = spec({ name: "c", valueType: "Long" });
-      const sel: MultiColumnSelector = { type: ["Int", "Long"] };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-  });
-
-  describe("domain matching", () => {
-    test("matches column domain", () => {
-      const s = spec({ name: "c", domain: { chain: "IGHeavy" } });
-      const sel: MultiColumnSelector = {
-        domain: { chain: [{ type: "exact", value: "IGHeavy" }] },
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("matches combined domain from axes", () => {
-      const s = spec({
-        name: "c",
-        axesSpec: [
-          { name: "axis1", type: "String", domain: { chain: "IGHeavy" }, annotations: {} },
-        ] as PColumnSpec["axesSpec"],
-      });
-      const sel: MultiColumnSelector = {
-        domain: { chain: [{ type: "exact", value: "IGHeavy" }] },
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("domain key missing fails", () => {
-      const s = spec({ name: "c", domain: {} });
-      const sel: MultiColumnSelector = {
-        domain: { chain: [{ type: "exact", value: "IGHeavy" }] },
-      };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-
-    test("multiple domain keys AND-ed", () => {
-      const s = spec({ name: "c", domain: { chain: "IGHeavy", species: "human" } });
-      const sel: MultiColumnSelector = {
-        domain: {
-          chain: [{ type: "exact", value: "IGHeavy" }],
-          species: [{ type: "exact", value: "human" }],
-        },
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("one domain key mismatch fails", () => {
-      const s = spec({ name: "c", domain: { chain: "IGHeavy", species: "mouse" } });
-      const sel: MultiColumnSelector = {
-        domain: {
-          chain: [{ type: "exact", value: "IGHeavy" }],
-          species: [{ type: "exact", value: "human" }],
-        },
-      };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-  });
-
-  describe("annotations matching", () => {
-    test("exact annotation match", () => {
-      const s = spec({ name: "c", annotations: { label: "CDR3" } });
-      const sel: MultiColumnSelector = {
-        annotations: { label: [{ type: "exact", value: "CDR3" }] },
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("regex annotation match", () => {
-      const s = spec({ name: "c", annotations: { label: "CDR3-length" } });
-      const sel: MultiColumnSelector = {
-        annotations: { label: [{ type: "regex", value: ".*CDR3.*" as RegExpString }] },
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("missing annotation key fails", () => {
-      const s = spec({ name: "c", annotations: {} });
-      const sel: MultiColumnSelector = {
-        annotations: { label: [{ type: "exact", value: "CDR3" }] },
-      };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-  });
-
-  describe("axes matching", () => {
-    const withAxes = (axes: PColumnSpec["axesSpec"]) => spec({ name: "c", axesSpec: axes });
-
-    const axis = (name: string, type: string = "String") =>
-      ({ name, type, domain: {}, annotations: {} }) as PColumnSpec["axesSpec"][number];
-
-    test("partial match (default) — selector axis found", () => {
-      const s = withAxes([axis("a1"), axis("a2")]);
-      const sel: MultiColumnSelector = {
-        axes: [{ name: [{ type: "exact", value: "a1" }] }],
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("partial match — selector axis not found", () => {
-      const s = withAxes([axis("a1")]);
-      const sel: MultiColumnSelector = {
-        axes: [{ name: [{ type: "exact", value: "missing" }] }],
-      };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-
-    test("exact match — same count and order", () => {
-      const s = withAxes([axis("a1"), axis("a2")]);
-      const sel: MultiColumnSelector = {
-        axes: [
-          { name: [{ type: "exact", value: "a1" }] },
-          { name: [{ type: "exact", value: "a2" }] },
-        ],
-        partialAxesMatch: false,
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("exact match — wrong order fails", () => {
-      const s = withAxes([axis("a1"), axis("a2")]);
-      const sel: MultiColumnSelector = {
-        axes: [
-          { name: [{ type: "exact", value: "a2" }] },
-          { name: [{ type: "exact", value: "a1" }] },
-        ],
-        partialAxesMatch: false,
-      };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-
-    test("exact match — count mismatch fails", () => {
-      const s = withAxes([axis("a1"), axis("a2")]);
-      const sel: MultiColumnSelector = {
-        axes: [{ name: [{ type: "exact", value: "a1" }] }],
-        partialAxesMatch: false,
-      };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-
-    test("axis type matching", () => {
-      const s = withAxes([axis("a1", "Int")]);
-      const sel: MultiColumnSelector = {
-        axes: [{ type: ["Int"] }],
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("axis domain matching", () => {
-      const a = {
-        name: "a1",
-        type: "String",
-        domain: { k: "v" },
-        annotations: {},
-      } as PColumnSpec["axesSpec"][number];
-      const s = withAxes([a]);
-      const sel: MultiColumnSelector = {
-        axes: [{ domain: { k: [{ type: "exact", value: "v" }] } }],
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-  });
-
-  describe("AND across fields", () => {
-    test("all fields must match", () => {
-      const s = spec({
-        name: "col1",
-        valueType: "Int",
-        annotations: { label: "x" },
-      });
-      const sel: MultiColumnSelector = {
-        name: [{ type: "exact", value: "col1" }],
-        type: ["Int"],
-        annotations: { label: [{ type: "exact", value: "x" }] },
-      };
-      expect(matchColumn(s, sel)).toBe(true);
-    });
-
-    test("one field mismatch fails entire selector", () => {
-      const s = spec({
-        name: "col1",
-        valueType: "String",
-      });
-      const sel: MultiColumnSelector = {
-        name: [{ type: "exact", value: "col1" }],
-        type: ["Int"],
-      };
-      expect(matchColumn(s, sel)).toBe(false);
-    });
-  });
-
-  test("empty selector matches everything", () => {
-    const s = spec({ name: "anything", valueType: "Double" });
-    expect(matchColumn(s, {})).toBe(true);
-  });
-});
-
-// --- matchColumnSelectors (OR across array) ---
-
-describe("matchColumnSelectors", () => {
-  test("matches if any selector matches", () => {
-    const s = spec({ name: "col2" });
-    const selectors: MultiColumnSelector[] = [
-      { name: [{ type: "exact", value: "col1" }] },
-      { name: [{ type: "exact", value: "col2" }] },
-    ];
-    expect(matchColumnSelectors(selectors, s)).toBe(true);
-  });
-
-  test("no match if none match", () => {
-    const s = spec({ name: "col3" });
-    const selectors: MultiColumnSelector[] = [
-      { name: [{ type: "exact", value: "col1" }] },
-      { name: [{ type: "exact", value: "col2" }] },
-    ];
-    expect(matchColumnSelectors(selectors, s)).toBe(false);
-  });
-
-  test("empty array matches nothing", () => {
-    const s = spec({ name: "col1" });
-    expect(matchColumnSelectors([], s)).toBe(false);
-  });
-});
-
-// --- columnSelectorsToPredicate ---
-
-describe("columnSelectorsToPredicate", () => {
-  test("works with relaxed single selector", () => {
-    const pred = columnSelectorsToPredicate({ name: "col1" });
-    expect(pred(spec({ name: "col1" }))).toBe(true);
-    expect(pred(spec({ name: "col2" }))).toBe(false);
-  });
-
-  test("works with relaxed array of selectors", () => {
-    const pred = columnSelectorsToPredicate([{ name: "col1" }, { name: "col2" }]);
-    expect(pred(spec({ name: "col1" }))).toBe(true);
-    expect(pred(spec({ name: "col2" }))).toBe(true);
-    expect(pred(spec({ name: "col3" }))).toBe(false);
-  });
-
-  test("works with regex in relaxed form", () => {
-    const pred = columnSelectorsToPredicate({
-      name: { type: "regex", value: "col[12]" as RegExpString },
-    });
-    expect(pred(spec({ name: "col1" }))).toBe(true);
-    expect(pred(spec({ name: "col2" }))).toBe(true);
-    expect(pred(spec({ name: "col3" }))).toBe(false);
-  });
-
-  test("domain filter in relaxed form", () => {
-    const pred = columnSelectorsToPredicate({
-      domain: { chain: "IGHeavy" },
-    });
-    expect(pred(spec({ name: "c", domain: { chain: "IGHeavy" } }))).toBe(true);
-    expect(pred(spec({ name: "c", domain: { chain: "IGLight" } }))).toBe(false);
-    expect(pred(spec({ name: "c" }))).toBe(false);
-  });
-});
-
-// --- Integration: relaxed selectors end-to-end ---
-
-describe("relaxed selectors end-to-end", () => {
-  test("design doc example: name + domain relaxed", () => {
-    const input: RelaxedColumnSelector = {
-      name: "pl7.app/vdj/sequence",
-      domain: { "pl7.app/vdj/chain": "IGHeavy" },
-    };
-    const [sel] = normalizeSelectors(input);
-    const s = spec({
-      name: "pl7.app/vdj/sequence",
-      domain: { "pl7.app/vdj/chain": "IGHeavy" },
-    });
-    expect(matchColumn(s, sel)).toBe(true);
-  });
-
-  test("design doc example: two selectors OR-ed", () => {
-    const input: RelaxedColumnSelector[] = [
-      { name: "pl7.app/vdj/sequence" },
-      { name: "pl7.app/vdj/geneHit", domain: { "pl7.app/vdj/chain": "IGHeavy" } },
-    ];
-    const selectors = normalizeSelectors(input);
-
-    expect(matchColumnSelectors(selectors, spec({ name: "pl7.app/vdj/sequence" }))).toBe(true);
-
-    expect(
-      matchColumnSelectors(
-        selectors,
-        spec({ name: "pl7.app/vdj/geneHit", domain: { "pl7.app/vdj/chain": "IGHeavy" } }),
-      ),
-    ).toBe(true);
-
-    expect(
-      matchColumnSelectors(
-        selectors,
-        spec({ name: "pl7.app/vdj/geneHit", domain: { "pl7.app/vdj/chain": "IGLight" } }),
-      ),
-    ).toBe(false);
-  });
-
-  test("design doc example: domain key with multiple values", () => {
-    const pred = columnSelectorsToPredicate({
-      domain: { "pl7.app/vdj/chain": ["IGHeavy", "IGLight"] },
-    });
-    expect(pred(spec({ name: "c", domain: { "pl7.app/vdj/chain": "IGHeavy" } }))).toBe(true);
-    expect(pred(spec({ name: "c", domain: { "pl7.app/vdj/chain": "IGLight" } }))).toBe(true);
-    expect(pred(spec({ name: "c", domain: { "pl7.app/vdj/chain": "TRA" } }))).toBe(false);
-  });
-});

package/src/columns/column_selector.ts

@@ -3,7 +3,6 @@ import type {
   ColumnValueType,
   MultiAxisSelector,
   MultiColumnSelector,
-  PColumnSpec,
   StringMatcher,
 } from "@milaboratories/pl-model-common";
 
@@ -38,7 +37,7 @@ export interface RelaxedColumnSelector {
 }
 
 /** Input that normalizes to ColumnSelector[]. */
-export type ColumnSelectorInput = RelaxedColumnSelector | RelaxedColumnSelector[];
+export type ColumnSelector = RelaxedColumnSelector | RelaxedColumnSelector[];
 
 // --- Normalization ---
 
@@ -64,7 +63,9 @@ function normalizeTypes<T>(input: T | T[]): T[] {
 
 type Mutable<T> = { -readonly [K in keyof T]: T[K] };
 
-function normalizeAxisSelector(input: RelaxedAxisSelector): MultiAxisSelector {
+export function convertRelaxedAxisSelectorToMultiAxisSelector(
+  input: RelaxedAxisSelector,
+): MultiAxisSelector {
   const result: Mutable<MultiAxisSelector> = {};
   if (input.name !== undefined) result.name = normalizeStringMatchers(input.name);
   if (input.type !== undefined) result.type = normalizeTypes(input.type);
@@ -75,13 +76,9 @@ function normalizeAxisSelector(input: RelaxedAxisSelector): MultiAxisSelector {
   return result;
 }
 
-/** Normalize relaxed input to strict ColumnSelector[]. */
-export function normalizeSelectors(input: ColumnSelectorInput): MultiColumnSelector[] {
-  const arr = Array.isArray(input) ? input : [input];
-  return arr.map(normalizeSingleSelector);
-}
-
-function normalizeSingleSelector(input: RelaxedColumnSelector): MultiColumnSelector {
+export function convertRelaxedColumnSelectorToMultiColumnSelector(
+  input: RelaxedColumnSelector,
+): MultiColumnSelector {
   const result: Mutable<MultiColumnSelector> = {};
   if (input.name !== undefined) result.name = normalizeStringMatchers(input.name);
   if (input.type !== undefined) result.type = normalizeTypes(input.type);
@@ -89,125 +86,15 @@ function normalizeSingleSelector(input: RelaxedColumnSelector): MultiColumnSelec
   if (input.contextDomain !== undefined)
     result.contextDomain = normalizeRecord(input.contextDomain);
   if (input.annotations !== undefined) result.annotations = normalizeRecord(input.annotations);
-  if (input.axes !== undefined) result.axes = input.axes.map(normalizeAxisSelector);
+  if (input.axes !== undefined)
+    result.axes = input.axes.map(convertRelaxedAxisSelectorToMultiAxisSelector);
   if (input.partialAxesMatch !== undefined) result.partialAxesMatch = input.partialAxesMatch;
   return result;
 }
 
-// --- Matching ---
-
-function matchStringValue(value: string, matchers: StringMatcher[]): boolean {
-  return matchers.some((m) => {
-    if (m.type === "exact") return value === m.value;
-    return new RegExp(`^(?:${m.value})$`).test(value);
-  });
-}
-
-function matchRecordField(
-  actual: Record<string, string> | undefined,
-  required: Record<string, StringMatcher[]>,
-): boolean {
-  const record = actual ?? {};
-  for (const [key, matchers] of Object.entries(required)) {
-    const value = record[key];
-    if (value === undefined) return false;
-    if (!matchStringValue(value, matchers)) return false;
-  }
-  return true;
-}
-
-/** Get combined domain: column's own domain merged with all axis domains. */
-function getCombinedDomain(spec: PColumnSpec): Record<string, string> {
-  const result: Record<string, string> = {};
-  if (spec.domain) Object.assign(result, spec.domain);
-  for (const axis of spec.axesSpec) {
-    if (axis.domain) Object.assign(result, axis.domain);
-  }
-  return result;
-}
-
-/** Get combined context domain: column's own contextDomain merged with all axis contextDomains. */
-function getCombinedContextDomain(spec: PColumnSpec): Record<string, string> {
-  const result: Record<string, string> = {};
-  if (spec.contextDomain) Object.assign(result, spec.contextDomain);
-  for (const axis of spec.axesSpec) {
-    if ("contextDomain" in axis && axis.contextDomain) Object.assign(result, axis.contextDomain);
-  }
-  return result;
-}
-
-function matchAxisSelector(
-  axis: PColumnSpec["axesSpec"][number],
-  selector: MultiAxisSelector,
-): boolean {
-  if (selector.name !== undefined && !matchStringValue(axis.name, selector.name)) return false;
-  if (selector.type !== undefined && !selector.type.includes(axis.type)) return false;
-  if (selector.domain !== undefined && !matchRecordField(axis.domain, selector.domain))
-    return false;
-  if (
-    selector.contextDomain !== undefined &&
-    !matchRecordField(
-      "contextDomain" in axis ? (axis.contextDomain as Record<string, string>) : undefined,
-      selector.contextDomain,
-    )
-  )
-    return false;
-  if (
-    selector.annotations !== undefined &&
-    !matchRecordField(axis.annotations, selector.annotations)
-  )
-    return false;
-  return true;
-}
-
-/** Check if a PColumnSpec matches a single strict ColumnSelector. */
-export function matchColumn(spec: PColumnSpec, selector: MultiColumnSelector): boolean {
-  if (selector.name !== undefined && !matchStringValue(spec.name, selector.name)) return false;
-  if (selector.type !== undefined && !selector.type.includes(spec.valueType)) return false;
-
-  if (selector.domain !== undefined) {
-    const combined = getCombinedDomain(spec);
-    if (!matchRecordField(combined, selector.domain)) return false;
-  }
-
-  if (selector.contextDomain !== undefined) {
-    const combined = getCombinedContextDomain(spec);
-    if (!matchRecordField(combined, selector.contextDomain)) return false;
-  }
-
-  if (selector.annotations !== undefined) {
-    if (!matchRecordField(spec.annotations, selector.annotations)) return false;
-  }
-
-  if (selector.axes !== undefined) {
-    const partialMatch = selector.partialAxesMatch ?? true;
-    if (partialMatch) {
-      for (const axisSel of selector.axes) {
-        if (!spec.axesSpec.some((axis) => matchAxisSelector(axis, axisSel))) return false;
-      }
-    } else {
-      if (spec.axesSpec.length !== selector.axes.length) return false;
-      for (let i = 0; i < selector.axes.length; i++) {
-        if (!matchAxisSelector(spec.axesSpec[i], selector.axes[i])) return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-/** Check if a PColumnSpec matches any of the selectors (OR across array). */
-export function matchColumnSelectors(selectors: MultiColumnSelector[], spec: PColumnSpec): boolean {
-  return selectors.some((sel) => matchColumn(spec, sel));
-}
-
-/**
- * Convert selector input to a predicate function.
- * Normalizes relaxed form, then returns a function that OR-matches.
- */
-export function columnSelectorsToPredicate(
-  input: ColumnSelectorInput,
-): (spec: PColumnSpec) => boolean {
-  const selectors = normalizeSelectors(input);
-  return (spec) => matchColumnSelectors(selectors, spec);
+export function convertColumnSelectorToMultiColumnSelector(
+  input: ColumnSelector,
+): MultiColumnSelector[] {
+  const arr = Array.isArray(input) ? input : [input];
+  return arr.map(convertRelaxedColumnSelectorToMultiColumnSelector);
 }

package/src/columns/column_snapshot.ts

@@ -1,4 +1,4 @@
-import type { PColumnSpec, PObjectId } from "@milaboratories/pl-model-common";
+import type { PColumnSpec, PObjectId, SUniversalPColumnId } from "@milaboratories/pl-model-common";
 import type { PColumnDataUniversal } from "../render/internal";
 
 // --- ColumnSnapshot ---
@@ -13,7 +13,7 @@ export type ColumnDataStatus = "ready" | "computing" | "absent";
  * - `data` holds an active object when data exists (ready or computing),
  *   or `undefined` when data is permanently absent.
  */
-export interface ColumnSnapshot<Id extends PObjectId = PObjectId> {
+export interface ColumnSnapshot<Id extends PObjectId | SUniversalPColumnId> {
   readonly id: Id;
   readonly spec: PColumnSpec;
   readonly dataStatus: ColumnDataStatus;
@@ -45,11 +45,11 @@ export function createReadyColumnData(getData: () => PColumnDataUniversal | unde
 // --- Snapshot construction helpers ---
 
 /** Creates a ColumnSnapshot from parts. */
-export function createColumnSnapshot<Id extends PObjectId = PObjectId>(
+export function createColumnSnapshot<Id extends PObjectId>(
   id: Id,
   spec: PColumnSpec,
+  data: undefined | ColumnData,
   dataStatus: ColumnDataStatus,
-  data: ColumnData | undefined,
 ): ColumnSnapshot<Id> {
-  return { id, spec, dataStatus, data };
+  return { id, spec, data, dataStatus };
 }