jbrowse-plugin-msaview 2.7.1 → 2.7.3

package/dist/MsaViewPanel/msaDataStore.js

@@ -1,22 +1,13 @@
-import { openDB } from 'idb';
+import { createDbOpener } from '../utils/idb';
 const DB_NAME = 'jbrowse-msaview-data';
 const DB_VERSION = 1;
 const STORE_NAME = 'msa-data';
-let dbPromise;
-function getDB() {
-    dbPromise ??= openDB(DB_NAME, DB_VERSION, {
-        upgrade(db) {
-            if (!db.objectStoreNames.contains(STORE_NAME)) {
-                const store = db.createObjectStore(STORE_NAME, { keyPath: 'id' });
-                store.createIndex('timestamp', 'timestamp', { unique: false });
-            }
-        },
-    }).catch((e) => {
-        dbPromise = undefined;
-        throw e;
-    });
-    return dbPromise;
-}
+const getDB = createDbOpener(DB_NAME, DB_VERSION, db => {
+    if (!db.objectStoreNames.contains(STORE_NAME)) {
+        const store = db.createObjectStore(STORE_NAME, { keyPath: 'id' });
+        store.createIndex('timestamp', 'timestamp', { unique: false });
+    }
+});
 export function generateDataStoreId() {
     return `msa-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
 }
@@ -41,7 +32,7 @@ export async function storeMsaData(id, data) {
 export async function retrieveMsaData(id) {
     try {
         const db = await getDB();
-        const result = (await db.get(STORE_NAME, id));
+        const result = await db.get(STORE_NAME, id);
         if (result) {
             return {
                 msa: result.msa,

package/dist/MsaViewPanel/syncGenomeHoverToMsaColumn.test.js

@@ -45,12 +45,14 @@ describe('syncGenomeHoverToMsaColumn (real genomeToMSA mapping)', () => {
     beforeEach(() => {
         vi.clearAllMocks();
     });
-    test('genome hover at coord 1005 highlights MSA column 5', () => {
+    test('genome hover at coord 1005 highlights MSA column 4', () => {
         const { model, calls } = makeModel();
         const run = syncGenomeHoverToMsaColumn(model);
-        hoverGenome(1005); // 1005 - mafRegion.start(1000) = ungapped 5
+        // the hover coord is 1-based, so 1005 is the 0-based base 1004, i.e.
+        // ungapped offset 4 into a region starting at 1000
+        hoverGenome(1005);
         run();
-        expect(calls).toEqual([5]);
+        expect(calls).toEqual([4]);
     });
     test('moving the genome hover moves the highlighted column', () => {
         const { model, calls } = makeModel();
@@ -59,7 +61,7 @@ describe('syncGenomeHoverToMsaColumn (real genomeToMSA mapping)', () => {
         run();
         hoverGenome(1007);
         run();
-        expect(calls).toEqual([2, 7]);
+        expect(calls).toEqual([1, 6]);
     });
     test('leaving the genome clears the column it set', () => {
         const { model, calls } = makeModel();
@@ -68,7 +70,7 @@ describe('syncGenomeHoverToMsaColumn (real genomeToMSA mapping)', () => {
         run();
         clearGenomeHover();
         run();
-        expect(calls).toEqual([4, undefined]);
+        expect(calls).toEqual([3, undefined]);
     });
     test('a hover outside the maf region clears a previously-set column once', () => {
         const { model, calls } = makeModel();
@@ -78,7 +80,7 @@ describe('syncGenomeHoverToMsaColumn (real genomeToMSA mapping)', () => {
         hoverGenome(5000); // outside [1000,1010) -> genomeToMSA returns undefined
         run();
         run();
-        expect(calls).toEqual([4, undefined]);
+        expect(calls).toEqual([3, undefined]);
     });
     test('never touches mouseCol when the genome never provides a column, so a direct MSA hover survives unrelated session hovers', () => {
         const { model, calls } = makeModel();