@genome-spy/core 0.72.0 → 0.74.0

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").Conditional<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>> | import("../spec/channel.js").Conditional<import("../spec/channel.js").MarkPropExprDef<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").Conditional<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>> | import("../spec/channel.js").Conditional<import("../spec/channel.js").MarkPropExprDef<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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"}

package/dist/src/encoder/encoder.js

@@ -2,62 +2,155 @@ import {
     isIntervalSelection,
     makeSelectionTestExpression,
 } from "../selection/selection.js";
-import { createConditionalAccessors } from "./accessor.js";
+import { createAccessor } from "./accessor.js";
+import { makeConstantExprRef } from "../paramRuntime/paramUtils.js";
 
 /**
- * TODO: Complete this. Not tested yet.
- *
- * Creates a selection predicate that can be used in conditional encoding.
+ * 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.
  *
  * @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}
  */
-// eslint-disable-next-line no-unused-vars
-function createSelectionPredicate(param, encoding, paramRuntime, empty) {
-    const selection =
-        /** @type {import("../types/selectionTypes.js").Selection} */ (
+export function createSelectionPredicate(param, encoding, paramRuntime, empty) {
+    /**
+     * @typedef {import("../data/flowNode.js").Datum} Datum
+     * @typedef {import("../types/selectionTypes.js").Selection} Selection
+     * @typedef {import("../types/encoder.js").Predicate} Predicate
+     */
+
+    /** @type {import("../paramRuntime/types.js").ExprRefFunction | undefined} */
+    let compiled;
+
+    const fallback = makeConstantExprRef(false);
+
+    const ensureCompiled = () => {
+        if (compiled) {
+            return compiled;
+        }
+
+        const selection = /** @type {Selection | undefined} */ (
             paramRuntime.findValue(param)
         );
-    if (!selection) {
-        throw new Error(`No selection parameter found: ${param}`);
-    }
+        if (!selection) {
+            return fallback;
+        }
 
-    /** @type {Partial<Record<import("../spec/channel.js").PositionalChannel, import("../spec/channel.js").Field>>} */
-    const fields = {};
-    if (isIntervalSelection(selection)) {
-        const channels = Object.keys(selection.intervals);
-        for (const channel of channels) {
-            const channelDef = encoding[channel];
-            if (isFieldDef(channelDef)) {
-                fields[channel] = channelDef.field;
-                continue;
-            } else if ("condition" in channelDef) {
-                const condition = channelDef.condition;
-                if (isFieldDef(condition)) {
-                    fields[channel] = condition.field;
+        /** @type {Partial<Record<import("../spec/channel.js").PositionalChannel, import("../spec/channel.js").Field>>} */
+        const fields = {};
+        if (isIntervalSelection(selection)) {
+            const channels = Object.keys(selection.intervals);
+            for (const channel of channels) {
+                const channelDef = encoding[channel];
+                if (isFieldDef(channelDef)) {
+                    fields[channel] = channelDef.field;
                     continue;
+                } else if (channelDef && "condition" in channelDef) {
+                    const condition = channelDef.condition;
+                    if (isFieldDef(condition)) {
+                        fields[channel] = condition.field;
+                        continue;
+                    }
                 }
+                throw new Error(
+                    `Selection "${param}" has an interval for "${channel}" channel, but could not find a fieldDef: ${JSON.stringify(encoding[channel])}`
+                );
             }
-            throw new Error(
-                `Selection "${param}" has an interval for "${channel}" channel, but could not find a fieldDef: ${JSON.stringify(encoding[channel])}`
-            );
         }
-    }
 
-    const expr = makeSelectionTestExpression(
-        { type: "filter", param, fields, empty },
-        selection
+        const expr = makeSelectionTestExpression(
+            { type: "filter", param, fields, empty },
+            selection
+        );
+
+        compiled = paramRuntime.createExpression(expr);
+        return compiled;
+    };
+
+    /** @type {Predicate} */
+    const predicate = Object.assign(
+        /** @param {Datum} datum */ (datum) => ensureCompiled()(datum),
+        {
+            param,
+            empty: empty ?? true,
+        }
     );
 
-    return paramRuntime.createExpression(expr);
+    return predicate;
 }
 
 /**
- * Creates an object that contains encoders for every channel of a mark
+ * Creates ordered conditional branches for a channel definition. The last
+ * branch is always the fallback branch.
  *
- * TODO: This method should have a test. But how to mock Mark...
+ * @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,
+    channelDef,
+    encoding,
+    paramRuntime
+) {
+    const conditions =
+        isFieldOrDatumDefWithCondition(channelDef) ||
+        isValueDefWithCondition(channelDef)
+            ? Array.isArray(channelDef.condition)
+                ? channelDef.condition
+                : [channelDef.condition]
+            : [];
+
+    const branchChannelDefs = [...conditions, channelDef];
+
+    /** @type {import("../types/encoder.js").EncodingBranch[]} */
+    const branches = branchChannelDefs.map((branchChannelDef, index) => {
+        const condition = conditions[index];
+        const accessor = createAccessor(
+            channel,
+            branchChannelDef,
+            paramRuntime
+        );
+
+        /** @type {import("../types/encoder.js").Predicate} */
+        const predicate = condition?.param
+            ? createSelectionPredicate(
+                  condition.param,
+                  encoding,
+                  paramRuntime,
+                  condition.empty
+              )
+            : Object.assign(
+                  makeConstantExprRef(index === branchChannelDefs.length - 1),
+                  {
+                      empty: false,
+                  }
+              );
+
+        return {
+            accessor,
+            predicate,
+        };
+    });
+
+    if (branches.filter((branch) => !branch.accessor.constant).length > 1) {
+        throw new Error(
+            "Only one accessor can be non-constant. Channel: " + channel
+        );
+    }
+
+    return branches;
+}
+
+/**
+ * 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
@@ -91,9 +184,10 @@ export default function createEncoders(unitView, encoding) {
         const typedChannelDef =
             /** @type {import("../spec/channel.js").ChannelDef} */ (channelDef);
         encoders[typedChannel] = createSimpleOrConditionalEncoder(
-            createConditionalAccessors(
+            createConditionalBranches(
                 typedChannel,
                 typedChannelDef,
+                encoding,
                 unitView.paramRuntime
             ),
             scaleSource
@@ -116,23 +210,46 @@ export function isNonMarkPropertyChannel(channel) {
 }
 
 /**
- * @param {import("../types/encoder.js").Accessor[]} accessors
+ * @param {import("../types/encoder.js").Encoder} encoder
+ * @returns {import("../types/encoder.js").Accessor[]}
+ */
+export function getEncoderAccessors(encoder) {
+    return encoder.branches.map((branch) => branch.accessor);
+}
+
+/**
+ * @param {import("../types/encoder.js").Encoder} encoder
+ * @returns {import("../types/encoder.js").Accessor | undefined}
+ */
+export function getEncoderDataAccessor(encoder) {
+    return encoder.branches.find((branch) => !branch.accessor.constant)
+        ?.accessor;
+}
+
+/**
+ * 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, scaleSource) {
+export function createSimpleOrConditionalEncoder(branches, scaleSource) {
     /**
      * @typedef {import("../types/encoder.js").Encoder} Encoder
-     * @typedef {import("../types/encoder.js").Accessor} Accessor
      * @typedef {import("../data/flowNode.js").Datum} Datum
      */
-    if (accessors.length === 1) {
-        return createEncoder(accessors[0], scaleSource);
+    if (branches.length === 1) {
+        const encoder = createEncoder(branches[0].accessor, scaleSource);
+        return Object.assign(encoder, {
+            branches,
+        });
     }
 
-    const predicates = accessors.map((a) => a.predicate);
+    const predicates = branches.map((branch) => branch.predicate);
 
-    const encoders = accessors.map((a) => createEncoder(a, scaleSource));
+    const encoders = branches.map((branch) =>
+        createEncoder(branch.accessor, scaleSource)
+    );
 
     const encoder = Object.assign(
         (/** @type {Datum} */ datum) => {
@@ -144,12 +261,9 @@ export function createSimpleOrConditionalEncoder(accessors, scaleSource) {
         },
         {
             constant: false,
-            accessors: /** @type {Accessor[]} */ (
-                encoders.map((e) => e.accessors[0])
-            ),
-            dataAccessor: encoders.map((e) => e.dataAccessor).find((a) => a),
+            branches,
             scale: encoders.map((e) => e.scale).find((s) => s),
-            channelDef: accessors.at(-1).channelDef,
+            channelDef: branches.at(-1).accessor.channelDef,
         }
     );
 
@@ -157,6 +271,8 @@ export function createSimpleOrConditionalEncoder(accessors, scaleSource) {
 }
 
 /**
+ * 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}
@@ -189,17 +305,18 @@ export function createEncoder(accessor, scaleSource) {
         {
             scale,
             constant: accessor.constant,
-            accessors: [accessor],
-            dataAccessor: accessor.constant ? undefined : accessor,
-            // TODO: Accessor already has the channelDef
+            branches: [
+                {
+                    accessor,
+                    predicate: makeConstantExprRef(true),
+                },
+            ],
             channelDef,
         }
     );
 }
 
 /**
- * TODO: Move to a more generic place
- *
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  * @returns {channelDef is import("../spec/channel.js").ValueDef}
  */
@@ -224,11 +341,13 @@ export function isDatumDef(channelDef) {
 }
 
 /**
+ * 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}
  */
 export function isChannelDefWithScale(channelDef) {
-    // TODO: Not accurate, fix
     return (
         isFieldDef(channelDef) ||
         isDatumDef(channelDef) ||
@@ -257,11 +376,16 @@ export function findChannelDefWithScale(channelDef) {
  */
 export function getChannelDefWithScale(view, channel) {
     const channelDef = view.mark.encoding[channel];
-    if (!Array.isArray(channelDef) && isChannelDefWithScale(channelDef)) {
-        return channelDef;
+    if (!Array.isArray(channelDef)) {
+        const channelDefWithScale = findChannelDefWithScale(channelDef);
+        if (channelDefWithScale) {
+            return channelDefWithScale;
+        }
     } else {
         throw new Error("Not a channel def with scale!");
     }
+
+    throw new Error("Not a channel def with scale!");
 }
 
 /**

package/dist/src/fonts/bmFontManager.js

@@ -131,7 +131,7 @@ export default class BmFontManager {
 
             fontEntry.texture = await texturePromise;
             fontEntry.metrics = await metricsPromise;
-        } catch (error) {
+        } catch {
             console.warn(
                 `Cannot load font: "${key.family}". Using the embedded default font.`
             );

package/dist/src/full.d.ts

@@ -0,0 +1,2 @@
+export * from "./index.js";
+//# sourceMappingURL=full.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"full.d.ts","sourceRoot":"","sources":["../../src/full.js"],"names":[],"mappings":""}

package/dist/src/full.js

@@ -0,0 +1,2 @@
+// Explicit alias for the default fat core entry point.
+export * from "./index.js";

package/dist/src/genome/assemblyPreflight.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @typedef {import("../spec/scale.js").Scale["assembly"]} AssemblyReference
+ */
+/**
+ * @typedef {object} AssemblyPreflightResult
+ * @prop {AssemblyReference[]} assemblies
+ * @prop {boolean} needsDefaultAssembly
+ */
+/**
+ * @param {import("../view/view.js").default} viewRoot
+ * @returns {AssemblyPreflightResult}
+ */
+export function collectAssembliesFromViewHierarchy(viewRoot: import("../view/view.js").default): AssemblyPreflightResult;
+/**
+ * Ensures that all assemblies required by the given view hierarchy are loaded
+ * before any scale initialization path can run.
+ *
+ * Reminder: call this immediately after view hierarchy creation and before
+ * operations that can implicitly initialize scales (for example, step-based
+ * size resolution, dynamic opacity setup, or encoder initialization).
+ *
+ * @param {import("../view/view.js").default} viewRoot
+ * @param {import("./genomeStore.js").default} genomeStore
+ */
+export function ensureAssembliesForView(viewRoot: import("../view/view.js").default, genomeStore: import("./genomeStore.js").default): Promise<void>;
+export type AssemblyReference = import("../spec/scale.js").Scale["assembly"];
+export type AssemblyPreflightResult = {
+    assemblies: AssemblyReference[];
+    needsDefaultAssembly: boolean;
+};
+//# sourceMappingURL=assemblyPreflight.d.ts.map

package/dist/src/genome/assemblyPreflight.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assemblyPreflight.d.ts","sourceRoot":"","sources":["../../../src/genome/assemblyPreflight.js"],"names":[],"mappings":"AAEA;;GAEG;AAEH;;;;GAIG;AAEH;;;GAGG;AACH,6DAHW,OAAO,iBAAiB,EAAE,OAAO,GAC/B,uBAAuB,CAsBnC;AAED;;;;;;;;;;GAUG;AACH,kDAHW,OAAO,iBAAiB,EAAE,OAAO,eACjC,OAAO,kBAAkB,EAAE,OAAO,iBAgB5C;gCA5DY,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC;;gBAK/C,iBAAiB,EAAE;0BACnB,OAAO"}