itube-specs 0.0.369 → 0.0.372

package/components/ui/s-chips.vue

@@ -89,7 +89,7 @@ const isActive = computed(() => {
   }
 
   const current = route.path.replace(/^\/|\/$/g, '');
-  const target = targetPath.value.replace(/^\/|\/$/g, '');
+  const target = generateLink(targetPath.value).replace(/^\/|\/$/g, '');
 
   return current === target;
 });

package/composables/use-meta.ts

@@ -3,7 +3,7 @@ import type { Ref } from 'vue';
 import { useRoute } from 'vue-router';
 import type { IChipsItem } from '../types';
 
-export function useMeta(t, page: string, brandName: string, sortOptions?: IChipsItem[], text?: Ref<string>, secondText?: Ref<string>) {
+export function useMeta(t, page: string, brandName: string, sortOptions?: IChipsItem[], text?: Ref<string>, secondText?: Ref<string>, thirdText?: Ref<string>, fourthText?: Ref<string>) {
     const route = useRoute();
 
     const sortType = computed(() => {
@@ -16,6 +16,8 @@ export function useMeta(t, page: string, brandName: string, sortOptions?: IChips
     function getPath(key: string) {
         const plainSlug = unref(text);
         const secondTextValue = unref(secondText);
+        const thirdTextValue = unref(thirdText);
+        const fourTextValue = unref(fourthText);
         const pageNumber = computed(() => route.query?.['page'] ? Number(route.query['page']) : 1);
         const pageText = unref(pageNumber) === 1 ? null : ` #${unref(pageNumber)}`;
 
@@ -24,6 +26,8 @@ export function useMeta(t, page: string, brandName: string, sortOptions?: IChips
             {
                 text: plainSlug,
                 secondText: secondTextValue,
+                thirdText: thirdTextValue,
+                fourText: fourTextValue,
                 brandName: `| ${brandName}`, //черточка '|' нужна обязательно
                 page: pageText,
             }

package/composables/use-model-filter-chips.ts

@@ -0,0 +1,99 @@
+import type { IChipsItem, IModelFilter, IModelFilterOptions } from '../types'
+import type { LocationQuery } from '#vue-router'
+import { getMonth } from '../runtime'
+import type { Ref } from 'vue';
+
+export function useFilterChipsItems(
+  filters: Ref<IModelFilter[]>,
+  route: { query: LocationQuery },
+  t: (key: string) => string
+) {
+  const chipsItems = computed<IChipsItem[]>(() => {
+    const queryItems = Object.keys(route.query)
+      .filter(item => item.startsWith('filter_'))
+      .map(item =>
+        item
+          .replace('filter_', '')
+          .replace(/_/g, ' ')
+      )
+
+    const groups = Object.values(
+      queryItems.reduce((acc: Record<string, string[]>, str: string) => {
+        const parts = str.split(' ')
+        const last = parts.at(-1)
+
+        const key =
+          last === 'from' || last === 'to'
+            ? parts.slice(0, -1).join(' ')
+            : str
+
+        acc[key] ??= []
+
+        if (last === 'from') acc[key].unshift(str)
+        else acc[key].push(str)
+
+        return acc
+      }, {})
+    )
+
+    const getValue = (item: string, index: number) => {
+      const filter = filters.value.find(filter =>
+        filter.name ===
+        item
+          .replace(/ /g, '_')
+          .replace('_from', '')
+          .replace('_to', '')
+      )
+
+      const defaultValue =
+        index === 0
+          ? filter?.options[0]
+          : filter?.options.at(-1)
+
+      const value = route.query[`filter_${item.replace(/ /g, '_')}`]
+
+      if (item.includes('month')) {
+        return getMonth(
+          t,
+          Number(value ?? defaultValue?.name) - 1
+        )
+      }
+
+      if (!isNaN(Number(value))) {
+        return value
+      }
+
+      return (
+        filter?.options.find(
+          (option: IModelFilterOptions) =>
+            option.name === value
+        )?.title ??
+        defaultValue?.title
+      )
+    }
+
+    const getValueText = (items: string[]) =>
+      [...new Set(items.map(getValue))].join(' - ')
+
+    const chipsTitle = (items: string[]) => {
+      const key = items[0].replace(' from', '')
+      const filter = filters.value.find(
+        f => f.name.replace(/_/g, ' ') === key
+      )
+
+      const text = `${filter?.title}: ${getValueText(items)}`
+      return text.length > 30 ? getValueText(items) : text
+    }
+
+    return groups.map(item => ({
+      title: chipsTitle(item),
+      value: item.map(
+        sub => `filter_${sub.replace(/ /g, '_')}`
+      ),
+    }))
+  })
+
+  return {
+    chipsItems,
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.369",
+  "version": "0.0.372",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {

package/runtime/utils/cleaners/clean-video-data.ts

@@ -25,4 +25,5 @@ export const cleanVideoData = (data: IRawVideoData): IVideoData => ({
     videoUrl: data.video_url || '',
     isDeleted: data.is_deleted || false,
     thumbNum: data.thumb_number || 0,
+    description: data.description || '',
 })

package/types/raw/raw-video-data.d.ts

@@ -10,7 +10,7 @@ export interface IRawVideoData {
     is_hd: boolean;             // unused
     title: string;
     header: string;
-    description: string;        // unused
+    description: string;
     views: number;
     likes: number;
     dislikes: number;           // unused

package/types/video-data.d.ts

@@ -34,4 +34,5 @@ export interface IVideoData {
     videoUrl: string;
     isDeleted: boolean;
     thumbNum: number;
+    description: string;
 }