14 files changed, 322 insertions, 300 deletions
diff --git a/packages/idb-bridge/src/util/FakeEvent.ts b/packages/idb-bridge/src/util/FakeEvent.ts
index ae62401c3..4457498f6 100644
--- a/packages/idb-bridge/src/util/FakeEvent.ts
+++ b/packages/idb-bridge/src/util/FakeEvent.ts
@@ -14,67 +14,64 @@
  permissions and limitations under the License.
 */
 
-
 import FakeEventTarget from "./FakeEventTarget";
 import { EventType } from "./types";
 
 export class Event {
-    public eventPath: FakeEventTarget[] = [];
-    public type: EventType;
-
-    public readonly NONE = 0;
-    public readonly CAPTURING_PHASE = 1;
-    public readonly AT_TARGET = 2;
-    public readonly BUBBLING_PHASE = 3;
-
-    // Flags
-    public propagationStopped = false;
-    public immediatePropagationStopped = false;
-    public canceled = false;
-    public initialized = true;
-    public dispatched = false;
-
-    public target: FakeEventTarget | null = null;
-    public currentTarget: FakeEventTarget | null = null;
-
-    public eventPhase: 0 | 1 | 2 | 3 = 0;
-
-    public defaultPrevented = false;
-
-    public isTrusted = false;
-    public timeStamp = Date.now();
-
-    public bubbles: boolean;
-    public cancelable: boolean;
-
-    constructor(
-        type: EventType,
-        eventInitDict: { bubbles?: boolean; cancelable?: boolean } = {},
-    ) {
-        this.type = type;
-
-        this.bubbles =
-            eventInitDict.bubbles !== undefined ? eventInitDict.bubbles : false;
-        this.cancelable =
-            eventInitDict.cancelable !== undefined
-                ? eventInitDict.cancelable
-                : false;
-    }
+  public eventPath: FakeEventTarget[] = [];
+  public type: EventType;
 
-    public preventDefault() {
-        if (this.cancelable) {
-            this.canceled = true;
-        }
-    }
+  public readonly NONE = 0;
+  public readonly CAPTURING_PHASE = 1;
+  public readonly AT_TARGET = 2;
+  public readonly BUBBLING_PHASE = 3;
 
-    public stopPropagation() {
-        this.propagationStopped = true;
-    }
+  // Flags
+  public propagationStopped = false;
+  public immediatePropagationStopped = false;
+  public canceled = false;
+  public initialized = true;
+  public dispatched = false;
+
+  public target: FakeEventTarget | null = null;
+  public currentTarget: FakeEventTarget | null = null;
+
+  public eventPhase: 0 | 1 | 2 | 3 = 0;
+
+  public defaultPrevented = false;
 
-    public stopImmediatePropagation() {
-        this.propagationStopped = true;
-        this.immediatePropagationStopped = true;
+  public isTrusted = false;
+  public timeStamp = Date.now();
+
+  public bubbles: boolean;
+  public cancelable: boolean;
+
+  constructor(
+    type: EventType,
+    eventInitDict: { bubbles?: boolean; cancelable?: boolean } = {},
+  ) {
+    this.type = type;
+
+    this.bubbles =
+      eventInitDict.bubbles !== undefined ? eventInitDict.bubbles : false;
+    this.cancelable =
+      eventInitDict.cancelable !== undefined ? eventInitDict.cancelable : false;
+  }
+
+  public preventDefault() {
+    if (this.cancelable) {
+      this.canceled = true;
     }
+  }
+
+  public stopPropagation() {
+    this.propagationStopped = true;
+  }
+
+  public stopImmediatePropagation() {
+    this.propagationStopped = true;
+    this.immediatePropagationStopped = true;
+  }
 }
 
 export default Event;
diff --git a/packages/idb-bridge/src/util/FakeEventTarget.ts b/packages/idb-bridge/src/util/FakeEventTarget.ts
index 025f21b4c..291eaca7d 100644
--- a/packages/idb-bridge/src/util/FakeEventTarget.ts
+++ b/packages/idb-bridge/src/util/FakeEventTarget.ts
@@ -117,7 +117,7 @@ abstract class FakeEventTarget {
     callback: EventCallback,
     capture = false,
   ) {
-    const i = this.listeners.findIndex(listener => {
+    const i = this.listeners.findIndex((listener) => {
       return (
         listener.type === type &&
         listener.callback === callback &&
diff --git a/packages/idb-bridge/src/util/cmp.ts b/packages/idb-bridge/src/util/cmp.ts
index 9d0dc99a2..ddd43f2a6 100644
--- a/packages/idb-bridge/src/util/cmp.ts
+++ b/packages/idb-bridge/src/util/cmp.ts
@@ -18,91 +18,91 @@ import { DataError } from "./errors";
 import valueToKey from "./valueToKey";
 
 const getType = (x: any) => {
-    if (typeof x === "number") {
-        return "Number";
-    }
-    if (x instanceof Date) {
-        return "Date";
-    }
-    if (Array.isArray(x)) {
-        return "Array";
-    }
-    if (typeof x === "string") {
-        return "String";
-    }
-    if (x instanceof ArrayBuffer) {
-        return "Binary";
-    }
-
-    throw new DataError();
+  if (typeof x === "number") {
+    return "Number";
+  }
+  if (x instanceof Date) {
+    return "Date";
+  }
+  if (Array.isArray(x)) {
+    return "Array";
+  }
+  if (typeof x === "string") {
+    return "String";
+  }
+  if (x instanceof ArrayBuffer) {
+    return "Binary";
+  }
+
+  throw new DataError();
 };
 
 // https://w3c.github.io/IndexedDB/#compare-two-keys
 const compareKeys = (first: any, second: any): -1 | 0 | 1 => {
-    if (second === undefined) {
-        throw new TypeError();
-    }
+  if (second === undefined) {
+    throw new TypeError();
+  }
 
-    first = valueToKey(first);
-    second = valueToKey(second);
-
-    const t1 = getType(first);
-    const t2 = getType(second);
-
-    if (t1 !== t2) {
-        if (t1 === "Array") {
-            return 1;
-        }
-        if (
-            t1 === "Binary" &&
-            (t2 === "String" || t2 === "Date" || t2 === "Number")
-        ) {
-            return 1;
-        }
-        if (t1 === "String" && (t2 === "Date" || t2 === "Number")) {
-            return 1;
-        }
-        if (t1 === "Date" && t2 === "Number") {
-            return 1;
-        }
-        return -1;
-    }
+  first = valueToKey(first);
+  second = valueToKey(second);
 
-    if (t1 === "Binary") {
-        first = new Uint8Array(first);
-        second = new Uint8Array(second);
+  const t1 = getType(first);
+  const t2 = getType(second);
+
+  if (t1 !== t2) {
+    if (t1 === "Array") {
+      return 1;
+    }
+    if (
+      t1 === "Binary" &&
+      (t2 === "String" || t2 === "Date" || t2 === "Number")
+    ) {
+      return 1;
+    }
+    if (t1 === "String" && (t2 === "Date" || t2 === "Number")) {
+      return 1;
+    }
+    if (t1 === "Date" && t2 === "Number") {
+      return 1;
+    }
+    return -1;
+  }
+
+  if (t1 === "Binary") {
+    first = new Uint8Array(first);
+    second = new Uint8Array(second);
+  }
+
+  if (t1 === "Array" || t1 === "Binary") {
+    const length = Math.min(first.length, second.length);
+    for (let i = 0; i < length; i++) {
+      const result = compareKeys(first[i], second[i]);
+
+      if (result !== 0) {
+        return result;
+      }
     }
 
-    if (t1 === "Array" || t1 === "Binary") {
-        const length = Math.min(first.length, second.length);
-        for (let i = 0; i < length; i++) {
-            const result = compareKeys(first[i], second[i]);
-
-            if (result !== 0) {
-                return result;
-            }
-        }
-
-        if (first.length > second.length) {
-            return 1;
-        }
-        if (first.length < second.length) {
-            return -1;
-        }
-        return 0;
+    if (first.length > second.length) {
+      return 1;
+    }
+    if (first.length < second.length) {
+      return -1;
     }
+    return 0;
+  }
 
-    if (t1 === "Date") {
-        if (first.getTime() === second.getTime()) {
-            return 0;
-        }
-    } else {
-        if (first === second) {
-            return 0;
-        }
+  if (t1 === "Date") {
+    if (first.getTime() === second.getTime()) {
+      return 0;
+    }
+  } else {
+    if (first === second) {
+      return 0;
     }
+  }
 
-    return first > second ? 1 : -1;
+  return first > second ? 1 : -1;
 };
 
 export default compareKeys;
diff --git a/packages/idb-bridge/src/util/enforceRange.ts b/packages/idb-bridge/src/util/enforceRange.ts
index 9ac472757..87e135798 100644
--- a/packages/idb-bridge/src/util/enforceRange.ts
+++ b/packages/idb-bridge/src/util/enforceRange.ts
@@ -18,18 +18,18 @@
 // https://heycam.github.io/webidl/#EnforceRange
 
 const enforceRange = (
-    num: number,
-    type: "MAX_SAFE_INTEGER" | "unsigned long",
+  num: number,
+  type: "MAX_SAFE_INTEGER" | "unsigned long",
 ) => {
-    const min = 0;
-    const max = type === "unsigned long" ? 4294967295 : 9007199254740991;
+  const min = 0;
+  const max = type === "unsigned long" ? 4294967295 : 9007199254740991;
 
-    if (isNaN(num) || num < min || num > max) {
-        throw new TypeError();
-    }
-    if (num >= 0) {
-        return Math.floor(num);
-    }
+  if (isNaN(num) || num < min || num > max) {
+    throw new TypeError();
+  }
+  if (num >= 0) {
+    return Math.floor(num);
+  }
 };
 
 export default enforceRange;
diff --git a/packages/idb-bridge/src/util/errors.ts b/packages/idb-bridge/src/util/errors.ts
index 92de2ea90..6c8f81811 100644
--- a/packages/idb-bridge/src/util/errors.ts
+++ b/packages/idb-bridge/src/util/errors.ts
@@ -14,117 +14,116 @@
  permissions and limitations under the License.
  */
 
-
 /* tslint:disable: max-classes-per-file max-line-length */
 
 const messages = {
-    AbortError:
-        "A request was aborted, for example through a call to IDBTransaction.abort.",
-    ConstraintError:
-        "A mutation operation in the transaction failed because a constraint was not satisfied. For example, an object such as an object store or index already exists and a request attempted to create a new one.",
-    DataCloneError:
-        "The data being stored could not be cloned by the internal structured cloning algorithm.",
-    DataError: "Data provided to an operation does not meet requirements.",
-    InvalidAccessError:
-        "An invalid operation was performed on an object. For example transaction creation attempt was made, but an empty scope was provided.",
-    InvalidStateError:
-        "An operation was called on an object on which it is not allowed or at a time when it is not allowed. Also occurs if a request is made on a source object that has been deleted or removed. Use TransactionInactiveError or ReadOnlyError when possible, as they are more specific variations of InvalidStateError.",
-    NotFoundError:
-        "The operation failed because the requested database object could not be found. For example, an object store did not exist but was being opened.",
-    ReadOnlyError:
-        'The mutating operation was attempted in a "readonly" transaction.',
-    TransactionInactiveError:
-        "A request was placed against a transaction which is currently not active, or which is finished.",
-    VersionError:
-        "An attempt was made to open a database using a lower version than the existing version.",
+  AbortError:
+    "A request was aborted, for example through a call to IDBTransaction.abort.",
+  ConstraintError:
+    "A mutation operation in the transaction failed because a constraint was not satisfied. For example, an object such as an object store or index already exists and a request attempted to create a new one.",
+  DataCloneError:
+    "The data being stored could not be cloned by the internal structured cloning algorithm.",
+  DataError: "Data provided to an operation does not meet requirements.",
+  InvalidAccessError:
+    "An invalid operation was performed on an object. For example transaction creation attempt was made, but an empty scope was provided.",
+  InvalidStateError:
+    "An operation was called on an object on which it is not allowed or at a time when it is not allowed. Also occurs if a request is made on a source object that has been deleted or removed. Use TransactionInactiveError or ReadOnlyError when possible, as they are more specific variations of InvalidStateError.",
+  NotFoundError:
+    "The operation failed because the requested database object could not be found. For example, an object store did not exist but was being opened.",
+  ReadOnlyError:
+    'The mutating operation was attempted in a "readonly" transaction.',
+  TransactionInactiveError:
+    "A request was placed against a transaction which is currently not active, or which is finished.",
+  VersionError:
+    "An attempt was made to open a database using a lower version than the existing version.",
 };
 
 export class AbortError extends Error {
-    constructor(message = messages.AbortError) {
-        super();
-        Object.setPrototypeOf(this, ConstraintError.prototype);
-        this.name = "AbortError";
-        this.message = message;
-    }
+  constructor(message = messages.AbortError) {
+    super();
+    Object.setPrototypeOf(this, ConstraintError.prototype);
+    this.name = "AbortError";
+    this.message = message;
+  }
 }
 
 export class ConstraintError extends Error {
-    constructor(message = messages.ConstraintError) {
-        super();
-        Object.setPrototypeOf(this, ConstraintError.prototype);
-        this.name = "ConstraintError";
-        this.message = message;
-    }
+  constructor(message = messages.ConstraintError) {
+    super();
+    Object.setPrototypeOf(this, ConstraintError.prototype);
+    this.name = "ConstraintError";
+    this.message = message;
+  }
 }
 
 export class DataCloneError extends Error {
-    constructor(message = messages.DataCloneError) {
-        super();
-        Object.setPrototypeOf(this, DataCloneError.prototype);
-        this.name = "DataCloneError";
-        this.message = message;
-    }
+  constructor(message = messages.DataCloneError) {
+    super();
+    Object.setPrototypeOf(this, DataCloneError.prototype);
+    this.name = "DataCloneError";
+    this.message = message;
+  }
 }
 
 export class DataError extends Error {
-    constructor(message = messages.DataError) {
-        super();
-        Object.setPrototypeOf(this, DataError.prototype);
-        this.name = "DataError";
-        this.message = message;
-    }
+  constructor(message = messages.DataError) {
+    super();
+    Object.setPrototypeOf(this, DataError.prototype);
+    this.name = "DataError";
+    this.message = message;
+  }
 }
 
 export class InvalidAccessError extends Error {
-    constructor(message = messages.InvalidAccessError) {
-        super();
-        Object.setPrototypeOf(this, InvalidAccessError.prototype);
-        this.name = "InvalidAccessError";
-        this.message = message;
-    }
+  constructor(message = messages.InvalidAccessError) {
+    super();
+    Object.setPrototypeOf(this, InvalidAccessError.prototype);
+    this.name = "InvalidAccessError";
+    this.message = message;
+  }
 }
 
 export class InvalidStateError extends Error {
-    constructor(message = messages.InvalidStateError) {
-        super();
-        Object.setPrototypeOf(this, InvalidStateError.prototype);
-        this.name = "InvalidStateError";
-        this.message = message;
-    }
+  constructor(message = messages.InvalidStateError) {
+    super();
+    Object.setPrototypeOf(this, InvalidStateError.prototype);
+    this.name = "InvalidStateError";
+    this.message = message;
+  }
 }
 
 export class NotFoundError extends Error {
-    constructor(message = messages.NotFoundError) {
-        super();
-        Object.setPrototypeOf(this, NotFoundError.prototype);
-        this.name = "NotFoundError";
-        this.message = message;
-    }
+  constructor(message = messages.NotFoundError) {
+    super();
+    Object.setPrototypeOf(this, NotFoundError.prototype);
+    this.name = "NotFoundError";
+    this.message = message;
+  }
 }
 
 export class ReadOnlyError extends Error {
-    constructor(message = messages.ReadOnlyError) {
-        super();
-        Object.setPrototypeOf(this, ReadOnlyError.prototype);
-        this.name = "ReadOnlyError";
-        this.message = message;
-    }
+  constructor(message = messages.ReadOnlyError) {
+    super();
+    Object.setPrototypeOf(this, ReadOnlyError.prototype);
+    this.name = "ReadOnlyError";
+    this.message = message;
+  }
 }
 
 export class TransactionInactiveError extends Error {
-    constructor(message = messages.TransactionInactiveError) {
-        super();
-        Object.setPrototypeOf(this, TransactionInactiveError.prototype);
-        this.name = "TransactionInactiveError";
-        this.message = message;
-    }
+  constructor(message = messages.TransactionInactiveError) {
+    super();
+    Object.setPrototypeOf(this, TransactionInactiveError.prototype);
+    this.name = "TransactionInactiveError";
+    this.message = message;
+  }
 }
 
 export class VersionError extends Error {
-    constructor(message = messages.VersionError) {
-        super();
-        Object.setPrototypeOf(this, VersionError.prototype);
-        this.name = "VersionError";
-        this.message = message;
-    }
+  constructor(message = messages.VersionError) {
+    super();
+    Object.setPrototypeOf(this, VersionError.prototype);
+    this.name = "VersionError";
+    this.message = message;
+  }
 }
diff --git a/packages/idb-bridge/src/util/getIndexKeys.test.ts b/packages/idb-bridge/src/util/getIndexKeys.test.ts
index b9cdc769d..782b3da2f 100644
--- a/packages/idb-bridge/src/util/getIndexKeys.test.ts
+++ b/packages/idb-bridge/src/util/getIndexKeys.test.ts
@@ -19,23 +19,31 @@ import test from "ava";
 import { getIndexKeys } from "./getIndexKeys";
 
 test("basics", (t) => {
-  t.deepEqual(getIndexKeys({foo: 42}, "foo", false), [42]);
-  t.deepEqual(getIndexKeys({foo: {bar: 42}}, "foo.bar", false), [42]);
-  t.deepEqual(getIndexKeys({foo: [42, 43]}, "foo.0", false), [42]);
-  t.deepEqual(getIndexKeys({foo: [42, 43]}, "foo.1", false), [43]);
+  t.deepEqual(getIndexKeys({ foo: 42 }, "foo", false), [42]);
+  t.deepEqual(getIndexKeys({ foo: { bar: 42 } }, "foo.bar", false), [42]);
+  t.deepEqual(getIndexKeys({ foo: [42, 43] }, "foo.0", false), [42]);
+  t.deepEqual(getIndexKeys({ foo: [42, 43] }, "foo.1", false), [43]);
 
   t.deepEqual(getIndexKeys([1, 2, 3], "", false), [[1, 2, 3]]);
 
   t.throws(() => {
-    getIndexKeys({foo: 42}, "foo.bar", false);
+    getIndexKeys({ foo: 42 }, "foo.bar", false);
   });
 
-  t.deepEqual(getIndexKeys({foo: 42}, "foo", true), [42]);
-  t.deepEqual(getIndexKeys({foo: 42, bar: 10}, ["foo", "bar"], true), [42, 10]);
-  t.deepEqual(getIndexKeys({foo: 42, bar: 10}, ["foo", "bar"], false), [[42, 10]]);
-  t.deepEqual(getIndexKeys({foo: 42, bar: 10}, ["foo", "bar", "spam"], true), [42, 10]);
+  t.deepEqual(getIndexKeys({ foo: 42 }, "foo", true), [42]);
+  t.deepEqual(getIndexKeys({ foo: 42, bar: 10 }, ["foo", "bar"], true), [
+    42,
+    10,
+  ]);
+  t.deepEqual(getIndexKeys({ foo: 42, bar: 10 }, ["foo", "bar"], false), [
+    [42, 10],
+  ]);
+  t.deepEqual(
+    getIndexKeys({ foo: 42, bar: 10 }, ["foo", "bar", "spam"], true),
+    [42, 10],
+  );
 
   t.throws(() => {
-    getIndexKeys({foo: 42, bar: 10}, ["foo", "bar", "spam"], false);
+    getIndexKeys({ foo: 42, bar: 10 }, ["foo", "bar", "spam"], false);
   });
 });
diff --git a/packages/idb-bridge/src/util/injectKey.ts b/packages/idb-bridge/src/util/injectKey.ts
index 78d0c217e..38add33bd 100644
--- a/packages/idb-bridge/src/util/injectKey.ts
+++ b/packages/idb-bridge/src/util/injectKey.ts
@@ -62,4 +62,4 @@ export function injectKey(keyPath: KeyPath, value: Value, key: Key): Value {
   return newValue;
 }
 
-export default injectKey;
-\ No newline at end of file
+export default injectKey;
diff --git a/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts b/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts
index ecbae6508..df9748316 100644
--- a/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts
+++ b/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts
@@ -14,7 +14,7 @@
  permissions and limitations under the License.
 */
 
-import test from 'ava';
+import test from "ava";
 import { makeStoreKeyValue } from "./makeStoreKeyValue";
 
 test("basics", (t) => {
@@ -26,19 +26,37 @@ test("basics", (t) => {
   t.is(result.value.name, "Florian");
   t.is(result.value.id, 42);
 
-  result = makeStoreKeyValue({ name: "Florian", id: 10 }, undefined, 5, true, "id");
+  result = makeStoreKeyValue(
+    { name: "Florian", id: 10 },
+    undefined,
+    5,
+    true,
+    "id",
+  );
   t.is(result.updatedKeyGenerator, 11);
   t.is(result.key, 10);
   t.is(result.value.name, "Florian");
   t.is(result.value.id, 10);
 
-  result = makeStoreKeyValue({ name: "Florian", id: 5 }, undefined, 10, true, "id");
+  result = makeStoreKeyValue(
+    { name: "Florian", id: 5 },
+    undefined,
+    10,
+    true,
+    "id",
+  );
   t.is(result.updatedKeyGenerator, 10);
   t.is(result.key, 5);
   t.is(result.value.name, "Florian");
   t.is(result.value.id, 5);
 
-  result = makeStoreKeyValue({ name: "Florian", id: "foo" }, undefined, 10, true, "id");
+  result = makeStoreKeyValue(
+    { name: "Florian", id: "foo" },
+    undefined,
+    10,
+    true,
+    "id",
+  );
   t.is(result.updatedKeyGenerator, 10);
   t.is(result.key, "foo");
   t.is(result.value.name, "Florian");
diff --git a/packages/idb-bridge/src/util/makeStoreKeyValue.ts b/packages/idb-bridge/src/util/makeStoreKeyValue.ts
index 9b33158dd..f9006ef51 100644
--- a/packages/idb-bridge/src/util/makeStoreKeyValue.ts
+++ b/packages/idb-bridge/src/util/makeStoreKeyValue.ts
@@ -14,7 +14,6 @@
  permissions and limitations under the License.
 */
 
-
 import { Value, Key, KeyPath } from "./types";
 import extractKey from "./extractKey";
 import { DataError } from "./errors";
@@ -93,7 +92,7 @@ export function makeStoreKeyValue(
           key: key,
           value: value,
           updatedKeyGenerator,
-        }
+        };
       } else {
         // (no, yes, no)
         key = extractKey(keyPath!, value);
@@ -111,7 +110,7 @@ export function makeStoreKeyValue(
           key: currentKeyGenerator,
           value: value,
           updatedKeyGenerator: currentKeyGenerator + 1,
-        }
+        };
       } else {
         // (no, no, no)
         throw new DataError();
diff --git a/packages/idb-bridge/src/util/queueTask.ts b/packages/idb-bridge/src/util/queueTask.ts
index 7d59c2263..53563ffd2 100644
--- a/packages/idb-bridge/src/util/queueTask.ts
+++ b/packages/idb-bridge/src/util/queueTask.ts
@@ -14,8 +14,8 @@
   permissions and limitations under the License.
  */
 
- export function queueTask(fn: () => void) {
-   setImmediate(fn);
- }
+export function queueTask(fn: () => void) {
+  setImmediate(fn);
+}
 
- export default queueTask;
-\ No newline at end of file
+export default queueTask;
diff --git a/packages/idb-bridge/src/util/structuredClone.ts b/packages/idb-bridge/src/util/structuredClone.ts
index 165ed2f32..c49d0377f 100644
--- a/packages/idb-bridge/src/util/structuredClone.ts
+++ b/packages/idb-bridge/src/util/structuredClone.ts
@@ -14,7 +14,6 @@
  permissions and limitations under the License.
 */
 
-
 function structuredCloneImpl(val: any, visited: WeakMap<any, boolean>): any {
   // FIXME: replace with real implementation!
   return JSON.parse(JSON.stringify(val));
@@ -28,4 +27,4 @@ export function structuredClone(val: any): any {
   return structuredCloneImpl(val, visited);
 }
 
-export default structuredClone;
-\ No newline at end of file
+export default structuredClone;
diff --git a/packages/idb-bridge/src/util/types.ts b/packages/idb-bridge/src/util/types.ts
index 9bf80366d..b0142b0d8 100644
--- a/packages/idb-bridge/src/util/types.ts
+++ b/packages/idb-bridge/src/util/types.ts
@@ -15,11 +15,11 @@
  permissions and limitations under the License.
 */
 
-import BridgeIDBRequest from "../BridgeIDBRequest";
-import BridgeIDBKeyRange from "../BridgeIDBKeyRange";
-import BridgeIDBIndex from "../BridgeIDBIndex";
-import BridgeIBObjectStore from "../BridgeIDBObjectStore";
+import { BridgeIDBRequest } from "../BridgeIDBRequest";
+import { BridgeIDBKeyRange } from "../BridgeIDBKeyRange";
+import { BridgeIDBIndex } from "../BridgeIDBIndex";
 import { Event } from "../util/FakeEvent";
+import { BridgeIDBObjectStore } from "../BridgeIDBObjectStore";
 
 interface EventInCallback extends Event {
   target: any;
@@ -37,15 +37,18 @@ export type EventType =
   | "upgradeneeded"
   | "versionchange";
 
-export type CursorSource = BridgeIDBIndex | BridgeIBObjectStore;
-
+export type CursorSource = BridgeIDBIndex | BridgeIDBObjectStore;
 
 export interface FakeDOMStringList extends Array<string> {
   contains: (value: string) => boolean;
   item: (i: number) => string | undefined;
 }
 
-export type BridgeIDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";
+export type BridgeIDBCursorDirection =
+  | "next"
+  | "nextunique"
+  | "prev"
+  | "prevunique";
 
 export type KeyPath = string | string[];
 
@@ -64,8 +67,8 @@ export type TransactionMode = "readonly" | "readwrite" | "versionchange";
 
 export interface BridgeIDBDatabaseInfo {
   name: string;
-  version: number
-};
+  version: number;
+}
 
 export interface RequestObj {
   operation: () => Promise<any>;
diff --git a/packages/idb-bridge/src/util/validateKeyPath.ts b/packages/idb-bridge/src/util/validateKeyPath.ts
index 18552a5d4..072832190 100644
--- a/packages/idb-bridge/src/util/validateKeyPath.ts
+++ b/packages/idb-bridge/src/util/validateKeyPath.ts
@@ -18,60 +18,60 @@ import { KeyPath } from "./types";
 
 // http://www.w3.org/TR/2015/REC-IndexedDB-20150108/#dfn-valid-key-path
 const validateKeyPath = (keyPath: KeyPath, parent?: "array" | "string") => {
-    // This doesn't make sense to me based on the spec, but it is needed to pass the W3C KeyPath tests (see same
-    // comment in extractKey)
-    if (
-        keyPath !== undefined &&
-        keyPath !== null &&
-        typeof keyPath !== "string" &&
-        keyPath.toString &&
-        (parent === "array" || !Array.isArray(keyPath))
-    ) {
-        keyPath = keyPath.toString();
-    }
+  // This doesn't make sense to me based on the spec, but it is needed to pass the W3C KeyPath tests (see same
+  // comment in extractKey)
+  if (
+    keyPath !== undefined &&
+    keyPath !== null &&
+    typeof keyPath !== "string" &&
+    keyPath.toString &&
+    (parent === "array" || !Array.isArray(keyPath))
+  ) {
+    keyPath = keyPath.toString();
+  }
 
-    if (typeof keyPath === "string") {
-        if (keyPath === "" && parent !== "string") {
-            return;
-        }
-        try {
-            // https://mathiasbynens.be/demo/javascript-identifier-regex for ECMAScript 5.1 / Unicode v7.0.0, with
-            // reserved words at beginning removed
-            // tslint:disable-next-line max-line-length
-            const validIdentifierRegex = /^(?:[\$A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC])(?:[\$0-9A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC])*$/;
-            if (keyPath.length >= 1 && validIdentifierRegex.test(keyPath)) {
-                return;
-            }
-        } catch (err) {
-            throw new SyntaxError(err.message);
-        }
-        if (keyPath.indexOf(" ") >= 0) {
-            throw new SyntaxError(
-                "The keypath argument contains an invalid key path (no spaces allowed).",
-            );
-        }
+  if (typeof keyPath === "string") {
+    if (keyPath === "" && parent !== "string") {
+      return;
     }
-
-    if (Array.isArray(keyPath) && keyPath.length > 0) {
-        if (parent) {
-            // No nested arrays
-            throw new SyntaxError(
-                "The keypath argument contains an invalid key path (nested arrays).",
-            );
-        }
-        for (const part of keyPath) {
-            validateKeyPath(part, "array");
-        }
-        return;
-    } else if (typeof keyPath === "string" && keyPath.indexOf(".") >= 0) {
-        keyPath = keyPath.split(".");
-        for (const part of keyPath) {
-            validateKeyPath(part, "string");
-        }
+    try {
+      // https://mathiasbynens.be/demo/javascript-identifier-regex for ECMAScript 5.1 / Unicode v7.0.0, with
+      // reserved words at beginning removed
+      // tslint:disable-next-line max-line-length
+      const validIdentifierRegex = /^(?:[\$A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC])(?:[\$0-9A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC])*$/;
+      if (keyPath.length >= 1 && validIdentifierRegex.test(keyPath)) {
         return;
+      }
+    } catch (err) {
+      throw new SyntaxError(err.message);
+    }
+    if (keyPath.indexOf(" ") >= 0) {
+      throw new SyntaxError(
+        "The keypath argument contains an invalid key path (no spaces allowed).",
+      );
+    }
+  }
+
+  if (Array.isArray(keyPath) && keyPath.length > 0) {
+    if (parent) {
+      // No nested arrays
+      throw new SyntaxError(
+        "The keypath argument contains an invalid key path (nested arrays).",
+      );
+    }
+    for (const part of keyPath) {
+      validateKeyPath(part, "array");
+    }
+    return;
+  } else if (typeof keyPath === "string" && keyPath.indexOf(".") >= 0) {
+    keyPath = keyPath.split(".");
+    for (const part of keyPath) {
+      validateKeyPath(part, "string");
     }
+    return;
+  }
 
-    throw new SyntaxError();
+  throw new SyntaxError();
 };
 
 export default validateKeyPath;
diff --git a/packages/idb-bridge/src/util/valueToKey.ts b/packages/idb-bridge/src/util/valueToKey.ts
index 85c8c409f..5cf5b2b1b 100644
--- a/packages/idb-bridge/src/util/valueToKey.ts
+++ b/packages/idb-bridge/src/util/valueToKey.ts
@@ -62,7 +62,6 @@ function valueToKey(input: any, seen?: Set<object>): Key | Key[] {
     }
     return keys;
   } else {
-    
     throw new DataError();
   }
 }