@jbrowse/core 2.0.1 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (179) hide show
  1. package/BaseFeatureWidget/BaseFeatureDetail.d.ts +6 -0
  2. package/BaseFeatureWidget/BaseFeatureDetail.js +313 -592
  3. package/BaseFeatureWidget/SequenceFeatureDetails.js +213 -479
  4. package/BaseFeatureWidget/index.js +88 -126
  5. package/BaseFeatureWidget/types.js +1 -4
  6. package/BaseFeatureWidget/util.js +40 -75
  7. package/CorePlugin.js +55 -94
  8. package/Plugin.js +9 -34
  9. package/PluginLoader.js +153 -422
  10. package/PluginManager.d.ts +17 -14
  11. package/PluginManager.js +377 -666
  12. package/ReExports/Attributes.js +3 -10
  13. package/ReExports/BaseCard.js +3 -10
  14. package/ReExports/DataGrid.js +5 -12
  15. package/ReExports/FeatureDetails.js +3 -10
  16. package/ReExports/index.js +6 -12
  17. package/ReExports/list.d.ts +5 -0
  18. package/ReExports/list.js +271 -7
  19. package/ReExports/material-ui-colors.js +15 -16
  20. package/ReExports/modules.d.ts +0 -1
  21. package/ReExports/modules.js +453 -798
  22. package/TextSearch/BaseResults.js +51 -123
  23. package/TextSearch/TextSearchManager.js +66 -144
  24. package/assemblyManager/assembly.js +280 -555
  25. package/assemblyManager/assemblyConfigSchema.js +47 -64
  26. package/assemblyManager/assemblyManager.js +126 -272
  27. package/assemblyManager/index.js +9 -22
  28. package/configuration/configurationSchema.js +167 -203
  29. package/configuration/configurationSlot.js +248 -326
  30. package/configuration/index.js +19 -35
  31. package/configuration/util.js +131 -173
  32. package/data_adapters/BaseAdapter.d.ts +2 -2
  33. package/data_adapters/BaseAdapter.js +132 -521
  34. package/data_adapters/CytobandAdapter.js +40 -126
  35. package/data_adapters/dataAdapterCache.js +77 -158
  36. package/package.json +4 -5
  37. package/pluggableElementTypes/AdapterType.js +24 -79
  38. package/pluggableElementTypes/AddTrackWorkflowType.d.ts +17 -0
  39. package/pluggableElementTypes/AddTrackWorkflowType.js +20 -0
  40. package/pluggableElementTypes/ConnectionType.js +22 -65
  41. package/pluggableElementTypes/DisplayType.js +35 -82
  42. package/pluggableElementTypes/InternetAccountType.js +23 -64
  43. package/pluggableElementTypes/PluggableElementBase.js +8 -20
  44. package/pluggableElementTypes/RpcMethodType.js +85 -427
  45. package/pluggableElementTypes/TextSearchAdapterType.js +16 -55
  46. package/pluggableElementTypes/TrackType.js +26 -70
  47. package/pluggableElementTypes/ViewType.js +21 -63
  48. package/pluggableElementTypes/WidgetType.js +21 -64
  49. package/pluggableElementTypes/index.d.ts +4 -3
  50. package/pluggableElementTypes/index.js +42 -125
  51. package/pluggableElementTypes/models/BaseConnectionModelFactory.js +28 -43
  52. package/pluggableElementTypes/models/BaseDisplayModel.js +58 -95
  53. package/pluggableElementTypes/models/BaseTrackModel.js +139 -199
  54. package/pluggableElementTypes/models/BaseViewModel.js +24 -40
  55. package/pluggableElementTypes/models/InternetAccountModel.js +116 -263
  56. package/pluggableElementTypes/models/baseConnectionConfig.js +14 -25
  57. package/pluggableElementTypes/models/baseInternetAccountConfig.js +29 -38
  58. package/pluggableElementTypes/models/baseTrackConfig.js +106 -133
  59. package/pluggableElementTypes/models/index.js +21 -70
  60. package/pluggableElementTypes/renderers/BoxRendererType.js +132 -291
  61. package/pluggableElementTypes/renderers/CircularChordRendererType.js +8 -38
  62. package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.js +60 -192
  63. package/pluggableElementTypes/renderers/FeatureRendererType.d.ts +0 -2
  64. package/pluggableElementTypes/renderers/FeatureRendererType.js +89 -264
  65. package/pluggableElementTypes/renderers/RendererType.js +31 -105
  66. package/pluggableElementTypes/renderers/ServerSideRenderedContent.js +61 -72
  67. package/pluggableElementTypes/renderers/ServerSideRendererType.js +112 -265
  68. package/pluggableElementTypes/renderers/index.js +19 -62
  69. package/pluggableElementTypes/renderers/util/serializableFilterChain.js +27 -65
  70. package/rpc/BaseRpcDriver.js +169 -405
  71. package/rpc/MainThreadRpcDriver.js +27 -150
  72. package/rpc/RpcManager.js +58 -159
  73. package/rpc/WebWorkerRpcDriver.js +54 -171
  74. package/rpc/configSchema.js +25 -49
  75. package/rpc/coreRpcMethods.js +221 -959
  76. package/rpc/remoteAbortSignals.js +46 -70
  77. package/tsconfig.build.tsbuildinfo +1 -1
  78. package/ui/AboutDialog.js +106 -162
  79. package/ui/App.js +157 -242
  80. package/ui/AssemblySelector.js +59 -120
  81. package/ui/CascadingMenu.js +101 -196
  82. package/ui/ColorPicker.d.ts +16 -0
  83. package/ui/ColorPicker.js +97 -0
  84. package/ui/Drawer.js +28 -61
  85. package/ui/DrawerWidget.js +108 -202
  86. package/ui/DropDownMenu.js +60 -91
  87. package/ui/EditableTypography.js +87 -149
  88. package/ui/ErrorMessage.js +41 -56
  89. package/ui/FactoryResetDialog.js +24 -57
  90. package/ui/FatalErrorDialog.js +59 -91
  91. package/ui/FileSelector/FileSelector.js +123 -189
  92. package/ui/FileSelector/LocalFileChooser.js +44 -75
  93. package/ui/FileSelector/UrlChooser.js +17 -38
  94. package/ui/FileSelector/index.js +6 -12
  95. package/ui/Icons.js +45 -69
  96. package/ui/Logo.js +57 -110
  97. package/ui/Menu.js +232 -354
  98. package/ui/PrerenderedCanvas.js +63 -87
  99. package/ui/ResizeHandle.js +87 -116
  100. package/ui/ReturnToImportFormDialog.js +32 -63
  101. package/ui/SanitizedHTML.js +64 -47
  102. package/ui/Snackbar.js +74 -101
  103. package/ui/SnackbarModel.js +37 -51
  104. package/ui/Tooltip.js +49 -76
  105. package/ui/ViewContainer.js +113 -196
  106. package/ui/colors.d.ts +10 -0
  107. package/ui/colors.js +78 -0
  108. package/ui/index.js +51 -181
  109. package/ui/react-colorful.d.ts +17 -0
  110. package/ui/react-colorful.js +455 -0
  111. package/ui/theme.js +199 -247
  112. package/util/Base1DUtils.js +163 -202
  113. package/util/Base1DViewModel.js +121 -168
  114. package/util/QuickLRU.js +84 -332
  115. package/util/TimeTraveller.d.ts +19 -0
  116. package/util/TimeTraveller.js +86 -0
  117. package/util/aborting.js +49 -127
  118. package/util/analytics.js +91 -154
  119. package/util/blockTypes.js +106 -240
  120. package/util/calculateDynamicBlocks.js +98 -128
  121. package/util/calculateStaticBlocks.js +105 -125
  122. package/util/color/cssColorsLevel4.js +156 -160
  123. package/util/color/index.js +33 -55
  124. package/util/compositeMap.js +49 -333
  125. package/util/formatFastaStrings.js +9 -14
  126. package/util/idMaker.js +18 -31
  127. package/util/index.d.ts +7 -20
  128. package/util/index.js +742 -1188
  129. package/util/io/RemoteFileWithRangeCache.js +88 -257
  130. package/util/io/index.js +95 -169
  131. package/util/jexl.js +60 -115
  132. package/util/jexlStrings.js +24 -29
  133. package/util/layouts/BaseLayout.js +1 -4
  134. package/util/layouts/GranularRectLayout.js +388 -555
  135. package/util/layouts/MultiLayout.js +41 -109
  136. package/util/layouts/PrecomputedLayout.js +56 -112
  137. package/util/layouts/PrecomputedMultiLayout.js +22 -59
  138. package/util/layouts/SceneGraph.js +127 -197
  139. package/util/layouts/index.js +29 -66
  140. package/util/mst-reflection.js +55 -71
  141. package/util/offscreenCanvasPonyfill.js +66 -134
  142. package/util/offscreenCanvasUtils.d.ts +2 -7
  143. package/util/offscreenCanvasUtils.js +49 -146
  144. package/util/range.js +29 -40
  145. package/util/rxjs.js +20 -27
  146. package/util/simpleFeature.js +88 -152
  147. package/util/stats.js +91 -151
  148. package/util/tracks.js +130 -173
  149. package/util/types/index.js +110 -179
  150. package/util/types/mst.js +91 -146
  151. package/util/types/util.js +1 -4
  152. package/util/when.js +54 -101
  153. package/BaseFeatureWidget/SequenceFeatureDetails.test.js +0 -122
  154. package/BaseFeatureWidget/index.test.js +0 -69
  155. package/TextSearch/BaseResults.test.js +0 -42
  156. package/configuration/configurationSchema.test.js +0 -266
  157. package/configuration/configurationSlot.test.js +0 -69
  158. package/configuration/util.test.js +0 -39
  159. package/data_adapters/BaseAdapter.test.js +0 -200
  160. package/declare.d.js +0 -1
  161. package/pluggableElementTypes/RpcMethodType.test.js +0 -118
  162. package/pluggableElementTypes/renderers/declare.d.js +0 -1
  163. package/pluggableElementTypes/renderers/util/serializableFilterChain.test.js +0 -20
  164. package/rpc/BaseRpcDriver.test.js +0 -540
  165. package/rpc/declaration.d.js +0 -1
  166. package/ui/FatalErrorDialog.test.js +0 -82
  167. package/ui/SanitizedHTML.test.js +0 -36
  168. package/ui/theme.test.js +0 -92
  169. package/util/Base1DViewModel.test.js +0 -130
  170. package/util/calculateDynamicBlocks.test.js +0 -74
  171. package/util/calculateStaticBlocks.test.js +0 -297
  172. package/util/declare.d.js +0 -1
  173. package/util/formatFastaStrings.test.js +0 -40
  174. package/util/index.test.js +0 -213
  175. package/util/jexlStrings.test.js +0 -48
  176. package/util/layouts/GranularRectLayout.test.js +0 -99
  177. package/util/range.test.js +0 -64
  178. package/util/simpleFeature.test.js +0 -34
  179. package/util/stats.test.js +0 -172
@@ -1,76 +1,65 @@
1
1
  "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- var _typeof = require("@babel/runtime/helpers/typeof");
6
-
7
- Object.defineProperty(exports, "__esModule", {
8
- value: true
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
9
17
  });
10
- exports.default = ServerSideRenderedContent;
11
-
12
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
-
14
- var _react = _interopRequireWildcard(require("react"));
15
-
16
- var _styles = require("@mui/material/styles");
17
-
18
- var _reactDom = require("react-dom");
19
-
20
- var _ui = require("../../ui");
21
-
22
- var _util = require("../../util");
23
-
24
- var _excluded = ["theme", "html", "RenderingComponent"];
25
-
26
- 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); }
27
-
28
- 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; }
29
-
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ const react_1 = __importStar(require("react"));
27
+ const styles_1 = require("@mui/material/styles");
28
+ const react_dom_1 = require("react-dom");
29
+ const ui_1 = require("../../ui");
30
+ const util_1 = require("../../util");
30
31
  function ServerSideRenderedContent(props) {
31
- var ssrContainerNode = (0, _react.useRef)(null);
32
- var theme = props.theme,
33
- html = props.html,
34
- RenderingComponent = props.RenderingComponent,
35
- rest = (0, _objectWithoutProperties2.default)(props, _excluded);
36
- var jbrowseTheme = (0, _ui.createJBrowseTheme)(theme);
37
- (0, _react.useEffect)(function () {
38
- var domNode = ssrContainerNode.current;
39
-
40
- function doHydrate() {
41
- if (domNode) {
42
- if (domNode) {
43
- (0, _reactDom.unmountComponentAtNode)(domNode);
32
+ const ssrContainerNode = (0, react_1.useRef)(null);
33
+ const { theme, html, RenderingComponent, ...rest } = props;
34
+ const jbrowseTheme = (0, ui_1.createJBrowseTheme)(theme);
35
+ (0, react_1.useEffect)(() => {
36
+ const domNode = ssrContainerNode.current;
37
+ function doHydrate() {
38
+ if (domNode) {
39
+ if (domNode) {
40
+ (0, react_dom_1.unmountComponentAtNode)(domNode);
41
+ }
42
+ domNode.innerHTML = html;
43
+ // defer main-thread rendering and hydration for when
44
+ // we have some free time. helps keep the framerate up.
45
+ //
46
+ // note: the timeout param to rIC below helps when you are doing
47
+ // a long continuous scroll, it forces it to evaluate because
48
+ // otherwise the continuous scroll would never give it time to do
49
+ // so
50
+ (0, util_1.rIC)(() => {
51
+ (0, react_dom_1.hydrate)(react_1.default.createElement(styles_1.ThemeProvider, { theme: jbrowseTheme },
52
+ react_1.default.createElement(RenderingComponent, { ...rest })), domNode);
53
+ }, { timeout: 300 });
54
+ }
44
55
  }
45
-
46
- domNode.innerHTML = html; // defer main-thread rendering and hydration for when
47
- // we have some free time. helps keep the framerate up.
48
- //
49
- // note: the timeout param to rIC below helps when you are doing
50
- // a long continuous scroll, it forces it to evaluate because
51
- // otherwise the continuous scroll would never give it time to do
52
- // so
53
-
54
- (0, _util.rIC)(function () {
55
- (0, _reactDom.hydrate)( /*#__PURE__*/_react.default.createElement(_styles.ThemeProvider, {
56
- theme: jbrowseTheme
57
- }, /*#__PURE__*/_react.default.createElement(RenderingComponent, rest)), domNode);
58
- }, {
59
- timeout: 300
60
- });
61
- }
62
- }
63
-
64
- doHydrate();
65
- return function () {
66
- if (domNode) {
67
- (0, _reactDom.unmountComponentAtNode)(domNode);
68
- }
69
- };
70
- }, [html, jbrowseTheme, rest, RenderingComponent]);
71
- return /*#__PURE__*/_react.default.createElement("div", {
72
- ref: ssrContainerNode,
73
- "data-html-size": html.length,
74
- className: "ssr-container"
75
- });
76
- }
56
+ doHydrate();
57
+ return () => {
58
+ if (domNode) {
59
+ (0, react_dom_1.unmountComponentAtNode)(domNode);
60
+ }
61
+ };
62
+ }, [html, jbrowseTheme, rest, RenderingComponent]);
63
+ return (react_1.default.createElement("div", { ref: ssrContainerNode, "data-html-size": html.length, className: "ssr-container" }));
64
+ }
65
+ exports.default = ServerSideRenderedContent;
@@ -1,85 +1,45 @@
1
1
  "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- var _typeof = require("@babel/runtime/helpers/typeof");
6
-
7
- Object.defineProperty(exports, "__esModule", {
8
- value: true
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
9
17
  });
10
- exports.default = void 0;
11
-
12
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
-
14
- var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
-
16
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
17
-
18
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
19
-
20
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
21
-
22
- var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
23
-
24
- var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
25
-
26
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
27
-
28
- var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
29
-
30
- var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
31
-
32
- var _react = _interopRequireDefault(require("react"));
33
-
34
- var _styles = require("@mui/material/styles");
35
-
36
- var _canvasSequencer = require("canvas-sequencer");
37
-
38
- var _server = require("react-dom/server");
39
-
40
- var _mobxStateTree = require("mobx-state-tree");
41
-
42
- var _util = require("../../util");
43
-
44
- var _RendererType2 = _interopRequireDefault(require("./RendererType"));
45
-
46
- var _serializableFilterChain = _interopRequireDefault(require("./util/serializableFilterChain"));
47
-
48
- var _ui = require("../../ui");
49
-
50
- var _ServerSideRenderedContent = _interopRequireDefault(require("./ServerSideRenderedContent"));
51
-
52
- var _excluded = ["html"];
53
-
54
- 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); }
55
-
56
- 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; }
57
-
58
- 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; }
59
-
60
- 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; }
61
-
62
- 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); }; }
63
-
64
- 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; } }
65
-
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ var __importDefault = (this && this.__importDefault) || function (mod) {
26
+ return (mod && mod.__esModule) ? mod : { "default": mod };
27
+ };
28
+ Object.defineProperty(exports, "__esModule", { value: true });
29
+ const react_1 = __importDefault(require("react"));
30
+ const styles_1 = require("@mui/material/styles");
31
+ const canvas_sequencer_1 = require("canvas-sequencer");
32
+ const server_1 = require("react-dom/server");
33
+ const mobx_state_tree_1 = require("mobx-state-tree");
34
+ const util_1 = require("../../util");
35
+ const RendererType_1 = __importDefault(require("./RendererType"));
36
+ const serializableFilterChain_1 = __importDefault(require("./util/serializableFilterChain"));
37
+ const ui_1 = require("../../ui");
38
+ const ServerSideRenderedContent_1 = __importDefault(require("./ServerSideRenderedContent"));
66
39
  function isSvgExport(elt) {
67
- return 'canvasRecordedData' in elt;
40
+ return 'canvasRecordedData' in elt;
68
41
  }
69
-
70
- var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
71
- (0, _inherits2.default)(ServerSideRenderer, _RendererType);
72
-
73
- var _super = _createSuper(ServerSideRenderer);
74
-
75
- function ServerSideRenderer() {
76
- (0, _classCallCheck2.default)(this, ServerSideRenderer);
77
- return _super.apply(this, arguments);
78
- }
79
-
80
- (0, _createClass2.default)(ServerSideRenderer, [{
81
- key: "serializeArgsInClient",
82
- value:
42
+ class ServerSideRenderer extends RendererType_1.default {
83
43
  /**
84
44
  * directly modifies the render arguments to prepare them to be serialized and
85
45
  * sent to the worker.
@@ -87,11 +47,14 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
87
47
  * @param args - the arguments passed to render
88
48
  * @returns the same object
89
49
  */
90
- function serializeArgsInClient(args) {
91
- return _objectSpread(_objectSpread({}, args), {}, {
92
- config: (0, _mobxStateTree.isStateTreeNode)(args.config) ? (0, _mobxStateTree.getSnapshot)(args.config) : args.config,
93
- filters: args.filters && args.filters.toJSON().filters
94
- });
50
+ serializeArgsInClient(args) {
51
+ return {
52
+ ...args,
53
+ config: (0, mobx_state_tree_1.isStateTreeNode)(args.config)
54
+ ? (0, mobx_state_tree_1.getSnapshot)(args.config)
55
+ : args.config,
56
+ filters: args.filters && args.filters.toJSON().filters,
57
+ };
95
58
  }
96
59
  /**
97
60
  * Deserialize the render results from the worker in the client. Includes
@@ -101,28 +64,25 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
101
64
  * @param results - the results of the render
102
65
  * @param args - the arguments passed to render
103
66
  */
104
-
105
- }, {
106
- key: "deserializeResultsInClient",
107
- value: function deserializeResultsInClient(results, args) {
108
- var html = results.html,
109
- rest = (0, _objectWithoutProperties2.default)(results, _excluded); // if we are rendering svg, we skip hydration
110
-
111
- if (args.exportSVG) {
112
- // only return the results if the renderer explicitly has
113
- // this.supportsSVG support to avoid garbage being rendered in SVG
114
- // document
115
- return _objectSpread(_objectSpread({}, results), {}, {
116
- html: this.supportsSVG ? results.html : '<text y="12" fill="black">SVG export not supported for this track</text>'
117
- });
118
- } // hydrate results using ServerSideRenderedContent
119
-
120
-
121
- return _objectSpread(_objectSpread({}, rest), {}, {
122
- reactElement: /*#__PURE__*/_react.default.createElement(_ServerSideRenderedContent.default, (0, _extends2.default)({}, args, results, {
123
- RenderingComponent: this.ReactComponent
124
- }))
125
- });
67
+ deserializeResultsInClient(results, args) {
68
+ const { html, ...rest } = results;
69
+ // if we are rendering svg, we skip hydration
70
+ if (args.exportSVG) {
71
+ // only return the results if the renderer explicitly has
72
+ // this.supportsSVG support to avoid garbage being rendered in SVG
73
+ // document
74
+ return {
75
+ ...results,
76
+ html: this.supportsSVG
77
+ ? results.html
78
+ : '<text y="12" fill="black">SVG export not supported for this track</text>',
79
+ };
80
+ }
81
+ // hydrate results using ServerSideRenderedContent
82
+ return {
83
+ ...rest,
84
+ reactElement: (react_1.default.createElement(ServerSideRenderedContent_1.default, { ...args, ...results, RenderingComponent: this.ReactComponent })),
85
+ };
126
86
  }
127
87
  /**
128
88
  * modifies the passed arguments object to inflate arguments as necessary.
@@ -130,19 +90,15 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
130
90
  *
131
91
  * @param args - the converted arguments to modify
132
92
  */
133
-
134
- }, {
135
- key: "deserializeArgsInWorker",
136
- value: function deserializeArgsInWorker(args) {
137
- var deserialized = _objectSpread({}, args);
138
-
139
- deserialized.config = this.configSchema.create(args.config || {}, {
140
- pluginManager: this.pluginManager
141
- });
142
- deserialized.filters = new _serializableFilterChain.default({
143
- filters: args.filters
144
- });
145
- return deserialized;
93
+ deserializeArgsInWorker(args) {
94
+ const deserialized = { ...args };
95
+ deserialized.config = this.configSchema.create(args.config || {}, {
96
+ pluginManager: this.pluginManager,
97
+ });
98
+ deserialized.filters = new serializableFilterChain_1.default({
99
+ filters: args.filters,
100
+ });
101
+ return deserialized;
146
102
  }
147
103
  /**
148
104
  * Serialize results of the render to send them to the client. Includes
@@ -152,17 +108,10 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
152
108
  * method
153
109
  * @param args - deserialized render args
154
110
  */
155
-
156
- }, {
157
- key: "serializeResultsInWorker",
158
- value: function serializeResultsInWorker(results, args) {
159
- var html = (0, _server.renderToString)( /*#__PURE__*/_react.default.createElement(_styles.ThemeProvider, {
160
- theme: (0, _ui.createJBrowseTheme)(args.theme)
161
- }, results.reactElement));
162
- delete results.reactElement;
163
- return _objectSpread(_objectSpread({}, results), {}, {
164
- html: html
165
- });
111
+ serializeResultsInWorker(results, args) {
112
+ const html = (0, server_1.renderToString)(react_1.default.createElement(styles_1.ThemeProvider, { theme: (0, ui_1.createJBrowseTheme)(args.theme) }, results.reactElement));
113
+ delete results.reactElement;
114
+ return { ...results, html };
166
115
  }
167
116
  /**
168
117
  * Render method called on the client. Serializes args, then calls
@@ -171,145 +120,43 @@ var ServerSideRenderer = /*#__PURE__*/function (_RendererType) {
171
120
  * @param rpcManager - RPC mananger
172
121
  * @param args - render args
173
122
  */
174
-
175
- }, {
176
- key: "renderInClient",
177
- value: function () {
178
- var _renderInClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(rpcManager, args) {
179
- var results, width, height, canvasRecordedData, C2S, ctx, seq, str;
180
- return _regenerator.default.wrap(function _callee$(_context) {
181
- while (1) {
182
- switch (_context.prev = _context.next) {
183
- case 0:
184
- _context.next = 2;
185
- return rpcManager.call(args.sessionId, 'CoreRender', args);
186
-
187
- case 2:
188
- results = _context.sent;
189
-
190
- if (!isSvgExport(results)) {
191
- _context.next = 14;
192
- break;
193
- }
194
-
195
- width = results.width, height = results.height, canvasRecordedData = results.canvasRecordedData;
196
- _context.next = 7;
197
- return Promise.resolve().then(function () {
198
- return _interopRequireWildcard(require('canvas2svg'));
199
- });
200
-
201
- case 7:
202
- C2S = _context.sent;
203
- ctx = new C2S.default(width, height);
204
- seq = new _canvasSequencer.CanvasSequence(canvasRecordedData);
205
- seq.execute(ctx);
206
- str = ctx.getSvg(); // innerHTML strips the outer <svg> element from returned data, we add
207
- // our own <svg> element in the view's SVG export
208
-
209
- results.html = str.innerHTML;
210
- delete results.reactElement;
211
-
212
- case 14:
213
- return _context.abrupt("return", results);
214
-
215
- case 15:
216
- case "end":
217
- return _context.stop();
218
- }
219
- }
220
- }, _callee);
221
- }));
222
-
223
- function renderInClient(_x, _x2) {
224
- return _renderInClient.apply(this, arguments);
225
- }
226
-
227
- return renderInClient;
228
- }()
123
+ async renderInClient(rpcManager, args) {
124
+ const results = (await rpcManager.call(args.sessionId, 'CoreRender', args));
125
+ if (isSvgExport(results)) {
126
+ const { width, height, canvasRecordedData } = results;
127
+ const C2S = await Promise.resolve().then(() => __importStar(require('canvas2svg')));
128
+ const ctx = new C2S.default(width, height);
129
+ const seq = new canvas_sequencer_1.CanvasSequence(canvasRecordedData);
130
+ seq.execute(ctx);
131
+ const str = ctx.getSvg();
132
+ // innerHTML strips the outer <svg> element from returned data, we add
133
+ // our own <svg> element in the view's SVG export
134
+ results.html = str.innerHTML;
135
+ delete results.reactElement;
136
+ }
137
+ return results;
138
+ }
229
139
  /**
230
140
  * Render method called on the worker. `render` is called here in server-side
231
141
  * rendering
232
142
  *
233
143
  * @param args - serialized render args
234
144
  */
235
-
236
- }, {
237
- key: "renderInWorker",
238
- value: function () {
239
- var _renderInWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(args) {
240
- var _this = this;
241
-
242
- var signal, _args$statusCallback, statusCallback, deserializedArgs, results;
243
-
244
- return _regenerator.default.wrap(function _callee2$(_context2) {
245
- while (1) {
246
- switch (_context2.prev = _context2.next) {
247
- case 0:
248
- signal = args.signal, _args$statusCallback = args.statusCallback, statusCallback = _args$statusCallback === void 0 ? function () {} : _args$statusCallback;
249
- deserializedArgs = this.deserializeArgsInWorker(args);
250
- _context2.next = 4;
251
- return (0, _util.updateStatus)('Rendering plot', statusCallback, function () {
252
- return _this.render(deserializedArgs);
253
- });
254
-
255
- case 4:
256
- results = _context2.sent;
257
- (0, _util.checkAbortSignal)(signal); // serialize the results for passing back to the main thread.
258
- // these will be transmitted to the main process, and will come out
259
- // as the result of renderRegionWithWorker.
260
-
261
- return _context2.abrupt("return", (0, _util.updateStatus)('Serializing results', statusCallback, function () {
262
- return _this.serializeResultsInWorker(results, deserializedArgs);
263
- }));
264
-
265
- case 7:
266
- case "end":
267
- return _context2.stop();
268
- }
269
- }
270
- }, _callee2, this);
271
- }));
272
-
273
- function renderInWorker(_x3) {
274
- return _renderInWorker.apply(this, arguments);
275
- }
276
-
277
- return renderInWorker;
278
- }()
279
- }, {
280
- key: "freeResourcesInClient",
281
- value: function () {
282
- var _freeResourcesInClient = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(rpcManager, args) {
283
- var serializedArgs, freed, freedRpc;
284
- return _regenerator.default.wrap(function _callee3$(_context3) {
285
- while (1) {
286
- switch (_context3.prev = _context3.next) {
287
- case 0:
288
- serializedArgs = this.serializeArgsInClient(args);
289
- freed = this.freeResources();
290
- _context3.next = 4;
291
- return rpcManager.call(args.sessionId, 'CoreFreeResources', serializedArgs);
292
-
293
- case 4:
294
- freedRpc = _context3.sent;
295
- return _context3.abrupt("return", freed + freedRpc);
296
-
297
- case 6:
298
- case "end":
299
- return _context3.stop();
300
- }
301
- }
302
- }, _callee3, this);
303
- }));
304
-
305
- function freeResourcesInClient(_x4, _x5) {
306
- return _freeResourcesInClient.apply(this, arguments);
307
- }
308
-
309
- return freeResourcesInClient;
310
- }()
311
- }]);
312
- return ServerSideRenderer;
313
- }(_RendererType2.default);
314
-
315
- exports.default = ServerSideRenderer;
145
+ async renderInWorker(args) {
146
+ const { signal, statusCallback = () => { } } = args;
147
+ const deserializedArgs = this.deserializeArgsInWorker(args);
148
+ const results = await (0, util_1.updateStatus)('Rendering plot', statusCallback, () => this.render(deserializedArgs));
149
+ (0, util_1.checkAbortSignal)(signal);
150
+ // serialize the results for passing back to the main thread.
151
+ // these will be transmitted to the main process, and will come out
152
+ // as the result of renderRegionWithWorker.
153
+ return (0, util_1.updateStatus)('Serializing results', statusCallback, () => this.serializeResultsInWorker(results, deserializedArgs));
154
+ }
155
+ async freeResourcesInClient(rpcManager, args) {
156
+ const serializedArgs = this.serializeArgsInClient(args);
157
+ const freed = this.freeResources();
158
+ const freedRpc = (await rpcManager.call(args.sessionId, 'CoreFreeResources', serializedArgs));
159
+ return freed + freedRpc;
160
+ }
161
+ }
162
+ exports.default = ServerSideRenderer;
@@ -1,63 +1,20 @@
1
1
  "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- Object.defineProperty(exports, "__esModule", {
6
- value: true
7
- });
8
- Object.defineProperty(exports, "BoxRendererType", {
9
- enumerable: true,
10
- get: function get() {
11
- return _BoxRendererType.default;
12
- }
13
- });
14
- Object.defineProperty(exports, "CircularChordRendererType", {
15
- enumerable: true,
16
- get: function get() {
17
- return _CircularChordRendererType.default;
18
- }
19
- });
20
- Object.defineProperty(exports, "ComparativeServerSideRendererType", {
21
- enumerable: true,
22
- get: function get() {
23
- return _ComparativeServerSideRendererType.default;
24
- }
25
- });
26
- Object.defineProperty(exports, "FeatureRendererType", {
27
- enumerable: true,
28
- get: function get() {
29
- return _FeatureRendererType.default;
30
- }
31
- });
32
- Object.defineProperty(exports, "RendererType", {
33
- enumerable: true,
34
- get: function get() {
35
- return _RendererType.default;
36
- }
37
- });
38
- Object.defineProperty(exports, "ServerSideRenderedContent", {
39
- enumerable: true,
40
- get: function get() {
41
- return _ServerSideRenderedContent.default;
42
- }
43
- });
44
- Object.defineProperty(exports, "ServerSideRendererType", {
45
- enumerable: true,
46
- get: function get() {
47
- return _ServerSideRendererType.default;
48
- }
49
- });
50
-
51
- var _BoxRendererType = _interopRequireDefault(require("./BoxRendererType"));
52
-
53
- var _CircularChordRendererType = _interopRequireDefault(require("./CircularChordRendererType"));
54
-
55
- var _ComparativeServerSideRendererType = _interopRequireDefault(require("./ComparativeServerSideRendererType"));
56
-
57
- var _FeatureRendererType = _interopRequireDefault(require("./FeatureRendererType"));
58
-
59
- var _RendererType = _interopRequireDefault(require("./RendererType"));
60
-
61
- var _ServerSideRenderedContent = _interopRequireDefault(require("./ServerSideRenderedContent"));
62
-
63
- var _ServerSideRendererType = _interopRequireDefault(require("./ServerSideRendererType"));
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.ServerSideRendererType = exports.ServerSideRenderedContent = exports.RendererType = exports.FeatureRendererType = exports.ComparativeServerSideRendererType = exports.CircularChordRendererType = exports.BoxRendererType = void 0;
7
+ const BoxRendererType_1 = __importDefault(require("./BoxRendererType"));
8
+ exports.BoxRendererType = BoxRendererType_1.default;
9
+ const CircularChordRendererType_1 = __importDefault(require("./CircularChordRendererType"));
10
+ exports.CircularChordRendererType = CircularChordRendererType_1.default;
11
+ const ComparativeServerSideRendererType_1 = __importDefault(require("./ComparativeServerSideRendererType"));
12
+ exports.ComparativeServerSideRendererType = ComparativeServerSideRendererType_1.default;
13
+ const FeatureRendererType_1 = __importDefault(require("./FeatureRendererType"));
14
+ exports.FeatureRendererType = FeatureRendererType_1.default;
15
+ const RendererType_1 = __importDefault(require("./RendererType"));
16
+ exports.RendererType = RendererType_1.default;
17
+ const ServerSideRenderedContent_1 = __importDefault(require("./ServerSideRenderedContent"));
18
+ exports.ServerSideRenderedContent = ServerSideRenderedContent_1.default;
19
+ const ServerSideRendererType_1 = __importDefault(require("./ServerSideRendererType"));
20
+ exports.ServerSideRendererType = ServerSideRendererType_1.default;