@platforma-sdk/model 1.58.22 → 1.59.3

package/src/pframe_utils/axes.ts

@@ -29,7 +29,11 @@ import type { PColumnDataUniversal } from "../render";
 export type AxesVault = Map<CanonicalizedJson<AxisId>, AxisSpecNormalized>;
 
 /** Create id for column copy with added keys in axes domains */
-const colId = (id: PObjectId, domains: (Record<string, string> | undefined)[]) => {
+const colId = (
+  id: PObjectId,
+  domains: (Record<string, string> | undefined)[],
+  contextDomains: (Record<string, string> | undefined)[],
+) => {
   let wid = id.toString();
   domains?.forEach((domain) => {
     if (domain) {
@@ -39,6 +43,14 @@ const colId = (id: PObjectId, domains: (Record<string, string> | undefined)[]) =
       }
     }
   });
+  contextDomains?.forEach((contextDomain) => {
+    if (contextDomain) {
+      for (const [k, v] of Object.entries(contextDomain)) {
+        wid += k;
+        wid += v;
+      }
+    }
+  });
   return wid;
 };
 
@@ -122,6 +134,15 @@ function getAdditionalColumnsForColumn<T extends Omit<PColumn<PColumnDataUnivers
           allAddedDomainValues.add(item);
         }
       });
+      const cd1 = column.spec.axesSpec[idx].contextDomain;
+      const cd2 = axisId.contextDomain;
+      Object.entries(cd2 ?? {}).forEach(([key, value]) => {
+        if (cd1?.[key] === undefined) {
+          const item = JSON.stringify(["ctx:" + key, value]);
+          addedSet.add(item);
+          allAddedDomainValues.add(item);
+        }
+      });
       return {
         ...axisId,
         annotations: column.spec.axesSpec[idx].annotations,
@@ -139,6 +160,7 @@ function getAdditionalColumnsForColumn<T extends Omit<PColumn<PColumnDataUnivers
     const id = colId(
       column.id,
       idsList.map((id) => id.domain),
+      idsList.map((id) => id.contextDomain),
     );
 
     const label = readAnnotation(column.spec, Annotation.Label) ?? "";

package/src/render/api.ts

@@ -423,6 +423,10 @@ export class ResultPool implements ColumnProvider, AxisLabelProvider {
         continue;
       }
 
+      if (!matchDomain(spec.contextDomain, oth.contextDomain)) {
+        continue;
+      }
+
       for (let i = 0; i < spec.axesSpec.length; ++i) {
         const qAx = spec.axesSpec[i];
         const tAx = oth.axesSpec[i];
@@ -435,6 +439,9 @@ export class ResultPool implements ColumnProvider, AxisLabelProvider {
         if (!matchDomain(qAx.domain, tAx.domain)) {
           continue out;
         }
+        if (!matchDomain(qAx.contextDomain, tAx.contextDomain)) {
+          continue out;
+        }
       }
 
       result.push(data.obj);
@@ -457,7 +464,8 @@ export class ResultPool implements ColumnProvider, AxisLabelProvider {
         spec.axesSpec.length === 1 &&
         spec.axesSpec[0].name === axis.name &&
         spec.axesSpec[0].type === axis.type &&
-        matchDomain(axis.domain, spec.axesSpec[0].domain)
+        matchDomain(axis.domain, spec.axesSpec[0].domain) &&
+        matchDomain(axis.contextDomain, spec.axesSpec[0].contextDomain)
       ) {
         if (column.obj.data.resourceType.name !== "PColumnData/Json") {
           throw Error(`Expected JSON column for labels, got: ${column.obj.data.resourceType.name}`);

package/src/render/util/column_collection.ts

@@ -149,19 +149,25 @@ function fallbackIdDeriver(originalId: PObjectId, axisFilters?: AxisFilterByIdx[
 function hasAnchors(selector: unknown): selector is AnchoredPColumnSelector {
   if (!selector || typeof selector !== "object") return false;
   const potentialAnchored = selector as Record<string, any>;
-  const domainHasAnchors =
-    potentialAnchored["domain"] &&
-    typeof potentialAnchored["domain"] === "object" &&
-    Object.values(potentialAnchored["domain"]).some(
-      (v: unknown) => typeof v === "object" && v !== null && "anchor" in v,
-    );
+  const hasAnchorValues = (obj: unknown) =>
+    obj &&
+    typeof obj === "object" &&
+    Object.values(obj).some((v: unknown) => typeof v === "object" && v !== null && "anchor" in v);
+  const domainHasAnchors = hasAnchorValues(potentialAnchored["domain"]);
+  const contextDomainHasAnchors = hasAnchorValues(potentialAnchored["contextDomain"]);
   const axesHaveAnchors =
     potentialAnchored["axes"] &&
     Array.isArray(potentialAnchored["axes"]) &&
     potentialAnchored["axes"].some(
       (a: unknown) => typeof a === "object" && a !== null && "anchor" in a,
     );
-  return !!potentialAnchored["domainAnchor"] || domainHasAnchors || axesHaveAnchors;
+  return (
+    !!potentialAnchored["domainAnchor"] ||
+    !!potentialAnchored["contextDomainAnchor"] ||
+    domainHasAnchors ||
+    contextDomainHasAnchors ||
+    axesHaveAnchors
+  );
 }
 
 /**