@welshman/app 0.1.2 → 0.2.0

package/dist/feeds/src/request.js

@@ -0,0 +1,61 @@
+import { partition, now, nthEq, race } from "@welshman/lib";
+import { makeEvent, getPubkeyTagValues } from "@welshman/util";
+import { Nip01Signer } from "@welshman/signer";
+import { Router, getFilterSelections, addMinimalFallbacks } from "@welshman/router";
+import { Tracker, request } from "@welshman/net";
+import { makeDvmRequest } from "@welshman/dvm";
+export const requestPage = async ({ filters = [{}], relays = [], onEvent, signal, repository, tracker = new Tracker(), }) => {
+    if (relays.length > 0) {
+        return request({ tracker, signal, relays, filters, onEvent, autoClose: true });
+    }
+    const promises = [];
+    const [withSearch, withoutSearch] = partition(f => Boolean(f.search), filters);
+    if (withSearch.length > 0) {
+        promises.push(request({
+            signal,
+            tracker,
+            onEvent,
+            threshold: 0.1,
+            autoClose: true,
+            filters: withSearch,
+            relays: Router.get().Search().getUrls(),
+        }));
+    }
+    if (withoutSearch.length > 0) {
+        promises.push(...getFilterSelections(filters).flatMap(({ relays, filters }) => request({ tracker, signal, onEvent, relays, filters, threshold: 0.8, autoClose: true })));
+    }
+    // Break out selections by relay so we can complete early after a certain number
+    // of requests complete for faster load times
+    await race(withSearch.length > 0 ? 0.1 : 0.8, promises);
+    // Wait until after we've queried the network to access our local cache. This results in less
+    // snappy response times, but is necessary to prevent stale stuff that the user has already seen
+    // from showing up at the top of the feed
+    if (repository) {
+        for (const event of repository.query(filters)) {
+            onEvent?.(event);
+        }
+    }
+};
+export const requestDVM = async ({ kind, onResult, tags = [], relays = [], signer = Nip01Signer.ephemeral(), }) => {
+    if (relays.length === 0) {
+        relays = Router.get()
+            .FromPubkeys(getPubkeyTagValues(tags))
+            .policy(addMinimalFallbacks)
+            .getUrls();
+    }
+    if (!tags.some(nthEq(0, "expiration"))) {
+        tags.push(["expiration", String(now() + 60)]);
+    }
+    if (!tags.some(nthEq(0, "relays"))) {
+        tags.push(["relays", ...relays]);
+    }
+    if (!tags.some(nthEq(1, "user"))) {
+        tags.push(["param", "user", await signer.getPubkey()]);
+    }
+    if (!tags.some(nthEq(1, "max_results"))) {
+        tags.push(["param", "max_results", "200"]);
+    }
+    const event = await signer.sign(makeEvent(kind, { tags }));
+    await makeDvmRequest({ relays, event, onResult });
+};
+//# sourceMappingURL=request.js.map

package/dist/feeds/src/request.js.map

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

package/dist/feeds/src/utils.d.ts

@@ -1,4 +1,4 @@
-import type { Filter } from "@welshman/util";
+import { Filter } from "@welshman/util";
 import { Feed, AddressFeed, AuthorFeed, CreatedAtFeed, DVMFeed, DifferenceFeed, IDFeed, IntersectionFeed, GlobalFeed, KindFeed, ListFeed, LabelFeed, WOTFeed, RelayFeed, ScopeFeed, SearchFeed, TagFeed, UnionFeed, TagFeedMapping, Scope, WOTItem, DVMItem, ListItem, LabelItem, CreatedAtItem } from "./core.js";
 export declare const makeAddressFeed: (...addresses: string[]) => AddressFeed;
 export declare const makeAuthorFeed: (...pubkeys: string[]) => AuthorFeed;

package/dist/feeds/src/utils.d.ts.map

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

package/dist/feeds/src/utils.js

@@ -1,4 +1,5 @@
 import { ensureNumber } from "@welshman/lib";
+import { unionFilters } from "@welshman/util";
 import { getTagValues } from "@welshman/util";
 import { FeedType, } from "./core.js";
 export const makeAddressFeed = (...addresses) => [
@@ -139,7 +140,7 @@ export const feedsFromFilter = ({ since, until, ...filter }) => {
     return feeds;
 };
 export const feedFromFilter = (filter) => makeIntersectionFeed(...feedsFromFilter(filter));
-export const feedFromFilters = (filters) => makeUnionFeed(...filters.map(filter => feedFromFilter(filter)));
+export const feedFromFilters = (filters) => makeUnionFeed(...unionFilters(filters).map(filter => feedFromFilter(filter)));
 export const walkFeed = (feed, visit) => {
     visit(feed);
     if (hasSubFeeds(feed)) {

package/dist/feeds/src/utils.js.map

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

package/dist/feeds/src/validate.d.ts

@@ -0,0 +1,24 @@
+import Trava from "trava";
+declare const ValidationError: typeof Trava.ValidationError;
+export { ValidationError };
+export declare const validateTagFeedMapping: Trava.Validator;
+export declare const validateFeedArgs: (validateArgument: Trava.Validator) => (feed: any) => any;
+export declare const validateAddressFeed: (feed: any) => any;
+export declare const validateAuthorFeed: (feed: any) => any;
+export declare const validateCreatedAtFeed: (feed: any) => any;
+export declare const validateDVMFeed: (feed: any) => any;
+export declare const validateDifferenceFeed: (feed: any) => any;
+export declare const validateIDFeed: (feed: any) => any;
+export declare const validateIntersectionFeed: (feed: any) => any;
+export declare const validateGlobalFeed: (feed: any) => any;
+export declare const validateKindFeed: (feed: any) => any;
+export declare const validateListFeed: (feed: any) => any;
+export declare const validateLabelFeed: (feed: any) => any;
+export declare const validateWOTFeed: (feed: any) => any;
+export declare const validateRelayFeed: (feed: any) => any;
+export declare const validateScopeFeed: (feed: any) => any;
+export declare const validateSearchFeed: (feed: any) => any;
+export declare const validateTagFeed: (feed: any) => any;
+export declare const validateUnionFeed: (feed: any) => any;
+export declare const validateFeed: (feed: any) => any;
+//# sourceMappingURL=validate.d.ts.map

package/dist/feeds/src/validate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../feeds/src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,QAAA,MAAO,eAAe,8BAA+C,CAAA;AAqBrE,OAAO,EAAC,eAAe,EAAC,CAAA;AAExB,eAAO,MAAM,sBAAsB,iBAKjC,CAAA;AAEF,eAAO,MAAM,gBAAgB,GAAI,kBAAkB,KAAK,CAAC,SAAS,MAAM,MAAM,GAAG,QAUhF,CAAA;AAED,eAAO,MAAM,mBAAmB,SAZ8C,GAAG,QAYb,CAAA;AAEpE,eAAO,MAAM,kBAAkB,SAd+C,GAAG,QAclB,CAAA;AAE/D,eAAO,MAAM,qBAAqB,SAhB4C,GAAG,QAsBhF,CAAA;AAED,eAAO,MAAM,eAAe,SAxBkD,GAAG,QA+BhF,CAAA;AAED,eAAO,MAAM,sBAAsB,SAjC2C,GAAG,QAiCE,CAAA;AAEnF,eAAO,MAAM,cAAc,SAnCmD,GAAG,QAmCtB,CAAA;AAE3D,eAAO,MAAM,wBAAwB,SArCyC,GAAG,QAqCI,CAAA;AAErF,eAAO,MAAM,kBAAkB,SAvC+C,GAAG,QAuCF,CAAA;AAE/E,eAAO,MAAM,gBAAgB,SAzCiD,GAAG,QAyCjB,CAAA;AAEhE,eAAO,MAAM,gBAAgB,SA3CiD,GAAG,QAgDhF,CAAA;AAED,eAAO,MAAM,iBAAiB,SAlDgD,GAAG,QA+EhF,CAAA;AAED,eAAO,MAAM,eAAe,SAjFkD,GAAG,QAsFhF,CAAA;AAED,eAAO,MAAM,iBAAiB,SAxFgD,GAAG,QAwFjB,CAAA;AAEhE,eAAO,MAAM,iBAAiB,SA1FgD,GAAG,QA0FjB,CAAA;AAEhE,eAAO,MAAM,kBAAkB,SA5F+C,GAAG,QA4Ff,CAAA;AAElE,eAAO,MAAM,eAAe,SA9FkD,GAAG,QA8FlB,CAAA;AAE/D,eAAO,MAAM,iBAAiB,SAhGgD,GAAG,QAgGH,CAAA;AAE9E,eAAO,MAAM,YAAY,GAAI,MAAM,GAAG,QA0CrC,CAAA"}

package/dist/feeds/src/validate.js

@@ -0,0 +1,137 @@
+import Trava from "trava";
+import { spec, isPojo } from "@welshman/lib";
+import { isRelayUrl, Address } from "@welshman/util";
+import { Scope, FeedType } from "./core.js";
+import { getFeedArgs } from "./utils.js";
+const { ValidationError, Compose, Check, Each, Optional, Keys } = Trava;
+const validateNumber = Check((x) => typeof x === "number", "Value must be a number");
+const validateString = Check((x) => typeof x === "string", "Value must be a string");
+const validateRelay = Check((x) => typeof x === "string" && isRelayUrl(x), "Invalid relay url");
+const validateScope = Check((x) => Object.values(Scope).includes(x), "Invalid scope");
+const validateHex = Check((x) => typeof x === "string" && x.length === 64, "Invalid hex value");
+const validateAddress = Check((x) => typeof x === "string" && Address.isAddress(x), "Invalid address");
+const validateArray = Check((x) => Array.isArray(x), "Value must be an array");
+const validateObject = Check((x) => isPojo(x), "Value must be an object");
+export { ValidationError };
+export const validateTagFeedMapping = Compose([
+    validateArray,
+    Check(spec({ length: 2 }), "Tag feed mappings must have two entries"),
+    (a) => validateString(a[0]),
+    (a) => validateFeed(a[1]),
+]);
+export const validateFeedArgs = (validateArgument) => (feed) => {
+    let error = validateArray(feed);
+    if (error instanceof ValidationError)
+        return error;
+    for (const argument of getFeedArgs(feed)) {
+        error = validateArgument(argument);
+        if (error instanceof ValidationError)
+            return error;
+    }
+    return feed;
+};
+export const validateAddressFeed = validateFeedArgs(validateAddress);
+export const validateAuthorFeed = validateFeedArgs(validateHex);
+export const validateCreatedAtFeed = validateFeedArgs(Keys({
+    since: Optional(validateNumber),
+    until: Optional(validateNumber),
+    relative: Optional(Each(validateString)),
+}));
+export const validateDVMFeed = validateFeedArgs(Keys({
+    kind: validateNumber,
+    tags: Optional(Each(validateString)),
+    relays: Optional(Each(validateString)),
+    mappings: Optional(Each(validateTagFeedMapping)),
+}));
+export const validateDifferenceFeed = validateFeedArgs((x) => validateFeed(x));
+export const validateIDFeed = validateFeedArgs(validateHex);
+export const validateIntersectionFeed = validateFeedArgs((x) => validateFeed(x));
+export const validateGlobalFeed = validateFeedArgs((x) => validateFeed(x));
+export const validateKindFeed = validateFeedArgs(validateNumber);
+export const validateListFeed = validateFeedArgs(Keys({
+    addresses: Optional(Each(validateString)),
+    mappings: Optional(Each(validateTagFeedMapping)),
+}));
+export const validateLabelFeed = validateFeedArgs(Compose([
+    validateObject,
+    (item) => {
+        const validateRelays = Each(validateRelay);
+        const validateAuthors = Each(validateHex);
+        const validateStrings = Each(validateString);
+        const validateMappings = Each(validateTagFeedMapping);
+        for (const [key, value] of Object.entries(item)) {
+            let error;
+            if (key === "relays") {
+                error = validateRelays(value);
+            }
+            else if (key === "authors") {
+                error = validateAuthors(value);
+            }
+            else if (key === "mappings") {
+                error = validateMappings(value);
+            }
+            else if (key.match("^#.$")) {
+                error = validateStrings(value);
+            }
+            else {
+                error = new ValidationError("Invalid label item");
+            }
+            if (error instanceof ValidationError)
+                return error;
+        }
+        return item;
+    },
+]));
+export const validateWOTFeed = validateFeedArgs(Keys({
+    min: Optional(validateNumber),
+    max: Optional(validateNumber),
+}));
+export const validateRelayFeed = validateFeedArgs(validateRelay);
+export const validateScopeFeed = validateFeedArgs(validateScope);
+export const validateSearchFeed = validateFeedArgs(validateString);
+export const validateTagFeed = validateFeedArgs(validateString);
+export const validateUnionFeed = validateFeedArgs((x) => validateFeed(x));
+export const validateFeed = (feed) => {
+    const error = validateArray(feed);
+    if (error instanceof ValidationError)
+        return error;
+    switch (feed[0]) {
+        case FeedType.Address:
+            return validateAddressFeed(feed);
+        case FeedType.Author:
+            return validateAuthorFeed(feed);
+        case FeedType.CreatedAt:
+            return validateCreatedAtFeed(feed);
+        case FeedType.DVM:
+            return validateDVMFeed(feed);
+        case FeedType.Difference:
+            return validateDifferenceFeed(feed);
+        case FeedType.ID:
+            return validateIDFeed(feed);
+        case FeedType.Intersection:
+            return validateIntersectionFeed(feed);
+        case FeedType.Global:
+            return validateGlobalFeed(feed);
+        case FeedType.Kind:
+            return validateKindFeed(feed);
+        case FeedType.List:
+            return validateListFeed(feed);
+        case FeedType.Label:
+            return validateLabelFeed(feed);
+        case FeedType.WOT:
+            return validateWOTFeed(feed);
+        case FeedType.Relay:
+            return validateRelayFeed(feed);
+        case FeedType.Scope:
+            return validateScopeFeed(feed);
+        case FeedType.Search:
+            return validateSearchFeed(feed);
+        case FeedType.Tag:
+            return validateTagFeed(feed);
+        case FeedType.Union:
+            return validateUnionFeed(feed);
+        default:
+            return new ValidationError("Unknown feed type");
+    }
+};
+//# sourceMappingURL=validate.js.map

package/dist/feeds/src/validate.js.map

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

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

@@ -4,12 +4,14 @@ export type TaskQueueOptions<Item> = {
 };
 export declare class TaskQueue<Item> {
     readonly options: TaskQueueOptions<Item>;
+    _subs: ((item: Item) => void)[];
     items: Item[];
     isPaused: boolean;
     isProcessing: boolean;
     constructor(options: TaskQueueOptions<Item>);
     push(item: Item): void;
     remove(item: Item): void;
+    subscribe(subscriber: (item: Item) => void): () => void;
     process(): Promise<void>;
     stop(): void;
     start(): void;

package/dist/lib/src/TaskQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskQueue.d.ts","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,CAAC,IAAI,IAAI;IACnC,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAA;CACrC,CAAA;AAED,qBAAa,SAAS,CAAC,IAAI;IAKb,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAJpD,KAAK,EAAE,IAAI,EAAE,CAAK;IAClB,QAAQ,UAAQ;IAChB,YAAY,UAAQ;gBAEC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE,IAAI;IAKf,MAAM,CAAC,IAAI,EAAE,IAAI;IAIX,OAAO;IAwBb,IAAI;IAIJ,KAAK;IAKL,KAAK;CAGN"}
+{"version":3,"file":"TaskQueue.d.ts","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,CAAC,IAAI,IAAI;IACnC,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAA;CACrC,CAAA;AAED,qBAAa,SAAS,CAAC,IAAI;IAMb,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;IALpD,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,EAAE,CAAK;IACpC,KAAK,EAAE,IAAI,EAAE,CAAK;IAClB,QAAQ,UAAQ;IAChB,YAAY,UAAQ;gBAEC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAEpD,IAAI,CAAC,IAAI,EAAE,IAAI;IAKf,MAAM,CAAC,IAAI,EAAE,IAAI;IAIjB,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAQpC,OAAO;IA4Bb,IAAI;IAIJ,KAAK;IAKL,KAAK;CAGN"}

package/dist/lib/src/TaskQueue.js

@@ -1,6 +1,7 @@
 import { remove, yieldThread } from "./Tools.js";
 export class TaskQueue {
     options;
+    _subs = [];
     items = [];
     isPaused = false;
     isProcessing = false;
@@ -14,6 +15,12 @@ export class TaskQueue {
     remove(item) {
         this.items = remove(item, this.items);
     }
+    subscribe(subscriber) {
+        this._subs.push(subscriber);
+        return () => {
+            this._subs = remove(subscriber, this._subs);
+        };
+    }
     async process() {
         if (this.isProcessing || this.isPaused || this.items.length === 0) {
             return;
@@ -22,6 +29,9 @@ export class TaskQueue {
         await yieldThread();
         for (const item of this.items.splice(0, this.options.batchSize)) {
             try {
+                for (const subscriber of this._subs) {
+                    subscriber(item);
+                }
                 await this.options.processItem(item);
             }
             catch (e) {

package/dist/lib/src/TaskQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskQueue.js","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,YAAY,CAAA;AAO9C,MAAM,OAAO,SAAS;IAKC;IAJrB,KAAK,GAAW,EAAE,CAAA;IAClB,QAAQ,GAAG,KAAK,CAAA;IAChB,YAAY,GAAG,KAAK,CAAA;IAEpB,YAAqB,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAAG,CAAC;IAExD,IAAI,CAAC,IAAU;QACb,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrB,IAAI,CAAC,OAAO,EAAE,CAAA;IAChB,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClE,OAAM;QACR,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QAExB,MAAM,WAAW,EAAE,CAAA;QAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QAEzB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,EAAE,CAAA;QAChB,CAAC;IACH,CAAC;IAED,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;IACtB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACrB,IAAI,CAAC,OAAO,EAAE,CAAA;IAChB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;IACjB,CAAC;CACF"}
+{"version":3,"file":"TaskQueue.js","sourceRoot":"","sources":["../../../../lib/src/TaskQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,YAAY,CAAA;AAO9C,MAAM,OAAO,SAAS;IAMC;IALrB,KAAK,GAA6B,EAAE,CAAA;IACpC,KAAK,GAAW,EAAE,CAAA;IAClB,QAAQ,GAAG,KAAK,CAAA;IAChB,YAAY,GAAG,KAAK,CAAA;IAEpB,YAAqB,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAAG,CAAC;IAExD,IAAI,CAAC,IAAU;QACb,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrB,IAAI,CAAC,OAAO,EAAE,CAAA;IAChB,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC;IAED,SAAS,CAAC,UAAgC;QACxC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAE3B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClE,OAAM;QACR,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QAExB,MAAM,WAAW,EAAE,CAAA;QAEnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC;gBACH,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACpC,UAAU,CAAC,IAAI,CAAC,CAAA;gBAClB,CAAC;gBAED,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QAEzB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,EAAE,CAAA;QAChB,CAAC;IACH,CAAC;IAED,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;IACtB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACrB,IAAI,CAAC,OAAO,EAAE,CAAA;IAChB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;IACjB,CAAC;CACF"}

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

@@ -1,4 +1,8 @@
 type Obj<T = any> = Record<string, T>;
+export type Nil = null | undefined;
+export declare const isNil: <T>(x: T, ...args: unknown[]) => boolean;
+export declare const isNotNil: <T>(x: T, ...args: unknown[]) => x is T & {};
+export declare const assertNotNil: <T>(x: T, ...args: unknown[]) => NonNullable<T>;
 /** Function that does nothing and returns undefined */
 export declare const noop: (...args: unknown[]) => undefined;
 /**
@@ -100,6 +104,10 @@ export declare const MONTH: number;
 export declare const QUARTER: number;
 /** One year in seconds (approximate) */
 export declare const YEAR: number;
+/** User's default locale */
+export declare const LOCALE: string;
+/** User's default timezone */
+export declare const TIMEZONE: string;
 /**
  * Multiplies time unit by count
  * @param unit - Time unit in seconds
@@ -122,6 +130,55 @@ export declare const ago: (unit: number, count?: number) => number;
  * @returns Time in milliseconds
  */
 export declare const ms: (seconds: number) => number;
+/**
+ * Converts seconds to date
+ * @param seconds - Time in seconds
+ * @returns Date object
+ */
+export declare const secondsToDate: (seconds: number) => Date;
+/**
+ * Converts date object to seconds
+ * @param date - Date object
+ * @returns timestamp in seconds
+ */
+export declare const dateToSeconds: (date: Date) => number;
+/**
+ * Creates a local date from a date string
+ * @param dateString - date string
+ * @param timezone - timezone string
+ * @returns timezone-aware Date object
+ */
+export declare const createLocalDate: (dateString: any, timezone?: string) => Date;
+/** Formatter for date+time */
+export declare const dateTimeFormatter: Intl.DateTimeFormat;
+/**
+ * Formats seconds as a datetime
+ * @param seconds - timestamp in seconds
+ * @returns datetime string
+ */
+export declare const formatTimestamp: (seconds: number) => string;
+/** Formatter for date */
+export declare const dateFormatter: Intl.DateTimeFormat;
+/**
+ * Formats seconds as a date
+ * @param seconds - timestamp in seconds
+ * @returns date string
+ */
+export declare const formatTimestampAsDate: (ts: number) => string;
+/** Formatter for time */
+export declare const timeFormatter: Intl.DateTimeFormat;
+/**
+ * Formats seconds as a time
+ * @param seconds - timestamp in seconds
+ * @returns time string
+ */
+export declare const formatTimestampAsTime: (ts: number) => string;
+/**
+ * Formats seconds as a relative date (x minutes ago)
+ * @param seconds - timestamp in seconds
+ * @returns relative date string
+ */
+export declare const formatTimestampRelative: (ts: number) => string;
 /**
  * Returns the first element of an array
  * @param xs - The array
@@ -195,6 +252,13 @@ export declare const difference: <T>(a: T[], b: T[]) => T[];
  * @returns New array with element removed
  */
 export declare const remove: <T>(a: T, xs: T[]) => T[];
+/**
+ * Removes element at index
+ * @param i - Index to remove
+ * @param xs - Source array
+ * @returns New array with element removed
+ */
+export declare const removeAt: <T>(i: number, xs: T[]) => T[];
 /**
  * Returns elements from second array not present in first
  * @param a - Array of elements to exclude
@@ -277,6 +341,13 @@ export declare const sortBy: <T>(f: (x: T) => any, xs: T[]) => T[];
  * @returns Map of groups
  */
 export declare const groupBy: <T, K>(f: (x: T) => K, xs: T[]) => Map<K, T[]>;
+/**
+ * Counts array elements by key function
+ * @param f - Function to generate group key
+ * @param xs - Array to count entries
+ * @returns Map of counts
+ */
+export declare const countBy: <T, K>(f: (x: T) => K, xs: T[]) => Map<K, number>;
 /**
  * Creates map from array using key function
  * @param f - Function to generate key
@@ -308,7 +379,9 @@ export declare const chunks: <T>(n: number, xs: T[]) => T[][];
 /** Splits array into two parts at index */
 export declare const splitAt: <T>(n: number, xs: T[]) => T[][];
 /** Inserts element into array at index */
-export declare const insert: <T>(n: number, x: T, xs: T[]) => T[];
+export declare const insertAt: <T>(n: number, x: T, xs: T[]) => T[];
+/** Replaces array element at index */
+export declare const replaceAt: <T>(n: number, x: T, xs: T[]) => T[];
 /** Returns random element from array */
 export declare const choice: <T>(xs: T[]) => T;
 /** Returns shuffled copy of iterable */
@@ -321,6 +394,8 @@ export declare const isIterable: (x: any) => boolean;
 export declare const toIterable: (x: any) => any;
 /** Ensures value is array by wrapping if needed */
 export declare const ensurePlural: <T>(x: T | T[]) => T[];
+/** Ensures values are not undefined */
+export declare const removeNil: <T>(xs: T[]) => NonNullable<T & {}>[];
 /**
  * Checks if value is a plain object
  * @param obj - Value to check
@@ -446,6 +521,17 @@ export declare const randomId: () => string;
  * @returns Promise that resolves after t milliseconds
  */
 export declare const sleep: (t: number) => Promise<unknown>;
+export type PollOptions = {
+    signal: AbortSignal;
+    condition: () => boolean;
+    interval?: number;
+};
+/**
+ * Creates a promise that resolves after the condition completes or timeout
+ * @param options - PollOptions
+ * @returns void Promise
+ */
+export declare const poll: ({ interval, condition, signal }: PollOptions) => Promise<void>;
 /**
  * Creates a microtask that yields to other tasks in the event loop
  * @returns Promise that resolves after yielding
@@ -481,6 +567,13 @@ export declare const batch: <T>(t: number, f: (xs: T[]) => void) => (x: T) => vo
  * @returns Function that returns promise of result
  */
 export declare const batcher: <T, U>(t: number, execute: (request: T[]) => U[] | Promise<U[]>) => (request: T) => Promise<U>;
+/**
+ * Returns a promise that resolves after some proportion of promises complete
+ * @param threshold - number between 0 and 1 for how many promises to wait for
+ * @param promises - array of promises
+ * @returns promise
+ */
+export declare const race: (threshold: number, promises: Promise<unknown>[]) => Promise<void>;
 /**
  * Removes protocol (http://, https://, etc) from URL
  * @param url - URL to process
@@ -565,6 +658,8 @@ export declare const on: <EventMap extends Record<string | symbol, any[]>, E ext
  * @returns Truncated string
  */
 export declare const ellipsize: (s: string, l: number, suffix?: string) => string;
+/** Displays a list of items with oxford commas and a chosen conjunction */
+export declare const displayList: <T>(xs: T[], conj?: string, n?: number) => string;
 /** Generates a hash string from input string */
 export declare const hash: (s: string) => string;
 /** Returns a function that gets the nth element of an array */
@@ -576,15 +671,17 @@ export declare const nthNe: (i: number, v: any) => (xs: any[], ...args: unknown[
 /** Returns a function that checks if key/value pairs of x match all pairs in spec */
 export declare const spec: (values: Obj | Array<any>) => (x: Obj | Array<any>, ...args: unknown[]) => boolean;
 /** Returns a function that checks equality with value */
-export declare const eq: <T>(v: T) => (x: T) => boolean;
+export declare const eq: <T>(v: T) => (x: T, ...args: unknown[]) => boolean;
 /** Returns a function that checks inequality with value */
-export declare const ne: <T>(v: T) => (x: T) => boolean;
+export declare const ne: <T>(v: T) => (x: T, ...args: unknown[]) => boolean;
 /** Returns a function that gets property value from object */
 export declare const prop: <T>(k: string) => (x: Record<string, unknown>) => T;
 /** Returns a function that adds/updates a property on object */
 export declare const assoc: <K extends string, T, U>(k: K, v: T) => (o: U) => U & Record<K, T>;
 /** Returns a function that removes a property on object */
 export declare const dissoc: <K extends string, T extends Obj>(k: K) => (o: T) => T;
+/** Returns a function that checks whether a value is in the given sequence */
+export declare const member: <T>(xs: Iterable<T>) => (x: T) => boolean;
 /**
  * Adds value to Set at key in object
  * @param m - Object mapping keys to Sets