@platforma-sdk/model 1.68.5 → 1.68.7

package/dist/columns/column_collection_builder.cjs

@@ -117,8 +117,7 @@ var AnchoredColumnCollectionImpl = class {
 			});
 			const variants = hit.mappingVariants.map((v) => ({
 				path,
-				qualifications: remapFromIdxToId(v.qualifications, anchors),
-				distinctiveQualifications: remapFromIdxToId(v.distinctiveQualifications, anchors)
+				qualifications: remapFromIdxToId(v.qualifications, anchors)
 			}));
 			const existing = acc.get(origId);
 			return acc.set(origId, existing === void 0 ? {
@@ -131,6 +130,13 @@ var AnchoredColumnCollectionImpl = class {
 		}, /* @__PURE__ */ new Map());
 		return Array.from(byColumn.values());
 	}
+	findColumnVariants(options) {
+		return this.findColumns(options).flatMap((match) => match.variants.map((variant) => ({
+			column: match.column,
+			path: variant.path,
+			qualifications: variant.qualifications
+		})));
+	}
 };
 /**
 * Collect all columns from all providers, dedup by NativePObjectId.

package/dist/columns/column_collection_builder.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"column_collection_builder.cjs","names":["getService","TreeNodeAccessor","ArrayColumnProvider","toColumnSnapshotProvider","convertColumnSelectorToMultiColumnSelector"],"sources":["../../src/columns/column_collection_builder.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  DiscoverColumnsConstraints,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n  MultiColumnSelector,\n  NativePObjectId,\n  PColumnSpec,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { deriveNativeId, isPColumnSpec } 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 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 { getService } from \"../services\";\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  /** 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, ColumnSnapshot<PObjectId>>;\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<PObjectId>;\n  /** Match variants — different ways (paths/qualifications) to reach this column. */\n  readonly variants: MatchVariant[];\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  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: {\n    linker: ColumnSnapshot<PObjectId>;\n    qualifications: AxisQualification[];\n  }[];\n}\n\n/** Qualifications needed for both already-integrated anchor columns and the hit column. */\nexport interface MatchQualifications {\n  /** Qualifications for already-integrated anchor columns */\n  readonly forQueries: Record<PObjectId, AxisQualification[]>;\n  /** Qualifications for the hit column. */\n  readonly forHit: AxisQualification[];\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 = getService(\"pframeSpec\")) {}\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  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\n    return results;\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, ColumnSnapshot<PObjectId>>;\n  private readonly columnsMap: Map<PObjectId, ColumnSnapshot<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  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getAnchors(): Map<string, ColumnSnapshot<PObjectId>> {\n    return this.anchorsMap;\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    const anchors = Array.from(this.anchorsMap.values());\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      constraints,\n      maxHops: options?.maxHops ?? 4,\n      axes: anchors.map((anchor) => ({\n        axesSpec: anchor.spec.axesSpec,\n        qualifications: [],\n      })),\n    });\n\n    const byColumn = response.hits.reduce<Map<PObjectId, ColumnMatch>>((acc, hit) => {\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\n      const path = hit.path.map((step) => {\n        if (step.type !== \"linker\") {\n          throw new Error(`Unexpected discover-columns step type: ${step.type}`);\n        }\n\n        return {\n          linker:\n            this.columnsMap.get(step.linker.columnId) ??\n            throwError(`Linker column with id ${step.linker.columnId} not found in collection`),\n          qualifications: step.qualifications,\n        };\n      });\n      const variants: MatchVariant[] = hit.mappingVariants.map((v) => ({\n        path,\n        qualifications: remapFromIdxToId(v.qualifications, anchors),\n        distinctiveQualifications: remapFromIdxToId(v.distinctiveQualifications, anchors),\n      }));\n      const existing = acc.get(origId);\n      return acc.set(\n        origId,\n        existing === undefined\n          ? { column: col, variants }\n          : { ...existing, variants: [...existing.variants, ...variants] },\n      );\n    }, new Map());\n\n    return Array.from(byColumn.values());\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/** Normalize ColumnSelector (relaxed, single or array) to MultiColumnSelector[]. */\nfunction toMultiColumnSelectors(input: ColumnSelector): MultiColumnSelector[] {\n  return convertColumnSelectorToMultiColumnSelector(input);\n}\n\n// --- Anchor resolution ---\n\n/**\n * Resolve each anchor entry to a ColumnSnapshot from the collected columns.\n * - PObjectId (string): looked up by id in the collected columns\n * - PColumnSpec: matched by deriveNativeId against collected columns\n * - RelaxedColumnSelector: resolved via discoverColumns in \"exact\" mode;\n *   must match exactly one column\n * Throws on unresolved, ambiguous, or duplicated matches. Requires at least one\n * anchor to resolve.\n */\nfunction resolveAnchorMap(\n  anchors: Record<string, AnchorEntry>,\n  columns: ColumnSnapshot<PObjectId>[],\n  discoverColumns: (request: DiscoverColumnsRequest) => DiscoverColumnsResponse,\n): Map<string, ColumnSnapshot<PObjectId>> {\n  const result = new Map<string, ColumnSnapshot<PObjectId>>();\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 [name, anchor] of Object.entries(anchors)) {\n    if (typeof anchor === \"string\") {\n      const found =\n        columns.find((col) => col.id === anchor) ??\n        throwError(`Anchor \"${name}\": column with id \"${anchor}\" not found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\n      resovedIds.add(found.id);\n    } else if (\"kind\" in anchor) {\n      if (!isPColumnSpec(anchor)) throwError(`Anchor \"${name}\": invalid PColumnSpec`);\n      const nativeId = deriveNativeId(anchor);\n      const found =\n        columns.find((col) => deriveNativeId(col.spec) === nativeId) ??\n        throwError(`Anchor \"${name}\": no column matching spec found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\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\n      if (matched.hits.length === 0) {\n        throwError(`Anchor \"${name}\": no columns matched selector`);\n      }\n      if (matched.hits.length > 1) {\n        throwError(\n          `Anchor \"${name}\": 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(name));\n      }\n\n      const id = matched.hits[0].hit.columnId as PObjectId;\n      const snap =\n        columns.find((col) => col.id === id) ??\n        throwError(`Anchor \"${name}\": matched column with id \"${id}\" not found in sources`);\n      result.set(name, snap);\n      resovedIds.add(snap.id);\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\nfunction remapFromIdxToId(\n  qualifications: {\n    forQueries: AxisQualification[][];\n    forHit: AxisQualification[];\n  },\n  anchors: ColumnSnapshot<PObjectId>[],\n): MatchQualifications {\n  const forQueries = qualifications.forQueries.reduce<Record<PObjectId, AxisQualification[]>>(\n    (acc, qs, i) => (anchors[i] ? ((acc[anchors[i].id] = qs), acc) : acc),\n    {},\n  );\n  return { forQueries, forHit: qualifications.forHit };\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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"}
+{"version":3,"file":"column_collection_builder.cjs","names":["getService","TreeNodeAccessor","ArrayColumnProvider","toColumnSnapshotProvider","convertColumnSelectorToMultiColumnSelector"],"sources":["../../src/columns/column_collection_builder.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  DiscoverColumnsConstraints,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n  MultiColumnSelector,\n  NativePObjectId,\n  PColumnSpec,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { deriveNativeId, isPColumnSpec } 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 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 { getService } from \"../services\";\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  /** 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, ColumnSnapshot<PObjectId>>;\n\n  /** Axis-aware column discovery. */\n  findColumns(options?: AnchoredFindColumnsOptions): ColumnMatch[];\n\n  /** Variant discovery with detailed mapping info for each hit. */\n  findColumnVariants(options?: AnchoredFindColumnsOptions): ColumnVariant[];\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<PObjectId>;\n  /** Match variants — different ways (paths/qualifications) to reach this column. */\n  readonly variants: MatchVariant[];\n}\n\nexport interface ColumnVariant<Id extends PObjectId = PObjectId> {\n  /** Column snapshot with anchored SUniversalPColumnId. */\n  readonly column: ColumnSnapshot<Id>;\n  /** Full qualifications needed for integration. */\n  readonly qualifications: MatchQualifications;\n  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: {\n    linker: ColumnSnapshot<PObjectId>;\n    qualifications: AxisQualification[];\n  }[];\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  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: {\n    linker: ColumnSnapshot<PObjectId>;\n    qualifications: AxisQualification[];\n  }[];\n}\n\n/** Qualifications needed for both already-integrated anchor columns and the hit column. */\nexport interface MatchQualifications {\n  /** Qualifications for already-integrated anchor columns */\n  readonly forQueries: Record<PObjectId, AxisQualification[]>;\n  /** Qualifications for the hit column. */\n  readonly forHit: AxisQualification[];\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 = getService(\"pframeSpec\")) {}\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  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\n    return results;\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, ColumnSnapshot<PObjectId>>;\n  private readonly columnsMap: Map<PObjectId, ColumnSnapshot<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  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getAnchors(): Map<string, ColumnSnapshot<PObjectId>> {\n    return this.anchorsMap;\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    const anchors = Array.from(this.anchorsMap.values());\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      constraints,\n      maxHops: options?.maxHops ?? 4,\n      axes: anchors.map((anchor) => ({\n        axesSpec: anchor.spec.axesSpec,\n        qualifications: [],\n      })),\n    });\n\n    const byColumn = response.hits.reduce<Map<PObjectId, ColumnMatch>>((acc, hit) => {\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\n      const path = hit.path.map((step) => {\n        if (step.type !== \"linker\") {\n          throw new Error(`Unexpected discover-columns step type: ${step.type}`);\n        }\n\n        return {\n          linker:\n            this.columnsMap.get(step.linker.columnId) ??\n            throwError(`Linker column with id ${step.linker.columnId} not found in collection`),\n          qualifications: step.qualifications,\n        };\n      });\n      const variants: MatchVariant[] = hit.mappingVariants.map((v) => ({\n        path,\n        qualifications: remapFromIdxToId(v.qualifications, anchors),\n      }));\n      const existing = acc.get(origId);\n      return acc.set(\n        origId,\n        existing === undefined\n          ? { column: col, variants }\n          : { ...existing, variants: [...existing.variants, ...variants] },\n      );\n    }, new Map());\n\n    return Array.from(byColumn.values());\n  }\n\n  findColumnVariants(options?: AnchoredFindColumnsOptions): ColumnVariant[] {\n    const matches = this.findColumns(options);\n    return matches.flatMap((match) =>\n      match.variants.map((variant) => ({\n        column: match.column,\n        path: variant.path,\n        qualifications: variant.qualifications,\n      })),\n    );\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/** Normalize ColumnSelector (relaxed, single or array) to MultiColumnSelector[]. */\nfunction toMultiColumnSelectors(input: ColumnSelector): MultiColumnSelector[] {\n  return convertColumnSelectorToMultiColumnSelector(input);\n}\n\n// --- Anchor resolution ---\n\n/**\n * Resolve each anchor entry to a ColumnSnapshot from the collected columns.\n * - PObjectId (string): looked up by id in the collected columns\n * - PColumnSpec: matched by deriveNativeId against collected columns\n * - RelaxedColumnSelector: resolved via discoverColumns in \"exact\" mode;\n *   must match exactly one column\n * Throws on unresolved, ambiguous, or duplicated matches. Requires at least one\n * anchor to resolve.\n */\nfunction resolveAnchorMap(\n  anchors: Record<string, AnchorEntry>,\n  columns: ColumnSnapshot<PObjectId>[],\n  discoverColumns: (request: DiscoverColumnsRequest) => DiscoverColumnsResponse,\n): Map<string, ColumnSnapshot<PObjectId>> {\n  const result = new Map<string, ColumnSnapshot<PObjectId>>();\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 [name, anchor] of Object.entries(anchors)) {\n    if (typeof anchor === \"string\") {\n      const found =\n        columns.find((col) => col.id === anchor) ??\n        throwError(`Anchor \"${name}\": column with id \"${anchor}\" not found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\n      resovedIds.add(found.id);\n    } else if (\"kind\" in anchor) {\n      if (!isPColumnSpec(anchor)) throwError(`Anchor \"${name}\": invalid PColumnSpec`);\n      const nativeId = deriveNativeId(anchor);\n      const found =\n        columns.find((col) => deriveNativeId(col.spec) === nativeId) ??\n        throwError(`Anchor \"${name}\": no column matching spec found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\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\n      if (matched.hits.length === 0) {\n        throwError(`Anchor \"${name}\": no columns matched selector`);\n      }\n      if (matched.hits.length > 1) {\n        throwError(\n          `Anchor \"${name}\": 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(name));\n      }\n\n      const id = matched.hits[0].hit.columnId as PObjectId;\n      const snap =\n        columns.find((col) => col.id === id) ??\n        throwError(`Anchor \"${name}\": matched column with id \"${id}\" not found in sources`);\n      result.set(name, snap);\n      resovedIds.add(snap.id);\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\nfunction remapFromIdxToId(\n  qualifications: {\n    forQueries: AxisQualification[][];\n    forHit: AxisQualification[];\n  },\n  anchors: ColumnSnapshot<PObjectId>[],\n): MatchQualifications {\n  const forQueries = qualifications.forQueries.reduce<Record<PObjectId, AxisQualification[]>>(\n    (acc, qs, i) => (anchors[i] ? ((acc[anchors[i].id] = qs), acc) : acc),\n    {},\n  );\n  return { forQueries, forHit: qualifications.forHit };\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":";;;;;;;;;;;;;;;;AAqIA,IAAa,0BAAb,MAAqC;CACnC,YAAuD,EAAE;CAEzD,YAAY,aAAgDA,qBAAAA,WAAW,aAAa,EAAE;AAAzD,OAAA,aAAA;;;;;;;CAO7B,UAAU,QAA+C;AACvD,MAAI,kBAAkBC,iBAAAA,kBAAkB;GACtC,MAAM,UAAU,OAAO,aAAa;AACpC,OAAI,QAAS,MAAK,UAAU,KAAK,IAAIC,iCAAAA,oBAAoB,QAAQ,CAAC;QAElE,MAAK,UAAU,KAAKC,iCAAAA,yBAAyB,OAAO,CAAC;AAEvD,SAAO;;CAGT,WAAW,SAAoD;AAC7D,OAAK,MAAM,UAAU,QACnB,MAAK,UAAU,OAAO;AAExB,SAAO;;CAaT,MACE,SAMwE;EACxE,MAAM,eAAe,SAAS,2BAA2B;AAIzD,MAAI,CADgB,KAAK,UAAU,OAAO,MAAM,EAAE,sBAAsB,CAAC,IACrD,CAAC,aAAc,QAAO,KAAA;EAG1C,MAAM,UAAU,eAAe,KAAK,UAAU;AAG9C,MAFmB,YAAY,KAAA,KAAa,aAAa,QAGvD,QAAO,IAAI,6BAA6B,KAAK,YAAY;GACvD,SAAS,QAAQ;GACjB;GACD,CAAC;MAEF,QAAO,IAAI,qBAAqB,KAAK,YAAY,EAC/C,SACD,CAAC;;;AAWR,IAAM,uBAAN,MAAmE;CACjE;CACA;CAEA,YACE,YACA,SACA;AAFiB,OAAA,aAAA;AAGjB,OAAK,UAAU,IAAI,IAAI,QAAQ,QAAQ,KAAK,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AACnE,OAAK,iBAAiB,KAAK,WAAW,gBACpC,OAAO,YAAY,QAAQ,QAAQ,KAAK,QAAQ,CAAC,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CACrE;;CAGH,UAAgB;AACd,OAAK,eAAe,OAAO;;CAG7B,CAAC,OAAO,WAAiB;AACvB,OAAK,SAAS;;CAGhB,YAAY,SAA2D;EACrE,MAAM,iBAAiB,SAAS,UAAU,uBAAuB,QAAQ,QAAQ,GAAG,KAAA;EACpF,MAAM,iBAAiB,SAAS,UAAU,uBAAuB,QAAQ,QAAQ,GAAG,KAAA;AAepF,SAbiB,KAAK,WAAW,gBAAgB,KAAK,eAAe,KAAK;GACxE;GACA;GACA,MAAM,EAAE;GACR,SAAS;GACT,aAAa,0BAA0B,aAAa;GACrD,CAAC,CAGuB,KACtB,KAAK,QAAQ,KAAK,QAAQ,IAAI,IAAI,IAAI,SAAsB,CAAC,CAC7D,QAAQ,QAA0C,QAAQ,KAAA,EAAU;;;AAY3E,IAAM,+BAAN,MAAmF;CACjF;CACA;CACA;CAEA,YACE,YACA,SACA;AAFiB,OAAA,aAAA;AAIjB,OAAK,iBAAiB,KAAK,WAAW,gBACpC,OAAO,YAAY,QAAQ,QAAQ,KAAK,QAAQ,CAAC,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CACrE;AACD,OAAK,aAAa,IAAI,IAAI,QAAQ,QAAQ,KAAK,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AACtE,OAAK,aAAa,iBAChB,QAAQ,SACR,QAAQ,SACR,KAAK,WAAW,gBAAgB,KAAK,KAAK,YAAY,KAAK,eAAe,IAAI,CAC/E;;CAGH,UAAgB;AACd,OAAK,eAAe,OAAO;;CAG7B,CAAC,OAAO,WAAiB;AACvB,OAAK,SAAS;;CAGhB,aAAqD;AACnD,SAAO,KAAK;;CAGd,YAAY,SAAqD;EAE/D,MAAM,cAAc,0BADP,SAAS,QAAQ,aACqB;EACnD,MAAM,iBAAiB,SAAS,UAAU,uBAAuB,QAAQ,QAAQ,GAAG,KAAA;EACpF,MAAM,iBAAiB,SAAS,UAAU,uBAAuB,QAAQ,QAAQ,GAAG,KAAA;EACpF,MAAM,UAAU,MAAM,KAAK,KAAK,WAAW,QAAQ,CAAC;EAYpD,MAAM,WAXW,KAAK,WAAW,gBAAgB,KAAK,eAAe,KAAK;GACxE;GACA;GACA;GACA,SAAS,SAAS,WAAW;GAC7B,MAAM,QAAQ,KAAK,YAAY;IAC7B,UAAU,OAAO,KAAK;IACtB,gBAAgB,EAAE;IACnB,EAAE;GACJ,CAAC,CAEwB,KAAK,QAAqC,KAAK,QAAQ;GAC/E,MAAM,SAAS,IAAI,IAAI;GACvB,MAAM,MACJ,KAAK,WAAW,IAAI,OAAO,KAAA,GAAA,wBAAA,YAChB,kBAAkB,OAAO,0BAA0B;GAEhE,MAAM,OAAO,IAAI,KAAK,KAAK,SAAS;AAClC,QAAI,KAAK,SAAS,SAChB,OAAM,IAAI,MAAM,0CAA0C,KAAK,OAAO;AAGxE,WAAO;KACL,QACE,KAAK,WAAW,IAAI,KAAK,OAAO,SAAS,KAAA,GAAA,wBAAA,YAC9B,yBAAyB,KAAK,OAAO,SAAS,0BAA0B;KACrF,gBAAgB,KAAK;KACtB;KACD;GACF,MAAM,WAA2B,IAAI,gBAAgB,KAAK,OAAO;IAC/D;IACA,gBAAgB,iBAAiB,EAAE,gBAAgB,QAAQ;IAC5D,EAAE;GACH,MAAM,WAAW,IAAI,IAAI,OAAO;AAChC,UAAO,IAAI,IACT,QACA,aAAa,KAAA,IACT;IAAE,QAAQ;IAAK;IAAU,GACzB;IAAE,GAAG;IAAU,UAAU,CAAC,GAAG,SAAS,UAAU,GAAG,SAAS;IAAE,CACnE;qBACA,IAAI,KAAK,CAAC;AAEb,SAAO,MAAM,KAAK,SAAS,QAAQ,CAAC;;CAGtC,mBAAmB,SAAuD;AAExE,SADgB,KAAK,YAAY,QAAQ,CAC1B,SAAS,UACtB,MAAM,SAAS,KAAK,aAAa;GAC/B,QAAQ,MAAM;GACd,MAAM,QAAQ;GACd,gBAAgB,QAAQ;GACzB,EAAE,CACJ;;;;;;;AAQL,SAAS,eAAe,WAAkE;CACxF,MAAM,uBAAO,IAAI,KAAsB;CACvC,MAAM,SAAsC,EAAE;AAE9C,MAAK,MAAM,YAAY,WAAW;EAChC,MAAM,UAAU,SAAS,eAAe;AACxC,OAAK,MAAM,OAAO,SAAS;GACzB,MAAM,YAAA,GAAA,gCAAA,gBAA0B,IAAI,KAAK;AACzC,OAAI,KAAK,IAAI,SAAS,CAAE;AACxB,QAAK,IAAI,SAAS;AAClB,UAAO,KAAK,IAAI;;;AAIpB,QAAO;;;AAMT,SAAS,uBAAuB,OAA8C;AAC5E,QAAOC,wBAAAA,2CAA2C,MAAM;;;;;;;;;;;AAc1D,SAAS,iBACP,SACA,SACA,iBACwC;CACxC,MAAM,yBAAS,IAAI,KAAwC;CAC3D,MAAM,6BAAa,IAAI,KAAgB;CACvC,MAAM,qBAAqB,QACzB,WAAW,IAAI;AAEjB,MAAK,MAAM,CAAC,MAAM,WAAW,OAAO,QAAQ,QAAQ,CAClD,KAAI,OAAO,WAAW,UAAU;EAC9B,MAAM,QACJ,QAAQ,MAAM,QAAQ,IAAI,OAAO,OAAO,KAAA,GAAA,wBAAA,YAC7B,WAAW,KAAK,qBAAqB,OAAO,wBAAwB;AACjF,MAAI,WAAW,IAAI,MAAM,GAAG,CAC1B,EAAA,GAAA,wBAAA,YAAW,kBAAkB,KAAK,CAAC;AAErC,SAAO,IAAI,MAAM,MAAM;AACvB,aAAW,IAAI,MAAM,GAAG;YACf,UAAU,QAAQ;AAC3B,MAAI,EAAA,GAAA,gCAAA,eAAe,OAAO,CAAE,EAAA,GAAA,wBAAA,YAAW,WAAW,KAAK,wBAAwB;EAC/E,MAAM,YAAA,GAAA,gCAAA,gBAA0B,OAAO;EACvC,MAAM,QACJ,QAAQ,MAAM,SAAA,GAAA,gCAAA,gBAAuB,IAAI,KAAK,KAAK,SAAS,KAAA,GAAA,wBAAA,YACjD,WAAW,KAAK,6CAA6C;AAC1E,MAAI,WAAW,IAAI,MAAM,GAAG,CAC1B,EAAA,GAAA,wBAAA,YAAW,kBAAkB,KAAK,CAAC;AAErC,SAAO,IAAI,MAAM,MAAM;AACvB,aAAW,IAAI,MAAM,GAAG;QACnB;EACL,MAAM,UAAU,gBAAgB;GAC9B,gBAAgB,uBAAuB,OAAO;GAC9C,gBAAgB,KAAA;GAChB,MAAM,EAAE;GACR,SAAS;GACT,aAAa,0BAA0B,QAAQ;GAChD,CAAC;AAEF,MAAI,QAAQ,KAAK,WAAW,EAC1B,EAAA,GAAA,wBAAA,YAAW,WAAW,KAAK,gCAAgC;AAE7D,MAAI,QAAQ,KAAK,SAAS,EACxB,EAAA,GAAA,wBAAA,YACE,WAAW,KAAK,+GACjB;AAEH,MAAI,WAAW,IAAI,QAAQ,KAAK,GAAG,IAAI,SAAsB,CAC3D,EAAA,GAAA,wBAAA,YAAW,kBAAkB,KAAK,CAAC;EAGrC,MAAM,KAAK,QAAQ,KAAK,GAAG,IAAI;EAC/B,MAAM,OACJ,QAAQ,MAAM,QAAQ,IAAI,OAAO,GAAG,KAAA,GAAA,wBAAA,YACzB,WAAW,KAAK,6BAA6B,GAAG,wBAAwB;AACrF,SAAO,IAAI,MAAM,KAAK;AACtB,aAAW,IAAI,KAAK,GAAG;;AAI3B,KAAI,WAAW,SAAS,EACtB,EAAA,GAAA,wBAAA,YAAW,yDAAyD;AAGtE,QAAO;;AAGT,SAAS,iBACP,gBAIA,SACqB;AAKrB,QAAO;EAAE,YAJU,eAAe,WAAW,QAC1C,KAAK,IAAI,MAAO,QAAQ,MAAO,IAAI,QAAQ,GAAG,MAAM,IAAK,OAAO,KACjE,EAAE,CACH;EACoB,QAAQ,eAAe;EAAQ;;AAKtD,SAAS,0BAA0B,MAAgD;AACjF,SAAQ,MAAR;EACE,KAAK,aACH,QAAO;GACL,yBAAyB;GACzB,sBAAsB;GACtB,2BAA2B;GAC3B,wBAAwB;GACzB;EACH,KAAK,UACH,QAAO;GACL,yBAAyB;GACzB,sBAAsB;GACtB,2BAA2B;GAC3B,wBAAwB;GACzB;EACH,KAAK,QACH,QAAO;GACL,yBAAyB;GACzB,sBAAsB;GACtB,2BAA2B;GAC3B,wBAAwB;GACzB"}

package/dist/columns/column_collection_builder.d.ts

@@ -29,6 +29,8 @@ interface AnchoredColumnCollection extends Disposable {
   getAnchors(): Map<string, ColumnSnapshot<PObjectId>>;
   /** Axis-aware column discovery. */
   findColumns(options?: AnchoredFindColumnsOptions): ColumnMatch[];
+  /** Variant discovery with detailed mapping info for each hit. */
+  findColumnVariants(options?: AnchoredFindColumnsOptions): ColumnVariant[];
 }
 /** Controls axis matching behavior for anchored discovery. */
 type MatchingMode = "enrichment" | "related" | "exact";
@@ -46,12 +48,21 @@ interface ColumnMatch {
   /** Match variants — different ways (paths/qualifications) to reach this column. */
   readonly variants: MatchVariant[];
 }
+interface ColumnVariant<Id extends PObjectId = PObjectId> {
+  /** Column snapshot with anchored SUniversalPColumnId. */
+  readonly column: ColumnSnapshot<Id>;
+  /** Full qualifications needed for integration. */
+  readonly qualifications: MatchQualifications;
+  /** Linker steps traversed to reach this hit; empty for direct matches. */
+  readonly path: {
+    linker: ColumnSnapshot<PObjectId>;
+    qualifications: AxisQualification[];
+  }[];
+}
 /** A single mapping variant describing how a hit column can be integrated. */
 interface MatchVariant {
   /** Full qualifications needed for integration. */
   readonly qualifications: MatchQualifications;
-  /** Distinctive (minimal) qualifications needed for integration. */
-  readonly distinctiveQualifications: MatchQualifications;
   /** Linker steps traversed to reach this hit; empty for direct matches. */
   readonly path: {
     linker: ColumnSnapshot<PObjectId>;
@@ -106,5 +117,5 @@ declare class ColumnCollectionBuilder {
   build(options: AnchoredBuildOptions): undefined | AnchoredColumnCollection;
 }
 //#endregion
-export { AnchorEntry, AnchoredBuildOptions, AnchoredColumnCollection, AnchoredFindColumnsOptions, BuildOptions, ColumnCollection, ColumnCollectionBuilder, ColumnMatch, FindColumnsOptions, MatchQualifications, MatchVariant, MatchingMode };
+export { AnchorEntry, AnchoredBuildOptions, AnchoredColumnCollection, AnchoredFindColumnsOptions, BuildOptions, ColumnCollection, ColumnCollectionBuilder, ColumnMatch, ColumnVariant, FindColumnsOptions, MatchQualifications, MatchVariant, MatchingMode };
 //# sourceMappingURL=column_collection_builder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"column_collection_builder.d.ts","names":[],"sources":["../../src/columns/column_collection_builder.ts"],"mappings":";;;;;;;;UAyBiB,kBAAA;EAAkB;EAEjC,OAAA,GAAU,cAAA;EAEc;EAAxB,OAAA,GAAU,cAAA;AAAA;;UAMK,gBAAA,SAAyB,UAAA;EANhB;EAQxB,OAAA;EAFe;;;EAOf,WAAA,CAAY,OAAA,GAAU,kBAAA,GAAqB,cAAA,CAAe,SAAA;AAAA;;UAM3C,wBAAA,SAAiC,UAAA;EAbE;EAelD,OAAA;EAfwC;EAkBxC,UAAA,IAAc,GAAA,SAAY,cAAA,CAAe,SAAA;EAXzC;EAcA,WAAA,CAAY,OAAA,GAAU,0BAAA,GAA6B,WAAA;AAAA;;KAIzC,YAAA;;UAGK,0BAAA,SAAmC,kBAAA;EAfnC;EAiBf,IAAA,GAAO,YAAA;;EAEP,OAAA;AAAA;;UAIe,WAAA;EAfoC;EAAA,SAiB1C,MAAA,EAAQ,cAAA,CAAe,SAAA;EAzB0B;EAAA,SA2BjD,QAAA,EAAU,YAAA;AAAA;;UAIJ,YAAA;EA1BD;EAAA,SA4BL,cAAA,EAAgB,mBAAA;EA5BgB;EAAA,SA8BhC,yBAAA,EAA2B,mBAAA;EA3Bd;EAAA,SA6Bb,IAAA;IACP,MAAA,EAAQ,cAAA,CAAe,SAAA;IACvB,cAAA,EAAgB,iBAAA;EAAA;AAAA;;UAKH,mBAAA;EAhCO;EAAA,SAkCb,UAAA,EAAY,MAAA,CAAO,SAAA,EAAW,iBAAA;EA/BxB;EAAA,SAiCN,MAAA,EAAQ,iBAAA;AAAA;AAAA,UAKF,YAAA;EACf,sBAAA;AAAA;AAAA,KAGU,WAAA,GAAc,SAAA,GAAY,WAAA,GAAc,qBAAA;AAAA,UAEnC,oBAAA,SAA6B,YAAA;EAC5C,OAAA,EAAS,MAAA,SAAe,WAAA;AAAA;AArC1B;;;;;;;AAAA,cAiDa,uBAAA;EAAA,iBAGkB,UAAA;EAAA,iBAFZ,SAAA;cAEY,UAAA,GAAY,gBAAA;EAhDhC;;;;AAIX;EAmDE,SAAA,CAAU,MAAA,EAAQ,YAAA,GAAe,gBAAA;EAUjC,UAAA,CAAW,OAAA,GAAU,YAAA,GAAe,gBAAA;EA3DX;EAmEzB,KAAA,CAAA,eAAqB,gBAAA;EACrB,KAAA,CAAM,OAAA;IACJ,sBAAA;EAAA,IACE,gBAAA;IAAA,SAA8B,kBAAA;EAAA;EAtEzB;EAwET,KAAA,CACE,OAAA,EAAS,oBAAA;IAAyB,sBAAA;EAAA,IACjC,wBAAA;IAAA,SAAsC,kBAAA;EAAA;EACzC,KAAA,CAAM,OAAA,EAAS,oBAAA,eAAmC,wBAAA;AAAA"}
+{"version":3,"file":"column_collection_builder.d.ts","names":[],"sources":["../../src/columns/column_collection_builder.ts"],"mappings":";;;;;;;;UAyBiB,kBAAA;EAAkB;EAEjC,OAAA,GAAU,cAAA;EAEc;EAAxB,OAAA,GAAU,cAAA;AAAA;;UAMK,gBAAA,SAAyB,UAAA;EANhB;EAQxB,OAAA;EAFe;;;EAOf,WAAA,CAAY,OAAA,GAAU,kBAAA,GAAqB,cAAA,CAAe,SAAA;AAAA;;UAM3C,wBAAA,SAAiC,UAAA;EAbE;EAelD,OAAA;EAfwC;EAkBxC,UAAA,IAAc,GAAA,SAAY,cAAA,CAAe,SAAA;EAXzC;EAcA,WAAA,CAAY,OAAA,GAAU,0BAAA,GAA6B,WAAA;EAdvC;EAiBZ,kBAAA,CAAmB,OAAA,GAAU,0BAAA,GAA6B,aAAA;AAAA;;KAIhD,YAAA;AAfZ;AAAA,UAkBiB,0BAAA,SAAmC,kBAAA;;EAElD,IAAA,GAAO,YAAA;EAfmB;EAiB1B,OAAA;AAAA;;UAIe,WAAA;EAf2C;EAAA,SAiBjD,MAAA,EAAQ,cAAA,CAAe,SAAA;EA5B0B;EAAA,SA8BjD,QAAA,EAAU,YAAA;AAAA;AAAA,UAGJ,aAAA,YAAyB,SAAA,GAAY,SAAA;EA5BpD;EAAA,SA8BS,MAAA,EAAQ,cAAA,CAAe,EAAA;EA9BN;EAAA,SAgCjB,cAAA,EAAgB,mBAAA;EA7BzB;EAAA,SA+BS,IAAA;IACP,MAAA,EAAQ,cAAA,CAAe,SAAA;IACvB,cAAA,EAAgB,iBAAA;EAAA;AAAA;;UAKH,YAAA;EAnCwD;EAAA,SAqC9D,cAAA,EAAgB,mBAAA;EAjCf;EAAA,SAmCD,IAAA;IACP,MAAA,EAAQ,cAAA,CAAe,SAAA;IACvB,cAAA,EAAgB,iBAAA;EAAA;AAAA;;UAKH,mBAAA;EAvCqD;EAAA,SAyC3D,UAAA,EAAY,MAAA,CAAO,SAAA,EAAW,iBAAA;EAvCvC;EAAA,SAyCS,MAAA,EAAQ,iBAAA;AAAA;AAAA,UAKF,YAAA;EACf,sBAAA;AAAA;AAAA,KAGU,WAAA,GAAc,SAAA,GAAY,WAAA,GAAc,qBAAA;AAAA,UAEnC,oBAAA,SAA6B,YAAA;EAC5C,OAAA,EAAS,MAAA,SAAe,WAAA;AAAA;;;;;;;;cAYb,uBAAA;EAAA,iBAGkB,UAAA;EAAA,iBAFZ,SAAA;cAEY,UAAA,GAAY,gBAAA;EAvDb;;;;;EA8D5B,SAAA,CAAU,MAAA,EAAQ,YAAA,GAAe,gBAAA;EAUjC,UAAA,CAAW,OAAA,GAAU,YAAA,GAAe,gBAAA;EAjEX;EAyEzB,KAAA,CAAA,eAAqB,gBAAA;EACrB,KAAA,CAAM,OAAA;IACJ,sBAAA;EAAA,IACE,gBAAA;IAAA,SAA8B,kBAAA;EAAA;EAnFkB;EAqFpD,KAAA,CACE,OAAA,EAAS,oBAAA;IAAyB,sBAAA;EAAA,IACjC,wBAAA;IAAA,SAAsC,kBAAA;EAAA;EACzC,KAAA,CAAM,OAAA,EAAS,oBAAA,eAAmC,wBAAA;AAAA"}

package/dist/columns/column_collection_builder.js

@@ -116,8 +116,7 @@ var AnchoredColumnCollectionImpl = class {
 			});
 			const variants = hit.mappingVariants.map((v) => ({
 				path,
-				qualifications: remapFromIdxToId(v.qualifications, anchors),
-				distinctiveQualifications: remapFromIdxToId(v.distinctiveQualifications, anchors)
+				qualifications: remapFromIdxToId(v.qualifications, anchors)
 			}));
 			const existing = acc.get(origId);
 			return acc.set(origId, existing === void 0 ? {
@@ -130,6 +129,13 @@ var AnchoredColumnCollectionImpl = class {
 		}, /* @__PURE__ */ new Map());
 		return Array.from(byColumn.values());
 	}
+	findColumnVariants(options) {
+		return this.findColumns(options).flatMap((match) => match.variants.map((variant) => ({
+			column: match.column,
+			path: variant.path,
+			qualifications: variant.qualifications
+		})));
+	}
 };
 /**
 * Collect all columns from all providers, dedup by NativePObjectId.

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  DiscoverColumnsConstraints,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n  MultiColumnSelector,\n  NativePObjectId,\n  PColumnSpec,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { deriveNativeId, isPColumnSpec } 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 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 { getService } from \"../services\";\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  /** 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, ColumnSnapshot<PObjectId>>;\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<PObjectId>;\n  /** Match variants — different ways (paths/qualifications) to reach this column. */\n  readonly variants: MatchVariant[];\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  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: {\n    linker: ColumnSnapshot<PObjectId>;\n    qualifications: AxisQualification[];\n  }[];\n}\n\n/** Qualifications needed for both already-integrated anchor columns and the hit column. */\nexport interface MatchQualifications {\n  /** Qualifications for already-integrated anchor columns */\n  readonly forQueries: Record<PObjectId, AxisQualification[]>;\n  /** Qualifications for the hit column. */\n  readonly forHit: AxisQualification[];\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 = getService(\"pframeSpec\")) {}\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  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\n    return results;\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, ColumnSnapshot<PObjectId>>;\n  private readonly columnsMap: Map<PObjectId, ColumnSnapshot<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  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getAnchors(): Map<string, ColumnSnapshot<PObjectId>> {\n    return this.anchorsMap;\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    const anchors = Array.from(this.anchorsMap.values());\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      constraints,\n      maxHops: options?.maxHops ?? 4,\n      axes: anchors.map((anchor) => ({\n        axesSpec: anchor.spec.axesSpec,\n        qualifications: [],\n      })),\n    });\n\n    const byColumn = response.hits.reduce<Map<PObjectId, ColumnMatch>>((acc, hit) => {\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\n      const path = hit.path.map((step) => {\n        if (step.type !== \"linker\") {\n          throw new Error(`Unexpected discover-columns step type: ${step.type}`);\n        }\n\n        return {\n          linker:\n            this.columnsMap.get(step.linker.columnId) ??\n            throwError(`Linker column with id ${step.linker.columnId} not found in collection`),\n          qualifications: step.qualifications,\n        };\n      });\n      const variants: MatchVariant[] = hit.mappingVariants.map((v) => ({\n        path,\n        qualifications: remapFromIdxToId(v.qualifications, anchors),\n        distinctiveQualifications: remapFromIdxToId(v.distinctiveQualifications, anchors),\n      }));\n      const existing = acc.get(origId);\n      return acc.set(\n        origId,\n        existing === undefined\n          ? { column: col, variants }\n          : { ...existing, variants: [...existing.variants, ...variants] },\n      );\n    }, new Map());\n\n    return Array.from(byColumn.values());\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/** Normalize ColumnSelector (relaxed, single or array) to MultiColumnSelector[]. */\nfunction toMultiColumnSelectors(input: ColumnSelector): MultiColumnSelector[] {\n  return convertColumnSelectorToMultiColumnSelector(input);\n}\n\n// --- Anchor resolution ---\n\n/**\n * Resolve each anchor entry to a ColumnSnapshot from the collected columns.\n * - PObjectId (string): looked up by id in the collected columns\n * - PColumnSpec: matched by deriveNativeId against collected columns\n * - RelaxedColumnSelector: resolved via discoverColumns in \"exact\" mode;\n *   must match exactly one column\n * Throws on unresolved, ambiguous, or duplicated matches. Requires at least one\n * anchor to resolve.\n */\nfunction resolveAnchorMap(\n  anchors: Record<string, AnchorEntry>,\n  columns: ColumnSnapshot<PObjectId>[],\n  discoverColumns: (request: DiscoverColumnsRequest) => DiscoverColumnsResponse,\n): Map<string, ColumnSnapshot<PObjectId>> {\n  const result = new Map<string, ColumnSnapshot<PObjectId>>();\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 [name, anchor] of Object.entries(anchors)) {\n    if (typeof anchor === \"string\") {\n      const found =\n        columns.find((col) => col.id === anchor) ??\n        throwError(`Anchor \"${name}\": column with id \"${anchor}\" not found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\n      resovedIds.add(found.id);\n    } else if (\"kind\" in anchor) {\n      if (!isPColumnSpec(anchor)) throwError(`Anchor \"${name}\": invalid PColumnSpec`);\n      const nativeId = deriveNativeId(anchor);\n      const found =\n        columns.find((col) => deriveNativeId(col.spec) === nativeId) ??\n        throwError(`Anchor \"${name}\": no column matching spec found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\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\n      if (matched.hits.length === 0) {\n        throwError(`Anchor \"${name}\": no columns matched selector`);\n      }\n      if (matched.hits.length > 1) {\n        throwError(\n          `Anchor \"${name}\": 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(name));\n      }\n\n      const id = matched.hits[0].hit.columnId as PObjectId;\n      const snap =\n        columns.find((col) => col.id === id) ??\n        throwError(`Anchor \"${name}\": matched column with id \"${id}\" not found in sources`);\n      result.set(name, snap);\n      resovedIds.add(snap.id);\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\nfunction remapFromIdxToId(\n  qualifications: {\n    forQueries: AxisQualification[][];\n    forHit: AxisQualification[];\n  },\n  anchors: ColumnSnapshot<PObjectId>[],\n): MatchQualifications {\n  const forQueries = qualifications.forQueries.reduce<Record<PObjectId, AxisQualification[]>>(\n    (acc, qs, i) => (anchors[i] ? ((acc[anchors[i].id] = qs), acc) : acc),\n    {},\n  );\n  return { forQueries, forHit: qualifications.forHit };\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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"}
+{"version":3,"file":"column_collection_builder.js","names":[],"sources":["../../src/columns/column_collection_builder.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  DiscoverColumnsConstraints,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n  MultiColumnSelector,\n  NativePObjectId,\n  PColumnSpec,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { deriveNativeId, isPColumnSpec } 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 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 { getService } from \"../services\";\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  /** 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, ColumnSnapshot<PObjectId>>;\n\n  /** Axis-aware column discovery. */\n  findColumns(options?: AnchoredFindColumnsOptions): ColumnMatch[];\n\n  /** Variant discovery with detailed mapping info for each hit. */\n  findColumnVariants(options?: AnchoredFindColumnsOptions): ColumnVariant[];\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<PObjectId>;\n  /** Match variants — different ways (paths/qualifications) to reach this column. */\n  readonly variants: MatchVariant[];\n}\n\nexport interface ColumnVariant<Id extends PObjectId = PObjectId> {\n  /** Column snapshot with anchored SUniversalPColumnId. */\n  readonly column: ColumnSnapshot<Id>;\n  /** Full qualifications needed for integration. */\n  readonly qualifications: MatchQualifications;\n  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: {\n    linker: ColumnSnapshot<PObjectId>;\n    qualifications: AxisQualification[];\n  }[];\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  /** Linker steps traversed to reach this hit; empty for direct matches. */\n  readonly path: {\n    linker: ColumnSnapshot<PObjectId>;\n    qualifications: AxisQualification[];\n  }[];\n}\n\n/** Qualifications needed for both already-integrated anchor columns and the hit column. */\nexport interface MatchQualifications {\n  /** Qualifications for already-integrated anchor columns */\n  readonly forQueries: Record<PObjectId, AxisQualification[]>;\n  /** Qualifications for the hit column. */\n  readonly forHit: AxisQualification[];\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 = getService(\"pframeSpec\")) {}\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  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\n    return results;\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, ColumnSnapshot<PObjectId>>;\n  private readonly columnsMap: Map<PObjectId, ColumnSnapshot<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  }\n\n  dispose(): void {\n    this.specFrameEntry.unref();\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  getAnchors(): Map<string, ColumnSnapshot<PObjectId>> {\n    return this.anchorsMap;\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    const anchors = Array.from(this.anchorsMap.values());\n    const response = this.specDriver.discoverColumns(this.specFrameEntry.key, {\n      includeColumns,\n      excludeColumns,\n      constraints,\n      maxHops: options?.maxHops ?? 4,\n      axes: anchors.map((anchor) => ({\n        axesSpec: anchor.spec.axesSpec,\n        qualifications: [],\n      })),\n    });\n\n    const byColumn = response.hits.reduce<Map<PObjectId, ColumnMatch>>((acc, hit) => {\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\n      const path = hit.path.map((step) => {\n        if (step.type !== \"linker\") {\n          throw new Error(`Unexpected discover-columns step type: ${step.type}`);\n        }\n\n        return {\n          linker:\n            this.columnsMap.get(step.linker.columnId) ??\n            throwError(`Linker column with id ${step.linker.columnId} not found in collection`),\n          qualifications: step.qualifications,\n        };\n      });\n      const variants: MatchVariant[] = hit.mappingVariants.map((v) => ({\n        path,\n        qualifications: remapFromIdxToId(v.qualifications, anchors),\n      }));\n      const existing = acc.get(origId);\n      return acc.set(\n        origId,\n        existing === undefined\n          ? { column: col, variants }\n          : { ...existing, variants: [...existing.variants, ...variants] },\n      );\n    }, new Map());\n\n    return Array.from(byColumn.values());\n  }\n\n  findColumnVariants(options?: AnchoredFindColumnsOptions): ColumnVariant[] {\n    const matches = this.findColumns(options);\n    return matches.flatMap((match) =>\n      match.variants.map((variant) => ({\n        column: match.column,\n        path: variant.path,\n        qualifications: variant.qualifications,\n      })),\n    );\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/** Normalize ColumnSelector (relaxed, single or array) to MultiColumnSelector[]. */\nfunction toMultiColumnSelectors(input: ColumnSelector): MultiColumnSelector[] {\n  return convertColumnSelectorToMultiColumnSelector(input);\n}\n\n// --- Anchor resolution ---\n\n/**\n * Resolve each anchor entry to a ColumnSnapshot from the collected columns.\n * - PObjectId (string): looked up by id in the collected columns\n * - PColumnSpec: matched by deriveNativeId against collected columns\n * - RelaxedColumnSelector: resolved via discoverColumns in \"exact\" mode;\n *   must match exactly one column\n * Throws on unresolved, ambiguous, or duplicated matches. Requires at least one\n * anchor to resolve.\n */\nfunction resolveAnchorMap(\n  anchors: Record<string, AnchorEntry>,\n  columns: ColumnSnapshot<PObjectId>[],\n  discoverColumns: (request: DiscoverColumnsRequest) => DiscoverColumnsResponse,\n): Map<string, ColumnSnapshot<PObjectId>> {\n  const result = new Map<string, ColumnSnapshot<PObjectId>>();\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 [name, anchor] of Object.entries(anchors)) {\n    if (typeof anchor === \"string\") {\n      const found =\n        columns.find((col) => col.id === anchor) ??\n        throwError(`Anchor \"${name}\": column with id \"${anchor}\" not found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\n      resovedIds.add(found.id);\n    } else if (\"kind\" in anchor) {\n      if (!isPColumnSpec(anchor)) throwError(`Anchor \"${name}\": invalid PColumnSpec`);\n      const nativeId = deriveNativeId(anchor);\n      const found =\n        columns.find((col) => deriveNativeId(col.spec) === nativeId) ??\n        throwError(`Anchor \"${name}\": no column matching spec found in sources`);\n      if (resovedIds.has(found.id)) {\n        throwError(getDuplicateError(name));\n      }\n      result.set(name, found);\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\n      if (matched.hits.length === 0) {\n        throwError(`Anchor \"${name}\": no columns matched selector`);\n      }\n      if (matched.hits.length > 1) {\n        throwError(\n          `Anchor \"${name}\": 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(name));\n      }\n\n      const id = matched.hits[0].hit.columnId as PObjectId;\n      const snap =\n        columns.find((col) => col.id === id) ??\n        throwError(`Anchor \"${name}\": matched column with id \"${id}\" not found in sources`);\n      result.set(name, snap);\n      resovedIds.add(snap.id);\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\nfunction remapFromIdxToId(\n  qualifications: {\n    forQueries: AxisQualification[][];\n    forHit: AxisQualification[];\n  },\n  anchors: ColumnSnapshot<PObjectId>[],\n): MatchQualifications {\n  const forQueries = qualifications.forQueries.reduce<Record<PObjectId, AxisQualification[]>>(\n    (acc, qs, i) => (anchors[i] ? ((acc[anchors[i].id] = qs), acc) : acc),\n    {},\n  );\n  return { forQueries, forHit: qualifications.forHit };\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/ctx_column_sources.d.ts

@@ -1,6 +1,6 @@
-import { RenderCtxBase, ResultPool } from "../render/api.js";
 import { ColumnSnapshot } from "./column_snapshot.js";
 import { ColumnSnapshotProvider } from "./column_snapshot_provider.js";
+import { RenderCtxBase, ResultPool } from "../render/api.js";
 import { PObjectId } from "@milaboratories/pl-model-common";
 
 //#region src/columns/ctx_column_sources.d.ts

package/dist/columns/index.d.ts

@@ -1,6 +1,6 @@
 import { ColumnSelector, RelaxedAxisSelector, RelaxedColumnSelector, RelaxedRecord, RelaxedStringMatchers, StringMatcher, convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector } from "./column_selector.js";
 import { ColumnData, ColumnDataStatus, ColumnSnapshot, createColumnSnapshot, createReadyColumnData } from "./column_snapshot.js";
 import { ArrayColumnProvider, ColumnSnapshotProvider, ColumnSource, OutputColumnProvider, OutputColumnProviderOpts, SnapshotColumnProvider, isColumnSnapshotProvider, toColumnSnapshotProvider } from "./column_snapshot_provider.js";
-import { AnchorEntry, AnchoredBuildOptions, AnchoredColumnCollection, AnchoredFindColumnsOptions, BuildOptions, ColumnCollection, ColumnCollectionBuilder, ColumnMatch, FindColumnsOptions, MatchQualifications, MatchVariant, MatchingMode } from "./column_collection_builder.js";
+import { AnchorEntry, AnchoredBuildOptions, AnchoredColumnCollection, AnchoredFindColumnsOptions, BuildOptions, ColumnCollection, ColumnCollectionBuilder, ColumnMatch, ColumnVariant, FindColumnsOptions, MatchQualifications, MatchVariant, MatchingMode } from "./column_collection_builder.js";
 import { ResultPoolColumnSnapshotProvider, collectCtxColumnSnapshotProviders } from "./ctx_column_sources.js";
 import { ExpandByPartitionOpts, ExpandByPartitionResult, SplitAxis, expandByPartition } from "./expand_by_partition.js";

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs

@@ -7,6 +7,7 @@ const require_utils = require("./utils.cjs");
 const require_discoverColumns = require("./discoverColumns.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 let _milaboratories_helpers = require("@milaboratories/helpers");
+let es_toolkit = require("es-toolkit");
 let es_toolkit_compat = require("es-toolkit/compat");
 //#region src/components/PlDataTable/createPlDataTable/createPlDataTableV3.ts
 function createPlDataTableV3(ctx, options) {
@@ -16,12 +17,13 @@ function createPlDataTableV3(ctx, options) {
 	const discovered = (0, _milaboratories_helpers.isPlainObject)(options.columns) ? require_discoverColumns.discoverTableColumnSnaphots(ctx, options.columns) : options.columns;
 	if ((0, _milaboratories_helpers.isNil)(discovered) || discovered.length === 0) return void 0;
 	const splited = splitDiscoveredColumns(discovered);
-	const labelColumns = require_labels.getMatchingLabelColumns([...splited.direct, ...splited.linked], require_labels.getAllLabelColumns(ctx));
+	const labelColumns = require_labels.getMatchingLabelColumns([...splited.direct, ...splited.linked].map((v) => v.column), require_labels.getAllLabelColumns(ctx));
 	const derivedLabels = require_utils.deriveAllLabels({
 		columns: discovered.map((dc) => ({
-			id: dc.id,
-			spec: dc.spec,
-			linkerPath: dc.linkerPath?.map((lp) => ({ spec: lp.linker.spec }))
+			id: dc.column.id,
+			spec: dc.column.spec,
+			linkerPath: dc.path,
+			qualifications: dc.qualifications
 		})),
 		labelColumns,
 		deriveLabelsOptions: {
@@ -30,12 +32,11 @@ function createPlDataTableV3(ctx, options) {
 		}
 	});
 	const derivedTooltips = require_utils.deriveAllTooltips({ columns: discovered.map((dc) => ({
-		id: dc.id,
+		id: dc.column.id,
 		originalId: dc.originalId,
-		spec: dc.spec,
-		linkerPath: dc.linkerPath,
-		qualifications: dc.qualifications,
-		distinctiveQualifications: dc.distinctiveQualifications
+		spec: dc.column.spec,
+		linkerPath: dc.path,
+		qualifications: dc.qualifications
 	})) });
 	const annotated = annotateColumnGroups({
 		pframeSpec,
@@ -49,8 +50,8 @@ function createPlDataTableV3(ctx, options) {
 	const secondarySnapshots = annotated.direct.filter((c) => !c.isPrimary);
 	if (primarySnapshots.length === 0) return void 0;
 	const columnIsAvailable = createColumnValidationById([
-		...annotated.direct,
-		...annotated.linked.flatMap((lc) => [...(lc.linkerPath ?? []).map((s) => s.linker), lc]),
+		...annotated.direct.map((v) => v.column),
+		...annotated.linked.flatMap((lc) => [...lc.path.map((s) => s.linker), lc.column]),
 		...annotated.labels
 	]);
 	const remapedDefaultFilters = remapFilterColumnIds(options.filters, discovered);
@@ -58,7 +59,7 @@ function createPlDataTableV3(ctx, options) {
 	validateFilters(filters, columnIsAvailable);
 	const sorting = resolveSorting(state.pTableParams.sorting, remapSortingColumnIds(options.sorting, discovered));
 	validateSorting(sorting, columnIsAvailable);
-	const primaryEntries = primarySnapshots.map((snap) => ({ column: resolveSnapshot(snap) }));
+	const primaryEntries = primarySnapshots.map((v) => ({ column: resolveSnapshot(v.column) }));
 	const fullDef = require_createPTableDefV3.createPTableDefV3({
 		primaryJoinType,
 		primary: primaryEntries,
@@ -68,13 +69,13 @@ function createPlDataTableV3(ctx, options) {
 	});
 	const fullHandle = ctx.createPTableV2(fullDef);
 	const pframeHandle = ctx.createPFrame([
-		...annotated.direct.map(resolveSnapshot),
-		...annotated.linked.map(resolveSnapshot),
+		...annotated.direct.map((v) => resolveSnapshot(v.column)),
+		...annotated.linked.map((v) => resolveSnapshot(v.column)),
 		...annotated.labels,
 		...collectLinkerSnapshots(annotated.linked).map(resolveSnapshot)
 	]);
 	const hiddenSpecs = state.pTableParams.hiddenColIds;
-	const visible = buildVisibleColumns(annotated, computeHiddenColumns([...annotated.direct, ...annotated.linked], sorting, filters, hiddenSpecs), labelColumns);
+	const visible = buildVisibleColumns(annotated, computeHiddenColumns([...annotated.direct, ...annotated.linked].map((v) => v.column), sorting, filters, hiddenSpecs), labelColumns);
 	const visibleDef = require_createPTableDefV3.createPTableDefV3({
 		primaryJoinType,
 		primary: primaryEntries,
@@ -94,13 +95,13 @@ function createPlDataTableV3(ctx, options) {
 /** Split discovered columns into direct (no linker path) and linked (with linker path). */
 function splitDiscoveredColumns(columns) {
 	return {
-		direct: columns.filter((dc) => (0, _milaboratories_helpers.isNil)(dc.linkerPath) || dc.linkerPath.length === 0),
-		linked: columns.filter((dc) => !(0, _milaboratories_helpers.isNil)(dc.linkerPath) && dc.linkerPath.length > 0)
+		direct: columns.filter((dc) => dc.path.length === 0),
+		linked: columns.filter((dc) => dc.path.length > 0)
 	};
 }
 /** All linker snapshots across the given linked columns, deduped by id. */
 function collectLinkerSnapshots(linked) {
-	return (0, _milaboratories_pl_model_common.uniqueBy)(linked.flatMap((lc) => (lc.linkerPath ?? []).map((s) => s.linker)), (c) => c.id);
+	return (0, _milaboratories_pl_model_common.uniqueBy)(linked.flatMap((lc) => lc.path.map((s) => s.linker)), (c) => c.id);
 }
 /**
 * Annotate all column groups with derived labels and display-rule annotations.
@@ -111,34 +112,33 @@ function collectLinkerSnapshots(linked) {
 function annotateColumnGroups(params) {
 	const { direct, linked, labelColumns, derivedLabels, derivedTooltips, displayOptions, pframeSpec } = params;
 	const allColumnsForRules = [
-		...direct,
-		...linked,
+		...direct.map((v) => v.column),
+		...linked.map((v) => v.column),
 		...labelColumns,
 		...collectLinkerSnapshots(linked)
 	];
 	const visibilityByColId = require_utils.evaluateRules(displayOptions?.visibility ?? [], allColumnsForRules, pframeSpec);
 	const orderByColId = require_utils.evaluateRules(displayOptions?.ordering ?? [], allColumnsForRules, pframeSpec);
 	return {
-		direct: [
-			require_utils.withLabelAnnotations.bind(null, derivedLabels),
-			require_utils.withInfoAnnotations.bind(null, derivedTooltips),
-			require_utils.withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId)
-		].reduce((cols, fn) => fn(cols), direct),
-		linked: [
-			require_utils.withLabelAnnotations.bind(null, derivedLabels),
-			require_utils.withInfoAnnotations.bind(null, derivedTooltips),
-			require_utils.withHidenAxesAnnotations.bind(null),
-			require_utils.withTableVisualAnnotations.bind(null, visibilityByColId, orderByColId),
-			(cols) => cols.map((lc) => ({
-				...lc,
-				linkerPath: annotateLinkerPath(derivedLabels, lc.linkerPath)
-			}))
-		].reduce((cols, fn) => fn(cols), linked),
-		labels: require_utils.withLabelAnnotations(derivedLabels, labelColumns)
+		direct: liftToVariantColumns(direct, (0, es_toolkit.flow)((cols) => require_utils.withLabelAnnotations(derivedLabels, cols), (cols) => require_utils.withInfoAnnotations(derivedTooltips, cols), (cols) => require_utils.withTableVisualAnnotations(visibilityByColId, orderByColId, cols))),
+		linked: liftToVariantColumns(linked, (0, es_toolkit.flow)((cols) => require_utils.withHidenAxesAnnotations(cols), (cols) => require_utils.withLabelAnnotations(derivedLabels, cols), (cols) => require_utils.withInfoAnnotations(derivedTooltips, cols), (cols) => require_utils.withTableVisualAnnotations(visibilityByColId, orderByColId, cols))).map((lc) => ({
+			...lc,
+			path: annotateLinkerPath(derivedLabels, lc.path)
+		})),
+		labels: (0, es_toolkit.flow)((cols) => require_utils.withHidenAxesAnnotations(cols), (cols) => require_utils.withLabelAnnotations(derivedLabels, cols))(labelColumns)
 	};
 }
+/** Lift a snapshot-array transform so it runs on the inner `column` of each variant. */
+function liftToVariantColumns(variants, fn) {
+	const cols = fn(variants.map((v) => v.column));
+	if (cols.length !== variants.length) throw new Error(`liftToVariantColumns: fn must preserve array length (got ${cols.length}, expected ${variants.length})`);
+	return variants.map((v, i) => ({
+		...v,
+		column: cols[i]
+	}));
+}
 function annotateLinkerPath(derivedLabels, path) {
-	if ((0, _milaboratories_helpers.isNil)(path) || path.length === 0) return path;
+	if (path.length === 0) return path;
 	const annotatedLinkers = require_utils.withHidenAxesAnnotations(require_utils.withLabelAnnotations(derivedLabels, path.map((s) => s.linker)));
 	return path.map((s, i) => ({
 		...s,
@@ -187,20 +187,20 @@ function buildSecondaryGroups(direct, linked, labels) {
 	return [
 		...direct.map((c) => ({
 			entries: [{
-				column: resolveSnapshot(c),
-				qualifications: c.qualifications?.forHit
+				column: resolveSnapshot(c.column),
+				qualifications: c.qualifications.forHit
 			}],
-			primaryQualifications: c.qualifications?.forQueries
+			primaryQualifications: c.qualifications.forQueries
 		})),
 		...linked.map((lc) => ({
-			entries: [...(lc.linkerPath ?? []).map((s) => ({
+			entries: [...lc.path.map((s) => ({
 				column: resolveSnapshot(s.linker),
 				qualifications: s.qualifications
 			})), {
-				column: resolveSnapshot(lc),
-				qualifications: lc.qualifications?.forHit
+				column: resolveSnapshot(lc.column),
+				qualifications: lc.qualifications.forHit
 			}],
-			primaryQualifications: lc.qualifications?.forQueries
+			primaryQualifications: lc.qualifications.forQueries
 		})),
 		...labels.map((c) => ({ entries: [{ column: c }] }))
 	];
@@ -224,12 +224,12 @@ function collectPreservedColumnIds(sorting, filters) {
 }
 /** Filter annotated columns to only visible ones, re-matching label columns for the visible subset. */
 function buildVisibleColumns(annotated, hiddenColumns, originalLabelColumns) {
-	const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.id));
-	const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.id));
+	const direct = annotated.direct.filter((c) => !hiddenColumns.has(c.column.id));
+	const linked = annotated.linked.filter((c) => !hiddenColumns.has(c.column.id));
 	return {
 		direct,
 		linked,
-		labels: require_labels.getMatchingLabelColumns([...direct, ...linked], originalLabelColumns)
+		labels: require_labels.getMatchingLabelColumns([...direct, ...linked].map((v) => v.column), originalLabelColumns)
 	};
 }
 /** Resolve a ColumnSnapshot to a PColumn with lazily-evaluated data. */
@@ -245,12 +245,12 @@ function remapSortingColumnIds(sorting, columns) {
 	return sorting?.map((s) => {
 		if (s.column.type === "axis") return s;
 		const id = s.column.id;
-		const column = columns.find((c) => (c.originalId ?? c.id) === id) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${id}" in sorting does not match any discovered column`);
+		const column = columns.find((c) => (c.originalId ?? c.column.id) === id) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${id}" in sorting does not match any discovered column`);
 		return {
 			...s,
 			column: {
 				type: "column",
-				id: column.id
+				id: column.column.id
 			}
 		};
 	});
@@ -264,7 +264,7 @@ function remapFilterColumnIds(filters, columns) {
 		const originalId = parsed.id;
 		return (0, _milaboratories_pl_model_common.canonicalizeJson)({
 			type: "column",
-			id: (columns.find((c) => (c.originalId ?? c.id) === originalId) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${parsed.id}" in filters does not match any discovered column`)).id
+			id: (columns.find((c) => (c.originalId ?? c.column.id) === originalId) ?? (0, _milaboratories_helpers.throwError)(`Column ID "${parsed.id}" in filters does not match any discovered column`)).column.id
 		});
 	};
 	return require_traverse.traverseFilterSpec(filters, {