yummies 3.2.13 → 3.4.0

package/date-time.d.ts

@@ -1,7 +1,8 @@
 import { 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<{
+import 'dayjs/locale/ru.js';
+export type RawDateToFormat = Date | string | number | Dayjs;
+export declare const formatDate: (value: Maybe<RawDateToFormat>, settings?: Maybe<{
     format?: "human" | "full" | "short" | "day" | "day-only" | "date" | "month" | "spent-time" | "time" | "time-short";
     pattern?: string;
     asTime?: boolean;
@@ -14,7 +15,7 @@ export declare const dayTimeDuration: (timeInMs: number) => {
     milliseconds: number;
 };
 type DateChangeParam = [amount: number, unit?: Maybe<ManipulateType>];
-export declare const changeDate: (date: Maybe<Date | number | string>, ...args: [...DateChangeParam, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>]) => Date;
+export declare const changeDate: (date: Maybe<RawDateToFormat>, ...args: [...DateChangeParam, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>, ...Partial<DateChangeParam>]) => Date;
 export declare const timeDuration: (timeInMs: number) => {
     hours: number;
     milliseconds: number;

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,cAAc,EAAE,MAAM,OAAO,CAAC;AAOrD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,iBAAiB,CAAC;AAwBzB,eAAO,MAAM,UAAU,GACrB,OAAO,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,EACrC,WAAW,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,GAAI,UAAU,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,GACrB,MAAM,KAAK,CAAC,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,EACnC,GAAG,MAAM,CACP,GAAG,eAAe,EAClB,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,CAC5B,SAaF,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM;;;;;CAU5C,CAAC;AASF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,IAAI,EACX,OAAO,CAAC,EAAE,OAAO,GAChB,MAAM,CAAC;AACV,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC"}
+{"version":3,"file":"date-time.d.ts","sourceRoot":"","sources":["../src/date-time.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAOrD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,oBAAoB,CAAC;AAwB5B,MAAM,MAAM,eAAe,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;AAE7D,eAAO,MAAM,UAAU,GACrB,OAAO,KAAK,CAAC,eAAe,CAAC,EAC7B,WAAW,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,GAAI,UAAU,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,GACrB,MAAM,KAAK,CAAC,eAAe,CAAC,EAC5B,GAAG,MAAM,CACP,GAAG,eAAe,EAClB,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,EAC3B,GAAG,OAAO,CAAC,eAAe,CAAC,CAC5B,SAaF,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM;;;;;CAU5C,CAAC;AASF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,IAAI,EACX,OAAO,CAAC,EAAE,OAAO,GAChB,MAAM,CAAC;AACV,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC"}

package/date-time.js

@@ -4,7 +4,7 @@ import relativeTime from 'dayjs/plugin/relativeTime.js';
 import { unitsToMs } from './ms.js';
 import { declension } from './text.js';
 import { typeGuard } from './type-guard/index.js';
-import 'dayjs/locale/ru';
+import 'dayjs/locale/ru.js';
 dayjs.extend(relativeTime);
 dayjs.extend(duration);
 dayjs.locale('ru');
@@ -16,19 +16,19 @@ const toLibFormat = function (value, asTime) {
         }
         return dayjs(value);
     }
-    else if (typeGuard.isString(value)) {
-        return dayjs(value);
-    }
     else if (dayjs.isDayjs(value)) {
         return value;
     }
+    else {
+        return dayjs(value);
+    }
 };
 export const formatDate = function (value, settings) {
     const dateFormat = settings?.format;
     const datePattern = settings?.pattern;
     const asTime = settings?.asTime;
     value = toLibFormat(value, asTime);
-    if (typeGuard.isUndefined(value)) {
+    if (typeGuard.isUndefined(value) || !value.isValid()) {
         return NO_VALUE;
     }
     if (datePattern) {
@@ -84,7 +84,7 @@ export const dayTimeDuration = (timeInMs) => {
     };
 };
 export const changeDate = (date, ...args) => {
-    let wrappedDate = dayjs(date);
+    let wrappedDate = toLibFormat(date);
     for (let i = 0; i < args.length; i += 2) {
         const amount = args[i];
         const unit = args[i + 1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yummies",
-  "version": "3.2.13",
+  "version": "3.4.0",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -167,6 +167,11 @@
       "default": "./storage.js",
       "types": "./storage.d.ts"
     },
+    "./text.test": {
+      "import": "./text.test.js",
+      "default": "./text.test.js",
+      "types": "./text.test.d.ts"
+    },
     "./text": {
       "import": "./text.js",
       "default": "./text.js",

package/text.d.ts

@@ -8,4 +8,8 @@
  * declension(5, ['слово', 'слова', 'слов']) // 'слов'
  */
 export declare const declension: (count: number, txt: readonly [one: string, two: string, five: string], cases?: number[]) => string;
+/**
+ * Разбиение текста на линии
+ */
+export declare const splitTextByLines: (text: string, lineLingth?: 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,GACrB,OAAO,MAAM,EACb,KAAK,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,EACtD,gBAA0B,WAEmD,CAAC"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,GACrB,OAAO,MAAM,EACb,KAAK,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,EACtD,gBAA0B,WAEmD,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,MAAM,EACZ,aAAY,MAAW,KACtB,MAAM,EAqCR,CAAC"}

package/text.js

@@ -8,3 +8,41 @@
  * declension(5, ['слово', 'слова', 'слов']) // 'слов'
  */
 export const declension = (count, txt, cases = [2, 0, 1, 1, 1, 2]) => txt[count % 100 > 4 && count % 100 < 20 ? 2 : cases[Math.min(count % 10, 5)]];
+/**
+ * Разбиение текста на линии
+ */
+export const splitTextByLines = (text, lineLingth = 60) => {
+    const words = text.split(/\s+/).filter((word) => word !== '');
+    const lines = [];
+    let currentLine = '';
+    for (const word of words) {
+        if (word.length > lineLingth) {
+            if (currentLine !== '') {
+                lines.push(currentLine);
+                currentLine = '';
+            }
+            let start = 0;
+            while (start < word.length) {
+                const chunk = word.slice(start, start + lineLingth);
+                lines.push(chunk);
+                start += lineLingth;
+            }
+            continue;
+        }
+        // Проверка возможности добавления слова в текущую строку
+        if (currentLine === '') {
+            currentLine = word;
+        }
+        else if (currentLine.length + 1 + word.length <= lineLingth) {
+            currentLine += ' ' + word;
+        }
+        else {
+            lines.push(currentLine);
+            currentLine = word;
+        }
+    }
+    if (currentLine !== '' || lines.length === 0) {
+        lines.push(currentLine);
+    }
+    return lines;
+};