bfg-common 1.5.227 → 1.5.229

package/composables/productNameLocal.ts

@@ -1,30 +1,30 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LanguageKey } from '~/lib/models/types'
-
-export function productNameLocal(
-  localization: UI_I_Localization
-): UI_I_Localization {
-  const config = useRuntimeConfig()
-
-  const productName =
-    config.public.LOCALIZATION_CODE === 'ru'
-      ? config.public.PRODUCT_NAME_RU
-      : config.public.PRODUCT_NAME_EN
-
-  return replaceProductNameRecursion(localization, productName)
-}
-
-const replaceProductNameRecursion = (
-  localization: UI_I_Localization,
-  productName: any
-): UI_I_Localization => {
-  for (const key of Object.keys(localization)) {
-    let item = localization[key as UI_T_LanguageKey]
-
-    for (const key2 of Object.keys(item)) {
-      item[key2] = item[key2].replaceAll('{productName}', productName)
-    }
-  }
-
-  return localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
+
+export function productNameLocal(
+  localization: UI_I_Localization
+): UI_I_Localization {
+  const config = useRuntimeConfig()
+
+  const productName =
+    config.public.LOCALIZATION_CODE === 'ru'
+      ? config.public.PRODUCT_NAME_RU
+      : config.public.PRODUCT_NAME_EN
+
+  return replaceProductNameRecursion(localization, productName)
+}
+
+const replaceProductNameRecursion = (
+  localization: UI_I_Localization,
+  productName: any
+): UI_I_Localization => {
+  for (const key of Object.keys(localization)) {
+    let item = localization[key as UI_T_LanguageKey]
+
+    for (const key2 of Object.keys(item)) {
+      item[key2] = item[key2].replaceAll('{productName}', productName)
+    }
+  }
+
+  return localization
+}

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION as string
-
-  // const regexHasDot = /\./
-  // const regexHasDotAndB = /\.\d*b$/
-  // const regexHasDotAndD = /\..*d/
-
-  // const isBeta = regexHasDotAndB.test(version)
-  // const isDev =
-  //   regexHasDotAndD.test(version) ||
-  //   (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    // isBeta,
-    // isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*b$/
+  // const regexHasDotAndD = /\..*d/
+
+  // const isBeta = regexHasDotAndB.test(version)
+  // const isDev =
+  //   regexHasDotAndD.test(version) ||
+  //   (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    // isBeta,
+    // isDev,
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.227",
+  "version": "1.5.229",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.26",
-    "bfg-uikit": "1.0.435",
+    "bfg-uikit": "1.0.437",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }

package/plugins/date.ts

@@ -1,233 +1,233 @@
-import { defineNuxtPlugin } from '#app'
-import {
-  format,
-  // differenceInYears,
-  // differenceInMonths,
-  // differenceInDays,
-  // differenceInHours,
-  // differenceInMinutes,
-  // differenceInSeconds,
-} from 'date-fns'
-import * as localizations from 'date-fns/locale'
-import type { UI_T_DateFormat } from '~/lib/models/plugins/date/types'
-import type { UI_I_Dateformat } from '~/lib/models/plugins/date/interfaces'
-import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
-
-export default defineNuxtPlugin(() => {
-  // Проверяем переданое является датой
-  const isDate = (date: string | number) => {
-    return new Date(date).toString() !== 'Invalid Date'
-  }
-
-  // Проверяем формат времени браузера равно 24h
-  const isBrowserLocale24h = () =>
-    !new Intl.DateTimeFormat(undefined, { hour: 'numeric' })
-      .format(0)
-      .match(/AM/)
-
-  // Получаем переводы для даты
-  const getDateLocalization = (lang?: string) => {
-    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
-    const { be, enUS, hy, kk, ru, zhCN } = localizations
-    let localization
-
-    switch (currentLanguage) {
-      case 'be_BY':
-        localization = be
-        break
-      case 'en_US':
-        localization = enUS
-        break
-      case 'hy_AM':
-        localization = hy
-        break
-      case 'kk_KZ':
-        localization = kk
-        break
-      case 'ru_RU':
-        localization = ru
-        break
-      case 'zh_CHS':
-        localization = zhCN
-        break
-    }
-
-    return localization
-  }
-
-  // Получаем формат даты
-  const getDateFormat = (lang?: string): UI_T_DateFormat => {
-    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
-    const dateFormats: UI_I_Dateformat = {
-      be_BY: 'yyyy-MM-dd',
-      en_US: 'MM-dd-yyyy',
-      hy_AM: 'yyyy-MM-dd',
-      kk_KZ: 'dd/MM/yyyy',
-      ru_RU: 'dd/MM/yyyy',
-      zh_CHS: 'yyyy-MM-dd',
-    }
-
-    const dateFormat = ref(dateFormats[currentLanguage])
-
-    window.addEventListener('timeFormatStorageChanged', function handler() {
-      dateFormat.value = dateFormats[lang || useLocalStorage('lang') || 'en_US'] // TODO нужно проверить когда будем работать без useLocalStorage
-
-      window.removeEventListener('timeFormatStorageChanged', handler)
-    })
-
-    return dateFormat.value
-  }
-
-  // Получаем формат времени
-  const getTimeFormat = (hasSeconds: boolean, timeFormat?: string) => {
-    let appTimeFormat = timeFormat || useLocalStorage('timeFormat') || 'DEFAULT'
-    let timeFormatLocal = ''
-
-    if (appTimeFormat === 'DEFAULT') {
-      const isBrowserTimeFormat24 = isBrowserLocale24h()
-
-      appTimeFormat = isBrowserTimeFormat24 ? '24H' : appTimeFormat
-    }
-
-    if (appTimeFormat === '24H') {
-      timeFormatLocal = 'HH:mm'
-    } else {
-      timeFormatLocal = 'h:mm aa'
-    }
-
-    hasSeconds && (timeFormatLocal = timeFormatLocal.replace(':mm', ':mm:ss'))
-
-    return timeFormatLocal
-  }
-
-  // Форматирование даты из английского в стандартный
-  const enFormatToStandardFormat = (date: string): string => {
-    const splitDate = date.split('-')
-    return [splitDate[2], splitDate[0], splitDate[1]].join('/')
-  }
-  const getUnixByDate = (dateTime: string, lang?: string): number => {
-    const currentFormat: UI_T_DateFormat = getDateFormat(lang)
-
-    const [date, time] = dateTime.split(' ')
-
-    let standardDate = ''
-    switch (currentFormat) {
-      case 'dd/MM/yyyy':
-        standardDate = date.split('/').reverse().join('/')
-        break
-      case 'yyyy-MM-dd':
-        standardDate = date.replaceAll('-', '/')
-        break
-      case 'MM-dd-yyyy':
-        standardDate = enFormatToStandardFormat(date)
-        break
-    }
-
-    const standard = time ? standardDate + ' ' + time : standardDate
-    return new Date(standard).getTime()
-  }
-
-  // Форматирование даты без временим
-  const formattedDate = (
-    date: number | string | Date,
-    formatDate = '',
-    lang?: string
-  ) => {
-    const formatDateLocal = formatDate || getDateFormat(lang)
-
-    return format(new Date(date), formatDateLocal, {
-      locale: getDateLocalization(lang),
-    })
-  }
-  // Форматирование временим
-  const formattedTime = (
-    date: number | string | Date,
-    formatDate = '',
-    hasSeconds = false,
-    timeFormat?: string
-  ) => {
-    const formatDateLocal = formatDate || getTimeFormat(hasSeconds, timeFormat)
-
-    return format(new Date(date), formatDateLocal)
-  }
-
-  // Форматирование даты с временим
-  const formattedDatetime = (
-    date: number | string | Date,
-    formatDate = '',
-    hasSeconds = false,
-    lang?: string,
-    timeFormat?: string
-  ) => {
-    const formatDateLocal = ref(formatDate || getDateFormat(lang))
-    const formatDatetime = ref(
-      formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
-    )
-
-    window.addEventListener('timeFormatStorageChanged', function handler() {
-      formatDatetime.value =
-        formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
-
-      window.removeEventListener('timeFormatStorageChanged', handler)
-    })
-
-    return format(new Date(date), formatDatetime.value, {
-      locale: getDateLocalization(lang),
-    })
-  }
-
-  const correctRuUnit = (value: number, type: string): string => {
-    let result = ''
-
-    const forms: UI_I_ArbitraryObject<string[]> = {
-      second: ['Секунда', 'Секунды', 'Секунд'],
-      minute: ['Минута', 'Минуты', 'Минут'],
-      hour: ['Час', 'Часа', 'Часов'],
-      day: ['День', 'Дня', 'Дней'],
-      week: ['Неделя', 'Недели', 'Недель'],
-      month: ['Месяц', 'Месяца', 'Месяцев'],
-      year: ['Год', 'Года', 'Лет'],
-    }
-
-    const isFirstType = value % 10 === 1 && value % 100 !== 11
-    const isSecondType =
-      [2, 3, 4].includes(value % 10) && ![12, 13, 14].includes(value % 100)
-
-    if (isFirstType) {
-      result = forms[type][0]
-    } else if (isSecondType) {
-      result = forms[type][1]
-    } else {
-      result = forms[type][2]
-    }
-
-    return result
-  }
-
-  // Определяем сколько времени осталось
-  // time = seconds
-  const timeToTimeLeft = (time: number): number[] => {
-    const seconds = Math.floor(time % 60)
-    const minutes = Math.floor((time / 60) % 60)
-    const hours = Math.floor((time / 60 / 60) % 24)
-    const days = Math.floor((time / 60 / 60 / 24) % 30)
-    const months = Math.floor((time / 60 / 60 / 24 / 30) % 12)
-    const years = Math.floor(time / 60 / 60 / 24 / 30 / 12)
-
-    return [years, months, days, hours, minutes, seconds]
-  }
-
-  return {
-    provide: {
-      isDate,
-      getTimeFormat,
-      getDateFormat,
-      formattedTime,
-      formattedDate,
-      formattedDatetime,
-      getUnixByDate,
-      correctRuUnit,
-      timeToTimeLeft,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import {
+  format,
+  // differenceInYears,
+  // differenceInMonths,
+  // differenceInDays,
+  // differenceInHours,
+  // differenceInMinutes,
+  // differenceInSeconds,
+} from 'date-fns'
+import * as localizations from 'date-fns/locale'
+import type { UI_T_DateFormat } from '~/lib/models/plugins/date/types'
+import type { UI_I_Dateformat } from '~/lib/models/plugins/date/interfaces'
+import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+
+export default defineNuxtPlugin(() => {
+  // Проверяем переданое является датой
+  const isDate = (date: string | number) => {
+    return new Date(date).toString() !== 'Invalid Date'
+  }
+
+  // Проверяем формат времени браузера равно 24h
+  const isBrowserLocale24h = () =>
+    !new Intl.DateTimeFormat(undefined, { hour: 'numeric' })
+      .format(0)
+      .match(/AM/)
+
+  // Получаем переводы для даты
+  const getDateLocalization = (lang?: string) => {
+    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
+    const { be, enUS, hy, kk, ru, zhCN } = localizations
+    let localization
+
+    switch (currentLanguage) {
+      case 'be_BY':
+        localization = be
+        break
+      case 'en_US':
+        localization = enUS
+        break
+      case 'hy_AM':
+        localization = hy
+        break
+      case 'kk_KZ':
+        localization = kk
+        break
+      case 'ru_RU':
+        localization = ru
+        break
+      case 'zh_CHS':
+        localization = zhCN
+        break
+    }
+
+    return localization
+  }
+
+  // Получаем формат даты
+  const getDateFormat = (lang?: string): UI_T_DateFormat => {
+    const currentLanguage = lang || useLocalStorage('lang') || 'en_US'
+    const dateFormats: UI_I_Dateformat = {
+      be_BY: 'yyyy-MM-dd',
+      en_US: 'MM-dd-yyyy',
+      hy_AM: 'yyyy-MM-dd',
+      kk_KZ: 'dd/MM/yyyy',
+      ru_RU: 'dd/MM/yyyy',
+      zh_CHS: 'yyyy-MM-dd',
+    }
+
+    const dateFormat = ref(dateFormats[currentLanguage])
+
+    window.addEventListener('timeFormatStorageChanged', function handler() {
+      dateFormat.value = dateFormats[lang || useLocalStorage('lang') || 'en_US'] // TODO нужно проверить когда будем работать без useLocalStorage
+
+      window.removeEventListener('timeFormatStorageChanged', handler)
+    })
+
+    return dateFormat.value
+  }
+
+  // Получаем формат времени
+  const getTimeFormat = (hasSeconds: boolean, timeFormat?: string) => {
+    let appTimeFormat = timeFormat || useLocalStorage('timeFormat') || 'DEFAULT'
+    let timeFormatLocal = ''
+
+    if (appTimeFormat === 'DEFAULT') {
+      const isBrowserTimeFormat24 = isBrowserLocale24h()
+
+      appTimeFormat = isBrowserTimeFormat24 ? '24H' : appTimeFormat
+    }
+
+    if (appTimeFormat === '24H') {
+      timeFormatLocal = 'HH:mm'
+    } else {
+      timeFormatLocal = 'h:mm aa'
+    }
+
+    hasSeconds && (timeFormatLocal = timeFormatLocal.replace(':mm', ':mm:ss'))
+
+    return timeFormatLocal
+  }
+
+  // Форматирование даты из английского в стандартный
+  const enFormatToStandardFormat = (date: string): string => {
+    const splitDate = date.split('-')
+    return [splitDate[2], splitDate[0], splitDate[1]].join('/')
+  }
+  const getUnixByDate = (dateTime: string, lang?: string): number => {
+    const currentFormat: UI_T_DateFormat = getDateFormat(lang)
+
+    const [date, time] = dateTime.split(' ')
+
+    let standardDate = ''
+    switch (currentFormat) {
+      case 'dd/MM/yyyy':
+        standardDate = date.split('/').reverse().join('/')
+        break
+      case 'yyyy-MM-dd':
+        standardDate = date.replaceAll('-', '/')
+        break
+      case 'MM-dd-yyyy':
+        standardDate = enFormatToStandardFormat(date)
+        break
+    }
+
+    const standard = time ? standardDate + ' ' + time : standardDate
+    return new Date(standard).getTime()
+  }
+
+  // Форматирование даты без временим
+  const formattedDate = (
+    date: number | string | Date,
+    formatDate = '',
+    lang?: string
+  ) => {
+    const formatDateLocal = formatDate || getDateFormat(lang)
+
+    return format(new Date(date), formatDateLocal, {
+      locale: getDateLocalization(lang),
+    })
+  }
+  // Форматирование временим
+  const formattedTime = (
+    date: number | string | Date,
+    formatDate = '',
+    hasSeconds = false,
+    timeFormat?: string
+  ) => {
+    const formatDateLocal = formatDate || getTimeFormat(hasSeconds, timeFormat)
+
+    return format(new Date(date), formatDateLocal)
+  }
+
+  // Форматирование даты с временим
+  const formattedDatetime = (
+    date: number | string | Date,
+    formatDate = '',
+    hasSeconds = false,
+    lang?: string,
+    timeFormat?: string
+  ) => {
+    const formatDateLocal = ref(formatDate || getDateFormat(lang))
+    const formatDatetime = ref(
+      formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
+    )
+
+    window.addEventListener('timeFormatStorageChanged', function handler() {
+      formatDatetime.value =
+        formatDateLocal.value + ' ' + getTimeFormat(hasSeconds, timeFormat)
+
+      window.removeEventListener('timeFormatStorageChanged', handler)
+    })
+
+    return format(new Date(date), formatDatetime.value, {
+      locale: getDateLocalization(lang),
+    })
+  }
+
+  const correctRuUnit = (value: number, type: string): string => {
+    let result = ''
+
+    const forms: UI_I_ArbitraryObject<string[]> = {
+      second: ['Секунда', 'Секунды', 'Секунд'],
+      minute: ['Минута', 'Минуты', 'Минут'],
+      hour: ['Час', 'Часа', 'Часов'],
+      day: ['День', 'Дня', 'Дней'],
+      week: ['Неделя', 'Недели', 'Недель'],
+      month: ['Месяц', 'Месяца', 'Месяцев'],
+      year: ['Год', 'Года', 'Лет'],
+    }
+
+    const isFirstType = value % 10 === 1 && value % 100 !== 11
+    const isSecondType =
+      [2, 3, 4].includes(value % 10) && ![12, 13, 14].includes(value % 100)
+
+    if (isFirstType) {
+      result = forms[type][0]
+    } else if (isSecondType) {
+      result = forms[type][1]
+    } else {
+      result = forms[type][2]
+    }
+
+    return result
+  }
+
+  // Определяем сколько времени осталось
+  // time = seconds
+  const timeToTimeLeft = (time: number): number[] => {
+    const seconds = Math.floor(time % 60)
+    const minutes = Math.floor((time / 60) % 60)
+    const hours = Math.floor((time / 60 / 60) % 24)
+    const days = Math.floor((time / 60 / 60 / 24) % 30)
+    const months = Math.floor((time / 60 / 60 / 24 / 30) % 12)
+    const years = Math.floor(time / 60 / 60 / 24 / 30 / 12)
+
+    return [years, months, days, hours, minutes, seconds]
+  }
+
+  return {
+    provide: {
+      isDate,
+      getTimeFormat,
+      getDateFormat,
+      formattedTime,
+      formattedDate,
+      formattedDatetime,
+      getUnixByDate,
+      correctRuUnit,
+      timeToTimeLeft,
+    },
+  }
+})