@gera2ld/common 0.1.0 → 0.1.2

package/dist/index.js

@@ -398,50 +398,45 @@ function G(e) {
 	}), t;
 }
 function K(e, t) {
-	let { json: n, timeout: r = 1e4, searchParams: i, ...a } = t || {}, o = new AbortController(), s = r ? setTimeout(() => o.abort(), r) : null, c = new Headers(a.headers);
-	n != null && (a.body = JSON.stringify(n), c.set("content-type", "application/json"));
-	let l = new URL(e);
-	i && (l.search = G(i).toString());
-	async function u(e) {
+	let { json: n, timeout: r = 1e4, searchParams: i, signal: a = AbortSignal.timeout(r), ...o } = t || {}, s = new Headers(o.headers);
+	n != null && (o.body = JSON.stringify(n), s.set("content-type", "application/json"));
+	let c = new URL(e);
+	i && (c.search = G(i).toString());
+	async function l(e) {
 		let n;
 		try {
-			n = await fetch(l, {
-				...a,
-				headers: c,
-				signal: o.signal
+			n = await fetch(c, {
+				...o,
+				headers: s,
+				signal: a
 			});
 			let r = await e(n);
 			if (!n.ok) throw new W(n.statusText, {
-				url: l.toString(),
-				method: a.method || "GET",
+				url: c.toString(),
+				method: o.method || "GET",
 				options: t
 			}, n, r);
 			return r;
 		} catch (e) {
 			throw e instanceof W ? e : new W(e?.message || `${e}`, {
-				url: l.toString(),
-				method: a.method || "GET",
+				url: c.toString(),
+				method: o.method || "GET",
 				options: t
 			}, n, e);
-		} finally {
-			s && clearTimeout(s);
 		}
 	}
 	return {
 		async arrayBuffer() {
-			return u((e) => e.arrayBuffer());
+			return l((e) => e.arrayBuffer());
 		},
 		async blob() {
-			return u((e) => e.blob());
+			return l((e) => e.blob());
 		},
 		async json() {
-			return c.has("accept") || c.set("accept", "application/json"), u((e) => e.json());
+			return s.has("accept") || s.set("accept", "application/json"), l((e) => e.json());
 		},
 		async text() {
-			return u((e) => e.text());
-		},
-		abort() {
-			o.abort();
+			return l((e) => e.text());
 		}
 	};
 }
@@ -455,40 +450,62 @@ var q = [
 	["d", 24],
 	["mo", 30],
 	["y", 365 / 30]
+], J = [
+	["year", 365 * 24 * 60 * 60 * 1e3],
+	["month", 720 * 60 * 60 * 1e3],
+	["week", 10080 * 60 * 1e3],
+	["day", 1440 * 60 * 1e3],
+	["hour", 3600 * 1e3],
+	["minute", 60 * 1e3],
+	["second", 1e3]
 ];
-function J(e, t) {
-	let n = `${e}`.match(/[a-zA-Z]+$/)?.[0] || "", r = n ? +`${e}`.slice(0, -n.length) : +e;
-	if (n) {
-		for (let [e, i] of t?.intervalLevels || q) if (r *= i, e === n) {
-			n = "";
+function Y(e) {
+	let t = `${e}`.match(/[a-zA-Z]+$/)?.[0] || "", n = t ? +`${e}`.slice(0, -t.length) : +e;
+	if (t) {
+		for (let [e, r] of q) if (n *= r, e === t) {
+			t = "";
 			break;
 		}
 	}
-	if (n || isNaN(r)) throw Error(`Invalid interval: ${e}`);
-	return r;
-}
-function Y(e, t) {
-	let n = Math.sign(e);
-	e = Math.abs(e);
-	let r = "ms";
-	for (let [n, i] of t?.intervalLevels || q) {
-		if (e < i) break;
-		e /= i, r = n;
-	}
-	return `${n < 0 ? "-" : ""}${z(e, t) || ""}${r}`;
+	if (t || isNaN(n)) throw Error(`Invalid interval: ${e}`);
+	return n;
 }
-function X(e) {
+function X(e, t) {
+	let { locale: n, style: r = "long" } = t ?? {}, i = Math.abs(e);
+	for (let [e, t] of J) if (i >= t) return new Intl.NumberFormat(n, {
+		style: "unit",
+		unit: e,
+		unitDisplay: r
+	}).format(Math.round(i / t));
+	return new Intl.NumberFormat(n, {
+		style: "unit",
+		unit: "second",
+		unitDisplay: r
+	}).format(Math.round(i / 1e3));
+}
+function Z(e) {
 	return [
 		e.getFullYear(),
 		e.getMonth() + 1,
 		e.getDate()
 	].map((e) => `${e}`.padStart(2, "0")).join("-");
 }
-function Z(e) {
+function Q(e) {
 	return new Intl.DateTimeFormat("en-GB", {
 		dateStyle: "short",
 		timeStyle: "medium"
 	}).format(new Date(e));
 }
+function $(e, t) {
+	let n = new Date(e).getTime() - Date.now(), r = Math.abs(n), { locale: i, numeric: a = "auto", style: o = "long" } = t ?? {};
+	for (let [e, t] of J) if (r >= t) return new Intl.RelativeTimeFormat(i, {
+		numeric: a,
+		style: o
+	}).format(Math.round(n / t), e);
+	return new Intl.RelativeTimeFormat(i, {
+		numeric: a,
+		style: o
+	}).format(Math.round(n / 1e3), "second");
+}
 //#endregion
-export { A as BufferReader, k as CrLf, F as Logger, P as Queue, W as SimpleRequestError, h as b64decode, m as b64encode, _ as b64urlDecode, g as b64urlEncode, G as buildSearchParams, D as bytesToHex, j as concatBuffer, y as decodeText, q as defaultIntervalLevels, T as defer, L as deflateNumber, v as encodeText, X as formatDate, Y as formatInterval, z as formatNumber, B as formatPercentage, w as formatString, I as inflateNumber, N as limitConcurrency, O as loadJS, J as normalizeInterval, H as rateLimiter, b as replacerBigInt, Z as reprDate, C as reprJson, M as searchBuffer, K as simpleRequest, S as truncateString, U as waitUntil, E as wrapFunction };
+export { A as BufferReader, k as CrLf, F as Logger, P as Queue, W as SimpleRequestError, h as b64decode, m as b64encode, _ as b64urlDecode, g as b64urlEncode, G as buildSearchParams, D as bytesToHex, j as concatBuffer, y as decodeText, T as defer, L as deflateNumber, v as encodeText, X as formatDuration, Z as formatISODate, z as formatNumber, B as formatPercentage, w as formatString, I as inflateNumber, N as limitConcurrency, O as loadJS, Y as normalizeInterval, H as rateLimiter, b as replacerBigInt, Q as reprDate, C as reprJson, M as searchBuffer, K as simpleRequest, $ as timeAgo, S as truncateString, U as waitUntil, E as wrapFunction };

package/dist/request.d.ts

@@ -16,11 +16,10 @@ export declare class SimpleRequestError extends Error {
         options?: IRequestOptions;
     }, response?: Response | undefined, cause?: unknown);
 }
-export declare function buildSearchParams(init?: IRequestOptions['searchParams']): URLSearchParams;
+export declare function buildSearchParams(init?: IRequestOptions["searchParams"]): URLSearchParams;
 export declare function simpleRequest<T = unknown>(url: string | URL, options?: IRequestOptions): {
     arrayBuffer(): Promise<ArrayBuffer>;
     blob(): Promise<Blob>;
     json<U = T>(): Promise<U>;
     text(): Promise<string>;
-    abort(): void;
 };

package/dist/time.d.ts

@@ -1,10 +1,17 @@
-import { type INumberOptions } from './number.ts';
-export declare const defaultIntervalLevels: Array<[string, number]>;
-export declare function normalizeInterval(interval: string | number, options?: Partial<{
-    intervalLevels: Array<[string, number]>;
-}>): number;
-export declare function formatInterval(interval: number, options?: Partial<INumberOptions & {
-    intervalLevels: Array<[string, number]>;
-}>): string;
-export declare function formatDate(date: Date): string;
+/** Converts a string like "1h" or a number to milliseconds. */
+export declare function normalizeInterval(interval: string | number): number;
+/** Formats a signed ms duration as a locale-aware string. */
+export declare function formatDuration(ms: number, options?: {
+    locale?: string;
+    style?: "long" | "short" | "narrow";
+}): string;
+/** Formats a Date as "YYYY-MM-DD". */
+export declare function formatISODate(date: Date): string;
+/** Formats a date using Intl.DateTimeFormat with en-GB short date and medium time. */
 export declare function reprDate(date: number | string | Date): string;
+/** Formats a date as a relative time string like "2 hours ago". */
+export declare function timeAgo(date: number | string | Date, options?: {
+    locale?: string;
+    numeric?: "auto" | "always";
+    style?: "long" | "short" | "narrow";
+}): string;

package/dist/time.test.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gera2ld/common",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -24,6 +24,6 @@
     "clean": "del-cli dist tsconfig.tsbuildinfo",
     "build:types": "tsc",
     "build:js": "vite build",
-    "build": "pnpm run clean && pnpm run /^build:/"
+    "build": "pnpm clean && pnpm build:js && pnpm build:types"
   }
 }