bfg-common 1.5.244 → 1.5.245

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/lib/utils/utils.ts

@@ -10,9 +10,15 @@ export const enumKeyFromValue = (
   return dataFromEnum ? dataFromEnum[0] : undefined
 }
 
+export const extractContentInBrackets = (inputString: string): string => {
+  const regex = /\[([^\]]+)\]/
+  const match = inputString.match(regex)
+
+  return match ? match[1] : ''
+}
 export const extractContentLastSlash = (
-  inputString: string,
-  after = false
+    inputString: string,
+    after = false
 ): string => {
   const regex = after ? /\/([^/]+)\/?$/ : /(.*)\//
 
@@ -21,6 +27,12 @@ export const extractContentLastSlash = (
   return match ? match[1] : ''
 }
 
+export const removeLastSlash = (
+    inputString: string
+): string => {
+  return inputString.endsWith('/') ? inputString.slice(0, -1) : inputString
+}
+
 export const intToIp = (value: number): string => {
   return [
     (value >> 24) & 0xff,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.244",
+  "version": "1.5.245",
   "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.438",
+    "bfg-uikit": "1.0.442",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }

package/plugins/cron.ts

@@ -0,0 +1,75 @@
+import { defineNuxtPlugin } from '#app'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+export default defineNuxtPlugin(() => {
+  const cron = function (): any {
+    const self: any = {}
+
+    self.cronToHumanReadable = (
+      cronString: string,
+      localization: UI_I_Localization
+    ): string => {
+      const [minutes, hours, , , daysString] = cronString.split(' ')
+
+      const daysMap = {
+        0: localization.sundays,
+        1: localization.mondays,
+        2: localization.tuesdays,
+        3: localization.wednesdays,
+        4: localization.thursdays,
+        5: localization.fridays,
+        6: localization.saturdays,
+      }
+
+      let days = localization.everyDay
+      if (daysString !== '*') {
+        const daysArray = daysString
+          .split(',')
+          // @ts-ignore
+          .map((day: number) => daysMap[day])
+        days = `${localization.on2} ${daysArray.join(', ')}`
+      }
+
+      // Формирование строки времени
+      const time = `${String(hours).padStart(2, '0')}:${String(
+        minutes
+      ).padStart(2, '0')}`
+
+      return `${days} ${localization.in} ${time}`
+    }
+
+    self.decodeCron = (cronString: string): any => {
+      const [minutes, hours, , , daysString] = cronString.split(' ')
+
+      const days =
+        daysString === '*'
+          ? [0, 1, 2, 3, 4, 5, 6]
+          : daysString.split(',').map(Number)
+
+      const h = hours === '*' ? '00' : String(hours).padStart(2, '0')
+      const m = minutes === '*' ? '00' : String(minutes).padStart(2, '0')
+      const time = `${h}:${m}`
+
+      return [
+        days,
+        time,
+      ]
+    }
+
+    self.encodeCron = (days: number[], time: string): string => {
+      const { 0: hours, 1: minutes } = time.split(':').map(Number)
+
+      const daysString = days.length === 7 ? '*' : days.join(',')
+
+      return `${minutes} ${hours} * * ${daysString}`
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      cron,
+    },
+  }
+})