cafe-utility 19.1.0 → 19.3.0

package/index.d.ts

@@ -234,6 +234,23 @@ declare function fromUtcString(string: string): Date;
 declare function fromMillis(millis: number): Date;
 declare function createTimeDigits(value: number): string;
 declare function humanizeTime(millis: number): string;
+interface TimestampTranslations {
+    today: (hour: number, minute: number, pm: boolean) => string;
+    yesterday: () => string;
+    monday: () => string;
+    tuesday: () => string;
+    wednesday: () => string;
+    thursday: () => string;
+    friday: () => string;
+    saturday: () => string;
+    sunday: () => string;
+    weeks: (value: number) => string;
+}
+interface GetTimestampOptions {
+    now?: number;
+    translations?: TimestampTranslations;
+}
+declare function getTimestamp(date: Date | number, options?: GetTimestampOptions): string;
 interface AgoTranslations {
     now: () => string;
     seconds: (value: number) => string;
@@ -266,17 +283,17 @@ interface Progress {
 }
 declare function getProgress(startedAt: number, current: number, total: number, now?: number): Progress;
 declare const dayNumberIndex: {
-    0: string;
-    1: string;
-    2: string;
-    3: string;
-    4: string;
-    5: string;
-    6: string;
+    readonly 0: "sunday";
+    readonly 1: "monday";
+    readonly 2: "tuesday";
+    readonly 3: "wednesday";
+    readonly 4: "thursday";
+    readonly 5: "friday";
+    readonly 6: "saturday";
 };
 interface DayInfo {
     zeroBasedIndex: number;
-    day: string;
+    day: 'sunday' | 'monday' | 'tuesday' | 'wednesday' | 'thursday' | 'friday' | 'saturday';
 }
 declare function mapDayNumber(zeroBasedIndex: keyof typeof dayNumberIndex): DayInfo;
 declare function getDayInfoFromDate(date: Date): DayInfo;
@@ -393,6 +410,7 @@ interface Newable<T> extends Function {
 declare function findInstance<T, K extends T>(array: T[], type: Newable<K>): Optional<K>;
 declare function filterInstances<T, K extends T>(array: T[], type: Newable<K>): K[];
 declare function interleave<T, K>(arrayA: T[], arrayB: K[]): (T | K)[];
+declare function toggle<T>(array: T[], value: T): T[];
 type Playbook<T> = {
     ttl: number;
     ttlMax?: number;
@@ -484,6 +502,7 @@ export declare const Arrays: {
     findInstance: typeof findInstance;
     filterInstances: typeof filterInstances;
     interleave: typeof interleave;
+    toggle: typeof toggle;
 };
 export declare const System: {
     sleepMillis: typeof sleepMillis;
@@ -520,6 +539,7 @@ export declare const Promises: {
     makeAsyncQueue: typeof makeAsyncQueue;
 };
 export declare const Dates: {
+    getTimestamp: typeof getTimestamp;
     getAgo: typeof getAgo;
     countCycles: typeof countCycles;
     isoDate: typeof isoDate;

package/index.js

@@ -598,8 +598,7 @@ function range(n, t) {
     return e
 }
 function includesAny(n, t) {
-    for (const e of t) if (n.includes(e)) return !0
-    return !1
+    return t.some(e => n.includes(e))
 }
 function isChinese(n) {
     return /^[\u4E00-\u9FA5]+$/.test(n)
@@ -1257,6 +1256,32 @@ function humanizeTime(n) {
         ? `${createTimeDigits(t)}:${createTimeDigits(e)}:${createTimeDigits(r)}`
         : `${createTimeDigits(e)}:${createTimeDigits(r)}`
 }
+function absoluteDays(n) {
+    return Math.floor((isDate(n) ? n.getTime() : n) / 864e5)
+}
+const DefaultTimestampTranslations = {
+    today: (n, t) => createTimeDigits(n) + ':' + createTimeDigits(t),
+    yesterday: () => 'Yesterday',
+    monday: () => 'Mon',
+    tuesday: () => 'Tue',
+    wednesday: () => 'Wed',
+    thursday: () => 'Thu',
+    friday: () => 'Fri',
+    saturday: () => 'Sat',
+    sunday: () => 'Sun',
+    weeks: n => `${n}w`
+}
+function getTimestamp(n, t) {
+    const e = new Date(t?.now || Date.now()),
+        r = t?.translations || DefaultTimestampTranslations,
+        o = isDate(n) ? n : new Date(n)
+    if (absoluteDays(e) === absoluteDays(o)) return r.today(o.getUTCHours(), o.getUTCMinutes(), o.getUTCHours() > 12)
+    if (absoluteDays(e) - absoluteDays(o) === 1) return r.yesterday()
+    const i = getDayInfoFromDate(o)
+    return absoluteDays(e) - absoluteDays(o) < 7
+        ? r[i.day]()
+        : r.weeks(Math.round((e.getTime() - o.getTime()) / 6048e5))
+}
 const DefaultAgoTranslations = {
     now: () => 'A few seconds ago',
     seconds: n => `${n} seconds ago`,
@@ -1481,10 +1506,8 @@ function organiseWithLimits(n, t, e, r, o) {
 }
 function diffKeys(n, t) {
     const e = Object.keys(n),
-        r = Object.keys(t),
-        o = e.filter(s => !r.includes(s)),
-        i = r.filter(s => !e.includes(s))
-    return { uniqueToA: o, uniqueToB: i }
+        r = Object.keys(t)
+    return { uniqueToA: e.filter(o => !r.includes(o)), uniqueToB: r.filter(o => !e.includes(o)) }
 }
 function pickRandomKey(n) {
     const t = Object.keys(n)
@@ -1748,9 +1771,12 @@ function setMulti(n, t, e) {
 function group(n, t) {
     const e = []
     let r = []
-    n.length && (e.push(r), r.push(n[0]))
-    for (let o = 1; o < n.length; o++) t(n[o], n[o - 1]) || ((r = []), e.push(r)), r.push(n[o])
-    return e
+    return (
+        n.forEach((o, i) => {
+            ;(i === 0 || !t(o, n[i - 1])) && ((r = []), e.push(r)), r.push(o)
+        }),
+        e
+    )
 }
 function createBidirectionalMap() {
     return { map: new Map(), keys: [] }
@@ -1850,6 +1876,9 @@ function interleave(n, t) {
     for (let o = 0; o < r; o++) n[o] && e.push(n[o]), t[o] && e.push(t[o])
     return e
 }
+function toggle(n, t) {
+    return n.includes(t) ? n.filter(e => e !== t) : [...n, t]
+}
 function tickPlaybook(n) {
     if (n.length === 0) return null
     const t = n[0]
@@ -2132,7 +2161,8 @@ function raycastCircle(n, t, e) {
         bringToFrontInPlace,
         findInstance,
         filterInstances,
-        interleave
+        interleave,
+        toggle
     }),
     (exports.System = { sleepMillis, forever, scheduleMany, waitFor, expandError }),
     (exports.Numbers = {
@@ -2158,6 +2188,7 @@ function raycastCircle(n, t, e) {
     }),
     (exports.Promises = { raceFulfilled, invert: invertPromise, runInParallelBatches, makeAsyncQueue }),
     (exports.Dates = {
+        getTimestamp,
         getAgo,
         countCycles,
         isoDate,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "19.1.0",
+    "version": "19.3.0",
     "description": "",
     "main": "index.js",
     "exports": {