@ciwergrp/nuxid 1.17.4 → 1.17.8

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@ciwergrp/nuxid",
   "configKey": "nuxid",
-  "version": "1.17.4",
+  "version": "1.17.8",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/fetcher/cursor.d.ts

@@ -19,6 +19,7 @@ export interface CursorFetchOptions<TRequest extends NitroFetchRequest = NitroFe
     itemKey?: string;
     cursorParam?: string;
     query?: Record<string, any>;
+    key?: string;
 }
 export interface FetchError<TData = any> {
     statusCode: number | undefined;

package/dist/runtime/fetcher/cursor.js

@@ -5,9 +5,9 @@ export async function useCursorHttp(url, options) {
     if (!obj || typeof obj !== "object") {
       return sources;
     }
-    for (const key in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key)) {
-        const value = obj[key];
+    for (const key2 in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
+        const value = obj[key2];
         if (isRef(value)) {
           sources.push(value);
         } else if (typeof value === "object") {
@@ -22,15 +22,15 @@ export async function useCursorHttp(url, options) {
       return obj;
     }
     const unwrapped = Array.isArray(obj) ? [] : {};
-    for (const key in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key)) {
-        const value = obj[key];
+    for (const key2 in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
+        const value = obj[key2];
         if (isRef(value)) {
-          unwrapped[key] = value.value;
+          unwrapped[key2] = value.value;
         } else if (typeof value === "object") {
-          unwrapped[key] = unwrapReactiveObject(value);
+          unwrapped[key2] = unwrapReactiveObject(value);
         } else {
-          unwrapped[key] = value;
+          unwrapped[key2] = value;
         }
       }
     }
@@ -56,9 +56,11 @@ export async function useCursorHttp(url, options) {
     pollInterval,
     fetcher,
     fetchOptions,
+    query,
     meta,
     itemKey = "id",
-    cursorParam = "cursor"
+    cursorParam = "cursor",
+    key
   } = options ?? {};
   const initialUrl = url;
   const data = ref();
@@ -70,6 +72,24 @@ export async function useCursorHttp(url, options) {
   const currentParams = shallowRef(
     unwrapReactiveObject(fetchOptions) ?? {}
   );
+  const normalizeStateKey = (value, fallback) => {
+    if (typeof value !== "string") {
+      return fallback;
+    }
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : fallback;
+  };
+  const stateKey = normalizeStateKey(key, (() => {
+    try {
+      const queryValue = query ?? currentParams.value?.query ?? {};
+      return `${String(url)}:${JSON.stringify(queryValue)}`;
+    } catch {
+      return String(url);
+    }
+  })());
+  const { useNuxtApp, useState } = await import("#app");
+  const nuxtApp = useNuxtApp();
+  const initialResponseState = useState(stateKey, () => null);
   let pollTimer = null;
   let fetchPromise = null;
   const fetcherFn = fetcher ?? globalThis.$fetch;
@@ -97,6 +117,18 @@ export async function useCursorHttp(url, options) {
     }
     return String(value);
   };
+  const cloneResponse = (response) => ({
+    ...response,
+    data: [...response.data]
+  });
+  const applyResponse = (response, cacheInitial = false) => {
+    data.value = cloneResponse(response);
+    nextCursor.value = normalizeCursorValue(response.meta?.[cursorKey]);
+    hasNextPage.value = response.meta?.[hasMoreKey] ?? false;
+    if (cacheInitial) {
+      initialResponseState.value = cloneResponse(response);
+    }
+  };
   const fetchData = async (fetchUrl, params) => {
     if (loading.value) {
       return fetchPromise ?? Promise.resolve();
@@ -130,7 +162,36 @@ export async function useCursorHttp(url, options) {
       }
     }
   };
-  const initialFetch = () => fetchData(initialUrl, currentParams.value);
+  const fetchInitialData = async (params, useCache = true) => {
+    if (loading.value) {
+      return fetchPromise ?? Promise.resolve();
+    }
+    const canUseHydrationCache = import.meta.client && nuxtApp.isHydrating && nuxtApp.payload.serverRendered;
+    if (useCache && canUseHydrationCache && initialResponseState.value) {
+      applyResponse(initialResponseState.value);
+      return Promise.resolve();
+    }
+    loading.value = true;
+    error.value = null;
+    const promise = (async () => {
+      try {
+        const response = await fetcherFn(initialUrl, params ?? currentParams.value);
+        applyResponse(response, true);
+      } catch (e) {
+        error.value = normalizeFetchError(e);
+      } finally {
+        loading.value = false;
+      }
+    })();
+    fetchPromise = promise;
+    try {
+      await promise;
+    } finally {
+      if (fetchPromise === promise) {
+        fetchPromise = null;
+      }
+    }
+  };
   const pollData = async () => {
     try {
       const response = await fetcherFn(initialUrl, currentParams.value);
@@ -145,9 +206,7 @@ export async function useCursorHttp(url, options) {
           data.value.data.unshift(...newItems);
         }
       } else {
-        data.value = response;
-        nextCursor.value = normalizeCursorValue(response.meta?.[cursorKey]);
-        hasNextPage.value = response.meta?.[hasMoreKey] ?? false;
+        applyResponse(response, true);
       }
     } catch (e) {
       console.error("Polling error:", e);
@@ -173,13 +232,13 @@ export async function useCursorHttp(url, options) {
     nextCursor.value = null;
     hasNextPage.value = true;
     isLoadMoreTriggered.value = false;
-    await fetchData(initialUrl, currentParams.value);
+    await fetchInitialData(currentParams.value, false);
   };
   const init = async () => {
     if (data.value) {
       return;
     }
-    await fetchData(initialUrl, currentParams.value);
+    await fetchInitialData(currentParams.value);
   };
   const reactiveSources = findReactiveSources(fetchOptions);
   if (reactiveSources.length > 0) {
@@ -203,10 +262,10 @@ export async function useCursorHttp(url, options) {
   if (immediate) {
     if (import.meta.client && lazy) {
       onBeforeMount(() => {
-        void initialFetch();
+        void fetchInitialData();
       });
     } else {
-      await initialFetch();
+      await fetchInitialData();
     }
   }
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciwergrp/nuxid",
-  "version": "1.17.4",
+  "version": "1.17.8",
   "description": "All-in-one essential modules for Nuxt",
   "repository": {
     "type": "git",