applesauce-core 0.9.0 → 0.11.0

package/dist/query-store/query-store.js

@@ -0,0 +1,88 @@
+import { filter, finalize, ReplaySubject, share, startWith, timer } from "rxjs";
+import hash_sum from "hash-sum";
+import * as Queries from "../queries/index.js";
+import { getObservableValue } from "../observable/get-observable-value.js";
+export class QueryStore {
+    static Queries = Queries;
+    store;
+    constructor(store) {
+        if (!store)
+            throw new Error("EventStore required");
+        this.store = store;
+    }
+    /** A directory of all active queries */
+    queries = new Map();
+    /** How long a query should be kept "warm" while nothing is subscribed to it */
+    queryKeepWarmTimeout = 60_000;
+    /** Creates a cached query */
+    createQuery(queryConstructor, ...args) {
+        let observables = this.queries.get(queryConstructor);
+        if (!observables) {
+            observables = new Map();
+            this.queries.set(queryConstructor, observables);
+        }
+        const key = hash_sum(args);
+        let observable = observables.get(key);
+        if (!observable) {
+            const cleanup = () => {
+                if (observables.get(key) === observable)
+                    observables.delete(key);
+            };
+            observable = queryConstructor(...args)
+                .run(this.store, this)
+                .pipe(
+            // always emit undefined so the observable is sync
+            startWith(undefined), 
+            // remove the observable when its subscribed
+            finalize(cleanup), 
+            // only create a single observable for all components
+            share({ connector: () => new ReplaySubject(1), resetOnComplete: () => timer(this.queryKeepWarmTimeout) }));
+            // set debug fields
+            Reflect.set(observable, "queryArgs", args);
+            observables.set(key, observable);
+        }
+        return observable;
+    }
+    /** Creates a query and waits for the next value */
+    async executeQuery(queryConstructor, ...args) {
+        const query = this.createQuery(queryConstructor, ...args).pipe(filter((v) => v !== undefined));
+        return getObservableValue(query);
+    }
+    /** Creates a SingleEventQuery */
+    event(id) {
+        return this.createQuery(Queries.SingleEventQuery, id);
+    }
+    /** Creates a MultipleEventsQuery */
+    events(ids) {
+        return this.createQuery(Queries.MultipleEventsQuery, ids);
+    }
+    /** Creates a ReplaceableQuery */
+    replaceable(kind, pubkey, d) {
+        return this.createQuery(Queries.ReplaceableQuery, kind, pubkey, d);
+    }
+    /** Creates a ReplaceableSetQuery */
+    replaceableSet(pointers) {
+        return this.createQuery(Queries.ReplaceableSetQuery, pointers);
+    }
+    /** Creates a TimelineQuery */
+    timeline(filters, keepOldVersions) {
+        return this.createQuery(Queries.TimelineQuery, filters, keepOldVersions);
+    }
+    /** Creates a ProfileQuery */
+    profile(pubkey) {
+        return this.createQuery(Queries.ProfileQuery, pubkey);
+    }
+    /** Creates a ReactionsQuery */
+    reactions(event) {
+        return this.createQuery(Queries.ReactionsQuery, event);
+    }
+    /** Creates a MailboxesQuery */
+    mailboxes(pubkey) {
+        return this.createQuery(Queries.MailboxesQuery, pubkey);
+    }
+    /** Creates a ThreadQuery */
+    thread(root) {
+        return this.createQuery(Queries.ThreadQuery, root);
+    }
+}
+export { Queries };

package/dist/query-store/query-store.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/query-store/query-store.test.js

@@ -0,0 +1,33 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { EventStore } from "../event-store/event-store.js";
+import { QueryStore } from "./query-store.js";
+import { ProfileQuery } from "../queries/profile.js";
+let eventStore;
+let queryStore;
+const event = {
+    content: '{"name":"hzrd149","picture":"https://cdn.hzrd149.com/5ed3fe5df09a74e8c126831eac999364f9eb7624e2b86d521521b8021de20bdc.png","about":"JavaScript developer working on some nostr stuff\\n- noStrudel https://nostrudel.ninja/ \\n- Blossom https://github.com/hzrd149/blossom \\n- Applesauce https://hzrd149.github.io/applesauce/","website":"https://hzrd149.com","nip05":"_@hzrd149.com","lud16":"hzrd1499@minibits.cash","pubkey":"266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5","display_name":"hzrd149","displayName":"hzrd149","banner":""}',
+    created_at: 1738362529,
+    id: "e9df8d5898c4ccfbd21fcd59f3f48abb3ff0ab7259b19570e2f1756de1e9306b",
+    kind: 0,
+    pubkey: "266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5",
+    sig: "465a47b93626a587bf81dadc2b306b8f713a62db31d6ce1533198e9ae1e665a6eaf376a03250bf9ffbb02eb9059c8eafbd37ae1092d05d215757575bd8357586",
+    tags: [],
+};
+beforeEach(() => {
+    eventStore = new EventStore();
+    queryStore = new QueryStore(eventStore);
+});
+describe("executeQuery", () => {
+    it("should resolve when value is already present", async () => {
+        eventStore.add(event);
+        expect(await queryStore.executeQuery(ProfileQuery, event.pubkey)).toEqual(expect.objectContaining({ name: "hzrd149" }));
+    });
+    it("should resolve when value is added to event store", async () => {
+        const p = queryStore.executeQuery(ProfileQuery, event.pubkey);
+        // delay adding the event
+        setTimeout(() => {
+            eventStore.add(event);
+        }, 10);
+        await expect(p).resolves.toEqual(expect.objectContaining({ name: "hzrd149" }));
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -11,69 +11,72 @@
   "author": "hzrd149",
   "license": "MIT",
   "files": [
-    "dist"
+    "dist",
+    "applesauce"
   ],
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
     "./helpers": {
       "import": "./dist/helpers/index.js",
+      "require": "./dist/helpers/index.js",
       "types": "./dist/helpers/index.d.ts"
     },
     "./helpers/*": {
       "import": "./dist/helpers/*.js",
+      "require": "./dist/helpers/*.js",
       "types": "./dist/helpers/*.d.ts"
     },
     "./queries": {
       "import": "./dist/queries/index.js",
+      "require": "./dist/queries/index.js",
       "types": "./dist/queries/index.d.ts"
     },
     "./queries/*": {
       "import": "./dist/queries/*.js",
+      "require": "./dist/queries/*.js",
       "types": "./dist/queries/*.d.ts"
     },
     "./observable": {
       "import": "./dist/observable/index.js",
+      "require": "./dist/observable/index.js",
       "types": "./dist/observable/index.d.ts"
     },
     "./promise": {
       "import": "./dist/promise/index.js",
+      "require": "./dist/promise/index.js",
       "types": "./dist/promise/index.d.ts"
     },
     "./query-store": {
       "import": "./dist/query-store/index.js",
+      "require": "./dist/query-store/index.js",
       "types": "./dist/query-store/index.d.ts"
     },
     "./event-store": {
       "import": "./dist/event-store/index.js",
+      "require": "./dist/event-store/index.js",
       "types": "./dist/event-store/index.d.ts"
     }
   },
   "dependencies": {
-    "debug": "^4.3.7",
-    "json-stringify-deterministic": "^1.0.12",
+    "@scure/base": "^1.2.4",
+    "debug": "^4.4.0",
+    "fast-deep-equal": "^3.1.3",
+    "hash-sum": "^2.0.0",
     "light-bolt11-decoder": "^3.2.0",
-    "nanoid": "^5.0.7",
-    "nostr-tools": "^2.10.1",
+    "nanoid": "^5.0.9",
+    "nostr-tools": "^2.10.4",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
+    "@hirez_io/observer-spy": "^2.2.0",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.13",
-    "jest": "^29.7.0",
-    "jest-extended": "^4.0.2",
-    "typescript": "^5.6.3"
-  },
-  "jest": {
-    "roots": [
-      "dist"
-    ],
-    "setupFilesAfterEnv": [
-      "jest-extended/all"
-    ]
+    "@types/hash-sum": "^1.0.2",
+    "typescript": "^5.7.3",
+    "vitest": "^3.0.5"
   },
   "funding": {
     "type": "lightning",
@@ -82,7 +85,7 @@
   "scripts": {
     "build": "tsc",
     "watch:build": "tsc --watch > /dev/null",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "watch:test": "(trap 'kill 0' SIGINT; pnpm run build -w > /dev/null & pnpm run test --watch)"
+    "test": "vitest run --passWithNoTests",
+    "watch:test": "vitest"
   }
 }

package/dist/observable/getValue.d.ts

@@ -1,2 +0,0 @@
-import { Observable } from "rxjs";
-export declare function getValue<T>(observable: Observable<T>): T | Promise<T>;

package/dist/observable/getValue.js

@@ -1,13 +0,0 @@
-import { BehaviorSubject } from "rxjs";
-export function getValue(observable) {
-    if (observable instanceof BehaviorSubject)
-        return observable.value;
-    if (Reflect.has(observable, "value"))
-        return Reflect.get(observable, "value");
-    return new Promise((res) => {
-        const sub = observable.subscribe((v) => {
-            res(v);
-            sub.unsubscribe();
-        });
-    });
-}