@jbrowse/core 1.4.4 → 1.5.3

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 (159) hide show
  1. package/BaseFeatureWidget/BaseFeatureDetail.d.ts +4 -4
  2. package/BaseFeatureWidget/BaseFeatureDetail.js +27 -8
  3. package/BaseFeatureWidget/SequenceFeatureDetails.js +10 -10
  4. package/BaseFeatureWidget/index.js +1 -1
  5. package/BaseFeatureWidget/types.d.ts +1 -1
  6. package/BaseFeatureWidget/util.js +3 -3
  7. package/CorePlugin.d.ts +0 -1
  8. package/CorePlugin.js +13 -1
  9. package/PluginLoader.d.ts +26 -4
  10. package/PluginLoader.js +337 -51
  11. package/PluginManager.d.ts +18 -11
  12. package/PluginManager.js +53 -31
  13. package/ReExports/list.js +1 -1
  14. package/ReExports/material-ui-colors.js +38 -38
  15. package/ReExports/modules.d.ts +19 -20
  16. package/ReExports/modules.js +10 -3
  17. package/TextSearch/BaseResults.d.ts +5 -14
  18. package/TextSearch/BaseResults.js +16 -58
  19. package/TextSearch/BaseResults.test.js +1 -11
  20. package/TextSearch/TextSearchManager.d.ts +3 -3
  21. package/TextSearch/TextSearchManager.js +1 -1
  22. package/assemblyManager/assembly.d.ts +21 -8
  23. package/assemblyManager/assembly.js +163 -120
  24. package/assemblyManager/assemblyConfigSchema.d.ts +3 -0
  25. package/assemblyManager/{assemblyConfigSchemas.js → assemblyConfigSchema.js} +35 -27
  26. package/assemblyManager/assemblyManager.d.ts +169 -60
  27. package/assemblyManager/index.d.ts +1 -1
  28. package/assemblyManager/index.js +5 -5
  29. package/configuration/configurationSchema.d.ts +3 -2
  30. package/configuration/configurationSchema.js +7 -10
  31. package/configuration/configurationSchema.test.js +4 -2
  32. package/configuration/configurationSlot.js +5 -4
  33. package/configuration/index.js +4 -4
  34. package/configuration/util.js +5 -5
  35. package/data_adapters/BaseAdapter.d.ts +5 -3
  36. package/data_adapters/BaseAdapter.js +7 -4
  37. package/data_adapters/BaseAdapter.test.js +4 -2
  38. package/data_adapters/CytobandAdapter.d.ts +8 -0
  39. package/data_adapters/CytobandAdapter.js +128 -0
  40. package/data_adapters/dataAdapterCache.js +3 -3
  41. package/package.json +7 -7
  42. package/pluggableElementTypes/AdapterType.d.ts +9 -1
  43. package/pluggableElementTypes/AdapterType.js +20 -0
  44. package/pluggableElementTypes/InternetAccountType.d.ts +12 -0
  45. package/pluggableElementTypes/InternetAccountType.js +64 -0
  46. package/pluggableElementTypes/PluggableElementBase.d.ts +1 -2
  47. package/pluggableElementTypes/PluggableElementBase.js +2 -3
  48. package/pluggableElementTypes/RpcMethodType.d.ts +3 -0
  49. package/pluggableElementTypes/RpcMethodType.js +269 -26
  50. package/pluggableElementTypes/RpcMethodType.test.d.ts +4 -0
  51. package/pluggableElementTypes/RpcMethodType.test.js +118 -0
  52. package/pluggableElementTypes/ViewType.d.ts +1 -1
  53. package/pluggableElementTypes/WidgetType.d.ts +1 -0
  54. package/pluggableElementTypes/index.d.ts +7 -3
  55. package/pluggableElementTypes/index.js +127 -1
  56. package/pluggableElementTypes/models/BaseDisplayModel.d.ts +6 -6
  57. package/pluggableElementTypes/models/BaseDisplayModel.js +1 -3
  58. package/pluggableElementTypes/models/BaseViewModel.js +13 -15
  59. package/pluggableElementTypes/models/InternetAccountModel.d.ts +24 -0
  60. package/pluggableElementTypes/models/InternetAccountModel.js +85 -0
  61. package/pluggableElementTypes/models/baseInternetAccountConfig.d.ts +4 -0
  62. package/pluggableElementTypes/models/baseInternetAccountConfig.js +25 -0
  63. package/pluggableElementTypes/models/index.d.ts +3 -0
  64. package/pluggableElementTypes/models/index.js +24 -8
  65. package/pluggableElementTypes/renderers/BoxRendererType.js +1 -1
  66. package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.d.ts +1 -1
  67. package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.js +15 -6
  68. package/pluggableElementTypes/renderers/FeatureRendererType.d.ts +3 -3
  69. package/pluggableElementTypes/renderers/FeatureRendererType.js +17 -8
  70. package/pluggableElementTypes/renderers/RendererType.d.ts +1 -0
  71. package/pluggableElementTypes/renderers/RendererType.js +4 -1
  72. package/pluggableElementTypes/renderers/ServerSideRenderedContent.js +1 -1
  73. package/pluggableElementTypes/renderers/index.d.ts +9 -0
  74. package/pluggableElementTypes/renderers/index.js +63 -0
  75. package/rpc/BaseRpcDriver.js +5 -9
  76. package/rpc/BaseRpcDriver.test.js +6 -6
  77. package/rpc/RpcManager.d.ts +1 -1
  78. package/rpc/RpcManager.js +44 -16
  79. package/rpc/WebWorkerRpcDriver.js +3 -3
  80. package/rpc/coreRpcMethods.d.ts +2 -1
  81. package/rpc/coreRpcMethods.js +109 -75
  82. package/rpc/remoteAbortSignals.js +2 -2
  83. package/ui/App.d.ts +17 -4
  84. package/ui/App.js +55 -41
  85. package/ui/Drawer.d.ts +6 -14
  86. package/ui/Drawer.js +11 -12
  87. package/ui/DrawerWidget.d.ts +5 -3
  88. package/ui/DrawerWidget.js +100 -61
  89. package/ui/ErrorMessage.d.ts +5 -0
  90. package/ui/ErrorMessage.js +54 -0
  91. package/ui/FileSelector/FileSelector.d.ts +11 -0
  92. package/ui/FileSelector/FileSelector.js +198 -0
  93. package/ui/FileSelector/LocalFileChooser.d.ts +7 -0
  94. package/ui/FileSelector/LocalFileChooser.js +79 -0
  95. package/ui/FileSelector/UrlChooser.d.ts +9 -0
  96. package/ui/FileSelector/UrlChooser.js +41 -0
  97. package/ui/FileSelector/index.d.ts +2 -0
  98. package/ui/FileSelector/index.js +13 -0
  99. package/ui/Icons.d.ts +4 -0
  100. package/ui/Icons.js +34 -0
  101. package/ui/Logo.js +1 -1
  102. package/ui/PrerenderedCanvas.d.ts +1 -0
  103. package/ui/PrerenderedCanvas.js +4 -1
  104. package/ui/ResizeHandle.d.ts +2 -3
  105. package/ui/ResizeHandle.js +6 -7
  106. package/ui/SanitizedHTML.js +1 -1
  107. package/ui/Snackbar.js +4 -6
  108. package/ui/SnackbarModel.d.ts +16 -0
  109. package/ui/SnackbarModel.js +56 -0
  110. package/ui/Tooltip.d.ts +1 -1
  111. package/ui/index.js +24 -24
  112. package/ui/theme.js +5 -5
  113. package/util/QuickLRU.d.ts +1 -1
  114. package/util/QuickLRU.js +3 -3
  115. package/util/aborting.d.ts +1 -1
  116. package/util/aborting.js +10 -11
  117. package/util/analytics.d.ts +2 -2
  118. package/util/analytics.js +20 -7
  119. package/util/blockTypes.d.ts +11 -6
  120. package/util/blockTypes.js +7 -1
  121. package/util/color/cssColorsLevel4.js +1 -1
  122. package/util/color/index.js +5 -5
  123. package/util/compositeMap.js +3 -3
  124. package/util/index.d.ts +6 -16
  125. package/util/index.js +76 -100
  126. package/util/io/RemoteFileWithRangeCache.d.ts +17 -0
  127. package/util/io/RemoteFileWithRangeCache.js +266 -0
  128. package/util/io/index.d.ts +4 -2
  129. package/util/io/index.js +134 -25
  130. package/util/jexl.js +4 -1
  131. package/util/layouts/BaseLayout.d.ts +3 -0
  132. package/util/layouts/GranularRectLayout.d.ts +19 -10
  133. package/util/layouts/GranularRectLayout.js +459 -100
  134. package/util/layouts/GranularRectLayout.test.js +57 -10
  135. package/util/layouts/PrecomputedLayout.js +2 -1
  136. package/util/layouts/index.d.ts +7 -0
  137. package/util/layouts/index.js +68 -0
  138. package/util/mst-reflection.js +3 -3
  139. package/util/offscreenCanvasPonyfill.js +1 -1
  140. package/util/range.js +1 -1
  141. package/util/simpleFeature.js +1 -1
  142. package/util/stats.js +2 -2
  143. package/util/tracks.d.ts +31 -362
  144. package/util/tracks.js +74 -190
  145. package/util/types/index.d.ts +54 -10
  146. package/util/types/index.js +110 -8
  147. package/util/types/mst.d.ts +46 -2
  148. package/util/types/mst.js +56 -8
  149. package/util/types/util.d.ts +1 -1
  150. package/util/when.js +1 -1
  151. package/assemblyManager/assemblyConfigSchemas.d.ts +0 -7
  152. package/ui/FileSelector.d.ts +0 -9
  153. package/ui/FileSelector.js +0 -150
  154. package/util/io/LocalFile.d.ts +0 -18
  155. package/util/io/LocalFile.js +0 -220
  156. package/util/io/rangeFetcher.d.ts +0 -3
  157. package/util/io/rangeFetcher.js +0 -236
  158. package/value.d.ts +0 -1
  159. package/value.js +0 -10
@@ -5,8 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.watchWorker = watchWorker;
9
8
  exports.default = void 0;
9
+ exports.watchWorker = watchWorker;
10
10
 
11
11
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
12
12
 
@@ -282,7 +282,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
282
282
  callP,
283
283
  killedCheckInterval,
284
284
  killedP,
285
- result,
285
+ resultP,
286
286
  _args = arguments;
287
287
  return _regenerator.default.wrap(function _callee$(_context) {
288
288
  while (1) {
@@ -324,7 +324,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
324
324
  if (worker.status === 'killed') {
325
325
  reject(new Error("operation timed out, worker process stopped responding, ".concat(worker.error)));
326
326
  } else if (done) {
327
- resolve();
327
+ resolve(true);
328
328
  }
329
329
  }, _this4.workerCheckFrequency);
330
330
  }).finally(function () {
@@ -333,14 +333,10 @@ var BaseRpcDriver = /*#__PURE__*/function () {
333
333
  // promise. the killed promise will only actually win if the worker was
334
334
  // killed before the call could return
335
335
 
336
- _context.next = 14;
337
- return Promise.race([callP, killedP]);
336
+ resultP = Promise.race([callP, killedP]);
337
+ return _context.abrupt("return", rpcMethod.deserializeReturn(resultP, args, this.name));
338
338
 
339
339
  case 14:
340
- result = _context.sent;
341
- return _context.abrupt("return", rpcMethod.deserializeReturn(result, args, this.name));
342
-
343
- case 16:
344
340
  case "end":
345
341
  return _context.stop();
346
342
  }
@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
7
7
  Object.defineProperty(exports, "__esModule", {
8
8
  value: true
9
9
  });
10
- exports.MockRendererShort = exports.MockRendererTimeout = void 0;
10
+ exports.MockRendererTimeout = exports.MockRendererShort = void 0;
11
11
 
12
12
  var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
13
13
 
@@ -48,7 +48,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
48
48
  function timeout(ms) {
49
49
  return new Promise(function (resolve) {
50
50
  setTimeout(function () {
51
- resolve();
51
+ resolve(true);
52
52
  }, ms);
53
53
  });
54
54
  }
@@ -246,7 +246,7 @@ test('watch worker with long ping, generates timeout', /*#__PURE__*/(0, _asyncTo
246
246
  case 9:
247
247
  _context2.prev = 9;
248
248
  _context2.t0 = _context2["catch"](2);
249
- expect(_context2.t0.message).toMatch(/timeout/);
249
+ expect("".concat(_context2.t0)).toMatch(/timeout/);
250
250
 
251
251
  case 12:
252
252
  case "end":
@@ -281,7 +281,7 @@ test('test worker abort', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PUR
281
281
  case 10:
282
282
  _context3.prev = 10;
283
283
  _context3.t0 = _context3["catch"](2);
284
- expect(_context3.t0.message).toMatch(/abort/);
284
+ expect("".concat(_context3.t0)).toMatch(/abort/);
285
285
 
286
286
  case 13:
287
287
  case "end":
@@ -462,7 +462,7 @@ test('test RPC driver operation timeout and worker replace', /*#__PURE__*/(0, _a
462
462
  case 13:
463
463
  _context7.prev = 13;
464
464
  _context7.t0 = _context7["catch"](8);
465
- expect(_context7.t0.message).toMatch(/operation timed out/);
465
+ expect("".concat(_context7.t0)).toMatch(/operation timed out/);
466
466
 
467
467
  case 16:
468
468
  _context7.next = 18;
@@ -508,7 +508,7 @@ test('remote abort', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/
508
508
  case 15:
509
509
  _context8.prev = 15;
510
510
  _context8.t0 = _context8["catch"](7);
511
- expect(_context8.t0.message).toMatch(/abort/);
511
+ expect("".concat(_context8.t0)).toMatch(/abort/);
512
512
 
513
513
  case 18:
514
514
  case "end":
@@ -21,7 +21,7 @@ export default class RpcManager {
21
21
  getDriver(backendName: keyof typeof DriverClasses): DriverClass;
22
22
  getDriverForCall(_sessionId: string, _functionName: string, args: {
23
23
  rpcDriverName?: string;
24
- }): DriverClass;
24
+ }): Promise<DriverClass>;
25
25
  call(sessionId: string, functionName: string, args: {}, opts?: {}): Promise<unknown>;
26
26
  }
27
27
  export {};
package/rpc/RpcManager.js CHANGED
@@ -62,7 +62,9 @@ var RpcManager = /*#__PURE__*/function () {
62
62
 
63
63
  if (!DriverClassImpl) {
64
64
  throw new Error("requested RPC driver \"".concat(backendName, "\" is not installed"));
65
- } else if (!backendConfiguration) {
65
+ }
66
+
67
+ if (!backendConfiguration) {
66
68
  throw new Error("requested RPC driver \"".concat(backendName, "\" is missing config"));
67
69
  } // eslint-disable-next-line @typescript-eslint/no-explicit-any
68
70
 
@@ -75,41 +77,67 @@ var RpcManager = /*#__PURE__*/function () {
75
77
  }
76
78
  }, {
77
79
  key: "getDriverForCall",
78
- value: function getDriverForCall(_sessionId, _functionName, args) {
79
- var backendName = args.rpcDriverName || (0, _configuration.readConfObject)(this.mainConfiguration, 'defaultDriver');
80
- return this.getDriver(backendName);
81
- }
80
+ value: function () {
81
+ var _getDriverForCall = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_sessionId, _functionName, args) {
82
+ var backendName;
83
+ return _regenerator.default.wrap(function _callee$(_context) {
84
+ while (1) {
85
+ switch (_context.prev = _context.next) {
86
+ case 0:
87
+ backendName = args.rpcDriverName || (0, _configuration.readConfObject)(this.mainConfiguration, 'defaultDriver');
88
+ return _context.abrupt("return", this.getDriver(backendName));
89
+
90
+ case 2:
91
+ case "end":
92
+ return _context.stop();
93
+ }
94
+ }
95
+ }, _callee, this);
96
+ }));
97
+
98
+ function getDriverForCall(_x, _x2, _x3) {
99
+ return _getDriverForCall.apply(this, arguments);
100
+ }
101
+
102
+ return getDriverForCall;
103
+ }()
82
104
  }, {
83
105
  key: "call",
84
106
  value: function () {
85
- var _call = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(sessionId, functionName, args) {
107
+ var _call = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(sessionId, functionName, args) {
86
108
  var opts,
87
- _args = arguments;
88
- return _regenerator.default.wrap(function _callee$(_context) {
109
+ driverForCall,
110
+ _args2 = arguments;
111
+ return _regenerator.default.wrap(function _callee2$(_context2) {
89
112
  while (1) {
90
- switch (_context.prev = _context.next) {
113
+ switch (_context2.prev = _context2.next) {
91
114
  case 0:
92
- opts = _args.length > 3 && _args[3] !== undefined ? _args[3] : {};
115
+ opts = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : {};
93
116
 
94
117
  if (sessionId) {
95
- _context.next = 3;
118
+ _context2.next = 3;
96
119
  break;
97
120
  }
98
121
 
99
122
  throw new Error('sessionId is required');
100
123
 
101
124
  case 3:
102
- return _context.abrupt("return", this.getDriverForCall(sessionId, functionName, args).call(this.pluginManager, sessionId, functionName, args, opts));
125
+ _context2.next = 5;
126
+ return this.getDriverForCall(sessionId, functionName, args);
103
127
 
104
- case 4:
128
+ case 5:
129
+ driverForCall = _context2.sent;
130
+ return _context2.abrupt("return", driverForCall.call(this.pluginManager, sessionId, functionName, args, opts));
131
+
132
+ case 7:
105
133
  case "end":
106
- return _context.stop();
134
+ return _context2.stop();
107
135
  }
108
136
  }
109
- }, _callee, this);
137
+ }, _callee2, this);
110
138
  }));
111
139
 
112
- function call(_x, _x2, _x3) {
140
+ function call(_x4, _x5, _x6) {
113
141
  return _call.apply(this, arguments);
114
142
  }
115
143
 
@@ -125,9 +125,9 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
125
125
  (0, _createClass2.default)(WebWorkerRpcDriver, [{
126
126
  key: "makeWorker",
127
127
  value: function makeWorker() {
128
- // note that we are making a Rpc.Client connection with a worker pool of one for each worker,
129
- // because we want to do our own state-group-aware load balancing rather than using librpc's
130
- // builtin round-robin
128
+ // note that we are making a Rpc.Client connection with a worker pool of
129
+ // one for each worker, because we want to do our own state-group-aware
130
+ // load balancing rather than using librpc's builtin round-robin
131
131
  var worker = new WebWorkerHandle({
132
132
  workers: [new this.WorkerClass()]
133
133
  }); // send the worker its boot configuration using info from the pluginManager
@@ -29,7 +29,7 @@ export declare class CoreGetMetadata extends RpcMethodType {
29
29
  }
30
30
  export declare class CoreGetFeatures extends RpcMethodType {
31
31
  name: string;
32
- deserializeReturn(feats: SimpleFeatureSerialized[]): Promise<SimpleFeature[]>;
32
+ deserializeReturn(feats: SimpleFeatureSerialized[], args: unknown, rpcDriverClassName: string): Promise<SimpleFeature[]>;
33
33
  execute(args: {
34
34
  sessionId: string;
35
35
  region: Region;
@@ -47,6 +47,7 @@ export declare class CoreGetFeatures extends RpcMethodType {
47
47
  export declare class CoreFreeResources extends RpcMethodType {
48
48
  name: string;
49
49
  execute(specification: {}): Promise<number>;
50
+ serializeArguments(args: {}, _rpcDriverClassName: string): Promise<{}>;
50
51
  }
51
52
  export interface RenderArgs extends ServerSideRenderArgs {
52
53
  adapterConfig: {};
@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.CoreRender = exports.CoreFreeResources = exports.CoreGetFeatures = exports.CoreGetMetadata = exports.CoreGetFileInfo = exports.CoreGetRefNames = void 0;
8
+ exports.CoreRender = exports.CoreGetRefNames = exports.CoreGetMetadata = exports.CoreGetFileInfo = exports.CoreGetFeatures = exports.CoreFreeResources = void 0;
9
+
10
+ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
9
11
 
10
12
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
13
 
@@ -267,24 +269,30 @@ var CoreGetFeatures = /*#__PURE__*/function (_RpcMethodType4) {
267
269
  (0, _createClass2.default)(CoreGetFeatures, [{
268
270
  key: "deserializeReturn",
269
271
  value: function () {
270
- var _deserializeReturn = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(feats) {
272
+ var _deserializeReturn = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(feats, args, rpcDriverClassName) {
273
+ var superDeserialized;
271
274
  return _regenerator.default.wrap(function _callee4$(_context4) {
272
275
  while (1) {
273
276
  switch (_context4.prev = _context4.next) {
274
277
  case 0:
275
- return _context4.abrupt("return", feats.map(function (feat) {
278
+ _context4.next = 2;
279
+ return (0, _get2.default)((0, _getPrototypeOf2.default)(CoreGetFeatures.prototype), "deserializeReturn", this).call(this, feats, args, rpcDriverClassName);
280
+
281
+ case 2:
282
+ superDeserialized = _context4.sent;
283
+ return _context4.abrupt("return", superDeserialized.map(function (feat) {
276
284
  return new _simpleFeature.default(feat);
277
285
  }));
278
286
 
279
- case 1:
287
+ case 4:
280
288
  case "end":
281
289
  return _context4.stop();
282
290
  }
283
291
  }
284
- }, _callee4);
292
+ }, _callee4, this);
285
293
  }));
286
294
 
287
- function deserializeReturn(_x7) {
295
+ function deserializeReturn(_x7, _x8, _x9) {
288
296
  return _deserializeReturn.apply(this, arguments);
289
297
  }
290
298
 
@@ -341,7 +349,7 @@ var CoreGetFeatures = /*#__PURE__*/function (_RpcMethodType4) {
341
349
  }, _callee5, this);
342
350
  }));
343
351
 
344
- function execute(_x8, _x9) {
352
+ function execute(_x10, _x11) {
345
353
  return _execute4.apply(this, arguments);
346
354
  }
347
355
 
@@ -408,12 +416,36 @@ var CoreFreeResources = /*#__PURE__*/function (_RpcMethodType5) {
408
416
  }, _callee6, this);
409
417
  }));
410
418
 
411
- function execute(_x10) {
419
+ function execute(_x12) {
412
420
  return _execute5.apply(this, arguments);
413
421
  }
414
422
 
415
423
  return execute;
416
424
  }()
425
+ }, {
426
+ key: "serializeArguments",
427
+ value: function () {
428
+ var _serializeArguments = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(args, _rpcDriverClassName) {
429
+ return _regenerator.default.wrap(function _callee7$(_context7) {
430
+ while (1) {
431
+ switch (_context7.prev = _context7.next) {
432
+ case 0:
433
+ return _context7.abrupt("return", args);
434
+
435
+ case 1:
436
+ case "end":
437
+ return _context7.stop();
438
+ }
439
+ }
440
+ }, _callee7);
441
+ }));
442
+
443
+ function serializeArguments(_x13, _x14) {
444
+ return _serializeArguments.apply(this, arguments);
445
+ }
446
+
447
+ return serializeArguments;
448
+ }()
417
449
  }]);
418
450
  return CoreFreeResources;
419
451
  }(_RpcMethodType7.default);
@@ -445,57 +477,62 @@ var CoreRender = /*#__PURE__*/function (_RpcMethodType6) {
445
477
  (0, _createClass2.default)(CoreRender, [{
446
478
  key: "serializeArguments",
447
479
  value: function () {
448
- var _serializeArguments = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(args, rpcDriverClassName) {
480
+ var _serializeArguments2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(args, rpcDriverClassName) {
449
481
  var _this$pluginManager$r, _this$pluginManager$r2;
450
482
 
451
- var assemblyManager, renamedArgs, rendererType, RendererType;
452
- return _regenerator.default.wrap(function _callee7$(_context7) {
483
+ var assemblyManager, renamedArgs, superArgs, rendererType, RendererType;
484
+ return _regenerator.default.wrap(function _callee8$(_context8) {
453
485
  while (1) {
454
- switch (_context7.prev = _context7.next) {
486
+ switch (_context8.prev = _context8.next) {
455
487
  case 0:
456
488
  assemblyManager = (_this$pluginManager$r = this.pluginManager.rootModel) === null || _this$pluginManager$r === void 0 ? void 0 : (_this$pluginManager$r2 = _this$pluginManager$r.session) === null || _this$pluginManager$r2 === void 0 ? void 0 : _this$pluginManager$r2.assemblyManager;
457
489
 
458
490
  if (!assemblyManager) {
459
- _context7.next = 7;
491
+ _context8.next = 7;
460
492
  break;
461
493
  }
462
494
 
463
- _context7.next = 4;
495
+ _context8.next = 4;
464
496
  return (0, _util.renameRegionsIfNeeded)(assemblyManager, args);
465
497
 
466
498
  case 4:
467
- _context7.t0 = _context7.sent;
468
- _context7.next = 8;
499
+ _context8.t0 = _context8.sent;
500
+ _context8.next = 8;
469
501
  break;
470
502
 
471
503
  case 7:
472
- _context7.t0 = args;
504
+ _context8.t0 = args;
473
505
 
474
506
  case 8:
475
- renamedArgs = _context7.t0;
507
+ renamedArgs = _context8.t0;
508
+ _context8.next = 11;
509
+ return (0, _get2.default)((0, _getPrototypeOf2.default)(CoreRender.prototype), "serializeArguments", this).call(this, renamedArgs, rpcDriverClassName);
510
+
511
+ case 11:
512
+ superArgs = _context8.sent;
476
513
 
477
514
  if (!(rpcDriverClassName === 'MainThreadRpcDriver')) {
478
- _context7.next = 11;
515
+ _context8.next = 14;
479
516
  break;
480
517
  }
481
518
 
482
- return _context7.abrupt("return", renamedArgs);
519
+ return _context8.abrupt("return", superArgs);
483
520
 
484
- case 11:
521
+ case 14:
485
522
  rendererType = args.rendererType;
486
523
  RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));
487
- return _context7.abrupt("return", RendererType.serializeArgsInClient(renamedArgs));
524
+ return _context8.abrupt("return", RendererType.serializeArgsInClient(superArgs));
488
525
 
489
- case 14:
526
+ case 17:
490
527
  case "end":
491
- return _context7.stop();
528
+ return _context8.stop();
492
529
  }
493
530
  }
494
- }, _callee7, this);
531
+ }, _callee8, this);
495
532
  }));
496
533
 
497
- function serializeArguments(_x11, _x12) {
498
- return _serializeArguments.apply(this, arguments);
534
+ function serializeArguments(_x15, _x16) {
535
+ return _serializeArguments2.apply(this, arguments);
499
536
  }
500
537
 
501
538
  return serializeArguments;
@@ -503,31 +540,31 @@ var CoreRender = /*#__PURE__*/function (_RpcMethodType6) {
503
540
  }, {
504
541
  key: "execute",
505
542
  value: function () {
506
- var _execute6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(args, rpcDriverClassName) {
507
- var deserializedArgs, _deserializedArgs, sessionId, adapterConfig, rendererType, signal, _yield$getAdapter5, dataAdapter, RendererType, renderArgs, result;
543
+ var _execute6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(args, rpcDriverClassName) {
544
+ var deserializedArgs, _deserializedArgs, sessionId, rendererType, signal, RendererType, result;
508
545
 
509
- return _regenerator.default.wrap(function _callee8$(_context8) {
546
+ return _regenerator.default.wrap(function _callee9$(_context9) {
510
547
  while (1) {
511
- switch (_context8.prev = _context8.next) {
548
+ switch (_context9.prev = _context9.next) {
512
549
  case 0:
513
550
  deserializedArgs = args;
514
551
 
515
552
  if (!(rpcDriverClassName !== 'MainThreadRpcDriver')) {
516
- _context8.next = 5;
553
+ _context9.next = 5;
517
554
  break;
518
555
  }
519
556
 
520
- _context8.next = 4;
557
+ _context9.next = 4;
521
558
  return this.deserializeArguments(args, rpcDriverClassName);
522
559
 
523
560
  case 4:
524
- deserializedArgs = _context8.sent;
561
+ deserializedArgs = _context9.sent;
525
562
 
526
563
  case 5:
527
- _deserializedArgs = deserializedArgs, sessionId = _deserializedArgs.sessionId, adapterConfig = _deserializedArgs.adapterConfig, rendererType = _deserializedArgs.rendererType, signal = _deserializedArgs.signal;
564
+ _deserializedArgs = deserializedArgs, sessionId = _deserializedArgs.sessionId, rendererType = _deserializedArgs.rendererType, signal = _deserializedArgs.signal;
528
565
 
529
566
  if (sessionId) {
530
- _context8.next = 8;
567
+ _context9.next = 8;
531
568
  break;
532
569
  }
533
570
 
@@ -535,51 +572,42 @@ var CoreRender = /*#__PURE__*/function (_RpcMethodType6) {
535
572
 
536
573
  case 8:
537
574
  (0, _util.checkAbortSignal)(signal);
538
- _context8.next = 11;
539
- return (0, _dataAdapterCache.getAdapter)(this.pluginManager, sessionId, adapterConfig);
540
-
541
- case 11:
542
- _yield$getAdapter5 = _context8.sent;
543
- dataAdapter = _yield$getAdapter5.dataAdapter;
544
575
  RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));
545
- renderArgs = _objectSpread(_objectSpread({}, deserializedArgs), {}, {
546
- dataAdapter: dataAdapter
547
- });
548
576
 
549
577
  if (!(rpcDriverClassName === 'MainThreadRpcDriver')) {
550
- _context8.next = 21;
578
+ _context9.next = 16;
551
579
  break;
552
580
  }
553
581
 
554
- _context8.next = 18;
555
- return RendererType.render(renderArgs);
582
+ _context9.next = 13;
583
+ return RendererType.render(deserializedArgs);
556
584
 
557
- case 18:
558
- _context8.t0 = _context8.sent;
559
- _context8.next = 24;
585
+ case 13:
586
+ _context9.t0 = _context9.sent;
587
+ _context9.next = 19;
560
588
  break;
561
589
 
562
- case 21:
563
- _context8.next = 23;
564
- return RendererType.renderInWorker(renderArgs);
590
+ case 16:
591
+ _context9.next = 18;
592
+ return RendererType.renderInWorker(deserializedArgs);
565
593
 
566
- case 23:
567
- _context8.t0 = _context8.sent;
594
+ case 18:
595
+ _context9.t0 = _context9.sent;
568
596
 
569
- case 24:
570
- result = _context8.t0;
597
+ case 19:
598
+ result = _context9.t0;
571
599
  (0, _util.checkAbortSignal)(signal);
572
- return _context8.abrupt("return", result);
600
+ return _context9.abrupt("return", result);
573
601
 
574
- case 27:
602
+ case 22:
575
603
  case "end":
576
- return _context8.stop();
604
+ return _context9.stop();
577
605
  }
578
606
  }
579
- }, _callee8, this);
607
+ }, _callee9, this);
580
608
  }));
581
609
 
582
- function execute(_x13, _x14) {
610
+ function execute(_x17, _x18) {
583
611
  return _execute6.apply(this, arguments);
584
612
  }
585
613
 
@@ -588,33 +616,39 @@ var CoreRender = /*#__PURE__*/function (_RpcMethodType6) {
588
616
  }, {
589
617
  key: "deserializeReturn",
590
618
  value: function () {
591
- var _deserializeReturn2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(serializedReturn, args, rpcDriverClassName) {
592
- var rendererType, RendererType;
593
- return _regenerator.default.wrap(function _callee9$(_context9) {
619
+ var _deserializeReturn2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(serializedReturn, args, rpcDriverClassName) {
620
+ var superDeserialized, rendererType, RendererType;
621
+ return _regenerator.default.wrap(function _callee10$(_context10) {
594
622
  while (1) {
595
- switch (_context9.prev = _context9.next) {
623
+ switch (_context10.prev = _context10.next) {
596
624
  case 0:
625
+ _context10.next = 2;
626
+ return (0, _get2.default)((0, _getPrototypeOf2.default)(CoreRender.prototype), "deserializeReturn", this).call(this, serializedReturn, args, rpcDriverClassName);
627
+
628
+ case 2:
629
+ superDeserialized = _context10.sent;
630
+
597
631
  if (!(rpcDriverClassName === 'MainThreadRpcDriver')) {
598
- _context9.next = 2;
632
+ _context10.next = 5;
599
633
  break;
600
634
  }
601
635
 
602
- return _context9.abrupt("return", serializedReturn);
636
+ return _context10.abrupt("return", superDeserialized);
603
637
 
604
- case 2:
638
+ case 5:
605
639
  rendererType = args.rendererType;
606
640
  RendererType = validateRendererType(rendererType, this.pluginManager.getRendererType(rendererType));
607
- return _context9.abrupt("return", RendererType.deserializeResultsInClient(serializedReturn, args));
641
+ return _context10.abrupt("return", RendererType.deserializeResultsInClient(superDeserialized, args));
608
642
 
609
- case 5:
643
+ case 8:
610
644
  case "end":
611
- return _context9.stop();
645
+ return _context10.stop();
612
646
  }
613
647
  }
614
- }, _callee9, this);
648
+ }, _callee10, this);
615
649
  }));
616
650
 
617
- function deserializeReturn(_x15, _x16, _x17) {
651
+ function deserializeReturn(_x19, _x20, _x21) {
618
652
  return _deserializeReturn2.apply(this, arguments);
619
653
  }
620
654
 
@@ -5,11 +5,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.serializeAbortSignal = serializeAbortSignal;
9
- exports.isRemoteAbortSignal = isRemoteAbortSignal;
10
8
  exports.deserializeAbortSignal = deserializeAbortSignal;
9
+ exports.isRemoteAbortSignal = isRemoteAbortSignal;
11
10
  exports.remoteAbort = remoteAbort;
12
11
  exports.remoteAbortRpcHandler = remoteAbortRpcHandler;
12
+ exports.serializeAbortSignal = serializeAbortSignal;
13
13
 
14
14
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
15
15
 
package/ui/App.d.ts CHANGED
@@ -1,5 +1,18 @@
1
+ import React from 'react';
2
+ import { NotificationLevel, SessionWithDrawerWidgets } from '../util';
3
+ import { MenuItem as JBMenuItem } from './index';
4
+ declare type SnackbarMessage = [string, NotificationLevel];
5
+ declare const App: ({ session, HeaderButtons, }: {
6
+ HeaderButtons?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
7
+ session: SessionWithDrawerWidgets & {
8
+ savedSessionNames: string[];
9
+ menus: {
10
+ label: string;
11
+ menuItems: JBMenuItem[];
12
+ }[];
13
+ renameCurrentSession: (arg: string) => void;
14
+ snackbarMessages: SnackbarMessage[];
15
+ popSnackbarMessage: () => unknown;
16
+ };
17
+ }) => JSX.Element;
1
18
  export default App;
2
- declare function App({ session, HeaderButtons }: {
3
- session: any;
4
- HeaderButtons?: any;
5
- }): JSX.Element;