@genome-spy/core 0.73.0 → 0.75.0

package/dist/src/data/transforms/measureText.js

@@ -1,6 +1,4 @@
 import { BEHAVIOR_MODIFIES } from "../flowNode.js";
-import fontMetadata from "../../fonts/Lato-Regular.json" with { type: "json" };
-import getMetrics from "../../fonts/bmFontMetrics.js";
 import { field } from "../../utils/field.js";
 import Transform from "./transform.js";
 import { isExprRef } from "../../paramRuntime/paramUtils.js";
@@ -23,10 +21,8 @@ export default class MeasureTextTransform extends Transform {
 
         this.params = params;
 
-        const metrics = getMetrics(fontMetadata);
         const accessor = field(params.field);
         const as = params.as;
-        // TODO: Support custom fonts.
 
         let size = 0;
 
@@ -56,11 +52,24 @@ export default class MeasureTextTransform extends Transform {
         this.handle = (datum) => {
             const text = accessor(datum);
             if (text !== undefined) {
-                datum[as] = metrics.measureWidth(text, size);
+                datum[as] = this.font.metrics.measureWidth(text, size);
             } else {
                 datum[as] = 0;
             }
             this._propagate(datum);
         };
     }
+
+    initialize() {
+        const fontManager = this.paramRuntimeProvider.context.fontManager;
+        // Resolve the font during flow initialization so viewDataInit's global
+        // font wait also covers measureText before any rows are propagated.
+        this.font = this.params.font
+            ? fontManager.getFont(
+                  this.params.font,
+                  this.params.fontStyle,
+                  this.params.fontWeight
+              )
+            : fontManager.getDefaultFont();
+    }
 }

package/dist/src/data/transforms/pileup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pileup.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/pileup.js"],"names":[],"mappings":"AASA;IAKI;;;OAGG;IACH,oBAFW,OAAO,yBAAyB,EAAE,YAAY,EAMxD;IADG,uDAAoB;CAyG3B;sBAzHqB,gBAAgB"}
+{"version":3,"file":"pileup.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/pileup.js"],"names":[],"mappings":"AAQA;IAKI;;;OAGG;IACH,oBAFW,OAAO,yBAAyB,EAAE,YAAY,EAMxD;IADG,uDAAoB;CAyG3B;sBAzHqB,gBAAgB"}

package/dist/src/data/transforms/pileup.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-unmodified-loop-condition */
 import FlatQueue from "flatqueue";
 import { isNumber } from "vega-util";
 import { field } from "../../utils/field.js";
@@ -68,7 +67,7 @@ export default class PileupTransform extends Transform {
                 const preferredLane = preferredOrder.indexOf(
                     preferenceAccessor(datum)
                 );
-                let lane = -1;
+                let lane;
                 if (preferredLane >= 0 && freeLaneMap[preferredLane] < start) {
                     lane = preferredLane;
                 } else {

package/dist/src/data/transforms/regexFold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"regexFold.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/regexFold.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH;IAKI;;OAEG;IACH,oBAFW,OAAO,yBAAyB,EAAE,eAAe,EA6I3D;IAxIG,0DAAoB;IAyHhB,gBALO,GAAG,UAKe;CAgBpC;sBA3JqB,gBAAgB"}
+{"version":3,"file":"regexFold.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/regexFold.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH;IAKI;;OAEG;IACH,oBAFW,OAAO,yBAAyB,EAAE,eAAe,EA4I3D;IAvIG,0DAAoB;IAwHhB,gBALO,GAAG,UAKe;CAgBpC;sBA1JqB,gBAAgB"}

package/dist/src/data/transforms/regexFold.js

@@ -107,7 +107,6 @@ export default class RegexFoldTransform extends Transform {
                 ...as.map((a, i) => JSON.stringify(a) + `: datum[attrs[${i}]]`),
             ];
 
-            // eslint-disable-next-line no-new-func
             create = /** @type {any} */ (
                 new Function(
                     "datum",

package/dist/src/embedFactory.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @param {new (container: HTMLElement, spec: import("./spec/root.js").RootSpec, options?: import("./types/embedApi.js").EmbedOptions) => import("./genomeSpy.js").default} GenomeSpy
+ * @returns {(el: HTMLElement | string, spec: import("./spec/root.js").RootSpec | string, options?: import("./types/embedApi.js").EmbedOptions) => Promise<import("./types/embedApi.js").EmbedResult>}
+ */
+export function createEmbed(GenomeSpy: new (container: HTMLElement, spec: import("./spec/root.js").RootSpec, options?: import("./types/embedApi.js").EmbedOptions) => import("./genomeSpy.js").default): (el: HTMLElement | string, spec: import("./spec/root.js").RootSpec | string, options?: import("./types/embedApi.js").EmbedOptions) => Promise<import("./types/embedApi.js").EmbedResult>;
+/**
+ * Loads the spec from the given url and sets the baseUrl if it is not
+ * defined in the spec.
+ *
+ * @param {string} url
+ */
+export function loadSpec(url: string): Promise<any>;
+//# sourceMappingURL=embedFactory.d.ts.map

package/dist/src/embedFactory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"embedFactory.d.ts","sourceRoot":"","sources":["../../src/embedFactory.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,uCAHW,KAAK,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,gBAAgB,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,OAAO,qBAAqB,EAAE,YAAY,KAAK,OAAO,gBAAgB,EAAE,OAAO,GAC7J,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,gBAAgB,EAAE,QAAQ,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,qBAAqB,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,qBAAqB,EAAE,WAAW,CAAC,CAmFpM;AAaD;;;;;GAKG;AACH,8BAFW,MAAM,gBAmBhB"}

package/dist/src/embedFactory.js

@@ -0,0 +1,127 @@
+import { isObject, isString } from "vega-util";
+
+import { fetchJson } from "./utils/fetchUtils.js";
+import inferSpecBaseUrl from "./utils/inferSpecBaseUrl.js";
+
+/**
+ * @param {new (container: HTMLElement, spec: import("./spec/root.js").RootSpec, options?: import("./types/embedApi.js").EmbedOptions) => import("./genomeSpy.js").default} GenomeSpy
+ * @returns {(el: HTMLElement | string, spec: import("./spec/root.js").RootSpec | string, options?: import("./types/embedApi.js").EmbedOptions) => Promise<import("./types/embedApi.js").EmbedResult>}
+ */
+export function createEmbed(GenomeSpy) {
+    /**
+     * Embeds GenomeSpy into the DOM
+     *
+     * @param {HTMLElement | string} el
+     * @param {import("./spec/root.js").RootSpec | string} spec
+     * @param {import("./types/embedApi.js").EmbedOptions} [options]
+     * @returns {Promise<import("./types/embedApi.js").EmbedResult>}
+     */
+    return async function embed(el, spec, options = {}) {
+        /** @type {HTMLElement} */
+        let element;
+
+        if (isString(el)) {
+            element = document.querySelector(el);
+            if (!element) {
+                throw new Error(`No such element: ${el}`);
+            }
+        } else if (el instanceof HTMLElement) {
+            element = el;
+        } else {
+            throw new Error(`Invalid element: ${el}`);
+        }
+
+        /** @type {InstanceType<typeof GenomeSpy> | undefined} */
+        let genomeSpy;
+
+        try {
+            const specObject = isObject(spec) ? spec : await loadSpec(spec);
+
+            specObject.baseUrl ??= "";
+            specObject.width ??= "container";
+            specObject.padding ??= 10;
+
+            if (element == document.body) {
+                // Need to add a wrapper to make sizing behavior more stable
+                const wrapper = document.createElement("div");
+                wrapper.style.position = "fixed";
+                wrapper.style.inset = "0";
+                wrapper.style.overflow = "hidden";
+                element.appendChild(wrapper);
+                element = wrapper;
+            }
+
+            genomeSpy = new GenomeSpy(element, specObject, options);
+            applyOptions(genomeSpy, options);
+            await genomeSpy.launch();
+        } catch (e) {
+            element.innerText = e.toString();
+            console.error(e);
+        }
+
+        return {
+            finalize() {
+                genomeSpy.destroy();
+                while (element.firstChild) {
+                    element.firstChild.remove();
+                }
+            },
+
+            addEventListener(type, listener) {
+                genomeSpy.addEventListener(type, listener);
+            },
+
+            removeEventListener(type, listener) {
+                genomeSpy.removeEventListener(type, listener);
+            },
+
+            getScaleResolutionByName(name) {
+                return genomeSpy.getNamedScaleResolutions().get(name);
+            },
+
+            awaitVisibleLazyData:
+                genomeSpy.awaitVisibleLazyData.bind(genomeSpy),
+            getRenderedBounds: genomeSpy.getRenderedBounds.bind(genomeSpy),
+            updateNamedData: genomeSpy.updateNamedData.bind(genomeSpy),
+            getLogicalCanvasSize:
+                genomeSpy.getLogicalCanvasSize.bind(genomeSpy),
+            exportCanvas: genomeSpy.exportCanvas.bind(genomeSpy),
+        };
+    };
+}
+
+/**
+ *
+ * @param {import("./genomeSpy.js").default} genomeSpy
+ * @param {import("./types/embedApi.js").EmbedOptions} options options
+ */
+function applyOptions(genomeSpy, options) {
+    if (options.namedDataProvider) {
+        genomeSpy.registerNamedDataProvider(options.namedDataProvider);
+    }
+}
+
+/**
+ * Loads the spec from the given url and sets the baseUrl if it is not
+ * defined in the spec.
+ *
+ * @param {string} url
+ */
+export async function loadSpec(url) {
+    let spec;
+
+    try {
+        spec = /** @type {any} */ (await fetchJson(url));
+    } catch (e) {
+        throw new Error(
+            `Could not load or parse configuration: ${url}, reason: ${e.message}`,
+            { cause: e }
+        );
+    }
+
+    if (!spec.baseUrl) {
+        spec.baseUrl = inferSpecBaseUrl(url);
+    }
+
+    return spec;
+}

package/dist/src/encoder/accessor.d.ts

@@ -1,4 +1,7 @@
 /**
+ * Creates a raw accessor for a single channel definition branch and attaches
+ * metadata used by scale resolution and equality checks.
+ *
  * @param {import("../spec/channel.js").Channel} channel
  * @param {import("../spec/channel.js").ChannelDef | import("../spec/channel.js").Conditional<import("../spec/channel.js").ChannelDef>} channelDef
  * @param {{ createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction }} paramRuntime
@@ -7,18 +10,6 @@
 export function createAccessor(channel: import("../spec/channel.js").Channel, channelDef: import("../spec/channel.js").ChannelDef | import("../spec/channel.js").Conditional<import("../spec/channel.js").ChannelDef>, paramRuntime: {
     createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction;
 }): import("../types/encoder.js").Accessor;
-/**
- * Returns an array of acessors and their predicates. A returned array with
- * a single element indicates that no conditions are present.
- * The default accessor is always the last element in the array.
- *
- * @param {import("../spec/channel.js").Channel} channel
- * @param {import("../spec/channel.js").ChannelDef} channelDef
- * @param {{ createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction }} paramRuntime
- */
-export function createConditionalAccessors(channel: import("../spec/channel.js").Channel, channelDef: import("../spec/channel.js").ChannelDef, paramRuntime: {
-    createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction;
-}): import("../types/encoder.js").Accessor<import("../spec/channel.js").Scalar>[];
 /**
  * @param {import("../types/encoder.js").Accessor} accessor
  * @returns {accessor is import("../types/encoder.js").ScaleAccessor}

package/dist/src/encoder/accessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accessor.d.ts","sourceRoot":"","sources":["../../../src/encoder/accessor.js"],"names":[],"mappings":"AAaA;;;;;GAKG;AACH,wCALW,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,oBAAoB,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,UAAU,CAAC,gBAC3H;IAAE,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,0BAA0B,EAAE,eAAe,CAAA;CAAE,GACxF,OAAO,qBAAqB,EAAE,QAAQ,CAmHlD;AAED;;;;;;;;GAQG;AACH,oDAJW,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,oBAAoB,EAAE,UAAU,gBACvC;IAAE,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,0BAA0B,EAAE,eAAe,CAAA;CAAE,iFAgCpG;AAED;;;GAGG;AACH,0CAHW,OAAO,qBAAqB,EAAE,QAAQ,GACpC,QAAQ,IAAI,OAAO,qBAAqB,EAAE,aAAa,CAInE;AA6DD;;;;;;;;;;GAUG;AACH,+DALG;IAA+D,YAAY,EAAnE,OAAO,oBAAoB,EAAE,gBAAgB;IACpB,MAAM,EAA/B,eAAe;IAC6B,IAAI,GAAhD,OAAO,oBAAoB,EAAE,IAAI;CACzC,GAAU;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAYzD;AAED;;;;GAIG;AACH,+CAJW,OAAO,qBAAqB,EAAE,aAAa,QAC3C,OAAO,oBAAoB,EAAE,IAAI,GAC/B,MAAM,CAgBlB;8BApGY;IACN,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB,GAAG;IACA,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB,GAAG;IACA,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,oBAAoB,EAAE,MAAM,GAAG,OAAO,sBAAsB,EAAE,OAAO,CAAC;CACvF,GAAG;IACA,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,oBAAoB,EAAE,MAAM,GAAG,OAAO,sBAAsB,EAAE,OAAO,CAAC;CACvF"}
+{"version":3,"file":"accessor.d.ts","sourceRoot":"","sources":["../../../src/encoder/accessor.js"],"names":[],"mappings":"AAWA;;;;;;;;GAQG;AACH,wCALW,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,oBAAoB,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,UAAU,CAAC,gBAC3H;IAAE,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,0BAA0B,EAAE,eAAe,CAAA;CAAE,GACxF,OAAO,qBAAqB,EAAE,QAAQ,CAoGlD;AAED;;;GAGG;AACH,0CAHW,OAAO,qBAAqB,EAAE,QAAQ,GACpC,QAAQ,IAAI,OAAO,qBAAqB,EAAE,aAAa,CAInE;AA6DD;;;;;;;;;;GAUG;AACH,+DALG;IAA+D,YAAY,EAAnE,OAAO,oBAAoB,EAAE,gBAAgB;IACpB,MAAM,EAA/B,eAAe;IAC6B,IAAI,GAAhD,OAAO,oBAAoB,EAAE,IAAI;CACzC,GAAU;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAYzD;AAED;;;;GAIG;AACH,+CAJW,OAAO,qBAAqB,EAAE,aAAa,QAC3C,OAAO,oBAAoB,EAAE,IAAI,GAC/B,MAAM,CAgBlB;8BApGY;IACN,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB,GAAG;IACA,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB,GAAG;IACA,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,oBAAoB,EAAE,MAAM,GAAG,OAAO,sBAAsB,EAAE,OAAO,CAAC;CACvF,GAAG;IACA,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,oBAAoB,EAAE,MAAM,GAAG,OAAO,sBAAsB,EAAE,OAAO,CAAC;CACvF"}

package/dist/src/encoder/accessor.js

@@ -4,14 +4,15 @@ import {
     isDatumDef,
     isExprDef,
     isFieldDef,
-    isFieldOrDatumDefWithCondition,
     isValueDef,
-    isValueDefWithCondition,
 } from "./encoder.js";
 import { field } from "../utils/field.js";
-import { isExprRef, makeConstantExprRef } from "../paramRuntime/paramUtils.js";
+import { isExprRef } from "../paramRuntime/paramUtils.js";
 
 /**
+ * Creates a raw accessor for a single channel definition branch and attaches
+ * metadata used by scale resolution and equality checks.
+ *
  * @param {import("../spec/channel.js").Channel} channel
  * @param {import("../spec/channel.js").ChannelDef | import("../spec/channel.js").Conditional<import("../spec/channel.js").ChannelDef>} channelDef
  * @param {{ createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction }} paramRuntime
@@ -24,8 +25,7 @@ export function createAccessor(channel, channelDef, paramRuntime) {
      */
 
     if (!channel) {
-        // TODO: Don't call with an undefined channel
-        return;
+        throw new Error("Cannot create an accessor without a channel.");
     }
 
     /**
@@ -53,23 +53,6 @@ export function createAccessor(channel, channelDef, paramRuntime) {
             }).domainKeyBase;
         }
 
-        if ("param" in channelDef) {
-            // TODO: Figure out how to fix it. Interval selection depends on FIELDS!
-            /*
-            a.predicate = paramRuntime.createExpression(
-                makeSelectionTestExpression(channelDef)
-            );
-            a.predicate.param = channelDef.param;
-            a.predicate.empty = channelDef.empty ?? true;
-            */
-            a.predicate = makeConstantExprRef(false);
-            a.predicate.param = channelDef.param;
-            a.predicate.empty = channelDef.empty ?? true;
-        } else {
-            a.predicate = makeConstantExprRef(true); // Always true (default accessor)
-            a.predicate.empty = false;
-        }
-
         a.equals = (other) => {
             if (!other) {
                 return false;
@@ -89,8 +72,10 @@ export function createAccessor(channel, channelDef, paramRuntime) {
     }
 
     /**
+     * Creates an accessor for a literal value or an expression reference.
      *
      * @param {Scalar | import("../spec/parameter.js").ExprRef} potentialExprRef
+     * @returns {import("../types/encoder.js").Accessor<Scalar>}
      */
     function potentialExprRefToAccessor(potentialExprRef) {
         if (isExprRef(potentialExprRef)) {
@@ -114,10 +99,11 @@ export function createAccessor(channel, channelDef, paramRuntime) {
         try {
             return asAccessor(field(channelDef.field));
         } catch (e) {
-            throw new Error(`Invalid field definition: ${e.message}`);
+            throw new Error(`Invalid field definition: ${e.message}`, {
+                cause: e,
+            });
         }
     } else if (isExprDef(channelDef)) {
-        // TODO: If parameters change, the data should be re-evaluated
         return asAccessor(paramRuntime.createExpression(channelDef.expr));
     } else if (isDatumDef(channelDef)) {
         return potentialExprRefToAccessor(channelDef.datum);
@@ -132,47 +118,6 @@ export function createAccessor(channel, channelDef, paramRuntime) {
     }
 }
 
-/**
- * Returns an array of acessors and their predicates. A returned array with
- * a single element indicates that no conditions are present.
- * The default accessor is always the last element in the array.
- *
- * @param {import("../spec/channel.js").Channel} channel
- * @param {import("../spec/channel.js").ChannelDef} channelDef
- * @param {{ createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction }} paramRuntime
- */
-export function createConditionalAccessors(channel, channelDef, paramRuntime) {
-    /** @type {import("../types/encoder.js").Accessor[]} */
-    const conditionalAccessors = [];
-
-    // TODO: Support an array of conditions
-    if (
-        isFieldOrDatumDefWithCondition(channelDef) ||
-        isValueDefWithCondition(channelDef)
-    ) {
-        const conditions = Array.isArray(channelDef.condition)
-            ? channelDef.condition
-            : [channelDef.condition];
-
-        for (const condition of conditions) {
-            conditionalAccessors.push(
-                createAccessor(channel, condition, paramRuntime)
-            );
-        }
-    }
-
-    conditionalAccessors.push(
-        createAccessor(channel, channelDef, paramRuntime)
-    );
-
-    if (conditionalAccessors.filter((a) => !a.constant).length > 1) {
-        throw new Error(
-            "Only one accessor can be non-constant. Channel: " + channel
-        );
-    }
-    return conditionalAccessors;
-}
-
 /**
  * @param {import("../types/encoder.js").Accessor} accessor
  * @returns {accessor is import("../types/encoder.js").ScaleAccessor}

package/dist/src/encoder/encoder.d.ts

@@ -1,7 +1,35 @@
 /**
- * Creates an object that contains encoders for every channel of a mark
+ * Creates a host-side predicate for selection-driven conditional encoding.
+ * The selection test expression is compiled lazily when the predicate is
+ * first evaluated so encoder construction does not depend on eager selection
+ * materialization.
  *
- * TODO: This method should have a test. But how to mock Mark...
+ * @param {string} param
+ * @param {import("../spec/channel.js").Encoding} encoding
+ * @param {{ findValue: (param: string) => any, createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction }} paramRuntime
+ * @param {boolean} empty
+ * @returns {import("../types/encoder.js").Predicate}
+ */
+export function createSelectionPredicate(param: string, encoding: import("../spec/channel.js").Encoding, paramRuntime: {
+    findValue: (param: string) => any;
+    createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction;
+}, empty: boolean): import("../types/encoder.js").Predicate;
+/**
+ * Creates ordered conditional branches for a channel definition. The last
+ * branch is always the fallback branch.
+ *
+ * @param {import("../spec/channel.js").Channel} channel
+ * @param {import("../spec/channel.js").ChannelDef} channelDef
+ * @param {import("../spec/channel.js").Encoding} encoding
+ * @param {{ createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction, findValue: (param: string) => any }} paramRuntime
+ * @returns {import("../types/encoder.js").EncodingBranch[]}
+ */
+export function createConditionalBranches(channel: import("../spec/channel.js").Channel, channelDef: import("../spec/channel.js").ChannelDef, encoding: import("../spec/channel.js").Encoding, paramRuntime: {
+    createExpression: (expr: string) => import("../paramRuntime/types.js").ExprRefFunction;
+    findValue: (param: string) => any;
+}): import("../types/encoder.js").EncodingBranch[];
+/**
+ * Creates encoders for direct mark-property channels in an encoding object.
  *
  * @param {import("../view/unitView.js").default} unitView
  * @param {import("../spec/channel.js").Encoding} encoding
@@ -18,20 +46,32 @@ export default function createEncoders(unitView: import("../view/unitView.js").d
  */
 export function isNonMarkPropertyChannel(channel: import("../spec/channel.js").Channel): boolean;
 /**
- * @param {import("../types/encoder.js").Accessor[]} accessors
+ * @param {import("../types/encoder.js").Encoder} encoder
+ * @returns {import("../types/encoder.js").Accessor[]}
+ */
+export function getEncoderAccessors(encoder: import("../types/encoder.js").Encoder): import("../types/encoder.js").Accessor[];
+/**
+ * @param {import("../types/encoder.js").Encoder} encoder
+ * @returns {import("../types/encoder.js").Accessor | undefined}
+ */
+export function getEncoderDataAccessor(encoder: import("../types/encoder.js").Encoder): import("../types/encoder.js").Accessor | undefined;
+/**
+ * Creates an encoder from ordered branches. The first matching branch wins.
+ *
+ * @param {import("../types/encoder.js").EncodingBranch[]} branches
  * @param {(channel: import("../spec/channel.js").ChannelWithScale) => import("../types/encoder.js").VegaScale} scaleSource
  * @returns {Encoder}
  */
-export function createSimpleOrConditionalEncoder(accessors: import("../types/encoder.js").Accessor[], scaleSource: (channel: import("../spec/channel.js").ChannelWithScale) => import("../types/encoder.js").VegaScale): import("../types/encoder.js").Encoder;
+export function createSimpleOrConditionalEncoder(branches: import("../types/encoder.js").EncodingBranch[], scaleSource: (channel: import("../spec/channel.js").ChannelWithScale) => import("../types/encoder.js").VegaScale): import("../types/encoder.js").Encoder;
 /**
+ * Wraps a single accessor with optional scale application and encoder metadata.
+ *
  * @param {Accessor} accessor
  * @param {(channel: import("../spec/channel.js").ChannelWithScale) => import("../types/encoder.js").VegaScale} scaleSource
  * @returns {Encoder}
  */
 export function createEncoder(accessor: import("../types/encoder.js").Accessor<import("../spec/channel.js").Scalar>, scaleSource: (channel: import("../spec/channel.js").ChannelWithScale) => import("../types/encoder.js").VegaScale): import("../types/encoder.js").Encoder;
 /**
- * TODO: Move to a more generic place
- *
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  * @returns {channelDef is import("../spec/channel.js").ValueDef}
  */
@@ -47,6 +87,9 @@ export function isFieldDef(channelDef: import("../spec/channel.js").ChannelDef):
  */
 export function isDatumDef(channelDef: import("../spec/channel.js").ChannelDef): channelDef is import("../spec/channel.js").DatumDef;
 /**
+ * Returns true for direct channel definitions that participate in scale
+ * resolution. Conditional wrappers must be unwrapped by the caller first.
+ *
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  * @returns {channelDef is import("../spec/channel.js").ChannelDefWithScale}
  */
@@ -54,12 +97,12 @@ export function isChannelDefWithScale(channelDef: import("../spec/channel.js").C
 /**
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  */
-export function findChannelDefWithScale(channelDef: import("../spec/channel.js").ChannelDef): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").PositionDatumDef | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").ValueDefBase<string | import("../spec/parameter.js").ExprRef> & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").DomainContributionMixins) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").ValueDefBase<number | import("../spec/parameter.js").ExprRef> & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").DomainContributionMixins) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").FieldDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").DatumDef<import("../spec/parameter.js").ExprRef | import("../spec/channel.js").Scalar> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").DomainContributionMixins);
+export function findChannelDefWithScale(channelDef: import("../spec/channel.js").ChannelDef): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").PositionDatumDef | import("../spec/channel.js").MarkPropExprDef<import("../spec/channel.js").Type> | import("../spec/channel.js").Conditional<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>>;
 /**
  * @param {import("../view/unitView.js").default} view
  * @param {import("../spec/channel.js").Channel} channel
  */
-export function getChannelDefWithScale(view: import("../view/unitView.js").default, channel: import("../spec/channel.js").Channel): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").PositionDatumDef | (import("../spec/channel.js").FieldDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").XIndexDef) | (import("../spec/channel.js").ChromPosDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").TypeMixins<"locus"> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").XIndexDef) | (import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").DatumDef<import("../spec/parameter.js").ExprRef | import("../spec/channel.js").Scalar> & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").XIndexDef) | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").TypeForShape>, string>;
+export function getChannelDefWithScale(view: import("../view/unitView.js").default, channel: import("../spec/channel.js").Channel): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").PositionDatumDef | import("../spec/channel.js").MarkPropExprDef<import("../spec/channel.js").Type> | import("../spec/channel.js").Conditional<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>>;
 /**
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  * @returns {channelDef is import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>}

package/dist/src/encoder/encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../src/encoder/encoder.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../src/encoder/encoder.js"],"names":[],"mappings":"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"}