jbrowse-plugin-mafviewer 1.1.3 → 1.2.0
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/BgzipTaffyAdapter/BgzipTaffyAdapter.d.ts +5 -4
- package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js +103 -82
- package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js.map +1 -1
- package/dist/BgzipTaffyAdapter/util.d.ts +1 -0
- package/dist/BgzipTaffyAdapter/util.js +22 -0
- package/dist/BgzipTaffyAdapter/util.js.map +1 -0
- package/dist/BigMafAdapter/BigMafAdapter.d.ts +3 -2
- package/dist/BigMafAdapter/BigMafAdapter.js +4 -3
- package/dist/BigMafAdapter/BigMafAdapter.js.map +1 -1
- package/dist/LinearMafDisplay/components/ColorLegend.js +1 -1
- package/dist/LinearMafDisplay/components/ColorLegend.js.map +1 -1
- package/dist/LinearMafDisplay/components/ReactComponent.js +1 -1
- package/dist/LinearMafDisplay/components/ReactComponent.js.map +1 -1
- package/dist/LinearMafDisplay/components/SvgWrapper.js +2 -2
- package/dist/LinearMafDisplay/components/SvgWrapper.js.map +1 -1
- package/dist/LinearMafDisplay/components/YScaleBars.js +2 -2
- package/dist/LinearMafDisplay/components/YScaleBars.js.map +1 -1
- package/dist/LinearMafDisplay/renderSvg.d.ts +2 -2
- package/dist/LinearMafDisplay/renderSvg.js +0 -1
- package/dist/LinearMafDisplay/renderSvg.js.map +1 -1
- package/dist/LinearMafDisplay/stateModel.d.ts +19 -17
- package/dist/LinearMafDisplay/stateModel.js +17 -10
- package/dist/LinearMafDisplay/stateModel.js.map +1 -1
- package/dist/LinearMafRenderer/LinearMafRenderer.d.ts +8 -4
- package/dist/LinearMafRenderer/LinearMafRenderer.js +14 -148
- package/dist/LinearMafRenderer/LinearMafRenderer.js.map +1 -1
- package/dist/LinearMafRenderer/configSchema.d.ts +6 -1
- package/dist/LinearMafRenderer/configSchema.js +6 -1
- package/dist/LinearMafRenderer/configSchema.js.map +1 -1
- package/dist/LinearMafRenderer/makeImageData.d.ts +20 -0
- package/dist/LinearMafRenderer/makeImageData.js +144 -0
- package/dist/LinearMafRenderer/makeImageData.js.map +1 -0
- package/dist/LinearMafRenderer/util.d.ts +6 -1
- package/dist/LinearMafRenderer/util.js +17 -0
- package/dist/LinearMafRenderer/util.js.map +1 -1
- package/dist/MafAddTrackWorkflow/AddTrackWorkflow.d.ts +1 -1
- package/dist/MafAddTrackWorkflow/AddTrackWorkflow.js.map +1 -1
- package/dist/MafTabixAdapter/MafTabixAdapter.d.ts +9 -6
- package/dist/MafTabixAdapter/MafTabixAdapter.js +74 -43
- package/dist/MafTabixAdapter/MafTabixAdapter.js.map +1 -1
- package/dist/MafTabixAdapter/configSchema.d.ts +7 -0
- package/dist/MafTabixAdapter/configSchema.js +7 -0
- package/dist/MafTabixAdapter/configSchema.js.map +1 -1
- package/dist/jbrowse-plugin-mafviewer.umd.production.min.js +7 -8
- package/dist/jbrowse-plugin-mafviewer.umd.production.min.js.map +4 -4
- package/package.json +2 -2
- package/src/BgzipTaffyAdapter/BgzipTaffyAdapter.ts +123 -86
- package/src/BgzipTaffyAdapter/util.ts +25 -0
- package/src/BigMafAdapter/BigMafAdapter.ts +10 -4
- package/src/LinearMafDisplay/components/ColorLegend.tsx +1 -2
- package/src/LinearMafDisplay/components/ReactComponent.tsx +1 -1
- package/src/LinearMafDisplay/components/SvgWrapper.tsx +2 -2
- package/src/LinearMafDisplay/components/YScaleBars.tsx +3 -2
- package/src/LinearMafDisplay/renderSvg.tsx +5 -5
- package/src/LinearMafDisplay/stateModel.ts +30 -24
- package/src/LinearMafRenderer/LinearMafRenderer.ts +21 -176
- package/src/LinearMafRenderer/configSchema.ts +6 -1
- package/src/LinearMafRenderer/makeImageData.ts +211 -0
- package/src/LinearMafRenderer/util.ts +28 -1
- package/src/MafAddTrackWorkflow/AddTrackWorkflow.tsx +2 -1
- package/src/MafTabixAdapter/MafTabixAdapter.ts +92 -44
- package/src/MafTabixAdapter/configSchema.ts +7 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddTrackWorkflow.js","sourceRoot":"","sources":["../../src/MafAddTrackWorkflow/AddTrackWorkflow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAEL,UAAU,EACV,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"AddTrackWorkflow.js","sourceRoot":"","sources":["../../src/MafAddTrackWorkflow/AddTrackWorkflow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAEL,UAAU,EACV,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACL,MAAM,EACN,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,KAAK,EACL,KAAK,EACL,UAAU,EACV,SAAS,GACV,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAI1C,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvC,OAAO,EAAE;QACP,KAAK,EAAE,MAAM;KACd;IACD,KAAK,EAAE;QACL,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE;QACvB,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;KACzB;IACD,MAAM,EAAE;QACN,SAAS,EAAE,EAAE;QACb,YAAY,EAAE,GAAG;QACjB,OAAO,EAAE,OAAO;KACjB;CACF,CAAC,CAAC,CAAA;AAQH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,KAAK,EAA4B;IACxE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;IAC1C,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,EAAgB,CAAA;IAC9C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAgB,CAAA;IACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAgB,CAAA;IAClD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC7C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAA;IACvD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GACvC,QAAQ,CAAqB,eAAe,CAAC,CAAA;IAC/C,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GACzC,QAAQ,CAAmB,KAAK,CAAC,CAAA;IAEnC,MAAM,SAAS,GAAG,OAAO,CAAM,KAAK,CAAC,CAAA;IACrC,OAAO,CACL,oBAAC,KAAK,IAAC,SAAS,EAAE,OAAO,CAAC,KAAK;QAC7B,oBAAC,KAAK;YACH,KAAK,CAAC,CAAC,CAAC,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI;YAC9C,oBAAC,WAAW;gBACV,oBAAC,SAAS,oBAAsB;gBAChC,oBAAC,UAAU,IACT,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,KAAK,CAAC,EAAE;wBAChB,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,KAA2B,CAAC,CAAA;oBAC7D,CAAC,IAEA,CAAC,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC,GAAG,CAC5D,CAAC,CAAC,EAAE,CAAC,CACH,oBAAC,gBAAgB,IACf,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,oBAAC,KAAK,OAAG,EAClB,OAAO,EAAE,cAAc,KAAK,CAAC,EAC7B,KAAK,EAAE,CAAC,GACR,CACH,CACF,CACU,CACD;YACb,cAAc,KAAK,eAAe,CAAC,CAAC,CAAC,CACpC,oBAAC,YAAY,IACX,QAAQ,EAAE,GAAG,EACb,IAAI,EAAC,gBAAgB,EACrB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,GAAG,CAAC,EAAE;oBACjB,MAAM,CAAC,GAAG,CAAC,CAAA;gBACb,CAAC,GACD,CACH,CAAC,CAAC,CAAC,cAAc,KAAK,iBAAiB,CAAC,CAAC,CAAC,CACzC;gBACE,oBAAC,WAAW;oBACV,oBAAC,SAAS,qBAAuB;oBACjC,oBAAC,UAAU,IACT,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,KAAK,CAAC,EAAE;4BAChB,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAyB,CAAC,CAAA;wBAC5D,CAAC,IAEA,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CACvB,oBAAC,gBAAgB,IACf,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,oBAAC,KAAK,OAAG,EAClB,OAAO,EAAE,eAAe,KAAK,CAAC,EAC9B,KAAK,EAAE,CAAC,GACR,CACH,CAAC,CACS,CACD;gBACd,oBAAC,YAAY,IACX,QAAQ,EAAE,GAAG,EACb,IAAI,EAAC,mBAAmB,EACxB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,GAAG,CAAC,EAAE;wBACjB,MAAM,CAAC,GAAG,CAAC,CAAA;oBACb,CAAC,GACD;gBACF,oBAAC,YAAY,IACX,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAC,yBAAyB,EAC9B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,GAAG,CAAC,EAAE;wBACjB,WAAW,CAAC,GAAG,CAAC,CAAA;oBAClB,CAAC,GACD,CACD,CACJ,CAAC,CAAC,CAAC,CACF;gBACE,oBAAC,YAAY,IACX,QAAQ,EAAE,GAAG,EACb,IAAI,EAAC,+BAA+B,EACpC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,GAAG,CAAC,EAAE;wBACjB,MAAM,CAAC,GAAG,CAAC,CAAA;oBACb,CAAC,GACD;gBACF,oBAAC,YAAY,IACX,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAC,gCAAgC,EACrC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,GAAG,CAAC,EAAE;wBACjB,WAAW,CAAC,GAAG,CAAC,CAAA;oBAClB,CAAC,GACD,CACD,CACJ,CACK;QACR;YACE,oBAAC,YAAY,IACX,QAAQ,EAAE,KAAK,EACf,IAAI,EAAC,2BAA2B,EAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,GAAG,CAAC,EAAE;oBACjB,QAAQ,CAAC,GAAG,CAAC,CAAA;gBACf,CAAC,GACD;YACF,oBAAC,SAAS,IACR,SAAS,QACT,IAAI,EAAE,EAAE,EACR,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,KAAK,CAAC,EAAE;oBAChB,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAChC,CAAC,EACD,UAAU,EAAC,0DAA0D,EACrE,WAAW,EACT,wFAAwF,EAE1F,OAAO,EAAC,UAAU,EAClB,SAAS,SACT,CACE;QAEN,oBAAC,SAAS,IACR,KAAK,EAAE,SAAS,EAChB,UAAU,EAAC,YAAY,EACvB,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAChB,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAClC,CAAC,GACD;QACF,oBAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,SAAS,EAAE,OAAO,CAAC,MAAM,EACzB,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;oBACjC,IAAI,WAAW,GAAG,EAAc,CAAA;oBAChC,IAAI,CAAC;wBACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;oBACnC,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;oBAC3C,CAAC;oBAED,MAAM,OAAO,GAAG;wBACd,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE;wBAC/D,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe;qBACzC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;oBAEV,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;wBACpC,OAAO,CAAC,YAAY,CAAC;4BACnB,OAAO;4BACP,IAAI,EAAE,UAAU;4BAChB,IAAI,EAAE,SAAS;4BACf,aAAa,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;4BAC/B,OAAO,EACL,cAAc,KAAK,eAAe;gCAChC,CAAC,CAAC;oCACE,IAAI,EAAE,cAAc;oCACpB,cAAc,EAAE,GAAG;oCACnB,OAAO,EAAE,WAAW;oCACpB,UAAU,EAAE,KAAK;iCAClB;gCACH,CAAC,CAAC,cAAc,KAAK,iBAAiB;oCACpC,CAAC,CAAC;wCACE,IAAI,EAAE,cAAc;wCACpB,aAAa,EAAE,GAAG;wCAClB,UAAU,EAAE,KAAK;wCACjB,KAAK,EAAE;4CACL,SAAS,EAAE,eAAe;4CAC1B,QAAQ,EAAE,QAAQ;yCACnB;wCACD,OAAO,EAAE,WAAW;qCACrB;oCACH,CAAC,CAAC;wCACE,IAAI,EAAE,cAAc;wCACpB,aAAa,EAAE,GAAG;wCAClB,WAAW,EAAE,QAAQ;wCACrB,UAAU,EAAE,KAAK;wCACjB,OAAO,EAAE,WAAW;qCACrB;yBACV,CAAC,CAAA;wBAEF,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;oBAChC,CAAC;oBACD,KAAK,CAAC,SAAS,EAAE,CAAA;oBACjB,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;wBACvC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;oBAC3B,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACb,CAAC;YACH,CAAC,aAGM,CACH,CACT,CAAA;AACH,CAAC"}
|
|
@@ -1,18 +1,21 @@
|
|
|
1
|
-
import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
|
|
1
|
+
import { BaseFeatureDataAdapter, BaseOptions } from '@jbrowse/core/data_adapters/BaseAdapter';
|
|
2
2
|
import { Feature, Region } from '@jbrowse/core/util';
|
|
3
3
|
export default class MafTabixAdapter extends BaseFeatureDataAdapter {
|
|
4
4
|
setupP?: Promise<{
|
|
5
5
|
adapter: BaseFeatureDataAdapter;
|
|
6
6
|
}>;
|
|
7
|
-
|
|
7
|
+
setupPre(): Promise<{
|
|
8
8
|
adapter: BaseFeatureDataAdapter;
|
|
9
9
|
}>;
|
|
10
|
-
|
|
10
|
+
setupPre2(): Promise<{
|
|
11
|
+
adapter: BaseFeatureDataAdapter;
|
|
12
|
+
}>;
|
|
13
|
+
setup(opts?: BaseOptions): Promise<{
|
|
11
14
|
adapter: BaseFeatureDataAdapter;
|
|
12
15
|
}>;
|
|
13
|
-
getRefNames(): Promise<string[]>;
|
|
14
|
-
getHeader(): Promise<unknown>;
|
|
15
|
-
getFeatures(query: Region): import("rxjs").Observable<Feature>;
|
|
16
|
+
getRefNames(opts?: BaseOptions): Promise<string[]>;
|
|
17
|
+
getHeader(opts?: BaseOptions): Promise<unknown>;
|
|
18
|
+
getFeatures(query: Region, opts?: BaseOptions): import("rxjs").Observable<Feature>;
|
|
16
19
|
getSamples(_query: Region): Promise<{
|
|
17
20
|
samples: {
|
|
18
21
|
id: string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
|
|
2
|
-
import { SimpleFeature } from '@jbrowse/core/util';
|
|
1
|
+
import { BaseFeatureDataAdapter, } from '@jbrowse/core/data_adapters/BaseAdapter';
|
|
2
|
+
import { SimpleFeature, updateStatus, } from '@jbrowse/core/util';
|
|
3
3
|
import { openLocation } from '@jbrowse/core/util/io';
|
|
4
4
|
import { ObservableCreate } from '@jbrowse/core/util/rxjs';
|
|
5
5
|
import { getSnapshot } from 'mobx-state-tree';
|
|
@@ -8,7 +8,7 @@ import parseNewick from '../parseNewick';
|
|
|
8
8
|
import { normalize } from '../util';
|
|
9
9
|
export default class MafTabixAdapter extends BaseFeatureDataAdapter {
|
|
10
10
|
setupP;
|
|
11
|
-
async
|
|
11
|
+
async setupPre() {
|
|
12
12
|
const config = this.config;
|
|
13
13
|
if (!this.getSubAdapter) {
|
|
14
14
|
throw new Error('no getSubAdapter available');
|
|
@@ -21,60 +21,91 @@ export default class MafTabixAdapter extends BaseFeatureDataAdapter {
|
|
|
21
21
|
adapter: adapter.dataAdapter,
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
|
-
async
|
|
24
|
+
async setupPre2() {
|
|
25
25
|
if (!this.setupP) {
|
|
26
|
-
this.setupP = this.
|
|
26
|
+
this.setupP = this.setupPre().catch((e) => {
|
|
27
27
|
this.setupP = undefined;
|
|
28
28
|
throw e;
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
return this.setupP;
|
|
32
32
|
}
|
|
33
|
-
async
|
|
34
|
-
const {
|
|
33
|
+
async setup(opts) {
|
|
34
|
+
const { statusCallback = () => { } } = opts || {};
|
|
35
|
+
return updateStatus('Downloading index', statusCallback, () => this.setupPre2());
|
|
36
|
+
}
|
|
37
|
+
async getRefNames(opts) {
|
|
38
|
+
const { adapter } = await this.setup(opts);
|
|
35
39
|
return adapter.getRefNames();
|
|
36
40
|
}
|
|
37
|
-
async getHeader() {
|
|
38
|
-
const { adapter } = await this.setup();
|
|
41
|
+
async getHeader(opts) {
|
|
42
|
+
const { adapter } = await this.setup(opts);
|
|
39
43
|
return adapter.getHeader();
|
|
40
44
|
}
|
|
41
|
-
getFeatures(query) {
|
|
45
|
+
getFeatures(query, opts) {
|
|
46
|
+
const { statusCallback = () => { } } = opts || {};
|
|
42
47
|
return ObservableCreate(async (observer) => {
|
|
43
|
-
const { adapter } = await this.setup();
|
|
44
|
-
const features = await firstValueFrom(adapter.getFeatures(query).pipe(toArray()));
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
const
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
48
|
+
const { adapter } = await this.setup(opts);
|
|
49
|
+
const features = await updateStatus('Downloading alignments', statusCallback, () => firstValueFrom(adapter.getFeatures(query).pipe(toArray())));
|
|
50
|
+
await updateStatus('Processing alignments', statusCallback, () => {
|
|
51
|
+
let firstAssemblyNameFound = '';
|
|
52
|
+
const refAssemblyName = this.getConf('refAssemblyName');
|
|
53
|
+
for (const feature of features) {
|
|
54
|
+
const data = feature.get('field5').split(',');
|
|
55
|
+
const alignments = {};
|
|
56
|
+
for (let j = 0; j < data.length; j++) {
|
|
57
|
+
const elt = data[j];
|
|
58
|
+
const seq = elt.split(':')[5];
|
|
59
|
+
const ad = elt.split(':');
|
|
60
|
+
const ag = ad[0].split('.');
|
|
61
|
+
const [n1, n2 = '', ...rest] = ag;
|
|
62
|
+
let assemblyName;
|
|
63
|
+
let last = '';
|
|
64
|
+
if (ag.length === 2) {
|
|
65
|
+
assemblyName = n1;
|
|
66
|
+
last = n2;
|
|
67
|
+
}
|
|
68
|
+
else if (!Number.isNaN(+n2)) {
|
|
69
|
+
assemblyName = `${n1}.${n2}`;
|
|
70
|
+
last = rest.join('.');
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
assemblyName = n1;
|
|
74
|
+
last = [n2, ...rest].join('.');
|
|
75
|
+
}
|
|
76
|
+
if (assemblyName) {
|
|
77
|
+
firstAssemblyNameFound = firstAssemblyNameFound || assemblyName;
|
|
78
|
+
alignments[assemblyName] = {
|
|
79
|
+
chr: last,
|
|
80
|
+
start: +ad[1],
|
|
81
|
+
srcSize: +ad[2],
|
|
82
|
+
strand: ad[3] === '-' ? -1 : 1,
|
|
83
|
+
unknown: +ad[4],
|
|
84
|
+
data: seq,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
63
87
|
}
|
|
64
|
-
|
|
65
|
-
observer.next(new SimpleFeature({
|
|
66
|
-
id: feature.id(),
|
|
67
|
-
data: {
|
|
68
|
-
start: feature.get('start'),
|
|
69
|
-
end: feature.get('end'),
|
|
70
|
-
refName: feature.get('refName'),
|
|
71
|
-
name: feature.get('name'),
|
|
72
|
-
score: feature.get('score'),
|
|
88
|
+
console.log({
|
|
73
89
|
alignments,
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
90
|
+
firstAssemblyNameFound,
|
|
91
|
+
refAssemblyName,
|
|
92
|
+
q: query.assemblyName,
|
|
93
|
+
}, alignments[refAssemblyName], alignments[query.assemblyName], alignments[firstAssemblyNameFound]);
|
|
94
|
+
observer.next(new SimpleFeature({
|
|
95
|
+
id: feature.id(),
|
|
96
|
+
data: {
|
|
97
|
+
start: feature.get('start'),
|
|
98
|
+
end: feature.get('end'),
|
|
99
|
+
refName: feature.get('refName'),
|
|
100
|
+
name: feature.get('name'),
|
|
101
|
+
score: feature.get('score'),
|
|
102
|
+
alignments,
|
|
103
|
+
seq: alignments[refAssemblyName || query.assemblyName]?.data ||
|
|
104
|
+
alignments[firstAssemblyNameFound]?.data,
|
|
105
|
+
},
|
|
106
|
+
}));
|
|
107
|
+
}
|
|
108
|
+
});
|
|
78
109
|
observer.complete();
|
|
79
110
|
});
|
|
80
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MafTabixAdapter.js","sourceRoot":"","sources":["../../src/MafTabixAdapter/MafTabixAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"MafTabixAdapter.js","sourceRoot":"","sources":["../../src/MafTabixAdapter/MafTabixAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,13 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
|
|
|
17
17
|
locationType: string;
|
|
18
18
|
};
|
|
19
19
|
};
|
|
20
|
+
/**
|
|
21
|
+
* #slot
|
|
22
|
+
*/
|
|
23
|
+
refAssemblyName: {
|
|
24
|
+
type: string;
|
|
25
|
+
defaultValue: string;
|
|
26
|
+
};
|
|
20
27
|
index: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
|
|
21
28
|
/**
|
|
22
29
|
* #slot index.location
|
|
@@ -22,6 +22,13 @@ const configSchema = ConfigurationSchema('MafTabixAdapter', {
|
|
|
22
22
|
locationType: 'UriLocation',
|
|
23
23
|
},
|
|
24
24
|
},
|
|
25
|
+
/**
|
|
26
|
+
* #slot
|
|
27
|
+
*/
|
|
28
|
+
refAssemblyName: {
|
|
29
|
+
type: 'string',
|
|
30
|
+
defaultValue: '',
|
|
31
|
+
},
|
|
25
32
|
index: ConfigurationSchema('Index', {
|
|
26
33
|
/**
|
|
27
34
|
* #slot index.location
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../src/MafTabixAdapter/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEjE;;GAEG;AACH,SAAS,CAAC,KAAI,CAAC,CAAC,wDAAwD;AAExE,MAAM,YAAY,GAAG,mBAAmB,CACtC,iBAAiB,EACjB;IACE;;OAEG;IACH,OAAO,EAAE;QACP,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,sDAAsD;QACnE,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,aAAa,EAAE;QACb,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE;YACZ,GAAG,EAAE,wBAAwB;YAC7B,YAAY,EAAE,aAAa;SAC5B;KACF;IACD,KAAK,EAAE,mBAAmB,CAAC,OAAO,EAAE;QAClC;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE;gBACZ,GAAG,EAAE,wBAAwB;aAC9B;SACF;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,KAAK;SACpB;KACF,CAAC;IACF;;OAEG;IACH,UAAU,EAAE;QACV,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE;YACZ,GAAG,EAAE,gBAAgB;YACrB,YAAY,EAAE,aAAa;SAC5B;KACF;CACF,EACD,EAAE,eAAe,EAAE,IAAI,EAAE,CAC1B,CAAA;AAED,eAAe,YAAY,CAAA"}
|
|
1
|
+
{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../src/MafTabixAdapter/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEjE;;GAEG;AACH,SAAS,CAAC,KAAI,CAAC,CAAC,wDAAwD;AAExE,MAAM,YAAY,GAAG,mBAAmB,CACtC,iBAAiB,EACjB;IACE;;OAEG;IACH,OAAO,EAAE;QACP,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,sDAAsD;QACnE,YAAY,EAAE,EAAE;KACjB;IACD;;OAEG;IACH,aAAa,EAAE;QACb,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE;YACZ,GAAG,EAAE,wBAAwB;YAC7B,YAAY,EAAE,aAAa;SAC5B;KACF;IACD;;OAEG;IACH,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,EAAE;KACjB;IACD,KAAK,EAAE,mBAAmB,CAAC,OAAO,EAAE;QAClC;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE;gBACZ,GAAG,EAAE,wBAAwB;aAC9B;SACF;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,KAAK;SACpB;KACF,CAAC;IACF;;OAEG;IACH,UAAU,EAAE;QACV,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE;YACZ,GAAG,EAAE,gBAAgB;YACrB,YAAY,EAAE,aAAa;SAC5B;KACF;CACF,EACD,EAAE,eAAe,EAAE,IAAI,EAAE,CAC1B,CAAA;AAED,eAAe,YAAY,CAAA"}
|