@milaboratories/pl-model-common 1.13.4 → 1.13.6

package/src/drivers/pframe/spec/anchored.ts

@@ -1,11 +1,11 @@
 import canonicalize from 'canonicalize';
-import type { AxisId, PColumnSpec } from './spec';
-import { getAxisId, matchAxisId } from './spec';
-import type { AAxisSelector, AnchorAxisRef, AnchorAxisRefByIdx, AnchoredPColumnId, AnchoredPColumnSelector, AxisSelector, PColumnSelector } from './selectors';
-import type { AxisFilter } from './filtered_column';
 import type { PValue } from '../data_types';
+import type { AxisFilter } from './filtered_column';
 import type { SUniversalPColumnId, UniversalPColumnId } from './ids';
 import { stringifyColumnId } from './ids';
+import type { AAxisSelector, AnchorAxisRef, AnchorAxisRefByIdx, AnchoredPColumnId, AnchoredPColumnSelector, AxisSelector, PColumnSelector } from './selectors';
+import type { AxisId, PColumnSpec } from './spec';
+import { getAxisId, matchAxisId } from './spec';
 
 //
 // Helper functions
@@ -121,7 +121,8 @@ export class AnchoredIdDeriver {
     result.axes = spec.axesSpec.map((axis) => {
       const key = axisKey(axis);
       const anchorAxisRef = this.axes.get(key);
-      return anchorAxisRef ?? axis;
+      if (anchorAxisRef === undefined) return getAxisId(axis);
+      else return anchorAxisRef;
     });
 
     // If no axis filters are provided, return the anchored ID as is
@@ -171,16 +172,29 @@ export class AnchoredIdDeriver {
   }
 }
 
+/**
+ * Options for the resolveAnchors function
+ */
+export type ResolveAnchorsOptions = {
+  /**
+   * If true, missing domain keys in anchors will be ignored.
+   * If false (default), an error will be thrown.
+   */
+  ignoreMissingDomains?: boolean;
+};
+
 /**
  * Resolves anchored references in a column matcher to create a non-anchored matcher.
  * Doing an opposite operation to {@link AnchorIdDeriver.derive()}.
  *
  * @param anchors - Record of anchor column specifications indexed by anchor id
  * @param matcher - An anchored column matcher (or id, which is subtype of it) containing references that need to be resolved
+ * @param options - Options for resolving anchors
  * @returns A non-anchored column matcher with all references resolved to actual values
  */
-export function resolveAnchors(anchors: Record<string, PColumnSpec>, matcher: AnchoredPColumnSelector): PColumnSelector {
+export function resolveAnchors(anchors: Record<string, PColumnSpec>, matcher: AnchoredPColumnSelector, options?: ResolveAnchorsOptions): PColumnSelector {
   const result = { ...matcher };
+  const ignoreMissingDomains = options?.ignoreMissingDomains ?? false;
 
   if (result.domainAnchor !== undefined) {
     const anchorSpec = anchors[result.domainAnchor];
@@ -203,8 +217,11 @@ export function resolveAnchors(anchors: Record<string, PColumnSpec>, matcher: An
         if (!anchorSpec)
           throw new Error(`Anchor "${value.anchor}" not found for domain key "${key}"`);
 
-        if (!anchorSpec.domain || anchorSpec.domain[key] === undefined)
-          throw new Error(`Domain key "${key}" not found in anchor "${value.anchor}"`);
+        if (!anchorSpec.domain || anchorSpec.domain[key] === undefined) {
+          if (!ignoreMissingDomains)
+            throw new Error(`Domain key "${key}" not found in anchor "${value.anchor}"`);
+          continue;
+        }
 
         resolvedDomain[key] = anchorSpec.domain[key];
       }

package/src/drivers/pframe/spec/spec.ts

@@ -119,6 +119,14 @@ export interface PColumnIdAndSpec {
   readonly spec: PColumnSpec;
 }
 
+/** Get column id and spec from a column */
+export function getColumnIdAndSpec<Data>(column: PColumn<Data>): PColumnIdAndSpec {
+  return {
+    columnId: column.id,
+    spec: column.spec,
+  };
+}
+
 /** Information returned by {@link PFrame.listColumns} method */
 export interface PColumnInfo extends PColumnIdAndSpec {
   /** True if data was associated with this PColumn */