sliftutils 0.85.0 → 0.87.0

package/index.d.ts

@@ -127,6 +127,8 @@ declare module "sliftutils/misc/random" {
 
 declare module "sliftutils/misc/types" {
     export declare function isDefined<T>(value: T | undefined | null): value is T;
+    export declare function freezeObject(value: unknown): unknown;
+    export declare function deepFreezeObject(value: unknown): void;
 
 }
 
@@ -658,6 +660,8 @@ declare module "sliftutils/storage/DiskCollection" {
             writeDelay?: number | undefined;
             cbor?: boolean | undefined;
             noPrompt?: boolean | undefined;
+            freeze?: "deep" | "shallow" | undefined;
+            beforeWrite?: ((newValue: T) => void) | undefined;
         } | undefined);
         transactionStorage: TransactionStorage | undefined;
         initStorage(): Promise<IStorage<T>>;
@@ -969,6 +973,7 @@ declare module "sliftutils/storage/StorageObservable" {
     import { IStorage, IStorageSync } from "./IStorage";
     export declare class StorageSync<T> implements IStorageSync<T> {
         storage: IStorage<T>;
+        private config?;
         cached: import("mobx").ObservableMap<string, T | undefined>;
         infoCached: import("mobx").ObservableMap<string, {
             size: number;
@@ -978,7 +983,10 @@ declare module "sliftutils/storage/StorageObservable" {
         synced: {
             keySeqNum: number;
         };
-        constructor(storage: IStorage<T>);
+        constructor(storage: IStorage<T>, config?: {
+            freeze?: "deep" | "shallow" | undefined;
+            beforeWrite?: ((newValue: T) => void) | undefined;
+        } | undefined);
         get(key: string): T | undefined;
         set(key: string, value: T): void;
         remove(key: string): void;

package/misc/types.d.ts

@@ -1 +1,3 @@
 export declare function isDefined<T>(value: T | undefined | null): value is T;
+export declare function freezeObject(value: unknown): unknown;
+export declare function deepFreezeObject(value: unknown): void;

package/misc/types.ts

@@ -1,3 +1,24 @@
 export function isDefined<T>(value: T | undefined | null): value is T {
     return value !== undefined && value !== null;
+}
+
+
+export function freezeObject(value: unknown) {
+    if (!value) return value;
+    Object.freeze(value);
+}
+
+export function deepFreezeObject(value: unknown) {
+    if (!value) return;
+    if (typeof value !== "object") return;
+    if (Object.isFrozen(value)) return;
+
+    Object.freeze(value);
+
+    Object.getOwnPropertyNames(value).forEach(prop => {
+        const propValue = (value as any)[prop];
+        if (propValue && typeof propValue === "object") {
+            deepFreezeObject(propValue);
+        }
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "0.85.0",
+    "version": "0.87.0",
     "main": "index.js",
     "license": "MIT",
     "files": [
@@ -48,7 +48,7 @@
         "mobx": "^6.13.3",
         "preact-old-types": "^10.28.1",
         "shell-quote": "^1.8.3",
-        "socket-function": "^0.164.0",
+        "socket-function": "^0.165.0",
         "typenode": "^6.0.0",
         "typesafecss": "*",
         "ws": "^8.18.3",

package/storage/DiskCollection.d.ts

@@ -10,6 +10,8 @@ export declare class DiskCollection<T> implements IStorageSync<T> {
         writeDelay?: number | undefined;
         cbor?: boolean | undefined;
         noPrompt?: boolean | undefined;
+        freeze?: "deep" | "shallow" | undefined;
+        beforeWrite?: ((newValue: T) => void) | undefined;
     } | undefined);
     transactionStorage: TransactionStorage | undefined;
     initStorage(): Promise<IStorage<T>>;

package/storage/DiskCollection.ts

@@ -18,6 +18,9 @@ export class DiskCollection<T> implements IStorageSync<T> {
             writeDelay?: number;
             cbor?: boolean;
             noPrompt?: boolean;
+            freeze?: "shallow" | "deep";
+            // May mutate newValue in order to change what will be written
+            beforeWrite?: (newValue: T) => void;
         }
     ) {
     }
@@ -41,7 +44,8 @@ export class DiskCollection<T> implements IStorageSync<T> {
     private synced = new StorageSync(
         new PendingStorage(`Collection (${this.collectionName})`,
             new DelayedStorage<T>(this.baseStorage)
-        )
+        ),
+        this.config
     );
 
     public get(key: string): T | undefined {

package/storage/StorageObservable.d.ts

@@ -1,6 +1,7 @@
 import { IStorage, IStorageSync } from "./IStorage";
 export declare class StorageSync<T> implements IStorageSync<T> {
     storage: IStorage<T>;
+    private config?;
     cached: import("mobx").ObservableMap<string, T | undefined>;
     infoCached: import("mobx").ObservableMap<string, {
         size: number;
@@ -10,7 +11,10 @@ export declare class StorageSync<T> implements IStorageSync<T> {
     synced: {
         keySeqNum: number;
     };
-    constructor(storage: IStorage<T>);
+    constructor(storage: IStorage<T>, config?: {
+        freeze?: "deep" | "shallow" | undefined;
+        beforeWrite?: ((newValue: T) => void) | undefined;
+    } | undefined);
     get(key: string): T | undefined;
     set(key: string, value: T): void;
     remove(key: string): void;

package/storage/StorageObservable.ts

@@ -1,5 +1,5 @@
 import { observable } from "mobx";
-import { isDefined } from "../misc/types";
+import { deepFreezeObject, freezeObject, isDefined } from "../misc/types";
 import { IStorage, IStorageSync } from "./IStorage";
 
 // NOTE: At around 500K values (depending on their size to some degree), this will take about 2 minutes to load. But once it does it will be fast. So... keep that in mind. I recommend not exceeding 100K
@@ -11,7 +11,11 @@ export class StorageSync<T> implements IStorageSync<T> {
         keySeqNum: 0,
     }, undefined, { deep: false });
 
-    constructor(public storage: IStorage<T>) {
+    constructor(public storage: IStorage<T>, private config?: {
+        freeze?: "shallow" | "deep";
+        // May mutate newValue in order to change what will be written
+        beforeWrite?: (newValue: T) => void;
+    }) {
         storage.watchResync?.(async () => {
             // NOTE: If there's multiple tabs open, this'll trigger a lot, so we can't just clear all the values, as that'll cause a render where nothing's loaded. 
             this.loadedKeys = false;
@@ -33,6 +37,9 @@ export class StorageSync<T> implements IStorageSync<T> {
         return this.cached.get(key);
     }
     public set(key: string, value: T): void {
+        if (this.config?.beforeWrite) {
+            this.config.beforeWrite(value);
+        }
         if (!this.keys.has(key)) {
             this.keys.add(key);
             this.synced.keySeqNum++;
@@ -79,7 +86,12 @@ export class StorageSync<T> implements IStorageSync<T> {
         let value = this.cached.get(key);
         if (value === undefined) {
             value = await this.storage.get(key);
-            if (this.cached.get(key) === undefined) {
+            if (value !== undefined && this.cached.get(key) === undefined) {
+                if (this.config?.freeze === "shallow") {
+                    freezeObject(value);
+                } else if (this.config?.freeze === "deep") {
+                    deepFreezeObject(value);
+                }
                 this.cached.set(key, value);
             }
         }

package/storage/TransactionStorage.ts

@@ -401,26 +401,20 @@ export class TransactionStorage implements IStorage<Buffer> {
                 this.cache.delete(entry.key);
             } else {
                 if (!anyChanged && !initialLoad) {
-                    let prev = this.cache.get(entry.key);
-                    if (!prev) {
-                        anyChanged = true;
-                    } else {
-                        if (!prev.value) {
-                            if (entry.value) {
-                                anyChanged = true;
-                            }
-                        } else {
-                            if (!entry.value) {
-                                anyChanged = true;
-                            } else {
-                                // Both values, so... it might not have changed
-                                if (!prev.value.equals(entry.value)) {
-                                    anyChanged = true;
-                                }
-                            }
+                    const hasChanged = () => {
+                        let prev = this.cache.get(entry.key);
+                        if (!prev) {
+                            return true;
                         }
-                    }
+                        if (!!prev.value !== !!entry.value) return true;
+                        if (prev.value && entry.value && !prev.value.equals(entry.value)) {
+                            return true;
+                        }
+                        return false;
+                    };
+                    anyChanged = hasChanged() || anyChanged;
                 }
+
                 this.cache.set(entry.key, entry);
             }
         }

package/web/ExamplePage.tsx

@@ -13,24 +13,6 @@ export class ExamplePage extends preact.Component {
         count: 0,
     });
 
-    onKeyDown = (e: KeyboardEvent) => {
-        // Skip if the current target is an ipnut
-        if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
-            return;
-        }
-        let hotkeySelector = `[data-hotkey="${e.code}"]`;
-        let elements = document.querySelectorAll(hotkeySelector);
-        for (let element of elements) {
-            (element as HTMLElement).click();
-        }
-    };
-    componentDidMount(): void {
-        document.addEventListener("keydown", this.onKeyDown);
-    }
-    componentWillUnmount(): void {
-        document.removeEventListener("keydown", this.onKeyDown);
-    }
-
     render() {
         return (
             <div className={css.pad2(20)}>

package/yarn.lock

@@ -1349,7 +1349,7 @@ preact-old-types@^10.28.1:
   resolved "https://registry.yarnpkg.com/preact-old-types/-/preact-old-types-10.28.1.tgz#58f9400aa1b80768809c296534ec7b49f6f09a0d"
   integrity sha512-7r64HwL/PJtzE7jUMFkYVec+vSUf3z8Uozd8Bhl4HMvhcWINFzJsIEHKLAlkeCbzv+jTQl0UwVeMJQ26jK5bDg==
 
-preact@10.28.1, "preact@npm:preact-old-types@*":
+preact@10.24.3, "preact@npm:preact-old-types@*":
   version "10.28.1"
   resolved "https://registry.yarnpkg.com/preact-old-types/-/preact-old-types-10.28.1.tgz#58f9400aa1b80768809c296534ec7b49f6f09a0d"
   integrity sha512-7r64HwL/PJtzE7jUMFkYVec+vSUf3z8Uozd8Bhl4HMvhcWINFzJsIEHKLAlkeCbzv+jTQl0UwVeMJQ26jK5bDg==
@@ -1494,17 +1494,17 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-socket-function@^0.164.0:
-  version "0.164.0"
-  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-0.164.0.tgz#81b12ad687aaf7455159ab7e8788b1f8a5a7f513"
-  integrity sha512-+aQg9T4zJVFqHed5WuyBOtfW4MfdkdE2I3IWqEaeOv8+/e3CEtg5X/kqiFoyzCcx1efDS/eC0J6+WxODynBjXA==
+socket-function@^0.165.0:
+  version "0.165.0"
+  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-0.165.0.tgz#2c262c5cc75a79233d08538517030c504745a94c"
+  integrity sha512-VfpljEyUEjQD4flTboGwgcerK2vuVvDM0iPNL4L4Qyo76G5DQVGcHCaYDwZuuAJ8gvTXDq9j7P7vgdjElNAhXw==
   dependencies:
     "@types/pako" "^2.0.3"
     "@types/ws" "^8.5.3"
     cbor-x "^1.6.0"
     mobx "^6.6.2"
     pako "^2.1.0"
-    preact "10.28.1"
+    preact "10.24.3"
     typedev "^0.4.0"
     typenode "^5.13.0"
     ws "^8.17.1"