refactor(callapi): improve type inference and global declarations ♻️

fix(callapi): move `ReadableStream` global declaration to `reset.d.ts` to prevent tsdown for always bundling it 🚚

feat(callapi): use `NoInferUnMasked` helper for over NoInfer for better tooltips ✨

fix(callapi, types): add `NoInfer` usage to sharedOptions type to prevent middlewares and hooks from inferring the data and error as unknown🔧

Author: ryan-zayne

.changeset/fifty-chairs-film.md

@@ -0,0 +1,11 @@
+---
+"@zayne-labs/callapi": patch
+---
+
+refactor(callapi): improve type inference and global declarations ♻️
+
+fix(callapi): move `ReadableStream` global declaration to `reset.d.ts` to prevent tsdown for always bundling it 🚚
+
+feat(callapi): use `NoInferUnMasked` helper for over NoInfer for better tooltips ✨
+
+fix(callapi, types): add `NoInfer` usage to sharedOptions type to prevent middlewares and hooks from inferring the data and error as unknown🔧

packages/callapi/reset.d.ts

@@ -1,2 +1,9 @@
 import "@total-typescript/ts-reset";
 import "@total-typescript/ts-reset/dom";
+
+declare global {
+	// eslint-disable-next-line ts-eslint/consistent-type-definitions -- Ignore
+	interface ReadableStream<R> {
+		[Symbol.asyncIterator]: () => AsyncIterableIterator<R>;
+	}
+}

packages/callapi/src/hooks.ts

@@ -154,7 +154,7 @@ export interface Hooks<TCallApiContext extends CallApiContext = DefaultCallApiCo
 	onValidationError?: (context: ValidationErrorContext<TCallApiContext>) => Awaitable<unknown>;
 }
 
-export type HooksOrHooksArray<TCallApiContext extends CallApiContext = DefaultCallApiContext> = {
+export type HooksOrHooksArray<TCallApiContext extends NoInfer<CallApiContext> = DefaultCallApiContext> = {
 	[Key in keyof Hooks<TCallApiContext>]:
 		| Hooks<TCallApiContext>[Key]
 		// eslint-disable-next-line perfectionist/sort-union-types -- I need arrays to be last
@@ -224,7 +224,7 @@ export type SuccessContext<
 	TCallApiContext extends Pick<CallApiContext, "Data" | "InferredExtraOptions" | "Meta"> =
 		DefaultCallApiContext,
 > = RequestContext<TCallApiContext> & {
-	data: NoInfer<TCallApiContext["Data"]>;
+	data: TCallApiContext["Data"];
 	response: Response;
 };
 

packages/callapi/src/middlewares.ts

@@ -7,7 +7,7 @@ export type FetchImpl = UnmaskType<
 	(input: string | Request | URL, init?: RequestInit) => Promise<Response>
 >;
 
-export interface Middlewares<TCallApiContext extends CallApiContext = DefaultCallApiContext> {
+export interface Middlewares<TCallApiContext extends NoInfer<CallApiContext> = DefaultCallApiContext> {
 	/**
 	 * Wraps the fetch implementation to intercept requests at the network layer.
 	 *

packages/callapi/src/result.ts

@@ -2,7 +2,13 @@ import { extraOptionDefaults } from "./constants/defaults";
 import type { CallApiExtraOptions } from "./types/common";
 import type { ThrowOnErrorUnion } from "./types/conditional-types";
 import type { DefaultDataType, DefaultThrowOnError } from "./types/default-types";
-import type { AnyString, Awaitable, DistributiveOmit, UnmaskType } from "./types/type-helpers";
+import type {
+	AnyString,
+	Awaitable,
+	DistributiveOmit,
+	NoInferUnMasked,
+	UnmaskType,
+} from "./types/type-helpers";
 import { omitKeys } from "./utils/common";
 import type { HTTPError, ValidationError } from "./utils/external/error";
 import { isHTTPErrorInstance, isValidationErrorInstance } from "./utils/external/guards";
@@ -85,7 +91,7 @@ export const resolveResponseData = <TResponse>(
 };
 
 export type CallApiResultSuccessVariant<TData> = {
-	data: NoInfer<TData>;
+	data: NoInferUnMasked<TData>;
 	error: null;
 	response: Response;
 };
@@ -97,7 +103,7 @@ export type PossibleJavaScriptError = UnmaskType<{
 }>;
 
 export type PossibleHTTPError<TErrorData> = UnmaskType<{
-	errorData: NoInfer<TErrorData>;
+	errorData: NoInferUnMasked<TErrorData>;
 	message: string;
 	name: "HTTPError";
 	originalError: HTTPError;

packages/callapi/src/stream.ts

@@ -25,13 +25,6 @@ export type StreamProgressEvent = {
 	transferredBytes: number;
 };
 
-declare global {
-	// eslint-disable-next-line ts-eslint/no-explicit-any -- Ignore
-	interface ReadableStream<R = any> {
-		[Symbol.asyncIterator]: () => AsyncIterableIterator<R>;
-	}
-}
-
 const createProgressEvent = (options: {
 	chunk: Uint8Array;
 	totalBytes: number;

packages/callapi/src/types/common.ts

@@ -34,7 +34,7 @@ import type {
 	DefaultPluginArray,
 	DefaultThrowOnError,
 } from "./default-types";
-import type { Awaitable, Prettify, Writeable } from "./type-helpers";
+import type { Awaitable, NoInferUnMasked, Prettify, Writeable } from "./type-helpers";
 
 // eslint-disable-next-line ts-eslint/no-empty-object-type -- This needs to be empty to allow users to register their own meta
 export interface Register {
@@ -108,8 +108,8 @@ type SharedExtraOptions<
 	>,
 > = DedupeOptions
 	& HookConfigOptions
-	& HooksOrHooksArray<TComputedCallApiContext>
-	& Middlewares<TComputedCallApiContext>
+	& HooksOrHooksArray<NoInferUnMasked<TComputedCallApiContext>>
+	& Middlewares<NoInferUnMasked<TComputedCallApiContext>>
 	& ResultModeOption<TErrorData, TResultMode>
 	& RetryOptions<TErrorData>
 	& TComputedMergedPluginExtraOptions

packages/callapi/src/types/type-helpers.ts

@@ -43,7 +43,16 @@ export type UnionToIntersection<TUnion> =
 	:	never;
 
 // == Using this Immediately Indexed Mapped type helper to help show computed type of anything passed to it instead of just the type name
-export type UnmaskType<TValue> = { _: TValue }["_"];
+export type UnmaskType<TValue> = { value: TValue }["value"];
+
+/**
+ * @description Userland implementation of NoInfer intrinsic type, but this one doesn't show up on hover like the intrinsic one
+ *
+ * Prevents TypeScript from inferring `TGeneric` at this position by creating a circular dependency.
+ * The tuple index `[TGeneric extends unknown ? 0 : never]` depends on `TGeneric`, forcing TS to
+ * skip this site for inference and use other arguments or defaults instead.
+ */
+export type NoInferUnMasked<TGeneric> = [TGeneric][TGeneric extends unknown ? 0 : never];
 
 export type RemovePrefix<TPrefix extends "dedupe" | "retry", TKey extends string> =
 	TKey extends `${TPrefix}${infer TRest}` ? Uncapitalize<TRest> : TKey;