@inzombieland/core 1.18.35 → 1.18.37

package/composables/index.d.ts

@@ -3,7 +3,6 @@ export { useActiveSessions } from "./use-active-sessions";
 export { useApiActions } from "./use-api-actions";
 export { useAppLocale } from "./use-app-locale";
 export { useCookies } from "./use-cookies";
-export { useDayjs } from "./use-dayjs";
 export { useSubscribe } from "./use-subscribe";
 export { useThemeMode } from "./use-theme-mode";
 export { useUser } from "./use-user";

package/composables/index.mjs

@@ -3,7 +3,6 @@ export { useActiveSessions } from "./use-active-sessions.mjs";
 export { useApiActions } from "./use-api-actions.mjs";
 export { useAppLocale } from "./use-app-locale.mjs";
 export { useCookies } from "./use-cookies.mjs";
-export { useDayjs } from "./use-dayjs.mjs";
 export { useSubscribe } from "./use-subscribe.mjs";
 export { useThemeMode } from "./use-theme-mode.mjs";
 export { useUser } from "./use-user.mjs";

package/helpers/api-helper.mjs

@@ -1,4 +1,4 @@
-import { dateHelper } from "./date-helper.mjs";
+import { dateHelper } from "./date-helper";
 const isoExp = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)((-(\d{2}):(\d{2})|Z)?)$/gm;
 const isISODate = (value) => {
   return typeof value === "string" && isoExp.test(value);

package/helpers/composables.d.ts

@@ -1,5 +1,4 @@
 export { useApiHelper } from "./api-helper";
-export { useDateHelper } from "./date-helper";
 export { useDevice } from "./device-helper";
 export { usePhoneHelper } from "./phone-helper";
 export { useStringHelper } from "./string-helper";

package/helpers/composables.mjs

@@ -1,5 +1,4 @@
 export { useApiHelper } from "./api-helper.mjs";
-export { useDateHelper } from "./date-helper.mjs";
 export { useDevice } from "./device-helper.mjs";
 export { usePhoneHelper } from "./phone-helper.mjs";
 export { useStringHelper } from "./string-helper.mjs";

package/helpers/index.mjs

@@ -1,5 +1,5 @@
 export { apiHelper } from "./api-helper.mjs";
-export { dateHelper } from "./date-helper.mjs";
+export { dateHelper } from "./date-helper";
 export { deviceHelper } from "./device-helper.mjs";
 export { phoneHelper } from "./phone-helper.mjs";
 export { stringHelper } from "./string-helper.mjs";

package/init-application.mjs

@@ -1,10 +1,7 @@
 import { StyleProvider, Themes, Locale as VarletLocale } from "@varlet/ui";
-import dayjs from "dayjs";
-import localizedFormat from "dayjs/plugin/localizedFormat";
-import relativeTime from "dayjs/plugin/relativeTime";
 import { setNotifyDefaultOptions, Locale as VantLocale } from "vant";
-import VantLocaleEnUS from "vant/es/locale/lang/en-US";
-import VantLocaleRuRU from "vant/es/locale/lang/ru-RU";
+import enUS from "vant/es/locale/lang/en-US";
+import ruRU from "vant/es/locale/lang/ru-RU";
 import { watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
@@ -57,7 +54,14 @@ function initApplication() {
       if ("setLocale" in i18n && typeof i18n.setLocale === "function") {
         i18n.setLocale(locale2?.value);
       }
-      loadThirdPartyLocales(locale2?.value);
+      if (locale2?.value === "en") {
+        VantLocale.use("en-US", enUS);
+        VarletLocale.add("en-US", VarletLocale.enUS);
+      }
+      if (locale2?.value === "ru") {
+        VantLocale.use("ru-RU", ruRU);
+        VarletLocale.add("en-US", VarletLocale.enUS);
+      }
       const localeCookie = useCookies("locale", { maxAge: 60 * 60 * 24 * 365 });
       localeCookie.value = locale2?.value;
     },
@@ -91,39 +95,6 @@ function initApplication() {
     }
   });
 }
-function loadThirdPartyLocales(locale) {
-  loadVantLocale(locale);
-  loadVarletLocale(locale);
-  loadDayjsLocale(locale);
-}
-function loadVantLocale(locale) {
-  if (locale === "en") {
-    VantLocale.use("en-US", VantLocaleEnUS);
-  }
-  if (locale === "ru") {
-    VantLocale.use("ru-RU", VantLocaleRuRU);
-  }
-}
-function loadVarletLocale(locale) {
-  if (locale === "en") {
-    VarletLocale.add("en-US", VarletLocale.enUS);
-  }
-  if (locale === "ru") {
-    VarletLocale.add("en-US", VarletLocale.enUS);
-  }
-}
-async function loadDayjsLocale(lang) {
-  let locale;
-  if (lang === "en") {
-    locale = await import("dayjs/locale/en");
-  }
-  if (lang === "ru") {
-    locale = await import("dayjs/locale/ru");
-  }
-  dayjs.locale(locale);
-  dayjs.extend(localizedFormat);
-  dayjs.extend(relativeTime);
-}
 export const createInitApplication = once(() => {
   return () => initApplication();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/core",
-  "version": "1.18.35",
+  "version": "1.18.37",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",
@@ -15,7 +15,6 @@
     "@vueuse/core": "^12.8.2",
     "centrifuge": "^5.3.4",
     "cookie-es": "^2.0.0",
-    "dayjs": "^1.11.13",
     "destr": "^2.0.5",
     "klona": "^2.0.6",
     "ofetch": "^1.4.1",

package/composables/use-dayjs.d.ts

@@ -1,2 +0,0 @@
-import dayjs from "dayjs";
-export declare const useDayjs: () => typeof dayjs;

package/composables/use-dayjs.mjs

@@ -1,4 +0,0 @@
-import dayjs from "dayjs";
-export const useDayjs = () => {
-  return dayjs;
-};

package/helpers/date-helper.d.ts

@@ -1,19 +0,0 @@
-export declare function stringToDate(dateString: unknown): Date | undefined;
-/**
- * Преобразование даты.
- * Например из "d mmmm:R yyyy" в "5 февраля 2020"
- * @param date - дата
- * @param format - формат даты
- * @param locale
- * @param dateTimeNow
- */
-export declare function dateFormat(// @SONAR_STOP@
-date?: Date, format?: string, locale?: string, dateTimeNow?: Date): string;
-export declare const dateHelper: {
-    stringToDate: typeof stringToDate;
-    dateFormat: typeof dateFormat;
-};
-export declare const useDateHelper: () => {
-    stringToDate: typeof stringToDate;
-    dateFormat: typeof dateFormat;
-};

package/helpers/date-helper.mjs

@@ -1,233 +0,0 @@
-const isoExp = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)((-(\d{2}):(\d{2})|Z)?)$/;
-export function stringToDate(dateString) {
-  if (typeof dateString === "string") {
-    if (dateString === "0001-01-01T00:00:00Z") {
-      return;
-    }
-    let date = new Date(Number.NaN);
-    const parts = isoExp.exec(dateString);
-    if (parts) {
-      date = parts.at(-1) === "Z" ? new Date(
-        Date.UTC(
-          Number(parts[1]),
-          Number(parts[2]) - 1,
-          Number(parts[3]),
-          Number(parts[4]),
-          Number(parts[5]),
-          Number(parts[6])
-        )
-      ) : new Date(
-        Number(parts[1]),
-        Number(parts[2]) - 1,
-        Number(parts[3]),
-        Number(parts[4]),
-        Number(parts[5]),
-        Number(parts[6])
-      );
-    }
-    return date;
-  }
-  return void 0;
-}
-const masks = {
-  default: "dd mmm yyyy",
-  "default:R": "dd mmmm:R yyyy",
-  "default:RC": "dd mmmm:R yyyy:C",
-  defaultshortday: "d mmm yyyy",
-  "defaultshortday:C": "d mmm yyyy:C",
-  "defaultshortday:R": "d mmmm:R yyyy",
-  "defaultshortday:RC": "d mmmm:R yyyy:C",
-  shortDate: "m/d/yy",
-  mediumDate: "mmm d, yyyy",
-  longDate: "mmmm d, yyyy",
-  fullDate: "dddd, mmmm d, yyyy",
-  shortTime: "h:MM TT",
-  mediumTime: "h:MM:ss TT",
-  longTime: "h:MM:ss TT Z",
-  isoDate: "yyyy-mm-dd",
-  isoTime: "HH:MM:ss",
-  isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
-  isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'",
-  time: "HH:MM",
-  dateTime: "dd.mm.yyyy HH:MM",
-  clever: "clever"
-};
-const i18n = {
-  en: {
-    dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-    dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-    monthName: [
-      "January",
-      "February",
-      "March",
-      "April",
-      "May",
-      "June",
-      "July",
-      "August",
-      "September",
-      "October",
-      "November",
-      "December"
-    ],
-    yesterday: "'Yesterday'",
-    today: "'Today'"
-  },
-  ru: {
-    dayNames: ["\u0432\u043E\u0441\u043A\u0440\u0435\u0441\u0435\u043D\u044C\u0435", "\u043F\u043E\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u0438\u043A", "\u0432\u0442\u043E\u0440\u043D\u0438\u043A", "\u0441\u0440\u0435\u0434\u0430", "\u0447\u0435\u0442\u0432\u0435\u0440\u0433", "\u043F\u044F\u0442\u043D\u0438\u0446\u0430", "\u0441\u0443\u0431\u0431\u043E\u0442\u0430"],
-    dayNamesShort: ["\u0412\u0441", "\u041F\u043D", "\u0412\u0442", "\u0421\u0440", "\u0427\u0442", "\u041F\u0442", "\u0421\u0431"],
-    monthName: [
-      "\u044F\u043D\u0432\u0430\u0440\u044C",
-      "\u0444\u0435\u0432\u0440\u0430\u043B\u044C",
-      "\u043C\u0430\u0440\u0442",
-      "\u0430\u043F\u0440\u0435\u043B\u044C",
-      "\u043C\u0430\u0439",
-      "\u0438\u044E\u043D\u044C",
-      "\u0438\u044E\u043B\u044C",
-      "\u0430\u0432\u0433\u0443\u0441\u0442",
-      "\u0441\u0435\u043D\u0442\u044F\u0431\u0440\u044C",
-      "\u043E\u043A\u0442\u044F\u0431\u0440\u044C",
-      "\u043D\u043E\u044F\u0431\u0440\u044C",
-      "\u0434\u0435\u043A\u0430\u0431\u0440\u044C"
-    ],
-    yesterday: "'\u0412\u0447\u0435\u0440\u0430'",
-    today: "'\u0421\u0435\u0433\u043E\u0434\u043D\u044F'"
-  }
-};
-const token = /d{1,4}:?C?|m{1,4}:?[RC]?|yy(?:yy|y)?:?[RC]?|([HhMsTt])\1?|[LloZ]|"[^"]*"|'[^']*'/g;
-const timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
-const timezoneClip = /[^-+\dA-Z]/g;
-const pad = (value, len = 2) => {
-  let val = String(value);
-  while (val.length < len) {
-    val = `0${val}`;
-  }
-  return val;
-};
-const createOnlyDate = (date) => {
-  const d = new Date(date);
-  d.setHours(0, 0, 0, 0);
-  return d;
-};
-const countCalendarDayBetween = (date1, date2) => {
-  const day1 = createOnlyDate(date1);
-  const day2 = createOnlyDate(date2);
-  const dayCount = (day1.getTime() - day2.getTime()) / (24 * 60 * 60 * 1e3);
-  return Math.abs(dayCount);
-};
-const checkIsYesterday = (now, date) => {
-  return now > date && countCalendarDayBetween(now, date) === 1;
-};
-const getDayName = (day, locale, short = false) => {
-  return short ? i18n[locale].dayNamesShort[day] : i18n[locale].dayNames[day];
-};
-const monthDeclination = (month, locale) => {
-  return month === 3 || month === 8 ? `${i18n[locale].monthName[month - 1]}\u0430` : `${i18n[locale].monthName[month - 1].slice(0, -1)}\u044F`;
-};
-const getMonthName = (month, locale, countChar = 0, declination = false) => {
-  const monthName = locale === "ru" && declination ? monthDeclination(month, locale) : i18n[locale].monthName[month - 1];
-  if (countChar && countChar > 0) {
-    return monthName.slice(0, 3);
-  }
-  return monthName;
-};
-const getMask = (format, locale, isCurrentDay, isYesterday, isCurrentYear) => {
-  const defaultFormat = {
-    en: "mmmm d, yyyy",
-    ru: "d mmmm:R yyyy"
-  };
-  const formats = {
-    default: defaultFormat,
-    get clever() {
-      if (isCurrentDay) {
-        return {
-          en: `${i18n.en.today} 'at' H:MM TT`,
-          ru: `${i18n.ru.today}, HH:MM`
-        };
-      } else if (isYesterday) {
-        return {
-          en: `${i18n.en.yesterday} 'at' H:MM TT`,
-          ru: `${i18n.ru.yesterday}, HH:MM`
-        };
-      } else if (isCurrentYear) {
-        return {
-          en: "mmmm d",
-          ru: "d mmmm:R"
-        };
-      } else {
-        return defaultFormat;
-      }
-    }
-  };
-  let mask = String(masks[format] ?? (format || masks.default));
-  if (mask.startsWith("UTC:")) {
-    mask = mask.slice(4);
-  }
-  if (formats[format]?.[locale]) {
-    return formats[format]?.[locale] ?? "";
-  }
-  return mask;
-};
-export function dateFormat(date = /* @__PURE__ */ new Date(), format = "default", locale = "en", dateTimeNow) {
-  date = date ? new Date(date) : /* @__PURE__ */ new Date();
-  if (Number.isNaN(date)) {
-    throw new SyntaxError("invalid date");
-  }
-  const utc = (masks[format] ?? format).startsWith("UTC:");
-  const now = dateTimeNow ?? /* @__PURE__ */ new Date();
-  const currentYear = utc ? now.getUTCFullYear() : now.getFullYear();
-  const currentMonth = utc ? now.getUTCMonth() : now.getMonth();
-  const currentDate = utc ? now.getUTCDate() : now.getDate();
-  const isYesterday = checkIsYesterday(now, date);
-  const d = utc ? date.getUTCDate() : date.getDate();
-  const D = utc ? date.getUTCDay() : date.getDay();
-  const m = utc ? date.getUTCMonth() : date.getMonth();
-  const y = utc ? date.getUTCFullYear() : date.getFullYear();
-  const isCurrentYear = y === currentYear;
-  const isCurrentDay = y === currentYear && m === currentMonth && d === currentDate;
-  const H = utc ? date.getUTCHours() : date.getHours();
-  const M = utc ? date.getUTCMinutes() : date.getMinutes();
-  const s = utc ? date.getUTCSeconds() : date.getSeconds();
-  const L = utc ? date.getUTCMilliseconds() : date.getMilliseconds();
-  const o = utc ? 0 : date.getTimezoneOffset();
-  const flags = {
-    d,
-    dd: pad(d),
-    ddd: getDayName(D, locale, true),
-    dddd: getDayName(D, locale),
-    m: m + 1,
-    mm: pad(m + 1),
-    mmm: getMonthName(m + 1, locale, 3),
-    mmmm: getMonthName(m + 1, locale),
-    "mmmm:R": getMonthName(m + 1, locale, 0, true),
-    "mm:C": isYesterday || isCurrentDay ? "" : pad(m + 1),
-    "yy:C": isCurrentYear ? "" : String(y).slice(2),
-    yy: String(y).slice(2),
-    "yyyy:C": isCurrentYear ? "" : y,
-    yyyy: y,
-    yyy: y,
-    h: H % 12 || 12,
-    hh: pad(H % 12 || 12),
-    H,
-    HH: pad(H),
-    M,
-    MM: pad(M),
-    s,
-    ss: pad(s),
-    l: pad(L, 3),
-    L: pad(L > 99 ? Math.round(L / 10) : L),
-    tt: H < 12 ? "am" : "pm",
-    TT: H < 12 ? "AM" : "PM",
-    Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop()?.replace(timezoneClip, ""),
-    o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4)
-  };
-  const mask = getMask(format, locale, isCurrentDay, isYesterday, isCurrentYear);
-  const parsedDate = mask.replaceAll(token, ($0) => {
-    return $0 in flags ? String(flags[$0]) : $0.slice(1, -1);
-  });
-  return parsedDate.trim();
-}
-export const dateHelper = { stringToDate, dateFormat };
-export const useDateHelper = () => {
-  return dateHelper;
-};