@ciwergrp/nuxid 1.17.1 → 1.17.3

package/dist/module.json

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

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 key2 in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
-        const value = obj[key2];
+    for (const key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        const value = obj[key];
         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 key2 in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
-        const value = obj[key2];
+    for (const key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        const value = obj[key];
         if (isRef(value)) {
-          unwrapped[key2] = value.value;
+          unwrapped[key] = value.value;
         } else if (typeof value === "object") {
-          unwrapped[key2] = unwrapReactiveObject(value);
+          unwrapped[key] = unwrapReactiveObject(value);
         } else {
-          unwrapped[key2] = value;
+          unwrapped[key] = value;
         }
       }
     }
@@ -58,8 +58,7 @@ export async function useCursorHttp(url, options) {
     fetchOptions,
     meta,
     itemKey = "id",
-    cursorParam = "cursor",
-    key
+    cursorParam = "cursor"
   } = options ?? {};
   const initialUrl = url;
   const data = ref();
@@ -69,7 +68,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 +157,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 +185,7 @@ export async function useCursorHttp(url, options) {
     watch(
       reactiveSources,
       () => {
-        currentParams.value = unwrapReactiveObject(fetchOptions);
+        currentParams.value = unwrapReactiveObject(fetchOptions) ?? {};
         refresh();
       },
       { flush: "sync" }
@@ -197,43 +200,10 @@ export async function useCursorHttp(url, options) {
     }
   });
   if (immediate) {
-    const asyncKey = key ?? `cursor:${String(url)}:${JSON.stringify(currentParams.value ?? {})}`;
     if (lazy) {
-      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);
-        }
-      });
+      void fetchData(initialUrl, currentParams.value);
     } 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);
-      }
+      await fetchData(initialUrl, currentParams.value);
     }
   }
   return {

package/package.json

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