@jbrowse/core 2.0.1 → 2.1.0

package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.js

@@ -1,57 +1,13 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-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 _operators = require("rxjs/operators");
-
-var _ServerSideRendererType = _interopRequireDefault(require("./ServerSideRendererType"));
-
-var _dataAdapterCache = require("../../data_adapters/dataAdapterCache");
-
-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 ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer) {
-  (0, _inherits2.default)(ComparativeServerSideRenderer, _ServerSideRenderer);
-
-  var _super = _createSuper(ComparativeServerSideRenderer);
-
-  function ComparativeServerSideRenderer() {
-    (0, _classCallCheck2.default)(this, ComparativeServerSideRenderer);
-    return _super.apply(this, arguments);
-  }
-
-  (0, _createClass2.default)(ComparativeServerSideRenderer, [{
-    key: "renameRegionsIfNeeded",
-    value:
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const operators_1 = require("rxjs/operators");
+const ServerSideRendererType_1 = __importDefault(require("./ServerSideRendererType"));
+const dataAdapterCache_1 = require("../../data_adapters/dataAdapterCache");
+class ComparativeServerSideRenderer extends ServerSideRendererType_1.default {
     /**
      * directly modifies the render arguments to prepare
      * them to be serialized and sent to the worker.
@@ -65,154 +21,66 @@ var ComparativeServerSideRenderer = /*#__PURE__*/function (_ServerSideRenderer)
      * @param args - the arguments passed to render
      * @returns the same object
      */
-    function () {
-      var _renameRegionsIfNeeded = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(args) {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                return _context.abrupt("return", args);
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function renameRegionsIfNeeded(_x) {
-        return _renameRegionsIfNeeded.apply(this, arguments);
-      }
-
-      return renameRegionsIfNeeded;
-    }()
-  }, {
-    key: "serializeArgsInClient",
-    value: function serializeArgsInClient(args) {
-      var deserializedArgs = _objectSpread(_objectSpread({}, args), {}, {
-        displayModel: {}
-      });
-
-      return (0, _get2.default)((0, _getPrototypeOf2.default)(ComparativeServerSideRenderer.prototype), "serializeArgsInClient", this).call(this, deserializedArgs);
-    } // deserialize some of the results that came back from the worker
-
-  }, {
-    key: "deserializeResultsInClient",
-    value: function deserializeResultsInClient(result, args) {
-      var deserialized = (0, _get2.default)((0, _getPrototypeOf2.default)(ComparativeServerSideRenderer.prototype), "deserializeResultsInClient", this).call(this, result, args);
-      return _objectSpread(_objectSpread({}, deserialized), {}, {
-        blockKey: args.blockKey
-      });
+    async renameRegionsIfNeeded(args) {
+        return args;
+    }
+    serializeArgsInClient(args) {
+        const deserializedArgs = {
+            ...args,
+            displayModel: {},
+        };
+        return super.serializeArgsInClient(deserializedArgs);
+    }
+    // deserialize some of the results that came back from the worker
+    deserializeResultsInClient(result, args) {
+        const deserialized = super.deserializeResultsInClient(result, args);
+        return { ...deserialized, blockKey: args.blockKey };
     }
     /**
      * Render method called on the client. Serializes args, then
      * calls `render` with the RPC manager.
      */
-
-  }, {
-    key: "renderInClient",
-    value: function () {
-      var _renderInClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(rpcManager, args) {
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", rpcManager.call(args.sessionId, 'ComparativeRender', args));
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }));
-
-      function renderInClient(_x2, _x3) {
-        return _renderInClient.apply(this, arguments);
-      }
-
-      return renderInClient;
-    }()
+    async renderInClient(rpcManager, args) {
+        return rpcManager.call(args.sessionId, 'ComparativeRender', args);
+    }
     /**
      * @param renderArgs -
      * @param feature -
      * @returns true if this feature passes all configured filters
      */
-
-  }, {
-    key: "featurePassesFilters",
-    value: function featurePassesFilters(renderArgs, feature) {
-      return renderArgs.filters ? renderArgs.filters.passes(feature, renderArgs) : true;
+    featurePassesFilters(renderArgs, feature) {
+        return renderArgs.filters
+            ? renderArgs.filters.passes(feature, renderArgs)
+            : true;
     }
-  }, {
-    key: "getFeatures",
-    value: function () {
-      var _getFeatures = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(renderArgs) {
-        var _this = this;
-
-        var sessionId, adapterConfig, _yield$getAdapter, dataAdapter, regions, requestRegions;
-
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                sessionId = renderArgs.sessionId, adapterConfig = renderArgs.adapterConfig;
-                _context3.next = 3;
-                return (0, _dataAdapterCache.getAdapter)(this.pluginManager, sessionId, adapterConfig);
-
-              case 3:
-                _yield$getAdapter = _context3.sent;
-                dataAdapter = _yield$getAdapter.dataAdapter;
-                regions = []; // @ts-ignore this is instantiated by the getFeatures call
-
-                regions = renderArgs.regions;
-
-                if (!(!regions || regions.length === 0)) {
-                  _context3.next = 10;
-                  break;
-                }
-
-                console.warn('no regions supplied to comparative renderer');
-                return _context3.abrupt("return", []);
-
-              case 10:
-                requestRegions = regions.map(function (r) {
-                  // make sure the requested region's start and end are integers, if
-                  // there is a region specification.
-                  var requestRegion = _objectSpread({}, r);
-
-                  if (requestRegion.start) {
-                    requestRegion.start = Math.floor(requestRegion.start);
-                  }
-
-                  if (requestRegion.end) {
-                    requestRegion.end = Math.floor(requestRegion.end);
-                  }
-
-                  return requestRegion;
-                }); // note that getFeaturesInMultipleRegions does not do glyph expansion
-
-                return _context3.abrupt("return", dataAdapter.getFeaturesInMultipleRegions(requestRegions, renderArgs).pipe((0, _operators.filter)(function (f) {
-                  return _this.featurePassesFilters(renderArgs, f);
-                }), (0, _operators.toArray)()).toPromise());
-
-              case 12:
-              case "end":
-                return _context3.stop();
+    async getFeatures(renderArgs) {
+        const pm = this.pluginManager;
+        const { sessionId, adapterConfig } = renderArgs;
+        const { dataAdapter } = await (0, dataAdapterCache_1.getAdapter)(pm, sessionId, adapterConfig);
+        let regions = [];
+        // @ts-ignore this is instantiated by the getFeatures call
+        regions = renderArgs.regions;
+        if (!regions || regions.length === 0) {
+            console.warn('no regions supplied to comparative renderer');
+            return [];
+        }
+        const requestRegions = regions.map(r => {
+            // make sure the requested region's start and end are integers, if
+            // there is a region specification.
+            const requestRegion = { ...r };
+            if (requestRegion.start) {
+                requestRegion.start = Math.floor(requestRegion.start);
+            }
+            if (requestRegion.end) {
+                requestRegion.end = Math.floor(requestRegion.end);
             }
-          }
-        }, _callee3, this);
-      }));
-
-      function getFeatures(_x4) {
-        return _getFeatures.apply(this, arguments);
-      }
-
-      return getFeatures;
-    }()
-  }]);
-  return ComparativeServerSideRenderer;
-}(_ServerSideRendererType.default);
-
-exports.default = ComparativeServerSideRenderer;
+            return requestRegion;
+        });
+        // note that getFeaturesInMultipleRegions does not do glyph expansion
+        return dataAdapter
+            .getFeaturesInMultipleRegions(requestRegions, renderArgs)
+            .pipe((0, operators_1.filter)(f => this.featurePassesFilters(renderArgs, f)), (0, operators_1.toArray)())
+            .toPromise();
+    }
+}
+exports.default = ComparativeServerSideRenderer;

package/pluggableElementTypes/renderers/FeatureRendererType.d.ts

@@ -89,5 +89,3 @@ export default class FeatureRendererType extends ServerSideRendererType {
      */
     render(props: RenderArgsDeserialized): Promise<RenderResults>;
 }
-export declare class NewFeatureRendererType extends ServerSideRendererType {
-}