@jbrowse/core 1.7.10 → 2.0.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.d.ts +14 -4
- package/BaseFeatureWidget/BaseFeatureDetail.js +97 -63
- package/BaseFeatureWidget/SequenceFeatureDetails.js +21 -15
- package/BaseFeatureWidget/index.d.ts +2 -2
- package/BaseFeatureWidget/index.js +5 -3
- package/BaseFeatureWidget/index.test.js +48 -30
- package/BaseFeatureWidget/types.d.ts +1 -0
- package/PluginManager.d.ts +68 -104
- package/ReExports/Attributes.d.ts +2 -0
- package/ReExports/Attributes.js +12 -0
- package/ReExports/BaseCard.d.ts +2 -0
- package/ReExports/BaseCard.js +12 -0
- package/ReExports/DataGrid.d.ts +2 -0
- package/ReExports/DataGrid.js +13 -0
- package/ReExports/FeatureDetails.d.ts +2 -0
- package/ReExports/FeatureDetails.js +12 -0
- package/ReExports/list.js +1 -1
- package/ReExports/material-ui-colors.d.ts +1 -19
- package/ReExports/material-ui-colors.js +11 -152
- package/ReExports/modules.d.ts +69 -109
- package/ReExports/modules.js +683 -127
- package/TextSearch/TextSearchManager.d.ts +3 -1
- package/assemblyManager/assembly.d.ts +6 -7
- package/assemblyManager/assembly.js +27 -16
- package/assemblyManager/assemblyManager.d.ts +82 -24
- package/assemblyManager/assemblyManager.js +11 -9
- package/configuration/util.d.ts +1 -1
- package/package.json +14 -16
- package/pluggableElementTypes/models/BaseDisplayModel.d.ts +10 -10
- package/pluggableElementTypes/models/BaseTrackModel.d.ts +1 -1
- package/pluggableElementTypes/models/BaseTrackModel.js +24 -25
- package/pluggableElementTypes/renderers/FeatureRendererType.js +17 -8
- package/pluggableElementTypes/renderers/ServerSideRenderedContent.js +2 -2
- package/pluggableElementTypes/renderers/ServerSideRendererType.d.ts +2 -2
- package/pluggableElementTypes/renderers/ServerSideRendererType.js +1 -1
- package/rpc/BaseRpcDriver.js +1 -1
- package/rpc/coreRpcMethods.d.ts +1 -3
- package/rpc/coreRpcMethods.js +5 -5
- package/tsconfig.build.tsbuildinfo +1 -1
- package/ui/AboutDialog.js +15 -10
- package/ui/App.js +18 -37
- package/ui/AssemblySelector.d.ts +1 -1
- package/ui/AssemblySelector.js +10 -5
- package/ui/CascadingMenu.js +10 -14
- package/ui/Drawer.js +8 -5
- package/ui/DrawerWidget.js +39 -45
- package/ui/DropDownMenu.d.ts +0 -8
- package/ui/DropDownMenu.js +9 -15
- package/ui/EditableTypography.d.ts +1 -1
- package/ui/EditableTypography.js +42 -48
- package/ui/ErrorMessage.js +13 -23
- package/ui/FactoryResetDialog.js +6 -6
- package/ui/FatalErrorDialog.js +5 -5
- package/ui/FileSelector/FileSelector.js +19 -19
- package/ui/FileSelector/LocalFileChooser.js +12 -8
- package/ui/FileSelector/UrlChooser.js +2 -2
- package/ui/Icons.d.ts +1 -1
- package/ui/Icons.js +1 -1
- package/ui/Menu.d.ts +1 -1
- package/ui/Menu.js +28 -29
- package/ui/PrerenderedCanvas.js +10 -1
- package/ui/ResizeHandle.js +8 -6
- package/ui/ReturnToImportFormDialog.js +14 -10
- package/ui/SanitizedHTML.js +15 -21
- package/ui/Snackbar.js +11 -9
- package/ui/Tooltip.d.ts +3 -1
- package/ui/Tooltip.js +5 -3
- package/ui/ViewContainer.js +38 -25
- package/ui/theme.d.ts +279 -131
- package/ui/theme.js +174 -154
- package/ui/theme.test.js +56 -75
- package/util/Base1DUtils.d.ts +32 -0
- package/util/Base1DUtils.js +213 -0
- package/util/Base1DViewModel.d.ts +16 -37
- package/util/Base1DViewModel.js +34 -166
- package/util/color/index.js +6 -6
- package/util/index.d.ts +12 -21
- package/util/index.js +29 -90
- package/util/layouts/GranularRectLayout.js +1 -3
- package/util/layouts/PrecomputedLayout.js +1 -3
- package/util/offscreenCanvasPonyfill.js +10 -12
- package/util/tracks.js +4 -2
- package/util/types/index.d.ts +14 -4
- package/util/types/index.js +6 -0
- package/util/types/mst.d.ts +3 -3
- package/util/types/mst.js +11 -7
|
@@ -28,7 +28,9 @@ export default class TextSearchManager {
|
|
|
28
28
|
* @param args - search options/arguments include: search query
|
|
29
29
|
*/
|
|
30
30
|
relevantAdapters(searchScope: SearchScope): any[];
|
|
31
|
-
getAdaptersWithAssembly(asmName: string, adapterConfs: AnyConfigurationModel[]): (
|
|
31
|
+
getAdaptersWithAssembly(asmName: string, adapterConfs: AnyConfigurationModel[]): ({
|
|
32
|
+
[x: string]: any;
|
|
33
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
32
34
|
setSubschema(slotName: string, data: unknown): any;
|
|
33
35
|
} & import("mobx-state-tree").IStateTreeNode<import("../configuration").AnyConfigurationSchemaType>)[];
|
|
34
36
|
getTrackAdaptersWithAssembly(asmName: string, adapterConfs: AnyConfigurationModel[]): any[];
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Instance, IAnyType } from 'mobx-state-tree';
|
|
2
|
-
import { Feature } from '../util/simpleFeature';
|
|
3
2
|
import PluginManager from '../PluginManager';
|
|
4
|
-
import { Region } from '../util
|
|
3
|
+
import { Region, Feature } from '../util';
|
|
5
4
|
declare type RefNameAliases = Record<string, string>;
|
|
6
5
|
export interface BaseOptions {
|
|
7
6
|
signal?: AbortSignal;
|
|
@@ -19,9 +18,8 @@ export default function assemblyFactory(assemblyConfigType: IAnyType, pluginMana
|
|
|
19
18
|
}, {
|
|
20
19
|
error: Error | undefined;
|
|
21
20
|
regions: BasicRegion[] | undefined;
|
|
22
|
-
refNameAliases:
|
|
23
|
-
|
|
24
|
-
} | undefined;
|
|
21
|
+
refNameAliases: RefNameAliases | undefined;
|
|
22
|
+
lowerCaseRefNameAliases: RefNameAliases | undefined;
|
|
25
23
|
cytobands: Feature[] | undefined;
|
|
26
24
|
} & {
|
|
27
25
|
readonly initialized: boolean;
|
|
@@ -39,14 +37,15 @@ export default function assemblyFactory(assemblyConfigType: IAnyType, pluginMana
|
|
|
39
37
|
isValidRefName(refName: string): boolean;
|
|
40
38
|
} & {
|
|
41
39
|
setLoading(): void;
|
|
42
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
40
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
43
41
|
adapterRegionsWithAssembly: Region[];
|
|
44
42
|
refNameAliases: RefNameAliases;
|
|
43
|
+
lowerCaseRefNameAliases: RefNameAliases;
|
|
45
44
|
cytobands: Feature[];
|
|
46
45
|
}): void;
|
|
47
46
|
setError(e: Error): void;
|
|
48
47
|
setRegions(regions: Region[]): void;
|
|
49
|
-
setRefNameAliases(refNameAliases: RefNameAliases): void;
|
|
48
|
+
setRefNameAliases(refNameAliases: RefNameAliases, lowerCaseRefNameAliases: RefNameAliases): void;
|
|
50
49
|
setCytobands(cytobands: Feature[]): void;
|
|
51
50
|
afterAttach(): void;
|
|
52
51
|
} & {
|
|
@@ -37,10 +37,11 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
37
37
|
|
|
38
38
|
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; }
|
|
39
39
|
|
|
40
|
-
// Based on the UCSC Genome Browser chromosome color palette:
|
|
40
|
+
var refNameRegex = new RegExp('[0-9A-Za-z!#$%&+./:;?@^_|~-][0-9A-Za-z!#$%&*+./:;=?@^_|~-]*'); // Based on the UCSC Genome Browser chromosome color palette:
|
|
41
41
|
// https://github.com/ucscGenomeBrowser/kent/blob/a50ed53aff81d6fb3e34e6913ce18578292bc24e/src/hg/inc/chromColors.h
|
|
42
42
|
// Some colors darkened to have at least a 3:1 contrast ratio on a white
|
|
43
43
|
// background
|
|
44
|
+
|
|
44
45
|
var refNameColors = ['rgb(153, 102, 0)', 'rgb(102, 102, 0)', 'rgb(153, 153, 30)', 'rgb(204, 0, 0)', 'rgb(255, 0, 0)', 'rgb(255, 0, 204)', 'rgb(165, 132, 132)', // originally 'rgb(255, 204, 204)'
|
|
45
46
|
'rgb(204, 122, 0)', // originally rgb(255, 153, 0)'
|
|
46
47
|
'rgb(178, 142, 0)', // originally 'rgb(255, 204, 0)'
|
|
@@ -64,7 +65,7 @@ function loadRefNameMap(_x, _x2, _x3, _x4) {
|
|
|
64
65
|
|
|
65
66
|
|
|
66
67
|
function _loadRefNameMap() {
|
|
67
|
-
_loadRefNameMap = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(assembly,
|
|
68
|
+
_loadRefNameMap = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(assembly, adapterConfig, options, signal) {
|
|
68
69
|
var sessionId, refNames, refNameAliases, refNameMap, reversed;
|
|
69
70
|
return _regenerator.default.wrap(function _callee4$(_context4) {
|
|
70
71
|
while (1) {
|
|
@@ -82,7 +83,7 @@ function _loadRefNameMap() {
|
|
|
82
83
|
case 3:
|
|
83
84
|
_context4.next = 5;
|
|
84
85
|
return assembly.rpcManager.call(sessionId, 'CoreGetRefNames', _objectSpread({
|
|
85
|
-
adapterConfig:
|
|
86
|
+
adapterConfig: adapterConfig,
|
|
86
87
|
signal: signal
|
|
87
88
|
}, options), {
|
|
88
89
|
timeout: 1000000
|
|
@@ -128,7 +129,7 @@ function _loadRefNameMap() {
|
|
|
128
129
|
}
|
|
129
130
|
|
|
130
131
|
function checkRefName(refName) {
|
|
131
|
-
if (!refName.match(
|
|
132
|
+
if (!refName.match(refNameRegex)) {
|
|
132
133
|
throw new Error("Encountered invalid refName: \"".concat(refName, "\""));
|
|
133
134
|
}
|
|
134
135
|
}
|
|
@@ -170,6 +171,7 @@ function assemblyFactory(assemblyConfigType, pluginManager) {
|
|
|
170
171
|
error: undefined,
|
|
171
172
|
regions: undefined,
|
|
172
173
|
refNameAliases: undefined,
|
|
174
|
+
lowerCaseRefNameAliases: undefined,
|
|
173
175
|
cytobands: undefined
|
|
174
176
|
};
|
|
175
177
|
}).views(function (self) {
|
|
@@ -202,33 +204,32 @@ function assemblyFactory(assemblyConfigType, pluginManager) {
|
|
|
202
204
|
});
|
|
203
205
|
},
|
|
204
206
|
|
|
207
|
+
// note: lowerCaseRefNameAliases not included here: this allows the list
|
|
208
|
+
// of refnames to be just the "normal casing", but things like
|
|
209
|
+
// getCanonicalRefName can resolve a lower-case name if needed
|
|
205
210
|
get allRefNames() {
|
|
206
211
|
return !self.refNameAliases ? undefined : Object.keys(self.refNameAliases);
|
|
207
212
|
},
|
|
208
213
|
|
|
209
214
|
get rpcManager() {
|
|
215
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
210
216
|
return (0, _mobxStateTree.getParent)(self, 2).rpcManager;
|
|
211
217
|
},
|
|
212
218
|
|
|
213
219
|
get refNameColors() {
|
|
214
220
|
var colors = (0, _configuration.getConf)(self, 'refNameColors');
|
|
215
|
-
|
|
216
|
-
if (colors.length === 0) {
|
|
217
|
-
return refNameColors;
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
return colors;
|
|
221
|
+
return colors.length === 0 ? refNameColors : colors;
|
|
221
222
|
}
|
|
222
223
|
|
|
223
224
|
};
|
|
224
225
|
}).views(function (self) {
|
|
225
226
|
return {
|
|
226
227
|
getCanonicalRefName: function getCanonicalRefName(refName) {
|
|
227
|
-
if (!self.refNameAliases) {
|
|
228
|
+
if (!self.refNameAliases || !self.lowerCaseRefNameAliases) {
|
|
228
229
|
throw new Error('aliases not loaded, we expect them to be loaded before getCanonicalRefName can be called');
|
|
229
230
|
}
|
|
230
231
|
|
|
231
|
-
return self.refNameAliases[refName];
|
|
232
|
+
return self.refNameAliases[refName] || self.lowerCaseRefNameAliases[refName];
|
|
232
233
|
},
|
|
233
234
|
getRefNameColor: function getRefNameColor(refName) {
|
|
234
235
|
var _self$refNames;
|
|
@@ -257,9 +258,10 @@ function assemblyFactory(assemblyConfigType, pluginManager) {
|
|
|
257
258
|
setLoaded: function setLoaded(_ref) {
|
|
258
259
|
var adapterRegionsWithAssembly = _ref.adapterRegionsWithAssembly,
|
|
259
260
|
refNameAliases = _ref.refNameAliases,
|
|
261
|
+
lowerCaseRefNameAliases = _ref.lowerCaseRefNameAliases,
|
|
260
262
|
cytobands = _ref.cytobands;
|
|
261
263
|
this.setRegions(adapterRegionsWithAssembly);
|
|
262
|
-
this.setRefNameAliases(refNameAliases);
|
|
264
|
+
this.setRefNameAliases(refNameAliases, lowerCaseRefNameAliases);
|
|
263
265
|
this.setCytobands(cytobands);
|
|
264
266
|
},
|
|
265
267
|
setError: function setError(e) {
|
|
@@ -269,8 +271,9 @@ function assemblyFactory(assemblyConfigType, pluginManager) {
|
|
|
269
271
|
setRegions: function setRegions(regions) {
|
|
270
272
|
self.regions = regions;
|
|
271
273
|
},
|
|
272
|
-
setRefNameAliases: function setRefNameAliases(refNameAliases) {
|
|
274
|
+
setRefNameAliases: function setRefNameAliases(refNameAliases, lowerCaseRefNameAliases) {
|
|
273
275
|
self.refNameAliases = refNameAliases;
|
|
276
|
+
self.lowerCaseRefNameAliases = lowerCaseRefNameAliases;
|
|
274
277
|
},
|
|
275
278
|
setCytobands: function setCytobands(cytobands) {
|
|
276
279
|
self.cytobands = cytobands;
|
|
@@ -404,7 +407,7 @@ function loadAssemblyReaction(_x5, _x6) {
|
|
|
404
407
|
|
|
405
408
|
function _loadAssemblyReaction() {
|
|
406
409
|
_loadAssemblyReaction = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(props, signal) {
|
|
407
|
-
var sequenceAdapterConfig, assemblyName, refNameAliasesAdapterConfig, cytobandAdapterConfig, pluginManager, adapterRegions, adapterRegionsWithAssembly, refNameAliases, aliases, cytobands;
|
|
410
|
+
var sequenceAdapterConfig, assemblyName, refNameAliasesAdapterConfig, cytobandAdapterConfig, pluginManager, adapterRegions, adapterRegionsWithAssembly, refNameAliases, aliases, cytobands, lowerCaseRefNameAliases;
|
|
408
411
|
return _regenerator.default.wrap(function _callee5$(_context5) {
|
|
409
412
|
while (1) {
|
|
410
413
|
switch (_context5.prev = _context5.next) {
|
|
@@ -452,13 +455,21 @@ function _loadAssemblyReaction() {
|
|
|
452
455
|
adapterRegionsWithAssembly.forEach(function (region) {
|
|
453
456
|
refNameAliases[region.refName] = region.refName;
|
|
454
457
|
});
|
|
458
|
+
lowerCaseRefNameAliases = Object.fromEntries(Object.entries(refNameAliases).map(function (_ref5) {
|
|
459
|
+
var _ref6 = (0, _slicedToArray2.default)(_ref5, 2),
|
|
460
|
+
key = _ref6[0],
|
|
461
|
+
val = _ref6[1];
|
|
462
|
+
|
|
463
|
+
return [key.toLowerCase(), val];
|
|
464
|
+
}));
|
|
455
465
|
return _context5.abrupt("return", {
|
|
456
466
|
adapterRegionsWithAssembly: adapterRegionsWithAssembly,
|
|
457
467
|
refNameAliases: refNameAliases,
|
|
468
|
+
lowerCaseRefNameAliases: lowerCaseRefNameAliases,
|
|
458
469
|
cytobands: cytobands
|
|
459
470
|
});
|
|
460
471
|
|
|
461
|
-
case
|
|
472
|
+
case 18:
|
|
462
473
|
case "end":
|
|
463
474
|
return _context5.stop();
|
|
464
475
|
}
|
|
@@ -7,7 +7,10 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
7
7
|
error: Error | undefined;
|
|
8
8
|
regions: import("./assembly").BasicRegion[] | undefined;
|
|
9
9
|
refNameAliases: {
|
|
10
|
-
[
|
|
10
|
+
[x: string]: string;
|
|
11
|
+
} | undefined;
|
|
12
|
+
lowerCaseRefNameAliases: {
|
|
13
|
+
[x: string]: string;
|
|
11
14
|
} | undefined;
|
|
12
15
|
cytobands: import("../util").Feature[] | undefined;
|
|
13
16
|
} & {
|
|
@@ -26,17 +29,22 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
26
29
|
isValidRefName(refName: string): boolean;
|
|
27
30
|
} & {
|
|
28
31
|
setLoading(): void;
|
|
29
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
32
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
30
33
|
adapterRegionsWithAssembly: import("../util").Region[];
|
|
31
34
|
refNameAliases: {
|
|
32
35
|
[x: string]: string;
|
|
33
36
|
};
|
|
37
|
+
lowerCaseRefNameAliases: {
|
|
38
|
+
[x: string]: string;
|
|
39
|
+
};
|
|
34
40
|
cytobands: import("../util").Feature[];
|
|
35
41
|
}): void;
|
|
36
42
|
setError(e: Error): void;
|
|
37
43
|
setRegions(regions: import("../util").Region[]): void;
|
|
38
44
|
setRefNameAliases(refNameAliases: {
|
|
39
45
|
[x: string]: string;
|
|
46
|
+
}, lowerCaseRefNameAliases: {
|
|
47
|
+
[x: string]: string;
|
|
40
48
|
}): void;
|
|
41
49
|
setCytobands(cytobands: import("../util").Feature[]): void;
|
|
42
50
|
afterAttach(): void;
|
|
@@ -57,13 +65,16 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
57
65
|
}>;
|
|
58
66
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;
|
|
59
67
|
}, {
|
|
60
|
-
get(assemblyName: string): (
|
|
61
|
-
configuration:
|
|
62
|
-
}
|
|
68
|
+
get(assemblyName: string): ({
|
|
69
|
+
configuration: any;
|
|
70
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
63
71
|
error: Error | undefined;
|
|
64
72
|
regions: import("./assembly").BasicRegion[] | undefined;
|
|
65
73
|
refNameAliases: {
|
|
66
|
-
[
|
|
74
|
+
[x: string]: string;
|
|
75
|
+
} | undefined;
|
|
76
|
+
lowerCaseRefNameAliases: {
|
|
77
|
+
[x: string]: string;
|
|
67
78
|
} | undefined;
|
|
68
79
|
cytobands: import("../util").Feature[] | undefined;
|
|
69
80
|
} & {
|
|
@@ -82,17 +93,22 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
82
93
|
isValidRefName(refName: string): boolean;
|
|
83
94
|
} & {
|
|
84
95
|
setLoading(): void;
|
|
85
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
96
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
86
97
|
adapterRegionsWithAssembly: import("../util").Region[];
|
|
87
98
|
refNameAliases: {
|
|
88
99
|
[x: string]: string;
|
|
89
100
|
};
|
|
101
|
+
lowerCaseRefNameAliases: {
|
|
102
|
+
[x: string]: string;
|
|
103
|
+
};
|
|
90
104
|
cytobands: import("../util").Feature[];
|
|
91
105
|
}): void;
|
|
92
106
|
setError(e: Error): void;
|
|
93
107
|
setRegions(regions: import("../util").Region[]): void;
|
|
94
108
|
setRefNameAliases(refNameAliases: {
|
|
95
109
|
[x: string]: string;
|
|
110
|
+
}, lowerCaseRefNameAliases: {
|
|
111
|
+
[x: string]: string;
|
|
96
112
|
}): void;
|
|
97
113
|
setCytobands(cytobands: import("../util").Feature[]): void;
|
|
98
114
|
afterAttach(): void;
|
|
@@ -117,7 +133,10 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
117
133
|
error: Error | undefined;
|
|
118
134
|
regions: import("./assembly").BasicRegion[] | undefined;
|
|
119
135
|
refNameAliases: {
|
|
120
|
-
[
|
|
136
|
+
[x: string]: string;
|
|
137
|
+
} | undefined;
|
|
138
|
+
lowerCaseRefNameAliases: {
|
|
139
|
+
[x: string]: string;
|
|
121
140
|
} | undefined;
|
|
122
141
|
cytobands: import("../util").Feature[] | undefined;
|
|
123
142
|
} & {
|
|
@@ -136,17 +155,22 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
136
155
|
isValidRefName(refName: string): boolean;
|
|
137
156
|
} & {
|
|
138
157
|
setLoading(): void;
|
|
139
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
158
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
140
159
|
adapterRegionsWithAssembly: import("../util").Region[];
|
|
141
160
|
refNameAliases: {
|
|
142
161
|
[x: string]: string;
|
|
143
162
|
};
|
|
163
|
+
lowerCaseRefNameAliases: {
|
|
164
|
+
[x: string]: string;
|
|
165
|
+
};
|
|
144
166
|
cytobands: import("../util").Feature[];
|
|
145
167
|
}): void;
|
|
146
168
|
setError(e: Error): void;
|
|
147
169
|
setRegions(regions: import("../util").Region[]): void;
|
|
148
170
|
setRefNameAliases(refNameAliases: {
|
|
149
171
|
[x: string]: string;
|
|
172
|
+
}, lowerCaseRefNameAliases: {
|
|
173
|
+
[x: string]: string;
|
|
150
174
|
}): void;
|
|
151
175
|
setCytobands(cytobands: import("../util").Feature[]): void;
|
|
152
176
|
afterAttach(): void;
|
|
@@ -167,7 +191,9 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
167
191
|
}>;
|
|
168
192
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
|
|
169
193
|
readonly assemblyNamesList: string[];
|
|
170
|
-
readonly assemblyList: (
|
|
194
|
+
readonly assemblyList: ({
|
|
195
|
+
[x: string]: any;
|
|
196
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
171
197
|
setSubschema(slotName: string, data: unknown): any;
|
|
172
198
|
} & import("mobx-state-tree").IStateTreeNode<import("../configuration").AnyConfigurationSchemaType> & {
|
|
173
199
|
name: string;
|
|
@@ -176,13 +202,16 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
176
202
|
readonly pluginManager: any;
|
|
177
203
|
readonly allPossibleRefNames: string[] | undefined;
|
|
178
204
|
} & {
|
|
179
|
-
waitForAssembly(assemblyName: string): Promise<(
|
|
180
|
-
configuration:
|
|
181
|
-
}
|
|
205
|
+
waitForAssembly(assemblyName: string): Promise<({
|
|
206
|
+
configuration: any;
|
|
207
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
182
208
|
error: Error | undefined;
|
|
183
209
|
regions: import("./assembly").BasicRegion[] | undefined;
|
|
184
210
|
refNameAliases: {
|
|
185
|
-
[
|
|
211
|
+
[x: string]: string;
|
|
212
|
+
} | undefined;
|
|
213
|
+
lowerCaseRefNameAliases: {
|
|
214
|
+
[x: string]: string;
|
|
186
215
|
} | undefined;
|
|
187
216
|
cytobands: import("../util").Feature[] | undefined;
|
|
188
217
|
} & {
|
|
@@ -201,17 +230,22 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
201
230
|
isValidRefName(refName: string): boolean;
|
|
202
231
|
} & {
|
|
203
232
|
setLoading(): void;
|
|
204
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
233
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
205
234
|
adapterRegionsWithAssembly: import("../util").Region[];
|
|
206
235
|
refNameAliases: {
|
|
207
236
|
[x: string]: string;
|
|
208
237
|
};
|
|
238
|
+
lowerCaseRefNameAliases: {
|
|
239
|
+
[x: string]: string;
|
|
240
|
+
};
|
|
209
241
|
cytobands: import("../util").Feature[];
|
|
210
242
|
}): void;
|
|
211
243
|
setError(e: Error): void;
|
|
212
244
|
setRegions(regions: import("../util").Region[]): void;
|
|
213
245
|
setRefNameAliases(refNameAliases: {
|
|
214
246
|
[x: string]: string;
|
|
247
|
+
}, lowerCaseRefNameAliases: {
|
|
248
|
+
[x: string]: string;
|
|
215
249
|
}): void;
|
|
216
250
|
setCytobands(cytobands: import("../util").Feature[]): void;
|
|
217
251
|
afterAttach(): void;
|
|
@@ -236,7 +270,10 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
236
270
|
error: Error | undefined;
|
|
237
271
|
regions: import("./assembly").BasicRegion[] | undefined;
|
|
238
272
|
refNameAliases: {
|
|
239
|
-
[
|
|
273
|
+
[x: string]: string;
|
|
274
|
+
} | undefined;
|
|
275
|
+
lowerCaseRefNameAliases: {
|
|
276
|
+
[x: string]: string;
|
|
240
277
|
} | undefined;
|
|
241
278
|
cytobands: import("../util").Feature[] | undefined;
|
|
242
279
|
} & {
|
|
@@ -255,17 +292,22 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
255
292
|
isValidRefName(refName: string): boolean;
|
|
256
293
|
} & {
|
|
257
294
|
setLoading(): void;
|
|
258
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
295
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
259
296
|
adapterRegionsWithAssembly: import("../util").Region[];
|
|
260
297
|
refNameAliases: {
|
|
261
298
|
[x: string]: string;
|
|
262
299
|
};
|
|
300
|
+
lowerCaseRefNameAliases: {
|
|
301
|
+
[x: string]: string;
|
|
302
|
+
};
|
|
263
303
|
cytobands: import("../util").Feature[];
|
|
264
304
|
}): void;
|
|
265
305
|
setError(e: Error): void;
|
|
266
306
|
setRegions(regions: import("../util").Region[]): void;
|
|
267
307
|
setRefNameAliases(refNameAliases: {
|
|
268
308
|
[x: string]: string;
|
|
309
|
+
}, lowerCaseRefNameAliases: {
|
|
310
|
+
[x: string]: string;
|
|
269
311
|
}): void;
|
|
270
312
|
setCytobands(cytobands: import("../util").Feature[]): void;
|
|
271
313
|
afterAttach(): void;
|
|
@@ -299,13 +341,16 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
299
341
|
} | undefined>;
|
|
300
342
|
isValidRefName(refName: string, assemblyName?: string): boolean;
|
|
301
343
|
} & {
|
|
302
|
-
removeAssembly(asm:
|
|
303
|
-
configuration:
|
|
304
|
-
}
|
|
344
|
+
removeAssembly(asm: {
|
|
345
|
+
configuration: any;
|
|
346
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
305
347
|
error: Error | undefined;
|
|
306
348
|
regions: import("./assembly").BasicRegion[] | undefined;
|
|
307
349
|
refNameAliases: {
|
|
308
|
-
[
|
|
350
|
+
[x: string]: string;
|
|
351
|
+
} | undefined;
|
|
352
|
+
lowerCaseRefNameAliases: {
|
|
353
|
+
[x: string]: string;
|
|
309
354
|
} | undefined;
|
|
310
355
|
cytobands: import("../util").Feature[] | undefined;
|
|
311
356
|
} & {
|
|
@@ -324,17 +369,22 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
324
369
|
isValidRefName(refName: string): boolean;
|
|
325
370
|
} & {
|
|
326
371
|
setLoading(): void;
|
|
327
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
372
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
328
373
|
adapterRegionsWithAssembly: import("../util").Region[];
|
|
329
374
|
refNameAliases: {
|
|
330
375
|
[x: string]: string;
|
|
331
376
|
};
|
|
377
|
+
lowerCaseRefNameAliases: {
|
|
378
|
+
[x: string]: string;
|
|
379
|
+
};
|
|
332
380
|
cytobands: import("../util").Feature[];
|
|
333
381
|
}): void;
|
|
334
382
|
setError(e: Error): void;
|
|
335
383
|
setRegions(regions: import("../util").Region[]): void;
|
|
336
384
|
setRefNameAliases(refNameAliases: {
|
|
337
385
|
[x: string]: string;
|
|
386
|
+
}, lowerCaseRefNameAliases: {
|
|
387
|
+
[x: string]: string;
|
|
338
388
|
}): void;
|
|
339
389
|
setCytobands(cytobands: import("../util").Feature[]): void;
|
|
340
390
|
afterAttach(): void;
|
|
@@ -359,7 +409,10 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
359
409
|
error: Error | undefined;
|
|
360
410
|
regions: import("./assembly").BasicRegion[] | undefined;
|
|
361
411
|
refNameAliases: {
|
|
362
|
-
[
|
|
412
|
+
[x: string]: string;
|
|
413
|
+
} | undefined;
|
|
414
|
+
lowerCaseRefNameAliases: {
|
|
415
|
+
[x: string]: string;
|
|
363
416
|
} | undefined;
|
|
364
417
|
cytobands: import("../util").Feature[] | undefined;
|
|
365
418
|
} & {
|
|
@@ -378,17 +431,22 @@ export default function assemblyManagerFactory(assemblyConfigType: IAnyType, plu
|
|
|
378
431
|
isValidRefName(refName: string): boolean;
|
|
379
432
|
} & {
|
|
380
433
|
setLoading(): void;
|
|
381
|
-
setLoaded({ adapterRegionsWithAssembly, refNameAliases, cytobands, }: {
|
|
434
|
+
setLoaded({ adapterRegionsWithAssembly, refNameAliases, lowerCaseRefNameAliases, cytobands, }: {
|
|
382
435
|
adapterRegionsWithAssembly: import("../util").Region[];
|
|
383
436
|
refNameAliases: {
|
|
384
437
|
[x: string]: string;
|
|
385
438
|
};
|
|
439
|
+
lowerCaseRefNameAliases: {
|
|
440
|
+
[x: string]: string;
|
|
441
|
+
};
|
|
386
442
|
cytobands: import("../util").Feature[];
|
|
387
443
|
}): void;
|
|
388
444
|
setError(e: Error): void;
|
|
389
445
|
setRegions(regions: import("../util").Region[]): void;
|
|
390
446
|
setRefNameAliases(refNameAliases: {
|
|
391
447
|
[x: string]: string;
|
|
448
|
+
}, lowerCaseRefNameAliases: {
|
|
449
|
+
[x: string]: string;
|
|
392
450
|
}): void;
|
|
393
451
|
setCytobands(cytobands: import("../util").Feature[]): void;
|
|
394
452
|
afterAttach(): void;
|
|
@@ -61,10 +61,12 @@ function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
|
61
61
|
},
|
|
62
62
|
|
|
63
63
|
get rpcManager() {
|
|
64
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
64
65
|
return (0, _mobxStateTree.getParent)(self).rpcManager;
|
|
65
66
|
},
|
|
66
67
|
|
|
67
68
|
get pluginManager() {
|
|
69
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
68
70
|
return (0, _mobxStateTree.getParent)(self).pluginManager;
|
|
69
71
|
},
|
|
70
72
|
|
|
@@ -115,29 +117,29 @@ function assemblyManagerFactory(assemblyConfigType, pluginManager) {
|
|
|
115
117
|
case 2:
|
|
116
118
|
assembly = self.get(assemblyName);
|
|
117
119
|
|
|
118
|
-
if (
|
|
119
|
-
_context.next =
|
|
120
|
+
if (assembly) {
|
|
121
|
+
_context.next = 5;
|
|
120
122
|
break;
|
|
121
123
|
}
|
|
122
124
|
|
|
123
|
-
_context.
|
|
125
|
+
return _context.abrupt("return", undefined);
|
|
126
|
+
|
|
127
|
+
case 5:
|
|
128
|
+
_context.next = 7;
|
|
124
129
|
return (0, _util.when)(function () {
|
|
125
130
|
return Boolean(assembly.regions && assembly.refNameAliases) || !!assembly.error;
|
|
126
131
|
});
|
|
127
132
|
|
|
128
|
-
case
|
|
133
|
+
case 7:
|
|
129
134
|
if (!assembly.error) {
|
|
130
|
-
_context.next =
|
|
135
|
+
_context.next = 9;
|
|
131
136
|
break;
|
|
132
137
|
}
|
|
133
138
|
|
|
134
139
|
throw assembly.error;
|
|
135
140
|
|
|
136
|
-
case 8:
|
|
137
|
-
return _context.abrupt("return", assembly);
|
|
138
|
-
|
|
139
141
|
case 9:
|
|
140
|
-
return _context.abrupt("return",
|
|
142
|
+
return _context.abrupt("return", assembly);
|
|
141
143
|
|
|
142
144
|
case 10:
|
|
143
145
|
case "end":
|
package/configuration/util.d.ts
CHANGED
|
@@ -27,6 +27,6 @@ export declare function getConf(model: unknown, slotPath?: string[] | string | u
|
|
|
27
27
|
*/
|
|
28
28
|
export declare function getTypeNamesFromExplicitlyTypedUnion(maybeUnionType: unknown): string[];
|
|
29
29
|
export declare function isBareConfigurationSchemaType(thing: unknown): thing is AnyConfigurationSchemaType;
|
|
30
|
-
export declare function isConfigurationSchemaType(thing: unknown):
|
|
30
|
+
export declare function isConfigurationSchemaType(thing: unknown): thing is AnyConfigurationSchemaType;
|
|
31
31
|
export declare function isConfigurationModel(thing: unknown): thing is AnyConfigurationModel;
|
|
32
32
|
export declare function isConfigurationSlotType(thing: unknown): boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jbrowse/core",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.1",
|
|
4
4
|
"description": "JBrowse 2 core libraries used by plugins",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"jbrowse",
|
|
@@ -30,9 +30,8 @@
|
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@babel/runtime": "^7.17.9",
|
|
33
|
-
"@
|
|
33
|
+
"@mui/icons-material": "^5.0.1",
|
|
34
34
|
"abortable-promise-cache": "^1.5.0",
|
|
35
|
-
"canvas": "^2.8.0",
|
|
36
35
|
"canvas-sequencer": "^3.1.0",
|
|
37
36
|
"canvas2svg": "^1.0.16",
|
|
38
37
|
"clone": "^2.1.2",
|
|
@@ -51,30 +50,29 @@
|
|
|
51
50
|
"json-stable-stringify": "^1.0.1",
|
|
52
51
|
"librpc-web-mod": "^1.1.5",
|
|
53
52
|
"load-script2": "^2.0.5",
|
|
54
|
-
"material-ui-popup-state": "^
|
|
55
|
-
"object.fromentries": "^2.0.0",
|
|
53
|
+
"material-ui-popup-state": "^3.0.0",
|
|
56
54
|
"rbush": "^3.0.1",
|
|
57
55
|
"react-error-boundary": "^3.0.0",
|
|
58
|
-
"react-intersection-observer": "^
|
|
56
|
+
"react-intersection-observer": "^9.3.0",
|
|
59
57
|
"react-use-measure": "^2.1.1",
|
|
60
58
|
"shortid": "^2.2.13",
|
|
61
59
|
"svg-path-generator": "^1.1.0"
|
|
62
60
|
},
|
|
63
61
|
"peerDependencies": {
|
|
64
|
-
"@material
|
|
65
|
-
"@
|
|
66
|
-
"
|
|
67
|
-
"mobx": "^
|
|
68
|
-
"mobx-
|
|
69
|
-
"mobx-state-tree": "^3.14.1",
|
|
62
|
+
"@mui/material": "^5.0.0",
|
|
63
|
+
"@mui/x-data-grid": "^5.0.0",
|
|
64
|
+
"mobx": "^6.0.0",
|
|
65
|
+
"mobx-react": "^7.0.0",
|
|
66
|
+
"mobx-state-tree": "^5.0.0",
|
|
70
67
|
"prop-types": "^15.0.0",
|
|
71
|
-
"react": "
|
|
72
|
-
"react-dom": "
|
|
73
|
-
"rxjs": "^6.0.0"
|
|
68
|
+
"react": ">=16.8.0",
|
|
69
|
+
"react-dom": ">=16.8.0",
|
|
70
|
+
"rxjs": "^6.0.0",
|
|
71
|
+
"tss-react": "^3.0.0"
|
|
74
72
|
},
|
|
75
73
|
"publishConfig": {
|
|
76
74
|
"access": "public",
|
|
77
75
|
"directory": "dist"
|
|
78
76
|
},
|
|
79
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "ed935bf5612af3818abdc8ef52d100d5d81d33a2"
|
|
80
78
|
}
|
|
@@ -10,11 +10,11 @@ export declare const BaseDisplay: import("mobx-state-tree").IModelType<{
|
|
|
10
10
|
error: unknown;
|
|
11
11
|
} & {
|
|
12
12
|
readonly RenderingComponent: React.FC<{
|
|
13
|
-
model:
|
|
14
|
-
id:
|
|
15
|
-
type:
|
|
16
|
-
rpcDriverName:
|
|
17
|
-
}
|
|
13
|
+
model: {
|
|
14
|
+
id: string;
|
|
15
|
+
type: string;
|
|
16
|
+
rpcDriverName: string | undefined;
|
|
17
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
18
18
|
rendererTypeName: string;
|
|
19
19
|
error: unknown;
|
|
20
20
|
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
@@ -29,11 +29,11 @@ export declare const BaseDisplay: import("mobx-state-tree").IModelType<{
|
|
|
29
29
|
blockState?: Record<string, any> | undefined;
|
|
30
30
|
}>;
|
|
31
31
|
readonly DisplayBlurb: React.FC<{
|
|
32
|
-
model:
|
|
33
|
-
id:
|
|
34
|
-
type:
|
|
35
|
-
rpcDriverName:
|
|
36
|
-
}
|
|
32
|
+
model: {
|
|
33
|
+
id: string;
|
|
34
|
+
type: string;
|
|
35
|
+
rpcDriverName: string | undefined;
|
|
36
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
37
37
|
rendererTypeName: string;
|
|
38
38
|
error: unknown;
|
|
39
39
|
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
@@ -21,7 +21,7 @@ export declare function createBaseTrackModel(pluginManager: PluginManager, track
|
|
|
21
21
|
activateConfigurationUI(): void;
|
|
22
22
|
showDisplay(displayId: string, initialSnapshot?: {}): void;
|
|
23
23
|
hideDisplay(displayId: string): number;
|
|
24
|
-
replaceDisplay(
|
|
24
|
+
replaceDisplay(oldId: string, newId: string, initialSnapshot?: {}): void;
|
|
25
25
|
} & {
|
|
26
26
|
trackMenuItems(): MenuItem[];
|
|
27
27
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
|