@sylphx/lens-solid 2.1.2 → 2.1.4

package/dist/index.js

@@ -397,7 +397,7 @@ class ClientImpl {
   connectPromise = null;
   subscriptions = new Map;
   queryResultCache = new Map;
-  callbackWrappers = new WeakMap;
+  observerEntries = new WeakMap;
   constructor(config) {
     this.transport = config.transport;
     this.plugins = config.plugins ?? [];
@@ -499,8 +499,21 @@ class ClientImpl {
   generateId(type, path) {
     return `${type}-${path}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   }
+  inputHashCache = new WeakMap;
   makeQueryKey(path, input) {
-    return `${path}:${JSON.stringify(input ?? null)}`;
+    if (input === undefined || input === null) {
+      return `${path}:null`;
+    }
+    if (typeof input !== "object") {
+      return `${path}:${String(input)}`;
+    }
+    const obj = input;
+    let hash = this.inputHashCache.get(obj);
+    if (!hash) {
+      hash = JSON.stringify(input);
+      this.inputHashCache.set(obj, hash);
+    }
+    return `${path}:${hash}`;
   }
   executeQuery(path, input, select) {
     const key = this.makeQueryKey(path, input);
@@ -511,7 +524,9 @@ class ClientImpl {
     if (!this.subscriptions.has(key)) {
       this.subscriptions.set(key, {
         data: null,
-        callbacks: new Set
+        error: null,
+        completed: false,
+        observers: new Set
       });
     }
     const sub = this.subscriptions.get(key);
@@ -519,33 +534,48 @@ class ClientImpl {
       get value() {
         return sub.data;
       },
-      subscribe: (callback) => {
-        if (callback) {
-          const typedCallback = callback;
-          let wrapped = this.callbackWrappers.get(typedCallback);
-          if (!wrapped) {
-            wrapped = (data) => callback(data);
-            this.callbackWrappers.set(typedCallback, wrapped);
-          }
-          sub.callbacks.add(wrapped);
-          if (sub.data !== null) {
-            callback(sub.data);
-          }
+      subscribe: (observerOrCallback) => {
+        let entry;
+        if (typeof observerOrCallback === "function") {
+          const callback = observerOrCallback;
+          entry = { next: (data) => callback(data) };
+        } else if (observerOrCallback && typeof observerOrCallback === "object") {
+          const observer = observerOrCallback;
+          entry = {
+            next: observer.next ? (data) => observer.next(data) : undefined,
+            error: observer.error,
+            complete: observer.complete
+          };
+        } else {
+          entry = {};
+        }
+        if (observerOrCallback) {
+          this.observerEntries.set(observerOrCallback, entry);
+        }
+        sub.observers.add(entry);
+        if (sub.error && entry.error) {
+          entry.error(sub.error);
+        } else if (sub.data !== null && entry.next) {
+          entry.next(sub.data);
+        }
+        if (sub.completed && entry.complete) {
+          entry.complete();
         }
         if (!sub.unsubscribe) {
           this.startSubscription(path, input, key);
         }
         return () => {
-          if (callback) {
-            const typedCallback = callback;
-            const wrapped = this.callbackWrappers.get(typedCallback);
-            if (wrapped) {
-              sub.callbacks.delete(wrapped);
+          if (observerOrCallback) {
+            const storedEntry = this.observerEntries.get(observerOrCallback);
+            if (storedEntry) {
+              sub.observers.delete(storedEntry);
             }
           }
-          if (sub.callbacks.size === 0 && sub.unsubscribe) {
+          if (sub.observers.size === 0 && sub.unsubscribe) {
             sub.unsubscribe();
             sub.unsubscribe = undefined;
+            this.subscriptions.delete(key);
+            this.queryResultCache.delete(key);
           }
         };
       },
@@ -566,11 +596,16 @@ class ClientImpl {
             throw response.error;
           }
           sub.data = response.data;
-          for (const cb of sub.callbacks) {
-            cb(response.data);
+          for (const observer of sub.observers) {
+            observer.next?.(response.data);
           }
           return onfulfilled ? onfulfilled(response.data) : response.data;
         } catch (error) {
+          const err = error instanceof Error ? error : new Error(String(error));
+          sub.error = err;
+          for (const observer of sub.observers) {
+            observer.error?.(err);
+          }
           if (onrejected) {
             return onrejected(error);
           }
@@ -603,13 +638,31 @@ class ClientImpl {
           next: (result) => {
             if (result.data !== undefined) {
               sub.data = result.data;
-              for (const cb of sub.callbacks) {
-                cb(result.data);
+              sub.error = null;
+              for (const observer of sub.observers) {
+                observer.next?.(result.data);
+              }
+            }
+            if (result.error) {
+              const err = result.error instanceof Error ? result.error : new Error(String(result.error));
+              sub.error = err;
+              for (const observer of sub.observers) {
+                observer.error?.(err);
               }
             }
           },
-          error: () => {},
-          complete: () => {}
+          error: (err) => {
+            sub.error = err;
+            for (const observer of sub.observers) {
+              observer.error?.(err);
+            }
+          },
+          complete: () => {
+            sub.completed = true;
+            for (const observer of sub.observers) {
+              observer.complete?.();
+            }
+          }
         });
         sub.unsubscribe = () => subscription.unsubscribe();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sylphx/lens-solid",
-	"version": "2.1.2",
+	"version": "2.1.4",
 	"description": "SolidJS bindings for Lens API framework",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -31,7 +31,7 @@
 	"author": "SylphxAI",
 	"license": "MIT",
 	"dependencies": {
-		"@sylphx/lens-client": "^2.2.1",
+		"@sylphx/lens-client": "^2.3.1",
 		"@sylphx/lens-core": "^2.2.0"
 	},
 	"peerDependencies": {