@workglow/indexeddb 0.4.8 → 0.5.0

package/dist/storage/browser.js

@@ -76,8 +76,8 @@ function compareSchemas(store, expectedPrimaryKey, expectedIndexes) {
       diff.indexesToAdd.push(expectedIdx);
     } else {
       const expectedKeyPath = Array.isArray(expectedIdx.keyPath) ? expectedIdx.keyPath : [expectedIdx.keyPath];
-      const actualKeyPath2 = Array.isArray(existingIdx.keyPath) ? existingIdx.keyPath : [existingIdx.keyPath];
-      const keyPathChanged = !deepEqual(expectedKeyPath, actualKeyPath2);
+      const actualKeyPath = Array.isArray(existingIdx.keyPath) ? existingIdx.keyPath : [existingIdx.keyPath];
+      const keyPathChanged = !deepEqual(expectedKeyPath, actualKeyPath);
       const uniqueChanged = existingIdx.unique !== (expectedIdx.options?.unique ?? false);
       const multiEntryChanged = existingIdx.multiEntry !== (expectedIdx.options?.multiEntry ?? false);
       if (keyPathChanged || uniqueChanged || multiEntryChanged) {
@@ -162,11 +162,11 @@ async function performDestructiveMigration(db, tableName, primaryKey, expectedIn
   }
   options.onMigrationProgress?.(`Recreating object store...`, 0.75);
   const newDb = await openIndexedDbTable(tableName, newVersion, (event) => {
-    const db2 = event.target.result;
-    if (db2.objectStoreNames.contains(tableName)) {
-      db2.deleteObjectStore(tableName);
+    const db = event.target.result;
+    if (db.objectStoreNames.contains(tableName)) {
+      db.deleteObjectStore(tableName);
     }
-    const store = db2.createObjectStore(tableName, { keyPath: primaryKey, autoIncrement });
+    const store = db.createObjectStore(tableName, { keyPath: primaryKey, autoIncrement });
     for (const idx of expectedIndexes) {
       store.createIndex(idx.name, idx.keyPath, idx.options);
     }
@@ -192,11 +192,11 @@ async function createNewDatabase(tableName, primaryKey, expectedIndexes, options
   } catch (err) {}
   const version = 1;
   const db = await openIndexedDbTable(tableName, version, (event) => {
-    const db2 = event.target.result;
-    if (!db2.objectStoreNames.contains(METADATA_STORE_NAME)) {
-      db2.createObjectStore(METADATA_STORE_NAME, { keyPath: "tableName" });
+    const db = event.target.result;
+    if (!db.objectStoreNames.contains(METADATA_STORE_NAME)) {
+      db.createObjectStore(METADATA_STORE_NAME, { keyPath: "tableName" });
     }
-    const store = db2.createObjectStore(tableName, { keyPath: primaryKey, autoIncrement });
+    const store = db.createObjectStore(tableName, { keyPath: primaryKey, autoIncrement });
     for (const idx of expectedIndexes) {
       store.createIndex(idx.name, idx.keyPath, idx.options);
     }
@@ -233,23 +233,23 @@ async function ensureIndexedDbTable(tableName, primaryKey, expectedIndexes = [],
         await new Promise((resolve) => setTimeout(resolve, 50));
       } catch (err) {}
       db = await openIndexedDbTable(tableName, 1, (event) => {
-        const db2 = event.target.result;
-        if (!db2.objectStoreNames.contains(METADATA_STORE_NAME)) {
-          db2.createObjectStore(METADATA_STORE_NAME, { keyPath: "tableName" });
+        const db = event.target.result;
+        if (!db.objectStoreNames.contains(METADATA_STORE_NAME)) {
+          db.createObjectStore(METADATA_STORE_NAME, { keyPath: "tableName" });
         }
-        const store2 = db2.createObjectStore(tableName, { keyPath: primaryKey, autoIncrement });
+        const store = db.createObjectStore(tableName, { keyPath: primaryKey, autoIncrement });
         for (const idx of expectedIndexes) {
-          store2.createIndex(idx.name, idx.keyPath, idx.options);
+          store.createIndex(idx.name, idx.keyPath, idx.options);
         }
       });
-      const snapshot2 = {
+      const snapshot = {
         version: db.version,
         primaryKey,
         indexes: expectedIndexes,
         recordCount: 0,
         timestamp: Date.now()
       };
-      await saveSchemaMetadata(db, tableName, snapshot2);
+      await saveSchemaMetadata(db, tableName, snapshot);
       options.onMigrationProgress?.(`Database created successfully`, 1);
       return db;
     }
@@ -257,9 +257,9 @@ async function ensureIndexedDbTable(tableName, primaryKey, expectedIndexes = [],
       const currentVersion = db.version;
       db.close();
       db = await openIndexedDbTable(tableName, currentVersion + 1, (event) => {
-        const db2 = event.target.result;
-        if (!db2.objectStoreNames.contains(METADATA_STORE_NAME)) {
-          db2.createObjectStore(METADATA_STORE_NAME, { keyPath: "tableName" });
+        const db = event.target.result;
+        if (!db.objectStoreNames.contains(METADATA_STORE_NAME)) {
+          db.createObjectStore(METADATA_STORE_NAME, { keyPath: "tableName" });
         }
       });
     }
@@ -278,13 +278,13 @@ async function ensureIndexedDbTable(tableName, primaryKey, expectedIndexes = [],
     const needsMigration = diff.indexesToAdd.length > 0 || diff.indexesToRemove.length > 0 || diff.indexesToModify.length > 0 || diff.needsObjectStoreRecreation;
     if (!needsMigration) {
       options.onMigrationProgress?.(`Schema for ${tableName} is up to date`, 1);
-      const snapshot2 = {
+      const snapshot = {
         version: db.version,
         primaryKey,
         indexes: expectedIndexes,
         timestamp: Date.now()
       };
-      await saveSchemaMetadata(db, tableName, snapshot2);
+      await saveSchemaMetadata(db, tableName, snapshot);
       return db;
     }
     if (diff.needsObjectStoreRecreation) {
@@ -320,8 +320,11 @@ import {
   HybridSubscriptionManager,
   isSearchCondition,
   isSearchInCondition,
+  isSearchNotInCondition,
   matchesEqualityCriterion,
+  matchesInCriterion,
   matchesInequalityCriterion,
+  matchesNotInCriterion,
   normalizeCriterion,
   pickCoveringIndex,
   safeEmit,
@@ -1151,9 +1154,9 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
       const store = transaction.objectStore(this.table);
       const plan = this.createIndexedRange(store, criteria);
       if (plan?.coversCriteria) {
-        const request2 = plan.source.count(plan.range);
-        request2.onerror = () => reject(request2.error);
-        request2.onsuccess = () => resolve(request2.result);
+        const request = plan.source.count(plan.range);
+        request.onerror = () => reject(request.error);
+        request.onsuccess = () => resolve(request.result);
         return;
       }
       const source = plan?.source ?? store;
@@ -1215,7 +1218,12 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
       const recordValue = record[column];
       const normalized = normalizeCriterion(criterion);
       if (normalized.kind === "in") {
-        if (!normalized.values.some((candidate) => recordValue === candidate))
+        if (!matchesInCriterion(recordValue, normalized.values))
+          return false;
+        continue;
+      }
+      if (normalized.kind === "not-in") {
+        if (!matchesNotInCriterion(recordValue, normalized.values))
           return false;
         continue;
       }
@@ -1255,10 +1263,8 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
     return true;
   }
   async deleteSearch(criteria) {
-    const criteriaKeys = Object.keys(criteria);
-    if (criteriaKeys.length === 0) {
+    if (!this.shouldRunDeleteSearch(criteria))
       return;
-    }
     const db = await this.getDb();
     return new Promise((resolve, reject) => {
       try {
@@ -1348,7 +1354,7 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
     const criterion = criteria[column];
     if (criterion === undefined)
       return;
-    if (isSearchInCondition(criterion))
+    if (isSearchInCondition(criterion) || isSearchNotInCondition(criterion))
       return;
     if (isSearchCondition(criterion)) {
       if (criterion.operator !== "=")
@@ -1503,6 +1509,9 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
     });
     for (const col of picked.keyPath) {
       const criterion = criteria[col];
+      if (isSearchNotInCondition(criterion) && criterion.value.length === 0) {
+        throw new StorageUnsupportedError(`An empty "not-in" criterion on indexed column "${col}" (it matches every ` + `row including null-valued ones, but IndexedDB omits those from an index, ` + `so an index scan can never reach them — use query() instead)`, "IndexedDbTabularStorage");
+      }
       const isNullEquality = isSearchCondition(criterion) ? criterion.operator === "=" && criterion.value === null : criterion === null;
       if (isNullEquality) {
         throw new StorageUnsupportedError(`A null equality criterion on indexed column "${col}" (IndexedDB omits ` + `null-valued records from an index, so an index scan can never reach ` + `them — use query() instead)`, "IndexedDbTabularStorage");
@@ -1518,7 +1527,7 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
         const c = criteria[col];
         if (c === undefined && !(col in criteria))
           break;
-        if (isSearchInCondition(c))
+        if (isSearchInCondition(c) || isSearchNotInCondition(c))
           break;
         if (isSearchCondition(c)) {
           if (c.operator !== "=")
@@ -1527,7 +1536,7 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
             break;
           prefix.push(c.value);
         } else {
-          if (c === null)
+          if (c === null || c === undefined)
             break;
           prefix.push(c);
         }
@@ -1575,7 +1584,7 @@ class IndexedDbTabularStorage extends BaseTabularStorage {
             continue;
           const valFromKey = Array.isArray(key) ? key[pos] : key;
           const normalized = normalizeCriterion(crit);
-          const ok = normalized.kind === "in" ? normalized.values.some((candidate) => valFromKey === candidate) : compareWithOperator(valFromKey, normalized.operator, normalized.value);
+          const ok = normalized.kind === "in" ? matchesInCriterion(valFromKey, normalized.values) : normalized.kind === "not-in" ? matchesNotInCriterion(valFromKey, normalized.values) : compareWithOperator(valFromKey, normalized.operator, normalized.value);
           if (!ok) {
             matches = false;
             break;
@@ -1760,4 +1769,4 @@ export {
   runIndexedDbMigrationGroups
 };
 
-//# debugId=0833B0AFB348CFFE64756E2164756E21
+//# debugId=2B2714B1793C3B3064756E2164756E21