WIP

Author: CMCDragonkai

src/DB.ts

@@ -473,8 +473,17 @@ class DB {
       options.lt = levelKeyEnd;
     }
     const iterator = db.iterator(options);
+    const seek = iterator.seek.bind(iterator);
     const next = iterator.next.bind(iterator);
     // @ts-ignore AbstractIterator type is outdated
+    iterator.seek = (k: Buffer | string): void => {
+      seek(
+        utils.keyPathToKey(
+          [...levelPath, k] as unknown as KeyPath
+        )
+      );
+    };
+    // @ts-ignore AbstractIterator type is outdated
     iterator.next = async () => {
       const kv = await next();
       // If kv is undefined, we have reached the end of iteration

src/DBTransaction.ts

@@ -115,20 +115,14 @@ class DBTransaction {
     if (utils.checkSepKeyPath(keyPath as KeyPath)) {
       throw new errors.ErrorDBLevelSep();
     }
-    let value: T | undefined;
-    try {
-      value = await this.db._get<T>(
-        [...this.transactionPath, ...keyPath] as unknown as KeyPath,
-        raw as any
-      );
-    } catch (e) {
-      if (e.notFound) {
-        value = await this.db.get<T>(keyPath, raw as any);
-        // Don't set it in the transaction DB
-        // Because this is not a repeatable-read "snapshot"
-      } else {
-        throw e;
-      }
+    let value = await this.db._get<T>(
+      [...this.transactionPath, ...keyPath] as unknown as KeyPath,
+      raw as any
+    );
+    if (value === undefined) {
+      value = await this.db.get<T>(keyPath, raw as any);
+      // Don't set it in the transaction DB
+      // Because this is not a repeatable-read "snapshot"
     }
     return value;
   }
@@ -204,7 +198,7 @@ class DBTransaction {
         keyAsBuffer: true,
         valueAsBuffer: true
       },
-      ['data']
+      ['data', ...levelPath]
     );
     const tranIterator = this.db._iterator(
       this.db.db,
@@ -214,13 +208,13 @@ class DBTransaction {
         keyAsBuffer: true,
         valueAsBuffer: true
       },
-      this.transactionPath,
+      [...this.transactionPath, ...levelPath],
     );
     const order = options?.reverse ? 'desc' : 'asc';
     const iterator = {
       _ended: false,
       _nexting: false,
-      seek: (k: Buffer | string) => {
+      seek: (k: Buffer | string): void => {
         if (iterator._ended) {
           throw new Error('cannot call seek() after end()');
         }
@@ -233,7 +227,7 @@ class DBTransaction {
         dataIterator.seek(k);
         tranIterator.seek(k);
       },
-      end: async () => {
+      end: async (): Promise<void> => {
         if (iterator._ended) {
           throw new Error('end() already called on iterator');
         }