jbrowse-plugin-mafviewer 1.0.8 → 1.1.1

package/README.md

@@ -9,7 +9,7 @@ JBrowse 2
 
 ## Demo
 
-https://jbrowse.org/code/jb2/main/?config=%2Fdemos%2Fmafviewer%2Fhg38%2Fdistconfig.json&session=share-O3sxhB3iS2&password=8Ysiv
+https://jbrowse.org/code/jb2/main/?config=%2Fdemos%2Fmaf%2Fhg38%2Fdistconfig.json&session=share-jREsrEm0Q-&password=fRZjQ
 
 ## GUI usage (e.g. in JBrowse Desktop)
 
@@ -41,7 +41,7 @@ Then use the custom "Add track workflow"
 
 ### Example MafTabixAdapter config
 
-The MafTabix track is created according to
+can use nhLocation or samples array on adapter
 
 ```json
 {
@@ -66,6 +66,8 @@ The MafTabix track is created according to
 
 ### Example BigMafAdapter config
 
+can use nhLocation or samples array on adapter
+
 ```json
 {
   "type": "MafTrack",
@@ -90,6 +92,31 @@ The MafTabix track is created according to
 }
 ```
 
+### Example BgzipTaffyAdapter config
+
+can use nhLocation or samples array on adapter
+
+```json
+{
+  "type": "MafTrack",
+  "trackId": "bigMaf",
+  "name": "taffy",
+  "adapter": {
+    "type": "BgzipTaffyAdapter",
+    "nhLocation": {
+      "uri": "hg38.30way.nh"
+    },
+    "tafGzLocation": {
+      "uri": "30way.taf.gz"
+    },
+    "taiGzLocation": {
+      "uri": "30way.taf.gz.tai"
+    }
+  },
+  "assemblyNames": ["hg38"]
+}
+```
+
 ### Example with customized sample names and colors
 
 ```json
@@ -153,30 +180,24 @@ the case
 
 ## Prepare data
 
-This is the same as the jbrowse 1 mafviewer plugin (currently the similar to
-the). This plugin supports two formats
-
 1. BigMaf format, which can be created following UCSC guidelines
+   (https://genome.ucsc.edu/FAQ/FAQformat.html#format9.3)
 
 2. MAF tabix based format, based on a custom BED created via conversion tools in
-   this repo.
+   this repo (see maf2bed)
 
-The choice between the two is your convenience. BigMaf is a "standard" UCSC
-format, basically just a specialized BigBed, so it requires JBrowse 1.14.0 or
-newer for it's BigBed support. The custom BED format only requires JBrowse
-1.12.3 or newer, so therefore some slightly older JBrowse versions can support
-it.
+3. TAF format (new!). Currently only supports bgzip'd TAF. This is pioneered by
+   https://github.com/ComparativeGenomicsToolkit/taffy
 
-_Note: Both formats start with a MAF as input, and note that your MAF file
-should contain the species name and chromosome name e.g. hg38.chr1 in the
+_Note: All these formats generally start with a MAF as input. Note that your MAF
+file should contain the species name and chromosome name e.g. hg38.chr1 in the
 sequence identifiers._
 
-### Preparing BigMaf
+### Option 1. Preparing BigMaf
 
 Follow instructions from https://genome.ucsc.edu/FAQ/FAQformat.html#format9.3
-and set the storeType of your track as MAFViewer/Store/SeqFeature/BigMaf
 
-### Preparing the tabix BED format
+### Option 2. Preparing MAF tabix
 
 Start by converting the MAF into a pseudo-BED format using the maf2bed tool
 
@@ -191,7 +212,8 @@ The second argument to maf2bed is the genome version e.g. hg38 used for the main
 species in the MAF (if your MAF comes from a pipeline like Ensembl or UCSC, the
 identifiers in the MAF file will say something like hg38.chr1, therefore, the
 argument to maf2bed should just be hg38 to remove hg38 part of the identifier.
-if your MAF file does not include the species name as part of the identifier,
+
+If your MAF file does not include the species name as part of the identifier,
 you should add the species into them the those scaffold/chromosome e.g. create
 hg38.chr1 if it was just chr1 before)
 
@@ -200,7 +222,19 @@ If all is well, your BED file should have 6 columns, with
 separated between each species by `;` and each field in the alignment is
 separated by `:`.
 
-### Footnote
+Note: If you can't use the `cargo install maf2bed` binary, there is a
+`bin/maf2bed.pl` perl version of it in this repo
+
+### Option 3. Preparing TAF
+
+Follow steps from https://github.com/ComparativeGenomicsToolkit/taffy
+
+```
+taffy view -i chr22.maf -o chr22.taf
+bgzip chr22.taf
+taffy index -i chr22.taf.gz
+```
+
+The above workflow requires that taffy is built with "htslib support"
 
-If you can't use the `cargo install maf2bed` binary, there is a `bin/maf2bed.pl`
-perl version of it in this repo
+Note that the TAF support is beta, let me know if you run into any issues

package/dist/{TaffyAdapter/TaffyAdapter.d.ts → BgzipTaffyAdapter/BgzipTaffyAdapter.d.ts}

@@ -1,16 +1,20 @@
 import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
 import { Feature, Region } from '@jbrowse/core/util';
-interface ByteRange {
-    chrStart: number;
-    fileOffst: number;
-}
-type IndexData = Record<string, ByteRange[]>;
-export default class TaffyAdapter extends BaseFeatureDataAdapter {
+import type { IndexData } from './types';
+export default class BgzipTaffyAdapter extends BaseFeatureDataAdapter {
     setupP?: Promise<IndexData>;
     getRefNames(): Promise<string[]>;
     setup(): Promise<IndexData>;
     readTaiFile(): Promise<IndexData>;
     getFeatures(query: Region): import("rxjs").Observable<Feature>;
+    getSamples(_query: Region): Promise<{
+        samples: {
+            id: string;
+            label: string;
+            color?: string;
+        }[];
+        tree: Record<string, any> | undefined;
+    }>;
+    getLines(query: Region): Promise<string[]>;
     freeResources(): void;
 }
-export {};

package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js

@@ -0,0 +1,197 @@
+import { unzip } from '@gmod/bgzf-filehandle';
+import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
+import { SimpleFeature } from '@jbrowse/core/util';
+import { openLocation } from '@jbrowse/core/util/io';
+import { ObservableCreate } from '@jbrowse/core/util/rxjs';
+import Long from 'long';
+import VirtualOffset from './virtualOffset';
+import parseNewick from '../parseNewick';
+import { normalize } from '../util';
+import { parseRowInstructions } from './rowInstructions';
+export default class BgzipTaffyAdapter extends BaseFeatureDataAdapter {
+    setupP;
+    async getRefNames() {
+        const data = await this.setup();
+        return Object.keys(data);
+    }
+    setup() {
+        if (!this.setupP) {
+            this.setupP = this.readTaiFile().catch((e) => {
+                this.setupP = undefined;
+                throw e;
+            });
+        }
+        return this.setupP;
+    }
+    async readTaiFile() {
+        const text = await openLocation(this.getConf('taiLocation')).readFile('utf8');
+        const lines = text
+            .split('\n')
+            .map(f => f.trim())
+            .filter(line => !!line);
+        const entries = {};
+        let lastChr = '';
+        let lastChrStart = 0;
+        let lastRawVirtualOffset = 0;
+        for (const line of lines) {
+            const [chr, chrStart, virtualOffset] = line.split('\t');
+            const relativizedVirtualOffset = lastRawVirtualOffset + +virtualOffset;
+            const currChr = chr === '*' ? lastChr : chr.split('.').at(-1);
+            // bgzip TAF files store virtual offsets in plaintext in the TAI file
+            // these virtualoffsets are 64bit values, so the long library is needed
+            // to accurately do the bit manipulations needed
+            const x = Long.fromNumber(relativizedVirtualOffset);
+            const y = x.shiftRightUnsigned(16);
+            const z = x.and(0xffff);
+            const voff = new VirtualOffset(y.toNumber(), z.toNumber());
+            if (!entries[currChr]) {
+                entries[currChr] = [];
+                lastChr = '';
+                lastChrStart = 0;
+                lastRawVirtualOffset = 0;
+            }
+            const currStart = +chrStart + lastChrStart;
+            entries[currChr].push({
+                chrStart: currStart,
+                virtualOffset: voff,
+            });
+            lastChr = currChr;
+            lastChrStart = currStart;
+            lastRawVirtualOffset = relativizedVirtualOffset;
+        }
+        return entries;
+    }
+    getFeatures(query) {
+        return ObservableCreate(async (observer) => {
+            try {
+                const lines = await this.getLines(query);
+                const alignments = {};
+                const k = lines.length;
+                const data = [];
+                let a0;
+                for (let j = 0; j < k; j++) {
+                    const line = lines[j];
+                    if (line) {
+                        const [lineData, rowInstructions] = line.split(' ; ');
+                        if (rowInstructions) {
+                            for (const ins of parseRowInstructions(rowInstructions)) {
+                                if (ins.type === 'i') {
+                                    data.splice(ins.row, 0, ins);
+                                    if (!alignments[ins.asm]) {
+                                        alignments[ins.asm] = {
+                                            start: ins.start,
+                                            strand: ins.strand,
+                                            srcSize: ins.length,
+                                            chr: ins.ref,
+                                            data: '',
+                                        };
+                                    }
+                                    const e = alignments[ins.asm];
+                                    e.data += ' '.repeat(Math.max(0, j - e.data.length)); // catch it up
+                                }
+                                else if (ins.type === 's') {
+                                    if (!alignments[ins.asm]) {
+                                        alignments[ins.asm] = {
+                                            start: ins.start,
+                                            strand: ins.strand,
+                                            srcSize: ins.length,
+                                            chr: ins.ref,
+                                            data: '',
+                                        };
+                                    }
+                                    const e = alignments[ins.asm];
+                                    e.data += ' '.repeat(Math.max(0, j - e.data.length)); // catch it up
+                                    data[ins.row] = ins;
+                                }
+                                else if (ins.type === 'd') {
+                                    data.splice(ins.row, 1);
+                                }
+                                // no gaps for now(?)
+                                // else if (ins.type === 'g') {
+                                // }
+                                // else if (ins.type === 'G') {
+                                // }
+                            }
+                            if (!a0) {
+                                a0 = data[0];
+                            }
+                        }
+                        const lineLen = lineData.length;
+                        for (let i = 0; i < lineLen; i++) {
+                            const letter = lineData[i];
+                            const r = data[i];
+                            alignments[r.asm].data += letter;
+                        }
+                    }
+                }
+                if (a0) {
+                    const row0 = alignments[a0.asm];
+                    // see
+                    // https://github.com/ComparativeGenomicsToolkit/taffy/blob/f5a5354/docs/taffy_utilities.md#referenced-based-maftaf-and-indexing
+                    // for the significance of row[0]:
+                    //
+                    // "An anchor line in TAF is a column from which all sequence
+                    // coordinates can be deduced without scanning backwards to previous
+                    // lines "
+                    observer.next(new SimpleFeature({
+                        uniqueId: `${row0.start}-${row0.data.length}`,
+                        refName: query.refName,
+                        start: row0.start,
+                        end: row0.start + row0.data.length,
+                        strand: row0.strand,
+                        alignments,
+                        seq: row0.data,
+                    }));
+                }
+                observer.complete();
+            }
+            catch (e) {
+                observer.error(e);
+            }
+        });
+    }
+    async getSamples(_query) {
+        const nhLoc = this.getConf('nhLocation');
+        const nh = nhLoc.uri === '/path/to/my.nh'
+            ? undefined
+            : await openLocation(nhLoc).readFile('utf8');
+        // TODO: we may need to resolve the exact set of rows in the visible region
+        // here
+        return {
+            samples: normalize(this.getConf('samples')),
+            tree: nh ? parseNewick(nh) : undefined,
+        };
+    }
+    async getLines(query) {
+        const byteRanges = await this.setup();
+        const file = openLocation(this.getConf('tafGzLocation'));
+        const decoder = new TextDecoder('utf8');
+        const records = byteRanges[query.refName];
+        if (records) {
+            let firstEntry = records[0];
+            let nextEntry;
+            for (let i = 0; i < records.length; i++) {
+                if (records[i].chrStart >= query.start) {
+                    // we use i-1 for firstEntry because the current record is "greater
+                    // than the query start", we go backwards one record to make sure to
+                    // cover up until the query start. we use i+1 to ensure we get at
+                    // least one block in the case that i=0
+                    firstEntry = records[Math.max(i - 1, 0)];
+                    nextEntry = records[i + 1];
+                    break;
+                }
+            }
+            if (firstEntry && nextEntry) {
+                const response = await file.read(nextEntry.virtualOffset.blockPosition -
+                    firstEntry.virtualOffset.blockPosition, firstEntry.virtualOffset.blockPosition);
+                const buffer = await unzip(response);
+                return decoder
+                    .decode(buffer.slice(firstEntry.virtualOffset.dataPosition))
+                    .split('\n');
+            }
+        }
+        return [];
+    }
+    freeResources() { }
+}
+//# sourceMappingURL=BgzipTaffyAdapter.js.map

package/dist/BgzipTaffyAdapter/BgzipTaffyAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BgzipTaffyAdapter.js","sourceRoot":"","sources":["../../src/BgzipTaffyAdapter/BgzipTaffyAdapter.ts"],"names":[],"mappings":"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"}

package/dist/{TaffyAdapter → BgzipTaffyAdapter}/configSchema.d.ts

@@ -10,8 +10,9 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
     /**
      * #slot
      */
-    tafLocation: {
+    tafGzLocation: {
         type: string;
+        description: string;
         defaultValue: {
             uri: string;
             locationType: string;
@@ -22,6 +23,18 @@ declare const configSchema: import("@jbrowse/core/configuration/configurationSch
      */
     taiLocation: {
         type: string;
+        description: string;
+        defaultValue: {
+            uri: string;
+            locationType: string;
+        };
+    };
+    /**
+     * #slot
+     */
+    nhLocation: {
+        type: string;
+        description: string;
         defaultValue: {
             uri: string;
             locationType: string;

package/dist/{TaffyAdapter → BgzipTaffyAdapter}/configSchema.js

@@ -1,10 +1,10 @@
 import { ConfigurationSchema } from '@jbrowse/core/configuration';
 /**
- * #config TaffyAdapter
- * used to configure Taffy adapter
+ * #config BgzipTaffyAdapter
+ * used to configure BgzipTaffy adapter
  */
 function x() { } // eslint-disable-line @typescript-eslint/no-unused-vars
-const configSchema = ConfigurationSchema('TaffyAdapter', {
+const configSchema = ConfigurationSchema('BgzipTaffyAdapter', {
     /**
      * #slot
      */
@@ -16,8 +16,9 @@ const configSchema = ConfigurationSchema('TaffyAdapter', {
     /**
      * #slot
      */
-    tafLocation: {
+    tafGzLocation: {
         type: 'fileLocation',
+        description: 'bgzip taffy file',
         defaultValue: {
             uri: '/path/to/my.taf',
             locationType: 'UriLocation',
@@ -28,11 +29,25 @@ const configSchema = ConfigurationSchema('TaffyAdapter', {
      */
     taiLocation: {
         type: 'fileLocation',
+        description: 'taffy index',
         defaultValue: {
-            uri: '/path/to/my.taf.tai',
+            uri: '/path/to/my.taf.gz.tai',
             locationType: 'UriLocation',
         },
     },
-}, { explicitlyTyped: true });
+    /**
+     * #slot
+     */
+    nhLocation: {
+        type: 'fileLocation',
+        description: 'newick tree',
+        defaultValue: {
+            uri: '/path/to/my.nh',
+            locationType: 'UriLocation',
+        },
+    },
+}, {
+    explicitlyTyped: true,
+});
 export default configSchema;
 //# sourceMappingURL=configSchema.js.map

package/dist/BgzipTaffyAdapter/configSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configSchema.js","sourceRoot":"","sources":["../../src/BgzipTaffyAdapter/configSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEjE;;;GAGG;AACH,SAAS,CAAC,KAAI,CAAC,CAAC,wDAAwD;AAExE,MAAM,YAAY,GAAG,mBAAmB,CACtC,mBAAmB,EACnB;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,WAAW,EAAE,kBAAkB;QAC/B,YAAY,EAAE;YACZ,GAAG,EAAE,iBAAiB;YACtB,YAAY,EAAE,aAAa;SAC5B;KACF;IACD;;OAEG;IACH,WAAW,EAAE;QACX,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE;YACZ,GAAG,EAAE,wBAAwB;YAC7B,YAAY,EAAE,aAAa;SAC5B;KACF;IACD;;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;IACE,eAAe,EAAE,IAAI;CACtB,CACF,CAAA;AAED,eAAe,YAAY,CAAA"}

package/dist/BgzipTaffyAdapter/index.d.ts

@@ -0,0 +1,2 @@
+import PluginManager from '@jbrowse/core/PluginManager';
+export default function BgzipTaffyAdapterF(pluginManager: PluginManager): PluginManager;

package/dist/BgzipTaffyAdapter/index.js

@@ -0,0 +1,11 @@
+import { AdapterType } from '@jbrowse/core/pluggableElementTypes';
+import BgzipTaffyAdapter from './BgzipTaffyAdapter';
+import configSchema from './configSchema';
+export default function BgzipTaffyAdapterF(pluginManager) {
+    return pluginManager.addAdapterType(() => new AdapterType({
+        name: 'BgzipTaffyAdapter',
+        AdapterClass: BgzipTaffyAdapter,
+        configSchema,
+    }));
+}
+//# sourceMappingURL=index.js.map

package/dist/BgzipTaffyAdapter/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/BgzipTaffyAdapter/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAA;AAEjE,OAAO,iBAAiB,MAAM,qBAAqB,CAAA;AACnD,OAAO,YAAY,MAAM,gBAAgB,CAAA;AAEzC,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,aAA4B;IACrE,OAAO,aAAa,CAAC,cAAc,CACjC,GAAG,EAAE,CACH,IAAI,WAAW,CAAC;QACd,IAAI,EAAE,mBAAmB;QACzB,YAAY,EAAE,iBAAiB;QAC/B,YAAY;KACb,CAAC,CACL,CAAA;AACH,CAAC"}

package/dist/BgzipTaffyAdapter/rowInstructions.d.ts

@@ -0,0 +1,35 @@
+interface RowInsert {
+    type: 'i';
+    row: number;
+    asm: string;
+    ref: string;
+    start: number;
+    strand: number;
+    length: number;
+}
+interface RowSubstitute {
+    type: 's';
+    row: number;
+    asm: string;
+    ref: string;
+    start: number;
+    strand: number;
+    length: number;
+}
+interface RowDelete {
+    type: 'd';
+    row: number;
+}
+interface RowGap {
+    type: 'g';
+    row: number;
+    gapLen: number;
+}
+interface RowGapSubstring {
+    type: 'G';
+    row: number;
+    gapSubstring: string;
+}
+type RowInstruction = RowInsert | RowDelete | RowGap | RowGapSubstring | RowSubstitute;
+export declare function parseRowInstructions(meta: string): RowInstruction[];
+export {};

package/dist/BgzipTaffyAdapter/rowInstructions.js

@@ -0,0 +1,55 @@
+export function parseRowInstructions(meta) {
+    const ret = meta.split(' ');
+    const rows = [];
+    for (let i = 0; i < ret.length;) {
+        const type = ret[i++];
+        if (type === 'i') {
+            const row = +ret[i++];
+            const [asm, ref] = ret[i++].split('.');
+            rows.push({
+                type,
+                row,
+                asm: asm,
+                ref: ref,
+                start: +ret[i++],
+                strand: ret[i++] === '-' ? -1 : 1,
+                length: +ret[i++],
+            });
+        }
+        if (type === 's') {
+            const row = +ret[i++];
+            const [asm, ref] = ret[i++].split('.');
+            rows.push({
+                type,
+                row,
+                asm: asm,
+                ref: ref,
+                start: +ret[i++],
+                strand: ret[i++] === '-' ? -1 : 1,
+                length: +ret[i++],
+            });
+        }
+        else if (type === 'd') {
+            rows.push({
+                type,
+                row: +ret[i++],
+            });
+        }
+        else if (type === 'g') {
+            rows.push({
+                type,
+                row: +ret[i++],
+                gapLen: +ret[i++],
+            });
+        }
+        else if (type === 'G') {
+            rows.push({
+                type,
+                row: +ret[i++],
+                gapSubstring: ret[i++],
+            });
+        }
+    }
+    return rows;
+}
+//# sourceMappingURL=rowInstructions.js.map

package/dist/BgzipTaffyAdapter/rowInstructions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rowInstructions.js","sourceRoot":"","sources":["../../src/BgzipTaffyAdapter/rowInstructions.ts"],"names":[],"mappings":"AAuCA,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3B,MAAM,IAAI,GAAG,EAAsB,CAAA;IAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,GAAI,CAAC;QACjC,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAA;QACrB,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE,CAAA;YACtB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACvC,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI;gBACJ,GAAG;gBACH,GAAG,EAAE,GAAI;gBACT,GAAG,EAAE,GAAI;gBACT,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;gBACjB,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;aACnB,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE,CAAA;YACtB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACvC,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI;gBACJ,GAAG;gBACH,GAAG,EAAE,GAAI;gBACT,GAAG,EAAE,GAAI;gBACT,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;gBACjB,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;aACnB,CAAC,CAAA;QACJ,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI;gBACJ,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;aAChB,CAAC,CAAA;QACJ,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI;gBACJ,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;gBACf,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;aACnB,CAAC,CAAA;QACJ,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI;gBACJ,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAE;gBACf,YAAY,EAAE,GAAG,CAAC,CAAC,EAAE,CAAE;aACxB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/dist/BgzipTaffyAdapter/types.d.ts

@@ -0,0 +1,13 @@
+import VirtualOffset from './virtualOffset';
+export interface OrganismRecord {
+    chr: string;
+    start: number;
+    srcSize: number;
+    strand: number;
+    data: string;
+}
+export interface ByteRange {
+    chrStart: number;
+    virtualOffset: VirtualOffset;
+}
+export type IndexData = Record<string, ByteRange[]>;

package/dist/BgzipTaffyAdapter/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/BgzipTaffyAdapter/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/BgzipTaffyAdapter/types.ts"],"names":[],"mappings":""}

package/dist/BgzipTaffyAdapter/virtualOffset.d.ts

@@ -0,0 +1,8 @@
+export default class VirtualOffset {
+    blockPosition: number;
+    dataPosition: number;
+    constructor(blockPosition: number, dataPosition: number);
+    toString(): string;
+    compareTo(b: VirtualOffset): number;
+}
+export declare function fromBytes(bytes: Uint8Array, offset?: number): VirtualOffset;

package/dist/BgzipTaffyAdapter/virtualOffset.js

@@ -0,0 +1,23 @@
+export default class VirtualOffset {
+    blockPosition;
+    dataPosition;
+    constructor(blockPosition, dataPosition) {
+        this.blockPosition = blockPosition; // < offset of the compressed data block
+        this.dataPosition = dataPosition; // < offset into the uncompressed data
+    }
+    toString() {
+        return `${this.blockPosition}:${this.dataPosition}`;
+    }
+    compareTo(b) {
+        return (this.blockPosition - b.blockPosition || this.dataPosition - b.dataPosition);
+    }
+}
+export function fromBytes(bytes, offset = 0) {
+    return new VirtualOffset(bytes[offset + 7] * 0x10000000000 +
+        bytes[offset + 6] * 0x100000000 +
+        bytes[offset + 5] * 0x1000000 +
+        bytes[offset + 4] * 0x10000 +
+        bytes[offset + 3] * 0x100 +
+        bytes[offset + 2], (bytes[offset + 1] << 8) | bytes[offset]);
+}
+//# sourceMappingURL=virtualOffset.js.map

package/dist/BgzipTaffyAdapter/virtualOffset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"virtualOffset.js","sourceRoot":"","sources":["../../src/BgzipTaffyAdapter/virtualOffset.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,aAAa;IACzB,aAAa,CAAQ;IACrB,YAAY,CAAQ;IAC3B,YAAY,aAAqB,EAAE,YAAoB;QACrD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA,CAAC,wCAAwC;QAC3E,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA,CAAC,sCAAsC;IACzE,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,YAAY,EAAE,CAAA;IACrD,CAAC;IAED,SAAS,CAAC,CAAgB;QACxB,OAAO,CACL,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAC3E,CAAA;IACH,CAAC;CACF;AACD,MAAM,UAAU,SAAS,CAAC,KAAiB,EAAE,MAAM,GAAG,CAAC;IACrD,OAAO,IAAI,aAAa,CACtB,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,GAAG,aAAa;QAChC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,GAAG,WAAW;QAChC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,GAAG,SAAS;QAC9B,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,GAAG,OAAO;QAC5B,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,GAAG,KAAK;QAC1B,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,EACpB,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAE,CAC3C,CAAA;AACH,CAAC"}

package/dist/BigMafAdapter/BigMafAdapter.js

@@ -1,7 +1,7 @@
 import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
-import { getSnapshot } from 'mobx-state-tree';
 import { SimpleFeature } from '@jbrowse/core/util';
 import { ObservableCreate } from '@jbrowse/core/util/rxjs';
+import { getSnapshot } from 'mobx-state-tree';
 import { firstValueFrom, toArray } from 'rxjs';
 export default class BigMafAdapter extends BaseFeatureDataAdapter {
     setupP;