vega-functions 5.13.0 → 5.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vega-functions",
-  "version": "5.13.0",
+  "version": "5.13.2",
   "description": "Custom functions for the Vega expression language.",
   "keywords": [
     "vega",
@@ -15,26 +15,26 @@
   "repository": "vega/vega",
   "scripts": {
     "prebuild": "rimraf build",
-    "build": "rollup -c",
+    "build": "rollup -c rollup.config.mjs",
     "pretest": "yarn build --config-test",
     "test": "tape 'test/**/*-test.js'",
     "prepublishOnly": "yarn test && yarn build"
   },
   "dependencies": {
-    "d3-array": "^3.1.1",
-    "d3-color": "^3.0.1",
-    "d3-geo": "^3.0.1",
-    "vega-dataflow": "^5.7.3",
-    "vega-expression": "^5.0.0",
-    "vega-scale": "^7.2.0",
-    "vega-scenegraph": "^4.9.3",
-    "vega-selections": "^5.3.1",
-    "vega-statistics": "^1.7.9",
-    "vega-time": "^2.1.0",
-    "vega-util": "^1.16.0"
+    "d3-array": "^3.2.2",
+    "d3-color": "^3.1.0",
+    "d3-geo": "^3.1.0",
+    "vega-dataflow": "^5.7.5",
+    "vega-expression": "^5.1.0",
+    "vega-scale": "^7.3.0",
+    "vega-scenegraph": "^4.10.2",
+    "vega-selections": "^5.4.1",
+    "vega-statistics": "^1.8.1",
+    "vega-time": "^2.1.1",
+    "vega-util": "^1.17.1"
   },
   "devDependencies": {
     "vega-format": "^1.1.0"
   },
-  "gitHead": "9a3faca4395cade9ecdfde90af98f1c53e9916b2"
+  "gitHead": "a7a312ebe9db675ae03bd354f193ed34a976d21f"
 }

package/rollup.config.mjs

@@ -0,0 +1 @@
+export { default } from '../../rollup.config.mjs';

package/src/functions/lasso.js

@@ -1,9 +1,10 @@
 import intersect from './intersect';
-import { Bounds } from 'vega-scenegraph';
+import {Bounds} from 'vega-scenegraph';
+import {array} from 'vega-util';
 
 /**
  * Appends a new point to the lasso
- * 
+ *
  * @param {*} lasso the lasso in pixel space
  * @param {*} x the x coordinate in pixel space
  * @param {*} y the y coordinate in pixel space
@@ -11,73 +12,70 @@ import { Bounds } from 'vega-scenegraph';
  * @returns a new array containing the lasso with the new point
  */
 export function lassoAppend(lasso, x, y, minDist = 5) {
-    const last = lasso[lasso.length - 1];
+  lasso = array(lasso);
+  const last = lasso[lasso.length - 1];
 
-    // Add point to lasso if distance to last point exceed minDist or its the first point
-    if (last === undefined || Math.sqrt(((last[0] - x) ** 2) + ((last[1] - y) ** 2)) > minDist) {
-        lasso.push([x, y]);
-
-        return [...lasso];
-    }
-
-    return lasso;
+  // Add point to lasso if its the first point or distance to last point exceed minDist
+  return (last === undefined || Math.hypot(last[0] - x, last[1] - y) > minDist)
+  ? [...lasso, [x, y]]
+  : lasso;
 }
 
 
 /**
  * Generates a svg path command which draws a lasso
- * 
+ *
  * @param {*} lasso the lasso in pixel space in the form [[x,y], [x,y], ...]
  * @returns the svg path command that draws the lasso
  */
 export function lassoPath(lasso) {
-    return (lasso ?? []).reduce((svg, [x, y], i) => {
-        return svg += i == 0
-            ? `M ${x},${y} `
-            : i === lasso.length - 1
-                ? ' Z'
-                : `L ${x},${y} `;
-    }, '');
+  return array(lasso).reduce((svg, [x, y], i) => {
+  return svg += i == 0
+    ? `M ${x},${y} `
+    : i === lasso.length - 1
+    ? ' Z'
+    : `L ${x},${y} `;
+  }, '');
 }
 
 
 
 /**
  * Inverts the lasso from pixel space to an array of vega scenegraph tuples
- * 
+ *
  * @param {*} data the dataset
  * @param {*} pixelLasso the lasso in pixel space, [[x,y], [x,y], ...]
  * @param {*} unit the unit where the lasso is defined
- * 
+ *
  * @returns an array of vega scenegraph tuples
  */
 export function intersectLasso(markname, pixelLasso, unit) {
-    const { x, y, mark } = unit;
-
-    const bb = new Bounds().set(
-        Number.MAX_SAFE_INTEGER,
-        Number.MAX_SAFE_INTEGER,
-        Number.MIN_SAFE_INTEGER,
-        Number.MIN_SAFE_INTEGER
-    );
-
-    // Get bounding box around lasso
-    for (const [px, py] of pixelLasso) {
-        if (px < bb.x1) bb.x1 = px;
-        if (px > bb.x2) bb.x2 = px;
-        if (py < bb.y1) bb.y1 = py;
-        if (py > bb.y2) bb.y2 = py;
-    }
-
-    // Translate bb against unit coordinates
-    bb.translate(x, y);
-
-    const intersection = intersect([[bb.x1, bb.y1], [bb.x2, bb.y2]],
-        markname,
-        mark);
-
-    // Check every point against the lasso
-    return intersection.filter(tuple => pointInPolygon(tuple.x, tuple.y, pixelLasso));
+  const { x, y, mark } = unit;
+
+  const bb = new Bounds().set(
+    Number.MAX_SAFE_INTEGER,
+    Number.MAX_SAFE_INTEGER,
+    Number.MIN_SAFE_INTEGER,
+    Number.MIN_SAFE_INTEGER
+  );
+
+  // Get bounding box around lasso
+  for (const [px, py] of pixelLasso) {
+    if (px < bb.x1) bb.x1 = px;
+    if (px > bb.x2) bb.x2 = px;
+    if (py < bb.y1) bb.y1 = py;
+    if (py > bb.y2) bb.y2 = py;
+  }
+
+  // Translate bb against unit coordinates
+  bb.translate(x, y);
+
+  const intersection = intersect([[bb.x1, bb.y1], [bb.x2, bb.y2]],
+    markname,
+    mark);
+
+  // Check every point against the lasso
+  return intersection.filter(tuple => pointInPolygon(tuple.x, tuple.y, pixelLasso));
 }
 
 
@@ -85,26 +83,26 @@ export function intersectLasso(markname, pixelLasso, unit) {
 /**
  * Performs a test if a point is inside a polygon based on the idea from
  * https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html
- * 
+ *
  * This method will not need the same start/end point since it wraps around the edges of the array
- * 
+ *
  * @param {*} test a point to test against
  * @param {*} polygon a polygon in the form [[x,y], [x,y], ...]
  * @returns true if the point lies inside the polygon, false otherwise
  */
 function pointInPolygon(testx, testy, polygon) {
-    let intersections = 0;
+  let intersections = 0;
 
-    for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
-        const [prevX, prevY] = polygon[j];
-        const [x, y] = polygon[i];
+  for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+    const [prevX, prevY] = polygon[j];
+    const [x, y] = polygon[i];
 
-        // count intersections
-        if (((y > testy) != (prevY > testy)) && (testx < (prevX - x) * (testy - y) / (prevY - y) + x)) {
-            intersections++;
-        }
+    // count intersections
+    if (((y > testy) != (prevY > testy)) && (testx < (prevX - x) * (testy - y) / (prevY - y) + x)) {
+      intersections++;
     }
+  }
 
-    // point is in polygon if intersection count is odd
-    return intersections & 1;
+  // point is in polygon if intersection count is odd
+  return intersections & 1;
 }

package/src/functions/pinch.js

@@ -2,7 +2,7 @@ export function pinchDistance(event) {
   const t = event.touches,
         dx = t[0].clientX - t[1].clientX,
         dy = t[0].clientY - t[1].clientY;
-  return Math.sqrt(dx * dx + dy * dy);
+  return Math.hypot(dx, dy);
 }
 
 export function pinchAngle(event) {

package/src/scales.js

@@ -2,12 +2,21 @@ import {ScalePrefix} from './constants';
 import {scaleVisitor} from './visitors';
 import {Literal} from 'vega-expression';
 import {isFunction, isString, stringValue} from 'vega-util';
+import {isRegisteredScale} from 'vega-scale';
 
-export function getScale(name, ctx) {
-  let s;
-  return isFunction(name) ? name
-    : isString(name) ? (s = ctx.scales[name]) && s.value
-    : undefined;
+export function getScale(nameOrFunction, ctx) {
+
+  if (isFunction(nameOrFunction)) {
+    return nameOrFunction;
+  }
+
+  if (isString(nameOrFunction)) {
+    const maybeScale = ctx.scales[nameOrFunction];
+    return (maybeScale && isRegisteredScale(maybeScale.value)) ? maybeScale.value : undefined;
+
+  }
+
+  return undefined;
 }
 
 export function internalScaleFunctions(codegen, fnctx, visitors) {

package/rollup.config.js

@@ -1 +0,0 @@
-export { default } from '../../rollup.config';