@genome-spy/core 0.48.2 → 0.49.0

package/dist/src/view/axisResolution.js

@@ -13,9 +13,18 @@ import coalesce from "../utils/coalesce.js";
 import mergeObjects from "../utils/mergeObjects.js";
 import { getCachedOrCall } from "../utils/propertyCacher.js";
 
+/**
+ * @template {import("../spec/channel.js").PositionalChannel}[T=PositionalChannel]
+ *
+ * @typedef {object} AxisResolutionMember
+ * @prop {import("./unitView.js").default} view
+ * @prop {T} channel
+ * @prop {import("../spec/channel.js").ChannelDefWithScale} channelDef
+ */
 export default class AxisResolution {
     /**
-     * @typedef { import("./unitView.js").default} UnitView
+     * @typedef {import("./unitView.js").default} UnitView
+     * @typedef {import("../spec/channel.js").PositionalChannel} PositionalChannel
      */
 
     /**
@@ -23,7 +32,7 @@ export default class AxisResolution {
      */
     constructor(channel) {
         this.channel = channel;
-        /** @type {import("./scaleResolution.js").ResolutionMember<import("../spec/channel.js").PositionalChannel>[]} The involved views */
+        /** @type {AxisResolutionMember[]} The involved views */
         this.members = [];
     }
 
@@ -35,10 +44,10 @@ export default class AxisResolution {
      * N.B. This is expected to be called in depth-first order, AFTER the
      * scales have been resolved.
      *
-     * @param {UnitView} view
-     * @param {import("../spec/channel.js").PositionalChannel} channel TODO: Do something for this
+     * @param {AxisResolutionMember} newMember
      */
-    pushUnitView(view, channel) {
+    pushUnitView(newMember) {
+        const { view } = newMember;
         const newScaleResolution = view.getScaleResolution(this.channel);
 
         if (!newScaleResolution) {
@@ -52,7 +61,7 @@ export default class AxisResolution {
             throw new Error("Shared axes must have a shared scale!");
         }
 
-        this.members.push({ view, channel });
+        this.members.push(newMember);
     }
 
     getAxisProps() {
@@ -81,7 +90,7 @@ export default class AxisResolution {
     }
 
     getTitle() {
-        /** @param {import("./scaleResolution.js").ResolutionMember} member} */
+        /** @param {AxisResolutionMember} member} */
         const computeTitle = (member) => {
             const channelDef = getChannelDefWithScale(
                 member.view,

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

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

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

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

package/dist/src/view/axisResolution.test.js

@@ -35,19 +35,17 @@ const spec = {
 };
 
 describe("Axes resolve properly", () => {
-    const sharedSpec = {
-        ...spec,
-        resolve: { scale: { y: "shared" }, axis: { y: "shared" } },
-    };
-
     test("Independent axes are independent", async () => {
-        const independentSpec = {
-            ...spec,
-            resolve: { scale: { y: "shared" }, axis: { y: "independent" } },
-        };
+        const view = await createAndInitialize(
+            {
+                ...spec,
+                resolve: { scale: { y: "shared" }, axis: { y: "independent" } },
+            },
+            View
+        );
 
-        const view = await createAndInitialize(independentSpec, View);
         const [r0, r1] = [0, 1].map((i) =>
+            // @ts-ignore
             view.children[i].getAxisResolution("y")
         );
 
@@ -57,7 +55,14 @@ describe("Axes resolve properly", () => {
     });
 
     test("Shared axes have joined titles", async () => {
-        const view = await createAndInitialize(sharedSpec, View);
+        const view = await createAndInitialize(
+            {
+                ...spec,
+                resolve: { scale: { y: "shared" }, axis: { y: "shared" } },
+            },
+            View
+        );
+        // @ts-ignore
         expect(view.children[0].getAxisResolution("y").getTitle()).toEqual(
             "a, b"
         );

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

@@ -45,7 +45,7 @@ export default class FacetView extends ContainerView {
      *
      * @param {"row" | "column"} channel
      */
-    getAccessor(channel: "row" | "column"): import("../types/encoder.js").Accessor;
+    getAccessor(channel: "row" | "column"): any;
     updateFacets(): void;
     updateLabels(): void;
     getFacetGroups(): any[];

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

@@ -1 +1 @@
-{"version":3,"file":"facetView.d.ts","sourceRoot":"","sources":["../../../src/view/facetView.js"],"names":[],"mappings":"AAmDA;;;;;;;;;;;;;;GAcG;AACH;IACI;;;;;;;OAOG;IACH;;;;;;OAMG;IACH,6CAHW,aAAa,QACb,MAAM,EA8BhB;IAzBG,UAAgB;IAEhB,WAEC;IAED;;;;OAIG;IACH,aAFU,OAAO,YAAY,EAAE,QAAQ,CAAC,CAYvC;IAED,oDAAoD;IACpD,kBADY,OAAO,YAAY,EAAE,cAAc,CAAC,CACa;IA2BjE,sBAIC;IAED;;;OAGG;IACH,qBAFW,KAAK,GAAG,QAAQ,0CAwB1B;IAED,qBAyCC;IAED,qBASC;IA6BD,wBAgBC;IAOD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,uBA4LjD;IA3KO,wBAA0B;CA4KrC;2BA/bY,QAAQ,GAAG,KAAK;;;;;;aA4CnB,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;;;0BA1Df,oBAAoB;qBACzB,eAAe"}
+{"version":3,"file":"facetView.d.ts","sourceRoot":"","sources":["../../../src/view/facetView.js"],"names":[],"mappings":"AAmDA;;;;;;;;;;;;;;GAcG;AACH;IACI;;;;;;;OAOG;IACH;;;;;;OAMG;IACH,6CAHW,aAAa,QACb,MAAM,EA8BhB;IAzBG,UAAgB;IAEhB,WAEC;IAED;;;;OAIG;IACH,aAFU,OAAO,YAAY,EAAE,QAAQ,CAAC,CAYvC;IAED,oDAAoD;IACpD,kBADY,OAAO,YAAY,EAAE,cAAc,CAAC,CACa;IA2BjE,sBAIC;IAED;;;OAGG;IACH,qBAFW,KAAK,GAAG,QAAQ,OAwB1B;IAED,qBAyCC;IAED,qBASC;IA6BD,wBAgBC;IAOD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,uBA4LjD;IA3KO,wBAA0B;CA4KrC;2BA/bY,QAAQ,GAAG,KAAK;;;;;;aA4CnB,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;;;0BA1Df,oBAAoB;qBACzB,eAAe"}

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

@@ -13,7 +13,7 @@ export function buildDataFlow(root: import("./view.js").default, existingFlow?:
  */
 export function linearizeLocusAccess(view: import("./view.js").default): {
     transforms: import("../data/flowNode.js").default[];
-    rewrittenEncoding: import("../spec/channel.js").Encoding<string>;
+    rewrittenEncoding: import("../spec/channel.js").Encoding;
     /**
      * Should be called after the whole flow has been created in order to
      * not disrupt inheritance of encodings

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

@@ -1 +1 @@
-{"version":3,"file":"flowBuilder.d.ts","sourceRoot":"","sources":["../../../src/view/flowBuilder.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,8JAkKC;AAED;;;;;;GAMG;AACH;;;IAgGc;;;OAGG;;EAYhB;AAgCD;;;;;;GAMG;AACH;;;0BAqB0B,QAAQ,SAAS,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC;EAkB/E;qBA/XoB,qBAAqB;sBANpB,sBAAsB"}
+{"version":3,"file":"flowBuilder.d.ts","sourceRoot":"","sources":["../../../src/view/flowBuilder.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,8JA+LC;AAED;;;;;;GAMG;AACH;;;IAgGc;;;OAGG;;EAYhB;AAgCD;;;;;;GAMG;AACH;;;0BAqB0B,QAAQ,SAAS,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC;EAkB/E;qBA5ZoB,qBAAqB;sBANpB,sBAAsB"}

package/dist/src/view/flowBuilder.js

@@ -35,6 +35,8 @@ export function buildDataFlow(root, existingFlow) {
 
     /** @type {FlowNode[]} "Current nodes" on the path from view root to the current view */
     const nodeStack = [];
+    /** @type {{view: View, nodeStackDepth: number}[]} */
+    const viewStack = [];
 
     /** @type {FlowNode} */
     let currentNode;
@@ -59,6 +61,7 @@ export function buildDataFlow(root, existingFlow) {
         }
         currentNode.addChild(node);
         currentNode = node;
+        nodeStack.push(node);
         return node;
     }
 
@@ -108,10 +111,16 @@ export function buildDataFlow(root, existingFlow) {
         }
     }
 
+    function isInBranchWithIdentifier() {
+        return (
+            nodeStack.findLastIndex(
+                (node) => node instanceof IdentifierTransform
+            ) > nodeStack.findLastIndex((node) => node instanceof DataSource)
+        );
+    }
+
     /** @param {View} view */
     const processView = (view) => {
-        nodeStack.push(currentNode);
-
         if (view.spec.data) {
             const dataSource = isNamedData(view.spec.data)
                 ? new NamedSource(
@@ -122,6 +131,7 @@ export function buildDataFlow(root, existingFlow) {
                 : createDataSource(view.spec.data, view);
 
             currentNode = dataSource;
+            nodeStack.push(dataSource);
             dataFlow.addDataSource(dataSource, view);
         }
 
@@ -148,13 +158,24 @@ export function buildDataFlow(root, existingFlow) {
                 }
             }
 
-            if (view.mark.isPickingParticipant()) {
+            if (
+                view.mark.isPickingParticipant() &&
+                !isInBranchWithIdentifier()
+            ) {
+                // TODO: If two branches receive the same data, they should have
+                // a shared identifier transform. However, unique ids cannot be
+                // assigned right after the data source, because some transforms,
+                // (e.g, RegexFold) may generate new tuples.
+                //
                 appendTransform(new CloneTransform());
                 appendTransform(
                     new IdentifierTransform({ type: "identifier" })
                 );
             }
 
+            // TODO: Handle cases where the spec contains terminal collector nodes
+            // (with custom sort configuration, for example). Now a new collector
+            // is always appended to the end of the current branch.
             const collector = new Collector({
                 type: "collect",
                 groupby: view.getFacetFields(),
@@ -178,10 +199,18 @@ export function buildDataFlow(root, existingFlow) {
 
     for (const dataTree of dataTrees) {
         visitTree(dataTree, {
-            preOrder: (node) => processView(node.ref),
+            preOrder: (node) => {
+                viewStack.push({
+                    view: node.ref,
+                    nodeStackDepth: nodeStack.length,
+                });
+                processView(node.ref);
+            },
             // eslint-disable-next-line no-loop-func
             postOrder: () => {
-                currentNode = nodeStack.pop();
+                const { nodeStackDepth } = viewStack.pop();
+                nodeStack.length = nodeStackDepth;
+                currentNode = nodeStack.at(-1);
             },
         });
     }

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

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

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

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

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

@@ -66,12 +66,6 @@ export default class GridView extends ContainerView {
      * @protected
      */
     protected createAxes(): Promise<void[]>;
-    /**
-     * @param {import("./renderingContext/viewRenderingContext.js").default} context
-     * @param {import("./layout/rectangle.js").default} coords
-     * @param {import("../types/rendering.js").RenderingOptions} [options]
-     */
-    render(context: import("./renderingContext/viewRenderingContext.js").default, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
     #private;
 }
 export class GridChild {

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

@@ -1 +1 @@
-{"version":3,"file":"gridView.d.ts","sourceRoot":"","sources":["../../../src/view/gridView.js"],"names":[],"mappings":"AAswBA;;;GAGG;AACH,iDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CAwB9C;AAED;;;GAGG;AACH,uDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CA6C9C;AA2BD;;GAEG;AACH,8EAUC;AAED;;;;;GAKG;AACH,4CAJW,OAAO,uBAAuB,EAAE,OAAO,UACvC,OAAO,iBAAiB,EAAE,UAAU,YACpC,QAAQ,aAmBlB;AA53BD;;;;;;;;;;;;;;;GAeG;AACH;IA6BI;;;;;;;;;OASG;IACH,kBARW,OAAO,iBAAiB,EAAE,aAAa,WACvC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,iDAEb,MAAM,WACN,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAoBzC;IARG,8CAAgB;IAOhB,uBAA0B;IAG9B;;OAEG;IACH,qDAIC;IAeD;;OAEG;IACH,wDAKC;IAqBD;;OAEG;IACH,8CAEC;IAED,yBAEC;IAED;;OAEG;IACH,wCAmCC;IA2OD;;;;OAIG;IAEH,gBALW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,uBAAuB,EAAE,gBAAgB,QA6O1D;;CAoGJ;AAgJD;IACI;;;;OAIG;IACH,6DAHW,aAAa,UACb,MAAM,EAoFhB;IAjFG,4BAAgC;IAChC,kCAAgB;IAChB,eAAoB;IAEpB,uBAAuB;IACvB,YADW,QAAQ,CACQ;IAE3B,uBAAuB;IACvB,kBADW,QAAQ,CACc;IAEjC,mFAAmF;IACnF,MADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAC5D;IAEd,4FAA4F;IAC5F,WADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAC3D;IAEnB,0DAA0D;IAC1D,kEAAoB;IAEpB,uBAAuB;IACvB,OADW,QAAQ,CACG;IAEtB,wBAAwB;IACxB,QADW,SAAS,CACQ;IA4DhC,uEAcC;IAED;;OAEG;IACH,4BAkKC;IAED,uBAqBC;IAED,iCAEC;CACJ;qBAlrC0D,eAAe;sBAFpD,uBAAuB;0BAGnB,oBAAoB;qBAGzB,eAAe;yBALX,mBAAmB;AAqrC5C;IAeI;;;OAGG;IACH,uBAHW,SAAS,8CA6FnB;IAhGD,uBAAmB;IAsCf;;;MAAoB;IAIpB;;;;MAQC;IAgDL,2BAKC;IAWD;;;;OAIG;IACH,gCAHW,SAAS,UACT,SAAS,QA8CnB;;CACJ;oBAx2CmB,qBAAqB"}
+{"version":3,"file":"gridView.d.ts","sourceRoot":"","sources":["../../../src/view/gridView.js"],"names":[],"mappings":"AAswBA;;;GAGG;AACH,iDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CAwB9C;AAED;;;GAGG;AACH,uDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CA6C9C;AA2BD;;GAEG;AACH,8EAUC;AAED;;;;;GAKG;AACH,4CAJW,OAAO,uBAAuB,EAAE,OAAO,UACvC,OAAO,iBAAiB,EAAE,UAAU,YACpC,QAAQ,aAmBlB;AA53BD;;;;;;;;;;;;;;;GAeG;AACH;IA6BI;;;;;;;;;OASG;IACH,kBARW,OAAO,iBAAiB,EAAE,aAAa,WACvC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,iDAEb,MAAM,WACN,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAoBzC;IARG,8CAAgB;IAOhB,uBAA0B;IAG9B;;OAEG;IACH,qDAIC;IAeD;;OAEG;IACH,wDAKC;IAqBD;;OAEG;IACH,8CAEC;IAED,yBAEC;IAED;;OAEG;IACH,wCAmCC;;CA+jBJ;AAgJD;IACI;;;;OAIG;IACH,6DAHW,aAAa,UACb,MAAM,EAoFhB;IAjFG,4BAAgC;IAChC,kCAAgB;IAChB,eAAoB;IAEpB,uBAAuB;IACvB,YADW,QAAQ,CACQ;IAE3B,uBAAuB;IACvB,kBADW,QAAQ,CACc;IAEjC,mFAAmF;IACnF,MADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAC5D;IAEd,4FAA4F;IAC5F,WADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAC3D;IAEnB,0DAA0D;IAC1D,kEAAoB;IAEpB,uBAAuB;IACvB,OADW,QAAQ,CACG;IAEtB,wBAAwB;IACxB,QADW,SAAS,CACQ;IA4DhC,uEAcC;IAED;;OAEG;IACH,4BAkKC;IAED,uBAqBC;IAED,iCAEC;CACJ;qBAlrC0D,eAAe;sBAFpD,uBAAuB;0BAGnB,oBAAoB;qBAGzB,eAAe;yBALX,mBAAmB;AAqrC5C;IAeI;;;OAGG;IACH,uBAHW,SAAS,8CA6FnB;IAhGD,uBAAmB;IAsCf;;;MAAoB;IAIpB;;;;MAQC;IAgDL,2BAKC;IAWD;;;;OAIG;IACH,gCAHW,SAAS,UACT,SAAS,QA8CnB;;CACJ;oBAx2CmB,qBAAqB"}

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

@@ -11,12 +11,6 @@ export default class LayerView extends ContainerView {
     constructor(spec: import("../spec/view.js").LayerSpec, context: import("../types/viewContext.js").default, layoutParent: ContainerView, dataParent: import("./view.js").default, name: string, options?: import("./view.js").ViewOptions);
     spec: import("../spec/view.js").LayerSpec;
     get children(): (import("./unitView.js").default | LayerView)[];
-    /**
-     * @param {import("./renderingContext/viewRenderingContext.js").default} context
-     * @param {import("./layout/rectangle.js").default} coords
-     * @param {import("../types/rendering.js").RenderingOptions} [options]
-     */
-    render(context: import("./renderingContext/viewRenderingContext.js").default, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
     #private;
 }
 import ContainerView from "./containerView.js";

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

@@ -1 +1 @@
-{"version":3,"file":"layerView.d.ts","sourceRoot":"","sources":["../../../src/view/layerView.js"],"names":[],"mappings":"AAIA;IAQI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,SAAS,WACnC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,cACb,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAQzC;IAHG,0CAAgB;IAoCpB,gEAEC;IAWD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,uBAAuB,EAAE,gBAAgB,QAgB1D;;CAeJ;0BA1GyB,oBAAoB"}
+{"version":3,"file":"layerView.d.ts","sourceRoot":"","sources":["../../../src/view/layerView.js"],"names":[],"mappings":"AAIA;IAQI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,SAAS,WACnC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,cACb,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAQzC;IAHG,0CAAgB;IAoCpB,gEAEC;;CA6CJ;0BA1GyB,oBAAoB"}

package/dist/src/view/layout/flexLayout.test.d.ts

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

package/dist/src/view/layout/flexLayout.test.d.ts.map

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

package/dist/src/view/layout/grid.test.d.ts

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

package/dist/src/view/layout/grid.test.d.ts.map

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

package/dist/src/view/layout/rectangle.test.d.ts

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

package/dist/src/view/layout/rectangle.test.d.ts.map

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

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

@@ -11,7 +11,17 @@ export function isExprRef(x: any): x is import("../spec/parameter.js").ExprRef;
  * @template T
  * @returns {T}
  */
-export function withoutExprRef<T>(x: T | import("../spec/parameter.js").ExprRef): T;
+export function withoutExprRef<T>(x: import("../spec/parameter.js").ExprRef | T): T;
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").VariableParameter}
+ */
+export function isVariableParameter(param: import("../spec/parameter.js").Parameter): param is import("../spec/parameter.js").VariableParameter;
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").SelectionParameter}
+ */
+export function isSelectionParameter(param: import("../spec/parameter.js").Parameter): param is import("../spec/parameter.js").SelectionParameter<import("../spec/parameter.js").SelectionType>;
 /**
  * Takes a record of properties that may have ExprRefs as values. Converts the
  * ExprRefs to getters and setups a listener that is called when any of the
@@ -24,6 +34,23 @@ export function withoutExprRef<T>(x: T | import("../spec/parameter.js").ExprRef)
  * @template {Record<string, any | import("../spec/parameter.js").ExprRef>} T
  */
 export function activateExprRefProps<T extends Record<string, any>>(paramMediator: ParamMediator, props: T, listener?: (props: (keyof T)[]) => void): T;
+/**
+ * Validates a parameter name. If the name is invalid, throws an error.
+ * Otherwise, returns the name.
+ *
+ * @param {string} name
+ * @returns {string} the name
+ */
+export function validateParameterName(name: string): string;
+/**
+ * Creates a function that always returns the same value.
+ * Provides functionality for creating a constant expression reference.
+ * They just do nothing.
+ *
+ * @param {any} value
+ * @returns {ExprRefFunction}
+ */
+export function makeConstantExprRef(value: any): ExprRefFunction;
 /**
  * A class that manages parameters and expressions.
  * Supports nesting and scoped parameters.
@@ -44,10 +71,10 @@ export default class ParamMediator {
      */
     protected paramListeners: Map<string, Set<() => void>>;
     /**
-     * @param {VariableParameter} param
+     * @param {Parameter} param
      * @returns {ParameterSetter}
      */
-    registerParam(param: import("../spec/parameter.js").VariableParameter): (value: any) => void;
+    registerParam(param: import("../spec/parameter.js").Parameter): (value: any) => void;
     /**
      *
      * @param {string} paramName
@@ -75,7 +102,7 @@ export default class ParamMediator {
     /**
      * Returns configs for all parameters that have been registered using `registerParam`.
      */
-    get paramConfigs(): ReadonlyMap<string, import("../spec/parameter.js").VariableParameter>;
+    get paramConfigs(): ReadonlyMap<string, import("../spec/parameter.js").Parameter>;
     /**
      *
      * @param {string} paramName
@@ -101,7 +128,7 @@ export default class ParamMediator {
  * A class that manages parameters and expressions.
  * Supports nesting and scoped parameters.
  */
-export type ExprRefFunction = ((datum?: object) => any) & import("../utils/expression.js").ExpressionProps & {
+export type ExprRefFunction = ((datum?: import("../data/flowNode.js").Datum) => any) & import("../utils/expression.js").ExpressionProps & {
     addListener: (listener: () => void) => void;
     invalidate: () => void;
     identifier: () => string;

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

@@ -1 +1 @@
-{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"AAuQA;;;GAGG;AACH,6BAHW,GAAG,+CAKb;AAED;;;;;;;GAOG;AACH,oFASC;AAED;;;;;;;;;;GAUG;AACH,mFANW,aAAa,+CAEW,IAAI,KAwCtC;AA9UD;;;;;GAKG;AACH;IA2BI;;;;;OAKG;IACH,2BALW,MAAM,aAAa,EAU7B;IA7BD;;;OAGG;IACH,0BAHU,IAAI,MAAM,EAAE,IAAI,MAAM,IAAI,CAAC,CAAC,CAGvB;IA2Bf;;;OAGG;IACH,gFAzCqB,GAAG,KAAK,IAAI,CAkEhC;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,6BAEN,OAAO,iBACS,IAAI,CA8B9B;IAED;;;OAGG;IACH,qBAFW,MAAM,WA/Fc,GAAG,KAAK,IAAI,CAuG1C;IAED;;;OAGG;IACH,oBAFW,MAAM,OAIhB;IAED;;;OAGG;IACH,qBAFW,MAAM,OAKhB;IAED;;OAEG;IACH,0FAIC;IAED;;;;;OAKG;IACH,0CAJW,MAAM,GACJ,aAAa,CASzB;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBA4EhB;IAED;;;;OAIG;IACH,qBAFW,MAAM,OAKhB;;CACJ;;;;;;4BA9P4F,MAAM,IAAI,KAAK,IAAI;gBAAc,MAAM,IAAI;gBAAc,MAAM,MAAM"}
+{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"AA2SA;;;GAGG;AACH,6BAHW,GAAG,+CAKb;AAED;;;;;;;GAOG;AACH,oFASC;AAED;;;GAGG;AACH,gJAEC;AAED;;;GAGG;AACH,gMAEC;AAED;;;;;;;;;;GAUG;AACH,mFANW,aAAa,+CAEW,IAAI,KAwCtC;AAED;;;;;;GAMG;AACH,4CAHW,MAAM,GACJ,MAAM,CAUlB;AAED;;;;;;;GAOG;AACH,2CAHW,GAAG,GACD,eAAe,CAW3B;AAraD;;;;;GAKG;AACH;IA2BI;;;;;OAKG;IACH,2BALW,MAAM,aAAa,EAU7B;IA7BD;;;OAGG;IACH,0BAHU,IAAI,MAAM,EAAE,IAAI,MAAM,IAAI,CAAC,CAAC,CAGvB;IA2Bf;;;OAGG;IACH,wEAzCqB,GAAG,KAAK,IAAI,CAmGhC;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,6BAEN,OAAO,iBACS,IAAI,CAgC9B;IAED;;;OAGG;IACH,qBAFW,MAAM,WAlIc,GAAG,KAAK,IAAI,CA0I1C;IAED;;;OAGG;IACH,oBAFW,MAAM,OAIhB;IAED;;;OAGG;IACH,qBAFW,MAAM,OAKhB;IAED;;OAEG;IACH,kFAIC;IAED;;;;;OAKG;IACH,0CAJW,MAAM,GACJ,aAAa,CASzB;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBA4EhB;IAED;;;;OAIG;IACH,qBAFW,MAAM,OAKhB;;CACJ;;;;;;4BAjS4F,MAAM,IAAI,KAAK,IAAI;gBAAc,MAAM,IAAI;gBAAc,MAAM,MAAM"}

package/dist/src/view/paramMediator.js

@@ -1,5 +1,6 @@
 import { isString } from "vega-util";
 import createFunction from "../utils/expression.js";
+import { createSinglePointSelection } from "../selection/selection.js";
 
 /**
  * A class that manages parameters and expressions.
@@ -9,7 +10,7 @@ import createFunction from "../utils/expression.js";
  */
 export default class ParamMediator {
     /**
-     * @typedef {import("../spec/parameter.js").VariableParameter} VariableParameter
+     * @typedef {import("../spec/parameter.js").Parameter} Parameter
      * @typedef {(value: any) => void} ParameterSetter
      */
 
@@ -28,7 +29,7 @@ export default class ParamMediator {
     /** @type {Map<string, ExprRefFunction>} */
     #expressions = new Map();
 
-    /** @type {Map<string, VariableParameter>} */
+    /** @type {Map<string, Parameter>} */
     #paramConfigs = new Map();
 
     /** @type {() => ParamMediator} */
@@ -48,32 +49,65 @@ export default class ParamMediator {
     }
 
     /**
-     * @param {VariableParameter} param
+     * @param {Parameter} param
      * @returns {ParameterSetter}
      */
     registerParam(param) {
+        const name = param.name;
+
         if ("value" in param && "expr" in param) {
             throw new Error(
-                "Parameter must not have both value and expr: " + param.name
+                `The parameter "${name}" must not have both value and expr properties!`
             );
         }
 
         /** @type {ParameterSetter} */
         let setter;
 
-        if ("value" in param) {
-            setter = this.allocateSetter(param.name, param.value);
+        if (param.push == "outer") {
+            const outerMediator = this.findMediatorForParam(name);
+            if (!outerMediator) {
+                throw new Error(
+                    `Parameter "${name}" not found in outer scope!`
+                );
+            }
+
+            const outerProps = outerMediator.paramConfigs.get(name);
+            if ("expr" in outerProps || "select" in outerProps) {
+                throw new Error(
+                    `The outer parameter "${name}" must not have expr or select properties!`
+                );
+            }
+            setter = outerMediator.getSetter(name);
+            // The following will become a bit fragile if the view hierarchy is going to
+            // support mutation (i.e. adding/removing children) in future.
+            this.#allocatedSetters.set(name, setter);
+        } else if ("value" in param) {
+            setter = this.allocateSetter(name, param.value);
         } else if ("expr" in param) {
             const expr = this.createExpression(param.expr);
             // TODO: getSetter(param) should return a setter that throws if
             // modifying the value is attempted.
-            const realSetter = this.allocateSetter(param.name, expr(null));
+            const realSetter = this.allocateSetter(name, expr(null));
             expr.addListener(() => realSetter(expr(null)));
             // NOP
             setter = (_) => undefined;
+        } else {
+            setter = this.allocateSetter(name, null);
         }
 
-        this.#paramConfigs.set(param.name, param);
+        if ("select" in param) {
+            const type = isString(param.select)
+                ? param.select
+                : param.select.type;
+
+            // Set initial value so that production rules in shaders can be generated, etc.
+            if (type == "point") {
+                setter(createSinglePointSelection(null));
+            }
+        }
+
+        this.#paramConfigs.set(name, param);
 
         return setter;
     }
@@ -87,6 +121,8 @@ export default class ParamMediator {
      * @template T
      */
     allocateSetter(paramName, initialValue, passive = false) {
+        validateParameterName(paramName);
+
         if (this.#allocatedSetters.has(paramName)) {
             throw new Error(
                 "Setter already allocated for parameter: " + paramName
@@ -148,7 +184,7 @@ export default class ParamMediator {
      * Returns configs for all parameters that have been registered using `registerParam`.
      */
     get paramConfigs() {
-        return /** @type {ReadonlyMap<string, VariableParameter>} */ (
+        return /** @type {ReadonlyMap<string, Parameter>} */ (
             this.#paramConfigs
         );
     }
@@ -288,6 +324,22 @@ export function withoutExprRef(x) {
     return /** @type {T} */ (x);
 }
 
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").VariableParameter}
+ */
+export function isVariableParameter(param) {
+    return ("expr" in param || "bind" in param) && !("select" in param);
+}
+
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").SelectionParameter}
+ */
+export function isSelectionParameter(param) {
+    return !("expr" in param || "bind" in param) && "select" in param;
+}
+
 /**
  * Takes a record of properties that may have ExprRefs as values. Converts the
  * ExprRefs to getters and setups a listener that is called when any of the
@@ -336,3 +388,39 @@ export function activateExprRefProps(paramMediator, props, listener) {
 
     return /** @type {T} */ (activatedProps);
 }
+
+/**
+ * Validates a parameter name. If the name is invalid, throws an error.
+ * Otherwise, returns the name.
+ *
+ * @param {string} name
+ * @returns {string} the name
+ */
+export function validateParameterName(name) {
+    if (!/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name)) {
+        throw new Error(
+            `Invalid parameter name: ${name}. Must be a valid JavaScript identifier.`
+        );
+    }
+
+    return name;
+}
+
+/**
+ * Creates a function that always returns the same value.
+ * Provides functionality for creating a constant expression reference.
+ * They just do nothing.
+ *
+ * @param {any} value
+ * @returns {ExprRefFunction}
+ */
+export function makeConstantExprRef(value) {
+    return Object.assign(() => value, {
+        addListener: () => undefined,
+        invalidate: () => undefined,
+        identifier: () => "constant",
+        fields: [],
+        globals: [],
+        code: JSON.stringify(value),
+    });
+}

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

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

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

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

package/dist/src/view/paramMediator.test.js

@@ -173,6 +173,22 @@ describe("Nested ParamMediators", () => {
         childSetter(20);
         expect(result).toBe(30);
     });
+
+    test("Pushing to outer parameter", () => {
+        const parent = new ParamMediator();
+        const child = new ParamMediator(() => parent);
+
+        parent.registerParam({ name: "foo", value: 1 });
+        const childSetter = child.registerParam({ name: "foo", push: "outer" });
+
+        expect(parent.findValue("foo")).toBe(1);
+        expect(child.findValue("foo")).toBe(1);
+
+        childSetter(2);
+
+        expect(parent.findValue("foo")).toBe(2);
+        expect(child.findValue("foo")).toBe(2);
+    });
 });
 
 test("activateExprRefProps", async () => {
@@ -181,7 +197,7 @@ test("activateExprRefProps", async () => {
     const fooSetter = pm.registerParam({ name: "foo", value: 7 });
     const barSetter = pm.registerParam({ name: "bar", value: 11 });
 
-    /** @type {Record<string, any | import("../spec/parameter.js").ExprRef} */
+    /** @type {Record<string, any | import("../spec/parameter.js").ExprRef>} */
     const props = {
         a: 42,
         b: { expr: "foo" },