@spoosh/core 0.13.1 → 0.13.2

package/dist/index.d.mts

@@ -1748,6 +1748,21 @@ type TagOptions = {
 };
 declare function resolveTags(options: TagOptions | undefined, resolvedPath: string[]): string[];
 declare function resolvePath(path: string[], params: Record<string, string | number> | undefined): string[];
+/**
+ * Resolves dynamic path parameters in a string path.
+ * Unlike `resolvePath`, this works with string paths and doesn't throw on missing params.
+ *
+ * @param path - The path string with dynamic segments (e.g., "products/:id/comments")
+ * @param params - The params object containing values to substitute
+ * @returns The resolved path string (e.g., "products/1/comments")
+ *
+ * @example
+ * ```ts
+ * resolvePathString("products/:id/comments", { id: 1 })
+ * // => "products/1/comments"
+ * ```
+ */
+declare function resolvePathString(path: string, params: Record<string, string | number> | undefined): string;
 
 declare const isNetworkError: (err: unknown) => boolean;
 declare const isAbortError: (err: unknown) => boolean;
@@ -2002,4 +2017,4 @@ type CreateInfiniteReadOptions<TData, TItem, TError, TRequest> = {
 };
 declare function createInfiniteReadController<TData, TItem, TError, TRequest extends InfiniteRequestOptions = InfiniteRequestOptions>(options: CreateInfiniteReadOptions<TData, TItem, TError, TRequest>): InfiniteReadController<TData, TItem, TError>;
 
-export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type DevtoolEvents, type EventEmitter, type EventListener, type EventOptions, type EventTracer, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HasReadMethod, type HasWriteMethod, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextBase, type PluginContextExtensions, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginRequestOptions, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestCompleteEvent, type RequestOptions$1 as RequestOptions, type RequestTracer, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type SetupContext, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshOptions, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StandaloneEvent, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Trace, type TraceColor, type TraceEvent, type TraceInfo, type TraceListener, type TraceOptions, type TraceStage, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, type WriteSelectorClient, __DEV__, buildUrl, clone, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, createTracer, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isAbortError, isJsonBody, isNetworkError, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };
+export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type DevtoolEvents, type EventEmitter, type EventListener, type EventOptions, type EventTracer, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HasReadMethod, type HasWriteMethod, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextBase, type PluginContextExtensions, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginRequestOptions, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestCompleteEvent, type RequestOptions$1 as RequestOptions, type RequestTracer, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type SetupContext, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshOptions, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StandaloneEvent, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Trace, type TraceColor, type TraceEvent, type TraceInfo, type TraceListener, type TraceOptions, type TraceStage, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, type WriteSelectorClient, __DEV__, buildUrl, clone, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, createTracer, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isAbortError, isJsonBody, isNetworkError, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolvePathString, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };

package/dist/index.d.ts

@@ -1748,6 +1748,21 @@ type TagOptions = {
 };
 declare function resolveTags(options: TagOptions | undefined, resolvedPath: string[]): string[];
 declare function resolvePath(path: string[], params: Record<string, string | number> | undefined): string[];
+/**
+ * Resolves dynamic path parameters in a string path.
+ * Unlike `resolvePath`, this works with string paths and doesn't throw on missing params.
+ *
+ * @param path - The path string with dynamic segments (e.g., "products/:id/comments")
+ * @param params - The params object containing values to substitute
+ * @returns The resolved path string (e.g., "products/1/comments")
+ *
+ * @example
+ * ```ts
+ * resolvePathString("products/:id/comments", { id: 1 })
+ * // => "products/1/comments"
+ * ```
+ */
+declare function resolvePathString(path: string, params: Record<string, string | number> | undefined): string;
 
 declare const isNetworkError: (err: unknown) => boolean;
 declare const isAbortError: (err: unknown) => boolean;
@@ -2002,4 +2017,4 @@ type CreateInfiniteReadOptions<TData, TItem, TError, TRequest> = {
 };
 declare function createInfiniteReadController<TData, TItem, TError, TRequest extends InfiniteRequestOptions = InfiniteRequestOptions>(options: CreateInfiniteReadOptions<TData, TItem, TError, TRequest>): InfiniteReadController<TData, TItem, TError>;
 
-export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type DevtoolEvents, type EventEmitter, type EventListener, type EventOptions, type EventTracer, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HasReadMethod, type HasWriteMethod, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextBase, type PluginContextExtensions, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginRequestOptions, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestCompleteEvent, type RequestOptions$1 as RequestOptions, type RequestTracer, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type SetupContext, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshOptions, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StandaloneEvent, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Trace, type TraceColor, type TraceEvent, type TraceInfo, type TraceListener, type TraceOptions, type TraceStage, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, type WriteSelectorClient, __DEV__, buildUrl, clone, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, createTracer, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isAbortError, isJsonBody, isNetworkError, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };
+export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type DevtoolEvents, type EventEmitter, type EventListener, type EventOptions, type EventTracer, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HasReadMethod, type HasWriteMethod, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextBase, type PluginContextExtensions, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginRequestOptions, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestCompleteEvent, type RequestOptions$1 as RequestOptions, type RequestTracer, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type SetupContext, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshOptions, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StandaloneEvent, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Trace, type TraceColor, type TraceEvent, type TraceInfo, type TraceListener, type TraceOptions, type TraceStage, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, type WriteSelectorClient, __DEV__, buildUrl, clone, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, createTracer, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isAbortError, isJsonBody, isNetworkError, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolvePathString, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };

package/dist/index.js

@@ -54,6 +54,7 @@ __export(src_exports, {
   objectToUrlEncoded: () => objectToUrlEncoded,
   resolveHeadersToRecord: () => resolveHeadersToRecord,
   resolvePath: () => resolvePath,
+  resolvePathString: () => resolvePathString,
   resolveRequestBody: () => resolveRequestBody,
   resolveTags: () => resolveTags,
   setHeaders: () => setHeaders,
@@ -355,6 +356,17 @@ function resolvePath(path, params) {
     return segment;
   });
 }
+function resolvePathString(path, params) {
+  if (!params) return path;
+  return path.split("/").map((segment) => {
+    if (segment.startsWith(":")) {
+      const paramName = segment.slice(1);
+      const value = params[paramName];
+      return value !== void 0 ? String(value) : segment;
+    }
+    return segment;
+  }).join("/");
+}
 
 // src/utils/errors.ts
 var isNetworkError = (err) => err instanceof TypeError;
@@ -415,7 +427,15 @@ var fetchTransport = async (url, init) => {
   const res = await fetch(url, init);
   const contentType = res.headers.get("content-type");
   const isJson = contentType?.includes("application/json");
-  const data = isJson ? await res.json() : res;
+  const isText = contentType?.includes("text/") || contentType?.includes("application/xml");
+  let data;
+  if (isJson) {
+    data = await res.json();
+  } else if (isText) {
+    data = await res.text();
+  } else {
+    data = void 0;
+  }
   return { ok: res.ok, status: res.status, headers: res.headers, data };
 };
 
@@ -1325,30 +1345,26 @@ function createOperationController(options) {
       const coreFetch = async () => {
         abortController = new AbortController();
         context.request.signal = abortController.signal;
-        const fetchPromise = (async () => {
-          try {
-            const response = await fetchFn(context.request);
-            return response;
-          } catch (err) {
-            const errorResponse = {
-              status: 0,
-              error: err,
-              data: void 0
-            };
-            return errorResponse;
-          }
-        })();
-        stateManager.setPendingPromise(queryKey, fetchPromise);
-        fetchPromise.finally(() => {
-          stateManager.setPendingPromise(queryKey, void 0);
-        });
-        return fetchPromise;
+        try {
+          const response = await fetchFn(context.request);
+          return response;
+        } catch (err) {
+          const errorResponse = {
+            status: 0,
+            error: err,
+            data: void 0
+          };
+          return errorResponse;
+        }
       };
-      const finalResponse = await pluginExecutor.executeMiddleware(
+      const middlewarePromise = pluginExecutor.executeMiddleware(
         operationType,
         context,
         coreFetch
       );
+      stateManager.setPendingPromise(queryKey, middlewarePromise);
+      const finalResponse = await middlewarePromise;
+      stateManager.setPendingPromise(queryKey, void 0);
       if (finalResponse.data !== void 0 && !finalResponse.error) {
         updateState({
           data: finalResponse.data,
@@ -1483,6 +1499,7 @@ function createInfiniteReadController(options) {
   let cachedState = createInitialInfiniteState();
   const trackerKey = createTrackerKey(path, method, baseOptionsForKey);
   let pageSubscriptions = [];
+  let trackerSubscription = null;
   let refetchUnsubscribe = null;
   const loadFromTracker = () => {
     const cached = stateManager.getCache(trackerKey);
@@ -1597,52 +1614,50 @@ function createInfiniteReadController(options) {
     }
     pendingFetches.add(pageKey);
     fetchingDirection = direction;
+    latestError = void 0;
     notify();
     abortController = new AbortController();
     const signal = abortController.signal;
     const context = createContext(pageKey, mergedRequest);
     const coreFetch = async () => {
-      const fetchPromise = (async () => {
-        try {
-          const response = await fetchFn(mergedRequest, signal);
-          if (signal.aborted) {
-            return {
-              status: 0,
-              data: void 0,
-              aborted: true
-            };
-          }
-          return response;
-        } catch (err) {
-          if (signal.aborted) {
-            return {
-              status: 0,
-              data: void 0,
-              aborted: true
-            };
-          }
-          const errorResponse = {
+      try {
+        const response = await fetchFn(mergedRequest, signal);
+        if (signal.aborted) {
+          return {
             status: 0,
-            error: err,
-            data: void 0
+            data: void 0,
+            aborted: true
+          };
+        }
+        return response;
+      } catch (err) {
+        if (signal.aborted) {
+          return {
+            status: 0,
+            data: void 0,
+            aborted: true
           };
-          latestError = err;
-          return errorResponse;
-        } finally {
-          pendingFetches.delete(pageKey);
-          fetchingDirection = null;
-          stateManager.setPendingPromise(pageKey, void 0);
-          notify();
         }
-      })();
-      stateManager.setPendingPromise(pageKey, fetchPromise);
-      return fetchPromise;
+        const errorResponse = {
+          status: 0,
+          error: err,
+          data: void 0
+        };
+        latestError = err;
+        return errorResponse;
+      }
     };
-    const finalResponse = await pluginExecutor.executeMiddleware(
+    const middlewarePromise = pluginExecutor.executeMiddleware(
       "infiniteRead",
       context,
       coreFetch
     );
+    stateManager.setPendingPromise(pageKey, middlewarePromise);
+    const finalResponse = await middlewarePromise;
+    pendingFetches.delete(pageKey);
+    fetchingDirection = null;
+    stateManager.setPendingPromise(pageKey, void 0);
+    notify();
     if (finalResponse.data !== void 0 && !finalResponse.error) {
       pageRequests.set(pageKey, mergedRequest);
       if (direction === "next") {
@@ -1755,6 +1770,7 @@ function createInfiniteReadController(options) {
       loadFromTracker();
       cachedState = computeState();
       subscribeToPages();
+      trackerSubscription = stateManager.subscribeCache(trackerKey, notify);
       const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeLifecycle("onMount", "infiniteRead", context);
       refetchUnsubscribe = eventEmitter.on("refetch", (event) => {
@@ -1776,6 +1792,8 @@ function createInfiniteReadController(options) {
       pluginExecutor.executeLifecycle("onUnmount", "infiniteRead", context);
       pageSubscriptions.forEach((unsub) => unsub());
       pageSubscriptions = [];
+      trackerSubscription?.();
+      trackerSubscription = null;
       refetchUnsubscribe?.();
       refetchUnsubscribe = null;
     },

package/dist/index.mjs

@@ -290,6 +290,17 @@ function resolvePath(path, params) {
     return segment;
   });
 }
+function resolvePathString(path, params) {
+  if (!params) return path;
+  return path.split("/").map((segment) => {
+    if (segment.startsWith(":")) {
+      const paramName = segment.slice(1);
+      const value = params[paramName];
+      return value !== void 0 ? String(value) : segment;
+    }
+    return segment;
+  }).join("/");
+}
 
 // src/utils/errors.ts
 var isNetworkError = (err) => err instanceof TypeError;
@@ -350,7 +361,15 @@ var fetchTransport = async (url, init) => {
   const res = await fetch(url, init);
   const contentType = res.headers.get("content-type");
   const isJson = contentType?.includes("application/json");
-  const data = isJson ? await res.json() : res;
+  const isText = contentType?.includes("text/") || contentType?.includes("application/xml");
+  let data;
+  if (isJson) {
+    data = await res.json();
+  } else if (isText) {
+    data = await res.text();
+  } else {
+    data = void 0;
+  }
   return { ok: res.ok, status: res.status, headers: res.headers, data };
 };
 
@@ -1260,30 +1279,26 @@ function createOperationController(options) {
       const coreFetch = async () => {
         abortController = new AbortController();
         context.request.signal = abortController.signal;
-        const fetchPromise = (async () => {
-          try {
-            const response = await fetchFn(context.request);
-            return response;
-          } catch (err) {
-            const errorResponse = {
-              status: 0,
-              error: err,
-              data: void 0
-            };
-            return errorResponse;
-          }
-        })();
-        stateManager.setPendingPromise(queryKey, fetchPromise);
-        fetchPromise.finally(() => {
-          stateManager.setPendingPromise(queryKey, void 0);
-        });
-        return fetchPromise;
+        try {
+          const response = await fetchFn(context.request);
+          return response;
+        } catch (err) {
+          const errorResponse = {
+            status: 0,
+            error: err,
+            data: void 0
+          };
+          return errorResponse;
+        }
       };
-      const finalResponse = await pluginExecutor.executeMiddleware(
+      const middlewarePromise = pluginExecutor.executeMiddleware(
         operationType,
         context,
         coreFetch
       );
+      stateManager.setPendingPromise(queryKey, middlewarePromise);
+      const finalResponse = await middlewarePromise;
+      stateManager.setPendingPromise(queryKey, void 0);
       if (finalResponse.data !== void 0 && !finalResponse.error) {
         updateState({
           data: finalResponse.data,
@@ -1418,6 +1433,7 @@ function createInfiniteReadController(options) {
   let cachedState = createInitialInfiniteState();
   const trackerKey = createTrackerKey(path, method, baseOptionsForKey);
   let pageSubscriptions = [];
+  let trackerSubscription = null;
   let refetchUnsubscribe = null;
   const loadFromTracker = () => {
     const cached = stateManager.getCache(trackerKey);
@@ -1532,52 +1548,50 @@ function createInfiniteReadController(options) {
     }
     pendingFetches.add(pageKey);
     fetchingDirection = direction;
+    latestError = void 0;
     notify();
     abortController = new AbortController();
     const signal = abortController.signal;
     const context = createContext(pageKey, mergedRequest);
     const coreFetch = async () => {
-      const fetchPromise = (async () => {
-        try {
-          const response = await fetchFn(mergedRequest, signal);
-          if (signal.aborted) {
-            return {
-              status: 0,
-              data: void 0,
-              aborted: true
-            };
-          }
-          return response;
-        } catch (err) {
-          if (signal.aborted) {
-            return {
-              status: 0,
-              data: void 0,
-              aborted: true
-            };
-          }
-          const errorResponse = {
+      try {
+        const response = await fetchFn(mergedRequest, signal);
+        if (signal.aborted) {
+          return {
             status: 0,
-            error: err,
-            data: void 0
+            data: void 0,
+            aborted: true
+          };
+        }
+        return response;
+      } catch (err) {
+        if (signal.aborted) {
+          return {
+            status: 0,
+            data: void 0,
+            aborted: true
           };
-          latestError = err;
-          return errorResponse;
-        } finally {
-          pendingFetches.delete(pageKey);
-          fetchingDirection = null;
-          stateManager.setPendingPromise(pageKey, void 0);
-          notify();
         }
-      })();
-      stateManager.setPendingPromise(pageKey, fetchPromise);
-      return fetchPromise;
+        const errorResponse = {
+          status: 0,
+          error: err,
+          data: void 0
+        };
+        latestError = err;
+        return errorResponse;
+      }
     };
-    const finalResponse = await pluginExecutor.executeMiddleware(
+    const middlewarePromise = pluginExecutor.executeMiddleware(
       "infiniteRead",
       context,
       coreFetch
     );
+    stateManager.setPendingPromise(pageKey, middlewarePromise);
+    const finalResponse = await middlewarePromise;
+    pendingFetches.delete(pageKey);
+    fetchingDirection = null;
+    stateManager.setPendingPromise(pageKey, void 0);
+    notify();
     if (finalResponse.data !== void 0 && !finalResponse.error) {
       pageRequests.set(pageKey, mergedRequest);
       if (direction === "next") {
@@ -1690,6 +1704,7 @@ function createInfiniteReadController(options) {
       loadFromTracker();
       cachedState = computeState();
       subscribeToPages();
+      trackerSubscription = stateManager.subscribeCache(trackerKey, notify);
       const context = createContext(trackerKey, initialRequest);
       pluginExecutor.executeLifecycle("onMount", "infiniteRead", context);
       refetchUnsubscribe = eventEmitter.on("refetch", (event) => {
@@ -1711,6 +1726,8 @@ function createInfiniteReadController(options) {
       pluginExecutor.executeLifecycle("onUnmount", "infiniteRead", context);
       pageSubscriptions.forEach((unsub) => unsub());
       pageSubscriptions = [];
+      trackerSubscription?.();
+      trackerSubscription = null;
       refetchUnsubscribe?.();
       refetchUnsubscribe = null;
     },
@@ -1766,6 +1783,7 @@ export {
   objectToUrlEncoded,
   resolveHeadersToRecord,
   resolvePath,
+  resolvePathString,
   resolveRequestBody,
   resolveTags,
   setHeaders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/core",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "license": "MIT",
   "description": "Type-safe API toolkit with plugin middleware system",
   "keywords": [