@jbrowse/core 2.0.1 → 2.1.0

package/util/offscreenCanvasPonyfill.js

@@ -1,144 +1,76 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createImageBitmap = exports.createCanvas = exports.ImageBitmapType = void 0;
-exports.drawImageOntoCanvasContext = drawImageOntoCanvasContext;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _detectNode = _interopRequireDefault(require("detect-node"));
-
-var _canvasSequencer = require("canvas-sequencer");
-
 // This file is a ponyfill for the HTML5 OffscreenCanvas API.
-var createCanvas;
-exports.createCanvas = createCanvas;
-var createImageBitmap;
-/** the JS class (constructor) for offscreen-generated image bitmap data */
-
-exports.createImageBitmap = createImageBitmap;
-var ImageBitmapType;
-exports.ImageBitmapType = ImageBitmapType;
-
-function drawImageOntoCanvasContext( // eslint-disable-next-line @typescript-eslint/no-explicit-any
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.drawImageOntoCanvasContext = exports.ImageBitmapType = exports.createImageBitmap = exports.createCanvas = void 0;
+const detect_node_1 = __importDefault(require("detect-node"));
+const canvas_sequencer_1 = require("canvas-sequencer");
+function drawImageOntoCanvasContext(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 imageData, context) {
-  if (imageData.serializedCommands) {
-    var seq = new _canvasSequencer.CanvasSequence(imageData.serializedCommands);
-    seq.execute(context);
-  } else {
-    context.drawImage(imageData, 0, 0);
-  }
+    if (imageData.serializedCommands) {
+        const seq = new canvas_sequencer_1.CanvasSequence(imageData.serializedCommands);
+        seq.execute(context);
+    }
+    else {
+        context.drawImage(imageData, 0, 0);
+    }
 }
-
-var weHave = {
-  realOffscreenCanvas: typeof OffscreenCanvas === 'function',
-  node: _detectNode.default
+exports.drawImageOntoCanvasContext = drawImageOntoCanvasContext;
+const weHave = {
+    realOffscreenCanvas: typeof OffscreenCanvas === 'function',
+    node: detect_node_1.default,
 };
-
 if (weHave.realOffscreenCanvas) {
-  exports.createCanvas = createCanvas = function createCanvas(width, height) {
-    return new OffscreenCanvas(width, height);
-  }; // eslint-disable-next-line no-restricted-globals
-
-
-  exports.createImageBitmap = createImageBitmap = window.createImageBitmap || self.createImageBitmap; // eslint-disable-next-line no-restricted-globals
-
-  exports.ImageBitmapType = ImageBitmapType = window.ImageBitmap || self.ImageBitmap;
-} else if (weHave.node) {
-  // use node-canvas if we are running in node (i.e. automated tests)
-  exports.createCanvas = createCanvas = function createCanvas() {
-    // @ts-ignore
-    // eslint-disable-next-line no-undef
-    return nodeCreateCanvas.apply(void 0, arguments);
-  };
-
-  exports.createImageBitmap = createImageBitmap = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(canvas) {
-      var dataUri,
-          img,
-          _args = arguments;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!(_args.length <= 1 ? 0 : _args.length - 1)) {
-                _context.next = 2;
-                break;
-              }
-
-              throw new Error('only one-argument uses of createImageBitmap are supported by the node offscreencanvas ponyfill');
-
-            case 2:
-              dataUri = canvas.toDataURL(); // @ts-ignore
-              // eslint-disable-next-line no-undef
-
-              img = new nodeImage();
-              return _context.abrupt("return", new Promise(function (resolve, reject) {
-                img.onload = function () {
-                  return resolve(img);
-                };
-
-                img.onerror = reject;
-                img.src = dataUri;
-              }));
-
-            case 5:
-            case "end":
-              return _context.stop();
-          }
+    exports.createCanvas = (width, height) => new OffscreenCanvas(width, height);
+    // eslint-disable-next-line no-restricted-globals
+    exports.createImageBitmap = window.createImageBitmap || self.createImageBitmap;
+    // eslint-disable-next-line no-restricted-globals
+    exports.ImageBitmapType = window.ImageBitmap || self.ImageBitmap;
+}
+else if (weHave.node) {
+    // use node-canvas if we are running in node (i.e. automated tests)
+    exports.createCanvas = (...args) => {
+        // @ts-ignore
+        // eslint-disable-next-line no-undef
+        return nodeCreateCanvas(...args);
+    };
+    exports.createImageBitmap = async (canvas, ...otherargs) => {
+        if (otherargs.length) {
+            throw new Error('only one-argument uses of createImageBitmap are supported by the node offscreencanvas ponyfill');
         }
-      }, _callee);
-    }));
-
-    return function createImageBitmap(_x) {
-      return _ref.apply(this, arguments);
+        const dataUri = canvas.toDataURL();
+        // @ts-ignore
+        // eslint-disable-next-line no-undef
+        const img = new nodeImage();
+        return new Promise((resolve, reject) => {
+            img.onload = () => resolve(img);
+            img.onerror = reject;
+            img.src = dataUri;
+        });
     };
-  }();
-} else {
-  exports.createCanvas = createCanvas = function createCanvas(width, height) {
-    var context = new _canvasSequencer.CanvasSequence();
-    return {
-      width: width,
-      height: height,
-      getContext: function getContext() {
-        return context;
-      }
+}
+else {
+    exports.createCanvas = (width, height) => {
+        const context = new canvas_sequencer_1.CanvasSequence();
+        return {
+            width,
+            height,
+            getContext() {
+                return context;
+            },
+        };
     };
-  };
-
-  exports.createImageBitmap = createImageBitmap = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(canvas) {
-      var ctx;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              ctx = canvas.getContext('2d');
-              return _context2.abrupt("return", {
-                height: canvas.height,
-                width: canvas.width,
-                serializedCommands: ctx.toJSON(),
-                containsNoTransferables: true
-              });
-
-            case 2:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-
-    return function createImageBitmap(_x2) {
-      return _ref2.apply(this, arguments);
+    exports.createImageBitmap = async (canvas) => {
+        const ctx = canvas.getContext('2d');
+        return {
+            height: canvas.height,
+            width: canvas.width,
+            serializedCommands: ctx.toJSON(),
+            containsNoTransferables: true,
+        };
     };
-  }();
-
-  exports.ImageBitmapType = ImageBitmapType = String;
-}
+    exports.ImageBitmapType = String;
+}

package/util/offscreenCanvasUtils.d.ts

@@ -1,19 +1,14 @@
 /// <reference types="react" />
+export declare type RenderReturn = Record<string, unknown>;
 export declare function renderToAbstractCanvas(width: number, height: number, opts: {
     exportSVG?: {
         rasterizeLayers?: boolean;
     };
     highResolutionScaling: number;
-}, cb: Function): Promise<{
+}, cb: (ctx: CanvasRenderingContext2D) => Promise<RenderReturn | void> | RenderReturn | void): Promise<{
     canvasRecordedData: any;
-    reactElement?: undefined;
-    imageData?: undefined;
 } | {
     reactElement: JSX.Element;
-    canvasRecordedData?: undefined;
-    imageData?: undefined;
 } | {
     imageData: any;
-    canvasRecordedData?: undefined;
-    reactElement?: undefined;
 }>;

package/util/offscreenCanvasUtils.js

@@ -1,152 +1,55 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.renderToAbstractCanvas = renderToAbstractCanvas;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _react = _interopRequireDefault(require("react"));
-
-var _offscreenCanvasPonyfill = require("./offscreenCanvasPonyfill");
-
-var _canvasSequencer = require("canvas-sequencer");
-
-var _index = require("./index");
-
-function renderToAbstractCanvas(_x, _x2, _x3, _x4) {
-  return _renderToAbstractCanvas.apply(this, arguments);
-}
-
-function _renderToAbstractCanvas() {
-  _renderToAbstractCanvas = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(width, height, opts, cb) {
-    var exportSVG, _opts$highResolutionS, highResolutionScaling, fakeCtx, scale, canvas, ctx, _canvas, _ctx;
-
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            exportSVG = opts.exportSVG, _opts$highResolutionS = opts.highResolutionScaling, highResolutionScaling = _opts$highResolutionS === void 0 ? 1 : _opts$highResolutionS;
-
-            if (!exportSVG) {
-              _context.next = 37;
-              break;
-            }
-
-            if (exportSVG.rasterizeLayers) {
-              _context.next = 9;
-              break;
-            }
-
-            fakeCtx = new _canvasSequencer.CanvasSequence();
-            _context.next = 6;
-            return cb(fakeCtx);
-
-          case 6:
-            return _context.abrupt("return", {
-              canvasRecordedData: fakeCtx.toJSON()
-            });
-
-          case 9:
-            scale = 4;
-            canvas = (0, _offscreenCanvasPonyfill.createCanvas)(Math.ceil(width * scale), height * scale);
-            ctx = canvas.getContext('2d');
-
-            if (ctx) {
-              _context.next = 14;
-              break;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderToAbstractCanvas = void 0;
+const react_1 = __importDefault(require("react"));
+const canvas_sequencer_1 = require("canvas-sequencer");
+// locals
+const offscreenCanvasPonyfill_1 = require("./offscreenCanvasPonyfill");
+const index_1 = require("./index");
+async function renderToAbstractCanvas(width, height, opts, cb) {
+    const { exportSVG, highResolutionScaling: scaling = 1 } = opts;
+    if (exportSVG) {
+        if (!exportSVG.rasterizeLayers) {
+            const fakeCtx = new canvas_sequencer_1.CanvasSequence();
+            const result = await cb(fakeCtx);
+            return {
+                ...result,
+                canvasRecordedData: fakeCtx.toJSON(),
+            };
+        }
+        else {
+            const scale = 4;
+            const canvas = (0, offscreenCanvasPonyfill_1.createCanvas)(Math.ceil(width * scale), height * scale);
+            const ctx = canvas.getContext('2d');
+            if (!ctx) {
+                throw new Error('2d canvas rendering not supported on this platform');
             }
-
-            throw new Error('2d canvas rendering not supported on this platform');
-
-          case 14:
             ctx.scale(scale, scale);
-            _context.next = 17;
-            return cb(ctx);
-
-          case 17:
-            _context.t0 = _react.default;
-            _context.t1 = width;
-            _context.t2 = height;
-
-            if (!('convertToBlob' in canvas)) {
-              _context.next = 30;
-              break;
-            }
-
-            _context.t4 = _index.blobToDataURL;
-            _context.next = 24;
-            return canvas.convertToBlob({
-              type: 'image/png'
-            });
-
-          case 24:
-            _context.t5 = _context.sent;
-            _context.next = 27;
-            return (0, _context.t4)(_context.t5);
-
-          case 27:
-            _context.t3 = _context.sent;
-            _context.next = 31;
-            break;
-
-          case 30:
-            _context.t3 = canvas.toDataURL();
-
-          case 31:
-            _context.t6 = _context.t3;
-            _context.t7 = {
-              width: _context.t1,
-              height: _context.t2,
-              xlinkHref: _context.t6
+            const result = await cb(ctx);
+            // two methods needed for converting canvas to PNG, one for webworker
+            // offscreen canvas, one for main thread
+            return {
+                ...result,
+                reactElement: (react_1.default.createElement("image", { width: width, height: height, xlinkHref: 'convertToBlob' in canvas
+                        ? await (0, index_1.blobToDataURL)(await canvas.convertToBlob({
+                            type: 'image/png',
+                        }))
+                        : canvas.toDataURL() })),
             };
-            _context.t8 = _context.t0.createElement.call(_context.t0, "image", _context.t7);
-            return _context.abrupt("return", {
-              reactElement: _context.t8
-            });
-
-          case 35:
-            _context.next = 48;
-            break;
-
-          case 37:
-            _canvas = (0, _offscreenCanvasPonyfill.createCanvas)(Math.ceil(width * highResolutionScaling), height * highResolutionScaling);
-            _ctx = _canvas.getContext('2d');
-
-            if (_ctx) {
-              _context.next = 41;
-              break;
-            }
-
+        }
+    }
+    else {
+        const canvas = (0, offscreenCanvasPonyfill_1.createCanvas)(Math.ceil(width * scaling), height * scaling);
+        const ctx = canvas.getContext('2d');
+        if (!ctx) {
             throw new Error('2d canvas rendering not supported on this platform');
-
-          case 41:
-            _ctx.scale(highResolutionScaling, highResolutionScaling);
-
-            _context.next = 44;
-            return cb(_ctx);
-
-          case 44:
-            _context.next = 46;
-            return (0, _offscreenCanvasPonyfill.createImageBitmap)(_canvas);
-
-          case 46:
-            _context.t9 = _context.sent;
-            return _context.abrupt("return", {
-              imageData: _context.t9
-            });
-
-          case 48:
-          case "end":
-            return _context.stop();
         }
-      }
-    }, _callee);
-  }));
-  return _renderToAbstractCanvas.apply(this, arguments);
-}
+        ctx.scale(scaling, scaling);
+        const result = await cb(ctx);
+        return { ...result, imageData: await (0, offscreenCanvasPonyfill_1.createImageBitmap)(canvas) };
+    }
+}
+exports.renderToAbstractCanvas = renderToAbstractCanvas;

package/util/range.js

@@ -1,12 +1,6 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.doesIntersect2 = doesIntersect2;
-exports.intersection2 = intersection2;
-exports.isContainedWithin = isContainedWithin;
-
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isContainedWithin = exports.doesIntersect2 = exports.intersection2 = void 0;
 /**
  * fast low-level intersection of 2 coordinate ranges. assumes interbase coordinates.
  *
@@ -15,33 +9,30 @@ exports.isContainedWithin = isContainedWithin;
  * @returns array of [left, right], or [] if the ranges do not intersect. the choice of [] is because it allows destructuring array assignment without check for undefined return
  */
 function intersection2(left1, right1, left2, right2) {
-  // this code is verbose because "if" statements are faster than Math.min and Math.max
-  if (right1 > left2 && left1 < right2 && right2 - left2 && right1 - left1) {
-    if (left1 > left2) {
-      if (right1 < right2) {
-        // 1     |-------|
-        //     |------------|
-        return [left1, right1];
-      } // 2         |----|
-      //      |------|
-
-
-      return [left1, right2];
+    // this code is verbose because "if" statements are faster than Math.min and Math.max
+    if (right1 > left2 && left1 < right2 && right2 - left2 && right1 - left1) {
+        if (left1 > left2) {
+            if (right1 < right2) {
+                // 1     |-------|
+                //     |------------|
+                return [left1, right1];
+            }
+            // 2         |----|
+            //      |------|
+            return [left1, right2];
+        }
+        if (right1 < right2) {
+            // 3  |-----|
+            //       |------|
+            return [left2, right1];
+        }
+        // 4     |------------|
+        //         |-------|
+        return [left2, right2];
     }
-
-    if (right1 < right2) {
-      // 3  |-----|
-      //       |------|
-      return [left2, right1];
-    } // 4     |------------|
-    //         |-------|
-
-
-    return [left2, right2];
-  }
-
-  return [];
+    return [];
 }
+exports.intersection2 = intersection2;
 /**
  * Return whether 2 interbase coordinate ranges intersect.
  *
@@ -52,11 +43,10 @@ function intersection2(left1, right1, left2, right2) {
  *
  * @returns true if the two ranges intersect
  */
-
-
 function doesIntersect2(left1, right1, left2, right2) {
-  return right1 > left2 && left1 < right2;
+    return right1 > left2 && left1 < right2;
 }
+exports.doesIntersect2 = doesIntersect2;
 /**
  * Return whether the first region is completely contained within the second region
  *
@@ -65,8 +55,7 @@ function doesIntersect2(left1, right1, left2, right2) {
  * @param left2 - candidate outer region left
  * @param right2 - candidate outer region right
  */
-
-
 function isContainedWithin(left1, right1, left2, right2) {
-  return left2 <= left1 && right2 >= right1;
-}
+    return left2 <= left1 && right2 >= right1;
+}
+exports.isContainedWithin = isContainedWithin;

package/util/rxjs.js

@@ -1,34 +1,27 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ObservableCreate = ObservableCreate;
-
-var _rxjs = require("rxjs");
-
-var _operators = require("rxjs/operators");
-
-var _ = require(".");
-
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObservableCreate = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const _1 = require(".");
 /**
  * Wrapper for rxjs Observable.create with improved error handling and
  * aborting support
  * @param func - observer function, could be async
  */
 function ObservableCreate(func, signal) {
-  return _rxjs.Observable.create(function (observer) {
-    try {
-      var ret = func(observer); // catch async errors
-
-      if (ret && ret.catch) {
-        ret.catch(function (error) {
-          return observer.error(error);
-        });
-      }
-    } catch (error) {
-      // catch sync errors
-      observer.error(error);
-    }
-  }).pipe((0, _operators.takeUntil)((0, _.observeAbortSignal)(signal)));
-}
+    return rxjs_1.Observable.create((observer) => {
+        try {
+            const ret = func(observer);
+            // catch async errors
+            if (ret && ret.catch) {
+                ret.catch(error => observer.error(error));
+            }
+        }
+        catch (error) {
+            // catch sync errors
+            observer.error(error);
+        }
+    }).pipe((0, operators_1.takeUntil)((0, _1.observeAbortSignal)(signal)));
+}
+exports.ObservableCreate = ObservableCreate;