@jbrowse/plugin-sequence 2.10.3 → 2.11.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/dist/BgzipFastaAdapter/BgzipFastaAdapter.d.ts +1 -1
- package/dist/BgzipFastaAdapter/BgzipFastaAdapter.js +2 -2
- package/dist/BgzipFastaAdapter/index.d.ts +1 -2
- package/dist/BgzipFastaAdapter/index.js +3 -2
- package/dist/ChromSizesAdapter/ChromSizesAdapter.d.ts +1 -1
- package/dist/ChromSizesAdapter/ChromSizesAdapter.js +2 -2
- package/dist/ChromSizesAdapter/index.d.ts +1 -2
- package/dist/ChromSizesAdapter/index.js +3 -2
- package/dist/DivSequenceRenderer/components/DivSequenceRendering.d.ts +1 -0
- package/dist/DivSequenceRenderer/components/DivSequenceRendering.js +56 -41
- package/dist/DivSequenceRenderer/index.d.ts +1 -2
- package/dist/DivSequenceRenderer/index.js +3 -2
- package/dist/IndexedFastaAdapter/IndexedFastaAdapter.d.ts +1 -1
- package/dist/IndexedFastaAdapter/IndexedFastaAdapter.js +2 -2
- package/dist/IndexedFastaAdapter/index.d.ts +1 -2
- package/dist/IndexedFastaAdapter/index.js +3 -2
- package/dist/LinearReferenceSequenceDisplay/index.d.ts +1 -2
- package/dist/LinearReferenceSequenceDisplay/index.js +3 -2
- package/dist/LinearReferenceSequenceDisplay/model.d.ts +38 -20
- package/dist/LinearReferenceSequenceDisplay/model.js +4 -2
- package/dist/ReferenceSequenceTrack/index.d.ts +1 -2
- package/dist/ReferenceSequenceTrack/index.js +3 -2
- package/dist/SequenceSearchAdapter/SequenceSearchAdapter.d.ts +1 -1
- package/dist/SequenceSearchAdapter/SequenceSearchAdapter.js +16 -15
- package/dist/SequenceSearchAdapter/index.d.ts +1 -2
- package/dist/SequenceSearchAdapter/index.js +3 -2
- package/dist/TwoBitAdapter/index.d.ts +1 -2
- package/dist/TwoBitAdapter/index.js +3 -2
- package/dist/createExtensionPoints.d.ts +1 -2
- package/dist/createExtensionPoints.js +3 -2
- package/esm/BgzipFastaAdapter/BgzipFastaAdapter.d.ts +1 -1
- package/esm/BgzipFastaAdapter/BgzipFastaAdapter.js +1 -1
- package/esm/BgzipFastaAdapter/index.d.ts +1 -2
- package/esm/BgzipFastaAdapter/index.js +2 -2
- package/esm/ChromSizesAdapter/ChromSizesAdapter.d.ts +1 -1
- package/esm/ChromSizesAdapter/ChromSizesAdapter.js +1 -1
- package/esm/ChromSizesAdapter/index.d.ts +1 -2
- package/esm/ChromSizesAdapter/index.js +2 -2
- package/esm/DivSequenceRenderer/components/DivSequenceRendering.d.ts +1 -0
- package/esm/DivSequenceRenderer/components/DivSequenceRendering.js +56 -41
- package/esm/DivSequenceRenderer/index.d.ts +1 -2
- package/esm/DivSequenceRenderer/index.js +2 -2
- package/esm/IndexedFastaAdapter/IndexedFastaAdapter.d.ts +1 -1
- package/esm/IndexedFastaAdapter/IndexedFastaAdapter.js +1 -1
- package/esm/IndexedFastaAdapter/index.d.ts +1 -2
- package/esm/IndexedFastaAdapter/index.js +2 -2
- package/esm/LinearReferenceSequenceDisplay/index.d.ts +1 -2
- package/esm/LinearReferenceSequenceDisplay/index.js +2 -2
- package/esm/LinearReferenceSequenceDisplay/model.d.ts +38 -20
- package/esm/LinearReferenceSequenceDisplay/model.js +4 -2
- package/esm/ReferenceSequenceTrack/index.d.ts +1 -2
- package/esm/ReferenceSequenceTrack/index.js +2 -2
- package/esm/SequenceSearchAdapter/SequenceSearchAdapter.d.ts +1 -1
- package/esm/SequenceSearchAdapter/SequenceSearchAdapter.js +15 -14
- package/esm/SequenceSearchAdapter/index.d.ts +1 -2
- package/esm/SequenceSearchAdapter/index.js +2 -2
- package/esm/TwoBitAdapter/index.d.ts +1 -2
- package/esm/TwoBitAdapter/index.js +2 -2
- package/esm/createExtensionPoints.d.ts +1 -2
- package/esm/createExtensionPoints.js +2 -2
- package/package.json +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BgzipIndexedFasta } from '@gmod/indexedfasta';
|
|
2
2
|
import IndexedFasta from '../IndexedFastaAdapter/IndexedFastaAdapter';
|
|
3
|
-
export default class extends IndexedFasta {
|
|
3
|
+
export default class BgzipFastaAdapter extends IndexedFasta {
|
|
4
4
|
setupPre(): Promise<{
|
|
5
5
|
fasta: BgzipIndexedFasta;
|
|
6
6
|
}>;
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const indexedfasta_1 = require("@gmod/indexedfasta");
|
|
7
7
|
const io_1 = require("@jbrowse/core/util/io");
|
|
8
8
|
const IndexedFastaAdapter_1 = __importDefault(require("../IndexedFastaAdapter/IndexedFastaAdapter"));
|
|
9
|
-
class
|
|
9
|
+
class BgzipFastaAdapter extends IndexedFastaAdapter_1.default {
|
|
10
10
|
async setupPre() {
|
|
11
11
|
const fastaLocation = this.getConf('fastaLocation');
|
|
12
12
|
const faiLocation = this.getConf('faiLocation');
|
|
@@ -19,4 +19,4 @@ class default_1 extends IndexedFastaAdapter_1.default {
|
|
|
19
19
|
return { fasta: new indexedfasta_1.BgzipIndexedFasta(fastaOpts) };
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
exports.default =
|
|
22
|
+
exports.default = BgzipFastaAdapter;
|
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const AdapterType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/AdapterType"));
|
|
30
30
|
const configSchema_1 = __importDefault(require("./configSchema"));
|
|
31
|
-
|
|
31
|
+
function BgzipFastaAdapterF(pluginManager) {
|
|
32
32
|
pluginManager.addAdapterType(() => new AdapterType_1.default({
|
|
33
33
|
name: 'BgzipFastaAdapter',
|
|
34
34
|
displayName: 'Bgzip-indexed FASTA adapter',
|
|
@@ -38,4 +38,5 @@ exports.default = (pluginManager) => {
|
|
|
38
38
|
},
|
|
39
39
|
getAdapterClass: () => Promise.resolve().then(() => __importStar(require('./BgzipFastaAdapter'))).then(r => r.default),
|
|
40
40
|
}));
|
|
41
|
-
}
|
|
41
|
+
}
|
|
42
|
+
exports.default = BgzipFastaAdapterF;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RegionsAdapter, BaseAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
|
|
2
|
-
export default class extends BaseAdapter implements RegionsAdapter {
|
|
2
|
+
export default class ChromSizesAdapter extends BaseAdapter implements RegionsAdapter {
|
|
3
3
|
protected setupP?: Promise<Record<string, number>>;
|
|
4
4
|
setupPre(): Promise<{
|
|
5
5
|
[k: string]: number;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const BaseAdapter_1 = require("@jbrowse/core/data_adapters/BaseAdapter");
|
|
4
4
|
const io_1 = require("@jbrowse/core/util/io");
|
|
5
|
-
class
|
|
5
|
+
class ChromSizesAdapter extends BaseAdapter_1.BaseAdapter {
|
|
6
6
|
async setupPre() {
|
|
7
7
|
const pm = this.pluginManager;
|
|
8
8
|
const file = (0, io_1.openLocation)(this.getConf('chromSizesLocation'), pm);
|
|
@@ -38,4 +38,4 @@ class default_1 extends BaseAdapter_1.BaseAdapter {
|
|
|
38
38
|
}
|
|
39
39
|
freeResources( /* { region } */) { }
|
|
40
40
|
}
|
|
41
|
-
exports.default =
|
|
41
|
+
exports.default = ChromSizesAdapter;
|
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const AdapterType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/AdapterType"));
|
|
30
30
|
const configSchema_1 = __importDefault(require("./configSchema"));
|
|
31
|
-
|
|
31
|
+
function ChromSizesAdapterF(pluginManager) {
|
|
32
32
|
pluginManager.addAdapterType(() => new AdapterType_1.default({
|
|
33
33
|
name: 'ChromSizesAdapter',
|
|
34
34
|
displayName: 'Chrom sizes adapter',
|
|
@@ -38,4 +38,5 @@ exports.default = (pluginManager) => {
|
|
|
38
38
|
},
|
|
39
39
|
getAdapterClass: () => Promise.resolve().then(() => __importStar(require('./ChromSizesAdapter'))).then(r => r.default),
|
|
40
40
|
}));
|
|
41
|
-
}
|
|
41
|
+
}
|
|
42
|
+
exports.default = ChromSizesAdapterF;
|
|
@@ -7,42 +7,54 @@ const react_1 = __importDefault(require("react"));
|
|
|
7
7
|
const ui_1 = require("@jbrowse/core/ui");
|
|
8
8
|
const mobx_react_1 = require("mobx-react");
|
|
9
9
|
const util_1 = require("@jbrowse/core/util");
|
|
10
|
-
function Translation(
|
|
11
|
-
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
// can otherwise result in effectiveFrame -1
|
|
19
|
-
const effectiveFrame = (frame + tilt + 3) % 3;
|
|
20
|
-
const seqSliced = seq.slice(effectiveFrame);
|
|
10
|
+
function Translation({ codonTable, seq, frame, bpPerPx, colorByCDS, region, seqStart, height, y, reverse = false, theme, }) {
|
|
11
|
+
var _a, _b;
|
|
12
|
+
const normalizedFrame = Math.abs(frame) - 1;
|
|
13
|
+
const seqFrame = seqStart % 3;
|
|
14
|
+
const frameShift = (normalizedFrame - seqFrame + 3) % 3;
|
|
15
|
+
const frameShiftAdjustedSeqLength = seq.length - frameShift;
|
|
16
|
+
const multipleOfThreeLength = frameShiftAdjustedSeqLength - (frameShiftAdjustedSeqLength % 3);
|
|
17
|
+
const seqSliced = seq.slice(frameShift, frameShift + multipleOfThreeLength);
|
|
21
18
|
const translated = [];
|
|
22
19
|
for (let i = 0; i < seqSliced.length; i += 3) {
|
|
23
20
|
const codon = seqSliced.slice(i, i + 3);
|
|
24
21
|
const normalizedCodon = reverse ? (0, util_1.revcom)(codon) : codon;
|
|
25
22
|
const aminoAcid = codonTable[normalizedCodon] || '';
|
|
26
|
-
translated.push({
|
|
23
|
+
translated.push({
|
|
24
|
+
letter: aminoAcid,
|
|
25
|
+
codon: normalizedCodon.toUpperCase(),
|
|
26
|
+
});
|
|
27
27
|
}
|
|
28
|
-
const w = (1 / scale) * 3;
|
|
29
|
-
const drop = region.start === 0 ? 0 : w;
|
|
30
|
-
const render = 1 / bpPerPx >= 12;
|
|
31
28
|
const width = (region.end - region.start) / bpPerPx;
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
29
|
+
const codonWidth = (1 / bpPerPx) * 3;
|
|
30
|
+
const renderLetter = 1 / bpPerPx >= 12;
|
|
31
|
+
const frameOffset = frameShift / bpPerPx;
|
|
32
|
+
const startOffset = (region.start - seqStart) / bpPerPx;
|
|
33
|
+
const offset = frameOffset - startOffset;
|
|
34
|
+
const defaultFill = colorByCDS
|
|
35
|
+
? (_a = theme === null || theme === void 0 ? void 0 : theme.palette.framesCDS.at(frame)) === null || _a === void 0 ? void 0 : _a.main
|
|
36
|
+
: (_b = theme === null || theme === void 0 ? void 0 : theme.palette.frames.at(frame)) === null || _b === void 0 ? void 0 : _b.main;
|
|
37
|
+
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
38
|
+
react_1.default.createElement("rect", { x: 0, y: y, width: width, height: height, fill: defaultFill }),
|
|
39
|
+
translated.map((element, index) => {
|
|
40
|
+
const x = region.reversed
|
|
41
|
+
? width - (index + 1) * codonWidth - offset
|
|
42
|
+
: codonWidth * index + offset;
|
|
43
|
+
const { letter, codon } = element;
|
|
44
|
+
const codonFill = util_1.defaultStarts.includes(codon)
|
|
45
|
+
? theme === null || theme === void 0 ? void 0 : theme.palette.startCodon
|
|
46
|
+
: util_1.defaultStops.includes(codon)
|
|
47
|
+
? theme === null || theme === void 0 ? void 0 : theme.palette.stopCodon
|
|
48
|
+
: undefined;
|
|
49
|
+
if (!(renderLetter || codonFill)) {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
return (react_1.default.createElement(react_1.default.Fragment, { key: `${index}-${letter}` },
|
|
53
|
+
react_1.default.createElement("rect", { x: x, y: y, width: renderLetter
|
|
54
|
+
? codonWidth
|
|
55
|
+
: codonWidth + 0.7 /* small fudge factor when zoomed out*/, height: height, stroke: renderLetter ? '#555' : 'none', fill: codonFill || 'none' }),
|
|
56
|
+
renderLetter ? (react_1.default.createElement("text", { x: x + codonWidth / 2, fontSize: height - 2, y: y + height / 2, dominantBaseline: "middle", textAnchor: "middle" }, letter)) : null));
|
|
57
|
+
})));
|
|
46
58
|
}
|
|
47
59
|
function DNA(props) {
|
|
48
60
|
const { bpPerPx, region, feature, theme, height, seq, y } = props;
|
|
@@ -60,7 +72,7 @@ function DNA(props) {
|
|
|
60
72
|
render ? (react_1.default.createElement("text", { x: x + w / 2, y: y + height / 2, dominantBaseline: "middle", textAnchor: "middle", fontSize: height - 2, fill: color ? theme.palette.getContrastText(color.main) : 'black' }, letter)) : null));
|
|
61
73
|
})));
|
|
62
74
|
}
|
|
63
|
-
function SequenceSVG({ regions, theme: configTheme, features = new Map(), showReverse = true, showForward = true, showTranslation = true, bpPerPx, rowHeight, }) {
|
|
75
|
+
function SequenceSVG({ regions, theme: configTheme, colorByCDS, features = new Map(), showReverse = true, showForward = true, showTranslation = true, bpPerPx, rowHeight, }) {
|
|
64
76
|
const [region] = regions;
|
|
65
77
|
const theme = (0, ui_1.createJBrowseTheme)(configTheme);
|
|
66
78
|
const codonTable = (0, util_1.generateCodonTable)(util_1.defaultCodonTable);
|
|
@@ -75,23 +87,26 @@ function SequenceSVG({ regions, theme: configTheme, features = new Map(), showRe
|
|
|
75
87
|
// incrementer for the y-position of the current sequence being rendered
|
|
76
88
|
// (applies to both translation rows and dna rows)
|
|
77
89
|
let currY = -rowHeight;
|
|
90
|
+
const showDNA = bpPerPx <= 1;
|
|
91
|
+
const forwardFrames = showTranslation && showForward ? [3, 2, 1] : [];
|
|
92
|
+
const reverseFrames = showTranslation && showReverse ? [-1, -2, -3] : [];
|
|
93
|
+
// if region.reversed, the forward translation is on bottom, reverse on top
|
|
94
|
+
const [topFrames, bottomFrames] = region.reversed
|
|
95
|
+
? [reverseFrames.toReversed(), forwardFrames.toReversed()]
|
|
96
|
+
: [forwardFrames, reverseFrames];
|
|
78
97
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
showReverse ? (react_1.default.createElement(DNA, { height: rowHeight, y: (currY += rowHeight), feature: feature, region: region, seq: region.reversed ? seq : (0, util_1.complement)(seq), bpPerPx: bpPerPx, theme: theme })) : null,
|
|
84
|
-
showTranslation && (region.reversed ? showForward : showReverse)
|
|
85
|
-
? [0, -1, -2].map(index => (react_1.default.createElement(Translation, { key: `rev-translation-${index}`, seq: seq, y: (currY += rowHeight), codonTable: codonTable, frame: index, bpPerPx: bpPerPx, region: region, theme: theme, height: rowHeight, reverse: !region.reversed })))
|
|
86
|
-
: null));
|
|
98
|
+
topFrames.map(index => (react_1.default.createElement(Translation, { key: `translation-${index}`, colorByCDS: colorByCDS, seq: seq, y: (currY += rowHeight), codonTable: codonTable, frame: index, bpPerPx: bpPerPx, region: region, seqStart: feature.get('start'), theme: theme, height: rowHeight, reverse: region.reversed }))),
|
|
99
|
+
showForward && showDNA ? (react_1.default.createElement(DNA, { height: rowHeight, y: (currY += rowHeight), feature: feature, region: region, seq: region.reversed ? (0, util_1.complement)(seq) : seq, bpPerPx: bpPerPx, theme: theme })) : null,
|
|
100
|
+
showReverse && showDNA ? (react_1.default.createElement(DNA, { height: rowHeight, y: (currY += rowHeight), feature: feature, region: region, seq: region.reversed ? seq : (0, util_1.complement)(seq), bpPerPx: bpPerPx, theme: theme })) : null,
|
|
101
|
+
bottomFrames.map(index => (react_1.default.createElement(Translation, { key: `rev-translation-${index}`, colorByCDS: colorByCDS, seq: seq, y: (currY += rowHeight), codonTable: codonTable, frame: index, bpPerPx: bpPerPx, region: region, seqStart: feature.get('start'), theme: theme, height: rowHeight, reverse: !region.reversed })))));
|
|
87
102
|
}
|
|
88
103
|
function Wrapper({ exportSVG, width, totalHeight, children, }) {
|
|
89
|
-
return exportSVG ? (
|
|
104
|
+
return exportSVG ? (children) : (react_1.default.createElement("svg", { "data-testid": "sequence_track", width: width, height: totalHeight, style: {
|
|
105
|
+
// use block because svg by default is inline, which adds a margin
|
|
106
|
+
display: 'block',
|
|
90
107
|
width,
|
|
91
108
|
height: totalHeight,
|
|
92
109
|
userSelect: 'none',
|
|
93
|
-
// use block because svg by default is inline, which adds a margin
|
|
94
|
-
display: 'block',
|
|
95
110
|
} }, children));
|
|
96
111
|
}
|
|
97
112
|
const DivSequenceRendering = (0, mobx_react_1.observer)(function (props) {
|
|
@@ -20,11 +20,12 @@ class DivSequenceRenderer extends FeatureRendererType_1.default {
|
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
-
|
|
23
|
+
function DivSequenceRendererF(pluginManager) {
|
|
24
24
|
pluginManager.addRendererType(() => new DivSequenceRenderer({
|
|
25
25
|
name: 'DivSequenceRenderer',
|
|
26
26
|
ReactComponent: DivSequenceRendering_1.default,
|
|
27
27
|
configSchema: configSchema_1.default,
|
|
28
28
|
pluginManager,
|
|
29
29
|
}));
|
|
30
|
-
}
|
|
30
|
+
}
|
|
31
|
+
exports.default = DivSequenceRendererF;
|
|
@@ -2,7 +2,7 @@ import { IndexedFasta } from '@gmod/indexedfasta';
|
|
|
2
2
|
import { BaseSequenceAdapter, BaseOptions } from '@jbrowse/core/data_adapters/BaseAdapter';
|
|
3
3
|
import { NoAssemblyRegion } from '@jbrowse/core/util/types';
|
|
4
4
|
import { Feature } from '@jbrowse/core/util';
|
|
5
|
-
export default class extends BaseSequenceAdapter {
|
|
5
|
+
export default class IndexedFastaAdapter extends BaseSequenceAdapter {
|
|
6
6
|
protected setupP?: Promise<{
|
|
7
7
|
fasta: IndexedFasta;
|
|
8
8
|
}>;
|
|
@@ -10,7 +10,7 @@ const rxjs_1 = require("@jbrowse/core/util/rxjs");
|
|
|
10
10
|
const util_1 = require("@jbrowse/core/util");
|
|
11
11
|
const abortable_promise_cache_1 = __importDefault(require("abortable-promise-cache"));
|
|
12
12
|
const QuickLRU_1 = __importDefault(require("@jbrowse/core/util/QuickLRU"));
|
|
13
|
-
class
|
|
13
|
+
class IndexedFastaAdapter extends BaseAdapter_1.BaseSequenceAdapter {
|
|
14
14
|
constructor() {
|
|
15
15
|
super(...arguments);
|
|
16
16
|
this.seqCache = new abortable_promise_cache_1.default({
|
|
@@ -97,4 +97,4 @@ class default_1 extends BaseAdapter_1.BaseSequenceAdapter {
|
|
|
97
97
|
*/
|
|
98
98
|
freeResources( /* { region } */) { }
|
|
99
99
|
}
|
|
100
|
-
exports.default =
|
|
100
|
+
exports.default = IndexedFastaAdapter;
|
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const AdapterType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/AdapterType"));
|
|
30
30
|
const configSchema_1 = __importDefault(require("./configSchema"));
|
|
31
|
-
|
|
31
|
+
function IndexedFastaAdapterF(pluginManager) {
|
|
32
32
|
pluginManager.addAdapterType(() => new AdapterType_1.default({
|
|
33
33
|
name: 'IndexedFastaAdapter',
|
|
34
34
|
displayName: 'Indexed FASTA adapter',
|
|
@@ -38,4 +38,5 @@ exports.default = (pluginManager) => {
|
|
|
38
38
|
},
|
|
39
39
|
getAdapterClass: () => Promise.resolve().then(() => __importStar(require('./IndexedFastaAdapter'))).then(r => r.default),
|
|
40
40
|
}));
|
|
41
|
-
}
|
|
41
|
+
}
|
|
42
|
+
exports.default = IndexedFastaAdapterF;
|
|
@@ -4,7 +4,7 @@ const pluggableElementTypes_1 = require("@jbrowse/core/pluggableElementTypes");
|
|
|
4
4
|
const plugin_linear_genome_view_1 = require("@jbrowse/plugin-linear-genome-view");
|
|
5
5
|
const configSchema_1 = require("./configSchema");
|
|
6
6
|
const model_1 = require("./model");
|
|
7
|
-
|
|
7
|
+
function LinearReferenceSequenceDisplayF(pluginManager) {
|
|
8
8
|
pluginManager.addDisplayType(() => {
|
|
9
9
|
const stateModel = (0, model_1.modelFactory)(configSchema_1.configSchema);
|
|
10
10
|
return new pluggableElementTypes_1.DisplayType({
|
|
@@ -17,4 +17,5 @@ exports.default = (pluginManager) => {
|
|
|
17
17
|
ReactComponent: plugin_linear_genome_view_1.BaseLinearDisplayComponent,
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
}
|
|
20
|
+
}
|
|
21
|
+
exports.default = LinearReferenceSequenceDisplayF;
|
|
@@ -70,24 +70,31 @@ export declare function modelFactory(configSchema: AnyConfigurationSchemaType):
|
|
|
70
70
|
configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
|
|
71
71
|
maxFeatureScreenDensity: {
|
|
72
72
|
type: string;
|
|
73
|
-
description: string;
|
|
73
|
+
description: string; /**
|
|
74
|
+
* #property
|
|
75
|
+
*/
|
|
74
76
|
defaultValue: number;
|
|
75
77
|
};
|
|
76
78
|
fetchSizeLimit: {
|
|
77
|
-
type: string;
|
|
79
|
+
type: string; /**
|
|
80
|
+
* #property
|
|
81
|
+
*/
|
|
78
82
|
defaultValue: number;
|
|
79
83
|
description: string;
|
|
80
84
|
};
|
|
81
85
|
height: {
|
|
82
86
|
type: string;
|
|
83
|
-
defaultValue: number;
|
|
84
|
-
description: string; /**
|
|
87
|
+
defaultValue: number; /**
|
|
85
88
|
* #property
|
|
86
89
|
*/
|
|
90
|
+
description: string;
|
|
87
91
|
};
|
|
88
92
|
mouseover: {
|
|
89
93
|
type: string;
|
|
90
94
|
description: string;
|
|
95
|
+
/**
|
|
96
|
+
* #getter
|
|
97
|
+
*/
|
|
91
98
|
defaultValue: string;
|
|
92
99
|
contextVariable: string[];
|
|
93
100
|
};
|
|
@@ -107,13 +114,15 @@ export declare function modelFactory(configSchema: AnyConfigurationSchemaType):
|
|
|
107
114
|
model: {
|
|
108
115
|
id: string;
|
|
109
116
|
type: string;
|
|
110
|
-
rpcDriverName: string | undefined;
|
|
111
|
-
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
112
|
-
rendererTypeName: string; /**
|
|
117
|
+
rpcDriverName: string | undefined; /**
|
|
113
118
|
* #property
|
|
114
119
|
*/
|
|
120
|
+
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
121
|
+
rendererTypeName: string;
|
|
115
122
|
error: unknown;
|
|
116
|
-
message: string | undefined;
|
|
123
|
+
message: string | undefined; /**
|
|
124
|
+
* #property
|
|
125
|
+
*/
|
|
117
126
|
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
118
127
|
id: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<string>, [undefined]>;
|
|
119
128
|
type: import("mobx-state-tree").ISimpleType<string>;
|
|
@@ -161,13 +170,15 @@ export declare function modelFactory(configSchema: AnyConfigurationSchemaType):
|
|
|
161
170
|
} & {
|
|
162
171
|
scrollTop: number;
|
|
163
172
|
} & {
|
|
164
|
-
readonly height: number;
|
|
165
|
-
} & {
|
|
166
|
-
setScrollTop(scrollTop: number): void; /**
|
|
173
|
+
readonly height: number; /**
|
|
167
174
|
* #property
|
|
168
175
|
*/
|
|
176
|
+
} & {
|
|
177
|
+
setScrollTop(scrollTop: number): void;
|
|
169
178
|
setHeight(displayHeight: number): number;
|
|
170
|
-
resizeHeight(distance: number): number;
|
|
179
|
+
resizeHeight(distance: number): number; /**
|
|
180
|
+
* #getter
|
|
181
|
+
*/
|
|
171
182
|
} & {
|
|
172
183
|
featureDensityStatsP: Promise<import("@jbrowse/core/data_adapters/BaseAdapter").FeatureDensityStats> | undefined;
|
|
173
184
|
featureDensityStats: import("@jbrowse/core/data_adapters/BaseAdapter").FeatureDensityStats | undefined;
|
|
@@ -175,13 +186,13 @@ export declare function modelFactory(configSchema: AnyConfigurationSchemaType):
|
|
|
175
186
|
} & {
|
|
176
187
|
readonly currentBytesRequested: number;
|
|
177
188
|
readonly currentFeatureScreenDensity: number;
|
|
178
|
-
readonly maxFeatureScreenDensity: any;
|
|
189
|
+
readonly maxFeatureScreenDensity: any; /**
|
|
190
|
+
* #method
|
|
191
|
+
*/
|
|
179
192
|
readonly featureDensityStatsReady: boolean;
|
|
180
193
|
readonly maxAllowableBytes: number;
|
|
181
194
|
} & {
|
|
182
|
-
afterAttach(): void;
|
|
183
|
-
* #getter
|
|
184
|
-
*/
|
|
195
|
+
afterAttach(): void;
|
|
185
196
|
} & {
|
|
186
197
|
setCurrStatsBpPerPx(n: number): void;
|
|
187
198
|
setFeatureDensityStatsLimit(stats?: import("@jbrowse/core/data_adapters/BaseAdapter").FeatureDensityStats | undefined): void;
|
|
@@ -344,24 +355,31 @@ export declare function modelFactory(configSchema: AnyConfigurationSchemaType):
|
|
|
344
355
|
configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
|
|
345
356
|
maxFeatureScreenDensity: {
|
|
346
357
|
type: string;
|
|
347
|
-
description: string;
|
|
358
|
+
description: string; /**
|
|
359
|
+
* #property
|
|
360
|
+
*/
|
|
348
361
|
defaultValue: number;
|
|
349
362
|
};
|
|
350
363
|
fetchSizeLimit: {
|
|
351
|
-
type: string;
|
|
364
|
+
type: string; /**
|
|
365
|
+
* #property
|
|
366
|
+
*/
|
|
352
367
|
defaultValue: number;
|
|
353
368
|
description: string;
|
|
354
369
|
};
|
|
355
370
|
height: {
|
|
356
371
|
type: string;
|
|
357
|
-
defaultValue: number;
|
|
358
|
-
description: string; /**
|
|
372
|
+
defaultValue: number; /**
|
|
359
373
|
* #property
|
|
360
374
|
*/
|
|
375
|
+
description: string;
|
|
361
376
|
};
|
|
362
377
|
mouseover: {
|
|
363
378
|
type: string;
|
|
364
379
|
description: string;
|
|
380
|
+
/**
|
|
381
|
+
* #getter
|
|
382
|
+
*/
|
|
365
383
|
defaultValue: string;
|
|
366
384
|
contextVariable: string[];
|
|
367
385
|
};
|
|
@@ -4,6 +4,7 @@ exports.modelFactory = void 0;
|
|
|
4
4
|
const mobx_state_tree_1 = require("mobx-state-tree");
|
|
5
5
|
const plugin_linear_genome_view_1 = require("@jbrowse/plugin-linear-genome-view");
|
|
6
6
|
const configuration_1 = require("@jbrowse/core/configuration");
|
|
7
|
+
const tracks_1 = require("@jbrowse/core/util/tracks");
|
|
7
8
|
const util_1 = require("@jbrowse/core/util");
|
|
8
9
|
const mobx_1 = require("mobx");
|
|
9
10
|
/**
|
|
@@ -64,6 +65,7 @@ function modelFactory(configSchema) {
|
|
|
64
65
|
const { showForward, rpcDriverName, showReverse, showTranslation, rowHeight, sequenceHeight, } = self;
|
|
65
66
|
return {
|
|
66
67
|
...superRenderProps(),
|
|
68
|
+
...(0, tracks_1.getParentRenderProps)(self),
|
|
67
69
|
config: self.configuration.renderer,
|
|
68
70
|
rpcDriverName,
|
|
69
71
|
showForward,
|
|
@@ -81,7 +83,7 @@ function modelFactory(configSchema) {
|
|
|
81
83
|
*/
|
|
82
84
|
regionCannotBeRendered( /* region */) {
|
|
83
85
|
const view = (0, util_1.getContainingView)(self);
|
|
84
|
-
return (view === null || view === void 0 ? void 0 : view.bpPerPx)
|
|
86
|
+
return (view === null || view === void 0 ? void 0 : view.bpPerPx) > 3 ? 'Zoom in to see sequence' : undefined;
|
|
85
87
|
},
|
|
86
88
|
/**
|
|
87
89
|
* #getter
|
|
@@ -112,7 +114,7 @@ function modelFactory(configSchema) {
|
|
|
112
114
|
afterAttach() {
|
|
113
115
|
(0, mobx_state_tree_1.addDisposer)(self, (0, mobx_1.autorun)(() => {
|
|
114
116
|
const view = (0, util_1.getContainingView)(self);
|
|
115
|
-
if ((view === null || view === void 0 ? void 0 : view.bpPerPx)
|
|
117
|
+
if ((view === null || view === void 0 ? void 0 : view.bpPerPx) > 3) {
|
|
116
118
|
self.setHeight(50);
|
|
117
119
|
}
|
|
118
120
|
else {
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const TrackType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/TrackType"));
|
|
7
7
|
const models_1 = require("@jbrowse/core/pluggableElementTypes/models");
|
|
8
8
|
const configSchema_1 = require("./configSchema");
|
|
9
|
-
|
|
9
|
+
function ReferenceSequenceTrackF(pluginManager) {
|
|
10
10
|
pluginManager.addTrackType(() => {
|
|
11
11
|
const configSchema = (0, configSchema_1.createReferenceSeqTrackConfig)(pluginManager);
|
|
12
12
|
return new TrackType_1.default({
|
|
@@ -16,4 +16,5 @@ exports.default = (pluginManager) => {
|
|
|
16
16
|
stateModel: (0, models_1.createBaseTrackModel)(pluginManager, 'ReferenceSequenceTrack', configSchema),
|
|
17
17
|
});
|
|
18
18
|
});
|
|
19
|
-
}
|
|
19
|
+
}
|
|
20
|
+
exports.default = ReferenceSequenceTrackF;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseFeatureDataAdapter, BaseOptions } from '@jbrowse/core/data_adapters/BaseAdapter';
|
|
2
2
|
import { Feature, Region } from '@jbrowse/core/util';
|
|
3
|
-
export default class extends BaseFeatureDataAdapter {
|
|
3
|
+
export default class SequenceSearchAdapter extends BaseFeatureDataAdapter {
|
|
4
4
|
configure(): Promise<BaseFeatureDataAdapter>;
|
|
5
5
|
getRefNames(): Promise<string[]>;
|
|
6
6
|
getFeatures(query: Region, opts: BaseOptions): import("rxjs").Observable<Feature>;
|
|
@@ -5,7 +5,7 @@ const rxjs_1 = require("@jbrowse/core/util/rxjs");
|
|
|
5
5
|
const util_1 = require("@jbrowse/core/util");
|
|
6
6
|
const operators_1 = require("rxjs/operators");
|
|
7
7
|
const rxjs_2 = require("rxjs");
|
|
8
|
-
class
|
|
8
|
+
class SequenceSearchAdapter extends BaseAdapter_1.BaseFeatureDataAdapter {
|
|
9
9
|
async configure() {
|
|
10
10
|
var _a;
|
|
11
11
|
const adapter = await ((_a = this.getSubAdapter) === null || _a === void 0 ? void 0 : _a.call(this, this.getConf('sequenceAdapter')));
|
|
@@ -22,10 +22,9 @@ class default_1 extends BaseAdapter_1.BaseFeatureDataAdapter {
|
|
|
22
22
|
return (0, rxjs_1.ObservableCreate)(async (observer) => {
|
|
23
23
|
var _a;
|
|
24
24
|
const sequenceAdapter = await this.configure();
|
|
25
|
-
const hw =
|
|
26
|
-
|
|
27
|
-
queryStart = Math.max(0,
|
|
28
|
-
queryEnd += hw;
|
|
25
|
+
const hw = 10000;
|
|
26
|
+
const queryEnd = query.end + hw;
|
|
27
|
+
const queryStart = Math.max(0, query.start - hw);
|
|
29
28
|
if (queryEnd < 0 || queryStart > queryEnd) {
|
|
30
29
|
observer.complete();
|
|
31
30
|
return;
|
|
@@ -46,13 +45,14 @@ class default_1 extends BaseAdapter_1.BaseFeatureDataAdapter {
|
|
|
46
45
|
if (searchForward) {
|
|
47
46
|
const matches = residues.matchAll(re);
|
|
48
47
|
for (const match of matches) {
|
|
49
|
-
const s = queryStart +
|
|
50
|
-
|
|
48
|
+
const s = queryStart + match.index;
|
|
49
|
+
const e = queryStart + match.index + match[0].length;
|
|
50
|
+
if ((0, util_1.doesIntersect2)(s, e, query.start, query.end)) {
|
|
51
51
|
observer.next(new util_1.SimpleFeature({
|
|
52
|
-
uniqueId: `${this.id}
|
|
52
|
+
uniqueId: `${this.id}-${s}-${match[0]}-pos`,
|
|
53
53
|
refName: query.refName,
|
|
54
54
|
start: s,
|
|
55
|
-
end:
|
|
55
|
+
end: e,
|
|
56
56
|
name: match[0],
|
|
57
57
|
strand: 1,
|
|
58
58
|
}));
|
|
@@ -62,14 +62,15 @@ class default_1 extends BaseAdapter_1.BaseFeatureDataAdapter {
|
|
|
62
62
|
if (searchReverse) {
|
|
63
63
|
const matches = (0, util_1.revcom)(residues).matchAll(re);
|
|
64
64
|
for (const match of matches) {
|
|
65
|
-
const
|
|
66
|
-
|
|
65
|
+
const e = queryEnd - match.index;
|
|
66
|
+
const s = queryEnd - match.index - match[0].length;
|
|
67
|
+
if ((0, util_1.doesIntersect2)(s, e, query.start, query.end)) {
|
|
67
68
|
observer.next(new util_1.SimpleFeature({
|
|
68
|
-
uniqueId: `${this.id}
|
|
69
|
+
uniqueId: `${this.id}-${s}-${match[0]}-neg`,
|
|
69
70
|
refName: query.refName,
|
|
70
|
-
start: s
|
|
71
|
+
start: s,
|
|
72
|
+
end: e,
|
|
71
73
|
name: match[0],
|
|
72
|
-
end: s,
|
|
73
74
|
strand: -1,
|
|
74
75
|
}));
|
|
75
76
|
}
|
|
@@ -81,4 +82,4 @@ class default_1 extends BaseAdapter_1.BaseFeatureDataAdapter {
|
|
|
81
82
|
}
|
|
82
83
|
freeResources() { }
|
|
83
84
|
}
|
|
84
|
-
exports.default =
|
|
85
|
+
exports.default = SequenceSearchAdapter;
|
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const AdapterType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/AdapterType"));
|
|
30
30
|
const configSchema_1 = __importDefault(require("./configSchema"));
|
|
31
|
-
|
|
31
|
+
function SequenceSearchAdapterF(pluginManager) {
|
|
32
32
|
pluginManager.addAdapterType(() => new AdapterType_1.default({
|
|
33
33
|
name: 'SequenceSearchAdapter',
|
|
34
34
|
displayName: 'Sequence search adapter',
|
|
@@ -38,4 +38,5 @@ exports.default = (pluginManager) => {
|
|
|
38
38
|
configSchema: configSchema_1.default,
|
|
39
39
|
getAdapterClass: () => Promise.resolve().then(() => __importStar(require('./SequenceSearchAdapter'))).then(r => r.default),
|
|
40
40
|
}));
|
|
41
|
-
}
|
|
41
|
+
}
|
|
42
|
+
exports.default = SequenceSearchAdapterF;
|