refactor and move http types

Author: KurtGokhan

packages/tanstack-query-builder/src/builder/types.ts

@@ -1,6 +1,5 @@
 import type { QueryClient, QueryFunctionContext, QueryKey, UseQueryResult } from '@tanstack/react-query';
-import type { HttpRequestOptions } from '../http/types';
-import type { HasFlag, Prettify } from '../type-utils';
+import type { HasFlag } from '../type-utils';
 import type { BuilderOptions, BuilderPaginationOptions } from './options';
 
 export type BuilderConfig<TVars, TData, TError, TKey extends unknown[]> = {
@@ -15,31 +14,6 @@ export type BuilderConfig<TVars, TData, TError, TKey extends unknown[]> = {
   paginationOptions?: BuilderPaginationOptions<TVars, TData, TError, TKey>;
 };
 
-export type HttpBaseHeaders = Record<string, string | string[]>;
-export type HttpBaseParams = Record<string | number, unknown>;
-export type HttpBaseSearch = Record<string | number, unknown>;
-
-export type HttpBuilderBaseVars = Omit<HttpRequestOptions, 'body' | 'headers' | 'params' | 'search' | 'meta'>;
-
-type WhenRequired<T, TReq> = T extends undefined
-  ? Partial<TReq>
-  : unknown extends T
-    ? Partial<TReq>
-    : T extends null
-      ? Partial<TReq>
-      : Partial<T> extends T
-        ? Partial<TReq>
-        : TReq;
-
-export type HttpBuilderVars<TParam = unknown, TSearch = unknown, TBody = unknown, THeaders = unknown, TMeta = unknown> = Prettify<
-  HttpBuilderBaseVars &
-    WhenRequired<TParam, { params: TParam }> &
-    WhenRequired<TSearch, { search: TSearch }> &
-    WhenRequired<TBody, { body: TBody }> &
-    WhenRequired<THeaders, { headers: THeaders }> &
-    WhenRequired<TMeta, { meta: TMeta }>
->;
-
 export type BuilderMergeVarsFn<TVars> = (vars1: TVars | Partial<TVars>, vars2: TVars | Partial<TVars>) => TVars | Partial<TVars>;
 
 type QueriesResultItemType<TVars, TData, TError, TKey> = UseQueryResult<TData, TError>;

packages/tanstack-query-builder/src/http/HttpQueryBuilder.ts

@@ -2,11 +2,11 @@ import { QueryClient } from '@tanstack/react-query';
 import { QueryBuilder } from '../builder/QueryBuilder';
 import type { BuilderPaginationOptions } from '../builder/options';
 import type { BuilderConfig, BuilderFlags } from '../builder/types';
-import type { HttpBaseHeaders, HttpBaseParams, HttpBaseSearch, HttpBuilderVars } from '../builder/types';
 import type { RequestError } from '../http/errors';
-import type { ExtractPathParams, HttpMethod } from '../http/types';
 import type { WithOptional } from '../type-utils';
+import type { HttpBaseHeaders, HttpBaseParams, HttpBaseSearch, HttpBuilderVars } from './builder-types';
 import { createHttpMergeVarsFn, createHttpQueryFn, createHttpQueryKeySanitizer } from './builder-utils';
+import type { ExtractPathParams, HttpMethod } from './request-types';
 
 export class HttpQueryBuilder<
   TParam = unknown,

packages/tanstack-query-builder/src/http/builder-types.ts

@@ -0,0 +1,17 @@
+import type { Prettify, WhenRequired } from '../type-utils';
+import type { HttpRequestOptions } from './request-types';
+
+export type HttpBaseHeaders = Record<string, string | string[]>;
+export type HttpBaseParams = Record<string | number, unknown>;
+export type HttpBaseSearch = Record<string | number, unknown>;
+
+export type HttpBuilderBaseVars = Omit<HttpRequestOptions, 'body' | 'headers' | 'params' | 'search' | 'meta'>;
+
+export type HttpBuilderVars<TParam = unknown, TSearch = unknown, TBody = unknown, THeaders = unknown, TMeta = unknown> = Prettify<
+  HttpBuilderBaseVars &
+    WhenRequired<TParam, { params: TParam }> &
+    WhenRequired<TSearch, { search: TSearch }> &
+    WhenRequired<TBody, { body: TBody }> &
+    WhenRequired<THeaders, { headers: THeaders }> &
+    WhenRequired<TMeta, { meta: TMeta }>
+>;

packages/tanstack-query-builder/src/http/builder-utils.ts

@@ -1,4 +1,5 @@
-import type { BuilderKeySanitizerFn, BuilderMergeVarsFn, BuilderQueryFn, HttpBuilderVars } from '../builder/types';
+import type { BuilderKeySanitizerFn, BuilderMergeVarsFn, BuilderQueryFn } from '../builder/types';
+import type { HttpBuilderVars } from './builder-types';
 import { httpRequest } from './request';
 import { createHttpUrl } from './request-utils';
 

packages/tanstack-query-builder/src/http/errors.ts

@@ -1,4 +1,4 @@
-import type { HttpRequestOptions } from './types';
+import type { HttpRequestOptions } from './request-types';
 
 type RequestErrorInit = Pick<RequestError, 'options' | 'request' | 'response' | 'body' | 'cause'>;
 

…tanstack-query-builder/src/http/types.ts …-query-builder/src/http/request-types.tspackages/tanstack-query-builder/src/http/types.ts renamed to packages/tanstack-query-builder/src/http/request-types.ts packages/tanstack-query-builder/src/http/types.ts renamed to packages/tanstack-query-builder/src/http/request-types.ts

@@ -1,5 +1,5 @@
 import { RequestError } from './errors';
-import type { HttpRequestOptions, HttpRequestPathParams } from './types';
+import type { HttpRequestOptions, HttpRequestPathParams } from './request-types';
 
 function prepareParams(params: Record<string, unknown>): Record<string, string> {
   const newParams: Record<string, string> = {};

packages/tanstack-query-builder/src/http/request-utils.ts

@@ -1,8 +1,8 @@
 import { requestConcurrency } from './concurrency';
 import { Deferred } from './deferred';
 import { AbortError, RequestError, TimeoutError } from './errors';
+import type { HttpRequestOptions } from './request-types';
 import { createHttpUrl, inferErrorMessage, resolveCredentials } from './request-utils';
-import type { HttpRequestOptions } from './types';
 
 const CONTENT_TYPE_HEADER = 'content-type';
 const CONTENT_LENGTH_HEADER = 'content-length';

packages/tanstack-query-builder/src/http/request.ts

@@ -22,3 +22,13 @@ export type KeysOfValue<T, TCondition> = {
 export type HasFlag<T extends string, TFlag extends string, TTrue = true, TFalse = never> = T extends `${string}${TFlag}${string}`
   ? TTrue
   : TFalse;
+
+export type WhenRequired<T, TReq> = T extends undefined
+  ? Partial<TReq>
+  : unknown extends T
+    ? Partial<TReq>
+    : T extends null
+      ? Partial<TReq>
+      : Partial<T> extends T
+        ? Partial<TReq>
+        : TReq;

packages/tanstack-query-builder/src/type-utils.ts

@@ -1,6 +1,6 @@
-import { HttpBuilderBaseVars } from '../src/builder/types';
 import { HttpQueryBuilder } from '../src/http/HttpQueryBuilder';
-import { PathParam } from '../src/http/types';
+import { HttpBuilderBaseVars } from '../src/http/builder-types';
+import { PathParam } from '../src/http/request-types';
 import { Prettify } from '../src/type-utils';
 
 describe('HttpQueryBuilder', () => {