Make sorting/limit more resilient in repository

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@welshman",
   "private": true,
-  "version": "0.6.2",
+  "version": "0.6.3",
   "workspaces": [
     "packages/*"
   ],

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/app",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of svelte stores for use in building nostr client applications.",

packages/content/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/content",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities for parsing nostr note content.",

packages/editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/editor",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A batteries-included nostr editor.",

packages/feeds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/feeds",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Utilities for building dynamic nostr feeds.",

packages/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/lib",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities.",

packages/lib/src/Tools.ts

@@ -1517,9 +1517,9 @@ export const prop =
 
 /** Returns a function that adds/updates a property on object */
 export const assoc =
-  <K extends string, T, U>(k: K, v: T) =>
+  <K extends string, T>(k: K, v: T) =>
-  (o: U) =>
+  <U>(o: U): U =>
-    ({...o, [k as K]: v}) as U & Record<K, T>
+    ({...o, [k]: v}) as U
 
 /** Returns a function that removes a property on object */
 export const dissoc =

packages/net/__tests__/repository.test.ts

@@ -154,10 +154,6 @@ describe("Repository", () => {
       repo = new Repository()
     })
 
-    it("should throw on invalid queries", () => {
-      expect(() => repo.query([{limit: 10}], {shouldSort: false})).toThrow()
-    })
-
     it("should query by ids", () => {
       const event = createEvent(1)
       repo.publish(event)

packages/net/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/net",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Utilities for connecting with nostr relays.",

packages/net/src/diff.ts

@@ -207,7 +207,7 @@ export const pull = async ({context, ...options}: PullOptions) => {
   await Promise.all(
     Array.from(idsByRelay.entries()).map(([relay, allIds]) => {
       return Promise.all(
-        chunk(500, allIds).map(
+        chunk(100, allIds).map(
           ids =>
             new Promise<void>(resolve =>
               requestOne({

packages/net/src/repository.ts

@@ -154,15 +154,11 @@ export class Repository extends Emitter {
   ) => {
     const result: TrustedEvent[][] = []
     for (const originalFilter of filters) {
-      if (originalFilter.limit !== undefined && !shouldSort) {
-        throw new Error("Unable to skip sorting if limit is defined")
-      }
-
       // Attempt to fulfill the query using one of our indexes. Fall back to all events.
       const applied = this._applyAnyFilter(originalFilter)
       const filter = applied?.filter || originalFilter
       const events = applied ? this._getEvents(applied!.ids) : this.dump()
-      const sorted = this._sortEvents(shouldSort && Boolean(filter.limit), events)
+      const sorted = this._sortEvents(shouldSort || Boolean(filter.limit), events)
 
       const chunk: TrustedEvent[] = []
       for (const event of sorted) {

packages/router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/router",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities for nostr relay selection.",

packages/signer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/signer",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A nostr signer implemenation supporting several login methods.",

packages/store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/store",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities based on svelte/store for use with welshman",

packages/util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/util",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of nostr-related utilities.",