@genome-spy/core 0.68.0 → 0.69.0

package/dist/src/view/view.js

@@ -9,14 +9,15 @@ import {
     initPropertyCache,
     invalidatePrefix,
 } from "../utils/propertyCacher.js";
-import { isNumber, isString, span } from "vega-util";
+import { isArray, isNumber, isString, span } from "vega-util";
 import { scaleLog } from "d3-scale";
 import { isFieldDef, getPrimaryChannel } from "../encoder/encoder.js";
 import { concatUrl } from "../utils/url.js";
 import { isDiscrete, bandSpace } from "vega-scale";
 import { peek } from "../utils/arrayUtils.js";
 import ViewError from "./viewError.js";
-import ParamMediator, { isExprRef } from "./paramMediator.js";
+import ViewParamRuntime from "../paramRuntime/viewParamRuntime.js";
+import { isExprRef } from "../paramRuntime/paramUtils.js";
 import { InternMap } from "internmap";
 import { endWithSlash } from "../utils/addBaseUrl.js";
 
@@ -160,15 +161,15 @@ export default class View {
          */
         this.needsAxes = { x: false, y: false };
 
-        /** @type {ParamMediator} */
-        this.paramMediator = new ParamMediator(
-            () => this.dataParent?.paramMediator
+        /** @type {ViewParamRuntime} */
+        this.paramRuntime = new ViewParamRuntime(
+            () => this.dataParent?.paramRuntime
         );
 
         if (spec.params) {
             for (const param of spec.params) {
                 // TODO: If interval selection, validate `encodings` or provides defaults
-                this.paramMediator.registerParam(param);
+                this.paramRuntime.registerParam(param);
             }
         }
 
@@ -178,9 +179,9 @@ export default class View {
             // doesn't make much sense, but it's used in the App's SampleView
             // to set the height to sample facets' height.
             const allocateIfFree = (/** @type {string} */ name) =>
-                this.paramMediator.findMediatorForParam(name)
+                this.paramRuntime.findRuntimeForParam(name)
                     ? undefined
-                    : this.paramMediator.allocateSetter(name, 0);
+                    : this.paramRuntime.allocateSetter(name, 0);
             this.#heightSetter = allocateIfFree("height");
             this.#widthSetter = allocateIfFree("width");
         }
@@ -510,6 +511,7 @@ export default class View {
      *
      * @param {string} type
      * @param {function(BroadcastMessage):void} handler
+     * @returns {() => void}
      */
     _addBroadcastHandler(type, handler) {
         let handlers = this.#broadcastHandlers[type];
@@ -518,6 +520,18 @@ export default class View {
             this.#broadcastHandlers[type] = handlers;
         }
         handlers.push(handler);
+
+        return () => {
+            const currentHandlers = this.#broadcastHandlers[type];
+            if (!currentHandlers) {
+                return;
+            }
+
+            const index = currentHandlers.indexOf(handler);
+            if (index >= 0) {
+                currentHandlers.splice(index, 1);
+            }
+        };
     }
 
     /**
@@ -642,6 +656,8 @@ export default class View {
             this.context.dataFlow.removeDataSource(handle.dataSource);
         }
 
+        this.paramRuntime.dispose();
+
         this.context.dataFlow.loadingStatusRegistry.delete(this);
 
         this.flowHandle = undefined;
@@ -875,7 +891,7 @@ export default class View {
             return isString(title)
                 ? title
                 : isExprRef(title.text)
-                  ? this.paramMediator.evaluateAndGet(title.text.expr)
+                  ? this.paramRuntime.evaluateAndGet(title.text.expr)
                   : title.text;
         }
     }
@@ -940,6 +956,16 @@ function isDynamicOpacity(opacity) {
 }
 
 /**
+ * Builds the effective opacity function for a view.
+ *
+ * The resulting function multiplies parent opacity with one of:
+ * 1. constant opacity (`number`)
+ * 2. zoom-driven dynamic opacity (`DynamicOpacity`) that maps the current
+ *    units-per-pixel metric through a log interpolation
+ * 3. expression-driven opacity (`ExprRef`) that is evaluated reactively
+ *
+ * Dynamic opacity supports scale selection via `channel` (`x`, `y`, or
+ * `"auto"`), where `"auto"` averages available x/y metrics.
  *
  * @param {View} view
  * @returns {function(number):number}
@@ -951,46 +977,197 @@ function createViewOpacityFunction(view) {
         if (isNumber(opacityDef)) {
             return (parentOpacity) => parentOpacity * opacityDef;
         } else if (isDynamicOpacity(opacityDef)) {
-            /** @type {(channel: import("../spec/channel.js").ChannelWithScale) => any} */
-            const getScale = (channel) => {
-                const scale = view.getScaleResolution(channel)?.getScale();
+            /**
+             * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
+             */
+            const getScaleContext = (channel) => {
+                const scaleResolution = view.getScaleResolution(channel);
+                const scale = scaleResolution?.getScale();
                 // Only works on linear scales
                 if (["linear", "index", "locus"].includes(scale?.type)) {
-                    return scale;
+                    return { scale, scaleResolution };
                 }
             };
 
-            const scale = opacityDef.channel
-                ? getScale(opacityDef.channel)
-                : (getScale("x") ?? getScale("y"));
+            const opacityValues = asFiniteNumberArray(
+                opacityDef.values,
+                "opacity.values",
+                view
+            );
 
-            if (!scale) {
+            if (!isArray(opacityDef.unitsPerPixel)) {
                 throw new ViewError(
-                    "Cannot find a resolved quantitative scale for dynamic opacity!",
+                    '"opacity.unitsPerPixel" must be an array.',
                     view
                 );
             }
 
-            const interpolate = scaleLog()
-                .domain(opacityDef.unitsPerPixel)
-                .range(opacityDef.values)
-                .clamp(true);
+            /** @type {function(number): number} */
+            let interpolate = () => 1;
 
-            return (parentOpacity) => {
-                const rangeSpan = 1000; //TODO: span(scale.range());
-                const unitsPerPixel = span(scale.domain()) / rangeSpan;
+            /** @type {(() => number)[]} */
+            let stopReaders = [];
 
-                return interpolate(unitsPerPixel) * parentOpacity;
+            const updateInterpolator = () => {
+                const unitsPerPixel = asFiniteNumberArray(
+                    stopReaders.map((readStop) => readStop()),
+                    "opacity.unitsPerPixel",
+                    view
+                );
+
+                validateDynamicOpacityStops(unitsPerPixel, opacityValues, view);
+
+                const scale = scaleLog()
+                    .domain(unitsPerPixel)
+                    .range(opacityValues)
+                    .clamp(true);
+
+                interpolate = (value) => scale(value);
+            };
+
+            stopReaders = opacityDef.unitsPerPixel.map((stop) => {
+                if (isExprRef(stop)) {
+                    const fn = view.paramRuntime.watchExpression(
+                        stop.expr,
+                        () => {
+                            updateInterpolator();
+                            view.context.animator.requestRender();
+                        }
+                    );
+                    return () => fn(null);
+                } else {
+                    return () => stop;
+                }
+            });
+
+            updateInterpolator();
+
+            /**
+             * @param {{ scale: any, scaleResolution: import("../scales/scaleResolution.js").default }} scaleContext
+             */
+            const getUnitsPerPixel = (scaleContext) => {
+                const axisLength = scaleContext.scaleResolution.getAxisLength();
+                const rangeSpan = axisLength || 1000;
+                return span(scaleContext.scale.domain()) / rangeSpan;
+            };
+
+            /** @type {() => number} */
+            let getMetric;
+
+            if (opacityDef.channel === "auto") {
+                const xScale = getScaleContext("x");
+                const yScale = getScaleContext("y");
+
+                if (xScale && yScale) {
+                    getMetric = () =>
+                        (getUnitsPerPixel(xScale) + getUnitsPerPixel(yScale)) /
+                        2;
+                } else if (xScale) {
+                    getMetric = () => getUnitsPerPixel(xScale);
+                } else if (yScale) {
+                    getMetric = () => getUnitsPerPixel(yScale);
+                } else {
+                    throw new ViewError(
+                        "Cannot find a resolved quantitative x or y scale for dynamic opacity!",
+                        view
+                    );
+                }
+            } else {
+                const scaleContext = opacityDef.channel
+                    ? getScaleContext(opacityDef.channel)
+                    : (getScaleContext("x") ?? getScaleContext("y"));
+
+                if (!scaleContext) {
+                    throw new ViewError(
+                        "Cannot find a resolved quantitative scale for dynamic opacity!",
+                        view
+                    );
+                }
+
+                getMetric = () => getUnitsPerPixel(scaleContext);
+            }
+
+            return (parentOpacity) => {
+                return interpolate(getMetric()) * parentOpacity;
             };
         } else if (isExprRef(opacityDef)) {
-            const fn = view.paramMediator.createExpression(opacityDef.expr);
-            fn.addListener(() => view.context.animator.requestRender());
+            const fn = view.paramRuntime.watchExpression(opacityDef.expr, () =>
+                view.context.animator.requestRender()
+            );
             return (parentOpacity) => fn(null) * parentOpacity;
         }
     }
     return (parentOpacity) => parentOpacity;
 }
 
+/**
+ * @param {number[]} unitsPerPixel
+ * @param {number[]} values
+ * @param {View} view
+ */
+function validateDynamicOpacityStops(unitsPerPixel, values, view) {
+    if (!unitsPerPixel.length) {
+        throw new ViewError(
+            '"opacity.unitsPerPixel" must contain at least one stop.',
+            view
+        );
+    }
+
+    if (unitsPerPixel.length !== values.length) {
+        throw new ViewError(
+            '"opacity.unitsPerPixel" and "opacity.values" must have the same length.',
+            view
+        );
+    }
+
+    unitsPerPixel.forEach((value, index) => {
+        if (value <= 0) {
+            throw new ViewError(
+                "Invalid opacity.unitsPerPixel value at index " +
+                    index +
+                    ". Stop values must be positive.",
+                view
+            );
+        }
+    });
+
+    for (let i = 1; i < unitsPerPixel.length; i++) {
+        if (unitsPerPixel[i - 1] <= unitsPerPixel[i]) {
+            throw new ViewError(
+                '"opacity.unitsPerPixel" must be strictly decreasing.',
+                view
+            );
+        }
+    }
+}
+
+/**
+ * @param {unknown} value
+ * @param {string} label
+ * @param {View} view
+ * @returns {number[]}
+ */
+function asFiniteNumberArray(value, label, view) {
+    if (!isArray(value)) {
+        throw new ViewError('"' + label + '" must evaluate to an array.', view);
+    }
+
+    return value.map((item, index) => {
+        if (!isNumber(item) || !Number.isFinite(item)) {
+            throw new ViewError(
+                "Invalid " +
+                    label +
+                    " value at index " +
+                    index +
+                    ". Expected a finite number.",
+                view
+            );
+        }
+
+        return item;
+    });
+}
+
 /**
  *
  * @param {any} size

package/dist/src/view/viewFactory.d.ts

@@ -16,12 +16,6 @@ export function isLayerSpec(spec: import("../spec/view.js").ViewSpec): spec is i
  * @returns {spec is LayerSpec}
  */
 export function isFacetSpec(spec: import("../spec/view.js").ViewSpec): spec is import("../spec/view.js").LayerSpec;
-/**
- *
- * @param {ViewSpec} spec
- * @returns {spec is import("../spec/view.js").AggregateSamplesSpec}
- */
-export function isAggregateSamplesSpec(spec: import("../spec/view.js").ViewSpec): spec is import("../spec/view.js").AggregateSamplesSpec;
 /**
  *
  * @param {object} spec
@@ -46,12 +40,6 @@ export function isHConcatSpec(spec: import("../spec/view.js").ViewSpec): spec is
  * @returns {spec is ConcatSpec}
  */
 export function isConcatSpec(spec: import("../spec/view.js").ViewSpec): spec is import("../spec/view.js").ConcatSpec;
-/**
- *
- * @param {ViewSpec} spec
- * @returns {spec is SampleSpec}
- */
-export function isSampleSpec(spec: import("../spec/view.js").ViewSpec): spec is import("../spec/sampleView.js").SampleSpec;
 export const VIEW_ROOT_NAME: "viewRoot";
 /**
  * @typedef {object} ViewFactoryOptions

package/dist/src/view/viewFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"viewFactory.d.ts","sourceRoot":"","sources":["../../../src/view/viewFactory.js"],"names":[],"mappings":"AA+SA;;;;GAIG;AACH,sEAFa,IAAI,sCAAY,CAI5B;AAED;;;;GAIG;AACH,uEAFa,IAAI,uCAAa,CAI7B;AAED;;;;GAIG;AACH,uEAFa,IAAI,uCAAa,CAS7B;AAED;;;;GAIG;AACH,kFAFa,IAAI,IAAI,OAAO,iBAAiB,EAAE,oBAAoB,CAQlE;AAED;;;;GAIG;AACH,mCAHW,MAAM,GACJ,IAAI,IAAI,OAAO,iBAAiB,EAAE,UAAU,CAIxD;AAED;;;;GAIG;AACH,yEAFa,IAAI,yCAAe,CAI/B;AAED;;;;GAIG;AACH,yEAFa,IAAI,IAAI,WAAW,CAI/B;AAED;;;;GAIG;AACH,wEAFa,IAAI,wCAAc,CAI9B;AAED;;;;GAIG;AACH,wEAFa,IAAI,8CAAc,CAS9B;AA3XD,6BAA8B,UAAU,CAAC;AAEzC;;;;GAIG;AAEH;;GAEG;AACH;IAiBI;;OAEG;IACH,sBAFW,kBAAkB,EAoC5B;IAjCG,2CAA2C;IAC3C,SADW,QAAQ,CAAC,kBAAkB,CAAC,CAKtC;IA8BL;;;OAGG;IACH,qEAlDiC,OAAO,yHAC2B,OAAO,oBAAoB,EAAE,OAAO,eAAe,OAAO,WAAW,EAAE,OAAO,gBAAgB,MAAM,KAAK,IAAI,QAmD/K;IAED;;;;;;OAMG;IACH,wHAJW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,QAmBhB;IAED;;;;OAIG;IACH,sDAFa,IAAI,sCAAY,CAU5B;IAED;;;;;;;;;;OAUG;IACH,yBAPW,qCAAW,OAAO,iBAAiB,EAAE,UAAU,qEAE/C,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,cACN,CAAC,IAAI,oCAAU,KAAK,IAAI,iBAgGlC;;CACJ;;;;;kBA1Na,OAAO;eACP,OAAO;;iBArBJ,WAAW"}
+{"version":3,"file":"viewFactory.d.ts","sourceRoot":"","sources":["../../../src/view/viewFactory.js"],"names":[],"mappings":"AAwUA;;;;GAIG;AACH,sEAFa,IAAI,sCAAY,CAI5B;AAED;;;;GAIG;AACH,uEAFa,IAAI,uCAAa,CAI7B;AAED;;;;GAIG;AACH,uEAFa,IAAI,uCAAa,CAS7B;AAED;;;;GAIG;AACH,mCAHW,MAAM,GACJ,IAAI,IAAI,OAAO,iBAAiB,EAAE,UAAU,CAIxD;AAED;;;;GAIG;AACH,yEAFa,IAAI,yCAAe,CAI/B;AAED;;;;GAIG;AACH,yEAFa,IAAI,IAAI,WAAW,CAI/B;AAED;;;;GAIG;AACH,wEAFa,IAAI,wCAAc,CAI9B;AAxXD,6BAA8B,UAAU,CAAC;AAEzC;;;;GAIG;AAEH;;GAEG;AACH;IAiBI;;OAEG;IACH,sBAFW,kBAAkB,EAiD5B;IA9CG,2CAA2C;IAC3C,SADW,QAAQ,CAAC,kBAAkB,CAAC,CAKtC;IA2CL;;;OAGG;IACH,qEA/DiC,OAAO,yHAC2B,OAAO,oBAAoB,EAAE,OAAO,eAAe,OAAO,WAAW,EAAE,OAAO,gBAAgB,MAAM,KAAK,IAAI,QAgE/K;IAED;;;;;;OAMG;IACH,wHAJW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,QAyBhB;IAED;;;;OAIG;IACH,sDAFa,IAAI,sCAAY,CAU5B;IAED;;;;;;;;;;OAUG;IACH,yBAPW,qCAAW,OAAO,iBAAiB,EAAE,UAAU,qEAE/C,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,cACN,CAAC,IAAI,oCAAU,KAAK,IAAI,iBAiGlC;;CACJ;;;;;kBA9Oa,OAAO;eACP,OAAO;;iBAtBJ,WAAW"}

package/dist/src/view/viewFactory.js

@@ -8,12 +8,13 @@ import { isArray, isObject, isString } from "vega-util";
 import { loadExternalViewSpec } from "./viewUtils.js";
 import ContainerView from "./containerView.js";
 import ViewError from "./viewError.js";
-import { isSelectionParameter } from "./paramMediator.js";
+import { isSelectionParameter } from "../paramRuntime/paramUtils.js";
 import { asSelectionConfig } from "../selection/selection.js";
 import {
     markViewAsNonAddressable,
     registerImportInstance,
 } from "./viewSelectors.js";
+import { isMultiscaleSpec, normalizeMultiscaleSpec } from "./multiscale.js";
 
 export const VIEW_ROOT_NAME = "viewRoot";
 
@@ -32,9 +33,9 @@ export class ViewFactory {
      * @typedef {import("../spec/view.js").UnitSpec} UnitSpec
      * @typedef {import("../spec/view.js").ViewSpec} ViewSpec
      * @typedef {import("../spec/view.js").LayerSpec} LayerSpec
+     * @typedef {import("../spec/view.js").MultiscaleSpec} MultiscaleSpec
      * @typedef {import("../spec/view.js").VConcatSpec} VConcatSpec
      * @typedef {import("../spec/view.js").ConcatSpec} ConcatSpec
-     * @typedef {import("../spec/sampleView.js").SampleSpec} SampleSpec
      *
      * @typedef {(spec: ViewSpec) => boolean} SpecGuard
      * @typedef {(spec: ViewSpec, context: ViewContext, layoutParent?: import("./containerView.js").default, dataParent?: import("./view.js").default, defaultName?: string) => View} Factory
@@ -69,17 +70,30 @@ export class ViewFactory {
                 );
 
         this.addViewType(isLayerSpec, makeDefaultFactory(LayerView));
+        this.addViewType(
+            isMultiscaleSpec,
+            /** @type {Factory} */ (
+                (spec, context, layoutParent, dataParent, defaultName) =>
+                    /** @type {View} */ (
+                        new LayerView(
+                            normalizeMultiscaleSpec(
+                                /** @type {import("../spec/view.js").MultiscaleSpec} */ (
+                                    spec
+                                )
+                            ),
+                            context,
+                            layoutParent,
+                            dataParent,
+                            defaultName
+                        )
+                    )
+            )
+        );
         this.addViewType(isUnitSpec, makeDefaultFactory(UnitView));
         this.addViewType(isVConcatSpec, makeDefaultFactory(ConcatView));
         this.addViewType(isHConcatSpec, makeDefaultFactory(ConcatView));
         this.addViewType(isConcatSpec, makeDefaultFactory(ConcatView));
         //this.addViewType(isFacetSpec, makeDefaultFactory(FacetView));
-
-        this.addViewType(isSampleSpec, () => {
-            throw new Error(
-                "SampleView is not supported by the @genome-spy/core package. Use @genome-spy/app instead!"
-            );
-        });
     }
 
     /**
@@ -110,6 +124,12 @@ export class ViewFactory {
             }
         }
 
+        if (isSampleSpec(spec)) {
+            throw new Error(
+                "SampleView is not supported by the @genome-spy/core package. Use @genome-spy/app instead!"
+            );
+        }
+
         throw new Error(
             "Invalid spec, cannot figure out the view type from the properties: " +
                 JSON.stringify([...Object.keys(spec)])
@@ -203,6 +223,7 @@ export class ViewFactory {
             this.options.wrapRoot &&
             (isUnitSpec(viewSpec) ||
                 isLayerSpec(viewSpec) ||
+                isMultiscaleSpec(viewSpec) ||
                 hasIntervalSelection(viewSpec)) &&
             defaultName === VIEW_ROOT_NAME
         ) {
@@ -268,6 +289,10 @@ function applyParamsToImportedSpec(importedSpec, importSpec) {
         importedSpec.name = importSpec.name;
     }
 
+    if (importSpec.visible != null) {
+        importedSpec.visible = importSpec.visible;
+    }
+
     const params = isArray(importSpec.params)
         ? importSpec.params
         : isObject(importSpec.params)
@@ -333,19 +358,6 @@ export function isFacetSpec(spec) {
     );
 }
 
-/**
- *
- * @param {ViewSpec} spec
- * @returns {spec is import("../spec/view.js").AggregateSamplesSpec}
- */
-export function isAggregateSamplesSpec(spec) {
-    return (
-        spec &&
-        (isUnitSpec(spec) || isLayerSpec(spec)) &&
-        "aggregateSamples" in spec
-    );
-}
-
 /**
  *
  * @param {object} spec
@@ -384,10 +396,9 @@ export function isConcatSpec(spec) {
 
 /**
  *
- * @param {ViewSpec} spec
- * @returns {spec is SampleSpec}
+ * @param {object} spec
  */
-export function isSampleSpec(spec) {
+function isSampleSpec(spec) {
     return (
         "samples" in spec &&
         isObject(spec.samples) &&

package/dist/src/view/viewParamRuntime.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=viewParamRuntime.test.d.ts.map

package/dist/src/view/viewParamRuntime.test.d.ts.map

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

package/dist/src/view/viewSelectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"viewSelectors.d.ts","sourceRoot":"","sources":["../../../src/view/viewSelectors.js"],"names":[],"mappings":"AA8BA;;;;;GAKG;AACH,6CAHW,OAAO,WAAW,EAAE,OAAO,aAC3B,MAAM,GAAG,IAAI,QAQvB;AAED;;;;;GAKG;AACH,yCAHW,OAAO,WAAW,EAAE,OAAO,GACzB,eAAe,GAAG,SAAS,CAIvC;AAED;;;;;GAKG;AACH,+CAHW,OAAO,WAAW,EAAE,OAAO,YAC3B,kBAAkB,QAM5B;AAED;;;;;GAKG;AACH,wCAHW,OAAO,WAAW,EAAE,OAAO,GACzB,MAAM,EAAE,CAgBpB;AAED;;;;;GAKG;AACH,sCAHW,OAAO,WAAW,EAAE,OAAO,GACzB,YAAY,CAYxB;AAED;;;;;;GAMG;AACH,uCAJW,OAAO,WAAW,EAAE,OAAO,aAC3B,MAAM,GACJ,aAAa,CAazB;AAED;;;;;GAKG;AACH,+CAHW,aAAa,GACX,MAAM,CAQlB;AAED;;;;;GAKG;AACH,0CAHW,OAAO,WAAW,EAAE,OAAO,GACzB,OAAO,WAAW,EAAE,OAAO,EAAE,CAWzC;AAED;;;;;GAKG;AACH,4CAHW,OAAO,WAAW,EAAE,OAAO,WAC3B,OAAO,WAAW,EAAE,OAAO,QAerC;AAED;;;;;;GAMG;AACH,0CAJW,OAAO,WAAW,EAAE,OAAO,YAC3B,YAAY,GACV,OAAO,WAAW,EAAE,OAAO,GAAG,SAAS,CAmCnD;AAED;;;;;;GAMG;AACH,2CAJW,OAAO,WAAW,EAAE,OAAO,YAC3B,aAAa,GACX,aAAa,GAAG,SAAS,CAuCrC;AAED;;;;;GAKG;AACH,8CAHW,OAAO,WAAW,EAAE,OAAO,WAC3B,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,QAyBjD;AAED;;;;;GAKG;AACH,4CAHW,OAAO,WAAW,EAAE,OAAO,GACzB,sBAAsB,EAAE,CAOpC;AAED;;;;;GAKG;AACH,kDAHW,OAAO,WAAW,EAAE,OAAO,GACzB,uBAAuB,EAAE,CAcrC;AArUD;;;;;;GAMG;AAEH;;;;;;;;;GASG;AAEH,wCAAyC,IAAI,CAAC;2BAVjC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE;4BACjC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;qCAClC;IAAE,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE;sCAC/G;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE;8BACpC;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;kCACvB,SAAS,GAAG,gBAAgB;iCAC5B;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE;4BACzB;IAAE,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAA;CAAE"}
+{"version":3,"file":"viewSelectors.d.ts","sourceRoot":"","sources":["../../../src/view/viewSelectors.js"],"names":[],"mappings":"AAiCA;;;;;GAKG;AACH,6CAHW,OAAO,WAAW,EAAE,OAAO,aAC3B,MAAM,GAAG,IAAI,QAQvB;AAED;;;;;GAKG;AACH,yCAHW,OAAO,WAAW,EAAE,OAAO,GACzB,eAAe,GAAG,SAAS,CAIvC;AAED;;;;;GAKG;AACH,+CAHW,OAAO,WAAW,EAAE,OAAO,YAC3B,kBAAkB,QAM5B;AAED;;;;;GAKG;AACH,wCAHW,OAAO,WAAW,EAAE,OAAO,GACzB,MAAM,EAAE,CAgBpB;AAED;;;;;GAKG;AACH,sCAHW,OAAO,WAAW,EAAE,OAAO,GACzB,YAAY,CAYxB;AAED;;;;;;GAMG;AACH,uCAJW,OAAO,WAAW,EAAE,OAAO,aAC3B,MAAM,GACJ,aAAa,CAazB;AAED;;;;;GAKG;AACH,+CAHW,aAAa,GACX,MAAM,CAQlB;AAED;;;;;GAKG;AACH,0CAHW,OAAO,WAAW,EAAE,OAAO,GACzB,OAAO,WAAW,EAAE,OAAO,EAAE,CAWzC;AAED;;;;;GAKG;AACH,4CAHW,OAAO,WAAW,EAAE,OAAO,WAC3B,OAAO,WAAW,EAAE,OAAO,QAerC;AAED;;;;;;GAMG;AACH,0CAJW,OAAO,WAAW,EAAE,OAAO,YAC3B,YAAY,GACV,OAAO,WAAW,EAAE,OAAO,GAAG,SAAS,CAmCnD;AAED;;;;;;GAMG;AACH,2CAJW,OAAO,WAAW,EAAE,OAAO,YAC3B,aAAa,GACX,aAAa,GAAG,SAAS,CAuCrC;AAED;;;;;GAKG;AACH,8CAHW,OAAO,WAAW,EAAE,OAAO,WAC3B,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,QAyBjD;AAED;;;;;GAKG;AACH,4CAHW,OAAO,WAAW,EAAE,OAAO,GACzB,sBAAsB,EAAE,CAOpC;AAED;;;;;GAKG;AACH,kDAHW,OAAO,WAAW,EAAE,OAAO,GACzB,uBAAuB,EAAE,CAcrC;AArUD;;;;;;GAMG;AAEH;;;;;;;;;GASG;AAEH,wCAAyC,IAAI,CAAC;2BAVjC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE;4BACjC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE;qCAClC;IAAE,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE;sCAC/G;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE;8BACpC;IAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE;kCACvB,SAAS,GAAG,gBAAgB;iCAC5B;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE;4BACzB;IAAE,IAAI,EAAE,OAAO,WAAW,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAA;CAAE"}

package/dist/src/view/viewSelectors.js

@@ -1,5 +1,8 @@
 import { VISIT_SKIP, VISIT_STOP } from "./view.js";
-import { isSelectionParameter, isVariableParameter } from "./paramMediator.js";
+import {
+    isSelectionParameter,
+    isVariableParameter,
+} from "../paramRuntime/paramUtils.js";
 
 /**
  * Selectors identify views and parameters in a way that stays stable when the
@@ -237,7 +240,7 @@ export function resolveParamSelector(root, selector) {
     const matches = [];
 
     visitViewsInScope(scopeRoot, (view) => {
-        for (const [name, param] of view.paramMediator.paramConfigs) {
+        for (const [name, param] of view.paramRuntime.paramConfigs) {
             if (name !== selector.param) {
                 continue;
             }
@@ -281,7 +284,7 @@ export function visitBookmarkableParams(root, visitor) {
             return;
         }
 
-        for (const [name, param] of view.paramMediator.paramConfigs) {
+        for (const [name, param] of view.paramRuntime.paramConfigs) {
             if (!isBookmarkableParam(param)) {
                 continue;
             }
@@ -530,7 +533,7 @@ function validateParamNamesInScope(scopeRoot, scope, issues) {
     const names = new Map();
 
     visitViewsInScope(scopeRoot, (view) => {
-        for (const [name, param] of view.paramMediator.paramConfigs) {
+        for (const [name, param] of view.paramRuntime.paramConfigs) {
             if (!isBookmarkableParam(param)) {
                 continue;
             }
@@ -672,7 +675,7 @@ function hasAddressableFeatures(root) {
                 return VISIT_STOP;
             }
 
-            for (const param of view.paramMediator.paramConfigs.values()) {
+            for (const param of view.paramRuntime.paramConfigs.values()) {
                 if (isBookmarkableParam(param)) {
                     found = true;
                     return VISIT_STOP;

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.68.0",
+  "version": "0.69.0",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -30,7 +30,7 @@
     "build": "rm -rf dist && mkdir -p dist && node scripts/build.mjs && vite build && npm run build:schema && npm run build:typings",
     "prepublishOnly": "npm run build",
     "test:tsc": "tsc -p tsconfig.json --noEmit",
-    "build:schema": "mkdir -p dist && ts-json-schema-generator --path 'src/spec/*.ts' --type RootSpec > dist/schema.json",
+    "build:schema": "mkdir -p dist && ts-json-schema-generator --path 'src/spec/*.ts' --type CoreRootSpec > dist/schema.json",
     "build:typings": "tsc -p tsconfig.json --declaration --emitDeclarationOnly --declarationMap --outDir dist/src",
     "prepack": "node scripts/prepack.mjs",
     "postpack": "node scripts/postpack.mjs"
@@ -67,5 +67,5 @@
   "devDependencies": {
     "@types/long": "^4.0.1"
   },
-  "gitHead": "74e4d56c67c8aa0da1884b16ff29185b16d418c3"
+  "gitHead": "bfb9bd98ceb875f90a458b876208b15b6c12c9f3"
 }