@jbrowse/core 1.5.7 → 1.6.1
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.
- package/BaseFeatureWidget/BaseFeatureDetail.js +91 -78
- package/BaseFeatureWidget/SequenceFeatureDetails.js +65 -57
- package/BaseFeatureWidget/SequenceFeatureDetails.test.js +9 -9
- package/BaseFeatureWidget/index.js +1 -1
- package/BaseFeatureWidget/index.test.js +4 -4
- package/BaseFeatureWidget/util.js +13 -9
- package/CorePlugin.js +32 -20
- package/Plugin.js +13 -11
- package/PluginLoader.js +38 -33
- package/PluginManager.d.ts +8 -5
- package/PluginManager.js +142 -53
- package/ReExports/index.js +4 -4
- package/ReExports/list.js +2 -2
- package/ReExports/material-ui-colors.js +20 -20
- package/ReExports/modules.d.ts +7 -5
- package/ReExports/modules.js +51 -47
- package/TextSearch/BaseResults.js +34 -24
- package/TextSearch/BaseResults.test.js +7 -3
- package/TextSearch/TextSearchManager.js +17 -15
- package/assemblyManager/assembly.js +39 -34
- package/assemblyManager/assemblyConfigSchema.js +2 -2
- package/assemblyManager/assemblyManager.js +20 -16
- package/assemblyManager/index.js +3 -3
- package/babel.config.d.ts +15 -0
- package/babel.config.js +19 -0
- package/configuration/configurationSchema.js +19 -17
- package/configuration/configurationSlot.js +11 -11
- package/configuration/configurationSlot.test.js +5 -5
- package/configuration/index.d.ts +1 -0
- package/configuration/util.js +5 -5
- package/data_adapters/BaseAdapter.d.ts +15 -3
- package/data_adapters/BaseAdapter.js +216 -62
- package/data_adapters/BaseAdapter.test.js +30 -24
- package/data_adapters/CytobandAdapter.d.ts +1 -1
- package/data_adapters/CytobandAdapter.js +25 -19
- package/data_adapters/dataAdapterCache.js +9 -9
- package/package.json +4 -5
- package/pluggableElementTypes/AdapterType.js +31 -22
- package/pluggableElementTypes/ConnectionType.js +28 -18
- package/pluggableElementTypes/DisplayType.js +27 -17
- package/pluggableElementTypes/InternetAccountType.js +24 -14
- package/pluggableElementTypes/PluggableElementBase.js +10 -8
- package/pluggableElementTypes/RpcMethodType.d.ts +1 -1
- package/pluggableElementTypes/RpcMethodType.js +141 -118
- package/pluggableElementTypes/RpcMethodType.test.js +23 -17
- package/pluggableElementTypes/TextSearchAdapterType.js +25 -15
- package/pluggableElementTypes/TrackType.js +25 -15
- package/pluggableElementTypes/ViewType.js +25 -15
- package/pluggableElementTypes/WidgetType.js +27 -17
- package/pluggableElementTypes/index.js +11 -11
- package/pluggableElementTypes/models/BaseConnectionModelFactory.js +5 -5
- package/pluggableElementTypes/models/BaseDisplayModel.js +8 -5
- package/pluggableElementTypes/models/BaseTrackModel.js +11 -8
- package/pluggableElementTypes/models/BaseViewModel.js +3 -3
- package/pluggableElementTypes/models/InternetAccountModel.d.ts +1 -1
- package/pluggableElementTypes/models/InternetAccountModel.js +5 -5
- package/pluggableElementTypes/models/baseConnectionConfig.js +2 -2
- package/pluggableElementTypes/models/baseTrackConfig.js +7 -4
- package/pluggableElementTypes/models/index.js +4 -4
- package/pluggableElementTypes/renderers/BoxRendererType.js +49 -39
- package/pluggableElementTypes/renderers/CircularChordRendererType.js +18 -12
- package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.js +35 -27
- package/pluggableElementTypes/renderers/FeatureRendererType.js +46 -36
- package/pluggableElementTypes/renderers/RendererType.js +31 -21
- package/pluggableElementTypes/renderers/ServerSideRenderedContent.js +12 -8
- package/pluggableElementTypes/renderers/ServerSideRendererType.d.ts +1 -1
- package/pluggableElementTypes/renderers/ServerSideRendererType.js +45 -33
- package/pluggableElementTypes/renderers/index.js +8 -8
- package/pluggableElementTypes/renderers/util/serializableFilterChain.js +10 -8
- package/pluggableElementTypes/renderers/util/serializableFilterChain.test.js +2 -2
- package/rpc/BaseRpcDriver.js +43 -38
- package/rpc/BaseRpcDriver.test.js +63 -49
- package/rpc/MainThreadRpcDriver.js +32 -22
- package/rpc/RpcManager.js +19 -17
- package/rpc/WebWorkerRpcDriver.js +38 -28
- package/rpc/configSchema.js +2 -2
- package/rpc/coreRpcMethods.d.ts +16 -0
- package/rpc/coreRpcMethods.js +248 -121
- package/rpc/remoteAbortSignals.js +3 -3
- package/ui/AboutDialog.js +21 -17
- package/ui/App.js +42 -38
- package/ui/AssemblySelector.d.ts +1 -1
- package/ui/AssemblySelector.js +6 -6
- package/ui/Drawer.js +7 -7
- package/ui/DrawerWidget.d.ts +1 -1
- package/ui/DrawerWidget.js +37 -33
- package/ui/DropDownMenu.js +21 -9
- package/ui/EditableTypography.js +30 -19
- package/ui/ErrorMessage.js +5 -5
- package/ui/FactoryResetDialog.js +8 -8
- package/ui/FatalErrorDialog.js +29 -12
- package/ui/FatalErrorDialog.test.js +11 -11
- package/ui/FileSelector/FileSelector.js +42 -32
- package/ui/FileSelector/LocalFileChooser.js +9 -9
- package/ui/FileSelector/UrlChooser.js +4 -4
- package/ui/FileSelector/index.js +4 -4
- package/ui/Icons.js +9 -9
- package/ui/Logo.js +19 -19
- package/ui/Menu.js +46 -35
- package/ui/NewSessionCards.js +29 -19
- package/ui/PrerenderedCanvas.js +27 -10
- package/ui/ResizeHandle.js +17 -10
- package/ui/SanitizedHTML.js +5 -5
- package/ui/SanitizedHTML.test.js +4 -4
- package/ui/Snackbar.js +16 -12
- package/ui/SnackbarModel.js +1 -1
- package/ui/Tooltip.js +11 -7
- package/ui/ViewContainer.d.ts +2 -5
- package/ui/ViewContainer.js +44 -49
- package/ui/index.d.ts +1 -0
- package/ui/index.js +26 -13
- package/ui/theme.js +15 -11
- package/util/Base1DViewModel.d.ts +14 -12
- package/util/Base1DViewModel.js +51 -55
- package/util/Base1DViewModel.test.js +5 -5
- package/util/QuickLRU.js +31 -27
- package/util/aborting.js +26 -16
- package/util/analytics.d.ts +1 -0
- package/util/analytics.js +15 -7
- package/util/blockTypes.js +48 -36
- package/util/calculateDynamicBlocks.js +4 -4
- package/util/calculateDynamicBlocks.test.js +14 -10
- package/util/calculateStaticBlocks.js +1 -1
- package/util/calculateStaticBlocks.test.js +15 -15
- package/util/compositeMap.js +31 -27
- package/util/idMaker.js +4 -4
- package/util/index.d.ts +23 -1
- package/util/index.js +135 -41
- package/util/index.test.js +11 -7
- package/util/io/RemoteFileWithRangeCache.js +41 -29
- package/util/io/index.js +6 -6
- package/util/jexl.js +5 -5
- package/util/jexlStrings.js +2 -2
- package/util/jexlStrings.test.js +2 -2
- package/util/layouts/GranularRectLayout.js +33 -27
- package/util/layouts/GranularRectLayout.test.js +10 -10
- package/util/layouts/MultiLayout.js +19 -13
- package/util/layouts/PrecomputedLayout.js +16 -14
- package/util/layouts/PrecomputedMultiLayout.js +23 -17
- package/util/layouts/SceneGraph.js +18 -12
- package/util/layouts/index.js +6 -6
- package/util/offscreenCanvasPonyfill.js +31 -29
- package/util/offscreenCanvasUtils.js +6 -6
- package/util/range.test.js +20 -20
- package/util/rxjs.js +2 -2
- package/util/simpleFeature.js +23 -18
- package/util/simpleFeature.test.js +3 -3
- package/util/stats.d.ts +1 -1
- package/util/stats.js +11 -7
- package/util/stats.test.js +16 -16
- package/util/tracks.js +1 -3
- package/util/types/index.d.ts +1 -1
- package/util/types/index.js +36 -31
- package/util/types/mst.js +19 -15
- package/util/when.js +6 -6
package/util/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _typeof3 = require("@babel/runtime/helpers/typeof");
|
|
6
6
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
@@ -54,19 +54,22 @@ var _exportNames = {
|
|
|
54
54
|
updateStatus: true,
|
|
55
55
|
hashCode: true,
|
|
56
56
|
objectHash: true,
|
|
57
|
+
bytesForRegions: true,
|
|
58
|
+
viewBpToPx: true,
|
|
57
59
|
SimpleFeature: true,
|
|
58
60
|
isFeature: true
|
|
59
61
|
};
|
|
60
62
|
Object.defineProperty(exports, "SimpleFeature", {
|
|
61
63
|
enumerable: true,
|
|
62
64
|
get: function get() {
|
|
63
|
-
return _simpleFeature
|
|
65
|
+
return _simpleFeature.default;
|
|
64
66
|
}
|
|
65
67
|
});
|
|
66
68
|
exports.assembleLocString = assembleLocString;
|
|
67
69
|
exports.blobToDataURL = blobToDataURL;
|
|
68
70
|
exports.bpSpanPx = bpSpanPx;
|
|
69
71
|
exports.bpToPx = bpToPx;
|
|
72
|
+
exports.bytesForRegions = bytesForRegions;
|
|
70
73
|
exports.cartesianToPolar = cartesianToPolar;
|
|
71
74
|
exports.clamp = clamp;
|
|
72
75
|
exports.compareLocStrings = compareLocStrings;
|
|
@@ -110,20 +113,19 @@ exports.stringify = stringify;
|
|
|
110
113
|
exports.updateStatus = updateStatus;
|
|
111
114
|
exports.useDebounce = useDebounce;
|
|
112
115
|
exports.useDebouncedCallback = useDebouncedCallback;
|
|
116
|
+
exports.viewBpToPx = viewBpToPx;
|
|
113
117
|
|
|
114
|
-
var
|
|
118
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
115
119
|
|
|
116
|
-
var
|
|
120
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
117
121
|
|
|
118
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("
|
|
122
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
119
123
|
|
|
120
|
-
var
|
|
124
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
121
125
|
|
|
122
|
-
var
|
|
126
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
123
127
|
|
|
124
|
-
var
|
|
125
|
-
|
|
126
|
-
var _typeof2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/typeof.js"));
|
|
128
|
+
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
127
129
|
|
|
128
130
|
var _mobxStateTree = require("mobx-state-tree");
|
|
129
131
|
|
|
@@ -221,29 +223,42 @@ Object.keys(_offscreenCanvasUtils).forEach(function (key) {
|
|
|
221
223
|
});
|
|
222
224
|
});
|
|
223
225
|
|
|
224
|
-
|
|
226
|
+
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); }
|
|
227
|
+
|
|
228
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
|
|
229
|
+
|
|
230
|
+
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; }
|
|
231
|
+
|
|
232
|
+
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; }
|
|
233
|
+
|
|
234
|
+
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
235
|
+
|
|
236
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
237
|
+
|
|
238
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
239
|
+
|
|
225
240
|
if (!Object.fromEntries) {
|
|
226
241
|
// @ts-ignore
|
|
227
|
-
_object
|
|
242
|
+
_object.default.shim();
|
|
228
243
|
}
|
|
229
244
|
|
|
230
|
-
var inDevelopment = (typeof process === "undefined" ? "undefined" : (0, _typeof2
|
|
245
|
+
var inDevelopment = (typeof process === "undefined" ? "undefined" : (0, _typeof2.default)(process)) === 'object' && process.env && process.env.NODE_ENV === 'development';
|
|
231
246
|
exports.inDevelopment = inDevelopment;
|
|
232
247
|
var inProduction = !inDevelopment;
|
|
233
248
|
exports.inProduction = inProduction;
|
|
234
249
|
|
|
235
250
|
function useDebounce(value, delay) {
|
|
236
251
|
var _useState = (0, _react.useState)(value),
|
|
237
|
-
_useState2 = (0, _slicedToArray2
|
|
252
|
+
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
238
253
|
debouncedValue = _useState2[0],
|
|
239
254
|
setDebouncedValue = _useState2[1];
|
|
240
255
|
|
|
241
256
|
(0, _react.useEffect)(function () {
|
|
242
|
-
var
|
|
257
|
+
var handle = setTimeout(function () {
|
|
243
258
|
setDebouncedValue(value);
|
|
244
259
|
}, delay);
|
|
245
260
|
return function () {
|
|
246
|
-
clearTimeout(
|
|
261
|
+
clearTimeout(handle);
|
|
247
262
|
};
|
|
248
263
|
}, [value, delay]);
|
|
249
264
|
return debouncedValue;
|
|
@@ -278,7 +293,7 @@ function useDebouncedCallback(callback) {
|
|
|
278
293
|
|
|
279
294
|
timeout.current = setTimeout(function () {
|
|
280
295
|
if (argsRef.current) {
|
|
281
|
-
callback.apply(void 0, (0, _toConsumableArray2
|
|
296
|
+
callback.apply(void 0, (0, _toConsumableArray2.default)(argsRef.current));
|
|
282
297
|
}
|
|
283
298
|
}, wait);
|
|
284
299
|
};
|
|
@@ -492,7 +507,7 @@ function parseLocStringOneBased(locString, isValidRefName) {
|
|
|
492
507
|
throw new Error("invalid location string: \"".concat(locString, "\""));
|
|
493
508
|
}
|
|
494
509
|
|
|
495
|
-
var _assemblyMatch = (0, _slicedToArray2
|
|
510
|
+
var _assemblyMatch = (0, _slicedToArray2.default)(assemblyMatch, 4),
|
|
496
511
|
assemblyName = _assemblyMatch[2],
|
|
497
512
|
location = _assemblyMatch[3];
|
|
498
513
|
|
|
@@ -526,7 +541,7 @@ function parseLocStringOneBased(locString, isValidRefName) {
|
|
|
526
541
|
var singleMatch = suffix.match(/^(-?(\d+|\d{1,3}(,\d{3})*))(\.\.|-)?$/);
|
|
527
542
|
|
|
528
543
|
if (rangeMatch) {
|
|
529
|
-
var _rangeMatch = (0, _slicedToArray2
|
|
544
|
+
var _rangeMatch = (0, _slicedToArray2.default)(rangeMatch, 6),
|
|
530
545
|
start = _rangeMatch[1],
|
|
531
546
|
end = _rangeMatch[5];
|
|
532
547
|
|
|
@@ -539,7 +554,7 @@ function parseLocStringOneBased(locString, isValidRefName) {
|
|
|
539
554
|
};
|
|
540
555
|
}
|
|
541
556
|
} else if (singleMatch) {
|
|
542
|
-
var _singleMatch = (0, _slicedToArray2
|
|
557
|
+
var _singleMatch = (0, _slicedToArray2.default)(singleMatch, 5),
|
|
543
558
|
_start = _singleMatch[1],
|
|
544
559
|
separator = _singleMatch[4];
|
|
545
560
|
|
|
@@ -752,7 +767,7 @@ function iterMap(iterable, func, sizeHint) {
|
|
|
752
767
|
var results = sizeHint ? new Array(sizeHint) : [];
|
|
753
768
|
var counter = 0;
|
|
754
769
|
|
|
755
|
-
var _iterator = (
|
|
770
|
+
var _iterator = _createForOfIteratorHelper(iterable),
|
|
756
771
|
_step;
|
|
757
772
|
|
|
758
773
|
try {
|
|
@@ -772,7 +787,7 @@ function iterMap(iterable, func, sizeHint) {
|
|
|
772
787
|
|
|
773
788
|
// similar to electron.js
|
|
774
789
|
function mergeConfigs(A, B) {
|
|
775
|
-
var merged = (0, _deepmerge
|
|
790
|
+
var merged = (0, _deepmerge.default)(A, B);
|
|
776
791
|
|
|
777
792
|
if (B.defaultSession) {
|
|
778
793
|
merged.defaultSession = B.defaultSession;
|
|
@@ -845,9 +860,9 @@ function makeAbortableReaction(self, dataFunction, asyncReactionFunction, reacti
|
|
|
845
860
|
return undefined;
|
|
846
861
|
}
|
|
847
862
|
}, /*#__PURE__*/function () {
|
|
848
|
-
var _ref = (0, _asyncToGenerator2
|
|
863
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(data, mobxReactionHandle) {
|
|
849
864
|
var thisInProgress, result;
|
|
850
|
-
return
|
|
865
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
851
866
|
while (1) {
|
|
852
867
|
switch (_context.prev = _context.next) {
|
|
853
868
|
case 0:
|
|
@@ -919,16 +934,16 @@ function renameRegionIfNeeded(refNameMap, region) {
|
|
|
919
934
|
if (region && refNameMap && refNameMap[region.refName]) {
|
|
920
935
|
// clone the region so we don't modify it
|
|
921
936
|
if ((0, _mobxStateTree.isStateTreeNode)(region)) {
|
|
922
|
-
region = (
|
|
937
|
+
region = _objectSpread({}, (0, _mobxStateTree.getSnapshot)(region));
|
|
923
938
|
} else {
|
|
924
|
-
region = (
|
|
939
|
+
region = _objectSpread({}, region);
|
|
925
940
|
} // modify it directly in the container
|
|
926
941
|
|
|
927
942
|
|
|
928
943
|
var newRef = refNameMap[region.refName];
|
|
929
944
|
|
|
930
945
|
if (newRef) {
|
|
931
|
-
return (
|
|
946
|
+
return _objectSpread(_objectSpread({}, region), {}, {
|
|
932
947
|
refName: newRef,
|
|
933
948
|
originalRefName: region.refName
|
|
934
949
|
});
|
|
@@ -943,10 +958,10 @@ function renameRegionsIfNeeded(_x3, _x4) {
|
|
|
943
958
|
}
|
|
944
959
|
|
|
945
960
|
function _renameRegionsIfNeeded() {
|
|
946
|
-
_renameRegionsIfNeeded = (0, _asyncToGenerator2
|
|
961
|
+
_renameRegionsIfNeeded = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(assemblyManager, args) {
|
|
947
962
|
var _args$regions, regions, adapterConfig, assemblyNames, assemblyMaps;
|
|
948
963
|
|
|
949
|
-
return
|
|
964
|
+
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
950
965
|
while (1) {
|
|
951
966
|
switch (_context3.prev = _context3.next) {
|
|
952
967
|
case 0:
|
|
@@ -966,8 +981,8 @@ function _renameRegionsIfNeeded() {
|
|
|
966
981
|
_context3.t0 = Object;
|
|
967
982
|
_context3.next = 7;
|
|
968
983
|
return Promise.all(assemblyNames.map( /*#__PURE__*/function () {
|
|
969
|
-
var
|
|
970
|
-
return
|
|
984
|
+
var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(assemblyName) {
|
|
985
|
+
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
971
986
|
while (1) {
|
|
972
987
|
switch (_context2.prev = _context2.next) {
|
|
973
988
|
case 0:
|
|
@@ -987,17 +1002,19 @@ function _renameRegionsIfNeeded() {
|
|
|
987
1002
|
}, _callee2);
|
|
988
1003
|
}));
|
|
989
1004
|
|
|
990
|
-
return function (
|
|
991
|
-
return
|
|
1005
|
+
return function (_x10) {
|
|
1006
|
+
return _ref4.apply(this, arguments);
|
|
992
1007
|
};
|
|
993
1008
|
}()));
|
|
994
1009
|
|
|
995
1010
|
case 7:
|
|
996
1011
|
_context3.t1 = _context3.sent;
|
|
997
1012
|
assemblyMaps = _context3.t0.fromEntries.call(_context3.t0, _context3.t1);
|
|
998
|
-
return _context3.abrupt("return", (
|
|
999
|
-
regions: regions.map(function (region) {
|
|
1000
|
-
return
|
|
1013
|
+
return _context3.abrupt("return", _objectSpread(_objectSpread({}, args), {}, {
|
|
1014
|
+
regions: regions.map(function (region, i) {
|
|
1015
|
+
return (// note: uses assemblyNames defined above since region could be dead now
|
|
1016
|
+
renameRegionIfNeeded(assemblyMaps[assemblyNames[i]], region)
|
|
1017
|
+
);
|
|
1001
1018
|
})
|
|
1002
1019
|
}));
|
|
1003
1020
|
|
|
@@ -1236,19 +1253,19 @@ function updateStatus(_x5, _x6, _x7) {
|
|
|
1236
1253
|
}
|
|
1237
1254
|
|
|
1238
1255
|
function _updateStatus() {
|
|
1239
|
-
_updateStatus = (0, _asyncToGenerator2
|
|
1256
|
+
_updateStatus = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(msg, cb, fn) {
|
|
1240
1257
|
var result;
|
|
1241
|
-
return
|
|
1258
|
+
return _regenerator.default.wrap(function _callee4$(_context4) {
|
|
1242
1259
|
while (1) {
|
|
1243
1260
|
switch (_context4.prev = _context4.next) {
|
|
1244
1261
|
case 0:
|
|
1245
|
-
|
|
1262
|
+
cb(msg);
|
|
1246
1263
|
_context4.next = 3;
|
|
1247
1264
|
return fn();
|
|
1248
1265
|
|
|
1249
1266
|
case 3:
|
|
1250
1267
|
result = _context4.sent;
|
|
1251
|
-
|
|
1268
|
+
cb('');
|
|
1252
1269
|
return _context4.abrupt("return", result);
|
|
1253
1270
|
|
|
1254
1271
|
case 6:
|
|
@@ -1279,4 +1296,81 @@ function hashCode(str) {
|
|
|
1279
1296
|
|
|
1280
1297
|
function objectHash(obj) {
|
|
1281
1298
|
return "".concat(hashCode(JSON.stringify(obj)));
|
|
1299
|
+
}
|
|
1300
|
+
|
|
1301
|
+
function bytesForRegions(_x8, _x9) {
|
|
1302
|
+
return _bytesForRegions.apply(this, arguments);
|
|
1303
|
+
}
|
|
1304
|
+
|
|
1305
|
+
function _bytesForRegions() {
|
|
1306
|
+
_bytesForRegions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(regions, index) {
|
|
1307
|
+
var blockResults;
|
|
1308
|
+
return _regenerator.default.wrap(function _callee5$(_context5) {
|
|
1309
|
+
while (1) {
|
|
1310
|
+
switch (_context5.prev = _context5.next) {
|
|
1311
|
+
case 0:
|
|
1312
|
+
_context5.next = 2;
|
|
1313
|
+
return Promise.all(regions.map(function (r) {
|
|
1314
|
+
return index.blocksForRange(r.refName, r.start, r.end);
|
|
1315
|
+
}));
|
|
1316
|
+
|
|
1317
|
+
case 2:
|
|
1318
|
+
blockResults = _context5.sent;
|
|
1319
|
+
return _context5.abrupt("return", blockResults.flat().map(function (block) {
|
|
1320
|
+
return {
|
|
1321
|
+
start: block.minv.blockPosition,
|
|
1322
|
+
end: block.maxv.blockPosition + 65535
|
|
1323
|
+
};
|
|
1324
|
+
}).reduce(function (a, b) {
|
|
1325
|
+
return a + b.end - b.start;
|
|
1326
|
+
}, 0));
|
|
1327
|
+
|
|
1328
|
+
case 4:
|
|
1329
|
+
case "end":
|
|
1330
|
+
return _context5.stop();
|
|
1331
|
+
}
|
|
1332
|
+
}
|
|
1333
|
+
}, _callee5);
|
|
1334
|
+
}));
|
|
1335
|
+
return _bytesForRegions.apply(this, arguments);
|
|
1336
|
+
}
|
|
1337
|
+
|
|
1338
|
+
function viewBpToPx(_ref3) {
|
|
1339
|
+
var refName = _ref3.refName,
|
|
1340
|
+
coord = _ref3.coord,
|
|
1341
|
+
regionNumber = _ref3.regionNumber,
|
|
1342
|
+
self = _ref3.self;
|
|
1343
|
+
var offsetBp = 0;
|
|
1344
|
+
var interRegionPaddingBp = self.interRegionPaddingWidth * self.bpPerPx;
|
|
1345
|
+
var minimumBlockBp = self.minimumBlockWidth * self.bpPerPx;
|
|
1346
|
+
var index = self.displayedRegions.findIndex(function (region, idx) {
|
|
1347
|
+
var len = region.end - region.start;
|
|
1348
|
+
|
|
1349
|
+
if (refName === region.refName && coord >= region.start && coord <= region.end) {
|
|
1350
|
+
if (regionNumber ? regionNumber === idx : true) {
|
|
1351
|
+
offsetBp += region.reversed ? region.end - coord : coord - region.start;
|
|
1352
|
+
return true;
|
|
1353
|
+
}
|
|
1354
|
+
} // add the interRegionPaddingWidth if the boundary is in the screen
|
|
1355
|
+
// e.g. offset>=0 && offset<width
|
|
1356
|
+
|
|
1357
|
+
|
|
1358
|
+
if (len > minimumBlockBp && offsetBp / self.bpPerPx >= 0 && offsetBp / self.bpPerPx < self.width) {
|
|
1359
|
+
offsetBp += len + interRegionPaddingBp;
|
|
1360
|
+
} else {
|
|
1361
|
+
offsetBp += len;
|
|
1362
|
+
}
|
|
1363
|
+
|
|
1364
|
+
return false;
|
|
1365
|
+
});
|
|
1366
|
+
var found = self.displayedRegions[index];
|
|
1367
|
+
|
|
1368
|
+
if (found) {
|
|
1369
|
+
return {
|
|
1370
|
+
index: index,
|
|
1371
|
+
offsetPx: Math.round(offsetBp / self.bpPerPx)
|
|
1372
|
+
};
|
|
1373
|
+
}
|
|
1374
|
+
|
|
1375
|
+
return undefined;
|
|
1282
1376
|
}
|
package/util/index.test.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
6
6
|
|
|
7
|
-
var _slicedToArray2 = _interopRequireDefault(require("
|
|
7
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
8
8
|
|
|
9
9
|
var _index = require("./index");
|
|
10
10
|
|
|
11
|
+
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; }
|
|
12
|
+
|
|
13
|
+
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; }
|
|
14
|
+
|
|
11
15
|
describe('parseLocString', function () {
|
|
12
16
|
var cases = [['chr1:1..200', {
|
|
13
17
|
start: 0,
|
|
@@ -66,7 +70,7 @@ describe('parseLocString', function () {
|
|
|
66
70
|
refName: 'chr1'
|
|
67
71
|
}]];
|
|
68
72
|
cases.forEach(function (_ref) {
|
|
69
|
-
var _ref2 = (0, _slicedToArray2
|
|
73
|
+
var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
|
|
70
74
|
input = _ref2[0],
|
|
71
75
|
output = _ref2[1];
|
|
72
76
|
|
|
@@ -114,7 +118,7 @@ describe('assembleLocString', function () {
|
|
|
114
118
|
refName: 'chr1'
|
|
115
119
|
}, 'chr1:-99..-1']];
|
|
116
120
|
cases.forEach(function (_ref3) {
|
|
117
|
-
var _ref4 = (0, _slicedToArray2
|
|
121
|
+
var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
|
|
118
122
|
input = _ref4[0],
|
|
119
123
|
output = _ref4[1];
|
|
120
124
|
|
|
@@ -147,7 +151,7 @@ describe('assembleLocString', function () {
|
|
|
147
151
|
test("assemble and parse 'chr1:1..100'", function () {
|
|
148
152
|
expect((0, _index.parseLocString)((0, _index.assembleLocString)(location), function (refName) {
|
|
149
153
|
return refName === 'chr1' || refName === 'chr2';
|
|
150
|
-
})).toEqual((
|
|
154
|
+
})).toEqual(_objectSpread(_objectSpread({}, location), {}, {
|
|
151
155
|
start: 0
|
|
152
156
|
}));
|
|
153
157
|
});
|
|
@@ -155,7 +159,7 @@ describe('assembleLocString', function () {
|
|
|
155
159
|
describe('compareLocStrings', function () {
|
|
156
160
|
var cases = [['chr1:1..200', 'chr1:1-200', 0], ['chr1:1-200', '{hg19}chr1:1-200', -1], ['{hg19}chr1:1-200', 'chr1:1-200', 1], ['{hg19}chr1:1-200', '{hg19}chr1:2-200', -1]];
|
|
157
161
|
cases.forEach(function (_ref5) {
|
|
158
|
-
var _ref6 = (0, _slicedToArray2
|
|
162
|
+
var _ref6 = (0, _slicedToArray2.default)(_ref5, 3),
|
|
159
163
|
input1 = _ref6[0],
|
|
160
164
|
input2 = _ref6[1],
|
|
161
165
|
output = _ref6[2];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -8,27 +8,25 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.RemoteFileWithRangeCache = void 0;
|
|
9
9
|
exports.clearCache = clearCache;
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
12
12
|
|
|
13
|
-
var
|
|
13
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
14
|
|
|
15
|
-
var
|
|
15
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
16
16
|
|
|
17
|
-
var
|
|
17
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
18
18
|
|
|
19
|
-
var
|
|
19
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
20
20
|
|
|
21
|
-
var
|
|
21
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
22
22
|
|
|
23
|
-
var
|
|
23
|
+
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
24
24
|
|
|
25
|
-
var
|
|
25
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
26
26
|
|
|
27
|
-
var
|
|
27
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
28
28
|
|
|
29
|
-
var
|
|
30
|
-
|
|
31
|
-
var _createSuper2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/createSuper.js"));
|
|
29
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
32
30
|
|
|
33
31
|
var _httpRangeFetcher = require("http-range-fetcher");
|
|
34
32
|
|
|
@@ -36,6 +34,20 @@ var _buffer = require("buffer");
|
|
|
36
34
|
|
|
37
35
|
var _genericFilehandle = require("generic-filehandle");
|
|
38
36
|
|
|
37
|
+
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
38
|
+
|
|
39
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
40
|
+
|
|
41
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
42
|
+
|
|
43
|
+
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; }
|
|
44
|
+
|
|
45
|
+
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; }
|
|
46
|
+
|
|
47
|
+
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); }; }
|
|
48
|
+
|
|
49
|
+
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; } }
|
|
50
|
+
|
|
39
51
|
var fetchers = {};
|
|
40
52
|
|
|
41
53
|
function binaryRangeFetch(url, start, end) {
|
|
@@ -66,22 +78,22 @@ function clearCache() {
|
|
|
66
78
|
}
|
|
67
79
|
|
|
68
80
|
var RemoteFileWithRangeCache = /*#__PURE__*/function (_RemoteFile) {
|
|
69
|
-
(0, _inherits2
|
|
81
|
+
(0, _inherits2.default)(RemoteFileWithRangeCache, _RemoteFile);
|
|
70
82
|
|
|
71
|
-
var _super = (
|
|
83
|
+
var _super = _createSuper(RemoteFileWithRangeCache);
|
|
72
84
|
|
|
73
85
|
function RemoteFileWithRangeCache() {
|
|
74
|
-
(0, _classCallCheck2
|
|
86
|
+
(0, _classCallCheck2.default)(this, RemoteFileWithRangeCache);
|
|
75
87
|
return _super.apply(this, arguments);
|
|
76
88
|
}
|
|
77
89
|
|
|
78
|
-
(0, _createClass2
|
|
90
|
+
(0, _createClass2.default)(RemoteFileWithRangeCache, [{
|
|
79
91
|
key: "fetch",
|
|
80
92
|
value: function () {
|
|
81
|
-
var _fetch = (0, _asyncToGenerator2
|
|
93
|
+
var _fetch = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, init) {
|
|
82
94
|
var requestHeaders, range, _ref, _ref2, rangeParse, _rangeParse, _start, _end, s, e, response, headers;
|
|
83
95
|
|
|
84
|
-
return
|
|
96
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
85
97
|
while (1) {
|
|
86
98
|
switch (_context.prev = _context.next) {
|
|
87
99
|
case 0:
|
|
@@ -98,12 +110,12 @@ var RemoteFileWithRangeCache = /*#__PURE__*/function (_RemoteFile) {
|
|
|
98
110
|
} else if (Array.isArray(requestHeaders)) {
|
|
99
111
|
;
|
|
100
112
|
_ref = requestHeaders.find(function (_ref3) {
|
|
101
|
-
var _ref4 = (0, _slicedToArray2
|
|
113
|
+
var _ref4 = (0, _slicedToArray2.default)(_ref3, 1),
|
|
102
114
|
key = _ref4[0];
|
|
103
115
|
|
|
104
116
|
return key === 'range';
|
|
105
117
|
}) || [undefined, undefined];
|
|
106
|
-
_ref2 = (0, _slicedToArray2
|
|
118
|
+
_ref2 = (0, _slicedToArray2.default)(_ref, 2);
|
|
107
119
|
range = _ref2[1];
|
|
108
120
|
} else {
|
|
109
121
|
range = requestHeaders.range;
|
|
@@ -122,7 +134,7 @@ var RemoteFileWithRangeCache = /*#__PURE__*/function (_RemoteFile) {
|
|
|
122
134
|
break;
|
|
123
135
|
}
|
|
124
136
|
|
|
125
|
-
_rangeParse = (0, _slicedToArray2
|
|
137
|
+
_rangeParse = (0, _slicedToArray2.default)(rangeParse, 3), _start = _rangeParse[1], _end = _rangeParse[2];
|
|
126
138
|
s = parseInt(_start, 10);
|
|
127
139
|
e = parseInt(_end, 10);
|
|
128
140
|
_context.next = 11;
|
|
@@ -139,7 +151,7 @@ var RemoteFileWithRangeCache = /*#__PURE__*/function (_RemoteFile) {
|
|
|
139
151
|
}));
|
|
140
152
|
|
|
141
153
|
case 14:
|
|
142
|
-
return _context.abrupt("return", (0, _get2
|
|
154
|
+
return _context.abrupt("return", (0, _get2.default)((0, _getPrototypeOf2.default)(RemoteFileWithRangeCache.prototype), "fetch", this).call(this, url, init));
|
|
143
155
|
|
|
144
156
|
case 15:
|
|
145
157
|
case "end":
|
|
@@ -158,7 +170,7 @@ var RemoteFileWithRangeCache = /*#__PURE__*/function (_RemoteFile) {
|
|
|
158
170
|
}, {
|
|
159
171
|
key: "fetchBinaryRange",
|
|
160
172
|
value: function () {
|
|
161
|
-
var _fetchBinaryRange = (0, _asyncToGenerator2
|
|
173
|
+
var _fetchBinaryRange = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(url, start, end) {
|
|
162
174
|
var options,
|
|
163
175
|
requestDate,
|
|
164
176
|
requestHeaders,
|
|
@@ -175,17 +187,17 @@ var RemoteFileWithRangeCache = /*#__PURE__*/function (_RemoteFile) {
|
|
|
175
187
|
arrayBuffer,
|
|
176
188
|
_args2 = arguments;
|
|
177
189
|
|
|
178
|
-
return
|
|
190
|
+
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
179
191
|
while (1) {
|
|
180
192
|
switch (_context2.prev = _context2.next) {
|
|
181
193
|
case 0:
|
|
182
194
|
options = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : {};
|
|
183
195
|
requestDate = new Date();
|
|
184
|
-
requestHeaders = (
|
|
196
|
+
requestHeaders = _objectSpread(_objectSpread({}, options.headers), {}, {
|
|
185
197
|
range: "bytes=".concat(start, "-").concat(end)
|
|
186
198
|
});
|
|
187
199
|
_context2.next = 5;
|
|
188
|
-
return (0, _get2
|
|
200
|
+
return (0, _get2.default)((0, _getPrototypeOf2.default)(RemoteFileWithRangeCache.prototype), "fetch", this).call(this, url, _objectSpread(_objectSpread({}, options), {}, {
|
|
189
201
|
headers: requestHeaders
|
|
190
202
|
}));
|
|
191
203
|
|
|
@@ -207,11 +219,11 @@ var RemoteFileWithRangeCache = /*#__PURE__*/function (_RemoteFile) {
|
|
|
207
219
|
// will miss duplicate headers of course
|
|
208
220
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
209
221
|
headers = {};
|
|
210
|
-
_iterator = (
|
|
222
|
+
_iterator = _createForOfIteratorHelper(res.headers.entries());
|
|
211
223
|
|
|
212
224
|
try {
|
|
213
225
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
214
|
-
_step$value = (0, _slicedToArray2
|
|
226
|
+
_step$value = (0, _slicedToArray2.default)(_step.value, 2), k = _step$value[0], v = _step$value[1];
|
|
215
227
|
headers[k] = v;
|
|
216
228
|
} // return the response headers, and the data buffer
|
|
217
229
|
|
package/util/io/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -13,9 +13,9 @@ Object.defineProperty(exports, "RemoteFileWithRangeCache", {
|
|
|
13
13
|
});
|
|
14
14
|
exports.openLocation = openLocation;
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
17
17
|
|
|
18
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("
|
|
18
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
19
19
|
|
|
20
20
|
var _genericFilehandle = require("generic-filehandle");
|
|
21
21
|
|
|
@@ -41,9 +41,9 @@ function openLocation(location, pluginManager) {
|
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
function _checkAuthNeededFetch() {
|
|
44
|
-
_checkAuthNeededFetch = (0, _asyncToGenerator2
|
|
44
|
+
_checkAuthNeededFetch = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, opts) {
|
|
45
45
|
var response, authHeaders;
|
|
46
|
-
return
|
|
46
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
47
47
|
while (1) {
|
|
48
48
|
switch (_context.prev = _context.next) {
|
|
49
49
|
case 0:
|
|
@@ -89,7 +89,7 @@ function openLocation(location, pluginManager) {
|
|
|
89
89
|
throw new Error('No local path provided');
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
if (_detectNode
|
|
92
|
+
if (_detectNode.default) {
|
|
93
93
|
return new _genericFilehandle.LocalFile(location.localPath);
|
|
94
94
|
} else {
|
|
95
95
|
throw new Error("can't use local files in the browser");
|