@zayne-labs/callapi 1.11.34 → 1.11.36

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as ErrorContext, B as CallApiPlugin, C as InferExtendSchemaContext, F as ResponseContext, G as BaseCallApiSchemaRoutes, H as PluginSetupContext, I as ResponseErrorContext, J as CallApiSchemaConfig, K as BaseSchemaRouteKeyPrefixes, L as ResponseStreamContext, M as HooksOrHooksArray, N as RequestContext, O as RetryOptions, P as RequestStreamContext, R as SuccessContext, S as GetExtendSchemaConfigContext, T as Register, U as InferParamsFromRoute, V as PluginHooks, W as URLOptions, X as InferSchemaOutput, Y as InferSchemaInput, _ as CallApiExtraOptionsForHooks, a as CallApiResultSuccessOrErrorVariant, b as CallApiRequestOptionsForHooks, c as PossibleJavaScriptError, d as ResponseTypeType, f as ResultModeType, g as CallApiExtraOptions, h as CallApiConfig, i as CallApiResultErrorVariant, j as Hooks, k as DedupeOptions, l as PossibleJavaScriptOrValidationError, m as BaseCallApiExtraOptions, n as createFetchClient, o as CallApiResultSuccessVariant, p as BaseCallApiConfig, q as CallApiSchema, r as createFetchClientWithContext, s as PossibleHTTPError, t as callApi, u as PossibleValidationError, v as CallApiParameters, w as InstanceContext, x as CallApiResultLoose, y as CallApiRequestOptions, z as DefaultCallApiContext } from "./index-YnlEWnbR.js";
-export { BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaRoutes, BaseSchemaRouteKeyPrefixes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResultLoose as CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessOrErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultCallApiContext, ErrorContext, GetExtendSchemaConfigContext, Hooks, HooksOrHooksArray, InferExtendSchemaContext, InferParamsFromRoute, InferSchemaInput, InferSchemaOutput, InstanceContext, PluginHooks, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeType, ResultModeType, RetryOptions, SuccessContext, URLOptions, callApi, createFetchClient, createFetchClientWithContext };
+import { $ as ResponseStreamContext, A as Register, B as InferSchemaInput, C as CallApiParameters, D as GetExtendSchemaConfigContext, E as CallApiResultLoose, F as URLOptions, G as DedupeOptions, H as FetchImpl, I as BaseCallApiSchemaRoutes, J as HooksOrHooksArray, K as ErrorContext, L as BaseSchemaRouteKeyPrefixes, N as RetryOptions, O as InferExtendSchemaContext, P as InferParamsFromRoute, Q as ResponseErrorContext, R as CallApiSchema, S as CallApiExtraOptionsForHooks, T as CallApiRequestOptionsForHooks, U as FetchMiddlewareContext, V as InferSchemaOutput, W as Middlewares, X as RequestStreamContext, Y as RequestContext, Z as ResponseContext, _ as ResultModeType, a as CallApiPlugin, b as CallApiConfig, c as PluginSetupContext, d as CallApiResultSuccessVariant, et as SuccessContext, f as PossibleHTTPError, g as ResponseTypeType, h as PossibleValidationError, i as DefaultCallApiContext, k as InstanceContext, l as CallApiResultErrorVariant, m as PossibleJavaScriptOrValidationError, n as createFetchClient, o as PluginHooks, p as PossibleJavaScriptError, q as Hooks, r as createFetchClientWithContext, s as PluginMiddlewares, t as callApi, u as CallApiResultSuccessOrErrorVariant, v as BaseCallApiConfig, w as CallApiRequestOptions, x as CallApiExtraOptions, y as BaseCallApiExtraOptions, z as CallApiSchemaConfig } from "./index-CGn8h_Ai.js";
+export { BaseCallApiConfig, BaseCallApiExtraOptions, BaseCallApiSchemaRoutes, BaseSchemaRouteKeyPrefixes, CallApiConfig, CallApiExtraOptions, CallApiExtraOptionsForHooks, CallApiParameters, CallApiPlugin, CallApiRequestOptions, CallApiRequestOptionsForHooks, CallApiResultLoose as CallApiResult, CallApiResultErrorVariant, CallApiResultSuccessOrErrorVariant, CallApiResultSuccessVariant, CallApiSchema, CallApiSchemaConfig, DedupeOptions, DefaultCallApiContext, ErrorContext, FetchImpl, FetchMiddlewareContext, GetExtendSchemaConfigContext, Hooks, HooksOrHooksArray, InferExtendSchemaContext, InferParamsFromRoute, InferSchemaInput, InferSchemaOutput, InstanceContext, Middlewares, PluginHooks, PluginMiddlewares, PluginSetupContext, PossibleHTTPError, PossibleJavaScriptError, PossibleJavaScriptOrValidationError, PossibleValidationError, Register, RequestContext, RequestStreamContext, ResponseContext, ResponseErrorContext, ResponseStreamContext, ResponseTypeType, ResultModeType, RetryOptions, SuccessContext, URLOptions, callApi, createFetchClient, createFetchClientWithContext };

package/dist/index.js

@@ -1,5 +1,5 @@
 import { n as requestOptionDefaults, r as defineEnum, t as extraOptionDefaults } from "./defaults-B-dOt2Dd.js";
-import { _ as isReadableStream, a as isValidationErrorInstance, b as isValidJsonString, d as isBoolean, f as isFunction, g as isQueryString, h as isPromise, l as toQueryString, m as isPlainObject, n as isHTTPErrorInstance, o as HTTPError, p as isObject, s as ValidationError, u as isArray, v as isSerializable, y as isString } from "./guards-ZYV-Q_as.js";
+import { C as isReadableStream, E as isValidJsonString, S as isQueryString, T as isString, _ as isBoolean, a as isValidationErrorInstance, b as isPlainObject, f as HTTPError, g as isArray, h as toQueryString, n as isHTTPErrorInstance, p as ValidationError, v as isFunction, w as isSerializableObject, x as isPromise, y as isObject } from "./external-DXaCWLPN.js";
 import { n as fetchSpecificKeys, t as fallBackRouteSchemaKey } from "./validation-DbbofkNi.js";
 
 //#region src/auth.ts
@@ -78,8 +78,8 @@ const handleSchemaValidation = async (fullSchema, schemaName, validationOptions)
 		inputValue,
 		response
 	});
-	const disableResultApplicationBooleanObject = isObject(schemaConfig?.disableValidationOutputApplication) ? schemaConfig.disableValidationOutputApplication : {};
-	if (schemaConfig?.disableValidationOutputApplication === true || disableResultApplicationBooleanObject[schemaName] === true) return inputValue;
+	const disableResultApplicationBooleanObject = isObject(schemaConfig?.disableRuntimeValidationTransform) ? schemaConfig.disableRuntimeValidationTransform : {};
+	if (schemaConfig?.disableRuntimeValidationTransform === true || disableResultApplicationBooleanObject[schemaName] === true) return inputValue;
 	return validResult;
 };
 const extraOptionsToBeValidated = [
@@ -225,7 +225,7 @@ const ampersand = "&";
 const mergeUrlWithQuery = (url, query) => {
 	if (!query) return url;
 	const queryString = toQueryString(query);
-	if (queryString?.length === 0) return url;
+	if (queryString.length === 0) return url;
 	if (url.endsWith(questionMark)) return `${url}${queryString}`;
 	if (url.includes(questionMark)) return `${url}${ampersand}${queryString}`;
 	return `${url}${questionMark}${queryString}`;
@@ -257,12 +257,20 @@ const normalizeURL = (initURL) => {
 	if (!methodFromURL) return initURL;
 	return initURL.includes("http") ? initURL.replace(`@${methodFromURL}/`, "") : initURL.replace(`@${methodFromURL}/`, "/");
 };
+const getFullURL = (initURL, baseURL) => {
+	if (!baseURL || initURL.startsWith("http")) return initURL;
+	return initURL.length > 0 && !initURL.startsWith(slash) && !baseURL.endsWith(slash) ? `${baseURL}${slash}${initURL}` : `${baseURL}${initURL}`;
+};
 const getFullAndNormalizedURL = (options) => {
 	const { baseURL, initURL, params, query } = options;
 	const normalizedInitURL = normalizeURL(initURL);
-	const urlWithMergedQueryAndParams = mergeUrlWithQuery(mergeUrlWithParams(normalizedInitURL, params), query);
+	const fullURL = getFullURL(mergeUrlWithQuery(mergeUrlWithParams(normalizedInitURL, params), query), baseURL);
+	if (!URL.canParse(fullURL)) {
+		const errorMessage = !baseURL ? `Invalid URL '${fullURL}'. Are you passing a relative url to CallApi but not setting the 'baseURL' option?` : `Invalid URL '${fullURL}'. Please validate that you are passing the correct url.`;
+		console.error(errorMessage);
+	}
 	return {
-		fullURL: !urlWithMergedQueryAndParams.startsWith("http") && baseURL ? `${baseURL}${urlWithMergedQueryAndParams}` : urlWithMergedQueryAndParams,
+		fullURL,
 		normalizedInitURL
 	};
 };
@@ -320,29 +328,36 @@ const getResolvedHeaders = (options) => {
 	const { baseHeaders, headers } = options;
 	return objectifyHeaders(isFunction(headers) ? headers({ baseHeaders: objectifyHeaders(baseHeaders) }) : headers ?? baseHeaders);
 };
+const detectContentTypeHeader = (body) => {
+	if (isQueryString(body)) return { "Content-Type": "application/x-www-form-urlencoded" };
+	if (isSerializableObject(body) || isValidJsonString(body)) return {
+		Accept: "application/json",
+		"Content-Type": "application/json"
+	};
+	return null;
+};
 const getHeaders = async (options) => {
 	const { auth, body, resolvedHeaders } = options;
-	const headersObject = {
-		...await getAuthHeader(auth),
-		...objectifyHeaders(resolvedHeaders)
-	};
-	if (isQueryString(body)) {
-		headersObject["Content-Type"] = "application/x-www-form-urlencoded";
-		return headersObject;
+	const authHeaderObject = await getAuthHeader(auth);
+	const resolvedHeadersObject = objectifyHeaders(resolvedHeaders);
+	if (!(Object.hasOwn(resolvedHeadersObject, "Content-Type") || Object.hasOwn(resolvedHeadersObject, "content-type"))) {
+		const contentTypeHeader = detectContentTypeHeader(body);
+		contentTypeHeader && Object.assign(resolvedHeadersObject, contentTypeHeader);
 	}
-	if (isSerializable(body) || isValidJsonString(body)) {
-		headersObject["Content-Type"] = "application/json";
-		headersObject.Accept = "application/json";
-	}
-	return headersObject;
+	return {
+		...authHeaderObject,
+		...resolvedHeadersObject
+	};
 };
 const getMethod = (ctx) => {
 	const { initURL, method } = ctx;
 	return method?.toUpperCase() ?? extractMethodFromURL(initURL)?.toUpperCase() ?? requestOptionDefaults.method;
 };
 const getBody = (options) => {
-	const { body, bodySerializer } = options;
-	if (isSerializable(body)) return (bodySerializer ?? extraOptionDefaults.bodySerializer)(body);
+	const { body, bodySerializer, resolvedHeaders } = options;
+	const existingContentType = new Headers(resolvedHeaders).get("content-type");
+	if (!existingContentType && isSerializableObject(body)) return (bodySerializer ?? extraOptionDefaults.bodySerializer)(body);
+	if (existingContentType === "application/x-www-form-urlencoded" && isSerializableObject(body)) return toQueryString(body);
 	return body;
 };
 const getInitFetchImpl = (customFetchImpl) => {
@@ -1049,7 +1064,8 @@ const createFetchClientWithContext = () => {
 				Object.assign(request, {
 					body: getBody({
 						body: requestOptionsValidationResult.body,
-						bodySerializer: options.bodySerializer
+						bodySerializer: options.bodySerializer,
+						resolvedHeaders: requestOptionsValidationResult.headers
 					}),
 					headers: await getHeaders({
 						auth: options.auth,