Drop structuredClone polyfill and support for Node 16

dumbmatter · Oct 13, 2023 · 81291cd · 81291cd
1 parent 92256e5
commit 81291cd
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.0.0 ()
+
+- Dropped support for Node.js 16, which allows me to get rid of the structuredClone polyfill, which reduces the package size by roughly 50%.
+
 # 4.0.2 (2023-07-14)
 
 - #84 - Fix the TypeScript types in some situations.

diff --git a/package.json b/package.json
@@ -107,8 +107,8 @@
         "lib",
         "types.d.ts"
     ],
-    "dependencies": {
-        "realistic-structured-clone": "^3.0.0"
+    "engines": {
+        "node": ">=18"
     },
     "devDependencies": {
         "@babel/cli": "^7.18.6",

diff --git a/src/FDBCursor.ts b/src/FDBCursor.ts
@@ -10,7 +10,6 @@ import {
     TransactionInactiveError,
 } from "./lib/errors.js";
 import extractKey from "./lib/extractKey.js";
-import structuredClone from "./lib/structuredClone.js";
 import {
     CursorRange,
     CursorSource,
@@ -34,7 +33,7 @@ const getEffectiveObjectStore = (cursor: FDBCursor) => {
 const makeKeyRange = (
     range: FDBKeyRange,
     lowers: (Key | undefined)[],
-    uppers: (Key | undefined)[],
+    uppers: (Key | undefined)[]
 ) => {
     // Start with bounds from range
     let lower = range !== undefined ? range.lower : undefined;
@@ -91,7 +90,7 @@ class FDBCursor {
         range: CursorRange,
         direction: FDBCursorDirection = "next",
         request?: FDBRequest,
-        keyOnly: boolean = false,
+        keyOnly: boolean = false
     ) {
         this._range = range;
         this._source = source;
@@ -335,7 +334,7 @@ class FDBCursor {
                     }
                     const value =
                         this.source.objectStore._rawObjectStore.getValue(
-                            foundRecord.value,
+                            foundRecord.value
                         );
                     (this as any).value = structuredClone(value);
                 }
@@ -407,7 +406,7 @@ class FDBCursor {
                 effectiveObjectStore._rawObjectStore,
                 record,
                 false,
-                transaction._rollbackLog,
+                transaction._rollbackLog
             ),
             source: this,
         });
@@ -613,7 +612,7 @@ class FDBCursor {
             operation: effectiveObjectStore._rawObjectStore.deleteRecord.bind(
                 effectiveObjectStore._rawObjectStore,
                 effectiveKey,
-                transaction._rollbackLog,
+                transaction._rollbackLog
             ),
             source: this,
         });

diff --git a/src/FDBObjectStore.ts b/src/FDBObjectStore.ts
@@ -19,7 +19,6 @@ import extractKey from "./lib/extractKey.js";
 import FakeDOMStringList from "./lib/FakeDOMStringList.js";
 import Index from "./lib/Index.js";
 import ObjectStore from "./lib/ObjectStore.js";
-import structuredClone from "./lib/structuredClone.js";
 import { FDBCursorDirection, Key, KeyPath, Value } from "./lib/types.js";
 import validateKeyPath from "./lib/validateKeyPath.js";
 import valueToKey from "./lib/valueToKey.js";
@@ -38,7 +37,7 @@ const confirmActiveTransaction = (objectStore: FDBObjectStore) => {
 const buildRecordAddPut = (
     objectStore: FDBObjectStore,
     value: Value,
-    key: Key,
+    key: Key
 ) => {
     confirmActiveTransaction(objectStore);
 
@@ -106,7 +105,7 @@ class FDBObjectStore {
         this.autoIncrement = rawObjectStore.autoIncrement;
         this.transaction = transaction;
         this.indexNames = new FakeDOMStringList(
-            ...Array.from(rawObjectStore.rawIndexes.keys()).sort(),
+            ...Array.from(rawObjectStore.rawIndexes.keys()).sort()
         );
     }
 
@@ -144,20 +143,20 @@ class FDBObjectStore {
         this._rawObjectStore.rawDatabase.rawObjectStores.delete(oldName);
         this._rawObjectStore.rawDatabase.rawObjectStores.set(
             name,
-            this._rawObjectStore,
+            this._rawObjectStore
         );
         transaction.db.objectStoreNames = new FakeDOMStringList(
             ...Array.from(
-                this._rawObjectStore.rawDatabase.rawObjectStores.keys(),
+                this._rawObjectStore.rawDatabase.rawObjectStores.keys()
             )
                 .filter((objectStoreName) => {
                     const objectStore =
                         this._rawObjectStore.rawDatabase.rawObjectStores.get(
-                            objectStoreName,
+                            objectStoreName
                         );
                     return objectStore && !objectStore.deleted;
                 })
-                .sort(),
+                .sort()
         );
 
         const oldScope = new Set(transaction._scope);
@@ -167,7 +166,7 @@ class FDBObjectStore {
         this.transaction._scope.delete(oldName);
         transaction._scope.add(name);
         transaction.objectStoreNames = new FakeDOMStringList(
-            ...Array.from(transaction._scope).sort(),
+            ...Array.from(transaction._scope).sort()
         );
 
         transaction._rollbackLog.push(() => {
@@ -178,15 +177,15 @@ class FDBObjectStore {
             this._rawObjectStore.rawDatabase.rawObjectStores.delete(name);
             this._rawObjectStore.rawDatabase.rawObjectStores.set(
                 oldName,
-                this._rawObjectStore,
+                this._rawObjectStore
             );
             transaction.db.objectStoreNames = new FakeDOMStringList(
-                ...oldObjectStoreNames,
+                ...oldObjectStoreNames
             );
 
             transaction._scope = oldScope;
             transaction.objectStoreNames = new FakeDOMStringList(
-                ...oldTransactionObjectStoreNames,
+                ...oldTransactionObjectStoreNames
             );
         });
     }
@@ -202,7 +201,7 @@ class FDBObjectStore {
                 this._rawObjectStore,
                 record,
                 false,
-                this.transaction._rollbackLog,
+                this.transaction._rollbackLog
             ),
             source: this,
         });
@@ -219,7 +218,7 @@ class FDBObjectStore {
                 this._rawObjectStore,
                 record,
                 true,
-                this.transaction._rollbackLog,
+                this.transaction._rollbackLog
             ),
             source: this,
         });
@@ -243,7 +242,7 @@ class FDBObjectStore {
             operation: this._rawObjectStore.deleteRecord.bind(
                 this._rawObjectStore,
                 key,
-                this.transaction._rollbackLog,
+                this.transaction._rollbackLog
             ),
             source: this,
         });
@@ -262,7 +261,7 @@ class FDBObjectStore {
         return this.transaction._execRequestAsync({
             operation: this._rawObjectStore.getValue.bind(
                 this._rawObjectStore,
-                key,
+                key
             ),
             source: this,
         });
@@ -281,7 +280,7 @@ class FDBObjectStore {
             operation: this._rawObjectStore.getAllValues.bind(
                 this._rawObjectStore,
                 range,
-                count,
+                count
             ),
             source: this,
         });
@@ -301,7 +300,7 @@ class FDBObjectStore {
         return this.transaction._execRequestAsync({
             operation: this._rawObjectStore.getKey.bind(
                 this._rawObjectStore,
-                key,
+                key
             ),
             source: this,
         });
@@ -320,7 +319,7 @@ class FDBObjectStore {
             operation: this._rawObjectStore.getAllKeys.bind(
                 this._rawObjectStore,
                 range,
-                count,
+                count
             ),
             source: this,
         });
@@ -336,15 +335,15 @@ class FDBObjectStore {
         return this.transaction._execRequestAsync({
             operation: this._rawObjectStore.clear.bind(
                 this._rawObjectStore,
-                this.transaction._rollbackLog,
+                this.transaction._rollbackLog
             ),
             source: this,
         });
     }
 
     public openCursor(
         range?: FDBKeyRange | Key,
-        direction?: FDBCursorDirection,
+        direction?: FDBCursorDirection
     ) {
         confirmActiveTransaction(this);
 
@@ -370,7 +369,7 @@ class FDBObjectStore {
 
     public openKeyCursor(
         range?: FDBKeyRange | Key,
-        direction?: FDBCursorDirection,
+        direction?: FDBCursorDirection
     ) {
         confirmActiveTransaction(this);
 
@@ -399,7 +398,7 @@ class FDBObjectStore {
     public createIndex(
         name: string,
         keyPath: KeyPath,
-        optionalParameters: { multiEntry?: boolean; unique?: boolean } = {},
+        optionalParameters: { multiEntry?: boolean; unique?: boolean } = {}
     ) {
         if (arguments.length < 2) {
             throw new TypeError();
@@ -453,7 +452,7 @@ class FDBObjectStore {
             name,
             keyPath,
             multiEntry,
-            unique,
+            unique
         );
         this.indexNames._push(name);
         this.indexNames._sort();
@@ -519,7 +518,7 @@ class FDBObjectStore {
         this.indexNames = new FakeDOMStringList(
             ...Array.from(this.indexNames).filter((indexName) => {
                 return indexName !== name;
-            }),
+            })
         );
         rawIndex.deleted = true; // Not sure if this is supposed to happen synchronously
 

diff --git a/src/lib/Index.ts b/src/lib/Index.ts
@@ -4,7 +4,6 @@ import { ConstraintError } from "./errors.js";
 import extractKey from "./extractKey.js";
 import ObjectStore from "./ObjectStore.js";
 import RecordStore from "./RecordStore.js";
-import structuredClone from "./structuredClone.js";
 import { Key, KeyPath, Record } from "./types.js";
 import valueToKey from "./valueToKey.js";
 
@@ -26,7 +25,7 @@ class Index {
         name: string,
         keyPath: KeyPath,
         multiEntry: boolean,
-        unique: boolean,
+        unique: boolean
     ) {
         this.rawObjectStore = rawObjectStore;
 

diff --git a/src/lib/ObjectStore.ts b/src/lib/ObjectStore.ts
@@ -5,7 +5,6 @@ import extractKey from "./extractKey.js";
 import Index from "./Index.js";
 import KeyGenerator from "./KeyGenerator.js";
 import RecordStore from "./RecordStore.js";
-import structuredClone from "./structuredClone.js";
 import { Key, KeyPath, Record, RollbackLog } from "./types.js";
 
 // http://www.w3.org/TR/2015/REC-IndexedDB-20150108/#dfn-object-store
@@ -23,7 +22,7 @@ class ObjectStore {
         rawDatabase: Database,
         name: string,
         keyPath: KeyPath | null,
-        autoIncrement: boolean,
+        autoIncrement: boolean
     ) {
         this.rawDatabase = rawDatabase;
         this.keyGenerator = autoIncrement === true ? new KeyGenerator() : null;
@@ -86,7 +85,7 @@ class ObjectStore {
     public storeRecord(
         newRecord: Record,
         noOverwrite: boolean,
-        rollbackLog?: RollbackLog,
+        rollbackLog?: RollbackLog
     ) {
         if (this.keyPath !== null) {
             const key = extractKey(this.keyPath, newRecord.value);
@@ -112,7 +111,7 @@ class ObjectStore {
             if (this.keyPath !== null) {
                 if (Array.isArray(this.keyPath)) {
                     throw new Error(
-                        "Cannot have an array key path in an object store with a key generator",
+                        "Cannot have an array key path in an object store with a key generator"
                     );
                 }
                 let remainingKeyPath = this.keyPath;

diff --git a/src/lib/extractKey.ts b/src/lib/extractKey.ts
@@ -1,4 +1,3 @@
-import structuredClone from "./structuredClone.js";
 import { Key, KeyPath, Value } from "./types.js";
 import valueToKey from "./valueToKey.js";
 

diff --git a/src/lib/structuredClone.ts b/src/lib/structuredClone.ts