@zayne-labs/callapi-plugins 4.0.27 → 4.0.28

package/dist/index.d.ts

@@ -10,7 +10,7 @@ declare const fallBackRouteSchemaKey = "@default";
 type FallBackRouteSchemaKey = typeof fallBackRouteSchemaKey;
 //#endregion
 //#endregion
-//#region ../callapi/dist/index-HHFgKKcn.d.ts
+//#region ../callapi/dist/index-j55-O6zR.d.ts
 //#region src/types/type-helpers.d.ts
 type AnyString = string & NonNullable<unknown>;
 type AnyNumber = number & NonNullable<unknown>;
@@ -293,7 +293,7 @@ type DedupeOptions = {
 //#endregion
 //#region src/middlewares.d.ts
 type FetchImpl = UnmaskType<(input: string | Request | URL, init?: RequestInit) => Promise<Response>>;
-interface Middlewares {
+interface Middlewares<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext> {
   /**
    * Wraps the fetch implementation to intercept requests at the network layer.
    *
@@ -325,7 +325,7 @@ interface Middlewares {
    * }
    * ```
    */
-  fetchMiddleware?: (context: RequestContext & {
+  fetchMiddleware?: (context: RequestContext<TCallApiContext$1> & {
     fetchImpl: FetchImpl;
   }) => FetchImpl;
 }
@@ -853,6 +853,7 @@ type CallApiContext = {
   Meta?: DefaultMetaObject;
   ResultMode?: ResultModeType;
 };
+type GetMergedCallApiContext<TFullCallApiContext extends CallApiContext, TOverrideCallApiContext extends CallApiContext> = Omit<TFullCallApiContext, keyof TOverrideCallApiContext> & TOverrideCallApiContext;
 type FetchSpecificKeysUnion = Exclude<(typeof fetchSpecificKeys)[number], "body" | "headers" | "method">;
 type ModifiedRequestInit = RequestInit & {
   duplex?: "half";
@@ -875,9 +876,9 @@ type CallApiRequestOptions = Prettify<{
 type CallApiRequestOptionsForHooks = Omit<CallApiRequestOptions, "headers"> & {
   headers: Record<string, string | undefined>;
 };
-type SharedExtraOptions<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext, TData$1 = DefaultDataType, TErrorData$1 = DefaultDataType, TResultMode$1 extends ResultModeType = ResultModeType, TThrowOnError$1 extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType$1 extends ResponseTypeType = ResponseTypeType, TPluginArray$1 extends CallApiPlugin[] = DefaultPluginArray, TComputedPluginOptions = InferPluginOptions<TPluginArray$1> & TCallApiContext$1["InferredPluginOptions"], TComputedInferredPluginOptions extends Pick<Required<CallApiContext>, "InferredPluginOptions"> = {
-  InferredPluginOptions: TComputedPluginOptions;
-}> = DedupeOptions & HookConfigOptions & HooksOrHooksArray<TComputedInferredPluginOptions, TData$1, TErrorData$1> & Middlewares & Partial<TComputedInferredPluginOptions["InferredPluginOptions"]> & ResultModeOption<TErrorData$1, TResultMode$1> & RetryOptions<TErrorData$1> & ThrowOnErrorOption<TErrorData$1, TThrowOnError$1> & URLOptions & {
+type SharedExtraOptions<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext, TData$1 = DefaultDataType, TErrorData$1 = DefaultDataType, TResultMode$1 extends ResultModeType = ResultModeType, TThrowOnError$1 extends ThrowOnErrorUnion = DefaultThrowOnError, TResponseType$1 extends ResponseTypeType = ResponseTypeType, TPluginArray$1 extends CallApiPlugin[] = DefaultPluginArray, TComputedMergedPluginOptions = Partial<InferPluginOptions<TPluginArray$1> & TCallApiContext$1["InferredPluginOptions"]>> = DedupeOptions & HookConfigOptions & HooksOrHooksArray<GetMergedCallApiContext<TCallApiContext$1, {
+  InferredPluginOptions: TComputedMergedPluginOptions;
+}>> & Middlewares & ResultModeOption<TErrorData$1, TResultMode$1> & RetryOptions<TErrorData$1> & TComputedMergedPluginOptions & ThrowOnErrorOption<TErrorData$1, TThrowOnError$1> & URLOptions & {
   /**
    * Automatically add an Authorization header value.
    *
@@ -1424,7 +1425,7 @@ declare global {
 }
 //#endregion
 //#region src/hooks.d.ts
-interface Hooks<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext, TData$1 = TCallApiContext$1["Data"], TErrorData$1 = TCallApiContext$1["ErrorData"]> {
+interface Hooks<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext> {
   /**
    * Hook called when any error occurs within the request/response lifecycle.
    *
@@ -1435,7 +1436,7 @@ interface Hooks<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorDa
    * @param context - Error context containing error details, request info, and response (if available)
    * @returns Promise or void - Hook can be async or sync
    */
-  onError?: (context: ErrorContext<TCallApiContext$1, TErrorData$1>) => Awaitable<unknown>;
+  onError?: (context: ErrorContext<TCallApiContext$1>) => Awaitable<unknown>;
   /**
    * Hook called before the HTTP request is sent and before any internal processing of the request object begins.
    *
@@ -1487,7 +1488,7 @@ interface Hooks<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorDa
    * @returns Promise or void - Hook can be async or sync
    *
    */
-  onResponse?: (context: ResponseContext<TCallApiContext$1, TData$1, TErrorData$1>) => Awaitable<unknown>;
+  onResponse?: (context: ResponseContext<TCallApiContext$1>) => Awaitable<unknown>;
   /**
    * Hook called when an HTTP error response (4xx, 5xx) is received from the API.
    *
@@ -1498,7 +1499,7 @@ interface Hooks<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorDa
    * @param context - Response error context with HTTP error details and response
    * @returns Promise or void - Hook can be async or sync
    */
-  onResponseError?: (context: ResponseErrorContext<TCallApiContext$1, TErrorData$1>) => Awaitable<unknown>;
+  onResponseError?: (context: ResponseErrorContext<TCallApiContext$1>) => Awaitable<unknown>;
   /**
    * Hook called during download stream progress tracking.
    *
@@ -1522,7 +1523,7 @@ interface Hooks<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorDa
    * @returns Promise or void - Hook can be async or sync
    *
    */
-  onRetry?: (response: RetryContext<TCallApiContext$1, TErrorData$1>) => Awaitable<unknown>;
+  onRetry?: (response: RetryContext<TCallApiContext$1>) => Awaitable<unknown>;
   /**
    * Hook called when a successful response (2xx status) is received from the API.
    *
@@ -1534,7 +1535,7 @@ interface Hooks<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorDa
    * @returns Promise or void - Hook can be async or sync
    *
    */
-  onSuccess?: (context: SuccessContext<TCallApiContext$1, TData$1>) => Awaitable<unknown>;
+  onSuccess?: (context: SuccessContext<TCallApiContext$1>) => Awaitable<unknown>;
   /**
    * Hook called when a validation error occurs.
    *
@@ -1548,7 +1549,7 @@ interface Hooks<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorDa
    */
   onValidationError?: (context: ValidationErrorContext<TCallApiContext$1>) => Awaitable<unknown>;
 }
-type HooksOrHooksArray<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext, TData$1 = TCallApiContext$1["Data"], TErrorData$1 = TCallApiContext$1["ErrorData"]> = { [Key in keyof Hooks<TCallApiContext$1, TData$1, TErrorData$1>]: Hooks<TCallApiContext$1, TData$1, TErrorData$1>[Key] | Array<Hooks<TCallApiContext$1, TData$1, TErrorData$1>[Key]> };
+type HooksOrHooksArray<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext> = { [Key in keyof Hooks<TCallApiContext$1>]: Hooks<TCallApiContext$1>[Key] | Array<Hooks<TCallApiContext$1>[Key]> };
 interface HookConfigOptions {
   /**
    * Controls the execution mode of all composed hooks (main + plugin hooks).
@@ -1598,28 +1599,28 @@ type ValidationErrorContext<TCallApiContext$1 extends Pick<CallApiContext, "Infe
   error: PossibleValidationError;
   response: Response | null;
 }>;
-type SuccessContext<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext, TData$1 = TCallApiContext$1["Data"]> = UnmaskType<RequestContext<TCallApiContext$1> & {
-  data: NoInfer<TData$1>;
+type SuccessContext<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext> = UnmaskType<RequestContext<TCallApiContext$1> & {
+  data: NoInfer<TCallApiContext$1["Data"]>;
   response: Response;
 }>;
-type ResponseContext<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext, TData$1 = TCallApiContext$1["Data"], TErrorData$1 = TCallApiContext$1["ErrorData"]> = UnmaskType<RequestContext<TCallApiContext$1> & (Prettify<CallApiResultSuccessVariant<TData$1>> | Prettify<Extract<CallApiResultErrorVariant<TErrorData$1>, {
-  error: PossibleHTTPError<TErrorData$1>;
+type ResponseContext<TCallApiContext$1 extends Pick<CallApiContext, "Data" | "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext> = UnmaskType<RequestContext<TCallApiContext$1> & (Prettify<CallApiResultSuccessVariant<TCallApiContext$1["Data"]>> | Prettify<Extract<CallApiResultErrorVariant<TCallApiContext$1["ErrorData"]>, {
+  error: PossibleHTTPError<TCallApiContext$1["ErrorData"]>;
 }>>)>;
 type RequestErrorContext<TCallApiContext$1 extends Pick<CallApiContext, "InferredPluginOptions" | "Meta"> = DefaultCallApiContext> = RequestContext<TCallApiContext$1> & {
   error: PossibleJavaScriptError;
   response: null;
 };
-type ErrorContext<TCallApiContext$1 extends Pick<CallApiContext, "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext, TErrorData$1 = TCallApiContext$1["ErrorData"]> = UnmaskType<RequestContext<TCallApiContext$1> & ({
-  error: PossibleHTTPError<TErrorData$1>;
+type ErrorContext<TCallApiContext$1 extends Pick<CallApiContext, "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext> = UnmaskType<RequestContext<TCallApiContext$1> & ({
+  error: PossibleHTTPError<TCallApiContext$1["ErrorData"]>;
   response: Response;
 } | {
   error: PossibleJavaScriptOrValidationError;
   response: Response | null;
 })>;
-type ResponseErrorContext<TCallApiContext$1 extends Pick<CallApiContext, "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext, TErrorData$1 = TCallApiContext$1["ErrorData"]> = UnmaskType<Extract<ErrorContext<TCallApiContext$1, TErrorData$1>, {
-  error: PossibleHTTPError<TErrorData$1>;
+type ResponseErrorContext<TCallApiContext$1 extends Pick<CallApiContext, "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext> = UnmaskType<Extract<ErrorContext<TCallApiContext$1>, {
+  error: PossibleHTTPError<TCallApiContext$1["ErrorData"]>;
 }> & RequestContext<TCallApiContext$1>>;
-type RetryContext<TCallApiContext$1 extends Pick<CallApiContext, "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext, TErrorData$1 = TCallApiContext$1["ErrorData"]> = UnmaskType<ErrorContext<TCallApiContext$1, TErrorData$1> & {
+type RetryContext<TCallApiContext$1 extends Pick<CallApiContext, "ErrorData" | "InferredPluginOptions" | "Meta"> = DefaultCallApiContext> = UnmaskType<ErrorContext<TCallApiContext$1> & {
   retryAttemptCount: number;
 }>;
 type RequestStreamContext<TCallApiContext$1 extends Pick<CallApiContext, "InferredPluginOptions" | "Meta"> = DefaultCallApiContext> = UnmaskType<RequestContext<TCallApiContext$1> & {
@@ -1635,12 +1636,15 @@ type ResponseStreamContext<TCallApiContext$1 extends Pick<CallApiContext, "Infer
 type PluginSetupContext<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext> = RequestContext<TCallApiContext$1> & {
   initURL: string;
 };
-type PluginInitResult = Partial<Omit<PluginSetupContext, "initURL" | "request"> & {
+type PluginInitResult<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext> = Partial<Omit<PluginSetupContext<TCallApiContext$1>, "initURL" | "request"> & {
   initURL: InitURLOrURLObject;
   request: CallApiRequestOptions;
 }>;
-type PluginHooks<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext, TData$1 = (unknown extends TCallApiContext$1["Data"] ? never : TCallApiContext$1["Data"]), TErrorData$1 = (unknown extends TCallApiContext$1["ErrorData"] ? never : TCallApiContext$1["ErrorData"])> = HooksOrHooksArray<TCallApiContext$1, TData$1, TErrorData$1>;
-interface CallApiPlugin {
+type PluginHooks<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext> = HooksOrHooksArray<GetMergedCallApiContext<TCallApiContext$1, {
+  Data: DefaultDataType extends TCallApiContext$1["Data"] ? never : TCallApiContext$1["Data"];
+  ErrorData: DefaultDataType extends TCallApiContext$1["ErrorData"] ? never : TCallApiContext$1["ErrorData"];
+}>>;
+interface CallApiPlugin<TCallApiContext$1 extends CallApiContext = DefaultCallApiContext> {
   /**
    * Defines additional options that can be passed to callApi
    */
@@ -1652,7 +1656,7 @@ interface CallApiPlugin {
   /**
    * Hooks for the plugin
    */
-  hooks?: PluginHooks | ((context: PluginSetupContext) => Awaitable<PluginHooks>);
+  hooks?: PluginHooks<TCallApiContext$1> | ((context: PluginSetupContext<TCallApiContext$1>) => Awaitable<PluginHooks<TCallApiContext$1>>);
   /**
    *  A unique id for the plugin
    */
@@ -1660,7 +1664,7 @@ interface CallApiPlugin {
   /**
    * Middlewares that for the plugin
    */
-  middlewares?: Middlewares | ((context: PluginSetupContext) => Awaitable<Middlewares>);
+  middlewares?: Middlewares<TCallApiContext$1> | ((context: PluginSetupContext<TCallApiContext$1>) => Awaitable<Middlewares<TCallApiContext$1>>);
   /**
    * A name for the plugin
    */
@@ -1672,7 +1676,7 @@ interface CallApiPlugin {
   /**
    * A function that will be called when the plugin is initialized. This will be called before the any of the other internal functions.
    */
-  setup?: (context: PluginSetupContext) => Awaitable<PluginInitResult> | Awaitable<void>;
+  setup?: (context: PluginSetupContext<TCallApiContext$1>) => Awaitable<PluginInitResult<TCallApiContext$1>> | Awaitable<void>;
   /**
    *  A version for the plugin
    */
@@ -1812,12 +1816,21 @@ declare const loggerPlugin: (options?: LoggerOptions) => {
   name: "Logger";
   version: "1.1.0";
   hooks: {
-    onRequest: (ctx: RequestContext<DefaultCallApiContext>) => void;
-    onRequestError: (ctx: RequestContext<DefaultCallApiContext> & {
+    onRequest: (ctx: RequestContext<Omit<DefaultCallApiContext, "Data" | "ErrorData"> & {
+      Data: never;
+      ErrorData: never;
+    }>) => void;
+    onRequestError: (ctx: RequestContext<Omit<DefaultCallApiContext, "Data" | "ErrorData"> & {
+      Data: never;
+      ErrorData: never;
+    }> & {
       error: PossibleJavaScriptError;
       response: null;
     }) => void;
-    onResponseError: (ctx: RequestContext<DefaultCallApiContext> & {
+    onResponseError: (ctx: RequestContext<Omit<DefaultCallApiContext, "Data" | "ErrorData"> & {
+      Data: never;
+      ErrorData: never;
+    }> & {
       error: {
         errorData: never;
         message: string;
@@ -1826,7 +1839,10 @@ declare const loggerPlugin: (options?: LoggerOptions) => {
       };
       response: Response;
     }) => void;
-    onRetry: (ctx: (RequestContext<DefaultCallApiContext> & ({
+    onRetry: (ctx: (RequestContext<Omit<DefaultCallApiContext, "Data" | "ErrorData"> & {
+      Data: never;
+      ErrorData: never;
+    }> & ({
       error: PossibleJavaScriptOrValidationError;
       response: Response | null;
     } | {
@@ -1840,11 +1856,17 @@ declare const loggerPlugin: (options?: LoggerOptions) => {
     })) & {
       retryAttemptCount: number;
     }) => void;
-    onSuccess: (ctx: RequestContext<DefaultCallApiContext> & {
+    onSuccess: (ctx: RequestContext<Omit<DefaultCallApiContext, "Data" | "ErrorData"> & {
+      Data: never;
+      ErrorData: never;
+    }> & {
       data: never;
       response: Response;
     }) => void;
-    onValidationError: (ctx: RequestContext<DefaultCallApiContext> & {
+    onValidationError: (ctx: RequestContext<Omit<DefaultCallApiContext, "Data" | "ErrorData"> & {
+      Data: never;
+      ErrorData: never;
+    }> & {
       error: PossibleValidationError;
       response: Response | null;
     }) => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zayne-labs/callapi-plugins",
   "type": "module",
-  "version": "4.0.27",
+  "version": "4.0.28",
   "description": "A collection of plugins for callapi",
   "author": "Ryan Zayne",
   "license": "MIT",
@@ -21,7 +21,7 @@
   "peerDependencies": {
     "@zayne-labs/toolkit-type-helpers": ">=0.11.17",
     "consola": "3.x.x",
-    "@zayne-labs/callapi": "1.11.27"
+    "@zayne-labs/callapi": "1.11.28"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.2",
@@ -38,7 +38,7 @@
     "tsdown": "0.15.9",
     "typescript": "5.9.3",
     "vitest": "^4.0.14",
-    "@zayne-labs/callapi": "1.11.27"
+    "@zayne-labs/callapi": "1.11.28"
   },
   "publishConfig": {
     "access": "public",