@spoosh/core 0.4.2 → 0.5.0

package/dist/index.d.mts

@@ -76,16 +76,24 @@ type BaseRequestOptions = {
     cache?: RequestCache;
     signal?: AbortSignal;
 };
-type BodyOption<TBody> = [TBody] extends [never] ? object : {
+type BodyOption<TBody> = [TBody] extends [never] ? object : undefined extends TBody ? {
+    body?: Exclude<TBody, undefined>;
+} : {
     body: TBody;
 };
-type QueryOption<TQuery> = [TQuery] extends [never] ? object : {
+type QueryOption<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
+    query?: Exclude<TQuery, undefined>;
+} : {
     query: TQuery;
 };
-type FormDataOption<TFormData> = [TFormData] extends [never] ? object : {
+type FormDataOption<TFormData> = [TFormData] extends [never] ? object : undefined extends TFormData ? {
+    formData?: Exclude<TFormData, undefined>;
+} : {
     formData: TFormData;
 };
-type UrlEncodedOption<TUrlEncoded> = [TUrlEncoded] extends [never] ? object : {
+type UrlEncodedOption<TUrlEncoded> = [TUrlEncoded] extends [never] ? object : undefined extends TUrlEncoded ? {
+    urlEncoded?: Exclude<TUrlEncoded, undefined>;
+} : {
     urlEncoded: TUrlEncoded;
 };
 type RequestOptions<TBody = never, TQuery = never, TFormData = never, TUrlEncoded = never> = BaseRequestOptions & BodyOption<TBody> & QueryOption<TQuery> & FormDataOption<TFormData> & UrlEncodedOption<TUrlEncoded>;
@@ -197,7 +205,7 @@ type StateManager = {
     getCacheByTags: <TData>(tags: string[]) => CacheEntry<TData> | undefined;
     getCacheEntriesByTags: <TData, TError>(tags: string[]) => CacheEntryWithKey<TData, TError>[];
     getCacheEntriesBySelfTag: <TData, TError>(selfTag: string) => CacheEntryWithKey<TData, TError>[];
-    setPluginResult: (key: string, data: Record<string, unknown>) => void;
+    setMeta: (key: string, data: Record<string, unknown>) => void;
     /** Mark all cache entries with matching tags as stale */
     markStale: (tags: string[]) => void;
     /** Get all cache entries */
@@ -223,7 +231,7 @@ type CacheEntry<TData = unknown, TError = unknown> = {
     state: OperationState<TData, TError>;
     tags: string[];
     /** Plugin-contributed result data (e.g., isOptimistic, isStale). Merged into hook result. */
-    pluginResult: Map<string, unknown>;
+    meta: Map<string, unknown>;
     /** The original path-derived tag (e.g., "posts/1/comments"). Used for exact matching in cache */
     selfTag?: string;
     previousData?: TData;
@@ -734,27 +742,16 @@ type Endpoint<T extends {
 }> = {
     [EndpointBrand]: true;
 } & T;
+type ExtractProperty<T, K extends string, TDefault = never> = K extends keyof T ? T[K] : TDefault;
 type NormalizeEndpoint<T, TDefaultError> = T extends {
     [EndpointBrand]: true;
 } ? {
-    data: T extends {
-        data: infer D;
-    } ? D : never;
-    error: T extends {
-        error: infer E;
-    } ? E : TDefaultError;
-    body: T extends {
-        body: infer B;
-    } ? B : never;
-    query: T extends {
-        query: infer Q;
-    } ? Q : never;
-    formData: T extends {
-        formData: infer F;
-    } ? F : never;
-    urlEncoded: T extends {
-        urlEncoded: infer U;
-    } ? U : never;
+    data: ExtractProperty<T, "data">;
+    error: ExtractProperty<T, "error", TDefaultError>;
+    body: ExtractProperty<T, "body">;
+    query: ExtractProperty<T, "query">;
+    formData: ExtractProperty<T, "formData">;
+    urlEncoded: ExtractProperty<T, "urlEncoded">;
 } : {
     data: T;
     error: TDefaultError;

package/dist/index.d.ts

@@ -76,16 +76,24 @@ type BaseRequestOptions = {
     cache?: RequestCache;
     signal?: AbortSignal;
 };
-type BodyOption<TBody> = [TBody] extends [never] ? object : {
+type BodyOption<TBody> = [TBody] extends [never] ? object : undefined extends TBody ? {
+    body?: Exclude<TBody, undefined>;
+} : {
     body: TBody;
 };
-type QueryOption<TQuery> = [TQuery] extends [never] ? object : {
+type QueryOption<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
+    query?: Exclude<TQuery, undefined>;
+} : {
     query: TQuery;
 };
-type FormDataOption<TFormData> = [TFormData] extends [never] ? object : {
+type FormDataOption<TFormData> = [TFormData] extends [never] ? object : undefined extends TFormData ? {
+    formData?: Exclude<TFormData, undefined>;
+} : {
     formData: TFormData;
 };
-type UrlEncodedOption<TUrlEncoded> = [TUrlEncoded] extends [never] ? object : {
+type UrlEncodedOption<TUrlEncoded> = [TUrlEncoded] extends [never] ? object : undefined extends TUrlEncoded ? {
+    urlEncoded?: Exclude<TUrlEncoded, undefined>;
+} : {
     urlEncoded: TUrlEncoded;
 };
 type RequestOptions<TBody = never, TQuery = never, TFormData = never, TUrlEncoded = never> = BaseRequestOptions & BodyOption<TBody> & QueryOption<TQuery> & FormDataOption<TFormData> & UrlEncodedOption<TUrlEncoded>;
@@ -197,7 +205,7 @@ type StateManager = {
     getCacheByTags: <TData>(tags: string[]) => CacheEntry<TData> | undefined;
     getCacheEntriesByTags: <TData, TError>(tags: string[]) => CacheEntryWithKey<TData, TError>[];
     getCacheEntriesBySelfTag: <TData, TError>(selfTag: string) => CacheEntryWithKey<TData, TError>[];
-    setPluginResult: (key: string, data: Record<string, unknown>) => void;
+    setMeta: (key: string, data: Record<string, unknown>) => void;
     /** Mark all cache entries with matching tags as stale */
     markStale: (tags: string[]) => void;
     /** Get all cache entries */
@@ -223,7 +231,7 @@ type CacheEntry<TData = unknown, TError = unknown> = {
     state: OperationState<TData, TError>;
     tags: string[];
     /** Plugin-contributed result data (e.g., isOptimistic, isStale). Merged into hook result. */
-    pluginResult: Map<string, unknown>;
+    meta: Map<string, unknown>;
     /** The original path-derived tag (e.g., "posts/1/comments"). Used for exact matching in cache */
     selfTag?: string;
     previousData?: TData;
@@ -734,27 +742,16 @@ type Endpoint<T extends {
 }> = {
     [EndpointBrand]: true;
 } & T;
+type ExtractProperty<T, K extends string, TDefault = never> = K extends keyof T ? T[K] : TDefault;
 type NormalizeEndpoint<T, TDefaultError> = T extends {
     [EndpointBrand]: true;
 } ? {
-    data: T extends {
-        data: infer D;
-    } ? D : never;
-    error: T extends {
-        error: infer E;
-    } ? E : TDefaultError;
-    body: T extends {
-        body: infer B;
-    } ? B : never;
-    query: T extends {
-        query: infer Q;
-    } ? Q : never;
-    formData: T extends {
-        formData: infer F;
-    } ? F : never;
-    urlEncoded: T extends {
-        urlEncoded: infer U;
-    } ? U : never;
+    data: ExtractProperty<T, "data">;
+    error: ExtractProperty<T, "error", TDefaultError>;
+    body: ExtractProperty<T, "body">;
+    query: ExtractProperty<T, "query">;
+    formData: ExtractProperty<T, "formData">;
+    urlEncoded: ExtractProperty<T, "urlEncoded">;
 } : {
     data: T;
     error: TDefaultError;

package/dist/index.js

@@ -598,7 +598,7 @@ function createStateManager() {
         const newEntry = {
           state: entry.state ?? createInitialState(),
           tags: entry.tags ?? [],
-          pluginResult: /* @__PURE__ */ new Map(),
+          meta: /* @__PURE__ */ new Map(),
           selfTag: generateSelfTagFromKey(key),
           previousData: entry.previousData,
           stale: entry.stale
@@ -658,11 +658,11 @@ function createStateManager() {
       });
       return entries;
     },
-    setPluginResult(key, data) {
+    setMeta(key, data) {
       const entry = cache.get(key);
       if (entry) {
         for (const [name, value] of Object.entries(data)) {
-          entry.pluginResult.set(name, value);
+          entry.meta.set(name, value);
         }
         notifySubscribers(key);
       }

package/dist/index.mjs

@@ -543,7 +543,7 @@ function createStateManager() {
         const newEntry = {
           state: entry.state ?? createInitialState(),
           tags: entry.tags ?? [],
-          pluginResult: /* @__PURE__ */ new Map(),
+          meta: /* @__PURE__ */ new Map(),
           selfTag: generateSelfTagFromKey(key),
           previousData: entry.previousData,
           stale: entry.stale
@@ -603,11 +603,11 @@ function createStateManager() {
       });
       return entries;
     },
-    setPluginResult(key, data) {
+    setMeta(key, data) {
       const entry = cache.get(key);
       if (entry) {
         for (const [name, value] of Object.entries(data)) {
-          entry.pluginResult.set(name, value);
+          entry.meta.set(name, value);
         }
         notifySubscribers(key);
       }

package/package.json

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