@windborne/grapher 1.0.17 → 1.0.20

package/package.json

@@ -1,16 +1,37 @@
 {
   "name": "@windborne/grapher",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "Graphing library",
-  "main": "bundle.js",
+  "main": "src/index.js",
+  "module": "dist/bundle.esm.js",
+  "types": "src/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/bundle.esm.js",
+      "require": "./dist/bundle.cjs",
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    },
+    "./src": {
+      "import": "./src/index.mjs",
+      "default": "./src/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "src/",
+    "dist/",
+    "*.md",
+    "package.json"
+  ],
   "publishConfig": {},
   "scripts": {
     "lint-base": "eslint ./src ./examples ./test",
     "lint": "npm run lint-base -- --fix",
-    "dev": "webpack-dev-server --config webpack.dev.config.js",
-    "build": "rm -f *.wasm && webpack --config webpack.prod.config.js && touch src/rust/pkg/.npmignore",
-    "analyze-size": "webpack --config webpack.prod.config.js --json | webpack-bundle-size-analyzer",
-    "test": "mocha-webpack --webpack-config webpack.test.config.js --require test/setup.js --recursive --glob \"*.test.js\" test",
+    "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",
     "coverage": "NODE_ENV=coverage nyc --reporter=lcov --reporter=text npm run test"
   },
   "repository": {
@@ -24,7 +45,8 @@
   },
   "nyc": {
     "include": [
-      "src/**/*.js"
+      "src/**/*.js",
+      "src/**/*.jsx"
     ],
     "instrument": false,
     "sourceMap": false

package/src/components/{graph_body.js → graph_body.jsx}

@@ -2,8 +2,8 @@ import React, { useCallback, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import CustomPropTypes from '../helpers/custom_prop_types';
 import GraphBodyRenderer from '../renderer/graph_body_renderer';
-import Tooltip from './tooltip';
-import ContextMenu from './context_menu';
+import Tooltip from './tooltip.jsx';
+import ContextMenu from './context_menu.jsx';
 import StateController from '../state/state_controller';
 import {
     useAnnotationState,
@@ -14,9 +14,9 @@ import {
     useTooltipState,
     useContextMenu
 } from '../state/hooks';
-import Annotations from './annotations.js';
-import DraggablePoints from './draggable_points.js';
-import VerticalLines from './vertical_lines.js';
+import Annotations from './annotations.jsx';
+import DraggablePoints from './draggable_points.jsx';
+import VerticalLines from './vertical_lines.jsx';
 import binarySearch from '../helpers/binary_search';
 
 export default React.memo(GraphBody);

package/src/components/{options.js → options.jsx}

@@ -1,6 +1,6 @@
 import React from 'react';
-import PercentileButton from './percentile_button';
-import RangeSelectionButtonBase from './range_selection_button_base';
+import PercentileButton from './percentile_button.jsx';
+import RangeSelectionButtonBase from './range_selection_button_base.jsx';
 import {
     useAutoscaleY,
     useMaxPrecision,

package/src/components/{percentile_button.js → percentile_button.jsx}

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import RangeSelectionButtonBase from './range_selection_button_base';
+import RangeSelectionButtonBase from './range_selection_button_base.jsx';
 import StateController from '../state/state_controller';
 import {usePercentile, usePercentileAsymmetry} from '../state/hooks';
 

package/src/components/{range_graph.js → range_graph.jsx}

@@ -4,7 +4,7 @@ import GraphBodyRenderer from '../renderer/graph_body_renderer';
 import StateController from '../state/state_controller';
 import placeGrid from '../helpers/place_grid';
 import {formatX} from '../helpers/format';
-import VerticalLines from './vertical_lines';
+import VerticalLines from './vertical_lines.jsx';
 import CustomPropTypes from '../helpers/custom_prop_types';
 
 export default class RangeGraph extends React.PureComponent {

package/src/components/{range_selection.js → range_selection.jsx}

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import RangeSelectionButton from './range_selection_button';
-import RangeSelectionButtonBase from './range_selection_button_base';
+import RangeSelectionButton from './range_selection_button.jsx';
+import RangeSelectionButtonBase from './range_selection_button_base.jsx';
 import {Y_AXIS_WIDTH} from '../helpers/axis_sizes';
 import CustomPropTypes from '../helpers/custom_prop_types';
 import StateController from '../state/state_controller';
@@ -13,7 +13,7 @@ import {
     useShowingOptions
 } from '../state/hooks';
 import BOUND_CALCULATORS from '../state/bound_calculators';
-import Options from './options';
+import Options from './options.jsx';
 
 export default React.memo(RangeSelection);
 

package/src/components/{range_selection_button.js → range_selection_button.jsx}

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import RangeSelectionButtonBase from './range_selection_button_base';
+import RangeSelectionButtonBase from './range_selection_button_base.jsx';
 import StateController from '../state/state_controller';
 
 export default React.memo(RangeSelectionButton);

package/src/components/{series_key.js → series_key.jsx}

@@ -11,8 +11,8 @@ import {
     useRightAxisCount,
     useSeries, useShowingOptions
 } from '../state/hooks';
-import SeriesKeyItem from './series_key_item';
-import SeriesKeyAxisContainer from './series_key_axis_container';
+import SeriesKeyItem from './series_key_item.jsx';
+import SeriesKeyAxisContainer from './series_key_axis_container.jsx';
 
 function calculateStyles({stateController, keyWidth}) {
     const rightAxisCount = useRightAxisCount(stateController);

package/src/components/{series_key_item.js → series_key_item.jsx}

@@ -3,7 +3,7 @@ import getColor from '../helpers/colors';
 import CustomPropTypes from '../helpers/custom_prop_types';
 import PropTypes from 'prop-types';
 import StateController from '../state/state_controller';
-import nameForSeries from '../helpers/name_for_series.js';
+import nameForSeries from '../helpers/name_for_series';
 
 export default React.memo(SeriesKeyItem);
 

package/src/{grapher.js → grapher.jsx}

@@ -1,19 +1,19 @@
 import React, { useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import CustomPropTypes from './helpers/custom_prop_types';
-import GraphBody from './components/graph_body';
+import GraphBody from './components/graph_body.jsx';
 import './grapher.scss';
-import XAxis from './components/x_axis';
-import YAxis from './components/y_axis';
-import RangeSelection from './components/range_selection';
-import RangeGraph from './components/range_graph';
-import SeriesKey from './components/series_key';
+import XAxis from './components/x_axis.jsx';
+import YAxis from './components/y_axis.jsx';
+import RangeSelection from './components/range_selection.jsx';
+import RangeGraph from './components/range_graph.jsx';
+import SeriesKey from './components/series_key.jsx';
 import {Y_AXIS_WIDTH} from './helpers/axis_sizes';
-import GraphTitle from './components/graph_title';
+import GraphTitle from './components/graph_title.jsx';
 import {LINE_COLORS} from './helpers/colors';
 import StateController from './state/state_controller';
 import {useDraggingY, useLeftAxes, useRightAxes, useShowingSidebar, useTheme} from './state/hooks';
-import Sidebar from './components/sidebar';
+import Sidebar from './components/sidebar.jsx';
 import SyncPool from './state/sync_pool.js';
 import BOUND_CALCULATORS from './state/bound_calculators.js';
 

package/src/index.d.ts

@@ -0,0 +1,66 @@
+import React from 'react';
+
+export interface GrapherProps {
+  id: string;
+  series: any[];
+  theme?: string;
+  showAxes?: boolean;
+  showRangeGraph?: boolean;
+  showRangeSelectors?: boolean;
+  showSeriesKey?: boolean;
+  showTooltips?: boolean;
+  boundsSelectionEnabled?: boolean;
+  customBoundsSelectors?: any[];
+  sidebarEnabled?: boolean;
+  defaultShowAnnotations?: boolean;
+  defaultShowOptions?: boolean;
+  fullscreen?: boolean;
+  height?: number | string;
+  width?: number | string;
+  title?: string;
+  annotations?: any[];
+  onAxisChange?: (axes: any) => void;
+  onRenderTime?: (time: number) => void;
+  exportStateController?: (controller: any) => void;
+  stateControllerInitialization?: any;
+  timingFrameCount?: number;
+  percentile?: number;
+  showAxisColors?: boolean;
+  showGrid?: boolean;
+  bigLabels?: boolean;
+  defaultLineWidth?: number;
+  bodyHeight?: number;
+  dragPositionYOffset?: number;
+  syncPool?: any;
+}
+
+export interface MultiGrapherProps extends GrapherProps {
+  syncBounds?: boolean;
+  syncTooltips?: boolean;
+  newUpperEnabled?: boolean;
+  onMultiseriesChange?: (series: any[]) => void;
+}
+
+export interface RangeSelectionProps {
+  stateController: any;
+  customBoundsSelectors?: any[];
+  customBoundsSelectorsOnly?: boolean;
+  sidebarEnabled?: boolean;
+}
+
+export interface SyncPoolOptions {
+  syncBounds?: boolean;
+  syncTooltips?: boolean;
+  syncDragState?: boolean;
+}
+
+declare const Grapher: React.ComponentType<GrapherProps>;
+declare const MultiGrapher: React.ComponentType<MultiGrapherProps>;
+declare const RangeSelection: React.ComponentType<RangeSelectionProps>;
+declare const SyncPool: any;
+
+export const AVAILABLE_COLORS: string[];
+export const BUILT_IN_BOUND_CALCULATORS: Record<string, (globalBounds?: any) => any>;
+
+export { Grapher, MultiGrapher, RangeSelection, SyncPool };
+export default Grapher; 

package/src/index.js

@@ -0,0 +1,6 @@
+export { default as Grapher, AVAILABLE_COLORS, BUILT_IN_BOUND_CALCULATORS } from './grapher.jsx';
+export { default as MultiGrapher } from './multigrapher.jsx';
+export { default as RangeSelection } from './components/range_selection.jsx';
+export { default as SyncPool } from './state/sync_pool.js';
+
+export { default } from './grapher.jsx'; 

package/src/index.mjs

@@ -0,0 +1,5 @@
+export { default as Grapher } from './grapher.js';
+export { default as MultiGrapher } from './multigrapher.js';
+
+// Default export is the main Grapher component
+export { default } from './grapher.js'; 

package/src/{multigrapher.js → multigrapher.jsx}

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
-import Grapher from './grapher.js';
+import Grapher from './grapher.jsx';
 import MultigraphStateController from './state/multigraph_state_controller.js';
 import {useDraggingY, useMultiSeries} from './state/hooks.js';
 import SyncPool from './state/sync_pool.js';

package/src/rust/Cargo.lock

@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 

package/src/rust/pkg/index.js

@@ -1,22 +1,5 @@
 let wasm;
 
-const heap = new Array(128).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-function getObject(idx) { return heap[idx]; }
-
-let heap_next = heap.length;
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 let cachedUint8ArrayMemory0 = null;
 
 function getUint8ArrayMemory0() {
@@ -31,18 +14,6 @@ function getArrayU8FromWasm0(ptr, len) {
     return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
 }
 
-function dropObject(idx) {
-    if (idx < 132) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
@@ -143,14 +114,6 @@ function passArray8ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
-
-let stack_pointer = 128;
-
-function addBorrowedObject(obj) {
-    if (stack_pointer == 1) throw new Error('out of js stack');
-    heap[--stack_pointer] = obj;
-    return stack_pointer;
-}
 /**
  * @param {number} length
  * @param {Float64Array} data
@@ -162,23 +125,19 @@ function addBorrowedObject(obj) {
  * @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) {
-    try {
-        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, addBorrowedObject(params), ptr2, len2, addHeapObject(null_mask), ptr3, len3, addHeapObject(y_values), ptr4, len4, addHeapObject(min_y_values), ptr5, len5, addHeapObject(max_y_values));
-    } finally {
-        heap[stack_pointer++] = undefined;
-    }
+    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);
 }
 
 let cachedFloat32ArrayMemory0 = null;
@@ -243,7 +202,7 @@ export function extract_vertices(dpi_increase, null_mask, y_values, min_y_values
     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, addHeapObject(positions), ptr5, len5, addHeapObject(prev_positions), ptr6, len6, addHeapObject(vertices), ptr7, len7, addHeapObject(indices), dashed, dash0, dash1);
+    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);
 }
 
 /**
@@ -308,41 +267,48 @@ function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
     imports.wbg.__wbg_maxx_a3b1e1c3299e47bf = function(arg0) {
-        const ret = getObject(arg0).maxX;
+        const ret = arg0.maxX;
         return ret;
     };
     imports.wbg.__wbg_maxy_007b81ea99058122 = function(arg0) {
-        const ret = getObject(arg0).maxY;
+        const ret = arg0.maxY;
         return ret;
     };
     imports.wbg.__wbg_minx_e03d57649d81fc8f = function(arg0) {
-        const ret = getObject(arg0).minX;
+        const ret = arg0.minX;
         return ret;
     };
     imports.wbg.__wbg_miny_46aab5af597882a7 = function(arg0) {
-        const ret = getObject(arg0).minY;
+        const ret = arg0.minY;
         return ret;
     };
     imports.wbg.__wbg_renderheight_d030fe5a23b4c32b = function(arg0) {
-        const ret = getObject(arg0).renderHeight;
+        const ret = arg0.renderHeight;
         return ret;
     };
     imports.wbg.__wbg_renderwidth_8685762ee304f2a7 = function(arg0) {
-        const ret = getObject(arg0).renderWidth;
+        const ret = arg0.renderWidth;
         return ret;
     };
     imports.wbg.__wbg_scale_d705e0de44ed2361 = function(arg0) {
-        const ret = getObject(arg0).scale;
-        return addHeapObject(ret);
+        const ret = arg0.scale;
+        return ret;
     };
     imports.wbg.__wbindgen_copy_to_typed_array = function(arg0, arg1, arg2) {
-        new Uint8Array(getObject(arg2).buffer, getObject(arg2).byteOffset, getObject(arg2).byteLength).set(getArrayU8FromWasm0(arg0, arg1));
+        new Uint8Array(arg2.buffer, arg2.byteOffset, arg2.byteLength).set(getArrayU8FromWasm0(arg0, arg1));
     };
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
+    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 = getObject(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;