@welshman/app 0.6.8 → 0.7.1

package/dist/app/src/user.js

@@ -1,61 +1,46 @@
 import { derived } from "svelte/store";
-import { withGetter, memoized } from "@welshman/store";
 import { pubkey } from "./session.js";
-import { profilesByPubkey, loadProfile } from "./profiles.js";
-import { followsByPubkey, loadFollows } from "./follows.js";
-import { loadPins, pinsByPubkey } from "./pins.js";
-import { mutesByPubkey, loadMutes } from "./mutes.js";
-import { blossomServersByPubkey, loadBlossomServers } from "./blossom.js";
-import { relaySelectionsByPubkey, loadRelaySelections } from "./relaySelections.js";
-import { inboxRelaySelectionsByPubkey, loadInboxRelaySelections } from "./inboxRelaySelections.js";
-import { wotGraph } from "./wot.js";
-export const makeUserData = ({ mapStore, loadItem }) => withGetter(memoized(derived([mapStore, pubkey], ([$mapStore, $pubkey]) => {
+import { profilesByPubkey, forceLoadProfile, loadProfile } from "./profiles.js";
+import { followListsByPubkey, forceLoadFollowList, loadFollowList } from "./follows.js";
+import { pinListsByPubkey, forceLoadPinList, loadPinList } from "./pins.js";
+import { muteListsByPubkey, forceLoadMuteList, loadMuteList } from "./mutes.js";
+import { blossomServerListsByPubkey, forceLoadBlossomServerList, loadBlossomServerList, } from "./blossom.js";
+import { relayListsByPubkey, forceLoadRelayList, loadRelayList } from "./relayLists.js";
+import { messagingRelayListsByPubkey, forceLoadMessagingRelayList, loadMessagingRelayList, } from "./messagingRelayLists.js";
+import { wotGraph, getWotGraph } from "./wot.js";
+export const makeUserData = (itemsByKey, onDerive) => derived([itemsByKey, pubkey], ([$itemsByKey, $pubkey]) => {
     if (!$pubkey)
         return undefined;
-    loadItem($pubkey);
-    return $mapStore.get($pubkey);
-})));
-export const makeUserLoader = (loadItem) => async (relays = [], force = false) => {
+    onDerive?.($pubkey);
+    return $itemsByKey.get($pubkey);
+});
+export const makeUserLoader = (loadItem) => async (...args) => {
     const $pubkey = pubkey.get();
     if ($pubkey) {
-        await loadItem($pubkey, relays, force);
+        await loadItem($pubkey, ...args);
     }
 };
-export const userProfile = makeUserData({
-    mapStore: profilesByPubkey,
-    loadItem: loadProfile,
-});
+export const userProfile = makeUserData(profilesByPubkey, loadProfile);
+export const forceLoadUserProfile = makeUserLoader(forceLoadProfile);
 export const loadUserProfile = makeUserLoader(loadProfile);
-export const userFollows = makeUserData({
-    mapStore: followsByPubkey,
-    loadItem: loadFollows,
-});
-export const loadUserFollows = makeUserLoader(loadFollows);
-export const userMutes = makeUserData({
-    mapStore: mutesByPubkey,
-    loadItem: loadMutes,
-});
-export const loadUserMutes = makeUserLoader(loadMutes);
-export const userPins = makeUserData({
-    mapStore: pinsByPubkey,
-    loadItem: loadPins,
-});
-export const loadUserPins = makeUserLoader(loadPins);
-export const userRelaySelections = makeUserData({
-    mapStore: relaySelectionsByPubkey,
-    loadItem: loadRelaySelections,
-});
-export const loadUserRelaySelections = makeUserLoader(loadRelaySelections);
-export const userInboxRelaySelections = makeUserData({
-    mapStore: inboxRelaySelectionsByPubkey,
-    loadItem: loadInboxRelaySelections,
-});
-export const loadUserInboxRelaySelections = makeUserLoader(loadInboxRelaySelections);
-export const userBlossomServers = makeUserData({
-    mapStore: blossomServersByPubkey,
-    loadItem: loadBlossomServers,
-});
-export const loadUserBlossomServers = makeUserLoader(loadBlossomServers);
-export const getUserWotScore = (tpk) => wotGraph.get().get(tpk) || 0;
+export const userFollowList = makeUserData(followListsByPubkey, loadFollowList);
+export const forceLoadUserFollowList = makeUserLoader(forceLoadFollowList);
+export const loadUserFollowList = makeUserLoader(loadFollowList);
+export const userMuteList = makeUserData(muteListsByPubkey, loadMuteList);
+export const forceLoadUserMuteList = makeUserLoader(forceLoadMuteList);
+export const loadUserMuteList = makeUserLoader(loadMuteList);
+export const userPinList = makeUserData(pinListsByPubkey, loadPinList);
+export const forceLoadUserPinList = makeUserLoader(forceLoadPinList);
+export const loadUserPinList = makeUserLoader(loadPinList);
+export const userRelayList = makeUserData(relayListsByPubkey, loadRelayList);
+export const forceLoadUserRelayList = makeUserLoader(forceLoadRelayList);
+export const loadUserRelayList = makeUserLoader(loadRelayList);
+export const userMessagingRelayList = makeUserData(messagingRelayListsByPubkey, loadMessagingRelayList);
+export const forceLoadUserMessagingRelayList = makeUserLoader(forceLoadMessagingRelayList);
+export const loadUserMessagingRelayList = makeUserLoader(loadMessagingRelayList);
+export const userBlossomServerList = makeUserData(blossomServerListsByPubkey, loadBlossomServerList);
+export const forceLoadUserBlossomServerList = makeUserLoader(forceLoadBlossomServerList);
+export const loadUserBlossomServerList = makeUserLoader(loadBlossomServerList);
+export const getUserWotScore = (tpk) => getWotGraph().get(tpk) || 0;
 export const deriveUserWotScore = (tpk) => derived(wotGraph, $g => $g.get(tpk) || 0);
 //# sourceMappingURL=user.js.map

package/dist/app/src/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/user.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAW,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAA;AACnC,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAC,MAAM,eAAe,CAAA;AAC7E,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,cAAc,CAAA;AACrF,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAC,MAAM,WAAW,CAAA;AACzE,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAE,YAAY,EAAC,MAAM,YAAY,CAAA;AAC7E,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,qBAAqB,GACtB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,iBAAiB,CAAA;AACrF,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,UAAU,CAAA;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,UAAmC,EACnC,QAAgD,EAChD,EAAE,CACF,OAAO,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;IACvD,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAE9B,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;IAEnB,OAAO,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AACjC,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,cAAc,GACzB,CAAC,QAA+C,EAAE,EAAE,CACpD,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;IACvB,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAA;IAE5B,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,QAAQ,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;IAClC,CAAC;AACH,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAA;AACtE,MAAM,CAAC,MAAM,oBAAoB,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,eAAe,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;AAE1D,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAA;AAC/E,MAAM,CAAC,MAAM,uBAAuB,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAA;AAC1E,MAAM,CAAC,MAAM,kBAAkB,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;AAEhE,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;AACzE,MAAM,CAAC,MAAM,qBAAqB,GAAG,cAAc,CAAC,iBAAiB,CAAC,CAAA;AACtE,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC,YAAY,CAAC,CAAA;AAE5D,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAA;AACtE,MAAM,CAAC,MAAM,oBAAoB,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,eAAe,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;AAE1D,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,sBAAsB,GAAG,cAAc,CAAC,kBAAkB,CAAC,CAAA;AACxE,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAE9D,MAAM,CAAC,MAAM,sBAAsB,GAAG,YAAY,CAChD,2BAA2B,EAC3B,sBAAsB,CACvB,CAAA;AACD,MAAM,CAAC,MAAM,+BAA+B,GAAG,cAAc,CAAC,2BAA2B,CAAC,CAAA;AAC1F,MAAM,CAAC,MAAM,0BAA0B,GAAG,cAAc,CAAC,sBAAsB,CAAC,CAAA;AAEhF,MAAM,CAAC,MAAM,qBAAqB,GAAG,YAAY,CAAC,0BAA0B,EAAE,qBAAqB,CAAC,CAAA;AACpG,MAAM,CAAC,MAAM,8BAA8B,GAAG,cAAc,CAAC,0BAA0B,CAAC,CAAA;AACxF,MAAM,CAAC,MAAM,yBAAyB,GAAG,cAAc,CAAC,qBAAqB,CAAC,CAAA;AAE9E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAE3E,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA"}

package/dist/app/src/wot.d.ts

@@ -1,13 +1,17 @@
 export declare const getFollows: (pubkey: string) => string[];
 export declare const getMutes: (pubkey: string) => string[];
 export declare const getNetwork: (pubkey: string) => string[];
-export declare const followersByPubkey: import("@welshman/store").ReadableWithGetter<Map<string, Set<string>>>;
-export declare const mutersByPubkey: import("@welshman/store").ReadableWithGetter<Map<string, Set<string>>>;
+export declare const followersByPubkey: import("svelte/store").Readable<Map<string, Set<string>>>;
+export declare const getFollowersByPubkey: () => Map<string, Set<string>>;
+export declare const mutersByPubkey: import("svelte/store").Readable<Map<string, Set<string>>>;
+export declare const getMutersByPubkey: () => Map<string, Set<string>>;
 export declare const getFollowers: (pubkey: string) => string[];
 export declare const getMuters: (pubkey: string) => string[];
 export declare const getFollowsWhoFollow: (pubkey: string, target: string) => string[];
 export declare const getFollowsWhoMute: (pubkey: string, target: string) => string[];
-export declare const wotGraph: import("@welshman/store").WritableWithGetter<Map<string, number>>;
-export declare const maxWot: import("@welshman/store").ReadableWithGetter<number>;
+export declare const wotGraph: import("svelte/store").Writable<Map<string, number>>;
+export declare const getWotGraph: () => Map<string, number>;
+export declare const maxWot: import("svelte/store").Readable<number>;
+export declare const getMaxWot: () => number;
 export declare const getWotScore: (pubkey: string, target: string) => number;
 //# sourceMappingURL=wot.d.ts.map

package/dist/app/src/wot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wot.d.ts","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAC2B,CAAA;AAEpE,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,aAC2B,CAAA;AAElE,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAaxC,CAAA;AAED,eAAO,MAAM,iBAAiB,wEAY7B,CAAA;AAED,eAAO,MAAM,cAAc,wEAY1B,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,aACY,CAAA;AAEvD,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,aAAuD,CAAA;AAE/F,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAExE,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAEtE,eAAO,MAAM,QAAQ,mEAAkD,CAAA;AAEvE,eAAO,MAAM,MAAM,sDAAoE,CAAA;AAwBvF,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,WAKzD,CAAA"}
+{"version":3,"file":"wot.d.ts","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAA2D,CAAA;AAEpG,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,aAAyD,CAAA;AAEhG,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,aAaxC,CAAA;AAED,eAAO,MAAM,iBAAiB,2DAU5B,CAAA;AAEF,eAAO,MAAM,oBAAoB,gCAA4B,CAAA;AAE7D,eAAO,MAAM,cAAc,2DAUzB,CAAA;AAEF,eAAO,MAAM,iBAAiB,gCAAyB,CAAA;AAEvD,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,aAAyD,CAAA;AAEpG,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,aAAsD,CAAA;AAE9F,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAExE,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,aACM,CAAA;AAEtE,eAAO,MAAM,QAAQ,sDAAsC,CAAA;AAE3D,eAAO,MAAM,WAAW,2BAAmB,CAAA;AAE3C,eAAO,MAAM,MAAM,yCAAwD,CAAA;AAE3E,eAAO,MAAM,SAAS,cAAiB,CAAA;AAwBvC,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,EAAE,QAAQ,MAAM,WAKzD,CAAA"}

package/dist/app/src/wot.js

@@ -1,12 +1,12 @@
 import { derived, writable } from "svelte/store";
 import { max, throttle, addToMapKey, inc, dec } from "@welshman/lib";
 import { getListTags, getPubkeyTagValues } from "@welshman/util";
-import { throttled, withGetter } from "@welshman/store";
+import { throttled, getter } from "@welshman/store";
 import { pubkey } from "./session.js";
-import { follows, followsByPubkey } from "./follows.js";
-import { mutes, mutesByPubkey } from "./mutes.js";
-export const getFollows = (pubkey) => getPubkeyTagValues(getListTags(followsByPubkey.get().get(pubkey)));
-export const getMutes = (pubkey) => getPubkeyTagValues(getListTags(mutesByPubkey.get().get(pubkey)));
+import { followLists, getFollowListsByPubkey, getFollowList } from "./follows.js";
+import { muteLists, getMuteList } from "./mutes.js";
+export const getFollows = (pubkey) => getPubkeyTagValues(getListTags(getFollowList(pubkey)));
+export const getMutes = (pubkey) => getPubkeyTagValues(getListTags(getMuteList(pubkey)));
 export const getNetwork = (pubkey) => {
     const pubkeys = new Set(getFollows(pubkey));
     const network = new Set();
@@ -19,7 +19,7 @@ export const getNetwork = (pubkey) => {
     }
     return Array.from(network);
 };
-export const followersByPubkey = withGetter(derived(throttled(1000, follows), lists => {
+export const followersByPubkey = derived(throttled(1000, followLists), lists => {
     const $followersByPubkey = new Map();
     for (const list of lists) {
         for (const pubkey of getPubkeyTagValues(getListTags(list))) {
@@ -27,8 +27,9 @@ export const followersByPubkey = withGetter(derived(throttled(1000, follows), li
         }
     }
     return $followersByPubkey;
-}));
-export const mutersByPubkey = withGetter(derived(throttled(1000, mutes), lists => {
+});
+export const getFollowersByPubkey = getter(followersByPubkey);
+export const mutersByPubkey = derived(throttled(1000, muteLists), lists => {
     const $mutersByPubkey = new Map();
     for (const list of lists) {
         for (const pubkey of getPubkeyTagValues(getListTags(list))) {
@@ -36,17 +37,20 @@ export const mutersByPubkey = withGetter(derived(throttled(1000, mutes), lists =
         }
     }
     return $mutersByPubkey;
-}));
-export const getFollowers = (pubkey) => Array.from(followersByPubkey.get().get(pubkey) || []);
-export const getMuters = (pubkey) => Array.from(mutersByPubkey.get().get(pubkey) || []);
+});
+export const getMutersByPubkey = getter(mutersByPubkey);
+export const getFollowers = (pubkey) => Array.from(getFollowersByPubkey().get(pubkey) || []);
+export const getMuters = (pubkey) => Array.from(getMutersByPubkey().get(pubkey) || []);
 export const getFollowsWhoFollow = (pubkey, target) => getFollows(pubkey).filter(other => getFollows(other).includes(target));
 export const getFollowsWhoMute = (pubkey, target) => getFollows(pubkey).filter(other => getMutes(other).includes(target));
-export const wotGraph = withGetter(writable(new Map()));
-export const maxWot = withGetter(derived(wotGraph, $g => max(Array.from($g.values()))));
+export const wotGraph = writable(new Map());
+export const getWotGraph = getter(wotGraph);
+export const maxWot = derived(wotGraph, $g => max(Array.from($g.values())));
+export const getMaxWot = getter(maxWot);
 const buildGraph = throttle(1000, () => {
     const $pubkey = pubkey.get();
     const $graph = new Map();
-    const $follows = $pubkey ? getFollows($pubkey) : followsByPubkey.get().keys();
+    const $follows = $pubkey ? getFollows($pubkey) : getFollowListsByPubkey().keys();
     for (const follow of $follows) {
         for (const pubkey of getFollows(follow)) {
             $graph.set(pubkey, inc($graph.get(pubkey)));
@@ -58,8 +62,8 @@ const buildGraph = throttle(1000, () => {
     wotGraph.set($graph);
 });
 pubkey.subscribe(buildGraph);
-follows.subscribe(buildGraph);
-mutes.subscribe(buildGraph);
+followLists.subscribe(buildGraph);
+muteLists.subscribe(buildGraph);
 export const getWotScore = (pubkey, target) => {
     const follows = pubkey ? getFollowsWhoFollow(pubkey, target) : getFollowers(target);
     const mutes = pubkey ? getFollowsWhoMute(pubkey, target) : getMuters(target);

package/dist/app/src/wot.js.map

@@ -1 +1 @@
-{"version":3,"file":"wot.js","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wot.js","sourceRoot":"","sources":["../../../src/wot.ts"],"names":[],"mappings":"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"}

package/dist/app/src/zappers.d.ts

@@ -1,13 +1,20 @@
+import { Subscriber } from "svelte/store";
 import { Zapper, TrustedEvent, Zap } from "@welshman/util";
-export declare const zappers: import("svelte/store").Writable<Zapper[]>;
-export declare const fetchZappers: (lnurls: string[]) => Promise<Map<string, Zapper>>;
-export declare const zappersByLnurl: import("@welshman/store").ReadableWithGetter<Map<string, Zapper>>, deriveZapper: (key: string | undefined, relays?: string[]) => import("svelte/store").Readable<undefined> | {
-    subscribe: (f: import("svelte/store").Subscriber<Zapper | undefined>) => import("svelte/store").Unsubscriber;
-}, loadZapper: (key: string, relays?: string[], force?: boolean) => Promise<Zapper | undefined>, onZapper: (cb: import("svelte/store").Subscriber<Zapper>) => () => void;
-export declare const loadZapperForPubkey: (pubkey: string, relays?: string[]) => Promise<Zapper | undefined>;
+export declare const zappersByLnurl: import("svelte/store").Writable<Map<string, Zapper>>;
+export declare const zappers: import("svelte/store").Readable<Zapper[]>;
+export declare const getZappersByLnurl: () => Map<string, Zapper>;
+export declare const getZapper: (lnurl: string) => Zapper | undefined;
+export declare const zapperSubscribers: Subscriber<Zapper>[];
+export declare const notifyZapper: (zapper: Zapper) => void;
+export declare const onZapper: (sub: (zapper: Zapper) => void) => () => Subscriber<Zapper>[];
+export declare const fetchZapper: (request: string) => Promise<Zapper | undefined>;
+export declare const forceLoadZapper: (key: string, ...args: any[]) => Promise<Zapper | undefined>;
+export declare const loadZapper: (key: string, ...args: any[]) => Promise<import("@welshman/lib").Maybe<Zapper>>;
+export declare const deriveZapper: (key?: string, ...args: any[]) => import("svelte/store").Readable<Zapper | undefined>;
+export declare const loadZapperForPubkey: (pubkey: string, relays?: string[]) => Promise<import("@welshman/lib").Maybe<Zapper>>;
 export declare const deriveZapperForPubkey: (pubkey: string, relays?: string[]) => import("svelte/store").Readable<Zapper | undefined>;
 export declare const getLnUrlsForEvent: (event: TrustedEvent) => Promise<string[]>;
-export declare const getZapperForZap: (zap: TrustedEvent, parent: TrustedEvent) => Promise<Zapper | undefined>;
+export declare const getZapperForZap: (zap: TrustedEvent, parent: TrustedEvent) => Promise<import("@welshman/lib").Maybe<Zapper>>;
 export declare const getValidZap: (zap: TrustedEvent, parent: TrustedEvent) => Promise<Zap | undefined>;
 export declare const getValidZaps: (zaps: TrustedEvent[], parent: TrustedEvent) => Promise<Zap[]>;
 export declare const deriveValidZaps: (zaps: TrustedEvent[], parent: TrustedEvent) => import("svelte/store").Writable<Zap[]>;

package/dist/app/src/zappers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAuC,MAAM,gBAAgB,CAAA;AAe9F,eAAO,MAAM,OAAO,2CAAyB,CAAA;AAE7C,eAAO,MAAM,YAAY,GAAU,QAAQ,MAAM,EAAE,iCAmClD,CAAA;AAED,eAAO,MACO,cAAc,qEACd,YAAY;;GACd,UAAU,oFACZ,QAAQ,+DAqBhB,CAAA;AAEF,eAAO,MAAM,mBAAmB,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,gCAQ9E,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,wDASvE,CAAA;AAEJ,eAAO,MAAM,iBAAiB,GAAU,OAAO,YAAY,sBAU1D,CAAA;AAED,eAAO,MAAM,eAAe,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,gCAI5E,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,6BAIxE,CAAA;AAED,eAAO,MAAM,YAAY,GAAU,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,mBACE,CAAA;AAE/E,eAAO,MAAM,eAAe,GAAI,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,2CAQzE,CAAA"}
+{"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,UAAU,EAAC,MAAM,cAAc,CAAA;AAC1D,OAAO,EAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAuC,MAAM,gBAAgB,CAAA;AAc9F,eAAO,MAAM,cAAc,sDAAsC,CAAA;AAEjE,eAAO,MAAM,OAAO,2CAA8B,CAAA;AAElD,eAAO,MAAM,iBAAiB,2BAAyB,CAAA;AAEvD,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,uBAAmC,CAAA;AAE1E,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,MAAM,CAAC,EAAO,CAAA;AAEzD,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,SAAkD,CAAA;AAE7F,eAAO,MAAM,QAAQ,GAAI,KAAK,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,+BAQrD,CAAA;AAED,eAAO,MAAM,WAAW,kDAmDtB,CAAA;AAEF,eAAO,MAAM,eAAe,8DAA4C,CAAA;AAExE,eAAO,MAAM,UAAU,iFAAuC,CAAA;AAE9D,eAAO,MAAM,YAAY,uFAA6C,CAAA;AAEtE,eAAO,MAAM,mBAAmB,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,mDAI9E,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,wDAM1E,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,OAAO,YAAY,sBAU1D,CAAA;AAED,eAAO,MAAM,eAAe,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,mDAI5E,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,KAAK,YAAY,EAAE,QAAQ,YAAY,6BAIxE,CAAA;AAED,eAAO,MAAM,YAAY,GAAU,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,mBACE,CAAA;AAE/E,eAAO,MAAM,eAAe,GAAI,MAAM,YAAY,EAAE,EAAE,QAAQ,YAAY,2CAQzE,CAAA"}

package/dist/app/src/zappers.js

@@ -1,68 +1,76 @@
 import { writable, derived } from "svelte/store";
 import { getTagValues, getLnUrl, zapFromEvent } from "@welshman/util";
-import { removeUndefined, fetchJson, uniq, bech32ToHex, hexToBech32, tryCatch, batcher, postJson, } from "@welshman/lib";
-import { collection } from "@welshman/store";
+import { removeUndefined, fetchJson, bech32ToHex, hexToBech32, tryCatch, batcher, postJson, } from "@welshman/lib";
+import { getter, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem } from "@welshman/store";
 import { deriveProfile, loadProfile } from "./profiles.js";
 import { appContext } from "./context.js";
-export const zappers = writable([]);
-export const fetchZappers = async (lnurls) => {
+export const zappersByLnurl = writable(new Map());
+export const zappers = deriveItems(zappersByLnurl);
+export const getZappersByLnurl = getter(zappersByLnurl);
+export const getZapper = (lnurl) => getZappersByLnurl().get(lnurl);
+export const zapperSubscribers = [];
+export const notifyZapper = (zapper) => zapperSubscribers.forEach(sub => sub(zapper));
+export const onZapper = (sub) => {
+    zapperSubscribers.push(sub);
+    return () => zapperSubscribers.splice(zapperSubscribers.findIndex(s => s === sub), 1);
+};
+export const fetchZapper = batcher(800, async (lnurls) => {
     const base = appContext.dufflepudUrl;
-    const zappersByLnurl = new Map();
+    const result = new Map();
+    for (const lnurl of lnurls) {
+        if (!lnurl.startsWith("lnurl1")) {
+            throw new Error(`Invalid lnurl ${lnurl}`);
+        }
+    }
+    const addZapper = (lnurl, info) => {
+        if (info) {
+            try {
+                result.set(lnurl, { ...info, lnurl });
+            }
+            catch (e) {
+                // pass
+            }
+        }
+    };
     // Use dufflepud if we it's set up to protect user privacy, otherwise fetch directly
     if (base) {
-        const hexUrls = removeUndefined(lnurls.map(lnurl => tryCatch(() => bech32ToHex(lnurl))));
-        if (hexUrls.length > 0) {
-            const res = await tryCatch(async () => await postJson(`${base}/zapper/info`, { lnurls: hexUrls }));
-            for (const { lnurl, info } of res?.data || []) {
-                tryCatch(() => zappersByLnurl.set(hexToBech32("lnurl", lnurl), info));
-            }
+        const hexUrls = lnurls.map(bech32ToHex);
+        const res = await tryCatch(() => postJson(`${base}/zapper/info`, { lnurls: hexUrls }));
+        for (const { lnurl, info } of res?.data || []) {
+            addZapper(hexToBech32("lnurl", lnurl), info);
         }
     }
     else {
-        const results = await Promise.all(lnurls.map(async (lnurl) => {
-            const hexUrl = tryCatch(() => bech32ToHex(lnurl));
-            const info = hexUrl ? await tryCatch(async () => await fetchJson(hexUrl)) : undefined;
-            return { lnurl, hexUrl, info };
+        await Promise.all(lnurls.map(async (lnurl) => {
+            addZapper(lnurl, await tryCatch(() => fetchJson(bech32ToHex(lnurl))));
         }));
-        for (const { lnurl, info } of results) {
-            if (info) {
-                zappersByLnurl.set(lnurl, info);
-            }
-        }
     }
-    return zappersByLnurl;
-};
-export const { indexStore: zappersByLnurl, deriveItem: deriveZapper, loadItem: loadZapper, onItem: onZapper, } = collection({
-    name: "zappers",
-    store: zappers,
-    getKey: (zapper) => zapper.lnurl,
-    load: batcher(800, async (lnurls) => {
-        const fresh = await fetchZappers(uniq(lnurls));
-        const stale = zappersByLnurl.get();
-        for (const lnurl of lnurls) {
-            const newZapper = fresh.get(lnurl);
-            if (newZapper) {
-                stale.set(lnurl, { ...newZapper, lnurl });
+    if (result.size > 0) {
+        zappersByLnurl.update($zappersByLnurl => {
+            for (const [lnurl, zapper] of result) {
+                $zappersByLnurl.set(lnurl, zapper);
             }
+            return $zappersByLnurl;
+        });
+        for (const zapper of result.values()) {
+            notifyZapper(zapper);
         }
-        zappers.set(Array.from(stale.values()));
-        return lnurls;
-    }),
+    }
+    return lnurls.map(lnurl => result.get(lnurl));
 });
+export const forceLoadZapper = makeForceLoadItem(fetchZapper, getZapper);
+export const loadZapper = makeLoadItem(fetchZapper, getZapper);
+export const deriveZapper = makeDeriveItem(zappersByLnurl, loadZapper);
 export const loadZapperForPubkey = async (pubkey, relays = []) => {
     const $profile = await loadProfile(pubkey, relays);
-    if (!$profile?.lnurl) {
-        return undefined;
-    }
-    return loadZapper($profile.lnurl);
+    return $profile?.lnurl ? loadZapper($profile.lnurl) : undefined;
+};
+export const deriveZapperForPubkey = (pubkey, relays = []) => {
+    loadZapperForPubkey(pubkey, relays);
+    return derived([zappersByLnurl, deriveProfile(pubkey, relays)], ([$zappersByLnurl, $profile]) => {
+        return $profile?.lnurl ? $zappersByLnurl.get($profile.lnurl) : undefined;
+    });
 };
-export const deriveZapperForPubkey = (pubkey, relays = []) => derived([zappersByLnurl, deriveProfile(pubkey, relays)], ([$zappersByLnurl, $profile]) => {
-    if (!$profile?.lnurl) {
-        return undefined;
-    }
-    loadZapper($profile.lnurl);
-    return $zappersByLnurl.get($profile.lnurl);
-});
 export const getLnUrlsForEvent = async (event) => {
     const lnurls = removeUndefined(getTagValues("zap", event.tags).map(getLnUrl));
     if (lnurls.length > 0) {

package/dist/app/src/zappers.js.map

@@ -1 +1 @@
-{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,EAA4B,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC9F,OAAO,EACL,eAAe,EACf,SAAS,EACT,IAAI,EACJ,WAAW,EACX,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,GACT,MAAM,eAAe,CAAA;AACtB,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,eAAe,CAAA;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAEvC,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAA;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAgB,EAAE,EAAE;IACrD,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,CAAA;IACpC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEhD,oFAAoF;IACpF,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAExF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,GAAG,GAAQ,MAAM,QAAQ,CAC7B,KAAK,IAAI,EAAE,CAAC,MAAM,QAAQ,CAAC,GAAG,IAAI,cAAc,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC,CAAC,CACrE,CAAA;YAED,KAAK,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,IAAI,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;YACvE,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAA;YACjD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAErF,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAA;QAC9B,CAAC,CAAC,CACH,CAAA;QAED,KAAK,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,IAAI,OAAO,EAAE,CAAC;YACpC,IAAI,IAAI,EAAE,CAAC;gBACT,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,EACX,UAAU,EAAE,cAAc,EAC1B,UAAU,EAAE,YAAY,EACxB,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,QAAQ,GACjB,GAAG,UAAU,CAAC;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK;IACxC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,MAAgB,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC9C,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,EAAE,CAAA;QAElC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAElC,IAAI,SAAS,EAAE,CAAC;gBACd,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAC,GAAG,SAAS,EAAE,KAAK,EAAC,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAEvC,OAAO,MAAM,CAAA;IACf,CAAC,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAc,EAAE,SAAmB,EAAE,EAAE,EAAE;IACjF,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAElD,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QACrB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAc,EAAE,SAAmB,EAAE,EAAE,EAAE,CAC7E,OAAO,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,EAAE,QAAQ,CAAC,EAAE,EAAE;IACvF,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QACrB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE1B,OAAO,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC5C,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,KAAmB,EAAE,EAAE;IAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAE/C,OAAO,eAAe,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,GAAiB,EAAE,MAAoB,EAAE,EAAE;IAC/E,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAE9C,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAC9D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,GAAiB,EAAE,MAAoB,EAAE,EAAE;IAC3E,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAEjD,OAAO,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,IAAoB,EAAE,MAAoB,EAAE,EAAE,CAC/E,eAAe,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAoB,EAAE,MAAoB,EAAE,EAAE;IAC5E,MAAM,KAAK,GAAG,QAAQ,CAAQ,EAAE,CAAC,CAAA;IAEjC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC1C,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../src/zappers.ts"],"names":[],"mappings":"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"}

package/dist/lib/src/Tools.d.ts

@@ -230,6 +230,13 @@ export declare const concat: <T>(...xs: T[][]) => T[];
  * @returns New array with element appended
  */
 export declare const append: <T>(x: T, xs: Iterable<T>) => T[];
+/**
+ * Prepends element to array
+ * @param x - Element to prepend
+ * @param xs - Array to prepend to
+ * @returns New array with element prepended
+ */
+export declare const prepend: <T>(x: T, xs: Iterable<T>) => T[];
 /**
  * Creates union of two arrays
  * @param a - First array
@@ -313,21 +320,37 @@ export declare const flatten: <T>(xs: (T | T[])[], ...args: unknown[]) => T[];
  * @param xs - Array to partition
  * @returns Tuple of [matching, non-matching] arrays
  */
-export declare const partition: <T>(f: (x: T) => boolean, xs: T[]) => T[][];
+export declare const partition: <T>(f: (x: T) => boolean, xs: Iterable<T>) => T[][];
+/** Maps any iterable */
+export declare const map: <T, R>(f: (x: T) => R, xs: Iterable<T>) => R[];
 /**
  * Keeps items based on predicate
- * @param f - Whether to remove an item from the array
- * @param xs - Array of items to filter
+ * @param f - Whether to keep an item
+ * @param xs - Items to filter
  * @returns Filtered array
  */
-export declare const filter: <T>(f: (x: T) => any, xs: T[]) => T[];
+export declare const filter: <T>(f: (x: T) => any, xs: Iterable<T>) => T[];
 /**
  * Removes items based on predicate
  * @param f - Whether to remove an item from the array
- * @param xs - Array of items to filter
+ * @param xs - Items to filter
  * @returns Filtered array
  */
-export declare const reject: <T>(f: (x: T) => any, xs: T[]) => T[];
+export declare const reject: <T>(f: (x: T) => any, xs: Iterable<T>) => T[];
+/**
+ * Finds a single item based on predicate
+ * @param f - Whether an item matches
+ * @param xs - Items to filter
+ * @returns first matching item
+ */
+export declare const find: <T>(f: (x: T) => any, xs: Iterable<T>) => T | undefined;
+/**
+ * Finds a single item based on predicate
+ * @param f - Whether an item matches
+ * @param xs - Items to filter
+ * @returns whether an item matches
+ */
+export declare const some: <T>(f: (x: T) => any, xs: Iterable<T>) => boolean;
 /**
  * Returns array with duplicate elements removed
  * @param xs - Array with possible duplicates
@@ -340,7 +363,7 @@ export declare const uniq: <T>(xs: T[]) => T[];
  * @param xs - Input array
  * @returns Array with elements unique by key
  */
-export declare const uniqBy: <T>(f: (x: T) => any, xs: T[]) => T[];
+export declare const uniqBy: <T>(f: (x: T) => any, xs: Iterable<T>) => T[];
 /**
  * Returns sorted copy of array
  * @param xs - Array to sort
@@ -353,7 +376,7 @@ export declare const sort: <T>(xs: T[]) => T[];
  * @param xs - Array to sort
  * @returns Sorted array
  */
-export declare const sortBy: <T>(f: (x: T) => any, xs: T[]) => T[];
+export declare const sortBy: <T>(f: (x: T) => any, xs: Iterable<T>) => T[];
 /**
  * Groups array elements by key function
  * @param f - Function to generate group key
@@ -501,6 +524,10 @@ export declare const complement: <T extends unknown[]>(f: (...args: T) => any) =
  * @returns Function result or undefined if error
  */
 export declare const tryCatch: <T>(f: () => T, onError?: (e: Error) => void) => T | undefined;
+/**
+ * Throws an error with the given message
+ */
+export declare const thrower: (message: string) => () => never;
 /**
  * Creates function that only executes once
  * @param f - Function to wrap
@@ -566,7 +593,7 @@ export declare const yieldThread: () => any;
  * @param f - Function to throttle
  * @returns Throttled function
  */
-export declare const throttle: <F extends (...args: any[]) => any>(ms: number, f: F) => F | ((...thisArgs: Parameters<F>) => void);
+export declare const throttle: <F extends (...args: any[]) => any>(ms: number, f: F) => F | ((...args: Parameters<F>) => void);
 /**
  * Creates throttled function that returns cached value
  * @param ms - Minimum time between updates