itube-specs 0.0.785 → 0.0.786

package/composables/fetch/use-fetch-categories-by-letter.ts

@@ -11,7 +11,7 @@ export const useFetchCategoriesByLetter = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<Array<ICategoryCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<Array<ICategoryCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-categories-by-name.ts

@@ -11,7 +11,7 @@ export const useFetchCategoriesByName = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<ICardInfo>(
-        key,
+        stateKey.value,
         () => useApiFetcher<ICardInfo>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-categories-by-phrase.ts

@@ -11,7 +11,7 @@ export const useFetchCategoriesByPhrase = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<Array<IChipsItem>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<Array<IChipsItem>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-categories-related.ts

@@ -11,7 +11,7 @@ export const useFetchCategoriesRelated = async (
   const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
   const { data, status, error } = await useAsyncData<IRelatedPhrases>(
-    key,
+    stateKey.value,
     () => useApiFetcher<IRelatedPhrases>(
         stateKey.value,
         apiMethod,

package/composables/fetch/use-fetch-channels-by-model.ts

@@ -11,7 +11,7 @@ export const useFetchChannelsByModel = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IChannelCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IChannelCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-channels-by-name.ts

@@ -11,7 +11,7 @@ export const useFetchChannelsByName = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<ICardInfo>(
-        key,
+        stateKey.value,
         () => useApiFetcher<ICardInfo>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-channels-by-network-name.ts

@@ -15,7 +15,7 @@ export const useFetchChannelsByNetworkName = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IChannelCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IChannelCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-model-by-name.ts

@@ -11,7 +11,7 @@ export const useFetchModelByName = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<ICardInfo>(
-        key,
+        stateKey.value,
         () => useApiFetcher<ICardInfo>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-models-by-phrases.ts

@@ -15,7 +15,7 @@ export const useFetchModelsByPhrases = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IModelCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IModelCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-playlists-by-id.ts

@@ -10,7 +10,7 @@ export const useFetchPlaylistsById = async (apiMethod: (...args: any[]) => Promi
     const lang = useLang() as Language;
 
     const { data, status, error, refresh } = await useAsyncData<IPlaylistData>(
-        key,
+        stateKey.value,
         () => useApiFetcher<IPlaylistData>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-playlists-get-videos-by-id.ts

@@ -15,7 +15,7 @@ export const useFetchPlaylistsGetVideosById = async (
     const lang = useLang() as Language;
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcherNoCache<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-popular-tags-by-channel-name.ts

@@ -11,7 +11,7 @@ export const useFetchPopularTagsByChannelName = async (
   const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
   const { data, status, error } = await useAsyncData<IPopularTags[]>(
-    key,
+    stateKey.value,
     () => useApiFetcher<IPopularTags[]>(
         stateKey.value,
         apiMethod,

package/composables/fetch/use-fetch-popular-tags-by-model-name.ts

@@ -11,7 +11,7 @@ export const useFetchPopularTagsByModelName = async (
   const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
   const { data, status, error } = await useAsyncData<IPopularTags[]>(
-    key,
+    stateKey.value,
     () => useApiFetcher<IPopularTags[]>(
         stateKey.value,
         apiMethod,

package/composables/fetch/use-fetch-related-videos.ts

@@ -15,7 +15,7 @@ export const useFetchRelatedVideos = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => {
             if (!slug.value) return Promise.resolve(null as unknown as PaginatedResponse<IVideoCard>);
 

package/composables/fetch/use-fetch-video-referer-phrases.ts

@@ -9,7 +9,7 @@ export const useFetchVideoRefererPhrases = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${lang}`);
 
     const { data, status, error } = await useAsyncData<string[]>(
-        key,
+        stateKey.value,
         () => useApiFetcher<string[]>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-videos-by-categories.ts

@@ -16,8 +16,14 @@ export const useFetchVideosByCategories = async (
     const stateKey = computed(() => `data-${key}-${slug.value}-${JSON.stringify(route.query)}-${lang}`);
     const filters = computed(() => useGetVideosFilterRequest(route, selectDurationItems, selectAddedItems));
 
+    // Ключ уникален на slug+query+lang (не константа AsyncData.VideosByCategory): иначе все
+    // категории делят один кэш-слот useAsyncData и при приходе на /categories/<slug>, когда
+    // слот уже заполнен другой категорией, отдаётся её кэш вместо свежего фетча (ролики «не
+    // подсасываются»). watch — только на query (page/sort/фильтры): следить за slug НЕЛЬЗЯ,
+    // т.к. route.params.slug общий для всех [slug]-роутов и при уходе на /videos/<id> и т.п.
+    // watch дёрнул бы этот эндпоинт с чужим слагом.
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,
@@ -31,12 +37,7 @@ export const useFetchVideosByCategories = async (
             getSelectedQuery(route, sortItemsDefault) || '-popularity'
         )(),
         {
-            watch: [() => {
-                if (route.query) {
-                    const currentQuery = route.query;
-                    return JSON.stringify(currentQuery);
-                }
-            }],
+            watch: [() => JSON.stringify(route.query)],
         }
     );
 

package/composables/fetch/use-fetch-videos-by-channel.ts

@@ -15,7 +15,7 @@ export const useFetchVideosByChannel = async (apiMethod: (...args: any[]) => Pro
     const stateKey = computed(() => `data-${key}-${slug.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-videos-by-model-and-channel.ts

@@ -20,7 +20,7 @@ export const useFetchVideosByModelAndChannel = async (apiMethod: (...args: any[]
     const stateKey = computed(() => `data-${key}-${slug.value}-${channel.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-videos-by-model-and-tag.ts

@@ -20,7 +20,7 @@ export const useFetchVideosByModelAndTag = async (apiMethod: (...args: any[]) =>
     const stateKey = computed(() => `data-${key}-${slug.value}-${tag.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-videos-by-model.ts

@@ -15,7 +15,7 @@ export const useFetchVideosByModel = async (apiMethod: (...args: any[]) => Promi
     const stateKey = computed(() => `data-${key}-${slug.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-videos-by-tag.ts

@@ -15,7 +15,7 @@ export const useFetchVideosByTag = async (apiMethod: (...args: any[]) => Promise
     const stateKey = computed(() => `data-${key}-${slug.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-videos-search-by-niche.ts

@@ -13,7 +13,7 @@ export const useFetchVideosSearchByNiche = async (apiMethod: (...args: any[]) =>
     const stateKey = computed(() => `data-${key}-${slug.value}-${JSON.stringify(route.query)}-${lang}`);
 
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/composables/fetch/use-fetch-videos.ts

@@ -16,8 +16,11 @@ export const useFetchVideos = async (
     const key = AsyncData.Videos;
     const stateKey = computed(() => `data-${key}-${JSON.stringify(route.query)}-${lang}`);
 
+    // Ключ уникален на query+lang (не константа AsyncData.Videos): иначе главная делит один
+    // кэш-слот между разными query (page/sort/фильтры) и при возврате на неё отдаётся кэш от
+    // другого состояния вместо свежего фетча (мигает «нет данных»/пустой грид).
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
-        key,
+        stateKey.value,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
             stateKey.value,
             apiMethod,

package/package.json

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