@platforma-sdk/model 1.63.1 → 1.64.0

package/dist/columns/column_collection_builder.js

@@ -1,9 +1,10 @@
 import { TreeNodeAccessor } from "../render/accessor.js";
 import { createColumnSnapshot } from "./column_snapshot.js";
 import { ArrayColumnProvider, toColumnSnapshotProvider } from "./column_snapshot_provider.js";
-import { normalizeSelectors } from "./column_selector.js";
-import { AnchoredIdDeriver, deriveNativeId, isPlRef } from "@milaboratories/pl-model-common";
-
+import { convertColumnSelectorToMultiColumnSelector } from "./column_selector.js";
+import { AnchoredIdDeriver, canonicalizeJson, deriveNativeId, getAxesId, isPColumnSpec } from "@milaboratories/pl-model-common";
+import { throwError } from "@milaboratories/helpers";
+import { uniqBy } from "es-toolkit";
 //#region src/columns/column_collection_builder.ts
 /**
 * Mutable builder that accumulates column sources, then produces
@@ -35,58 +36,22 @@ var ColumnCollectionBuilder = class {
 	}
 	build(options) {
 		const allowPartial = options?.allowPartialColumnList === true;
-		const hasAnchors = options !== void 0 && "anchors" in options;
-		const allComplete = this.providers.every((p) => p.isColumnListComplete());
-		if (!allComplete && !allowPartial) return void 0;
-		const columnMap = this.collectColumns();
-		if (hasAnchors) {
-			const anchorSpecs = resolveAnchorSpecs(options.anchors, columnMap);
-			const idDeriver = new AnchoredIdDeriver(anchorSpecs);
-			return new AnchoredColumnCollectionImpl(this.specDriver, {
-				columns: columnMap,
-				idDeriver,
-				anchorSpecs,
-				columnListComplete: allowPartial ? allComplete : false
-			});
-		} else return new ColumnCollectionImpl(this.specDriver, {
-			columns: columnMap,
-			columnListComplete: allowPartial ? allComplete : false
+		if (!this.providers.every((p) => p.isColumnListComplete()) && !allowPartial) return void 0;
+		const columns = collectColumns(this.providers);
+		if (options !== void 0 && "anchors" in options) return new AnchoredColumnCollectionImpl(this.specDriver, {
+			anchors: options.anchors,
+			columns
 		});
+		else return new ColumnCollectionImpl(this.specDriver, { columns });
 	}
-	/**
-	* Collect all columns from all providers, dedup by NativePObjectId.
-	* First source wins.
-	*/
-	collectColumns() {
-		const seen = /* @__PURE__ */ new Set();
-		const result = /* @__PURE__ */ new Map();
-		for (const provider of this.providers) {
-			const columns = provider.getAllColumns();
-			for (const col of columns) {
-				const nativeId = deriveNativeId(col.spec);
-				if (seen.has(nativeId)) continue;
-				seen.add(nativeId);
-				result.set(col.id, col);
-			}
-		}
-		return result;
-	}
-};
-const PLAIN_CONSTRAINTS = {
-	allowFloatingSourceAxes: true,
-	allowFloatingHitAxes: true,
-	allowSourceQualifications: false,
-	allowHitQualifications: false
 };
 var ColumnCollectionImpl = class {
 	columns;
 	specFrameEntry;
-	columnListComplete;
 	constructor(specDriver, options) {
 		this.specDriver = specDriver;
-		this.columns = options.columns;
-		this.columnListComplete = options.columnListComplete ?? false;
-		this.specFrameEntry = this.specDriver.createSpecFrame(Object.fromEntries(Array.from(this.columns.entries(), ([id, col]) => [id, col.spec])));
+		this.columns = new Map(options.columns.map((col) => [col.id, col]));
+		this.specFrameEntry = this.specDriver.createSpecFrame(Object.fromEntries(options.columns.map((col) => [col.id, col.spec])));
 	}
 	dispose() {
 		this.specFrameEntry.unref();
@@ -107,7 +72,7 @@ var ColumnCollectionImpl = class {
 			excludeColumns,
 			axes: [],
 			maxHops: 0,
-			constraints: PLAIN_CONSTRAINTS
+			constraints: matchingModeToConstraints("enrichment")
 		}).hits.map((hit) => this.columns.get(hit.hit.columnId)).filter((col) => col !== void 0).map((col) => this.toSnapshot(col));
 	}
 	toSnapshot(col) {
@@ -115,24 +80,23 @@ var ColumnCollectionImpl = class {
 	}
 };
 var AnchoredColumnCollectionImpl = class {
-	columns;
+	anchorsMap;
+	columnsMap;
 	idDeriver;
+	uniqAnchorAxes;
+	idToOriginalIdMap;
 	specFrameEntry;
-	anchorAxes;
-	/** Reverse lookup: SUniversalPColumnId → PObjectId */
-	idToOriginal;
-	columnListComplete;
 	constructor(specDriver, options) {
 		this.specDriver = specDriver;
-		this.columns = options.columns;
-		this.idDeriver = options.idDeriver;
-		this.columnListComplete = options.columnListComplete ?? false;
-		this.specFrameEntry = this.specDriver.createSpecFrame(Object.fromEntries(Array.from(this.columns.entries(), ([id, col]) => [id, col.spec])));
-		this.anchorAxes = Object.values(options.anchorSpecs).map((spec) => ({
+		this.specFrameEntry = this.specDriver.createSpecFrame(Object.fromEntries(options.columns.map((col) => [col.id, col.spec])));
+		this.columnsMap = new Map(options.columns.map((col) => [col.id, col]));
+		this.anchorsMap = resolveAnchorMap(options.anchors, options.columns, this.specDriver.discoverColumns.bind(this.specDriver, this.specFrameEntry.key));
+		this.idDeriver = new AnchoredIdDeriver(Object.fromEntries(Array.from(this.anchorsMap.entries()).map(([k, v]) => [k, v.spec])));
+		this.uniqAnchorAxes = uniqBy(Array.from(this.anchorsMap.values(), ({ spec }) => ({
 			axesSpec: spec.axesSpec,
 			qualifications: []
-		}));
-		this.idToOriginal = new Map(Array.from(this.columns.entries()).map(([id, col]) => [this.idDeriver.deriveS(col.spec), id]));
+		})), (axis) => canonicalizeJson(getAxesId(axis.axesSpec)) + canonicalizeJson(axis.qualifications));
+		this.idToOriginalIdMap = new Map(options.columns.map((col) => [this.idDeriver.deriveS(col.spec), col.id]));
 	}
 	dispose() {
 		this.specFrameEntry.unref();
@@ -140,74 +104,122 @@ var AnchoredColumnCollectionImpl = class {
 	[Symbol.dispose]() {
 		this.dispose();
 	}
+	getAnchors() {
+		return this.anchorsMap;
+	}
 	getColumn(id) {
-		const origId = this.idToOriginal.get(id);
+		const origId = this.idToOriginalIdMap.get(id);
 		if (origId === void 0) return void 0;
-		const col = this.columns.get(origId);
+		const col = this.columnsMap.get(origId);
 		if (col === void 0) return void 0;
-		return this.toSnapshot(id, col);
+		return remapSnapshot(id, col);
 	}
 	findColumns(options) {
 		const constraints = matchingModeToConstraints(options?.mode ?? "enrichment");
 		const includeColumns = options?.include ? toMultiColumnSelectors(options.include) : void 0;
 		const excludeColumns = options?.exclude ? toMultiColumnSelectors(options.exclude) : void 0;
-		return this.specDriver.discoverColumns(this.specFrameEntry.key, {
+		const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {
 			includeColumns,
 			excludeColumns,
 			constraints,
-			axes: this.anchorAxes,
-			maxHops: options?.maxHops ?? 4
-		}).hits.map((hit) => {
+			maxHops: options?.maxHops ?? 4,
+			axes: this.uniqAnchorAxes
+		});
+		const results = [];
+		for (const hit of response.hits) {
 			const origId = hit.hit.columnId;
-			const col = this.columns.get(origId);
-			if (!col) return void 0;
-			const universalId = this.idDeriver.deriveS(col.spec);
-			return {
-				column: this.toSnapshot(universalId, col),
-				originalId: origId,
-				variants: hit.mappingVariants.map((v) => ({
-					qualifications: v.qualifications,
-					distinctiveQualifications: v.distinctiveQualifications
+			const col = this.columnsMap.get(origId) ?? throwError(`Column with id ${origId} not found in collection`);
+			const associatedId = this.idDeriver.deriveS(col.spec);
+			results.push({
+				path: hit.path.map((step) => ({
+					linker: remapSnapshot(this.idDeriver.deriveS(step.linker.spec), this.columnsMap.get(step.linker.columnId) ?? throwError(`Linker column with id ${step.linker.columnId} not found in collection`)),
+					qualifications: step.qualifications
 				})),
-				path: hit.path
-			};
-		}).filter((m) => m !== void 0);
-	}
-	toSnapshot(universalId, col) {
-		return remapSnapshot(universalId, col);
+				column: remapSnapshot(associatedId, col),
+				variants: hit.mappingVariants,
+				originalId: origId
+			});
+		}
+		return results;
 	}
 };
+/**
+* Collect all columns from all providers, dedup by NativePObjectId.
+* First source wins.
+*/
+function collectColumns(providers) {
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const provider of providers) {
+		const columns = provider.getAllColumns();
+		for (const col of columns) {
+			const nativeId = deriveNativeId(col.spec);
+			if (seen.has(nativeId)) continue;
+			seen.add(nativeId);
+			result.push(col);
+		}
+	}
+	return result;
+}
 /** Create a new snapshot with a different ID, preserving data accessors. */
 function remapSnapshot(id, col) {
-	return createColumnSnapshot(id, col.spec, col.dataStatus, col.data);
+	return createColumnSnapshot(id, col.spec, col.data, col.dataStatus);
 }
 /** Normalize SDK ColumnSelectorInput to MultiColumnSelector[]. */
 function toMultiColumnSelectors(input) {
-	return normalizeSelectors(input);
+	return convertColumnSelectorToMultiColumnSelector(input);
 }
 /**
 * Resolve each anchor value to a PColumnSpec.
 * - PColumnSpec: used directly
 * - PObjectId (string): looked up in the collected column map
-* - PlRef: not supported at this level — caller must resolve before building
 */
-function resolveAnchorSpecs(anchors, columnMap) {
-	const result = {};
+function resolveAnchorMap(anchors, columns, discoverColumns) {
+	const result = /* @__PURE__ */ new Map();
+	const resovedIds = /* @__PURE__ */ new Set();
+	const getDuplicateError = (key) => `Anchor "${key}": selector matched a column that was already matched by another anchor; please refine the selector to match a different column`;
 	for (const [key, anchor] of Object.entries(anchors)) if (typeof anchor === "string") {
-		const col = columnMap.get(anchor);
-		if (!col) throw new Error(`Anchor "${key}": column with id "${anchor}" not found in sources`);
-		result[key] = col.spec;
-	} else if (isPlRef(anchor)) throw new Error(`Anchor "${key}": PlRef anchors must be resolved to PColumnSpec before building. Use the column's spec directly or pass its PObjectId.`);
-	else result[key] = anchor;
+		const found = columns.find((col) => col.id === anchor) ?? throwError(`Anchor "${key}": column with id "${anchor}" not found in sources`);
+		if (resovedIds.has(found.id)) throwError(getDuplicateError(key));
+		result.set(key, {
+			columnId: found.id,
+			spec: found.spec
+		});
+		resovedIds.add(found.id);
+	} else if ("kind" in anchor) {
+		if (!isPColumnSpec(anchor)) throwError(`Anchor "${key}": invalid PColumnSpec`);
+		const nativeId = deriveNativeId(anchor);
+		const found = columns.find((col) => deriveNativeId(col.spec) === nativeId) ?? throwError(`Anchor "${key}": no column matching spec found in sources`);
+		if (resovedIds.has(found.id)) throwError(getDuplicateError(key));
+		result.set(key, {
+			columnId: found.id,
+			spec: anchor
+		});
+		resovedIds.add(found.id);
+	} else {
+		const matched = discoverColumns({
+			includeColumns: toMultiColumnSelectors(anchor),
+			excludeColumns: void 0,
+			axes: [],
+			maxHops: 0,
+			constraints: matchingModeToConstraints("exact")
+		});
+		if (matched.hits.length === 0) throwError(`Anchor "${key}": no columns matched selector`);
+		if (matched.hits.length > 1) throwError(`Anchor "${key}": selector is ambiguous and matched multiple columns; please refine the selector to match exactly one column`);
+		if (resovedIds.has(matched.hits[0].hit.columnId)) throwError(getDuplicateError(key));
+		result.set(key, matched.hits[0].hit);
+		resovedIds.add(matched.hits[0].hit.columnId);
+	}
+	if (resovedIds.size === 0) throwError("At least one anchor must be resolved to a valid column");
 	return result;
 }
 function matchingModeToConstraints(mode) {
 	switch (mode) {
 		case "enrichment": return {
 			allowFloatingSourceAxes: true,
-			allowFloatingHitAxes: true,
-			allowSourceQualifications: false,
-			allowHitQualifications: false
+			allowFloatingHitAxes: false,
+			allowSourceQualifications: true,
+			allowHitQualifications: true
 		};
 		case "related": return {
 			allowFloatingSourceAxes: true,
@@ -223,7 +235,7 @@ function matchingModeToConstraints(mode) {
 		};
 	}
 }
-
 //#endregion
 export { ColumnCollectionBuilder };
+
 //# sourceMappingURL=column_collection_builder.js.map

package/dist/columns/column_collection_builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"column_collection_builder.js","names":[],"sources":["../../src/columns/column_collection_builder.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  ColumnAxesWithQualifications,\n  DiscoverColumnsConstraints,\n  DiscoverColumnsStepInfo,\n  MultiColumnSelector,\n  NativePObjectId,\n  PColumnSpec,\n  PlRef,\n  PObjectId,\n  SUniversalPColumnId,\n} from \"@milaboratories/pl-model-common\";\nimport { AnchoredIdDeriver, deriveNativeId, isPlRef } from \"@milaboratories/pl-model-common\";\nimport type { ColumnSelectorInput } from \"./column_selector\";\nimport { normalizeSelectors } from \"./column_selector\";\nimport { TreeNodeAccessor } from \"../render/accessor\";\nimport type { ColumnSnapshot } from \"./column_snapshot\";\nimport { createColumnSnapshot } from \"./column_snapshot\";\nimport type { ColumnSnapshotProvider, ColumnSource } from \"./column_snapshot_provider\";\nimport { ArrayColumnProvider, toColumnSnapshotProvider } from \"./column_snapshot_provider\";\n\nimport type { PFrameSpecDriver, PoolEntry, SpecFrameHandle } from \"@milaboratories/pl-model-common\";\n\n// --- FindColumnsOptions ---\n\n/** Options for plain collection findColumns. */\nexport interface FindColumnsOptions {\n  /** Include columns matching these selectors. If omitted, includes all columns. */\n  include?: ColumnSelectorInput;\n  /** Exclude columns matching these selectors. */\n  exclude?: ColumnSelectorInput;\n}\n\n// --- ColumnCollection ---\n\n/** Plain collection — no axis context, selector-based filtering only. */\nexport interface ColumnCollection extends Disposable {\n  /** Release the underlying spec frame WASM resource. */\n  dispose(): void;\n  /** Point lookup by provider-native ID. */\n  getColumn(id: PObjectId): undefined | ColumnSnapshot<PObjectId>;\n\n  /** Find columns matching selectors. Returns flat list of snapshots.\n   *  No axis compatibility matching, no linker traversal.\n   *  Never returns undefined — the \"not ready\" state was absorbed by the builder. */\n  findColumns(options?: FindColumnsOptions): ColumnSnapshot<PObjectId>[];\n}\n\n// --- AnchoredColumnCollection ---\n\n/** Axis-aware column collection with anchored identity derivation. */\nexport interface AnchoredColumnCollection extends Disposable {\n  /** Release the underlying spec frame WASM resource. */\n  dispose(): void;\n  /** Point lookup by anchored ID. */\n  getColumn(id: SUniversalPColumnId): undefined | ColumnSnapshot<SUniversalPColumnId>;\n\n  /** Axis-aware column discovery. */\n  findColumns(options?: AnchoredFindColumnsOptions): ColumnMatch[];\n}\n\n/** Controls axis matching behavior for anchored discovery. */\nexport type MatchingMode = \"enrichment\" | \"related\" | \"exact\";\n\n/** Options for anchored collection findColumns. */\nexport interface AnchoredFindColumnsOptions extends FindColumnsOptions {\n  /** Controls axis matching behavior. Default: 'enrichment'. */\n  mode?: MatchingMode;\n  /** Maximum linker hops for cross-domain discovery (0 = direct only, default: 4). */\n  maxHops?: number;\n}\n\n/** Result of anchored discovery — column snapshot + routing info. */\nexport interface ColumnMatch {\n  /** Column snapshot with anchored SUniversalPColumnId. */\n  readonly column: ColumnSnapshot<SUniversalPColumnId>;\n  /** Provider-native ID — for lookups back to the source provider. */\n  readonly originalId: PObjectId;\n  /** Match variants — different paths/qualifications that reach this column. */\n  readonly variants: MatchVariant[];\n  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: DiscoverColumnsStepInfo[];\n}\n\n/** Qualifications needed for both query (already-integrated) columns and the hit column. */\nexport interface MatchQualifications {\n  /** Qualifications for each query (already-integrated) column set. */\n  readonly forQueries: AxisQualification[][];\n  /** Qualifications for the hit column. */\n  readonly forHit: AxisQualification[];\n}\n\n/** A single mapping variant describing how a hit column can be integrated. */\nexport interface MatchVariant {\n  /** Full qualifications needed for integration. */\n  readonly qualifications: MatchQualifications;\n  /** Distinctive (minimal) qualifications needed for integration. */\n  readonly distinctiveQualifications: MatchQualifications;\n}\n\n// --- Build options ---\n\nexport interface BuildOptions {\n  allowPartialColumnList?: true;\n}\n\nexport interface AnchoredBuildOptions extends BuildOptions {\n  anchors: Record<string, PlRef | PObjectId | PColumnSpec>;\n}\n\n// --- ColumnCollectionBuilder ---\n\n/**\n * Mutable builder that accumulates column sources, then produces\n * a ColumnCollection (plain) or AnchoredColumnCollection (with anchors).\n *\n * Each output lambda creates its own builder — a constraint of the\n * computable framework where each output tracks its own dependencies.\n */\nexport class ColumnCollectionBuilder {\n  private readonly providers: ColumnSnapshotProvider[] = [];\n\n  constructor(private readonly specDriver: PFrameSpecDriver) {}\n\n  /**\n   * Register a column source. Sources added first take precedence for dedup.\n   * Does NOT accept undefined — if a source isn't available yet,\n   * the caller should return undefined from the output lambda.\n   */\n  addSource(source: ColumnSource | TreeNodeAccessor): this {\n    if (source instanceof TreeNodeAccessor) {\n      const columns = source.getPColumns();\n      if (columns) this.providers.push(new ArrayColumnProvider(columns));\n    } else {\n      this.providers.push(toColumnSnapshotProvider(source));\n    }\n    return this;\n  }\n\n  addSources(sources: (ColumnSource | TreeNodeAccessor)[]): this {\n    for (const source of sources) {\n      this.addSource(source);\n    }\n    return this;\n  }\n\n  /** Plain collection — selector-based filtering, PObjectId namespace. */\n  build(): undefined | ColumnCollection;\n  build(options: {\n    allowPartialColumnList: true;\n  }): ColumnCollection & { readonly columnListComplete: boolean };\n  /** Anchored collection — axis-aware discovery, SUniversalPColumnId namespace. */\n  build(\n    options: AnchoredBuildOptions & { allowPartialColumnList: true },\n  ): AnchoredColumnCollection & { readonly columnListComplete: boolean };\n  build(options: AnchoredBuildOptions): undefined | AnchoredColumnCollection;\n  build(\n    options?: BuildOptions | AnchoredBuildOptions,\n  ):\n    | undefined\n    | ColumnCollection\n    | AnchoredColumnCollection\n    | (ColumnCollection & { readonly columnListComplete: boolean })\n    | (AnchoredColumnCollection & { readonly columnListComplete: boolean }) {\n    const allowPartial = options?.allowPartialColumnList === true;\n    const hasAnchors = options !== undefined && \"anchors\" in options;\n\n    // Check column list completeness\n    const allComplete = this.providers.every((p) => p.isColumnListComplete());\n    if (!allComplete && !allowPartial) return undefined;\n\n    // Collect all columns, dedup by native ID (first source wins)\n    const columnMap = this.collectColumns();\n\n    if (hasAnchors) {\n      const anchorSpecs = resolveAnchorSpecs(options.anchors, columnMap);\n      const idDeriver = new AnchoredIdDeriver(anchorSpecs);\n\n      return new AnchoredColumnCollectionImpl(this.specDriver, {\n        columns: columnMap,\n        idDeriver,\n        anchorSpecs,\n        columnListComplete: allowPartial ? allComplete : false,\n      });\n    } else {\n      return new ColumnCollectionImpl(this.specDriver, {\n        columns: columnMap,\n        columnListComplete: allowPartial ? allComplete : false,\n      });\n    }\n  }\n\n  /**\n   * Collect all columns from all providers, dedup by NativePObjectId.\n   * First source wins.\n   */\n  private collectColumns(): Map<PObjectId, ColumnSnapshot<PObjectId>> {\n    const seen = new Set<NativePObjectId>();\n    const result = new Map<PObjectId, ColumnSnapshot<PObjectId>>();\n\n    for (const provider of this.providers) {\n      const columns = provider.getAllColumns();\n      for (const col of columns) {\n        const nativeId = deriveNativeId(col.spec);\n        if (seen.has(nativeId)) continue;\n        seen.add(nativeId);\n        result.set(col.id, col);\n      }\n    }\n\n    return result;\n  }\n}\n\n// --- Permissive constraints for plain (non-anchored) filtering ---\n\nconst PLAIN_CONSTRAINTS: DiscoverColumnsConstraints = {\n  allowFloatingSourceAxes: true,\n  allowFloatingHitAxes: true,\n  allowSourceQualifications: false,\n  allowHitQualifications: false,\n};\n\n// --- ColumnCollectionImpl ---\n\ninterface ColumnCollectionImplOptions {\n  readonly columns: Map<PObjectId, ColumnSnapshot<PObjectId>>;\n  readonly columnListComplete?: boolean;\n}\n\nclass ColumnCollectionImpl implements ColumnCollection, Disposable {\n  private readonly columns: Map<PObjectId, ColumnSnapshot<PObjectId>>;\n  private readonly specFrameEntry: PoolEntry<SpecFrameHandle>;\n  public readonly columnListComplete: boolean;\n\n  constructor(\n    private readonly specDriver: PFrameSpecDriver,\n    options: ColumnCollectionImplOptions,\n  ) {\n    this.columns = options.columns;\n    this.columnListComplete = options.columnListComplete ?? false;\n    this.specFrameEntry = this.specDriver.createSpecFrame(\n      Object.fromEntries(Array.from(this.columns.entries(), ([id, col]) => [id, col.spec])),\n    );\n  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getColumn(id: PObjectId): undefined | ColumnSnapshot<PObjectId> {\n    const col = this.columns.get(id);\n    if (col === undefined) return undefined;\n    return this.toSnapshot(col);\n  }\n\n  findColumns(options?: FindColumnsOptions): ColumnSnapshot<PObjectId>[] {\n    const includeColumns = options?.include ? toMultiColumnSelectors(options.include) : undefined;\n    const excludeColumns = options?.exclude ? toMultiColumnSelectors(options.exclude) : undefined;\n\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      axes: [],\n      maxHops: 0,\n      constraints: PLAIN_CONSTRAINTS,\n    });\n\n    // Map hits back to snapshots\n    const results = response.hits\n      .map((hit) => this.columns.get(hit.hit.columnId as PObjectId))\n      .filter((col): col is ColumnSnapshot<PObjectId> => col !== undefined)\n      .map((col) => this.toSnapshot(col));\n\n    return results;\n  }\n\n  private toSnapshot(col: ColumnSnapshot<PObjectId>): ColumnSnapshot<PObjectId> {\n    return remapSnapshot(col.id, col);\n  }\n}\n\n// --- AnchoredColumnCollectionImpl ---\n\ninterface AnchoredColumnCollectionImplOptions extends ColumnCollectionImplOptions {\n  readonly idDeriver: AnchoredIdDeriver;\n  readonly anchorSpecs: Record<string, PColumnSpec>;\n}\n\nclass AnchoredColumnCollectionImpl implements AnchoredColumnCollection, Disposable {\n  private readonly columns: Map<PObjectId, ColumnSnapshot<PObjectId>>;\n  private readonly idDeriver: AnchoredIdDeriver;\n  private readonly specFrameEntry: PoolEntry<SpecFrameHandle>;\n  private readonly anchorAxes: ColumnAxesWithQualifications[];\n  /** Reverse lookup: SUniversalPColumnId → PObjectId */\n  private readonly idToOriginal: Map<SUniversalPColumnId, PObjectId>;\n  public readonly columnListComplete: boolean;\n\n  constructor(\n    private readonly specDriver: PFrameSpecDriver,\n    options: AnchoredColumnCollectionImplOptions,\n  ) {\n    this.columns = options.columns;\n    this.idDeriver = options.idDeriver;\n    this.columnListComplete = options.columnListComplete ?? false;\n\n    // Create spec frame from all collected columns\n    this.specFrameEntry = this.specDriver.createSpecFrame(\n      Object.fromEntries(Array.from(this.columns.entries(), ([id, col]) => [id, col.spec])),\n    );\n\n    // Build anchor axes for discovery requests\n    this.anchorAxes = Object.values(options.anchorSpecs).map((spec) => ({\n      axesSpec: spec.axesSpec,\n      qualifications: [],\n    }));\n\n    // Build reverse lookup map\n    this.idToOriginal = new Map(\n      Array.from(this.columns.entries()).map(\n        ([id, col]) => [this.idDeriver.deriveS(col.spec), id] as const,\n      ),\n    );\n  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getColumn(id: SUniversalPColumnId): undefined | ColumnSnapshot<SUniversalPColumnId> {\n    const origId = this.idToOriginal.get(id);\n    if (origId === undefined) return undefined;\n    const col = this.columns.get(origId);\n    if (col === undefined) return undefined;\n    return this.toSnapshot(id, col);\n  }\n\n  findColumns(options?: AnchoredFindColumnsOptions): ColumnMatch[] {\n    const mode = options?.mode ?? \"enrichment\";\n    const constraints = matchingModeToConstraints(mode);\n    const includeColumns = options?.include ? toMultiColumnSelectors(options.include) : undefined;\n    const excludeColumns = options?.exclude ? toMultiColumnSelectors(options.exclude) : undefined;\n\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      constraints,\n      axes: this.anchorAxes,\n      maxHops: options?.maxHops ?? 4,\n    });\n\n    // Map hits back to ColumnMatch entries\n    const results = response.hits\n      .map((hit) => {\n        const origId = hit.hit.columnId as PObjectId;\n        const col = this.columns.get(origId);\n        if (!col) return undefined;\n        const universalId = this.idDeriver.deriveS(col.spec);\n        return {\n          column: this.toSnapshot(universalId, col),\n          originalId: origId,\n          variants: hit.mappingVariants.map(\n            (v): MatchVariant => ({\n              qualifications: v.qualifications,\n              distinctiveQualifications: v.distinctiveQualifications,\n            }),\n          ),\n          path: hit.path,\n        } satisfies ColumnMatch;\n      })\n      .filter((m): m is ColumnMatch => m !== undefined);\n\n    return results;\n  }\n\n  private toSnapshot(\n    universalId: SUniversalPColumnId,\n    col: ColumnSnapshot<PObjectId>,\n  ): ColumnSnapshot<SUniversalPColumnId> {\n    return remapSnapshot(universalId, col);\n  }\n}\n\n// --- Shared snapshot helpers ---\n\n/** Create a new snapshot with a different ID, preserving data accessors. */\nfunction remapSnapshot<Id extends PObjectId>(\n  id: Id,\n  col: ColumnSnapshot<PObjectId>,\n): ColumnSnapshot<Id> {\n  return createColumnSnapshot(id, col.spec, col.dataStatus, col.data);\n}\n\n/** Normalize SDK ColumnSelectorInput to MultiColumnSelector[]. */\nfunction toMultiColumnSelectors(input: ColumnSelectorInput): MultiColumnSelector[] {\n  return normalizeSelectors(input);\n}\n\n// --- Anchor resolution ---\n\n/**\n * Resolve each anchor value to a PColumnSpec.\n * - PColumnSpec: used directly\n * - PObjectId (string): looked up in the collected column map\n * - PlRef: not supported at this level — caller must resolve before building\n */\nfunction resolveAnchorSpecs(\n  anchors: Record<string, PlRef | PObjectId | PColumnSpec>,\n  columnMap: Map<PObjectId, ColumnSnapshot<PObjectId>>,\n): Record<string, PColumnSpec> {\n  const result: Record<string, PColumnSpec> = {};\n  for (const [key, anchor] of Object.entries(anchors)) {\n    if (typeof anchor === \"string\") {\n      // PObjectId — look up in collected columns\n      const col = columnMap.get(anchor as PObjectId);\n      if (!col) throw new Error(`Anchor \"${key}\": column with id \"${anchor}\" not found in sources`);\n      result[key] = col.spec;\n    } else if (isPlRef(anchor)) {\n      throw new Error(\n        `Anchor \"${key}\": PlRef anchors must be resolved to PColumnSpec before building. ` +\n          `Use the column's spec directly or pass its PObjectId.`,\n      );\n    } else {\n      // PColumnSpec\n      result[key] = anchor;\n    }\n  }\n  return result;\n}\n\n// --- MatchingMode → DiscoverColumnsConstraints ---\n\nfunction matchingModeToConstraints(mode: MatchingMode): DiscoverColumnsConstraints {\n  switch (mode) {\n    case \"enrichment\":\n      return {\n        allowFloatingSourceAxes: true,\n        allowFloatingHitAxes: true,\n        allowSourceQualifications: false,\n        allowHitQualifications: false,\n      };\n    case \"related\":\n      return {\n        allowFloatingSourceAxes: true,\n        allowFloatingHitAxes: true,\n        allowSourceQualifications: true,\n        allowHitQualifications: true,\n      };\n    case \"exact\":\n      return {\n        allowFloatingSourceAxes: false,\n        allowFloatingHitAxes: false,\n        allowSourceQualifications: false,\n        allowHitQualifications: false,\n      };\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"column_collection_builder.js","names":[],"sources":["../../src/columns/column_collection_builder.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  ColumnAxesWithQualifications,\n  DiscoverColumnsConstraints,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n  MultiColumnSelector,\n  NativePObjectId,\n  PColumnIdAndSpec,\n  PColumnSpec,\n  PObjectId,\n  SUniversalPColumnId,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  AnchoredIdDeriver,\n  canonicalizeJson,\n  deriveNativeId,\n  getAxesId,\n  isPColumnSpec,\n} from \"@milaboratories/pl-model-common\";\nimport type { ColumnSelector, RelaxedColumnSelector } from \"./column_selector\";\nimport { convertColumnSelectorToMultiColumnSelector } from \"./column_selector\";\nimport { TreeNodeAccessor } from \"../render/accessor\";\nimport type { ColumnSnapshot } from \"./column_snapshot\";\nimport { createColumnSnapshot } from \"./column_snapshot\";\nimport type { ColumnSnapshotProvider, ColumnSource } from \"./column_snapshot_provider\";\nimport { ArrayColumnProvider, toColumnSnapshotProvider } from \"./column_snapshot_provider\";\n\nimport type { PFrameSpecDriver, PoolEntry, SpecFrameHandle } from \"@milaboratories/pl-model-common\";\nimport { throwError } from \"@milaboratories/helpers\";\nimport { uniqBy } from \"es-toolkit\";\n\n// --- FindColumnsOptions ---\n\n/** Options for plain collection findColumns. */\nexport interface FindColumnsOptions {\n  /** Include columns matching these selectors. If omitted, includes all columns. */\n  include?: ColumnSelector;\n  /** Exclude columns matching these selectors. */\n  exclude?: ColumnSelector;\n}\n\n// --- ColumnCollection ---\n\n/** Plain collection — no axis context, selector-based filtering only. */\nexport interface ColumnCollection extends Disposable {\n  /** Release the underlying spec frame WASM resource. */\n  dispose(): void;\n\n  /** Point lookup by provider-native ID. */\n  getColumn(id: PObjectId): undefined | ColumnSnapshot<PObjectId>;\n\n  /** Find columns matching selectors. Returns flat list of snapshots.\n   *  No axis compatibility matching, no linker traversal.\n   *  Never returns undefined — the \"not ready\" state was absorbed by the builder. */\n  findColumns(options?: FindColumnsOptions): ColumnSnapshot<PObjectId>[];\n}\n\n// --- AnchoredColumnCollection ---\n\n/** Axis-aware column collection with anchored identity derivation. */\nexport interface AnchoredColumnCollection extends Disposable {\n  /** Release the underlying spec frame WASM resource. */\n  dispose(): void;\n\n  /** List of anchors used for discovery, with their resolved specs. */\n  getAnchors(): Map<string, PColumnIdAndSpec>;\n\n  /** Point lookup by anchored ID. */\n  getColumn(id: SUniversalPColumnId): undefined | ColumnSnapshot<SUniversalPColumnId>;\n\n  /** Axis-aware column discovery. */\n  findColumns(options?: AnchoredFindColumnsOptions): ColumnMatch[];\n}\n\n/** Controls axis matching behavior for anchored discovery. */\nexport type MatchingMode = \"enrichment\" | \"related\" | \"exact\";\n\n/** Options for anchored collection findColumns. */\nexport interface AnchoredFindColumnsOptions extends FindColumnsOptions {\n  /** Controls axis matching behavior. Default: 'enrichment'. */\n  mode?: MatchingMode;\n  /** Maximum linker hops for cross-domain discovery (0 = direct only, default: 4). */\n  maxHops?: number;\n}\n\n/** Result of anchored discovery — column snapshot + routing info. */\nexport interface ColumnMatch {\n  /** Column snapshot with anchored SUniversalPColumnId. */\n  readonly column: ColumnSnapshot<SUniversalPColumnId>;\n  /** Provider-native ID — for lookups back to the source provider. */\n  readonly originalId: PObjectId;\n  /** Match variants — different paths/qualifications that reach this column. */\n  readonly variants: MatchVariant[];\n  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: {\n    linker: ColumnSnapshot<SUniversalPColumnId>;\n    qualifications: AxisQualification[];\n  }[];\n}\n\n/** Qualifications needed for both query (already-integrated) columns and the hit column. */\nexport interface MatchQualifications {\n  /** Qualifications for each query (already-integrated) column set. */\n  readonly forQueries: AxisQualification[][];\n  /** Qualifications for the hit column. */\n  readonly forHit: AxisQualification[];\n}\n\n/** A single mapping variant describing how a hit column can be integrated. */\nexport interface MatchVariant {\n  /** Full qualifications needed for integration. */\n  readonly qualifications: MatchQualifications;\n  /** Distinctive (minimal) qualifications needed for integration. */\n  readonly distinctiveQualifications: MatchQualifications;\n}\n\n// --- Build options ---\n\nexport interface BuildOptions {\n  allowPartialColumnList?: true;\n}\n\nexport type AnchorEntry = PObjectId | PColumnSpec | RelaxedColumnSelector;\n\nexport interface AnchoredBuildOptions extends BuildOptions {\n  anchors: Record<string, AnchorEntry>;\n}\n\n// --- ColumnCollectionBuilder ---\n\n/**\n * Mutable builder that accumulates column sources, then produces\n * a ColumnCollection (plain) or AnchoredColumnCollection (with anchors).\n *\n * Each output lambda creates its own builder — a constraint of the\n * computable framework where each output tracks its own dependencies.\n */\nexport class ColumnCollectionBuilder {\n  private readonly providers: ColumnSnapshotProvider[] = [];\n\n  constructor(private readonly specDriver: PFrameSpecDriver) {}\n\n  /**\n   * Register a column source. Sources added first take precedence for dedup.\n   * Does NOT accept undefined — if a source isn't available yet,\n   * the caller should return undefined from the output lambda.\n   */\n  addSource(source: ColumnSource | TreeNodeAccessor): this {\n    if (source instanceof TreeNodeAccessor) {\n      const columns = source.getPColumns();\n      if (columns) this.providers.push(new ArrayColumnProvider(columns));\n    } else {\n      this.providers.push(toColumnSnapshotProvider(source));\n    }\n    return this;\n  }\n\n  addSources(sources: (ColumnSource | TreeNodeAccessor)[]): this {\n    for (const source of sources) {\n      this.addSource(source);\n    }\n    return this;\n  }\n\n  /** Plain collection — selector-based filtering, PObjectId namespace. */\n  build(): undefined | ColumnCollection;\n  build(options: {\n    allowPartialColumnList: true;\n  }): ColumnCollection & { readonly columnListComplete: boolean };\n  /** Anchored collection — axis-aware discovery, SUniversalPColumnId namespace. */\n  build(\n    options: AnchoredBuildOptions & { allowPartialColumnList: true },\n  ): AnchoredColumnCollection & { readonly columnListComplete: boolean };\n  build(options: AnchoredBuildOptions): undefined | AnchoredColumnCollection;\n  build(\n    options?: BuildOptions | AnchoredBuildOptions,\n  ):\n    | undefined\n    | ColumnCollection\n    | AnchoredColumnCollection\n    | (ColumnCollection & { readonly columnListComplete: boolean })\n    | (AnchoredColumnCollection & { readonly columnListComplete: boolean }) {\n    const allowPartial = options?.allowPartialColumnList === true;\n\n    // Check column list completeness\n    const allComplete = this.providers.every((p) => p.isColumnListComplete());\n    if (!allComplete && !allowPartial) return undefined;\n\n    // Collect all columns, dedup by native ID (first source wins)\n    const columns = collectColumns(this.providers);\n    const hasAnchors = options !== undefined && \"anchors\" in options;\n\n    if (hasAnchors) {\n      return new AnchoredColumnCollectionImpl(this.specDriver, {\n        anchors: options.anchors,\n        columns,\n      });\n    } else {\n      return new ColumnCollectionImpl(this.specDriver, {\n        columns,\n      });\n    }\n  }\n}\n\n// --- ColumnCollectionImpl ---\n\ninterface ColumnCollectionImplOptions {\n  readonly columns: ColumnSnapshot<PObjectId>[];\n}\n\nclass ColumnCollectionImpl implements ColumnCollection, Disposable {\n  private readonly columns: Map<PObjectId, ColumnSnapshot<PObjectId>>;\n  private readonly specFrameEntry: PoolEntry<SpecFrameHandle>;\n\n  constructor(\n    private readonly specDriver: PFrameSpecDriver,\n    options: ColumnCollectionImplOptions,\n  ) {\n    this.columns = new Map(options.columns.map((col) => [col.id, col]));\n    this.specFrameEntry = this.specDriver.createSpecFrame(\n      Object.fromEntries(options.columns.map((col) => [col.id, col.spec])),\n    );\n  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getColumn(id: PObjectId): undefined | ColumnSnapshot<PObjectId> {\n    const col = this.columns.get(id);\n    if (col === undefined) return undefined;\n    return this.toSnapshot(col);\n  }\n\n  findColumns(options?: FindColumnsOptions): ColumnSnapshot<PObjectId>[] {\n    const includeColumns = options?.include ? toMultiColumnSelectors(options.include) : undefined;\n    const excludeColumns = options?.exclude ? toMultiColumnSelectors(options.exclude) : undefined;\n\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      axes: [],\n      maxHops: 0,\n      constraints: matchingModeToConstraints(\"enrichment\"),\n    });\n\n    // Map hits back to snapshots\n    const results = response.hits\n      .map((hit) => this.columns.get(hit.hit.columnId as PObjectId))\n      .filter((col): col is ColumnSnapshot<PObjectId> => col !== undefined)\n      .map((col) => this.toSnapshot(col));\n\n    return results;\n  }\n\n  private toSnapshot(col: ColumnSnapshot<PObjectId>): ColumnSnapshot<PObjectId> {\n    return remapSnapshot(col.id, col);\n  }\n}\n\n// --- AnchoredColumnCollectionImpl ---\n\ninterface AnchoredColumnCollectionImplOptions extends ColumnCollectionImplOptions {\n  readonly anchors: Record<string, AnchorEntry>;\n}\n\nclass AnchoredColumnCollectionImpl implements AnchoredColumnCollection, Disposable {\n  private readonly anchorsMap: Map<string, PColumnIdAndSpec>;\n  private readonly columnsMap: Map<PObjectId, ColumnSnapshot<PObjectId>>;\n\n  private readonly idDeriver: AnchoredIdDeriver;\n  private readonly uniqAnchorAxes: ColumnAxesWithQualifications[];\n  private readonly idToOriginalIdMap: Map<SUniversalPColumnId, PObjectId>;\n  private readonly specFrameEntry: PoolEntry<SpecFrameHandle>;\n\n  constructor(\n    private readonly specDriver: PFrameSpecDriver,\n    options: AnchoredColumnCollectionImplOptions,\n  ) {\n    // Create spec frame from all collected columns\n    this.specFrameEntry = this.specDriver.createSpecFrame(\n      Object.fromEntries(options.columns.map((col) => [col.id, col.spec])),\n    );\n    this.columnsMap = new Map(options.columns.map((col) => [col.id, col]));\n    this.anchorsMap = resolveAnchorMap(\n      options.anchors,\n      options.columns,\n      this.specDriver.discoverColumns.bind(this.specDriver, this.specFrameEntry.key),\n    );\n    this.idDeriver = new AnchoredIdDeriver(\n      Object.fromEntries(\n        Array.from(this.anchorsMap.entries()).map(([k, v]) => [k, v.spec] as const),\n      ),\n    );\n    this.uniqAnchorAxes = uniqBy(\n      Array.from(this.anchorsMap.values(), ({ spec }) => ({\n        axesSpec: spec.axesSpec,\n        qualifications: [],\n      })),\n      (axis) => canonicalizeJson(getAxesId(axis.axesSpec)) + canonicalizeJson(axis.qualifications),\n    );\n    this.idToOriginalIdMap = new Map(\n      options.columns.map((col) => [this.idDeriver.deriveS(col.spec), col.id] as const),\n    );\n  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getAnchors(): Map<string, PColumnIdAndSpec> {\n    return this.anchorsMap;\n  }\n\n  getColumn(id: SUniversalPColumnId): undefined | ColumnSnapshot<SUniversalPColumnId> {\n    const origId = this.idToOriginalIdMap.get(id);\n    if (origId === undefined) return undefined;\n    const col = this.columnsMap.get(origId);\n    if (col === undefined) return undefined;\n    return remapSnapshot(id, col);\n  }\n\n  findColumns(options?: AnchoredFindColumnsOptions): ColumnMatch[] {\n    const mode = options?.mode ?? \"enrichment\";\n    const constraints = matchingModeToConstraints(mode);\n    const includeColumns = options?.include ? toMultiColumnSelectors(options.include) : undefined;\n    const excludeColumns = options?.exclude ? toMultiColumnSelectors(options.exclude) : undefined;\n\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      constraints,\n      maxHops: options?.maxHops ?? 4,\n      axes: this.uniqAnchorAxes,\n    });\n\n    // Map every WASM discovery hit to a ColumnMatch.\n    // The same physical column may appear multiple times when reachable through\n    // different linker paths — each hit becomes a separate ColumnMatch so that\n    // the caller can expand them into distinct table columns.\n    const results: ColumnMatch[] = [];\n    for (const hit of response.hits) {\n      const origId = hit.hit.columnId as PObjectId;\n      const col =\n        this.columnsMap.get(origId) ??\n        throwError(`Column with id ${origId} not found in collection`);\n      const associatedId = this.idDeriver.deriveS(col.spec);\n\n      results.push({\n        path: hit.path.map((step) => ({\n          linker: remapSnapshot(\n            this.idDeriver.deriveS(step.linker.spec),\n            this.columnsMap.get(step.linker.columnId) ??\n              throwError(`Linker column with id ${step.linker.columnId} not found in collection`),\n          ),\n          qualifications: step.qualifications,\n        })),\n        column: remapSnapshot(associatedId, col),\n        variants: hit.mappingVariants,\n        originalId: origId,\n      });\n    }\n\n    return results;\n  }\n}\n\n/**\n * Collect all columns from all providers, dedup by NativePObjectId.\n * First source wins.\n */\nfunction collectColumns(providers: ColumnSnapshotProvider[]): ColumnSnapshot<PObjectId>[] {\n  const seen = new Set<NativePObjectId>();\n  const result: ColumnSnapshot<PObjectId>[] = [];\n\n  for (const provider of providers) {\n    const columns = provider.getAllColumns();\n    for (const col of columns) {\n      const nativeId = deriveNativeId(col.spec);\n      if (seen.has(nativeId)) continue;\n      seen.add(nativeId);\n      result.push(col);\n    }\n  }\n\n  return result;\n}\n\n// --- Shared snapshot helpers ---\n\n/** Create a new snapshot with a different ID, preserving data accessors. */\nfunction remapSnapshot<Id extends PObjectId>(\n  id: Id,\n  col: ColumnSnapshot<PObjectId>,\n): ColumnSnapshot<Id> {\n  return createColumnSnapshot(id, col.spec, col.data, col.dataStatus);\n}\n\n/** Normalize SDK ColumnSelectorInput to MultiColumnSelector[]. */\nfunction toMultiColumnSelectors(input: ColumnSelector): MultiColumnSelector[] {\n  return convertColumnSelectorToMultiColumnSelector(input);\n}\n\n// --- Anchor resolution ---\n\n/**\n * Resolve each anchor value to a PColumnSpec.\n * - PColumnSpec: used directly\n * - PObjectId (string): looked up in the collected column map\n */\nfunction resolveAnchorMap(\n  anchors: Record<string, AnchorEntry>,\n  columns: ColumnSnapshot<PObjectId>[],\n  discoverColumns: (request: DiscoverColumnsRequest) => DiscoverColumnsResponse,\n): Map<string, PColumnIdAndSpec> {\n  const result = new Map<string, PColumnIdAndSpec>();\n  const resovedIds = new Set<PObjectId>();\n  const getDuplicateError = (key: string) =>\n    `Anchor \"${key}\": selector matched a column that was already matched by another anchor; please refine the selector to match a different column`;\n\n  for (const [key, anchor] of Object.entries(anchors)) {\n    if (typeof anchor === \"string\") {\n      const found =\n        columns.find((col) => col.id === anchor) ??\n        throwError(`Anchor \"${key}\": column with id \"${anchor}\" not found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(key));\n      }\n      result.set(key, { columnId: found.id, spec: found.spec });\n      resovedIds.add(found.id);\n    } else if (\"kind\" in anchor) {\n      if (!isPColumnSpec(anchor)) throwError(`Anchor \"${key}\": invalid PColumnSpec`);\n      const nativeId = deriveNativeId(anchor);\n      const found =\n        columns.find((col) => deriveNativeId(col.spec) === nativeId) ??\n        throwError(`Anchor \"${key}\": no column matching spec found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(key));\n      }\n      result.set(key, { columnId: found.id, spec: anchor });\n      resovedIds.add(found.id);\n    } else {\n      const matched = discoverColumns({\n        includeColumns: toMultiColumnSelectors(anchor),\n        excludeColumns: undefined,\n        axes: [],\n        maxHops: 0,\n        constraints: matchingModeToConstraints(\"exact\"),\n      });\n      if (matched.hits.length === 0) {\n        throwError(`Anchor \"${key}\": no columns matched selector`);\n      }\n      if (matched.hits.length > 1) {\n        throwError(\n          `Anchor \"${key}\": selector is ambiguous and matched multiple columns; please refine the selector to match exactly one column`,\n        );\n      }\n      if (resovedIds.has(matched.hits[0].hit.columnId as PObjectId)) {\n        throwError(getDuplicateError(key));\n      }\n\n      result.set(key, matched.hits[0].hit);\n      resovedIds.add(matched.hits[0].hit.columnId);\n    }\n  }\n\n  if (resovedIds.size === 0) {\n    throwError(\"At least one anchor must be resolved to a valid column\");\n  }\n\n  return result;\n}\n\n// --- MatchingMode → DiscoverColumnsConstraints ---\n\nfunction matchingModeToConstraints(mode: MatchingMode): DiscoverColumnsConstraints {\n  switch (mode) {\n    case \"enrichment\":\n      return {\n        allowFloatingSourceAxes: true,\n        allowFloatingHitAxes: false,\n        allowSourceQualifications: true,\n        allowHitQualifications: true,\n      };\n    case \"related\":\n      return {\n        allowFloatingSourceAxes: true,\n        allowFloatingHitAxes: true,\n        allowSourceQualifications: true,\n        allowHitQualifications: true,\n      };\n    case \"exact\":\n      return {\n        allowFloatingSourceAxes: false,\n        allowFloatingHitAxes: false,\n        allowSourceQualifications: false,\n        allowHitQualifications: false,\n      };\n  }\n}\n"],"mappings":"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"}

package/dist/columns/column_selector.cjs

@@ -1,4 +1,3 @@
-
 //#region src/columns/column_selector.ts
 function normalizeStringMatchers(input) {
 	if (typeof input === "string") return [{
@@ -19,7 +18,7 @@ function normalizeRecord(input) {
 function normalizeTypes(input) {
 	return Array.isArray(input) ? input : [input];
 }
-function normalizeAxisSelector(input) {
+function convertRelaxedAxisSelectorToMultiAxisSelector(input) {
 	const result = {};
 	if (input.name !== void 0) result.name = normalizeStringMatchers(input.name);
 	if (input.type !== void 0) result.type = normalizeTypes(input.type);
@@ -28,95 +27,23 @@ function normalizeAxisSelector(input) {
 	if (input.annotations !== void 0) result.annotations = normalizeRecord(input.annotations);
 	return result;
 }
-/** Normalize relaxed input to strict ColumnSelector[]. */
-function normalizeSelectors(input) {
-	return (Array.isArray(input) ? input : [input]).map(normalizeSingleSelector);
-}
-function normalizeSingleSelector(input) {
+function convertRelaxedColumnSelectorToMultiColumnSelector(input) {
 	const result = {};
 	if (input.name !== void 0) result.name = normalizeStringMatchers(input.name);
 	if (input.type !== void 0) result.type = normalizeTypes(input.type);
 	if (input.domain !== void 0) result.domain = normalizeRecord(input.domain);
 	if (input.contextDomain !== void 0) result.contextDomain = normalizeRecord(input.contextDomain);
 	if (input.annotations !== void 0) result.annotations = normalizeRecord(input.annotations);
-	if (input.axes !== void 0) result.axes = input.axes.map(normalizeAxisSelector);
+	if (input.axes !== void 0) result.axes = input.axes.map(convertRelaxedAxisSelectorToMultiAxisSelector);
 	if (input.partialAxesMatch !== void 0) result.partialAxesMatch = input.partialAxesMatch;
 	return result;
 }
-function matchStringValue(value, matchers) {
-	return matchers.some((m) => {
-		if (m.type === "exact") return value === m.value;
-		return new RegExp(`^(?:${m.value})$`).test(value);
-	});
-}
-function matchRecordField(actual, required) {
-	const record = actual ?? {};
-	for (const [key, matchers] of Object.entries(required)) {
-		const value = record[key];
-		if (value === void 0) 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) {
-	const result = {};
-	if (spec.domain) Object.assign(result, spec.domain);
-	for (const axis of spec.axesSpec) if (axis.domain) Object.assign(result, axis.domain);
-	return result;
+function convertColumnSelectorToMultiColumnSelector(input) {
+	return (Array.isArray(input) ? input : [input]).map(convertRelaxedColumnSelectorToMultiColumnSelector);
 }
-/** Get combined context domain: column's own contextDomain merged with all axis contextDomains. */
-function getCombinedContextDomain(spec) {
-	const result = {};
-	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, selector) {
-	if (selector.name !== void 0 && !matchStringValue(axis.name, selector.name)) return false;
-	if (selector.type !== void 0 && !selector.type.includes(axis.type)) return false;
-	if (selector.domain !== void 0 && !matchRecordField(axis.domain, selector.domain)) return false;
-	if (selector.contextDomain !== void 0 && !matchRecordField("contextDomain" in axis ? axis.contextDomain : void 0, selector.contextDomain)) return false;
-	if (selector.annotations !== void 0 && !matchRecordField(axis.annotations, selector.annotations)) return false;
-	return true;
-}
-/** Check if a PColumnSpec matches a single strict ColumnSelector. */
-function matchColumn(spec, selector) {
-	if (selector.name !== void 0 && !matchStringValue(spec.name, selector.name)) return false;
-	if (selector.type !== void 0 && !selector.type.includes(spec.valueType)) return false;
-	if (selector.domain !== void 0) {
-		if (!matchRecordField(getCombinedDomain(spec), selector.domain)) return false;
-	}
-	if (selector.contextDomain !== void 0) {
-		if (!matchRecordField(getCombinedContextDomain(spec), selector.contextDomain)) return false;
-	}
-	if (selector.annotations !== void 0) {
-		if (!matchRecordField(spec.annotations, selector.annotations)) return false;
-	}
-	if (selector.axes !== void 0) if (selector.partialAxesMatch ?? true) {
-		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). */
-function matchColumnSelectors(selectors, spec) {
-	return selectors.some((sel) => matchColumn(spec, sel));
-}
-/**
-* Convert selector input to a predicate function.
-* Normalizes relaxed form, then returns a function that OR-matches.
-*/
-function columnSelectorsToPredicate(input) {
-	const selectors = normalizeSelectors(input);
-	return (spec) => matchColumnSelectors(selectors, spec);
-}
-
 //#endregion
-exports.columnSelectorsToPredicate = columnSelectorsToPredicate;
-exports.matchColumn = matchColumn;
-exports.matchColumnSelectors = matchColumnSelectors;
-exports.normalizeSelectors = normalizeSelectors;
+exports.convertColumnSelectorToMultiColumnSelector = convertColumnSelectorToMultiColumnSelector;
+exports.convertRelaxedAxisSelectorToMultiAxisSelector = convertRelaxedAxisSelectorToMultiAxisSelector;
+exports.convertRelaxedColumnSelectorToMultiColumnSelector = convertRelaxedColumnSelectorToMultiColumnSelector;
+
 //# sourceMappingURL=column_selector.cjs.map

package/dist/columns/column_selector.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"column_selector.cjs","names":[],"sources":["../../src/columns/column_selector.ts"],"sourcesContent":["import type {\n  AxisValueType,\n  ColumnValueType,\n  MultiAxisSelector,\n  MultiColumnSelector,\n  PColumnSpec,\n  StringMatcher,\n} from \"@milaboratories/pl-model-common\";\n\nexport type { StringMatcher } from \"@milaboratories/pl-model-common\";\n\n// --- Relaxed types ---\n\n/** Relaxed string matcher input: plain string, single matcher, or array of mixed. */\nexport type RelaxedStringMatchers = string | StringMatcher | (string | StringMatcher)[];\n\n/** Relaxed record matcher: values can be plain strings or relaxed matchers. */\nexport type RelaxedRecord = Record<string, RelaxedStringMatchers>;\n\n/** Relaxed axis selector — accepts plain strings where strict requires StringMatcher[]. */\nexport interface RelaxedAxisSelector {\n  name?: RelaxedStringMatchers;\n  type?: AxisValueType | AxisValueType[];\n  domain?: RelaxedRecord;\n  contextDomain?: RelaxedRecord;\n  annotations?: RelaxedRecord;\n}\n\n/** Relaxed column selector — convenient hand-written form. */\nexport interface RelaxedColumnSelector {\n  name?: RelaxedStringMatchers;\n  type?: ColumnValueType | ColumnValueType[];\n  domain?: RelaxedRecord;\n  contextDomain?: RelaxedRecord;\n  annotations?: RelaxedRecord;\n  axes?: RelaxedAxisSelector[];\n  partialAxesMatch?: boolean;\n}\n\n/** Input that normalizes to ColumnSelector[]. */\nexport type ColumnSelectorInput = RelaxedColumnSelector | RelaxedColumnSelector[];\n\n// --- Normalization ---\n\nfunction normalizeStringMatchers(input: RelaxedStringMatchers): StringMatcher[] {\n  if (typeof input === \"string\") return [{ type: \"regex\", value: input }];\n  if (!Array.isArray(input)) return [input];\n  return input.map((v) =>\n    typeof v === \"string\" ? ({ type: \"regex\", value: v } satisfies StringMatcher) : v,\n  );\n}\n\nfunction normalizeRecord(input: RelaxedRecord): Record<string, StringMatcher[]> {\n  const result: Record<string, StringMatcher[]> = {};\n  for (const [key, value] of Object.entries(input)) {\n    result[key] = normalizeStringMatchers(value);\n  }\n  return result;\n}\n\nfunction normalizeTypes<T>(input: T | T[]): T[] {\n  return Array.isArray(input) ? input : [input];\n}\n\ntype Mutable<T> = { -readonly [K in keyof T]: T[K] };\n\nfunction normalizeAxisSelector(input: RelaxedAxisSelector): MultiAxisSelector {\n  const result: Mutable<MultiAxisSelector> = {};\n  if (input.name !== undefined) result.name = normalizeStringMatchers(input.name);\n  if (input.type !== undefined) result.type = normalizeTypes(input.type);\n  if (input.domain !== undefined) result.domain = normalizeRecord(input.domain);\n  if (input.contextDomain !== undefined)\n    result.contextDomain = normalizeRecord(input.contextDomain);\n  if (input.annotations !== undefined) result.annotations = normalizeRecord(input.annotations);\n  return result;\n}\n\n/** Normalize relaxed input to strict ColumnSelector[]. */\nexport function normalizeSelectors(input: ColumnSelectorInput): MultiColumnSelector[] {\n  const arr = Array.isArray(input) ? input : [input];\n  return arr.map(normalizeSingleSelector);\n}\n\nfunction normalizeSingleSelector(input: RelaxedColumnSelector): MultiColumnSelector {\n  const result: Mutable<MultiColumnSelector> = {};\n  if (input.name !== undefined) result.name = normalizeStringMatchers(input.name);\n  if (input.type !== undefined) result.type = normalizeTypes(input.type);\n  if (input.domain !== undefined) result.domain = normalizeRecord(input.domain);\n  if (input.contextDomain !== undefined)\n    result.contextDomain = normalizeRecord(input.contextDomain);\n  if (input.annotations !== undefined) result.annotations = normalizeRecord(input.annotations);\n  if (input.axes !== undefined) result.axes = input.axes.map(normalizeAxisSelector);\n  if (input.partialAxesMatch !== undefined) result.partialAxesMatch = input.partialAxesMatch;\n  return result;\n}\n\n// --- Matching ---\n\nfunction matchStringValue(value: string, matchers: StringMatcher[]): boolean {\n  return matchers.some((m) => {\n    if (m.type === \"exact\") return value === m.value;\n    return new RegExp(`^(?:${m.value})$`).test(value);\n  });\n}\n\nfunction matchRecordField(\n  actual: Record<string, string> | undefined,\n  required: Record<string, StringMatcher[]>,\n): boolean {\n  const record = actual ?? {};\n  for (const [key, matchers] of Object.entries(required)) {\n    const value = record[key];\n    if (value === undefined) return false;\n    if (!matchStringValue(value, matchers)) return false;\n  }\n  return true;\n}\n\n/** Get combined domain: column's own domain merged with all axis domains. */\nfunction getCombinedDomain(spec: PColumnSpec): Record<string, string> {\n  const result: Record<string, string> = {};\n  if (spec.domain) Object.assign(result, spec.domain);\n  for (const axis of spec.axesSpec) {\n    if (axis.domain) Object.assign(result, axis.domain);\n  }\n  return result;\n}\n\n/** Get combined context domain: column's own contextDomain merged with all axis contextDomains. */\nfunction getCombinedContextDomain(spec: PColumnSpec): Record<string, string> {\n  const result: Record<string, string> = {};\n  if (spec.contextDomain) Object.assign(result, spec.contextDomain);\n  for (const axis of spec.axesSpec) {\n    if (\"contextDomain\" in axis && axis.contextDomain) Object.assign(result, axis.contextDomain);\n  }\n  return result;\n}\n\nfunction matchAxisSelector(\n  axis: PColumnSpec[\"axesSpec\"][number],\n  selector: MultiAxisSelector,\n): boolean {\n  if (selector.name !== undefined && !matchStringValue(axis.name, selector.name)) return false;\n  if (selector.type !== undefined && !selector.type.includes(axis.type)) return false;\n  if (selector.domain !== undefined && !matchRecordField(axis.domain, selector.domain))\n    return false;\n  if (\n    selector.contextDomain !== undefined &&\n    !matchRecordField(\n      \"contextDomain\" in axis ? (axis.contextDomain as Record<string, string>) : undefined,\n      selector.contextDomain,\n    )\n  )\n    return false;\n  if (\n    selector.annotations !== undefined &&\n    !matchRecordField(axis.annotations, selector.annotations)\n  )\n    return false;\n  return true;\n}\n\n/** Check if a PColumnSpec matches a single strict ColumnSelector. */\nexport function matchColumn(spec: PColumnSpec, selector: MultiColumnSelector): boolean {\n  if (selector.name !== undefined && !matchStringValue(spec.name, selector.name)) return false;\n  if (selector.type !== undefined && !selector.type.includes(spec.valueType)) return false;\n\n  if (selector.domain !== undefined) {\n    const combined = getCombinedDomain(spec);\n    if (!matchRecordField(combined, selector.domain)) return false;\n  }\n\n  if (selector.contextDomain !== undefined) {\n    const combined = getCombinedContextDomain(spec);\n    if (!matchRecordField(combined, selector.contextDomain)) return false;\n  }\n\n  if (selector.annotations !== undefined) {\n    if (!matchRecordField(spec.annotations, selector.annotations)) return false;\n  }\n\n  if (selector.axes !== undefined) {\n    const partialMatch = selector.partialAxesMatch ?? true;\n    if (partialMatch) {\n      for (const axisSel of selector.axes) {\n        if (!spec.axesSpec.some((axis) => matchAxisSelector(axis, axisSel))) return false;\n      }\n    } else {\n      if (spec.axesSpec.length !== selector.axes.length) return false;\n      for (let i = 0; i < selector.axes.length; i++) {\n        if (!matchAxisSelector(spec.axesSpec[i], selector.axes[i])) return false;\n      }\n    }\n  }\n\n  return true;\n}\n\n/** Check if a PColumnSpec matches any of the selectors (OR across array). */\nexport function matchColumnSelectors(selectors: MultiColumnSelector[], spec: PColumnSpec): boolean {\n  return selectors.some((sel) => matchColumn(spec, sel));\n}\n\n/**\n * Convert selector input to a predicate function.\n * Normalizes relaxed form, then returns a function that OR-matches.\n */\nexport function columnSelectorsToPredicate(\n  input: ColumnSelectorInput,\n): (spec: PColumnSpec) => boolean {\n  const selectors = normalizeSelectors(input);\n  return (spec) => matchColumnSelectors(selectors, spec);\n}\n"],"mappings":"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"}
+{"version":3,"file":"column_selector.cjs","names":[],"sources":["../../src/columns/column_selector.ts"],"sourcesContent":["import type {\n  AxisValueType,\n  ColumnValueType,\n  MultiAxisSelector,\n  MultiColumnSelector,\n  StringMatcher,\n} from \"@milaboratories/pl-model-common\";\n\nexport type { StringMatcher } from \"@milaboratories/pl-model-common\";\n\n// --- Relaxed types ---\n\n/** Relaxed string matcher input: plain string, single matcher, or array of mixed. */\nexport type RelaxedStringMatchers = string | StringMatcher | (string | StringMatcher)[];\n\n/** Relaxed record matcher: values can be plain strings or relaxed matchers. */\nexport type RelaxedRecord = Record<string, RelaxedStringMatchers>;\n\n/** Relaxed axis selector — accepts plain strings where strict requires StringMatcher[]. */\nexport interface RelaxedAxisSelector {\n  name?: RelaxedStringMatchers;\n  type?: AxisValueType | AxisValueType[];\n  domain?: RelaxedRecord;\n  contextDomain?: RelaxedRecord;\n  annotations?: RelaxedRecord;\n}\n\n/** Relaxed column selector — convenient hand-written form. */\nexport interface RelaxedColumnSelector {\n  name?: RelaxedStringMatchers;\n  type?: ColumnValueType | ColumnValueType[];\n  domain?: RelaxedRecord;\n  contextDomain?: RelaxedRecord;\n  annotations?: RelaxedRecord;\n  axes?: RelaxedAxisSelector[];\n  partialAxesMatch?: boolean;\n}\n\n/** Input that normalizes to ColumnSelector[]. */\nexport type ColumnSelector = RelaxedColumnSelector | RelaxedColumnSelector[];\n\n// --- Normalization ---\n\nfunction normalizeStringMatchers(input: RelaxedStringMatchers): StringMatcher[] {\n  if (typeof input === \"string\") return [{ type: \"regex\", value: input }];\n  if (!Array.isArray(input)) return [input];\n  return input.map((v) =>\n    typeof v === \"string\" ? ({ type: \"regex\", value: v } satisfies StringMatcher) : v,\n  );\n}\n\nfunction normalizeRecord(input: RelaxedRecord): Record<string, StringMatcher[]> {\n  const result: Record<string, StringMatcher[]> = {};\n  for (const [key, value] of Object.entries(input)) {\n    result[key] = normalizeStringMatchers(value);\n  }\n  return result;\n}\n\nfunction normalizeTypes<T>(input: T | T[]): T[] {\n  return Array.isArray(input) ? input : [input];\n}\n\ntype Mutable<T> = { -readonly [K in keyof T]: T[K] };\n\nexport function convertRelaxedAxisSelectorToMultiAxisSelector(\n  input: RelaxedAxisSelector,\n): MultiAxisSelector {\n  const result: Mutable<MultiAxisSelector> = {};\n  if (input.name !== undefined) result.name = normalizeStringMatchers(input.name);\n  if (input.type !== undefined) result.type = normalizeTypes(input.type);\n  if (input.domain !== undefined) result.domain = normalizeRecord(input.domain);\n  if (input.contextDomain !== undefined)\n    result.contextDomain = normalizeRecord(input.contextDomain);\n  if (input.annotations !== undefined) result.annotations = normalizeRecord(input.annotations);\n  return result;\n}\n\nexport function convertRelaxedColumnSelectorToMultiColumnSelector(\n  input: RelaxedColumnSelector,\n): MultiColumnSelector {\n  const result: Mutable<MultiColumnSelector> = {};\n  if (input.name !== undefined) result.name = normalizeStringMatchers(input.name);\n  if (input.type !== undefined) result.type = normalizeTypes(input.type);\n  if (input.domain !== undefined) result.domain = normalizeRecord(input.domain);\n  if (input.contextDomain !== undefined)\n    result.contextDomain = normalizeRecord(input.contextDomain);\n  if (input.annotations !== undefined) result.annotations = normalizeRecord(input.annotations);\n  if (input.axes !== undefined)\n    result.axes = input.axes.map(convertRelaxedAxisSelectorToMultiAxisSelector);\n  if (input.partialAxesMatch !== undefined) result.partialAxesMatch = input.partialAxesMatch;\n  return result;\n}\n\nexport function convertColumnSelectorToMultiColumnSelector(\n  input: ColumnSelector,\n): MultiColumnSelector[] {\n  const arr = Array.isArray(input) ? input : [input];\n  return arr.map(convertRelaxedColumnSelectorToMultiColumnSelector);\n}\n"],"mappings":";AA2CA,SAAS,wBAAwB,OAA+C;AAC9E,KAAI,OAAO,UAAU,SAAU,QAAO,CAAC;EAAE,MAAM;EAAS,OAAO;EAAO,CAAC;AACvE,KAAI,CAAC,MAAM,QAAQ,MAAM,CAAE,QAAO,CAAC,MAAM;AACzC,QAAO,MAAM,KAAK,MAChB,OAAO,MAAM,WAAY;EAAE,MAAM;EAAS,OAAO;EAAG,GAA4B,EACjF;;AAGH,SAAS,gBAAgB,OAAuD;CAC9E,MAAM,SAA0C,EAAE;AAClD,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,CAC9C,QAAO,OAAO,wBAAwB,MAAM;AAE9C,QAAO;;AAGT,SAAS,eAAkB,OAAqB;AAC9C,QAAO,MAAM,QAAQ,MAAM,GAAG,QAAQ,CAAC,MAAM;;AAK/C,SAAgB,8CACd,OACmB;CACnB,MAAM,SAAqC,EAAE;AAC7C,KAAI,MAAM,SAAS,KAAA,EAAW,QAAO,OAAO,wBAAwB,MAAM,KAAK;AAC/E,KAAI,MAAM,SAAS,KAAA,EAAW,QAAO,OAAO,eAAe,MAAM,KAAK;AACtE,KAAI,MAAM,WAAW,KAAA,EAAW,QAAO,SAAS,gBAAgB,MAAM,OAAO;AAC7E,KAAI,MAAM,kBAAkB,KAAA,EAC1B,QAAO,gBAAgB,gBAAgB,MAAM,cAAc;AAC7D,KAAI,MAAM,gBAAgB,KAAA,EAAW,QAAO,cAAc,gBAAgB,MAAM,YAAY;AAC5F,QAAO;;AAGT,SAAgB,kDACd,OACqB;CACrB,MAAM,SAAuC,EAAE;AAC/C,KAAI,MAAM,SAAS,KAAA,EAAW,QAAO,OAAO,wBAAwB,MAAM,KAAK;AAC/E,KAAI,MAAM,SAAS,KAAA,EAAW,QAAO,OAAO,eAAe,MAAM,KAAK;AACtE,KAAI,MAAM,WAAW,KAAA,EAAW,QAAO,SAAS,gBAAgB,MAAM,OAAO;AAC7E,KAAI,MAAM,kBAAkB,KAAA,EAC1B,QAAO,gBAAgB,gBAAgB,MAAM,cAAc;AAC7D,KAAI,MAAM,gBAAgB,KAAA,EAAW,QAAO,cAAc,gBAAgB,MAAM,YAAY;AAC5F,KAAI,MAAM,SAAS,KAAA,EACjB,QAAO,OAAO,MAAM,KAAK,IAAI,8CAA8C;AAC7E,KAAI,MAAM,qBAAqB,KAAA,EAAW,QAAO,mBAAmB,MAAM;AAC1E,QAAO;;AAGT,SAAgB,2CACd,OACuB;AAEvB,SADY,MAAM,QAAQ,MAAM,GAAG,QAAQ,CAAC,MAAM,EACvC,IAAI,kDAAkD"}

package/dist/columns/column_selector.d.ts

@@ -1,4 +1,4 @@
-import { AxisValueType, ColumnValueType, MultiColumnSelector, PColumnSpec, StringMatcher, StringMatcher as StringMatcher$1 } from "@milaboratories/pl-model-common";
+import { AxisValueType, ColumnValueType, MultiAxisSelector, MultiColumnSelector, StringMatcher, StringMatcher as StringMatcher$1 } from "@milaboratories/pl-model-common";
 
 //#region src/columns/column_selector.d.ts
 /** Relaxed string matcher input: plain string, single matcher, or array of mixed. */
@@ -24,18 +24,10 @@ interface RelaxedColumnSelector {
   partialAxesMatch?: boolean;
 }
 /** Input that normalizes to ColumnSelector[]. */
-type ColumnSelectorInput = RelaxedColumnSelector | RelaxedColumnSelector[];
-/** Normalize relaxed input to strict ColumnSelector[]. */
-declare function normalizeSelectors(input: ColumnSelectorInput): MultiColumnSelector[];
-/** Check if a PColumnSpec matches a single strict ColumnSelector. */
-declare function matchColumn(spec: PColumnSpec, selector: MultiColumnSelector): boolean;
-/** Check if a PColumnSpec matches any of the selectors (OR across array). */
-declare function matchColumnSelectors(selectors: MultiColumnSelector[], spec: PColumnSpec): boolean;
-/**
- * Convert selector input to a predicate function.
- * Normalizes relaxed form, then returns a function that OR-matches.
- */
-declare function columnSelectorsToPredicate(input: ColumnSelectorInput): (spec: PColumnSpec) => boolean;
+type ColumnSelector = RelaxedColumnSelector | RelaxedColumnSelector[];
+declare function convertRelaxedAxisSelectorToMultiAxisSelector(input: RelaxedAxisSelector): MultiAxisSelector;
+declare function convertRelaxedColumnSelectorToMultiColumnSelector(input: RelaxedColumnSelector): MultiColumnSelector;
+declare function convertColumnSelectorToMultiColumnSelector(input: ColumnSelector): MultiColumnSelector[];
 //#endregion
-export { ColumnSelectorInput, RelaxedAxisSelector, RelaxedColumnSelector, RelaxedRecord, RelaxedStringMatchers, type StringMatcher$1 as StringMatcher, columnSelectorsToPredicate, matchColumn, matchColumnSelectors, normalizeSelectors };
+export { ColumnSelector, RelaxedAxisSelector, RelaxedColumnSelector, RelaxedRecord, RelaxedStringMatchers, type StringMatcher$1 as StringMatcher, convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector };
 //# sourceMappingURL=column_selector.d.ts.map

package/dist/columns/column_selector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"column_selector.d.ts","names":[],"sources":["../../src/columns/column_selector.ts"],"mappings":";;;;KAaY,qBAAA,YAAiC,aAAA,aAA0B,aAAA;;KAG3D,aAAA,GAAgB,MAAA,SAAe,qBAAA;;UAG1B,mBAAA;EACf,IAAA,GAAO,qBAAA;EACP,IAAA,GAAO,aAAA,GAAgB,aAAA;EACvB,MAAA,GAAS,aAAA;EACT,aAAA,GAAgB,aAAA;EAChB,WAAA,GAAc,aAAA;AAAA;;UAIC,qBAAA;EACf,IAAA,GAAO,qBAAA;EACP,IAAA,GAAO,eAAA,GAAkB,eAAA;EACzB,MAAA,GAAS,aAAA;EACT,aAAA,GAAgB,aAAA;EAChB,WAAA,GAAc,aAAA;EACd,IAAA,GAAO,mBAAA;EACP,gBAAA;AAAA;;KAIU,cAAA,GAAiB,qBAAA,GAAwB,qBAAA;AAAA,iBA0BrC,6CAAA,CACd,KAAA,EAAO,mBAAA,GACN,iBAAA;AAAA,iBAWa,iDAAA,CACd,KAAA,EAAO,qBAAA,GACN,mBAAA;AAAA,iBAca,0CAAA,CACd,KAAA,EAAO,cAAA,GACN,mBAAA"}