support Date in option.expires

idleberg · Aug 8, 2024 · 841ba3f · 841ba3f
1 parent fa3ce96
commit 841ba3f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/porridge-db.ts b/src/porridge-db.ts
@@ -80,7 +80,9 @@ export class PorridgeDB {
 		};
 
 		if (options?.expires && String(options.expires).length) {
-			newValue[storageKeys.expires] = new Date(options.expires);
+			newValue[storageKeys.expires] = options.expires instanceof Date
+				? options.expires
+				: new Date(options.expires);
 		}
 
 		eventDispatcher(this.eventName, {

diff --git a/src/porridge.ts b/src/porridge.ts
@@ -80,7 +80,9 @@ export class Porridge {
 		};
 
 		if (options?.expires && String(options.expires).length) {
-			newValue[storageKeys.expires] = new Date(options.expires);
+			newValue[storageKeys.expires] = options.expires instanceof Date
+				? options.expires
+				: new Date(options.expires);
 		}
 
 		eventDispatcher(this.eventName, {

diff --git a/src/util.ts b/src/util.ts
@@ -136,7 +136,8 @@ export function addCustomEventListener(eventName: string, keyName: string, callb
 		if (typeof callback === 'function') {
 			callback({
 				key: keyName,
-				value: e.detail.value,
+				newValue: e.detail.newValue,
+				oldValue: e.detail.oldValue,
 			});
 		}
 	});

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,6 +1,6 @@
 declare namespace WebPorridge {
 	type StorageOptions = {
-		expires?: number;
+		expires?: Date | number;
 		prop?: string;
 	};