@gmod/gbz-base 0.0.1 → 1.1.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/README.md +45 -4
- package/bin/query.js +3 -1
- package/dist/cli.js +85 -19
- package/dist/cli.js.map +1 -0
- package/dist/db.d.ts +14 -6
- package/dist/db.js +92 -28
- package/dist/db.js.map +1 -0
- package/dist/filehandle.js +1 -0
- package/dist/filehandle.js.map +1 -0
- package/dist/gbwt/bytecode.d.ts +1 -1
- package/dist/gbwt/bytecode.js +7 -3
- package/dist/gbwt/bytecode.js.map +1 -0
- package/dist/gbwt/node.js +7 -2
- package/dist/gbwt/node.js.map +1 -0
- package/dist/gbwt/record.d.ts +4 -0
- package/dist/gbwt/record.js +30 -2
- package/dist/gbwt/record.js.map +1 -0
- package/dist/gbwt/sequence.js +8 -1
- package/dist/gbwt/sequence.js.map +1 -0
- package/dist/graphName.d.ts +9 -0
- package/dist/graphName.js +83 -0
- package/dist/graphName.js.map +1 -0
- package/dist/index.d.ts +5 -4
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -0
- package/dist/lcs.js +32 -10
- package/dist/lcs.js.map +1 -0
- package/dist/query.d.ts +4 -2
- package/dist/query.js +19 -0
- package/dist/query.js.map +1 -0
- package/dist/sqlite/btree.d.ts +1 -1
- package/dist/sqlite/btree.js +24 -7
- package/dist/sqlite/btree.js.map +1 -0
- package/dist/sqlite/database.d.ts +1 -1
- package/dist/sqlite/database.js +12 -2
- package/dist/sqlite/database.js.map +1 -0
- package/dist/sqlite/pager.d.ts +8 -3
- package/dist/sqlite/pager.js +71 -12
- package/dist/sqlite/pager.js.map +1 -0
- package/dist/sqlite/record.js +3 -1
- package/dist/sqlite/record.js.map +1 -0
- package/dist/subgraph.d.ts +12 -2
- package/dist/subgraph.js +413 -84
- package/dist/subgraph.js.map +1 -0
- package/package.json +36 -11
- package/src/cli.ts +258 -0
- package/src/db.ts +374 -0
- package/src/filehandle.ts +4 -0
- package/src/gbwt/bytecode.ts +87 -0
- package/src/gbwt/node.ts +64 -0
- package/src/gbwt/record.ts +177 -0
- package/src/gbwt/sequence.ts +50 -0
- package/src/graphName.ts +94 -0
- package/src/index.ts +34 -0
- package/src/lcs.ts +282 -0
- package/src/query.ts +106 -0
- package/src/sqlite/btree.ts +260 -0
- package/src/sqlite/database.ts +117 -0
- package/src/sqlite/pager.ts +148 -0
- package/src/sqlite/record.ts +100 -0
- package/src/subgraph.ts +1353 -0
- package/tools/haplotype-index/src/main.rs +197 -163
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/gbwt/node.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAA;AAI1B,MAAM,UAAU,UAAU,CAAC,EAAU,EAAE,WAAwB;IAC7D,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACrD,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,MAAc;IACnC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAc;IACtC,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC,CAAA;AACzB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAc;IACrC,OAAO,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;AACnD,CAAC;AAID,MAAM,UAAU,QAAQ,CAAC,IAAc;IACrC,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;AAC3C,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,WAAwB;IAChD,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAA;AACrD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,WAAwB;IAC/C,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;AACrD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAc;IAC7C,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAc;IAC5C,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,EAAU;IACtD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,CAAA;IACvB,OAAO,SAAS,CAAC,IAAI,CAAC;QACpB,CAAC,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC,IAAI,IAAI,MAAM,CAAA;AACpB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAc;IAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACrB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAClC,IAAI,KAAK,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC;QACzC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC;QACnB,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAClC,CAAC"}
|
package/dist/gbwt/record.d.ts
CHANGED
|
@@ -14,5 +14,9 @@ export declare class GbwtRecord {
|
|
|
14
14
|
private edgeTo;
|
|
15
15
|
offsetTo(pos: Pos): number | undefined;
|
|
16
16
|
predecessorAt(i: number): number | undefined;
|
|
17
|
+
decompressArrays(): {
|
|
18
|
+
nodes: Int32Array<ArrayBuffer>;
|
|
19
|
+
offsets: Int32Array<ArrayBuffer>;
|
|
20
|
+
};
|
|
17
21
|
decompress(): Pos[];
|
|
18
22
|
}
|
package/dist/gbwt/record.js
CHANGED
|
@@ -43,7 +43,9 @@ export class GbwtRecord {
|
|
|
43
43
|
const edge = this.edge(run.value);
|
|
44
44
|
const soFar = offsets[run.value];
|
|
45
45
|
if (offset + run.len > i) {
|
|
46
|
-
return edge.node === ENDMARKER
|
|
46
|
+
return edge.node === ENDMARKER
|
|
47
|
+
? undefined
|
|
48
|
+
: { node: edge.node, offset: soFar + (i - offset) };
|
|
47
49
|
}
|
|
48
50
|
offsets[run.value] = soFar + run.len;
|
|
49
51
|
offset += run.len;
|
|
@@ -94,7 +96,10 @@ export class GbwtRecord {
|
|
|
94
96
|
return undefined;
|
|
95
97
|
}
|
|
96
98
|
predecessorAt(i) {
|
|
97
|
-
const counts = this.edges.map(e => ({
|
|
99
|
+
const counts = this.edges.map(e => ({
|
|
100
|
+
node: e.node === ENDMARKER ? ENDMARKER : flipNode(e.node),
|
|
101
|
+
count: 0,
|
|
102
|
+
}));
|
|
98
103
|
for (const run of this.runs()) {
|
|
99
104
|
const entry = counts[run.value];
|
|
100
105
|
if (entry) {
|
|
@@ -118,6 +123,28 @@ export class GbwtRecord {
|
|
|
118
123
|
}
|
|
119
124
|
return undefined;
|
|
120
125
|
}
|
|
126
|
+
decompressArrays() {
|
|
127
|
+
const offsets = this.edges.map(e => e.offset);
|
|
128
|
+
let total = 0;
|
|
129
|
+
for (const run of this.runs()) {
|
|
130
|
+
total += run.len;
|
|
131
|
+
}
|
|
132
|
+
const nodes = new Int32Array(total);
|
|
133
|
+
const nextOffsets = new Int32Array(total);
|
|
134
|
+
let i = 0;
|
|
135
|
+
for (const run of this.runs()) {
|
|
136
|
+
const edge = this.edge(run.value);
|
|
137
|
+
let offset = offsets[run.value];
|
|
138
|
+
for (let k = 0; k < run.len; k++) {
|
|
139
|
+
nodes[i] = edge.node;
|
|
140
|
+
nextOffsets[i] = offset;
|
|
141
|
+
offset += 1;
|
|
142
|
+
i += 1;
|
|
143
|
+
}
|
|
144
|
+
offsets[run.value] = offset;
|
|
145
|
+
}
|
|
146
|
+
return { nodes, offsets: nextOffsets };
|
|
147
|
+
}
|
|
121
148
|
decompress() {
|
|
122
149
|
const offsets = this.edges.map(e => e.offset);
|
|
123
150
|
const result = [];
|
|
@@ -131,3 +158,4 @@ export class GbwtRecord {
|
|
|
131
158
|
return result;
|
|
132
159
|
}
|
|
133
160
|
}
|
|
161
|
+
//# sourceMappingURL=record.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"record.js","sourceRoot":"","sources":["../../src/gbwt/record.ts"],"names":[],"mappings":"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"}
|
package/dist/gbwt/sequence.js
CHANGED
|
@@ -30,7 +30,13 @@ export function decodeSequence(encoded) {
|
|
|
30
30
|
}
|
|
31
31
|
return result;
|
|
32
32
|
}
|
|
33
|
-
const COMPLEMENT = {
|
|
33
|
+
const COMPLEMENT = {
|
|
34
|
+
A: 'T',
|
|
35
|
+
C: 'G',
|
|
36
|
+
G: 'C',
|
|
37
|
+
T: 'A',
|
|
38
|
+
N: 'N',
|
|
39
|
+
};
|
|
34
40
|
export function reverseComplement(sequence) {
|
|
35
41
|
let result = '';
|
|
36
42
|
for (let i = sequence.length - 1; i >= 0; i--) {
|
|
@@ -38,3 +44,4 @@ export function reverseComplement(sequence) {
|
|
|
38
44
|
}
|
|
39
45
|
return result;
|
|
40
46
|
}
|
|
47
|
+
//# sourceMappingURL=sequence.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sequence.js","sourceRoot":"","sources":["../../src/gbwt/sequence.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAE5C,MAAM,UAAU,qBAAqB,CAAC,OAAmB;IACvD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACxC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,CAAC,CAAA;IACV,CAAC;IACD,IAAI,KAAK,GAAG,IAAI,CAAA;IAChB,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,MAAK;QACP,CAAC;QACD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;QAC7B,MAAM,IAAI,CAAC,CAAA;IACb,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,MAAM,CAAA;AAC1C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAmB;IAChD,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAA;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,CAAE,CAAA;YAC/B,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;gBAChB,OAAO,MAAM,CAAA;YACf,CAAC;YACD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;YAC7B,MAAM,IAAI,IAAI,CAAA;QAChB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,GAA2B;IACzC,CAAC,EAAE,GAAG;IACN,CAAC,EAAE,GAAG;IACN,CAAC,EAAE,GAAG;IACN,CAAC,EAAE,GAAG;IACN,CAAC,EAAE,GAAG;CACP,CAAA;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAgB;IAChD,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,GAAG,CAAA;IAC3C,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export interface GraphName {
|
|
2
|
+
name: string | undefined;
|
|
3
|
+
subgraph: Map<string, Set<string>>;
|
|
4
|
+
translation: Map<string, Set<string>>;
|
|
5
|
+
}
|
|
6
|
+
export declare function graphNameFromTags(tags: Map<string, string>): GraphName;
|
|
7
|
+
export declare function subgraphName(name: string, parent: GraphName): GraphName;
|
|
8
|
+
export declare function gfaHeaderLines(graphName: GraphName): string[];
|
|
9
|
+
export declare function sha256Hex(chunks: Uint8Array[]): Promise<string>;
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
function parseRelationships(field, what) {
|
|
2
|
+
const relationships = new Map();
|
|
3
|
+
if (field !== undefined) {
|
|
4
|
+
for (const rel of field.split(';')) {
|
|
5
|
+
const parts = rel.split(',');
|
|
6
|
+
const [from, to] = parts;
|
|
7
|
+
if (parts.length !== 2 || !from || !to) {
|
|
8
|
+
throw new Error(`Invalid ${what} relationship: ${rel}`);
|
|
9
|
+
}
|
|
10
|
+
let targets = relationships.get(from);
|
|
11
|
+
if (!targets) {
|
|
12
|
+
targets = new Set();
|
|
13
|
+
relationships.set(from, targets);
|
|
14
|
+
}
|
|
15
|
+
targets.add(to);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return relationships;
|
|
19
|
+
}
|
|
20
|
+
export function graphNameFromTags(tags) {
|
|
21
|
+
return {
|
|
22
|
+
name: tags.get('pggname'),
|
|
23
|
+
subgraph: parseRelationships(tags.get('subgraph'), 'subgraph'),
|
|
24
|
+
translation: parseRelationships(tags.get('translation'), 'translation'),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
function merge(into, from) {
|
|
28
|
+
for (const [key, values] of from) {
|
|
29
|
+
let targets = into.get(key);
|
|
30
|
+
if (!targets) {
|
|
31
|
+
targets = new Set();
|
|
32
|
+
into.set(key, targets);
|
|
33
|
+
}
|
|
34
|
+
for (const value of values) {
|
|
35
|
+
targets.add(value);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
export function subgraphName(name, parent) {
|
|
40
|
+
const result = {
|
|
41
|
+
name,
|
|
42
|
+
subgraph: new Map(),
|
|
43
|
+
translation: new Map(),
|
|
44
|
+
};
|
|
45
|
+
if (parent.name !== undefined) {
|
|
46
|
+
result.subgraph.set(name, new Set([parent.name]));
|
|
47
|
+
merge(result.subgraph, parent.subgraph);
|
|
48
|
+
merge(result.translation, parent.translation);
|
|
49
|
+
}
|
|
50
|
+
return result;
|
|
51
|
+
}
|
|
52
|
+
function sortedEntries(relationships) {
|
|
53
|
+
return [...relationships.entries()]
|
|
54
|
+
.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))
|
|
55
|
+
.flatMap(([from, tos]) => [...tos].sort().map(to => [from, to]));
|
|
56
|
+
}
|
|
57
|
+
export function gfaHeaderLines(graphName) {
|
|
58
|
+
const lines = [];
|
|
59
|
+
if (graphName.name !== undefined) {
|
|
60
|
+
lines.push(`H\tNM:Z:${graphName.name}`);
|
|
61
|
+
}
|
|
62
|
+
for (const [subgraph, supergraph] of sortedEntries(graphName.subgraph)) {
|
|
63
|
+
lines.push(`H\tSG:Z:${subgraph},${supergraph}`);
|
|
64
|
+
}
|
|
65
|
+
for (const [from, to] of sortedEntries(graphName.translation)) {
|
|
66
|
+
lines.push(`H\tTL:Z:${from},${to}`);
|
|
67
|
+
}
|
|
68
|
+
return lines;
|
|
69
|
+
}
|
|
70
|
+
export async function sha256Hex(chunks) {
|
|
71
|
+
const total = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
|
|
72
|
+
const bytes = new Uint8Array(total);
|
|
73
|
+
let offset = 0;
|
|
74
|
+
for (const chunk of chunks) {
|
|
75
|
+
bytes.set(chunk, offset);
|
|
76
|
+
offset += chunk.length;
|
|
77
|
+
}
|
|
78
|
+
const digest = await globalThis.crypto.subtle.digest('SHA-256', bytes);
|
|
79
|
+
return [...new Uint8Array(digest)]
|
|
80
|
+
.map(byte => byte.toString(16).padStart(2, '0'))
|
|
81
|
+
.join('');
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=graphName.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graphName.js","sourceRoot":"","sources":["../src/graphName.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
export { GBZBase, GbzRecord, SchemaVersionError, formatPathName,
|
|
2
|
-
export type { GbzPath, HaplotypeSample, PathName } from './db.ts';
|
|
1
|
+
export { GBZBase, GENERIC_SAMPLE, GbzRecord, SCHEMA_VERSION, SchemaVersionError, formatPathName, } from './db.ts';
|
|
2
|
+
export type { GbzPath, HaplotypeSample, OpenOptions, PathName } from './db.ts';
|
|
3
3
|
export type { ByteSource } from './filehandle.ts';
|
|
4
4
|
export type { Pos } from './gbwt/record.ts';
|
|
5
5
|
export { Subgraph } from './subgraph.ts';
|
|
6
|
-
export type { HaplotypeAlignment, HaplotypeOutput, PathIdentity, PathPosition, ReferencePath, SubgraphJson, SubgraphPath, ToJsonOptions, } from './subgraph.ts';
|
|
7
|
-
export { subgraphAtOffset, subgraphInInterval,
|
|
6
|
+
export type { HaplotypeAlignment, HaplotypeOutput, PathIdentity, PathPosition, ReferencePath, SnarlOutput, SubgraphJson, SubgraphPath, ToJsonOptions, } from './subgraph.ts';
|
|
7
|
+
export { subgraphAroundNodes, subgraphAtOffset, subgraphBetween, subgraphInInterval, } from './query.ts';
|
|
8
8
|
export type { PathQuery, QueryOptions } from './query.ts';
|
|
9
9
|
export { SqliteDatabase } from './sqlite/database.ts';
|
|
10
|
+
export type { GraphName } from './graphName.ts';
|
|
10
11
|
export { weightedLcs } from './lcs.ts';
|
|
11
12
|
export * as nodes from './gbwt/node.ts';
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export { GBZBase, GbzRecord, SchemaVersionError, formatPathName,
|
|
1
|
+
export { GBZBase, GENERIC_SAMPLE, GbzRecord, SCHEMA_VERSION, SchemaVersionError, formatPathName, } from "./db.js";
|
|
2
2
|
export { Subgraph } from "./subgraph.js";
|
|
3
|
-
export { subgraphAtOffset, subgraphInInterval,
|
|
3
|
+
export { subgraphAroundNodes, subgraphAtOffset, subgraphBetween, subgraphInInterval, } from "./query.js";
|
|
4
4
|
export { SqliteDatabase } from "./sqlite/database.js";
|
|
5
5
|
export { weightedLcs } from "./lcs.js";
|
|
6
6
|
export * as nodes from "./gbwt/node.js";
|
|
7
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,cAAc,EACd,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,cAAc,GACf,MAAM,SAAS,CAAA;AAIhB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAYxC,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,GACnB,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA"}
|
package/dist/lcs.js
CHANGED
|
@@ -54,10 +54,10 @@ class MinHeap {
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
class Matrix {
|
|
57
|
-
a;
|
|
58
|
-
b;
|
|
59
57
|
aSums;
|
|
60
58
|
bSums;
|
|
59
|
+
a;
|
|
60
|
+
b;
|
|
61
61
|
points = new Map();
|
|
62
62
|
pendingEdits = new MinHeap();
|
|
63
63
|
constructor(a, b, weight) {
|
|
@@ -103,7 +103,9 @@ class Matrix {
|
|
|
103
103
|
continue;
|
|
104
104
|
}
|
|
105
105
|
const point = { ...found };
|
|
106
|
-
while (point.a < this.a.length &&
|
|
106
|
+
while (point.a < this.a.length &&
|
|
107
|
+
point.b < this.b.length &&
|
|
108
|
+
this.a[point.a] === this.b[point.b]) {
|
|
107
109
|
point.weight += 2 * this.aWeight(point.a);
|
|
108
110
|
point.a += 1;
|
|
109
111
|
point.b += 1;
|
|
@@ -117,27 +119,44 @@ class Matrix {
|
|
|
117
119
|
}
|
|
118
120
|
if (point.a < this.a.length) {
|
|
119
121
|
const w = this.aWeight(point.a);
|
|
120
|
-
this.tryInsert(edits + w, diagonal + w, {
|
|
122
|
+
this.tryInsert(edits + w, diagonal + w, {
|
|
123
|
+
weight: point.weight,
|
|
124
|
+
a: point.a + 1,
|
|
125
|
+
b: point.b,
|
|
126
|
+
matches: 0,
|
|
127
|
+
});
|
|
121
128
|
}
|
|
122
129
|
if (point.b < this.b.length) {
|
|
123
130
|
const w = this.bWeight(point.b);
|
|
124
|
-
this.tryInsert(edits + w, diagonal - w, {
|
|
131
|
+
this.tryInsert(edits + w, diagonal - w, {
|
|
132
|
+
weight: point.weight,
|
|
133
|
+
a: point.a,
|
|
134
|
+
b: point.b + 1,
|
|
135
|
+
matches: 0,
|
|
136
|
+
});
|
|
125
137
|
}
|
|
126
138
|
}
|
|
127
139
|
return undefined;
|
|
128
140
|
}
|
|
129
141
|
nextEdits(edits) {
|
|
130
|
-
while (this.pendingEdits.peek() !== undefined &&
|
|
142
|
+
while (this.pendingEdits.peek() !== undefined &&
|
|
143
|
+
this.pendingEdits.peek() <= edits) {
|
|
131
144
|
this.pendingEdits.pop();
|
|
132
145
|
}
|
|
133
146
|
return this.pendingEdits.peek();
|
|
134
147
|
}
|
|
135
148
|
predecessor(a, b, edits) {
|
|
136
149
|
const diagonal = this.aSums[a] - this.bSums[b];
|
|
137
|
-
const prev = a > 0 && this.aWeight(a - 1) <= edits
|
|
138
|
-
|
|
150
|
+
const prev = a > 0 && this.aWeight(a - 1) <= edits
|
|
151
|
+
? this.get(edits - this.aWeight(a - 1), diagonal - this.aWeight(a - 1))
|
|
152
|
+
: undefined;
|
|
153
|
+
const next = b > 0 && this.bWeight(b - 1) <= edits
|
|
154
|
+
? this.get(edits - this.bWeight(b - 1), diagonal + this.bWeight(b - 1))
|
|
155
|
+
: undefined;
|
|
139
156
|
if (prev && next) {
|
|
140
|
-
return prev.weight > next.weight
|
|
157
|
+
return prev.weight > next.weight
|
|
158
|
+
? [prev, edits - this.aWeight(a - 1)]
|
|
159
|
+
: [next, edits - this.bWeight(b - 1)];
|
|
141
160
|
}
|
|
142
161
|
if (prev) {
|
|
143
162
|
return [prev, edits - this.aWeight(a - 1)];
|
|
@@ -154,7 +173,9 @@ export function weightedLcs(a, b, weight) {
|
|
|
154
173
|
prefix += 1;
|
|
155
174
|
}
|
|
156
175
|
let suffix = 0;
|
|
157
|
-
while (suffix < a.length - prefix &&
|
|
176
|
+
while (suffix < a.length - prefix &&
|
|
177
|
+
suffix < b.length - prefix &&
|
|
178
|
+
a[a.length - 1 - suffix] === b[b.length - 1 - suffix]) {
|
|
158
179
|
suffix += 1;
|
|
159
180
|
}
|
|
160
181
|
const pairs = [];
|
|
@@ -212,3 +233,4 @@ function weightedLcsCore(a, b, weight) {
|
|
|
212
233
|
result.reverse();
|
|
213
234
|
return [result, finalWeight];
|
|
214
235
|
}
|
|
236
|
+
//# sourceMappingURL=lcs.js.map
|
package/dist/lcs.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lcs.js","sourceRoot":"","sources":["../src/lcs.ts"],"names":[],"mappings":"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"}
|
package/dist/query.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import type { GBZBase } from './db.ts';
|
|
2
1
|
import { Subgraph } from './subgraph.ts';
|
|
3
|
-
import type {
|
|
2
|
+
import type { GBZBase } from './db.ts';
|
|
3
|
+
import type { HaplotypeOutput, SnarlOutput } from './subgraph.ts';
|
|
4
4
|
export interface QueryOptions {
|
|
5
5
|
context?: number;
|
|
6
6
|
haplotypes?: HaplotypeOutput;
|
|
7
|
+
snarls?: SnarlOutput;
|
|
7
8
|
limit?: number;
|
|
8
9
|
}
|
|
9
10
|
export interface PathQuery {
|
|
@@ -14,3 +15,4 @@ export interface PathQuery {
|
|
|
14
15
|
export declare function subgraphAtOffset(db: GBZBase, query: PathQuery, offset: number, opts?: QueryOptions): Promise<Subgraph>;
|
|
15
16
|
export declare function subgraphInInterval(db: GBZBase, query: PathQuery, start: number, end: number, opts?: QueryOptions): Promise<Subgraph>;
|
|
16
17
|
export declare function subgraphAroundNodes(db: GBZBase, nodes: number[], opts?: QueryOptions): Promise<Subgraph>;
|
|
18
|
+
export declare function subgraphBetween(db: GBZBase, start: number, end: number, opts?: Pick<QueryOptions, 'haplotypes' | 'limit'>): Promise<Subgraph>;
|
package/dist/query.js
CHANGED
|
@@ -13,6 +13,7 @@ export async function subgraphAtOffset(db, query, offset, opts = {}) {
|
|
|
13
13
|
subgraph.limit = opts.limit;
|
|
14
14
|
const reference = await subgraph.pathPosition(pathName(query, offset));
|
|
15
15
|
await subgraph.aroundPosition(reference.position.handle, reference.position.nodeOffset, opts.context ?? 100);
|
|
16
|
+
await subgraph.extractSnarls(opts.snarls ?? 'none');
|
|
16
17
|
subgraph.extractPaths(reference, opts.haplotypes ?? 'all');
|
|
17
18
|
return subgraph;
|
|
18
19
|
}
|
|
@@ -21,17 +22,35 @@ export async function subgraphInInterval(db, query, start, end, opts = {}) {
|
|
|
21
22
|
subgraph.limit = opts.limit;
|
|
22
23
|
const reference = await subgraph.pathPosition(pathName(query, start));
|
|
23
24
|
await subgraph.aroundInterval(reference.position, end - start, opts.context ?? 100);
|
|
25
|
+
await subgraph.extractSnarls(opts.snarls ?? 'none');
|
|
24
26
|
subgraph.extractPaths(reference, opts.haplotypes ?? 'all');
|
|
25
27
|
return subgraph;
|
|
26
28
|
}
|
|
27
29
|
export async function subgraphAroundNodes(db, nodes, opts = {}) {
|
|
28
30
|
const haplotypes = opts.haplotypes ?? 'all';
|
|
31
|
+
const snarls = opts.snarls ?? 'none';
|
|
29
32
|
if (haplotypes === 'reference-only') {
|
|
30
33
|
throw new Error('Cannot output a reference path in a node-based query');
|
|
31
34
|
}
|
|
35
|
+
if (snarls === 'overlapping' && nodes.length > 1) {
|
|
36
|
+
throw new Error('Overlapping snarls cannot be extracted for a node-based query with multiple nodes');
|
|
37
|
+
}
|
|
32
38
|
const subgraph = new Subgraph(db);
|
|
33
39
|
subgraph.limit = opts.limit;
|
|
34
40
|
await subgraph.aroundNodes(nodes, opts.context ?? 100);
|
|
41
|
+
await subgraph.extractSnarls(snarls);
|
|
42
|
+
subgraph.extractPaths(undefined, haplotypes);
|
|
43
|
+
return subgraph;
|
|
44
|
+
}
|
|
45
|
+
export async function subgraphBetween(db, start, end, opts = {}) {
|
|
46
|
+
const haplotypes = opts.haplotypes ?? 'all';
|
|
47
|
+
if (haplotypes === 'reference-only') {
|
|
48
|
+
throw new Error('Cannot output a reference path in a node-based query');
|
|
49
|
+
}
|
|
50
|
+
const subgraph = new Subgraph(db);
|
|
51
|
+
subgraph.limit = opts.limit;
|
|
52
|
+
await subgraph.betweenNodes(start, end);
|
|
35
53
|
subgraph.extractPaths(undefined, haplotypes);
|
|
36
54
|
return subgraph;
|
|
37
55
|
}
|
|
56
|
+
//# sourceMappingURL=query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
package/dist/sqlite/btree.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { Pager } from './pager.ts';
|
|
2
2
|
import type { SqlValue } from './record.ts';
|
|
3
3
|
export declare class BTree {
|
|
4
|
-
private pager;
|
|
5
4
|
private readonly usable;
|
|
5
|
+
private pager;
|
|
6
6
|
constructor(pager: Pager, reservedBytes: number);
|
|
7
7
|
private localPayloadSize;
|
|
8
8
|
private payload;
|
package/dist/sqlite/btree.js
CHANGED
|
@@ -6,7 +6,10 @@ const LEAF_TABLE = 0x0d;
|
|
|
6
6
|
function readHeader(page, start) {
|
|
7
7
|
const view = new DataView(page.buffer, page.byteOffset, page.byteLength);
|
|
8
8
|
const type = page[start];
|
|
9
|
-
if (type !== INTERIOR_INDEX &&
|
|
9
|
+
if (type !== INTERIOR_INDEX &&
|
|
10
|
+
type !== INTERIOR_TABLE &&
|
|
11
|
+
type !== LEAF_INDEX &&
|
|
12
|
+
type !== LEAF_TABLE) {
|
|
10
13
|
throw new Error(`SQLite page has unknown b-tree type ${type}`);
|
|
11
14
|
}
|
|
12
15
|
const interior = type === INTERIOR_INDEX || type === INTERIOR_TABLE;
|
|
@@ -26,15 +29,17 @@ function readUint32(page, offset) {
|
|
|
26
29
|
return view.getUint32(offset);
|
|
27
30
|
}
|
|
28
31
|
export class BTree {
|
|
29
|
-
pager;
|
|
30
32
|
usable;
|
|
33
|
+
pager;
|
|
31
34
|
constructor(pager, reservedBytes) {
|
|
32
35
|
this.pager = pager;
|
|
33
36
|
this.usable = pager.pageSize - reservedBytes;
|
|
34
37
|
}
|
|
35
38
|
localPayloadSize(total, isIndex) {
|
|
36
39
|
const usable = this.usable;
|
|
37
|
-
const maxLocal = isIndex
|
|
40
|
+
const maxLocal = isIndex
|
|
41
|
+
? Math.floor(((usable - 12) * 64) / 255) - 23
|
|
42
|
+
: usable - 35;
|
|
38
43
|
if (total <= maxLocal) {
|
|
39
44
|
return total;
|
|
40
45
|
}
|
|
@@ -107,7 +112,10 @@ export class BTree {
|
|
|
107
112
|
high = mid;
|
|
108
113
|
}
|
|
109
114
|
}
|
|
110
|
-
pageNumber =
|
|
115
|
+
pageNumber =
|
|
116
|
+
low === header.cellCount
|
|
117
|
+
? header.rightChild
|
|
118
|
+
: readUint32(page, cellOffset(page, header, low));
|
|
111
119
|
}
|
|
112
120
|
}
|
|
113
121
|
async *tableScan(root) {
|
|
@@ -117,14 +125,22 @@ export class BTree {
|
|
|
117
125
|
const offset = cellOffset(page, header, i);
|
|
118
126
|
const [size, afterSize] = readVarint(page, offset);
|
|
119
127
|
const [rowid, afterKey] = readVarint(page, afterSize);
|
|
120
|
-
yield {
|
|
128
|
+
yield {
|
|
129
|
+
rowid,
|
|
130
|
+
values: decodeRecord(await this.payload(page, afterKey, size, false)),
|
|
131
|
+
};
|
|
121
132
|
}
|
|
122
133
|
}
|
|
123
134
|
else {
|
|
135
|
+
const children = [];
|
|
124
136
|
for (let i = 0; i < header.cellCount; i++) {
|
|
125
|
-
|
|
137
|
+
children.push(readUint32(page, cellOffset(page, header, i)));
|
|
138
|
+
}
|
|
139
|
+
children.push(header.rightChild);
|
|
140
|
+
this.pager.prefetch(children);
|
|
141
|
+
for (const child of children) {
|
|
142
|
+
yield* this.tableScan(child);
|
|
126
143
|
}
|
|
127
|
-
yield* this.tableScan(header.rightChild);
|
|
128
144
|
}
|
|
129
145
|
}
|
|
130
146
|
async indexCell(page, header, index) {
|
|
@@ -199,3 +215,4 @@ function compareKey(values, key) {
|
|
|
199
215
|
}
|
|
200
216
|
return 0;
|
|
201
217
|
}
|
|
218
|
+
//# sourceMappingURL=btree.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"btree.js","sourceRoot":"","sources":["../../src/sqlite/btree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAKtD,MAAM,cAAc,GAAG,IAAI,CAAA;AAC3B,MAAM,cAAc,GAAG,IAAI,CAAA;AAC3B,MAAM,UAAU,GAAG,IAAI,CAAA;AACvB,MAAM,UAAU,GAAG,IAAI,CAAA;AASvB,SAAS,UAAU,CAAC,IAAgB,EAAE,KAAa;IACjD,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;IACxE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;IACxB,IACE,IAAI,KAAK,cAAc;QACvB,IAAI,KAAK,cAAc;QACvB,IAAI,KAAK,UAAU;QACnB,IAAI,KAAK,UAAU,EACnB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,EAAE,CAAC,CAAA;IAChE,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,cAAc,CAAA;IACnE,OAAO;QACL,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC;QACpC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,YAAY,EAAE,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KAC1C,CAAA;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAgB,EAAE,MAAkB,EAAE,KAAa;IACrE,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;IACxE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;AACxD,CAAC;AAED,SAAS,UAAU,CAAC,IAAgB,EAAE,MAAc;IAClD,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;IACxE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,OAAO,KAAK;IACC,MAAM,CAAQ;IACvB,KAAK,CAAO;IAEpB,YAAY,KAAY,EAAE,aAAqB;QAC7C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,aAAa,CAAA;IAC9C,CAAC;IAEO,gBAAgB,CAAC,KAAa,EAAE,OAAgB;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC1B,MAAM,QAAQ,GAAG,OAAO;YACtB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,EAAE;YAC7C,CAAC,CAAC,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YACtB,OAAO,KAAK,CAAA;QACd,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,EAAE,CAAA;QAC5D,MAAM,KAAK,GAAG,QAAQ,GAAG,CAAC,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAC5D,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAA;IAC7C,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,IAAgB,EAChB,MAAc,EACd,KAAa,EACb,OAAgB;QAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACnD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CAAA;QAC9C,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAA;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;QACpD,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,IAAI,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,CAAA;QAC3C,OAAO,IAAI,KAAK,CAAC,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAC7B,CAAC,EACD,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,CAC9C,CAAA;YACD,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;YACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;YACtB,IAAI,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QAChC,CAAC;QACD,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,UAAkB;QACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,UAAU,CACd,IAAY,EACZ,KAAa;QAEb,IAAI,UAAU,GAAG,IAAI,CAAA;QACrB,SAAS,CAAC;YACR,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YACtD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC/B,IAAI,GAAG,GAAG,CAAC,CAAA;gBACX,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;gBAC3B,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;oBAClB,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;oBAC7B,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;oBAC5C,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;oBAClD,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;oBACnD,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;wBAClB,OAAO,YAAY,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;oBACtE,CAAC;oBACD,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;wBAChB,GAAG,GAAG,GAAG,GAAG,CAAC,CAAA;oBACf,CAAC;yBAAM,CAAC;wBACN,IAAI,GAAG,GAAG,CAAA;oBACZ,CAAC;gBACH,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;YAC/D,CAAC;YACD,IAAI,GAAG,GAAG,CAAC,CAAA;YACX,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;YAC3B,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;gBAClB,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC7B,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;gBAC5C,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,CAAA;gBAC1C,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;oBAChB,GAAG,GAAG,GAAG,GAAG,CAAC,CAAA;gBACf,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,GAAG,CAAA;gBACZ,CAAC;YACH,CAAC;YACD,UAAU;gBACR,GAAG,KAAK,MAAM,CAAC,SAAS;oBACtB,CAAC,CAAC,MAAM,CAAC,UAAU;oBACnB,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,CAAC,SAAS,CACd,IAAY;QAEZ,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAChD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;gBAC1C,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAClD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;gBACrD,MAAM;oBACJ,KAAK;oBACL,MAAM,EAAE,YAAY,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;iBACtE,CAAA;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAa,EAAE,CAAA;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;YAC9D,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAChC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAC7B,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAC7B,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,IAAgB,EAAE,MAAkB,EAAE,KAAa;QACzE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,KAAK,cAAc,CAAA;QAC/C,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;QAC5E,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,CAAC,aAAa,CAClB,IAAY,EACZ,GAAa;QAEb,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAChD,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;QAC3B,OAAO,KAAK,GAAG,IAAI,EAAE,CAAC;YACpB,MAAM,GAAG,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;YACpD,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,KAAK,GAAG,GAAG,GAAG,CAAC,CAAA;YACjB,CAAC;iBAAM,CAAC;gBACN,IAAI,GAAG,GAAG,CAAA;YACZ,CAAC;QACH,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;YAClD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACnC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;YAChD,CAAC;YACD,MAAM,IAAI,CAAC,MAAM,CAAA;QACnB,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACnC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAY,EACZ,GAAa;QAEb,IAAI,IAA4B,CAAA;QAChC,IAAI,UAAU,GAAG,IAAI,CAAA;QACrB,SAAS,CAAC;YACR,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YACtD,IAAI,GAAG,GAAG,CAAC,CAAA;YACX,IAAI,IAAI,GAAG,MAAM,CAAC,SAAS,CAAA;YAC3B,IAAI,KAAK,GAAG,CAAC,CAAA;YACb,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;gBAClB,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;gBACpD,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAA;oBAClB,GAAG,GAAG,GAAG,GAAG,CAAC,CAAA;gBACf,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,IAAI,CAAC,SAAS,CAAA;oBACtB,IAAI,GAAG,GAAG,CAAA;gBACZ,CAAC;YACH,CAAC;YACD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC/B,OAAO,IAAI,CAAA;YACb,CAAC;YACD,UAAU,GAAG,GAAG,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAA;QACnE,CAAC;IACH,CAAC;CACF;AAED,SAAS,UAAU,CAAC,MAAkB,EAAE,GAAa;IACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACnB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;QAChB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { ByteSource } from '../filehandle.ts';
|
|
2
1
|
import { BTree } from './btree.ts';
|
|
3
2
|
import { Pager } from './pager.ts';
|
|
3
|
+
import type { ByteSource } from '../filehandle.ts';
|
|
4
4
|
import type { PagerOptions } from './pager.ts';
|
|
5
5
|
import type { SqlValue } from './record.ts';
|
|
6
6
|
export interface SqliteObject {
|
package/dist/sqlite/database.js
CHANGED
|
@@ -33,8 +33,17 @@ export class SqliteDatabase {
|
|
|
33
33
|
const objects = new Map();
|
|
34
34
|
for await (const { values } of btree.tableScan(1)) {
|
|
35
35
|
const [type, name, tableName, rootPage, sql] = values;
|
|
36
|
-
if (typeof type === 'string' &&
|
|
37
|
-
|
|
36
|
+
if (typeof type === 'string' &&
|
|
37
|
+
typeof name === 'string' &&
|
|
38
|
+
typeof tableName === 'string' &&
|
|
39
|
+
typeof rootPage === 'number') {
|
|
40
|
+
objects.set(name, {
|
|
41
|
+
type,
|
|
42
|
+
name,
|
|
43
|
+
tableName,
|
|
44
|
+
rootPage,
|
|
45
|
+
sql: typeof sql === 'string' ? sql : '',
|
|
46
|
+
});
|
|
38
47
|
}
|
|
39
48
|
}
|
|
40
49
|
return new SqliteDatabase(pager, btree, objects);
|
|
@@ -69,3 +78,4 @@ export class SqliteDatabase {
|
|
|
69
78
|
return this.objects.has(name);
|
|
70
79
|
}
|
|
71
80
|
}
|
|
81
|
+
//# sourceMappingURL=database.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/sqlite/database.ts"],"names":[],"mappings":"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"}
|
package/dist/sqlite/pager.d.ts
CHANGED
|
@@ -4,16 +4,21 @@ export interface PagerOptions {
|
|
|
4
4
|
maxBlocks?: number;
|
|
5
5
|
}
|
|
6
6
|
export declare class Pager {
|
|
7
|
-
private source;
|
|
8
|
-
readonly pageSize: number;
|
|
9
|
-
private fileSize;
|
|
10
7
|
private blocks;
|
|
11
8
|
private readonly blockSize;
|
|
12
9
|
private readonly maxBlocks;
|
|
13
10
|
bytesFetched: number;
|
|
14
11
|
fetches: number;
|
|
12
|
+
private source;
|
|
13
|
+
readonly pageSize: number;
|
|
14
|
+
private fileSize;
|
|
15
15
|
constructor(source: ByteSource, pageSize: number, fileSize: number, opts?: PagerOptions);
|
|
16
|
+
private read;
|
|
16
17
|
seed(index: number, bytes: Uint8Array): void;
|
|
17
18
|
private block;
|
|
19
|
+
prefetch(pageNumbers: number[]): void;
|
|
20
|
+
private fetchRun;
|
|
21
|
+
private forgetOnFailure;
|
|
22
|
+
private evict;
|
|
18
23
|
page(pageNumber: number): Promise<Uint8Array<ArrayBufferLike>>;
|
|
19
24
|
}
|