@windborne/grapher 1.0.53 → 1.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windborne/grapher",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "Graphing library",
   "main": "src/index.js",
   "module": "dist/bundle.esm.js",
@@ -31,7 +31,7 @@
     "dev": "webpack-dev-server --config webpack.dev.config.cjs",
     "build": "rm -rf dist && mkdir -p dist && rm -f *.wasm && webpack --config webpack.prod.config.cjs && touch src/rust/pkg/.npmignore",
     "analyze-size": "webpack --config webpack.prod.config.cjs --json | webpack-bundle-size-analyzer",
-    "test": "mocha-webpack --webpack-config webpack.test.config.cjs --require test/setup.js --recursive --glob \"*.test.js\" test",
+    "test": "mochapack --webpack-config webpack.test.config.cjs --require test/setup.js --recursive --glob \"*.test.js\" test",
     "coverage": "NODE_ENV=coverage nyc --reporter=lcov --reporter=text npm run test"
   },
   "repository": {
@@ -69,12 +69,12 @@
     "eslint-plugin-react": "^7.17.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.6.0",
-    "istanbul-instrumenter-loader": "^3.0.1",
+    "babel-plugin-istanbul": "^7.0.0",
     "jsdom": "^16.3.0",
     "jsdom-global": "^3.0.2",
     "kefir": "^3.8.6",
     "mocha": "^7.2.0",
-    "mocha-webpack": "^2.0.0-beta.0",
+    "mochapack": "^2.1.4",
     "nyc": "^15.1.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",

package/src/components/tooltip.jsx

@@ -242,10 +242,6 @@ export default class Tooltip extends React.PureComponent {
                             group.pixelY = tooltip.pixelY;
                         }
 
-                        if (tooltip.tooltipPixelY !== undefined && (group.tooltipPixelY === undefined || tooltip.tooltipPixelY < group.tooltipPixelY)) {
-                            group.tooltipPixelY = tooltip.tooltipPixelY;
-                        }
-
                         added = true;
                         break;
                     }
@@ -255,7 +251,6 @@ export default class Tooltip extends React.PureComponent {
                     groupedTooltips.push({
                         pixelX: tooltip.pixelX,
                         pixelY: tooltip.pixelY,
-                        tooltipPixelY: tooltip.tooltipPixelY,
                         multiplier: tooltip.multiplier,
                         tooltips: [tooltip]
                     });
@@ -364,7 +359,7 @@ export default class Tooltip extends React.PureComponent {
                         <div
                             key={i}
                             className="custom-tooltip-container"
-                            style={{top: tooltip.tooltipPixelY ?? tooltip.pixelY, left: tooltip.pixelX}}
+                            style={{top: tooltip.pixelY, left: tooltip.pixelX}}
                         >
                             <CustomTooltipComponent {...tooltip} />
                         </div>

package/src/renderer/graph_body_renderer.js

@@ -352,11 +352,19 @@ export default class GraphBodyRenderer extends Eventable {
         }
 
         if (singleSeries.rendering === 'bar') {
+            const barSeriesInAxis = singleSeries.axis.series.filter(s => s.rendering === 'bar');
+            let barClosestSpacing = null;
+            for (const s of barSeriesInAxis) {
+                const sp = s.dataBounds?.closestSpacing;
+                if (sp != null && sp > 0 && (barClosestSpacing === null || sp > barClosestSpacing)) {
+                    barClosestSpacing = sp;
+                }
+            }
             let barParams = {
                 ...commonCPUParams,
-                indexInAxis: singleSeries.axis.series.indexOf(singleSeries),
-                axisSeriesCount: singleSeries.axis.series.length,
-                closestSpacing: globalBounds.closestSpacing,
+                indexInAxis: barSeriesInAxis.indexOf(singleSeries),
+                axisSeriesCount: barSeriesInAxis.length,
+                closestSpacing: barClosestSpacing || globalBounds.closestSpacing,
                 bounds
             };
 

package/src/rust/pkg/index.js

@@ -0,0 +1,398 @@
+let wasm;
+
+let cachedUint8ArrayMemory0 = null;
+
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachedUint8ArrayMemory0;
+}
+
+function getArrayU8FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
+let WASM_VECTOR_LEN = 0;
+
+const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
+
+const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
+    ? function (arg, view) {
+    return cachedTextEncoder.encodeInto(arg, view);
+}
+    : function (arg, view) {
+    const buf = cachedTextEncoder.encode(arg);
+    view.set(buf);
+    return {
+        read: arg.length,
+        written: buf.length
+    };
+});
+
+function passStringToWasm0(arg, malloc, realloc) {
+
+    if (realloc === undefined) {
+        const buf = cachedTextEncoder.encode(arg);
+        const ptr = malloc(buf.length, 1) >>> 0;
+        getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf);
+        WASM_VECTOR_LEN = buf.length;
+        return ptr;
+    }
+
+    let len = arg.length;
+    let ptr = malloc(len, 1) >>> 0;
+
+    const mem = getUint8ArrayMemory0();
+
+    let offset = 0;
+
+    for (; offset < len; offset++) {
+        const code = arg.charCodeAt(offset);
+        if (code > 0x7F) break;
+        mem[ptr + offset] = code;
+    }
+
+    if (offset !== len) {
+        if (offset !== 0) {
+            arg = arg.slice(offset);
+        }
+        ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
+        const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len);
+        const ret = encodeString(arg, view);
+
+        offset += ret.written;
+        ptr = realloc(ptr, len, offset, 1) >>> 0;
+    }
+
+    WASM_VECTOR_LEN = offset;
+    return ptr;
+}
+
+function isLikeNone(x) {
+    return x === undefined || x === null;
+}
+
+let cachedDataViewMemory0 = null;
+
+function getDataViewMemory0() {
+    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
+        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
+    }
+    return cachedDataViewMemory0;
+}
+
+const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
+
+if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
+
+function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+let cachedFloat64ArrayMemory0 = null;
+
+function getFloat64ArrayMemory0() {
+    if (cachedFloat64ArrayMemory0 === null || cachedFloat64ArrayMemory0.byteLength === 0) {
+        cachedFloat64ArrayMemory0 = new Float64Array(wasm.memory.buffer);
+    }
+    return cachedFloat64ArrayMemory0;
+}
+
+function passArrayF64ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 8, 8) >>> 0;
+    getFloat64ArrayMemory0().set(arg, ptr / 8);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+let cachedFloat32ArrayMemory0 = null;
+
+function getFloat32ArrayMemory0() {
+    if (cachedFloat32ArrayMemory0 === null || cachedFloat32ArrayMemory0.byteLength === 0) {
+        cachedFloat32ArrayMemory0 = new Float32Array(wasm.memory.buffer);
+    }
+    return cachedFloat32ArrayMemory0;
+}
+
+function passArrayF32ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 4, 4) >>> 0;
+    getFloat32ArrayMemory0().set(arg, ptr / 4);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+let cachedUint32ArrayMemory0 = null;
+
+function getUint32ArrayMemory0() {
+    if (cachedUint32ArrayMemory0 === null || cachedUint32ArrayMemory0.byteLength === 0) {
+        cachedUint32ArrayMemory0 = new Uint32Array(wasm.memory.buffer);
+    }
+    return cachedUint32ArrayMemory0;
+}
+
+function passArray32ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 4, 4) >>> 0;
+    getUint32ArrayMemory0().set(arg, ptr / 4);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+/**
+ * @param {number} dpi_increase
+ * @param {Uint8Array} null_mask
+ * @param {Float64Array} y_values
+ * @param {Float64Array} min_y_values
+ * @param {Float64Array} max_y_values
+ * @param {Float32Array} positions
+ * @param {Float32Array} prev_positions
+ * @param {Float32Array} vertices
+ * @param {Uint32Array} indices
+ * @param {boolean} dashed
+ * @param {number} dash0
+ * @param {number} dash1
+ */
+export function extract_vertices(dpi_increase, null_mask, y_values, min_y_values, max_y_values, positions, prev_positions, vertices, indices, dashed, dash0, dash1) {
+    const ptr0 = passArray8ToWasm0(null_mask, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passArrayF64ToWasm0(y_values, wasm.__wbindgen_malloc);
+    const len1 = WASM_VECTOR_LEN;
+    const ptr2 = passArrayF64ToWasm0(min_y_values, wasm.__wbindgen_malloc);
+    const len2 = WASM_VECTOR_LEN;
+    const ptr3 = passArrayF64ToWasm0(max_y_values, wasm.__wbindgen_malloc);
+    const len3 = WASM_VECTOR_LEN;
+    var ptr4 = passArrayF32ToWasm0(positions, wasm.__wbindgen_malloc);
+    var len4 = WASM_VECTOR_LEN;
+    var ptr5 = passArrayF32ToWasm0(prev_positions, wasm.__wbindgen_malloc);
+    var len5 = WASM_VECTOR_LEN;
+    var ptr6 = passArrayF32ToWasm0(vertices, wasm.__wbindgen_malloc);
+    var len6 = WASM_VECTOR_LEN;
+    var ptr7 = passArray32ToWasm0(indices, wasm.__wbindgen_malloc);
+    var len7 = WASM_VECTOR_LEN;
+    wasm.extract_vertices(dpi_increase, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, positions, ptr5, len5, prev_positions, ptr6, len6, vertices, ptr7, len7, indices, dashed, dash0, dash1);
+}
+
+/**
+ * @param {Uint8Array} null_mask
+ * @param {Float64Array} y_values
+ * @param {Float64Array} min_y_values
+ * @param {Float64Array} max_y_values
+ * @param {boolean} dashed
+ * @param {number} dash0
+ * @param {number} dash1
+ * @returns {number}
+ */
+export function get_point_number(null_mask, y_values, min_y_values, max_y_values, dashed, dash0, dash1) {
+    const ptr0 = passArray8ToWasm0(null_mask, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passArrayF64ToWasm0(y_values, wasm.__wbindgen_malloc);
+    const len1 = WASM_VECTOR_LEN;
+    const ptr2 = passArrayF64ToWasm0(min_y_values, wasm.__wbindgen_malloc);
+    const len2 = WASM_VECTOR_LEN;
+    const ptr3 = passArrayF64ToWasm0(max_y_values, wasm.__wbindgen_malloc);
+    const len3 = WASM_VECTOR_LEN;
+    const ret = wasm.get_point_number(ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, dashed, dash0, dash1);
+    return ret;
+}
+
+export function main_js() {
+    wasm.main_js();
+}
+
+/**
+ * @param {number} length
+ * @param {Float64Array} data
+ * @param {Uint8Array} data_null_mask
+ * @param {any} params
+ * @param {Uint8Array} null_mask
+ * @param {Float64Array} y_values
+ * @param {Float64Array} min_y_values
+ * @param {Float64Array} max_y_values
+ */
+export function selected_space_to_render_space(length, data, data_null_mask, params, null_mask, y_values, min_y_values, max_y_values) {
+    const ptr0 = passArrayF64ToWasm0(data, wasm.__wbindgen_malloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passArray8ToWasm0(data_null_mask, wasm.__wbindgen_malloc);
+    const len1 = WASM_VECTOR_LEN;
+    var ptr2 = passArray8ToWasm0(null_mask, wasm.__wbindgen_malloc);
+    var len2 = WASM_VECTOR_LEN;
+    var ptr3 = passArrayF64ToWasm0(y_values, wasm.__wbindgen_malloc);
+    var len3 = WASM_VECTOR_LEN;
+    var ptr4 = passArrayF64ToWasm0(min_y_values, wasm.__wbindgen_malloc);
+    var len4 = WASM_VECTOR_LEN;
+    var ptr5 = passArrayF64ToWasm0(max_y_values, wasm.__wbindgen_malloc);
+    var len5 = WASM_VECTOR_LEN;
+    wasm.selected_space_to_render_space(length, ptr0, len0, ptr1, len1, params, ptr2, len2, null_mask, ptr3, len3, y_values, ptr4, len4, min_y_values, ptr5, len5, max_y_values);
+}
+
+async function __wbg_load(module, imports) {
+    if (typeof Response === 'function' && module instanceof Response) {
+        if (typeof WebAssembly.instantiateStreaming === 'function') {
+            try {
+                return await WebAssembly.instantiateStreaming(module, imports);
+
+            } catch (e) {
+                if (module.headers.get('Content-Type') != 'application/wasm') {
+                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
+
+                } else {
+                    throw e;
+                }
+            }
+        }
+
+        const bytes = await module.arrayBuffer();
+        return await WebAssembly.instantiate(bytes, imports);
+
+    } else {
+        const instance = await WebAssembly.instantiate(module, imports);
+
+        if (instance instanceof WebAssembly.Instance) {
+            return { instance, module };
+
+        } else {
+            return instance;
+        }
+    }
+}
+
+function __wbg_get_imports() {
+    const imports = {};
+    imports.wbg = {};
+    imports.wbg.__wbg_maxx_a3b1e1c3299e47bf = function(arg0) {
+        const ret = arg0.maxX;
+        return ret;
+    };
+    imports.wbg.__wbg_maxy_007b81ea99058122 = function(arg0) {
+        const ret = arg0.maxY;
+        return ret;
+    };
+    imports.wbg.__wbg_minx_e03d57649d81fc8f = function(arg0) {
+        const ret = arg0.minX;
+        return ret;
+    };
+    imports.wbg.__wbg_miny_46aab5af597882a7 = function(arg0) {
+        const ret = arg0.minY;
+        return ret;
+    };
+    imports.wbg.__wbg_renderheight_d030fe5a23b4c32b = function(arg0) {
+        const ret = arg0.renderHeight;
+        return ret;
+    };
+    imports.wbg.__wbg_renderwidth_8685762ee304f2a7 = function(arg0) {
+        const ret = arg0.renderWidth;
+        return ret;
+    };
+    imports.wbg.__wbg_scale_d705e0de44ed2361 = function(arg0) {
+        const ret = arg0.scale;
+        return ret;
+    };
+    imports.wbg.__wbindgen_copy_to_typed_array = function(arg0, arg1, arg2) {
+        new Uint8Array(arg2.buffer, arg2.byteOffset, arg2.byteLength).set(getArrayU8FromWasm0(arg0, arg1));
+    };
+    imports.wbg.__wbindgen_init_externref_table = function() {
+        const table = wasm.__wbindgen_export_0;
+        const offset = table.grow(4);
+        table.set(0, undefined);
+        table.set(offset + 0, undefined);
+        table.set(offset + 1, null);
+        table.set(offset + 2, true);
+        table.set(offset + 3, false);
+        ;
+    };
+    imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
+        const obj = arg1;
+        const ret = typeof(obj) === 'string' ? obj : undefined;
+        var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        var len1 = WASM_VECTOR_LEN;
+        getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+        getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+    };
+    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
+        throw new Error(getStringFromWasm0(arg0, arg1));
+    };
+
+    return imports;
+}
+
+function __wbg_init_memory(imports, memory) {
+
+}
+
+function __wbg_finalize_init(instance, module) {
+    wasm = instance.exports;
+    __wbg_init.__wbindgen_wasm_module = module;
+    cachedDataViewMemory0 = null;
+    cachedFloat32ArrayMemory0 = null;
+    cachedFloat64ArrayMemory0 = null;
+    cachedUint32ArrayMemory0 = null;
+    cachedUint8ArrayMemory0 = null;
+
+
+    wasm.__wbindgen_start();
+    return wasm;
+}
+
+function initSync(module) {
+    if (wasm !== undefined) return wasm;
+
+
+    if (typeof module !== 'undefined') {
+        if (Object.getPrototypeOf(module) === Object.prototype) {
+            ({module} = module)
+        } else {
+            console.warn('using deprecated parameters for `initSync()`; pass a single object instead')
+        }
+    }
+
+    const imports = __wbg_get_imports();
+
+    __wbg_init_memory(imports);
+
+    if (!(module instanceof WebAssembly.Module)) {
+        module = new WebAssembly.Module(module);
+    }
+
+    const instance = new WebAssembly.Instance(module, imports);
+
+    return __wbg_finalize_init(instance, module);
+}
+
+async function __wbg_init(module_or_path) {
+    if (wasm !== undefined) return wasm;
+
+
+    if (typeof module_or_path !== 'undefined') {
+        if (Object.getPrototypeOf(module_or_path) === Object.prototype) {
+            ({module_or_path} = module_or_path)
+        } else {
+            console.warn('using deprecated parameters for the initialization function; pass a single object instead')
+        }
+    }
+
+    if (typeof module_or_path === 'undefined') {
+        module_or_path = new URL('index_bg.wasm', import.meta.url);
+    }
+    const imports = __wbg_get_imports();
+
+    if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) {
+        module_or_path = fetch(module_or_path);
+    }
+
+    __wbg_init_memory(imports);
+
+    const { instance, module } = await __wbg_load(await module_or_path, imports);
+
+    return __wbg_finalize_init(instance, module);
+}
+
+export { initSync };
+export default __wbg_init;

package/src/rust/pkg/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "grapher-rs",
+  "type": "module",
+  "collaborators": [
+    "Kai Marshland <kaimarshland@gmail.com>"
+  ],
+  "version": "0.1.0",
+  "files": [
+    "index_bg.wasm",
+    "index.js"
+  ],
+  "main": "index.js",
+  "sideEffects": [
+    "./snippets/*"
+  ]
+}

package/src/state/calculate_tooltip_state.js

@@ -109,11 +109,20 @@ export default function calculateTooltipState({mousePresent, mouseX, mouseY, siz
         let distanceThreshold = DISTANCE_THRESHOLD;
 
         if (singleSeries.rendering === 'bar') {
-            const indexInAxis = singleSeries.axis.series.indexOf(singleSeries);
-            const axisSeriesCount = singleSeries.axis.series.length;
+            const barSeriesInAxis = singleSeries.axis.series.filter(s => s.rendering === 'bar');
+            const indexInAxis = barSeriesInAxis.indexOf(singleSeries);
+            const axisSeriesCount = barSeriesInAxis.length;
+
+            let barClosestSpacing = null;
+            for (const s of barSeriesInAxis) {
+                const sp = s.dataBounds?.closestSpacing;
+                if (sp != null && sp > 0 && (barClosestSpacing === null || sp > barClosestSpacing)) {
+                    barClosestSpacing = sp;
+                }
+            }
 
             const { totalBarWidth, barWidth } = getBarWidths({
-                closestSpacing,
+                closestSpacing: barClosestSpacing || closestSpacing,
                 bounds,
                 sizing,
                 axisSeriesCount

package/dist/599.bundle.cjs

@@ -1 +0,0 @@
-(globalThis.webpackChunkGrapher=globalThis.webpackChunkGrapher||[]).push([[599],{599:()=>{}}]);

package/dist/599.bundle.esm.js

@@ -1 +0,0 @@
-export const id=599;export const ids=[599];export const modules={599:()=>{}};