@jbrowse/core 1.5.4 → 1.5.8
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 +78 -91
- package/BaseFeatureWidget/SequenceFeatureDetails.js +57 -65
- package/BaseFeatureWidget/SequenceFeatureDetails.test.js +9 -9
- package/BaseFeatureWidget/index.js +1 -1
- package/BaseFeatureWidget/index.test.js +3 -3
- package/BaseFeatureWidget/types.js +5 -1
- package/BaseFeatureWidget/util.js +9 -13
- package/CorePlugin.js +19 -31
- package/Plugin.js +11 -13
- package/PluginLoader.js +33 -38
- package/PluginManager.js +55 -56
- package/ReExports/index.js +4 -4
- package/ReExports/list.js +2 -2
- package/ReExports/material-ui-colors.js +20 -20
- package/ReExports/modules.js +47 -51
- package/TextSearch/BaseResults.js +24 -34
- package/TextSearch/BaseResults.test.js +3 -7
- package/TextSearch/TextSearchManager.js +16 -17
- package/assemblyManager/assembly.js +34 -39
- package/assemblyManager/assemblyConfigSchema.js +2 -2
- package/assemblyManager/assemblyManager.js +16 -20
- package/assemblyManager/index.js +3 -3
- package/configuration/configurationSchema.js +17 -19
- package/configuration/configurationSlot.js +11 -11
- package/configuration/configurationSlot.test.js +5 -5
- package/configuration/util.js +5 -5
- package/data_adapters/BaseAdapter.js +38 -40
- package/data_adapters/BaseAdapter.test.js +24 -30
- package/data_adapters/CytobandAdapter.js +16 -22
- package/data_adapters/dataAdapterCache.js +9 -9
- package/package.json +3 -4
- package/pluggableElementTypes/AdapterType.js +22 -31
- package/pluggableElementTypes/ConnectionType.js +18 -28
- package/pluggableElementTypes/DisplayType.js +17 -27
- package/pluggableElementTypes/InternetAccountType.js +14 -24
- package/pluggableElementTypes/PluggableElementBase.js +8 -10
- package/pluggableElementTypes/RpcMethodType.js +41 -55
- package/pluggableElementTypes/RpcMethodType.test.js +17 -23
- package/pluggableElementTypes/TextSearchAdapterType.js +15 -25
- package/pluggableElementTypes/TrackType.js +15 -25
- package/pluggableElementTypes/ViewType.js +15 -25
- package/pluggableElementTypes/WidgetType.js +17 -27
- package/pluggableElementTypes/index.js +11 -11
- package/pluggableElementTypes/models/BaseConnectionModelFactory.js +5 -5
- package/pluggableElementTypes/models/BaseDisplayModel.js +5 -8
- package/pluggableElementTypes/models/BaseTrackModel.js +8 -11
- package/pluggableElementTypes/models/BaseViewModel.js +3 -3
- package/pluggableElementTypes/models/InternetAccountModel.js +5 -5
- package/pluggableElementTypes/models/baseConnectionConfig.js +2 -2
- package/pluggableElementTypes/models/baseTrackConfig.js +4 -7
- package/pluggableElementTypes/models/index.js +4 -4
- package/pluggableElementTypes/renderers/BoxRendererType.js +39 -49
- package/pluggableElementTypes/renderers/CircularChordRendererType.js +12 -18
- package/pluggableElementTypes/renderers/ComparativeServerSideRendererType.js +27 -35
- package/pluggableElementTypes/renderers/FeatureRendererType.js +36 -46
- package/pluggableElementTypes/renderers/RendererType.js +21 -31
- package/pluggableElementTypes/renderers/ServerSideRenderedContent.js +8 -12
- package/pluggableElementTypes/renderers/ServerSideRendererType.js +31 -44
- package/pluggableElementTypes/renderers/index.js +8 -8
- package/pluggableElementTypes/renderers/util/serializableFilterChain.js +8 -10
- package/pluggableElementTypes/renderers/util/serializableFilterChain.test.js +2 -2
- package/rpc/BaseRpcDriver.js +38 -41
- package/rpc/BaseRpcDriver.test.js +49 -63
- package/rpc/MainThreadRpcDriver.js +22 -32
- package/rpc/RpcManager.js +20 -19
- package/rpc/WebWorkerRpcDriver.js +29 -38
- package/rpc/configSchema.js +2 -2
- package/rpc/coreRpcMethods.js +72 -82
- package/rpc/remoteAbortSignals.js +3 -3
- package/ui/AboutDialog.js +17 -21
- package/ui/App.js +38 -42
- package/ui/AssemblySelector.js +5 -5
- package/ui/Drawer.js +7 -7
- package/ui/DrawerWidget.js +33 -37
- package/ui/DropDownMenu.js +9 -21
- package/ui/EditableTypography.js +19 -30
- package/ui/ErrorMessage.js +5 -5
- package/ui/FactoryResetDialog.js +8 -8
- package/ui/FatalErrorDialog.js +12 -29
- package/ui/FatalErrorDialog.test.js +11 -11
- package/ui/FileSelector/FileSelector.js +32 -42
- 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 +35 -46
- package/ui/NewSessionCards.js +19 -29
- package/ui/PrerenderedCanvas.js +10 -27
- package/ui/ResizeHandle.js +10 -17
- package/ui/SanitizedHTML.js +5 -5
- package/ui/SanitizedHTML.test.js +4 -4
- package/ui/Snackbar.js +12 -16
- package/ui/SnackbarModel.js +1 -1
- package/ui/Tooltip.js +7 -11
- package/ui/ViewContainer.js +20 -30
- package/ui/index.js +13 -17
- package/ui/theme.js +11 -15
- package/util/Base1DViewModel.js +10 -14
- package/util/Base1DViewModel.test.js +5 -5
- package/util/QuickLRU.js +27 -31
- package/util/aborting.js +16 -26
- package/util/analytics.js +7 -7
- package/util/blockTypes.js +39 -49
- package/util/calculateDynamicBlocks.js +4 -4
- package/util/calculateDynamicBlocks.test.js +10 -14
- package/util/calculateStaticBlocks.js +1 -1
- package/util/calculateStaticBlocks.test.js +15 -15
- package/util/compositeMap.js +28 -31
- package/util/idMaker.js +4 -4
- package/util/index.js +35 -48
- package/util/index.test.js +7 -11
- package/util/io/RemoteFileWithRangeCache.js +29 -41
- package/util/io/index.js +6 -6
- package/util/jexl.js +8 -5
- package/util/jexlStrings.js +2 -2
- package/util/jexlStrings.test.js +2 -2
- package/util/layouts/BaseLayout.js +5 -1
- package/util/layouts/GranularRectLayout.js +27 -33
- package/util/layouts/GranularRectLayout.test.js +10 -10
- package/util/layouts/MultiLayout.js +14 -19
- package/util/layouts/PrecomputedLayout.js +14 -16
- package/util/layouts/PrecomputedMultiLayout.js +17 -23
- package/util/layouts/SceneGraph.js +18 -18
- package/util/layouts/index.js +6 -6
- package/util/offscreenCanvasPonyfill.js +29 -31
- package/util/offscreenCanvasUtils.js +6 -6
- package/util/range.test.js +20 -20
- package/util/rxjs.js +2 -2
- package/util/simpleFeature.js +19 -24
- package/util/simpleFeature.test.js +3 -3
- package/util/stats.js +7 -11
- package/util/stats.test.js +15 -15
- package/util/types/index.js +32 -34
- package/util/types/mst.js +15 -19
- package/util/types/util.js +5 -1
- package/util/when.js +6 -6
- package/babel.config.d.ts +0 -15
- package/babel.config.js +0 -19
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/interopRequireDefault.js")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports
|
|
8
|
+
exports["default"] = assemblyManagerFactory;
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _index = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/regenerator/index.js"));
|
|
11
11
|
|
|
12
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _createForOfIteratorHelper2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/createForOfIteratorHelper.js"));
|
|
15
|
+
|
|
16
|
+
var _toConsumableArray2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/toConsumableArray.js"));
|
|
15
17
|
|
|
16
18
|
var _mobx = require("mobx");
|
|
17
19
|
|
|
@@ -23,14 +25,8 @@ var _configuration = require("../configuration");
|
|
|
23
25
|
|
|
24
26
|
var _assembly = _interopRequireDefault(require("./assembly"));
|
|
25
27
|
|
|
26
|
-
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; } } }; }
|
|
27
|
-
|
|
28
|
-
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); }
|
|
29
|
-
|
|
30
|
-
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; }
|
|
31
|
-
|
|
32
28
|
function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
33
|
-
var Assembly = (0, _assembly
|
|
29
|
+
var Assembly = (0, _assembly["default"])(assemblyConfigType, pluginManager);
|
|
34
30
|
return _mobxStateTree.types.model({
|
|
35
31
|
assemblies: _mobxStateTree.types.array(Assembly)
|
|
36
32
|
}).views(function (self) {
|
|
@@ -57,7 +53,7 @@ function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
|
57
53
|
_getParent$session = _getParent$session === void 0 ? {} : _getParent$session;
|
|
58
54
|
var _getParent$session$se = _getParent$session.sessionAssemblies,
|
|
59
55
|
sessionAssemblies = _getParent$session$se === void 0 ? [] : _getParent$session$se;
|
|
60
|
-
return [].concat((0, _toConsumableArray2
|
|
56
|
+
return [].concat((0, _toConsumableArray2["default"])(assemblies), (0, _toConsumableArray2["default"])(sessionAssemblies));
|
|
61
57
|
},
|
|
62
58
|
|
|
63
59
|
get rpcManager() {
|
|
@@ -71,7 +67,7 @@ function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
|
71
67
|
get allPossibleRefNames() {
|
|
72
68
|
var refNames = [];
|
|
73
69
|
|
|
74
|
-
var _iterator =
|
|
70
|
+
var _iterator = (0, _createForOfIteratorHelper2["default"])(self.assemblies),
|
|
75
71
|
_step;
|
|
76
72
|
|
|
77
73
|
try {
|
|
@@ -99,9 +95,9 @@ function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
|
99
95
|
// use this method instead of assemblyManager.get(assemblyName)
|
|
100
96
|
// get an assembly with regions loaded
|
|
101
97
|
waitForAssembly: function waitForAssembly(assemblyName) {
|
|
102
|
-
return (0, _asyncToGenerator2
|
|
98
|
+
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee() {
|
|
103
99
|
var assembly;
|
|
104
|
-
return
|
|
100
|
+
return _index["default"].wrap(function _callee$(_context) {
|
|
105
101
|
while (1) {
|
|
106
102
|
switch (_context.prev = _context.next) {
|
|
107
103
|
case 0:
|
|
@@ -148,9 +144,9 @@ function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
|
148
144
|
}))();
|
|
149
145
|
},
|
|
150
146
|
getRefNameMapForAdapter: function getRefNameMapForAdapter(adapterConf, assemblyName, opts) {
|
|
151
|
-
return (0, _asyncToGenerator2
|
|
147
|
+
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee2() {
|
|
152
148
|
var assembly;
|
|
153
|
-
return
|
|
149
|
+
return _index["default"].wrap(function _callee2$(_context2) {
|
|
154
150
|
while (1) {
|
|
155
151
|
switch (_context2.prev = _context2.next) {
|
|
156
152
|
case 0:
|
|
@@ -184,9 +180,9 @@ function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
|
184
180
|
}))();
|
|
185
181
|
},
|
|
186
182
|
getReverseRefNameMapForAdapter: function getReverseRefNameMapForAdapter(adapterConf, assemblyName, opts) {
|
|
187
|
-
return (0, _asyncToGenerator2
|
|
183
|
+
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee3() {
|
|
188
184
|
var assembly;
|
|
189
|
-
return
|
|
185
|
+
return _index["default"].wrap(function _callee3$(_context3) {
|
|
190
186
|
while (1) {
|
|
191
187
|
switch (_context3.prev = _context3.next) {
|
|
192
188
|
case 0:
|
package/assemblyManager/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/interopRequireDefault.js")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -8,13 +8,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
Object.defineProperty(exports, "assemblyConfigSchemaFactory", {
|
|
9
9
|
enumerable: true,
|
|
10
10
|
get: function get() {
|
|
11
|
-
return _assemblyConfigSchema
|
|
11
|
+
return _assemblyConfigSchema["default"];
|
|
12
12
|
}
|
|
13
13
|
});
|
|
14
14
|
Object.defineProperty(exports, "default", {
|
|
15
15
|
enumerable: true,
|
|
16
16
|
get: function get() {
|
|
17
|
-
return _assemblyManager
|
|
17
|
+
return _assemblyManager["default"];
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
20
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/interopRequireDefault.js")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -8,11 +8,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.ConfigurationReference = ConfigurationReference;
|
|
9
9
|
exports.ConfigurationSchema = ConfigurationSchema;
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _defineProperty2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/defineProperty.js"));
|
|
12
12
|
|
|
13
|
-
var
|
|
13
|
+
var _slicedToArray2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/slicedToArray.js"));
|
|
14
14
|
|
|
15
|
-
var
|
|
15
|
+
var _objectSpread2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/objectSpread2.js"));
|
|
16
|
+
|
|
17
|
+
var _typeof2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/typeof.js"));
|
|
16
18
|
|
|
17
19
|
var _mobxStateTree = require("mobx-state-tree");
|
|
18
20
|
|
|
@@ -22,12 +24,8 @@ var _configurationSlot = _interopRequireDefault(require("./configurationSlot"));
|
|
|
22
24
|
|
|
23
25
|
var _util = require("./util");
|
|
24
26
|
|
|
25
|
-
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; }
|
|
26
|
-
|
|
27
|
-
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; }
|
|
28
|
-
|
|
29
27
|
function isEmptyObject(thing) {
|
|
30
|
-
return (0, _typeof2
|
|
28
|
+
return (0, _typeof2["default"])(thing) === 'object' && !Array.isArray(thing) && thing !== null && Object.keys(thing).length === 0;
|
|
31
29
|
}
|
|
32
30
|
|
|
33
31
|
function isEmptyArray(thing) {
|
|
@@ -47,8 +45,8 @@ function preprocessConfigurationSchemaArguments(modelName, inputSchemaDefinition
|
|
|
47
45
|
var options = inputOptions;
|
|
48
46
|
|
|
49
47
|
if (inputOptions.baseConfiguration && inputOptions.baseConfiguration.jbrowseSchemaDefinition) {
|
|
50
|
-
schemaDefinition =
|
|
51
|
-
options =
|
|
48
|
+
schemaDefinition = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, inputOptions.baseConfiguration.jbrowseSchemaDefinition), schemaDefinition);
|
|
49
|
+
options = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, inputOptions.baseConfiguration.jbrowseSchemaOptions || {}), inputOptions);
|
|
52
50
|
delete options.baseConfiguration;
|
|
53
51
|
}
|
|
54
52
|
|
|
@@ -100,7 +98,7 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
|
|
|
100
98
|
}
|
|
101
99
|
};
|
|
102
100
|
Object.entries(schemaDefinition).forEach(function (_ref) {
|
|
103
|
-
var _ref2 = (0, _slicedToArray2
|
|
101
|
+
var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
|
|
104
102
|
slotName = _ref2[0],
|
|
105
103
|
slotDefinition = _ref2[1];
|
|
106
104
|
|
|
@@ -110,14 +108,14 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
|
|
|
110
108
|
modelDefinition[slotName] = slotDefinition;
|
|
111
109
|
} else if (typeof slotDefinition === 'string' || typeof slotDefinition === 'number') {
|
|
112
110
|
volatileConstants[slotName] = slotDefinition;
|
|
113
|
-
} else if ((0, _typeof2
|
|
111
|
+
} else if ((0, _typeof2["default"])(slotDefinition) === 'object') {
|
|
114
112
|
// this is a slot definition
|
|
115
113
|
if (!slotDefinition.type) {
|
|
116
114
|
throw new Error("no type set for config slot ".concat(modelName, ".").concat(slotName));
|
|
117
115
|
}
|
|
118
116
|
|
|
119
117
|
try {
|
|
120
|
-
modelDefinition[slotName] = (0, _configurationSlot
|
|
118
|
+
modelDefinition[slotName] = (0, _configurationSlot["default"])(slotName, slotDefinition);
|
|
121
119
|
} catch (e) {
|
|
122
120
|
throw new Error("invalid config slot definition for ".concat(modelName, ".").concat(slotName, ": ").concat(e));
|
|
123
121
|
}
|
|
@@ -141,7 +139,7 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
|
|
|
141
139
|
});
|
|
142
140
|
|
|
143
141
|
if (Object.keys(volatileConstants).length) {
|
|
144
|
-
completeModel = completeModel
|
|
142
|
+
completeModel = completeModel["volatile"](function
|
|
145
143
|
/* self */
|
|
146
144
|
() {
|
|
147
145
|
return volatileConstants;
|
|
@@ -160,8 +158,8 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
|
|
|
160
158
|
completeModel = completeModel.extend(options.extend);
|
|
161
159
|
}
|
|
162
160
|
|
|
163
|
-
var identifierDefault = identifier ? (0, _defineProperty2
|
|
164
|
-
var modelDefault = options.explicitlyTyped ?
|
|
161
|
+
var identifierDefault = identifier ? (0, _defineProperty2["default"])({}, identifier, 'placeholderId') : {};
|
|
162
|
+
var modelDefault = options.explicitlyTyped ? (0, _objectSpread2["default"])({
|
|
165
163
|
type: modelName
|
|
166
164
|
}, identifierDefault) : identifierDefault;
|
|
167
165
|
var defaultSnap = (0, _mobxStateTree.getSnapshot)(completeModel.create(modelDefault));
|
|
@@ -170,12 +168,12 @@ function makeConfigurationSchemaModel(modelName, schemaDefinition, options) {
|
|
|
170
168
|
var matchesDefault = true; // let keyCount = 0
|
|
171
169
|
|
|
172
170
|
for (var _i = 0, _Object$entries = Object.entries(snap); _i < _Object$entries.length; _i++) {
|
|
173
|
-
var _Object$entries$_i = (0, _slicedToArray2
|
|
171
|
+
var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
|
|
174
172
|
key = _Object$entries$_i[0],
|
|
175
173
|
value = _Object$entries$_i[1];
|
|
176
174
|
|
|
177
175
|
if (matchesDefault) {
|
|
178
|
-
if ((0, _typeof2
|
|
176
|
+
if ((0, _typeof2["default"])(defaultSnap[key]) === 'object' && (0, _typeof2["default"])(value) === 'object') {
|
|
179
177
|
if (JSON.stringify(defaultSnap[key]) !== JSON.stringify(value)) {
|
|
180
178
|
matchesDefault = false;
|
|
181
179
|
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/interopRequireDefault.js")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports
|
|
8
|
+
exports["default"] = ConfigSlot;
|
|
9
9
|
|
|
10
|
-
var _typeof2 = _interopRequireDefault(require("
|
|
10
|
+
var _typeof2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/typeof.js"));
|
|
11
11
|
|
|
12
12
|
var _mobxStateTree = require("mobx-state-tree");
|
|
13
13
|
|
|
@@ -27,7 +27,7 @@ var typeModels = {
|
|
|
27
27
|
stringArray: _mobxStateTree.types.array(_mobxStateTree.types.string),
|
|
28
28
|
stringArrayMap: _mobxStateTree.types.map(_mobxStateTree.types.array(_mobxStateTree.types.string)),
|
|
29
29
|
numberMap: _mobxStateTree.types.map(_mobxStateTree.types.number),
|
|
30
|
-
boolean: _mobxStateTree.types
|
|
30
|
+
"boolean": _mobxStateTree.types["boolean"],
|
|
31
31
|
color: _mobxStateTree.types.refinement('Color', _mobxStateTree.types.string, isValidColorString),
|
|
32
32
|
integer: _mobxStateTree.types.integer,
|
|
33
33
|
number: _mobxStateTree.types.number,
|
|
@@ -41,7 +41,7 @@ var fallbackDefaults = {
|
|
|
41
41
|
stringArray: [],
|
|
42
42
|
stringArrayMap: {},
|
|
43
43
|
numberMap: {},
|
|
44
|
-
boolean: true,
|
|
44
|
+
"boolean": true,
|
|
45
45
|
color: 'black',
|
|
46
46
|
integer: 1,
|
|
47
47
|
number: 1,
|
|
@@ -81,7 +81,7 @@ var typeModelExtensions = {
|
|
|
81
81
|
fileLocation: objectJSON,
|
|
82
82
|
number: literalJSON,
|
|
83
83
|
integer: literalJSON,
|
|
84
|
-
boolean: literalJSON,
|
|
84
|
+
"boolean": literalJSON,
|
|
85
85
|
frozen: objectJSON,
|
|
86
86
|
// special actions for working with stringArray slots
|
|
87
87
|
stringArray: function stringArray(self) {
|
|
@@ -118,7 +118,7 @@ var typeModelExtensions = {
|
|
|
118
118
|
self.value.set(key, val);
|
|
119
119
|
},
|
|
120
120
|
remove: function remove(key) {
|
|
121
|
-
self.value
|
|
121
|
+
self.value["delete"](key);
|
|
122
122
|
},
|
|
123
123
|
addToKey: function addToKey(key, val) {
|
|
124
124
|
var ar = self.value.get(key);
|
|
@@ -163,7 +163,7 @@ var typeModelExtensions = {
|
|
|
163
163
|
self.value.set(key, val);
|
|
164
164
|
},
|
|
165
165
|
remove: function remove(key) {
|
|
166
|
-
self.value
|
|
166
|
+
self.value["delete"](key);
|
|
167
167
|
}
|
|
168
168
|
}
|
|
169
169
|
};
|
|
@@ -218,7 +218,7 @@ function ConfigSlot(slotName, _ref) {
|
|
|
218
218
|
description: _mobxStateTree.types.literal(description),
|
|
219
219
|
type: _mobxStateTree.types.literal(type),
|
|
220
220
|
value: _mobxStateTree.types.optional(_mobxStateTree.types.union(JexlStringType, model), defaultValue)
|
|
221
|
-
})
|
|
221
|
+
})["volatile"](function () {
|
|
222
222
|
return {
|
|
223
223
|
contextVariable: contextVariable
|
|
224
224
|
};
|
|
@@ -272,14 +272,14 @@ function ConfigSlot(slotName, _ref) {
|
|
|
272
272
|
|
|
273
273
|
};
|
|
274
274
|
}).preProcessSnapshot(function (val) {
|
|
275
|
-
return (0, _typeof2
|
|
275
|
+
return (0, _typeof2["default"])(val) === 'object' && val.name === slotName ? val : {
|
|
276
276
|
name: slotName,
|
|
277
277
|
description: description,
|
|
278
278
|
type: type,
|
|
279
279
|
value: val
|
|
280
280
|
};
|
|
281
281
|
}).postProcessSnapshot(function (snap) {
|
|
282
|
-
if ((0, _typeof2
|
|
282
|
+
if ((0, _typeof2["default"])(snap.value) === 'object') {
|
|
283
283
|
return JSON.stringify(snap.value) !== JSON.stringify(defaultValue) ? snap.value : undefined;
|
|
284
284
|
}
|
|
285
285
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/interopRequireDefault.js")["default"];
|
|
4
4
|
|
|
5
5
|
var _configurationSlot = _interopRequireDefault(require("./configurationSlot"));
|
|
6
6
|
|
|
7
7
|
test('can convert a string slot to and from a callback', function () {
|
|
8
|
-
var model = (0, _configurationSlot
|
|
8
|
+
var model = (0, _configurationSlot["default"])('tester', {
|
|
9
9
|
type: 'string',
|
|
10
10
|
defaultValue: 'foo'
|
|
11
11
|
});
|
|
@@ -20,7 +20,7 @@ test('can convert a string slot to and from a callback', function () {
|
|
|
20
20
|
expect(instance.expr.evalSync()).toBe('foo');
|
|
21
21
|
});
|
|
22
22
|
test('can convert a numeric slot to and from a callback', function () {
|
|
23
|
-
var model = (0, _configurationSlot
|
|
23
|
+
var model = (0, _configurationSlot["default"])('tester', {
|
|
24
24
|
type: 'number',
|
|
25
25
|
defaultValue: 12,
|
|
26
26
|
contextVariable: ['something']
|
|
@@ -33,7 +33,7 @@ test('can convert a numeric slot to and from a callback', function () {
|
|
|
33
33
|
expect(instance.expr.evalSync()).toBe(12);
|
|
34
34
|
});
|
|
35
35
|
test('can convert a stringArray slot to and from a callback', function () {
|
|
36
|
-
var model = (0, _configurationSlot
|
|
36
|
+
var model = (0, _configurationSlot["default"])('tester', {
|
|
37
37
|
type: 'stringArray',
|
|
38
38
|
defaultValue: ['foo', 'bar']
|
|
39
39
|
});
|
|
@@ -48,7 +48,7 @@ test('can convert a stringArray slot to and from a callback', function () {
|
|
|
48
48
|
expect(instance.value).toEqual(['foo', 'bar']);
|
|
49
49
|
});
|
|
50
50
|
test('can convert a slot with a default function value to a scalar value', function () {
|
|
51
|
-
var model = (0, _configurationSlot
|
|
51
|
+
var model = (0, _configurationSlot["default"])('tester', {
|
|
52
52
|
type: 'string',
|
|
53
53
|
defaultValue: 'jexl:get(feature,"foo")'
|
|
54
54
|
});
|
package/configuration/util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/interopRequireDefault.js")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -13,9 +13,9 @@ exports.isConfigurationSchemaType = isConfigurationSchemaType;
|
|
|
13
13
|
exports.isConfigurationSlotType = isConfigurationSlotType;
|
|
14
14
|
exports.readConfObject = readConfObject;
|
|
15
15
|
|
|
16
|
-
var _typeof2 = _interopRequireDefault(require("
|
|
16
|
+
var _typeof2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/typeof.js"));
|
|
17
17
|
|
|
18
|
-
var _toConsumableArray2 = _interopRequireDefault(require("
|
|
18
|
+
var _toConsumableArray2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/toConsumableArray.js"));
|
|
19
19
|
|
|
20
20
|
var _mobxStateTree = require("mobx-state-tree");
|
|
21
21
|
|
|
@@ -154,7 +154,7 @@ function getTypeNamesFromExplicitlyTypedUnion(maybeUnionType) {
|
|
|
154
154
|
throw new Error("invalid config schema type ".concat(type));
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
-
typeNames.push.apply(typeNames, (0, _toConsumableArray2
|
|
157
|
+
typeNames.push.apply(typeNames, (0, _toConsumableArray2["default"])(typeName));
|
|
158
158
|
});
|
|
159
159
|
return typeNames;
|
|
160
160
|
}
|
|
@@ -217,5 +217,5 @@ function isConfigurationModel(thing) {
|
|
|
217
217
|
}
|
|
218
218
|
|
|
219
219
|
function isConfigurationSlotType(thing) {
|
|
220
|
-
return (0, _typeof2
|
|
220
|
+
return (0, _typeof2["default"])(thing) === 'object' && thing !== null && 'isJBrowseConfigurationSlot' in thing;
|
|
221
221
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("
|
|
3
|
+
var _interopRequireDefault = require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/interopRequireDefault.js")["default"];
|
|
4
4
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
@@ -12,23 +12,19 @@ exports.isRegionsAdapter = isRegionsAdapter;
|
|
|
12
12
|
exports.isSequenceAdapter = isSequenceAdapter;
|
|
13
13
|
exports.isTextSearchAdapter = isTextSearchAdapter;
|
|
14
14
|
|
|
15
|
-
var
|
|
15
|
+
var _index = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/regenerator/index.js"));
|
|
16
16
|
|
|
17
|
-
var _toConsumableArray2 = _interopRequireDefault(require("
|
|
17
|
+
var _toConsumableArray2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/toConsumableArray.js"));
|
|
18
18
|
|
|
19
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("
|
|
19
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js"));
|
|
20
20
|
|
|
21
|
-
var _inherits2 = _interopRequireDefault(require("
|
|
21
|
+
var _inherits2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/inherits.js"));
|
|
22
22
|
|
|
23
|
-
var
|
|
23
|
+
var _createSuper2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/createSuper.js"));
|
|
24
24
|
|
|
25
|
-
var
|
|
25
|
+
var _createClass2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/createClass.js"));
|
|
26
26
|
|
|
27
|
-
var
|
|
28
|
-
|
|
29
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
30
|
-
|
|
31
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
27
|
+
var _classCallCheck2 = _interopRequireDefault(require("/data/jbrowse-components2/node_modules/@babel/runtime/helpers/esm/classCallCheck.js"));
|
|
32
28
|
|
|
33
29
|
var _rxjs = require("rxjs");
|
|
34
30
|
|
|
@@ -46,19 +42,21 @@ var _stats = require("../util/stats");
|
|
|
46
42
|
|
|
47
43
|
var _idMaker = _interopRequireDefault(require("../util/idMaker"));
|
|
48
44
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
45
|
+
var BaseAdapter = /*#__PURE__*/(0, _createClass2["default"])(function BaseAdapter() {
|
|
46
|
+
var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (0, _configurationSchema.ConfigurationSchema)('empty', {}).create();
|
|
47
|
+
var getSubAdapter = arguments.length > 1 ? arguments[1] : undefined;
|
|
48
|
+
var pluginManager = arguments.length > 2 ? arguments[2] : undefined;
|
|
49
|
+
(0, _classCallCheck2["default"])(this, BaseAdapter);
|
|
50
|
+
this.config = config;
|
|
51
|
+
this.getSubAdapter = getSubAdapter;
|
|
52
|
+
this.pluginManager = pluginManager;
|
|
53
|
+
this.id = void 0;
|
|
56
54
|
|
|
57
55
|
// note: we use switch on jest here for more simple feature IDs
|
|
58
56
|
// in test environment
|
|
59
57
|
if (typeof jest === 'undefined') {
|
|
60
58
|
var data = (0, _mobxStateTree.isStateTreeNode)(config) ? (0, _mobxStateTree.getSnapshot)(config) : config;
|
|
61
|
-
this.id = "".concat((0, _idMaker
|
|
59
|
+
this.id = "".concat((0, _idMaker["default"])(data));
|
|
62
60
|
} else {
|
|
63
61
|
this.id = 'test';
|
|
64
62
|
}
|
|
@@ -75,19 +73,19 @@ var BaseAdapter = /*#__PURE__*/(0, _createClass2.default)(function BaseAdapter(c
|
|
|
75
73
|
*/
|
|
76
74
|
|
|
77
75
|
exports.BaseAdapter = BaseAdapter;
|
|
78
|
-
|
|
76
|
+
BaseAdapter.capabilities = [];
|
|
79
77
|
|
|
80
78
|
var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
81
|
-
(0, _inherits2
|
|
79
|
+
(0, _inherits2["default"])(BaseFeatureDataAdapter, _BaseAdapter);
|
|
82
80
|
|
|
83
|
-
var _super =
|
|
81
|
+
var _super = (0, _createSuper2["default"])(BaseFeatureDataAdapter);
|
|
84
82
|
|
|
85
83
|
function BaseFeatureDataAdapter() {
|
|
86
|
-
(0, _classCallCheck2
|
|
84
|
+
(0, _classCallCheck2["default"])(this, BaseFeatureDataAdapter);
|
|
87
85
|
return _super.apply(this, arguments);
|
|
88
86
|
}
|
|
89
87
|
|
|
90
|
-
(0, _createClass2
|
|
88
|
+
(0, _createClass2["default"])(BaseFeatureDataAdapter, [{
|
|
91
89
|
key: "getHeader",
|
|
92
90
|
value: // public abstract getFeatures(
|
|
93
91
|
// region: Region,
|
|
@@ -110,8 +108,8 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
110
108
|
* object
|
|
111
109
|
*/
|
|
112
110
|
function () {
|
|
113
|
-
var _getHeader = (0, _asyncToGenerator2
|
|
114
|
-
return
|
|
111
|
+
var _getHeader = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee(_opts) {
|
|
112
|
+
return _index["default"].wrap(function _callee$(_context) {
|
|
115
113
|
while (1) {
|
|
116
114
|
switch (_context.prev = _context.next) {
|
|
117
115
|
case 0:
|
|
@@ -139,8 +137,8 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
139
137
|
}, {
|
|
140
138
|
key: "getMetadata",
|
|
141
139
|
value: function () {
|
|
142
|
-
var _getMetadata = (0, _asyncToGenerator2
|
|
143
|
-
return
|
|
140
|
+
var _getMetadata = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee2(_opts) {
|
|
141
|
+
return _index["default"].wrap(function _callee2$(_context2) {
|
|
144
142
|
while (1) {
|
|
145
143
|
switch (_context2.prev = _context2.next) {
|
|
146
144
|
case 0:
|
|
@@ -172,9 +170,9 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
172
170
|
|
|
173
171
|
var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
174
172
|
return (0, _rxjs2.ObservableCreate)( /*#__PURE__*/function () {
|
|
175
|
-
var _ref = (0, _asyncToGenerator2
|
|
173
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee3(observer) {
|
|
176
174
|
var hasData;
|
|
177
|
-
return
|
|
175
|
+
return _index["default"].wrap(function _callee3$(_context3) {
|
|
178
176
|
while (1) {
|
|
179
177
|
switch (_context3.prev = _context3.next) {
|
|
180
178
|
case 0:
|
|
@@ -228,11 +226,11 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
228
226
|
|
|
229
227
|
var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
230
228
|
|
|
231
|
-
var obs = _rxjs.merge.apply(void 0, (0, _toConsumableArray2
|
|
229
|
+
var obs = _rxjs.merge.apply(void 0, (0, _toConsumableArray2["default"])(regions.map(function (region) {
|
|
232
230
|
return (0, _rxjs2.ObservableCreate)( /*#__PURE__*/function () {
|
|
233
|
-
var _ref2 = (0, _asyncToGenerator2
|
|
231
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee4(observer) {
|
|
234
232
|
var hasData;
|
|
235
|
-
return
|
|
233
|
+
return _index["default"].wrap(function _callee4$(_context4) {
|
|
236
234
|
while (1) {
|
|
237
235
|
switch (_context4.prev = _context4.next) {
|
|
238
236
|
case 0:
|
|
@@ -279,11 +277,11 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
279
277
|
}, {
|
|
280
278
|
key: "hasDataForRefName",
|
|
281
279
|
value: function () {
|
|
282
|
-
var _hasDataForRefName = (0, _asyncToGenerator2
|
|
280
|
+
var _hasDataForRefName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee5(refName) {
|
|
283
281
|
var opts,
|
|
284
282
|
refNames,
|
|
285
283
|
_args5 = arguments;
|
|
286
|
-
return
|
|
284
|
+
return _index["default"].wrap(function _callee5$(_context5) {
|
|
287
285
|
while (1) {
|
|
288
286
|
switch (_context5.prev = _context5.next) {
|
|
289
287
|
case 0:
|
|
@@ -312,9 +310,9 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
312
310
|
}, {
|
|
313
311
|
key: "getRegionStats",
|
|
314
312
|
value: function () {
|
|
315
|
-
var _getRegionStats = (0, _asyncToGenerator2
|
|
313
|
+
var _getRegionStats = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee6(region, opts) {
|
|
316
314
|
var feats;
|
|
317
|
-
return
|
|
315
|
+
return _index["default"].wrap(function _callee6$(_context6) {
|
|
318
316
|
while (1) {
|
|
319
317
|
switch (_context6.prev = _context6.next) {
|
|
320
318
|
case 0:
|
|
@@ -338,7 +336,7 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
338
336
|
}, {
|
|
339
337
|
key: "getMultiRegionStats",
|
|
340
338
|
value: function () {
|
|
341
|
-
var _getMultiRegionStats = (0, _asyncToGenerator2
|
|
339
|
+
var _getMultiRegionStats = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_index["default"].mark(function _callee7() {
|
|
342
340
|
var _this3 = this;
|
|
343
341
|
|
|
344
342
|
var regions,
|
|
@@ -351,7 +349,7 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
|
|
|
351
349
|
featureCount,
|
|
352
350
|
basesCovered,
|
|
353
351
|
_args7 = arguments;
|
|
354
|
-
return
|
|
352
|
+
return _index["default"].wrap(function _callee7$(_context7) {
|
|
355
353
|
while (1) {
|
|
356
354
|
switch (_context7.prev = _context7.next) {
|
|
357
355
|
case 0:
|