applesauce-react 2.0.0 → 3.0.0

package/README.md

@@ -11,26 +11,25 @@ npm install applesauce-react
 ## Example
 
 ```tsx
-import { EventStore, QueryStore, Queries } from "applesauce-core";
-import { QueryStoreProvider } from "applesauce-react/providers";
-import { useStoreQuery } from "applesauce-react/hooks";
+import { EventStore, Models } from "applesauce-core";
+import { EventStoreProvider } from "applesauce-react/providers";
+import { useEventModel } from "applesauce-react/hooks";
 
 const eventStore = new EventStore();
-const queryStore = new QueryStore(eventStore);
 
 function UserName({ pubkey }) {
-  const profile = useStoreQuery(Queries.ProfileQuery, [pubkey]);
+  const profile = useEventModel(Models.ProfileModel, [pubkey]);
 
   return <span>{profile.name || "loading..."}</span>;
 }
 
 function App() {
   return (
-    <QueryStoreProvider queryStore={queryStore}>
+    <EventStoreProvider eventStore={eventStore}>
       <h1>App</h1>
 
       <UserName pubkey="82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2" />
-    </QueryStoreProvider>
+    </EventStoreProvider>
   );
 }
 ```

package/dist/hooks/use-event-model.js

@@ -1,16 +1,15 @@
 import { withImmediateValueOrDefault } from "applesauce-core";
-import { useObservableEagerState } from "observable-hooks";
-import { useMemo } from "react";
+import hash_sum from "hash-sum";
 import { of } from "rxjs";
 import { useEventStore } from "./use-event-store.js";
+import { useObservableEagerMemo } from "./use-observable-memo.js";
 /** Runs and subscribes to a model on the event store */
 export function useEventModel(factory, args) {
     const store = useEventStore();
-    const observable$ = useMemo(() => {
+    return useObservableEagerMemo(() => {
         if (args)
             return store.model(factory, ...args).pipe(withImmediateValueOrDefault(undefined));
         else
             return of(undefined);
-    }, [args, store]);
-    return useObservableEagerState(observable$);
+    }, [hash_sum(args), store, factory]);
 }

package/dist/hooks/use-observable-memo.js

@@ -1,9 +1,9 @@
 import { useObservableEagerState, useObservableState } from "observable-hooks";
 import { useMemo } from "react";
-import { EMPTY } from "rxjs";
+import { of } from "rxjs";
 export function useObservableMemo(factory, deps) {
-    return useObservableState(useMemo(() => factory() || EMPTY, deps));
+    return useObservableState(useMemo(() => factory() || of(undefined), deps));
 }
 export function useObservableEagerMemo(factory, deps) {
-    return useObservableEagerState(useMemo(() => factory() || EMPTY, deps));
+    return useObservableEagerState(useMemo(() => factory() || of(undefined), deps));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-react",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "React hooks for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -49,17 +49,19 @@
     }
   },
   "dependencies": {
-    "applesauce-accounts": "^2.0.0",
-    "applesauce-actions": "^2.0.0",
-    "applesauce-content": "^2.0.0",
-    "applesauce-core": "^2.0.0",
-    "applesauce-factory": "^2.0.0",
+    "applesauce-accounts": "^3.0.0",
+    "applesauce-actions": "^3.0.0",
+    "applesauce-content": "^3.0.0",
+    "applesauce-core": "^3.0.0",
+    "applesauce-factory": "^3.0.0",
+    "hash-sum": "^2.0.0",
     "nostr-tools": "^2.13",
     "observable-hooks": "^4.2.4",
     "react": "^18.3.1",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
+    "@types/hash-sum": "^1.0.2",
     "@types/react": "^18.3.18",
     "typescript": "^5.8.3",
     "vitest": "^3.2.3"