@gmod/gbz-base 1.1.0 → 2.1.0

package/dist/query.d.ts

@@ -1,18 +1,16 @@
 import { Subgraph } from './subgraph.ts';
 import type { GBZBase } from './db.ts';
+import type { PathQuery } from './pathName.ts';
 import type { HaplotypeOutput, SnarlOutput } from './subgraph.ts';
+export type { PathQuery } from './pathName.ts';
 export interface QueryOptions {
-    context?: number;
-    haplotypes?: HaplotypeOutput;
-    snarls?: SnarlOutput;
-    limit?: number;
-}
-export interface PathQuery {
-    sample?: string;
-    contig: string;
-    haplotype?: number;
+    context?: number | undefined;
+    haplotypes?: HaplotypeOutput | undefined;
+    snarls?: SnarlOutput | undefined;
+    limit?: number | undefined;
+    signal?: AbortSignal | undefined;
 }
 export declare function subgraphAtOffset(db: GBZBase, query: PathQuery, offset: number, opts?: QueryOptions): Promise<Subgraph>;
 export declare function subgraphInInterval(db: GBZBase, query: PathQuery, start: number, end: number, opts?: QueryOptions): Promise<Subgraph>;
 export declare function subgraphAroundNodes(db: GBZBase, nodes: number[], opts?: QueryOptions): Promise<Subgraph>;
-export declare function subgraphBetween(db: GBZBase, start: number, end: number, opts?: Pick<QueryOptions, 'haplotypes' | 'limit'>): Promise<Subgraph>;
+export declare function subgraphBetween(db: GBZBase, start: number, end: number, opts?: Pick<QueryOptions, 'haplotypes' | 'limit' | 'signal'>): Promise<Subgraph>;

package/dist/query.js

@@ -1,26 +1,16 @@
-import { GENERIC_SAMPLE } from "./db.js";
+import { pathNameFor } from "./pathName.js";
 import { Subgraph } from "./subgraph.js";
-function pathName(query, fragment) {
-    return {
-        sample: query.sample ?? GENERIC_SAMPLE,
-        contig: query.contig,
-        haplotype: query.haplotype ?? 0,
-        fragment,
-    };
-}
 export async function subgraphAtOffset(db, query, offset, opts = {}) {
-    const subgraph = new Subgraph(db);
-    subgraph.limit = opts.limit;
-    const reference = await subgraph.pathPosition(pathName(query, offset));
+    const subgraph = new Subgraph(db, opts);
+    const reference = await subgraph.pathPosition(pathNameFor(query, offset));
     await subgraph.aroundPosition(reference.position.handle, reference.position.nodeOffset, opts.context ?? 100);
     await subgraph.extractSnarls(opts.snarls ?? 'none');
     subgraph.extractPaths(reference, opts.haplotypes ?? 'all');
     return subgraph;
 }
 export async function subgraphInInterval(db, query, start, end, opts = {}) {
-    const subgraph = new Subgraph(db);
-    subgraph.limit = opts.limit;
-    const reference = await subgraph.pathPosition(pathName(query, start));
+    const subgraph = new Subgraph(db, opts);
+    const reference = await subgraph.pathPosition(pathNameFor(query, start));
     await subgraph.aroundInterval(reference.position, end - start, opts.context ?? 100);
     await subgraph.extractSnarls(opts.snarls ?? 'none');
     subgraph.extractPaths(reference, opts.haplotypes ?? 'all');
@@ -35,8 +25,7 @@ export async function subgraphAroundNodes(db, nodes, opts = {}) {
     if (snarls === 'overlapping' && nodes.length > 1) {
         throw new Error('Overlapping snarls cannot be extracted for a node-based query with multiple nodes');
     }
-    const subgraph = new Subgraph(db);
-    subgraph.limit = opts.limit;
+    const subgraph = new Subgraph(db, opts);
     await subgraph.aroundNodes(nodes, opts.context ?? 100);
     await subgraph.extractSnarls(snarls);
     subgraph.extractPaths(undefined, haplotypes);
@@ -47,8 +36,7 @@ export async function subgraphBetween(db, start, end, opts = {}) {
     if (haplotypes === 'reference-only') {
         throw new Error('Cannot output a reference path in a node-based query');
     }
-    const subgraph = new Subgraph(db);
-    subgraph.limit = opts.limit;
+    const subgraph = new Subgraph(db, opts);
     await subgraph.betweenNodes(start, end);
     subgraph.extractPaths(undefined, haplotypes);
     return subgraph;

package/dist/query.js.map

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

package/dist/sqlite/btree.d.ts

@@ -3,6 +3,7 @@ import type { SqlValue } from './record.ts';
 export declare class BTree {
     private readonly usable;
     private pager;
+    private decodedIndexPages;
     constructor(pager: Pager, reservedBytes: number);
     private localPayloadSize;
     private payload;
@@ -12,6 +13,7 @@ export declare class BTree {
         rowid: number;
         values: SqlValue[];
     }>;
+    private decodedCells;
     private indexCell;
     indexScanFrom(root: number, low: number[]): AsyncGenerator<SqlValue[]>;
     indexSeekLE(root: number, key: number[]): Promise<SqlValue[] | undefined>;

package/dist/sqlite/btree.js

@@ -3,8 +3,16 @@ const INTERIOR_INDEX = 0x02;
 const INTERIOR_TABLE = 0x05;
 const LEAF_INDEX = 0x0a;
 const LEAF_TABLE = 0x0d;
+function readUint16(page, offset) {
+    return page[offset] * 256 + page[offset + 1];
+}
+function readUint32(page, offset) {
+    return (page[offset] * 16777216 +
+        page[offset + 1] * 65536 +
+        page[offset + 2] * 256 +
+        page[offset + 3]);
+}
 function readHeader(page, start) {
-    const view = new DataView(page.buffer, page.byteOffset, page.byteLength);
     const type = page[start];
     if (type !== INTERIOR_INDEX &&
         type !== INTERIOR_TABLE &&
@@ -15,22 +23,19 @@ function readHeader(page, start) {
     const interior = type === INTERIOR_INDEX || type === INTERIOR_TABLE;
     return {
         type,
-        cellCount: view.getUint16(start + 3),
-        rightChild: interior ? view.getUint32(start + 8) : 0,
+        cellCount: readUint16(page, start + 3),
+        rightChild: interior ? readUint32(page, start + 8) : 0,
         cellPointers: start + (interior ? 12 : 8),
     };
 }
 function cellOffset(page, header, index) {
-    const view = new DataView(page.buffer, page.byteOffset, page.byteLength);
-    return view.getUint16(header.cellPointers + 2 * index);
-}
-function readUint32(page, offset) {
-    const view = new DataView(page.buffer, page.byteOffset, page.byteLength);
-    return view.getUint32(offset);
+    return readUint16(page, header.cellPointers + 2 * index);
 }
+const MAX_DECODED_INDEX_PAGES = 4096;
 export class BTree {
     usable;
     pager;
+    decodedIndexPages = new Map();
     constructor(pager, reservedBytes) {
         this.pager = pager;
         this.usable = pager.pageSize - reservedBytes;
@@ -143,12 +148,37 @@ export class BTree {
             }
         }
     }
-    async indexCell(page, header, index) {
-        const offset = cellOffset(page, header, index);
-        const interior = header.type === INTERIOR_INDEX;
-        const [size, afterSize] = readVarint(page, interior ? offset + 4 : offset);
-        const values = decodeRecord(await this.payload(page, afterSize, size, true));
-        return { values, leftChild: interior ? readUint32(page, offset) : 0 };
+    decodedCells(pageNumber, header) {
+        let cells = this.decodedIndexPages.get(pageNumber);
+        if (cells) {
+            this.decodedIndexPages.delete(pageNumber);
+        }
+        else {
+            cells = new Array(header.cellCount);
+            if (this.decodedIndexPages.size >= MAX_DECODED_INDEX_PAGES) {
+                const oldest = this.decodedIndexPages.keys().next().value;
+                if (oldest !== undefined) {
+                    this.decodedIndexPages.delete(oldest);
+                }
+            }
+        }
+        this.decodedIndexPages.set(pageNumber, cells);
+        return cells;
+    }
+    async indexCell(pageNumber, page, header, index) {
+        const cells = this.decodedCells(pageNumber, header);
+        let cell = cells[index];
+        if (!cell) {
+            const offset = cellOffset(page, header, index);
+            const interior = header.type === INTERIOR_INDEX;
+            const [size, afterSize] = readVarint(page, interior ? offset + 4 : offset);
+            cell = {
+                values: decodeRecord(await this.payload(page, afterSize, size, true)),
+                leftChild: interior ? readUint32(page, offset) : 0,
+            };
+            cells[index] = cell;
+        }
+        return cell;
     }
     async *indexScanFrom(root, low) {
         const { page, header } = await this.pageAt(root);
@@ -156,7 +186,7 @@ export class BTree {
         let high = header.cellCount;
         while (first < high) {
             const mid = (first + high) >> 1;
-            const cell = await this.indexCell(page, header, mid);
+            const cell = await this.indexCell(root, page, header, mid);
             if (compareKey(cell.values, low) < 0) {
                 first = mid + 1;
             }
@@ -165,7 +195,7 @@ export class BTree {
             }
         }
         for (let i = first; i < header.cellCount; i++) {
-            const cell = await this.indexCell(page, header, i);
+            const cell = await this.indexCell(root, page, header, i);
             if (header.type === INTERIOR_INDEX) {
                 yield* this.indexScanFrom(cell.leftChild, low);
             }
@@ -185,7 +215,7 @@ export class BTree {
             let child = 0;
             while (low < high) {
                 const mid = (low + high) >> 1;
-                const cell = await this.indexCell(page, header, mid);
+                const cell = await this.indexCell(pageNumber, page, header, mid);
                 if (compareKey(cell.values, key) <= 0) {
                     best = cell.values;
                     low = mid + 1;

package/dist/sqlite/btree.js.map

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

package/dist/subgraph.d.ts

@@ -1,6 +1,7 @@
-import type { GBZBase, PathName } from './db.ts';
+import type { GBZBase } from './db.ts';
 import type { Orientation } from './gbwt/node.ts';
 import type { Pos } from './gbwt/record.ts';
+import type { PathName } from './pathName.ts';
 export type HaplotypeOutput = 'all' | 'distinct' | 'reference-only' | 'none';
 export type SnarlOutput = 'none' | 'contained' | 'overlapping';
 export interface PathPosition {
@@ -43,12 +44,8 @@ export interface SubgraphJson {
     }[];
     paths: SubgraphPath[];
 }
-export interface HaplotypeAlignment {
-    pathHandle: number | undefined;
-    name: PathName | undefined;
+export interface AlignmentSpan {
     strand: '+' | '-';
-    hapStart: number | undefined;
-    hapEnd: number | undefined;
     refStart: number;
     refEnd: number;
     cigar: string;
@@ -56,8 +53,23 @@ export interface HaplotypeAlignment {
     path: number[];
     start: Pos;
 }
-export interface ToJsonOptions {
-    names?: 'anonymous' | 'resolved';
+export type HaplotypeAlignment = AlignmentSpan & ({
+    resolved: true;
+    name: PathName;
+    label: string;
+    pathHandle: number;
+    hapStart: number;
+    hapEnd: number;
+} | {
+    resolved: false;
+});
+export interface SubgraphOutputOptions {
+    cigar?: boolean | undefined;
+    names?: 'anonymous' | 'resolved' | undefined;
+}
+export interface SubgraphOptions {
+    limit?: number | undefined;
+    signal?: AbortSignal | undefined;
 }
 export declare class Subgraph {
     private records;
@@ -68,7 +80,6 @@ export declare class Subgraph {
     private refInterval;
     private refIndexCache;
     private refPrefixCache;
-    limit: number | undefined;
     readonly stats: {
         orderedAlignments: number;
         lcsAlignments: number;
@@ -76,7 +87,9 @@ export declare class Subgraph {
         identificationFetches: number;
     };
     private db;
-    constructor(db: GBZBase);
+    private readonly limit;
+    private readonly signal;
+    constructor(db: GBZBase, opts?: SubgraphOptions);
     get nodeCount(): number;
     get pathCount(): number;
     get referenceInterval(): {
@@ -122,11 +135,13 @@ export declare class Subgraph {
     private prefixMatches;
     private suffixMatches;
     private align;
-    private edits;
+    private sharedWeight;
+    private editsAgainst;
+    private alignment;
     alignToRef(pathIndex: number): string | undefined;
     alignments(): HaplotypeAlignment[];
     private canonicalEdges;
     stableName(): Promise<string>;
-    toGFA(cigar: boolean, opts?: ToJsonOptions): Promise<string>;
-    toJSON(cigar: boolean, opts?: ToJsonOptions): SubgraphJson;
+    toGFA(opts?: SubgraphOutputOptions): Promise<string>;
+    toSubgraphJson(opts?: SubgraphOutputOptions): SubgraphJson;
 }

package/dist/subgraph.js

@@ -1,7 +1,7 @@
-import { formatPathName } from "./db.js";
 import { ENDMARKER, edgeIsCanonical, encodeNode, entryOrientation, entrySide, exitOrientation, exitSide, flipNode, flipSide, isReverse, nodeId, nodeOrientation, pathIsCanonical, } from "./gbwt/node.js";
 import { gfaHeaderLines, sha256Hex, subgraphName } from "./graphName.js";
 import { weightedLcs } from "./lcs.js";
+import { formatPathName } from "./pathName.js";
 function sideBefore(a, b) {
     return (a[0] < b[0] ||
         (a[0] === b[0] && (a[1] < b[1] || (a[1] === b[1] && a[2] < b[2]))));
@@ -67,7 +67,6 @@ export class Subgraph {
     refInterval;
     refIndexCache;
     refPrefixCache;
-    limit;
     stats = {
         orderedAlignments: 0,
         lcsAlignments: 0,
@@ -75,8 +74,12 @@ export class Subgraph {
         identificationFetches: 0,
     };
     db;
-    constructor(db) {
+    limit;
+    signal;
+    constructor(db, opts = {}) {
         this.db = db;
+        this.limit = opts.limit;
+        this.signal = opts.signal;
     }
     get nodeCount() {
         return this.records.size / 2;
@@ -110,6 +113,7 @@ export class Subgraph {
         return [...this.records.keys()].sort((a, b) => a - b);
     }
     async addNode(id) {
+        this.signal?.throwIfAborted();
         if (this.limit !== undefined && this.nodeCount >= this.limit) {
             throw new Error(`Subgraph size limit of ${this.limit} nodes exceeded`);
         }
@@ -608,6 +612,7 @@ export class Subgraph {
             let current = start;
             let pos;
             while (anchor === undefined) {
+                this.signal?.throwIfAborted();
                 if (current !== undefined) {
                     if (visited.has(current)) {
                         break;
@@ -828,13 +833,18 @@ export class Subgraph {
         }
         appendEdit(edits, 'M', suffix);
     }
-    edits(pathIndex) {
-        const info = this.paths[pathIndex];
-        if (this.refId === undefined || pathIndex === this.refId || !info) {
-            return undefined;
+    sharedWeight(path, ref) {
+        const index = this.refIndex(ref);
+        let weight = 0;
+        for (const handle of path) {
+            if (index.has(handle)) {
+                weight += this.record(handle).sequenceLen;
+            }
         }
-        const ref = this.paths[this.refId].path;
-        const ordered = this.orderedMatches(info.path, ref);
+        return weight;
+    }
+    editsAgainst(path, ref) {
+        const ordered = this.orderedMatches(path, ref);
         if (ordered) {
             this.stats.orderedAlignments += 1;
         }
@@ -842,22 +852,59 @@ export class Subgraph {
             this.stats.lcsAlignments += 1;
         }
         const lcs = ordered ??
-            weightedLcs(info.path, ref, handle => this.record(handle).sequenceLen)[0];
+            weightedLcs(path, ref, handle => this.record(handle).sequenceLen)[0];
         const edits = [];
+        let matched = 0;
         let pathOffset = 0;
         let refOffset = 0;
         for (const [nextPath, nextRef] of lcs) {
-            this.align(info.path.slice(pathOffset, nextPath), ref.slice(refOffset, nextRef), edits);
-            appendEdit(edits, 'M', this.record(info.path[nextPath]).sequenceLen);
+            this.align(path.slice(pathOffset, nextPath), ref.slice(refOffset, nextRef), edits);
+            const nodeLen = this.record(path[nextPath]).sequenceLen;
+            appendEdit(edits, 'M', nodeLen);
+            matched += nodeLen;
             pathOffset = nextPath + 1;
             refOffset = nextRef + 1;
         }
-        this.align(info.path.slice(pathOffset), ref.slice(refOffset), edits);
-        return edits;
+        this.align(path.slice(pathOffset), ref.slice(refOffset), edits);
+        return { edits, matched };
+    }
+    alignment(pathIndex) {
+        const info = this.paths[pathIndex];
+        if (this.refId === undefined || pathIndex === this.refId || !info) {
+            return undefined;
+        }
+        const ref = this.paths[this.refId].path;
+        const flippedPath = pathIsCanonical(ref)
+            ? []
+            : info.path.map(handle => flipNode(handle)).reverse();
+        const forwardBound = this.sharedWeight(info.path, ref);
+        const flippedBound = this.sharedWeight(flippedPath, ref);
+        let result;
+        if (flippedBound === 0) {
+            result = {
+                edits: this.editsAgainst(info.path, ref).edits,
+                flipped: false,
+            };
+        }
+        else if (forwardBound === 0) {
+            result = {
+                edits: this.editsAgainst(flippedPath, ref).edits,
+                flipped: true,
+            };
+        }
+        else {
+            const forward = this.editsAgainst(info.path, ref);
+            const flipped = this.editsAgainst(flippedPath, ref);
+            result =
+                flipped.matched > forward.matched
+                    ? { edits: flipped.edits, flipped: true }
+                    : { edits: forward.edits, flipped: false };
+        }
+        return result;
     }
     alignToRef(pathIndex) {
-        return this.edits(pathIndex)
-            ?.map(([op, len]) => `${len}${op}`)
+        return this.alignment(pathIndex)
+            ?.edits.map(([op, len]) => `${len}${op}`)
             .join('');
     }
     alignments() {
@@ -872,7 +919,7 @@ export class Subgraph {
             if (index === this.refId) {
                 return;
             }
-            const edits = this.edits(index);
+            const { edits, flipped } = this.alignment(index);
             let first = 0;
             let leading = 0;
             while (first < edits.length && edits[first][0] === 'D') {
@@ -886,23 +933,11 @@ export class Subgraph {
                 last -= 1;
             }
             const identity = info.identity;
-            const strand = info.path.some(handle => isReverse(handle)) &&
-                !info.path.some(handle => !isReverse(handle))
-                ? '-'
-                : '+';
-            result.push({
-                pathHandle: identity?.pathHandle,
-                name: identity?.name,
-                strand: identity
-                    ? identity.orientation === 'forward'
-                        ? '+'
-                        : '-'
-                    : strand,
-                hapStart: identity
-                    ? identity.name.fragment + identity.hapStart
-                    : undefined,
-                hapEnd: identity ? identity.name.fragment + identity.hapEnd : undefined,
-                start: info.positions[0],
+            const alongReference = identity
+                ? (identity.orientation === 'forward') !== flipped
+                : !flipped;
+            const span = {
+                strand: alongReference ? '+' : '-',
                 refStart: reference.start + leading,
                 refEnd: reference.start + refTotal - trailing,
                 cigar: edits
@@ -911,7 +946,24 @@ export class Subgraph {
                     .join(''),
                 weight: info.weight,
                 path: info.path,
-            });
+                start: info.positions[0],
+            };
+            if (identity) {
+                const hapStart = identity.name.fragment + identity.hapStart;
+                const hapEnd = identity.name.fragment + identity.hapEnd;
+                result.push({
+                    ...span,
+                    resolved: true,
+                    name: identity.name,
+                    label: formatPathName({ ...identity.name, fragment: hapStart }, hapEnd),
+                    pathHandle: identity.pathHandle,
+                    hapStart,
+                    hapEnd,
+                });
+            }
+            else {
+                result.push({ ...span, resolved: false });
+            }
         });
         return result;
     }
@@ -950,7 +1002,8 @@ export class Subgraph {
         }
         return sha256Hex(chunks);
     }
-    async toGFA(cigar, opts = {}) {
+    async toGFA(opts = {}) {
+        const cigar = opts.cigar ?? false;
         const lines = [
             this.refPath ? `H\tVN:Z:1.1\tRS:Z:${this.refPath.sample}` : 'H\tVN:Z:1.1',
             ...gfaHeaderLines(subgraphName(await this.stableName(), await this.db.graphName())),
@@ -1000,7 +1053,8 @@ export class Subgraph {
         });
         return `${lines.join('\n')}\n`;
     }
-    toJSON(cigar, opts = {}) {
+    toSubgraphJson(opts = {}) {
+        const cigar = opts.cigar ?? false;
         const handles = this.sortedHandles();
         const nodes = handles
             .filter(handle => !isReverse(handle))