yummies 3.0.16 → 3.0.18

package/README.md

@@ -20,6 +20,9 @@ Yummies - a set of various utilities for JavaScript projects with open source co
 ## [yummies/async](src/async.ts)  
 Utilities for working with asynchronous code  
 
+## [yummies/common](src/common.ts)  
+All other utilities without groupping  
+
 ## [yummies/cookie](src/cookie.ts)  
 Utilities for working with cookies  
 

package/common.d.ts

@@ -0,0 +1,3 @@
+export type FnValue<TValue, TArgs extends any[] = []> = TValue | ((...args: TArgs) => TValue);
+export declare const resolveFnValue: <TValue, TArgs extends any[] = []>(fn: FnValue<TValue, TArgs>, ...args: TArgs) => TValue;
+//# sourceMappingURL=common.d.ts.map

package/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,CAAC,MAAM,EAAE,KAAK,SAAS,GAAG,EAAE,GAAG,EAAE,IAChD,MAAM,GACN,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;AAEjC,eAAO,MAAM,cAAc,GAAI,MAAM,EAAE,KAAK,SAAS,GAAG,EAAE,WACpD,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,WACjB,KAAK,WAOf,CAAC"}

package/common.js

@@ -0,0 +1,6 @@
+export const resolveFnValue = (fn, ...args) => {
+    if (typeof fn === 'function') {
+        return fn(...args);
+    }
+    return fn;
+};

package/date-time.d.ts

@@ -1,4 +1,4 @@
-import { Dayjs } from 'dayjs';
+import dayjs, { Dayjs, ManipulateType } from 'dayjs';
 import { Maybe } from './utils/types.js';
 import 'dayjs/locale/ru';
 export declare const formatDate: (value: Maybe<string | number | Dayjs>, settings?: Maybe<{
@@ -6,10 +6,21 @@ export declare const formatDate: (value: Maybe<string | number | Dayjs>, setting
     pattern?: string;
     asTime?: boolean;
 }>) => string;
-export declare const getDatesDuration: (dateA: Date, dateB: Date) => string;
+export declare const dayTimeDuration: (timeInMs: number) => {
+    days: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+    milliseconds: number;
+};
+type DateChangeParam = [amount: number, unit?: Maybe<ManipulateType>];
+export declare const changeDate: (date: Maybe<Date | number | string>, amount: number, unit?: Maybe<dayjs.ManipulateType>, amount_1?: number | undefined, unit_1?: Maybe<dayjs.ManipulateType>, amount_2?: number | undefined, unit_2?: Maybe<dayjs.ManipulateType>, amount_3?: number | undefined, unit_3?: Maybe<dayjs.ManipulateType>, amount_4?: number | undefined, unit_4?: Maybe<dayjs.ManipulateType>, amount_5?: number | undefined, unit_5?: Maybe<dayjs.ManipulateType>) => Date;
 export declare const timeDuration: (timeInMs: number) => {
     hours: number;
+    milliseconds: number;
     minutes: number;
     seconds: number;
 };
+export declare const getDatesFormatDuration: (dateA: Date, dateB: Date, compact?: boolean) => string;
+export {};
 //# sourceMappingURL=date-time.d.ts.map

package/date-time.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date-time.d.ts","sourceRoot":"","sources":["../src/date-time.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAKrC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,iBAAiB,CAAC;AAwBzB,eAAO,MAAM,UAAU,UACd,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,aAC1B,KAAK,CAAC;IACf,MAAM,CAAC,EACH,OAAO,GACP,MAAM,GACN,OAAO,GACP,KAAK,GACL,UAAU,GACV,MAAM,GACN,OAAO,GACP,YAAY,GACZ,MAAM,GACN,YAAY,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,WA6CH,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,IAAI,SAAS,IAAI,WAoBxD,CAAC;AAEF,eAAO,MAAM,YAAY,aAAc,MAAM;;;;CAQ5C,CAAC"}
+{"version":3,"file":"date-time.d.ts","sourceRoot":"","sources":["../src/date-time.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAOrD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,iBAAiB,CAAC;AAwBzB,eAAO,MAAM,UAAU,UACd,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,aAC1B,KAAK,CAAC;IACf,MAAM,CAAC,EACH,OAAO,GACP,MAAM,GACN,OAAO,GACP,KAAK,GACL,UAAU,GACV,MAAM,GACN,OAAO,GACP,YAAY,GACZ,MAAM,GACN,YAAY,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC,WA6CH,CAAC;AAEF,eAAO,MAAM,eAAe,aAAc,MAAM;;;;;;CAwB/C,CAAC;AAEF,KAAK,eAAe,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;AAEtE,eAAO,MAAM,UAAU,SACf,KAAK,CAAC,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,sZAqBpC,CAAC;AAEF,eAAO,MAAM,YAAY,aAAc,MAAM;;;;;CAU5C,CAAC;AASF,eAAO,MAAM,sBAAsB,UAC1B,IAAI,SACJ,IAAI,YACD,OAAO,WAoDlB,CAAC"}

package/date-time.js

@@ -1,6 +1,8 @@
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
+import { unitsToMs } from './ms.js';
+import { declension } from './text.js';
 import { typeGuard } from './type-guard.js';
 import 'dayjs/locale/ru';
 dayjs.extend(relativeTime);
@@ -62,35 +64,88 @@ export const formatDate = function (value, settings) {
         }
     }
 };
-export const getDatesDuration = (dateA, dateB) => {
+export const dayTimeDuration = (timeInMs) => {
+    let left = timeInMs;
+    const days = Math.floor(left / unitsToMs.day);
+    left = left % unitsToMs.day;
+    const hours = Math.floor(left / unitsToMs.hour);
+    left = left % unitsToMs.hour;
+    const minutes = Math.floor(left / unitsToMs.min);
+    left = left % unitsToMs.min;
+    const seconds = Math.floor(left / unitsToMs.sec);
+    left = left % unitsToMs.sec;
+    const milliseconds = Math.floor(left);
+    return {
+        days,
+        hours,
+        minutes,
+        seconds,
+        milliseconds,
+    };
+};
+export const changeDate = (date, ...args) => {
+    let wrappedDate = dayjs(date);
+    for (let i = 0; i < args.length; i += 2) {
+        const amount = args[i];
+        const unit = args[i + 1];
+        if (unit != null) {
+            wrappedDate = wrappedDate.add(amount, unit);
+        }
+    }
+    return wrappedDate.toDate();
+};
+export const timeDuration = (timeInMs) => {
+    const { days, hours, milliseconds, minutes, seconds } = dayTimeDuration(timeInMs);
+    return {
+        hours: hours + unitsToMs.day * days,
+        milliseconds,
+        minutes,
+        seconds,
+    };
+};
+const durationFormatLabels = {
+    days: { compact: 'д', full: ['день', 'дня', 'дней'] },
+    hours: { compact: 'ч', full: ['час', 'часа', 'часов'] },
+    minutes: { compact: 'мин', full: ['минута', 'минуты', 'минут'] },
+    seconds: { compact: 'сек', full: ['секунда', 'секунды', 'секунд'] },
+};
+export const getDatesFormatDuration = (dateA, dateB, compact) => {
     const startedDate = dayjs(dateA);
     const endedDate = dayjs(dateB);
     const diff = endedDate.diff(startedDate, 'ms');
-    const duration = dayjs.duration(diff);
-    if (duration.asSeconds() < 1) {
-        return duration.format('SSS[ мс]');
-    }
-    else if (duration.asMinutes() < 1) {
-        return duration.format('s[ сек]');
-    }
-    else if (duration.asHours() < 1) {
-        return duration.format('m[ мин] s[ сек]');
+    const { days, hours, minutes, seconds } = dayTimeDuration(diff);
+    const formattedParts = [];
+    if (days) {
+        if (compact) {
+            formattedParts.push(`${days} ${durationFormatLabels.days.compact}`);
+        }
+        else {
+            formattedParts.push(`${days} ${declension(days, durationFormatLabels.days.full)}`);
+        }
     }
-    else if (duration.asDays() < 1) {
-        return duration.format('h[ ч] m[ мин] s[ сек]');
+    if (hours) {
+        if (compact) {
+            formattedParts.push(`${hours} ${durationFormatLabels.hours.compact}`);
+        }
+        else {
+            formattedParts.push(`${hours} ${declension(hours, durationFormatLabels.hours.full)}`);
+        }
     }
-    else if (duration.asMonths() < 1) {
-        return duration.format('D[ д] H[ ч] m[ мин] s[ сек]');
+    if (minutes) {
+        if (compact) {
+            formattedParts.push(`${minutes} ${durationFormatLabels.minutes.compact}`);
+        }
+        else {
+            formattedParts.push(`${minutes} ${declension(minutes, durationFormatLabels.minutes.full)}`);
+        }
     }
-    else {
-        return duration.format('M[ мес] D[ д] H[ ч] m[ мин] s[ сек]');
+    if (seconds) {
+        if (compact) {
+            formattedParts.push(`${seconds} ${durationFormatLabels.seconds.compact}`);
+        }
+        else {
+            formattedParts.push(`${seconds} ${declension(seconds, durationFormatLabels.seconds.full)}`);
+        }
     }
-};
-export const timeDuration = (timeInMs) => {
-    const duration = dayjs.duration(timeInMs);
-    return {
-        hours: duration.hours(),
-        minutes: duration.minutes(),
-        seconds: duration.seconds(),
-    };
+    return formattedParts.join(' ');
 };

package/date-time.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=date-time.test.d.ts.map

package/date-time.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"date-time.test.d.ts","sourceRoot":"","sources":["../src/date-time.test.ts"],"names":[],"mappings":""}

package/date-time.test.js

@@ -0,0 +1,77 @@
+import { describe, expect, test } from 'vitest';
+import { changeDate, dayTimeDuration, getDatesFormatDuration, timeDuration, } from './date-time';
+import { unitsToMs } from './ms';
+describe('date-time', () => {
+    describe('dayTimeDuration', () => {
+        test('1 minute', () => {
+            expect(dayTimeDuration(unitsToMs.min)).toStrictEqual({
+                days: 0,
+                hours: 0,
+                seconds: 0,
+                minutes: 1,
+                milliseconds: 0,
+            });
+        });
+        test('30 minutes 45 seconds', () => {
+            expect(dayTimeDuration(unitsToMs.min * 30 + unitsToMs.sec * 45)).toStrictEqual({
+                days: 0,
+                hours: 0,
+                seconds: 45,
+                minutes: 30,
+                milliseconds: 0,
+            });
+        });
+        test('34 days 59 minutes 59 seconds', () => {
+            expect(dayTimeDuration(34 * unitsToMs.day + unitsToMs.min * 59 + unitsToMs.sec * 59)).toStrictEqual({
+                days: 34,
+                hours: 0,
+                minutes: 59,
+                seconds: 59,
+                milliseconds: 0,
+            });
+        });
+    });
+    describe('timeDuration', () => {
+        test('1 minute', () => {
+            expect(timeDuration(unitsToMs.min)).toStrictEqual({
+                hours: 0,
+                seconds: 0,
+                minutes: 1,
+                milliseconds: 0,
+            });
+        });
+        test('30 minutes 45 seconds', () => {
+            expect(timeDuration(unitsToMs.min * 30 + unitsToMs.sec * 45)).toStrictEqual({
+                hours: 0,
+                seconds: 45,
+                minutes: 30,
+                milliseconds: 0,
+            });
+        });
+        test('34 days 59 minutes 59 seconds', () => {
+            expect(timeDuration(34 * unitsToMs.day + unitsToMs.min * 59 + unitsToMs.sec * 59)).toStrictEqual({
+                hours: 2_937_600_000,
+                minutes: 59,
+                seconds: 59,
+                milliseconds: 0,
+            });
+        });
+    });
+    describe('getDatesFormatDuration', () => {
+        test('30 minutes', () => {
+            const dateA = new Date(`2025-02-10T09:53:00.000Z`);
+            const dateB = changeDate(dateA, 30, 'minutes');
+            expect(getDatesFormatDuration(dateA, dateB)).toBe('30 минут');
+        });
+        test('2 hours 45 minutes 10 seconds', () => {
+            const dateA = new Date(`2025-02-10T09:53:00.000Z`);
+            const dateB = changeDate(dateA, 2, 'hours', 45, 'minutes', 10, 'seconds');
+            expect(getDatesFormatDuration(dateA, dateB)).toBe('2 часа 45 минут 10 секунд');
+        });
+        test('2 hours 45 minutes 10 seconds (compact)', () => {
+            const dateA = new Date(`2025-02-10T09:53:00.000Z`);
+            const dateB = changeDate(dateA, 2, 'hours', 45, 'minutes', 10, 'seconds');
+            expect(getDatesFormatDuration(dateA, dateB, true)).toBe('2 ч 45 мин 10 сек');
+        });
+    });
+});

package/ms.d.ts

@@ -1,4 +1,4 @@
-declare const MULTIPLY_BY_UNIT: {
+export declare const unitsToMs: {
     readonly ms: 1;
     readonly sec: 1000;
     readonly min: number;
@@ -15,6 +15,5 @@ declare const MULTIPLY_BY_UNIT: {
  * ms(30, 'sec') // 30_000
  * ```
  */
-export declare const ms: (value: number, unit?: keyof typeof MULTIPLY_BY_UNIT) => number;
-export {};
+export declare const ms: (value: number, unit?: keyof typeof unitsToMs) => number;
 //# sourceMappingURL=ms.d.ts.map

package/ms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ms.d.ts","sourceRoot":"","sources":["../src/ms.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,gBAAgB;;;;;;;CAOZ,CAAC;AAEX;;;;;;;;GAQG;AACH,eAAO,MAAM,EAAE,UAAW,MAAM,SAAQ,MAAM,OAAO,gBAAgB,WACrC,CAAC"}
+{"version":3,"file":"ms.d.ts","sourceRoot":"","sources":["../src/ms.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS;;;;;;;CAOZ,CAAC;AAEX;;;;;;;;GAQG;AACH,eAAO,MAAM,EAAE,UAAW,MAAM,SAAQ,MAAM,OAAO,SAAS,WACrC,CAAC"}

package/ms.js

@@ -1,4 +1,4 @@
-const MULTIPLY_BY_UNIT = {
+export const unitsToMs = {
     ms: 1,
     sec: 1000,
     min: 1000 * 60,
@@ -15,4 +15,4 @@ const MULTIPLY_BY_UNIT = {
  * ms(30, 'sec') // 30_000
  * ```
  */
-export const ms = (value, unit = 'ms') => value * MULTIPLY_BY_UNIT[unit];
+export const ms = (value, unit = 'ms') => value * unitsToMs[unit];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yummies",
-  "version": "3.0.16",
+  "version": "3.0.18",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -26,11 +26,16 @@
   },
   "devDependencies": {
     "@types/node": "^20.17.11",
+    "@vitejs/plugin-react-swc": "^3.8.0",
+    "@vitest/coverage-istanbul": "^3.0.5",
     "eslint": "^8.57.1",
     "js2me-eslint-config": "^1.0.7",
     "js2me-exports-post-build-script": "^2.0.17",
+    "jsdom": "^26.0.0",
     "rimraf": "^6.0.1",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "unplugin-swc": "^1.5.1",
+    "vitest": "^3.0.5"
   },
   "exports": {
     "./async": {
@@ -38,6 +43,11 @@
       "default": "./async.js",
       "types": "./async.d.ts"
     },
+    "./common": {
+      "import": "./common.js",
+      "default": "./common.js",
+      "types": "./common.d.ts"
+    },
     "./complex": {
       "import": "./complex/index.js",
       "default": "./complex/index.js",
@@ -58,6 +68,11 @@
       "default": "./css.js",
       "types": "./css.d.ts"
     },
+    "./date-time.test": {
+      "import": "./date-time.test.js",
+      "default": "./date-time.test.js",
+      "types": "./date-time.test.d.ts"
+    },
     "./date-time": {
       "import": "./date-time.js",
       "default": "./date-time.js",
@@ -147,6 +162,10 @@
     "build": "tsc && node ./post-build.mjs",
     "pub:patch": "PUBLISH=true PUBLISH_VERSION=patch pnpm run build",
     "pub:minor": "PUBLISH=true PUBLISH_VERSION=minor pnpm run build",
-    "pub:major": "PUBLISH=true PUBLISH_VERSION=major pnpm run build"
+    "pub:major": "PUBLISH=true PUBLISH_VERSION=major pnpm run build",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
+    "test:coverage": "vitest run --coverage",
+    "dev": "pnpm test:watch"
   }
 }

package/text.d.ts

@@ -7,5 +7,5 @@
  * @example
  * declension(5, ['слово', 'слова', 'слов']) // 'слов'
  */
-export declare const declension: (count: number, txt: [one: string, two: string, five: string], cases?: number[]) => string;
+export declare const declension: (count: number, txt: readonly [one: string, two: string, five: string], cases?: number[]) => string;
 //# sourceMappingURL=text.d.ts.map

package/text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,UACd,MAAM,OACR,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,6BAGgC,CAAC"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,UACd,MAAM,OACR,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,6BAGuB,CAAC"}