@ciwergrp/nuxid 1.16.7 → 1.17.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@ciwergrp/nuxid",
   "configKey": "nuxid",
-  "version": "1.16.7",
+  "version": "1.17.1",
   "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;
         }
       }
     }
@@ -58,7 +58,8 @@ export async function useCursorHttp(url, options) {
     fetchOptions,
     meta,
     itemKey = "id",
-    cursorParam = "cursor"
+    cursorParam = "cursor",
+    key
   } = options ?? {};
   const initialUrl = url;
   const data = ref();
@@ -196,10 +197,43 @@ export async function useCursorHttp(url, options) {
     }
   });
   if (immediate) {
+    const asyncKey = key ?? `cursor:${String(url)}:${JSON.stringify(currentParams.value ?? {})}`;
     if (lazy) {
-      void init();
+      const { data: asyncData, error: asyncError, pending: asyncPending } = useAsyncData(
+        asyncKey,
+        () => fetcherFn(initialUrl, currentParams.value),
+        { lazy: true }
+      );
+      watch(asyncPending, (v) => loading.value = v, { immediate: true });
+      watch(asyncData, (val) => {
+        if (val) {
+          const response = val;
+          data.value = { ...response, data: [...response.data] };
+          nextCursor.value = normalizeCursorValue(response.meta?.[cursorKey]);
+          hasNextPage.value = response.meta?.[hasMoreKey] ?? false;
+        }
+      });
+      watch(asyncError, (val) => {
+        if (val) {
+          error.value = normalizeFetchError(val);
+        }
+      });
     } else {
-      await init();
+      loading.value = true;
+      const { data: asyncData, error: asyncError } = await useAsyncData(
+        asyncKey,
+        () => fetcherFn(initialUrl, currentParams.value)
+      );
+      loading.value = false;
+      if (asyncData.value) {
+        const val = asyncData.value;
+        data.value = { ...val, data: [...val.data] };
+        nextCursor.value = normalizeCursorValue(val.meta?.[cursorKey]);
+        hasNextPage.value = val.meta?.[hasMoreKey] ?? false;
+      }
+      if (asyncError.value) {
+        error.value = normalizeFetchError(asyncError.value);
+      }
     }
   }
   return {

package/package.json

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