@ciwergrp/nuxid 1.17.0 → 1.17.2

package/dist/module.json

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

package/dist/runtime/fetcher/cursor.js

@@ -69,7 +69,7 @@ export async function useCursorHttp(url, options) {
   const hasNextPage = ref(true);
   const isLoadMoreTriggered = ref(false);
   const currentParams = shallowRef(
-    unwrapReactiveObject(fetchOptions)
+    unwrapReactiveObject(fetchOptions) ?? {}
   );
   let pollTimer = null;
   let fetchPromise = null;
@@ -158,10 +158,14 @@ export async function useCursorHttp(url, options) {
       return;
     }
     isLoadMoreTriggered.value = true;
+    const baseParams = currentParams.value ?? {};
     const params = nextCursor.value ? {
-      ...currentParams.value,
-      query: { ...currentParams.value?.query, [resolvedCursorParam]: nextCursor.value }
-    } : currentParams.value;
+      ...baseParams,
+      query: {
+        ...baseParams.query ?? {},
+        [resolvedCursorParam]: nextCursor.value
+      }
+    } : baseParams;
     await fetchData(initialUrl, params);
   };
   const refresh = async () => {
@@ -182,7 +186,7 @@ export async function useCursorHttp(url, options) {
     watch(
       reactiveSources,
       () => {
-        currentParams.value = unwrapReactiveObject(fetchOptions);
+        currentParams.value = unwrapReactiveObject(fetchOptions) ?? {};
         refresh();
       },
       { flush: "sync" }
@@ -197,29 +201,42 @@ export async function useCursorHttp(url, options) {
     }
   });
   if (immediate) {
+    const asyncKey = key ?? `cursor:${String(url)}:${JSON.stringify(currentParams.value ?? {})}`;
     if (lazy) {
-      void init();
-    } else {
-      const asyncKey = key ?? `cursor:${String(url)}:${JSON.stringify(currentParams.value ?? {})}`;
-      try {
-        const { useAsyncData } = await import("#app");
-        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;
+      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;
         }
-        if (asyncError.value) {
-          error.value = normalizeFetchError(asyncError.value);
+      });
+      watch(asyncError, (val) => {
+        if (val) {
+          error.value = normalizeFetchError(val);
         }
-      } catch {
-        await init();
+      });
+    } else {
+      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);
       }
     }
   }

package/package.json

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