@jbrowse/core 1.7.11 → 2.1.0

package/pluggableElementTypes/renderers/ServerSideRenderedContent.js

@@ -1,76 +1,65 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports.default = ServerSideRenderedContent;
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-var _styles = require("@material-ui/core/styles");
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _reactDom = require("react-dom");
-
-var _ui = require("../../ui");
-
-var _util = require("../../util");
-
-var _excluded = ["theme", "html", "RenderingComponent"];
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importStar(require("react"));
+const styles_1 = require("@mui/material/styles");
+const react_dom_1 = require("react-dom");
+const ui_1 = require("../../ui");
+const util_1 = require("../../util");
 function ServerSideRenderedContent(props) {
-  var ssrContainerNode = (0, _react.useRef)(null);
-  var theme = props.theme,
-      html = props.html,
-      RenderingComponent = props.RenderingComponent,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var jbrowseTheme = (0, _ui.createJBrowseTheme)(theme);
-  (0, _react.useEffect)(function () {
-    var domNode = ssrContainerNode.current;
-
-    function doHydrate() {
-      if (domNode) {
-        if (domNode) {
-          (0, _reactDom.unmountComponentAtNode)(domNode);
+    const ssrContainerNode = (0, react_1.useRef)(null);
+    const { theme, html, RenderingComponent, ...rest } = props;
+    const jbrowseTheme = (0, ui_1.createJBrowseTheme)(theme);
+    (0, react_1.useEffect)(() => {
+        const domNode = ssrContainerNode.current;
+        function doHydrate() {
+            if (domNode) {
+                if (domNode) {
+                    (0, react_dom_1.unmountComponentAtNode)(domNode);
+                }
+                domNode.innerHTML = html;
+                // defer main-thread rendering and hydration for when
+                // we have some free time. helps keep the framerate up.
+                //
+                // note: the timeout param to rIC below helps when you are doing
+                // a long continuous scroll, it forces it to evaluate because
+                // otherwise the continuous scroll would never give it time to do
+                // so
+                (0, util_1.rIC)(() => {
+                    (0, react_dom_1.hydrate)(react_1.default.createElement(styles_1.ThemeProvider, { theme: jbrowseTheme },
+                        react_1.default.createElement(RenderingComponent, { ...rest })), domNode);
+                }, { timeout: 300 });
+            }
         }
-
-        domNode.innerHTML = html; // defer main-thread rendering and hydration for when
-        // we have some free time. helps keep the framerate up.
-        //
-        // note: the timeout param to rIC below helps when you are doing
-        // a long continuous scroll, it forces it to evaluate because
-        // otherwise the continuous scroll would never give it time to do
-        // so
-
-        (0, _util.rIC)(function () {
-          (0, _reactDom.hydrate)( /*#__PURE__*/_react.default.createElement(_styles.ThemeProvider, {
-            theme: jbrowseTheme
-          }, /*#__PURE__*/_react.default.createElement(RenderingComponent, rest)), domNode);
-        }, {
-          timeout: 300
-        });
-      }
-    }
-
-    doHydrate();
-    return function () {
-      if (domNode) {
-        (0, _reactDom.unmountComponentAtNode)(domNode);
-      }
-    };
-  }, [html, jbrowseTheme, rest, RenderingComponent]);
-  return /*#__PURE__*/_react.default.createElement("div", {
-    ref: ssrContainerNode,
-    "data-html-size": html.length,
-    className: "ssr-container"
-  });
-}
+        doHydrate();
+        return () => {
+            if (domNode) {
+                (0, react_dom_1.unmountComponentAtNode)(domNode);
+            }
+        };
+    }, [html, jbrowseTheme, rest, RenderingComponent]);
+    return (react_1.default.createElement("div", { ref: ssrContainerNode, "data-html-size": html.length, className: "ssr-container" }));
+}
+exports.default = ServerSideRenderedContent;

package/pluggableElementTypes/renderers/ServerSideRendererType.d.ts

@@ -1,4 +1,4 @@
-import { ThemeOptions } from '@material-ui/core';
+import { DeprecatedThemeOptions } from '@mui/material';
 import { SnapshotOrInstance, SnapshotIn } from 'mobx-state-tree';
 import RendererType, { RenderProps, RenderResults } from './RendererType';
 import SerializableFilterChain, { SerializedFilterChain } from './util/serializableFilterChain';
@@ -7,7 +7,7 @@ import RpcManager from '../../rpc/RpcManager';
 interface BaseRenderArgs extends RenderProps {
     sessionId: string;
     signal?: AbortSignal;
-    theme: ThemeOptions;
+    theme: DeprecatedThemeOptions;
     exportSVG: {
         rasterizeLayers?: boolean;
     };

package/pluggableElementTypes/renderers/ServerSideRendererType.js

@@ -1,85 +1,45 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports.default = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _react = _interopRequireDefault(require("react"));
-
-var _styles = require("@material-ui/core/styles");
-
-var _canvasSequencer = require("canvas-sequencer");
-
-var _server = require("react-dom/server");
-
-var _mobxStateTree = require("mobx-state-tree");
-
-var _util = require("../../util");
-
-var _RendererType2 = _interopRequireDefault(require("./RendererType"));
-
-var _serializableFilterChain = _interopRequireDefault(require("./util/serializableFilterChain"));
-
-var _ui = require("../../ui");
-
-var _ServerSideRenderedContent = _interopRequireDefault(require("./ServerSideRenderedContent"));
-
-var _excluded = ["html"];
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importDefault(require("react"));
+const styles_1 = require("@mui/material/styles");
+const canvas_sequencer_1 = require("canvas-sequencer");
+const server_1 = require("react-dom/server");
+const mobx_state_tree_1 = require("mobx-state-tree");
+const util_1 = require("../../util");
+const RendererType_1 = __importDefault(require("./RendererType"));
+const serializableFilterChain_1 = __importDefault(require("./util/serializableFilterChain"));
+const ui_1 = require("../../ui");
+const ServerSideRenderedContent_1 = __importDefault(require("./ServerSideRenderedContent"));
 function isSvgExport(elt) {
-  return 'canvasRecordedData' in elt;
+    return 'canvasRecordedData' in elt;
 }
-
-var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
-  (0, _inherits2.default)(ServerSideRenderer, _RendererType);
-
-  var _super = _createSuper(ServerSideRenderer);
-
-  function ServerSideRenderer() {
-    (0, _classCallCheck2.default)(this, ServerSideRenderer);
-    return _super.apply(this, arguments);
-  }
-
-  (0, _createClass2.default)(ServerSideRenderer, [{
-    key: "serializeArgsInClient",
-    value:
+class ServerSideRenderer extends RendererType_1.default {
     /**
      * directly modifies the render arguments to prepare them to be serialized and
      * sent to the worker.
@@ -87,11 +47,14 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
      * @param args - the arguments passed to render
      * @returns the same object
      */
-    function serializeArgsInClient(args) {
-      return _objectSpread(_objectSpread({}, args), {}, {
-        config: (0, _mobxStateTree.isStateTreeNode)(args.config) ? (0, _mobxStateTree.getSnapshot)(args.config) : args.config,
-        filters: args.filters && args.filters.toJSON().filters
-      });
+    serializeArgsInClient(args) {
+        return {
+            ...args,
+            config: (0, mobx_state_tree_1.isStateTreeNode)(args.config)
+                ? (0, mobx_state_tree_1.getSnapshot)(args.config)
+                : args.config,
+            filters: args.filters && args.filters.toJSON().filters,
+        };
     }
     /**
      * Deserialize the render results from the worker in the client. Includes
@@ -101,28 +64,25 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
      * @param results - the results of the render
      * @param args - the arguments passed to render
      */
-
-  }, {
-    key: "deserializeResultsInClient",
-    value: function deserializeResultsInClient(results, args) {
-      var html = results.html,
-          rest = (0, _objectWithoutProperties2.default)(results, _excluded); // if we are rendering svg, we skip hydration
-
-      if (args.exportSVG) {
-        // only return the results if the renderer explicitly has
-        // this.supportsSVG support to avoid garbage being rendered in SVG
-        // document
-        return _objectSpread(_objectSpread({}, results), {}, {
-          html: this.supportsSVG ? results.html : '<text y="12" fill="black">SVG export not supported for this track</text>'
-        });
-      } // hydrate results using ServerSideRenderedContent
-
-
-      return _objectSpread(_objectSpread({}, rest), {}, {
-        reactElement: /*#__PURE__*/_react.default.createElement(_ServerSideRenderedContent.default, (0, _extends2.default)({}, args, results, {
-          RenderingComponent: this.ReactComponent
-        }))
-      });
+    deserializeResultsInClient(results, args) {
+        const { html, ...rest } = results;
+        // if we are rendering svg, we skip hydration
+        if (args.exportSVG) {
+            // only return the results if the renderer explicitly has
+            // this.supportsSVG support to avoid garbage being rendered in SVG
+            // document
+            return {
+                ...results,
+                html: this.supportsSVG
+                    ? results.html
+                    : '<text y="12" fill="black">SVG export not supported for this track</text>',
+            };
+        }
+        // hydrate results using ServerSideRenderedContent
+        return {
+            ...rest,
+            reactElement: (react_1.default.createElement(ServerSideRenderedContent_1.default, { ...args, ...results, RenderingComponent: this.ReactComponent })),
+        };
     }
     /**
      * modifies the passed arguments object to inflate arguments as necessary.
@@ -130,19 +90,15 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
      *
      * @param args - the converted arguments to modify
      */
-
-  }, {
-    key: "deserializeArgsInWorker",
-    value: function deserializeArgsInWorker(args) {
-      var deserialized = _objectSpread({}, args);
-
-      deserialized.config = this.configSchema.create(args.config || {}, {
-        pluginManager: this.pluginManager
-      });
-      deserialized.filters = new _serializableFilterChain.default({
-        filters: args.filters
-      });
-      return deserialized;
+    deserializeArgsInWorker(args) {
+        const deserialized = { ...args };
+        deserialized.config = this.configSchema.create(args.config || {}, {
+            pluginManager: this.pluginManager,
+        });
+        deserialized.filters = new serializableFilterChain_1.default({
+            filters: args.filters,
+        });
+        return deserialized;
     }
     /**
      * Serialize results of the render to send them to the client. Includes
@@ -152,17 +108,10 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
      * method
      * @param args - deserialized render args
      */
-
-  }, {
-    key: "serializeResultsInWorker",
-    value: function serializeResultsInWorker(results, args) {
-      var html = (0, _server.renderToString)( /*#__PURE__*/_react.default.createElement(_styles.ThemeProvider, {
-        theme: (0, _ui.createJBrowseTheme)(args.theme)
-      }, results.reactElement));
-      delete results.reactElement;
-      return _objectSpread(_objectSpread({}, results), {}, {
-        html: html
-      });
+    serializeResultsInWorker(results, args) {
+        const html = (0, server_1.renderToString)(react_1.default.createElement(styles_1.ThemeProvider, { theme: (0, ui_1.createJBrowseTheme)(args.theme) }, results.reactElement));
+        delete results.reactElement;
+        return { ...results, html };
     }
     /**
      * Render method called on the client. Serializes args, then calls
@@ -171,145 +120,43 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
      * @param rpcManager - RPC mananger
      * @param args - render args
      */
-
-  }, {
-    key: "renderInClient",
-    value: function () {
-      var _renderInClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(rpcManager, args) {
-        var results, width, height, canvasRecordedData, C2S, ctx, seq, str;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return rpcManager.call(args.sessionId, 'CoreRender', args);
-
-              case 2:
-                results = _context.sent;
-
-                if (!isSvgExport(results)) {
-                  _context.next = 14;
-                  break;
-                }
-
-                width = results.width, height = results.height, canvasRecordedData = results.canvasRecordedData;
-                _context.next = 7;
-                return Promise.resolve().then(function () {
-                  return _interopRequireWildcard(require('canvas2svg'));
-                });
-
-              case 7:
-                C2S = _context.sent;
-                ctx = new C2S.default(width, height);
-                seq = new _canvasSequencer.CanvasSequence(canvasRecordedData);
-                seq.execute(ctx);
-                str = ctx.getSvg(); // innerHTML strips the outer <svg> element from returned data, we add
-                // our own <svg> element in the view's SVG export
-
-                results.html = str.innerHTML;
-                delete results.reactElement;
-
-              case 14:
-                return _context.abrupt("return", results);
-
-              case 15:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function renderInClient(_x, _x2) {
-        return _renderInClient.apply(this, arguments);
-      }
-
-      return renderInClient;
-    }()
+    async renderInClient(rpcManager, args) {
+        const results = (await rpcManager.call(args.sessionId, 'CoreRender', args));
+        if (isSvgExport(results)) {
+            const { width, height, canvasRecordedData } = results;
+            const C2S = await Promise.resolve().then(() => __importStar(require('canvas2svg')));
+            const ctx = new C2S.default(width, height);
+            const seq = new canvas_sequencer_1.CanvasSequence(canvasRecordedData);
+            seq.execute(ctx);
+            const str = ctx.getSvg();
+            // innerHTML strips the outer <svg> element from returned data, we add
+            // our own <svg> element in the view's SVG export
+            results.html = str.innerHTML;
+            delete results.reactElement;
+        }
+        return results;
+    }
     /**
      * Render method called on the worker. `render` is called here in server-side
      * rendering
      *
      * @param args - serialized render args
      */
-
-  }, {
-    key: "renderInWorker",
-    value: function () {
-      var _renderInWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(args) {
-        var _this = this;
-
-        var signal, _args$statusCallback, statusCallback, deserializedArgs, results;
-
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                signal = args.signal, _args$statusCallback = args.statusCallback, statusCallback = _args$statusCallback === void 0 ? function () {} : _args$statusCallback;
-                deserializedArgs = this.deserializeArgsInWorker(args);
-                _context2.next = 4;
-                return (0, _util.updateStatus)('Rendering plot', statusCallback, function () {
-                  return _this.render(deserializedArgs);
-                });
-
-              case 4:
-                results = _context2.sent;
-                (0, _util.checkAbortSignal)(signal); // serialize the results for passing back to the main thread.
-                // these will be transmitted to the main process, and will come out
-                // as the result of renderRegionWithWorker.
-
-                return _context2.abrupt("return", (0, _util.updateStatus)('Serializing results', statusCallback, function () {
-                  return _this.serializeResultsInWorker(results, deserializedArgs);
-                }));
-
-              case 7:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function renderInWorker(_x3) {
-        return _renderInWorker.apply(this, arguments);
-      }
-
-      return renderInWorker;
-    }()
-  }, {
-    key: "freeResourcesInClient",
-    value: function () {
-      var _freeResourcesInClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(rpcManager, args) {
-        var serializedArgs, freed, freedRpc;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                serializedArgs = this.serializeArgsInClient(args);
-                freed = this.freeResources();
-                _context3.next = 4;
-                return rpcManager.call(args.sessionId, 'CoreFreeResources', serializedArgs);
-
-              case 4:
-                freedRpc = _context3.sent;
-                return _context3.abrupt("return", freed + freedRpc);
-
-              case 6:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function freeResourcesInClient(_x4, _x5) {
-        return _freeResourcesInClient.apply(this, arguments);
-      }
-
-      return freeResourcesInClient;
-    }()
-  }]);
-  return ServerSideRenderer;
-}(_RendererType2.default);
-
-exports.default = ServerSideRenderer;
+    async renderInWorker(args) {
+        const { signal, statusCallback = () => { } } = args;
+        const deserializedArgs = this.deserializeArgsInWorker(args);
+        const results = await (0, util_1.updateStatus)('Rendering plot', statusCallback, () => this.render(deserializedArgs));
+        (0, util_1.checkAbortSignal)(signal);
+        // serialize the results for passing back to the main thread.
+        // these will be transmitted to the main process, and will come out
+        // as the result of renderRegionWithWorker.
+        return (0, util_1.updateStatus)('Serializing results', statusCallback, () => this.serializeResultsInWorker(results, deserializedArgs));
+    }
+    async freeResourcesInClient(rpcManager, args) {
+        const serializedArgs = this.serializeArgsInClient(args);
+        const freed = this.freeResources();
+        const freedRpc = (await rpcManager.call(args.sessionId, 'CoreFreeResources', serializedArgs));
+        return freed + freedRpc;
+    }
+}
+exports.default = ServerSideRenderer;