@spoosh/core 0.18.1 → 0.18.3

package/dist/index.d.mts

@@ -1763,12 +1763,13 @@ type IsStrictSubscriptionOptionsRequired<TMethodConfig, TUserPath extends string
 /**
  * Subscription response type that carries event types.
  */
-type SubscriptionResponse<TMethodConfig, TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[] = readonly (keyof ExtractEvents<TMethodConfig>)[]> = {
+type SubscriptionResponse<TMethodConfig, TUserPath extends string, TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[] = readonly (keyof ExtractEvents<TMethodConfig>)[]> = {
     _subscription: true;
     events: ExtractEvents<TMethodConfig>;
     requestedEvents: TRequestedEvents;
     query: ExtractQuery<TMethodConfig>;
     body: ExtractBody<TMethodConfig>;
+    params: HasParams<TUserPath> extends true ? Record<ExtractParamNames<TUserPath>, string | number> : never;
     error: ExtractError<TMethodConfig>;
 };
 type BaseSubscriptionResponse<TEvents extends Record<string, unknown> = Record<string, unknown>, TError = unknown> = {
@@ -1777,6 +1778,7 @@ type BaseSubscriptionResponse<TEvents extends Record<string, unknown> = Record<s
     requestedEvents: readonly string[];
     query: unknown;
     body: unknown;
+    params: unknown;
     error: TError;
 };
 /**
@@ -1784,7 +1786,7 @@ type BaseSubscriptionResponse<TEvents extends Record<string, unknown> = Record<s
  * GET: Strict typing (body/query required if schema requires)
  * POST/PUT/etc: Loose typing (body/query always optional, passed to trigger)
  */
-type SubscriptionMethodFn<TMethodConfig, TUserPath extends string, TMethod extends string> = TMethod extends "GET" ? IsStrictSubscriptionOptionsRequired<TMethodConfig, TUserPath> extends true ? <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: LooseSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TRequestedEvents>;
+type SubscriptionMethodFn<TMethodConfig, TUserPath extends string, TMethod extends string> = TMethod extends "GET" ? IsStrictSubscriptionOptionsRequired<TMethodConfig, TUserPath> extends true ? <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TUserPath, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TUserPath, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: LooseSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TUserPath, TRequestedEvents>;
 /**
  * Subscription path methods - only methods with events field.
  */
@@ -2460,6 +2462,7 @@ type InfiniteReadController<TData, TItem, TError, TMeta = Record<string, unknown
     fetchNext: () => Promise<void>;
     fetchPrev: () => Promise<void>;
     trigger: (options?: InfiniteTriggerOptions) => Promise<void>;
+    refetch: () => Promise<void>;
     abort: () => void;
     mount: () => void;
     unmount: () => void;

package/dist/index.d.ts

@@ -1763,12 +1763,13 @@ type IsStrictSubscriptionOptionsRequired<TMethodConfig, TUserPath extends string
 /**
  * Subscription response type that carries event types.
  */
-type SubscriptionResponse<TMethodConfig, TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[] = readonly (keyof ExtractEvents<TMethodConfig>)[]> = {
+type SubscriptionResponse<TMethodConfig, TUserPath extends string, TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[] = readonly (keyof ExtractEvents<TMethodConfig>)[]> = {
     _subscription: true;
     events: ExtractEvents<TMethodConfig>;
     requestedEvents: TRequestedEvents;
     query: ExtractQuery<TMethodConfig>;
     body: ExtractBody<TMethodConfig>;
+    params: HasParams<TUserPath> extends true ? Record<ExtractParamNames<TUserPath>, string | number> : never;
     error: ExtractError<TMethodConfig>;
 };
 type BaseSubscriptionResponse<TEvents extends Record<string, unknown> = Record<string, unknown>, TError = unknown> = {
@@ -1777,6 +1778,7 @@ type BaseSubscriptionResponse<TEvents extends Record<string, unknown> = Record<s
     requestedEvents: readonly string[];
     query: unknown;
     body: unknown;
+    params: unknown;
     error: TError;
 };
 /**
@@ -1784,7 +1786,7 @@ type BaseSubscriptionResponse<TEvents extends Record<string, unknown> = Record<s
  * GET: Strict typing (body/query required if schema requires)
  * POST/PUT/etc: Loose typing (body/query always optional, passed to trigger)
  */
-type SubscriptionMethodFn<TMethodConfig, TUserPath extends string, TMethod extends string> = TMethod extends "GET" ? IsStrictSubscriptionOptionsRequired<TMethodConfig, TUserPath> extends true ? <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: LooseSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TRequestedEvents>;
+type SubscriptionMethodFn<TMethodConfig, TUserPath extends string, TMethod extends string> = TMethod extends "GET" ? IsStrictSubscriptionOptionsRequired<TMethodConfig, TUserPath> extends true ? <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TUserPath, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: StrictSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TUserPath, TRequestedEvents> : <TRequestedEvents extends readonly (keyof ExtractEvents<TMethodConfig>)[]>(options?: LooseSubscriptionRequestOptions<TMethodConfig, TUserPath, TRequestedEvents>) => SubscriptionResponse<TMethodConfig, TUserPath, TRequestedEvents>;
 /**
  * Subscription path methods - only methods with events field.
  */
@@ -2460,6 +2462,7 @@ type InfiniteReadController<TData, TItem, TError, TMeta = Record<string, unknown
     fetchNext: () => Promise<void>;
     fetchPrev: () => Promise<void>;
     trigger: (options?: InfiniteTriggerOptions) => Promise<void>;
+    refetch: () => Promise<void>;
     abort: () => void;
     mount: () => void;
     unmount: () => void;

package/dist/index.js

@@ -1920,6 +1920,20 @@ function createInfiniteReadController(options) {
       }
       notify();
     },
+    async refetch() {
+      const firstPageKey = pageKeys[0];
+      if (!firstPageKey) {
+        await doFetch("next", {});
+        return;
+      }
+      const firstPageRequest = pageRequests.get(firstPageKey) ?? initialRequest;
+      pageSubscriptions.slice(1).forEach((unsub) => unsub());
+      pageSubscriptions = pageSubscriptions.slice(0, 1);
+      pageKeys = [firstPageKey];
+      pageRequests = /* @__PURE__ */ new Map([[firstPageKey, firstPageRequest]]);
+      stateManager.setCache(firstPageKey, { stale: true });
+      await doFetch("next", firstPageRequest);
+    },
     abort() {
       abortController?.abort();
       abortController = null;
@@ -2356,10 +2370,14 @@ function createSubscriptionController(options) {
   let handle = null;
   const subscribers = /* @__PURE__ */ new Set();
   let subscriptionVersion = 0;
+  const messageQueue = [];
+  let queueIndex = 0;
   let cachedState = {
     data: void 0,
     error: void 0,
-    isConnected: false
+    isConnected: false,
+    _messageQueue: messageQueue,
+    _queueIndex: queueIndex
   };
   const updateStateFromHandle = () => {
     if (!handle) return;
@@ -2367,6 +2385,7 @@ function createSubscriptionController(options) {
     const newError = handle.getError();
     if (newData !== cachedState.data || newError !== cachedState.error) {
       cachedState = {
+        ...cachedState,
         data: newData,
         error: newError,
         isConnected: true
@@ -2404,17 +2423,29 @@ function createSubscriptionController(options) {
           handle.unsubscribe();
           handle = null;
         }
-        cachedState = { data: void 0, error: void 0, isConnected: false };
+        messageQueue.length = 0;
+        queueIndex = 0;
+        cachedState = {
+          data: void 0,
+          error: void 0,
+          isConnected: false,
+          _messageQueue: messageQueue,
+          _queueIndex: queueIndex
+        };
         notify();
         const ctx = createContext();
         ctx.onData = (data) => {
           if (thisVersion !== subscriptionVersion) {
             return;
           }
+          messageQueue.push(data);
+          queueIndex++;
           cachedState = {
             data,
             error: cachedState.error,
-            isConnected: true
+            isConnected: true,
+            _messageQueue: messageQueue,
+            _queueIndex: queueIndex
           };
           notify();
         };
@@ -2423,9 +2454,8 @@ function createSubscriptionController(options) {
             return;
           }
           cachedState = {
-            data: cachedState.data,
-            error,
-            isConnected: cachedState.isConnected
+            ...cachedState,
+            error
           };
           notify();
         };

package/dist/index.mjs

@@ -1843,6 +1843,20 @@ function createInfiniteReadController(options) {
       }
       notify();
     },
+    async refetch() {
+      const firstPageKey = pageKeys[0];
+      if (!firstPageKey) {
+        await doFetch("next", {});
+        return;
+      }
+      const firstPageRequest = pageRequests.get(firstPageKey) ?? initialRequest;
+      pageSubscriptions.slice(1).forEach((unsub) => unsub());
+      pageSubscriptions = pageSubscriptions.slice(0, 1);
+      pageKeys = [firstPageKey];
+      pageRequests = /* @__PURE__ */ new Map([[firstPageKey, firstPageRequest]]);
+      stateManager.setCache(firstPageKey, { stale: true });
+      await doFetch("next", firstPageRequest);
+    },
     abort() {
       abortController?.abort();
       abortController = null;
@@ -2279,10 +2293,14 @@ function createSubscriptionController(options) {
   let handle = null;
   const subscribers = /* @__PURE__ */ new Set();
   let subscriptionVersion = 0;
+  const messageQueue = [];
+  let queueIndex = 0;
   let cachedState = {
     data: void 0,
     error: void 0,
-    isConnected: false
+    isConnected: false,
+    _messageQueue: messageQueue,
+    _queueIndex: queueIndex
   };
   const updateStateFromHandle = () => {
     if (!handle) return;
@@ -2290,6 +2308,7 @@ function createSubscriptionController(options) {
     const newError = handle.getError();
     if (newData !== cachedState.data || newError !== cachedState.error) {
       cachedState = {
+        ...cachedState,
         data: newData,
         error: newError,
         isConnected: true
@@ -2327,17 +2346,29 @@ function createSubscriptionController(options) {
           handle.unsubscribe();
           handle = null;
         }
-        cachedState = { data: void 0, error: void 0, isConnected: false };
+        messageQueue.length = 0;
+        queueIndex = 0;
+        cachedState = {
+          data: void 0,
+          error: void 0,
+          isConnected: false,
+          _messageQueue: messageQueue,
+          _queueIndex: queueIndex
+        };
         notify();
         const ctx = createContext();
         ctx.onData = (data) => {
           if (thisVersion !== subscriptionVersion) {
             return;
           }
+          messageQueue.push(data);
+          queueIndex++;
           cachedState = {
             data,
             error: cachedState.error,
-            isConnected: true
+            isConnected: true,
+            _messageQueue: messageQueue,
+            _queueIndex: queueIndex
           };
           notify();
         };
@@ -2346,9 +2377,8 @@ function createSubscriptionController(options) {
             return;
           }
           cachedState = {
-            data: cachedState.data,
-            error,
-            isConnected: cachedState.isConnected
+            ...cachedState,
+            error
           };
           notify();
         };

package/package.json

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