@zayne-labs/callapi 1.11.29 → 1.11.31

package/dist/index.js

@@ -67,11 +67,15 @@ const routeKeyMethods = defineEnum([
 ]);
 const handleSchemaValidation = async (fullSchema, schemaName, validationOptions) => {
 	const { inputValue, response, schemaConfig } = validationOptions;
-	if (schemaConfig?.disableRuntimeValidation) return inputValue;
-	return await standardSchemaParser(fullSchema, schemaName, {
+	const disableRuntimeValidationBooleanObject = isObject(schemaConfig?.disableRuntimeValidation) ? schemaConfig.disableRuntimeValidation : {};
+	if (schemaConfig?.disableRuntimeValidation === true || disableRuntimeValidationBooleanObject[schemaName] === true) return inputValue;
+	const validResult = await standardSchemaParser(fullSchema, schemaName, {
 		inputValue,
 		response
 	});
+	const disableResultApplicationBooleanObject = isObject(schemaConfig?.disableValidationOutputApplication) ? schemaConfig.disableValidationOutputApplication : {};
+	if (schemaConfig?.disableValidationOutputApplication === true || disableResultApplicationBooleanObject[schemaName] === true) return inputValue;
+	return validResult;
 };
 const extraOptionsToBeValidated = [
 	"meta",
@@ -98,11 +102,13 @@ const requestOptionsToBeValidated = [
 	"method"
 ];
 const handleRequestOptionsValidation = async (validationOptions) => {
-	const { requestOptions, schema, schemaConfig } = validationOptions;
-	const validationResultArray = await Promise.all(requestOptionsToBeValidated.map((schemaName) => handleSchemaValidation(schema, schemaName, {
-		inputValue: requestOptions[schemaName],
-		schemaConfig
-	})));
+	const { request, schema, schemaConfig } = validationOptions;
+	const validationResultArray = await Promise.all(requestOptionsToBeValidated.map((schemaName) => {
+		return handleSchemaValidation(schema, schemaName, {
+			inputValue: request[schemaName],
+			schemaConfig
+		});
+	}));
 	const validatedResultObject = {};
 	for (const [index, propertyKey] of requestOptionsToBeValidated.entries()) {
 		const validationResult = validationResultArray[index];
@@ -112,7 +118,7 @@ const handleRequestOptionsValidation = async (validationOptions) => {
 	return validatedResultObject;
 };
 const handleConfigValidation = async (validationOptions) => {
-	const { baseExtraOptions, currentRouteSchemaKey, extraOptions, options, requestOptions } = validationOptions;
+	const { baseExtraOptions, currentRouteSchemaKey, extraOptions, options, request } = validationOptions;
 	const { currentRouteSchema, resolvedSchema } = getResolvedSchema({
 		baseExtraOptions,
 		currentRouteSchemaKey,
@@ -127,19 +133,12 @@ const handleConfigValidation = async (validationOptions) => {
 		issues: [{ message: `Strict Mode - No schema found for route '${currentRouteSchemaKey}' ` }],
 		response: null
 	});
-	if (resolvedSchemaConfig?.disableRuntimeValidation) return {
-		extraOptionsValidationResult: null,
-		requestOptionsValidationResult: null,
-		resolvedSchema,
-		resolvedSchemaConfig,
-		shouldApplySchemaOutput: false
-	};
 	const [extraOptionsValidationResult, requestOptionsValidationResult] = await Promise.all([handleExtraOptionsValidation({
 		options,
 		schema: resolvedSchema,
 		schemaConfig: resolvedSchemaConfig
 	}), handleRequestOptionsValidation({
-		requestOptions,
+		request,
 		schema: resolvedSchema,
 		schemaConfig: resolvedSchemaConfig
 	})]);
@@ -147,8 +146,7 @@ const handleConfigValidation = async (validationOptions) => {
 		extraOptionsValidationResult,
 		requestOptionsValidationResult,
 		resolvedSchema,
-		resolvedSchemaConfig,
-		shouldApplySchemaOutput: (Boolean(extraOptionsValidationResult) || Boolean(requestOptionsValidationResult)) && !resolvedSchemaConfig?.disableValidationOutputApplication
+		resolvedSchemaConfig
 	};
 };
 const getResolvedSchema = (context) => {
@@ -327,12 +325,21 @@ const objectifyHeaders = (headers) => {
 	if (!headers || isPlainObject(headers)) return headers;
 	return Object.fromEntries(headers);
 };
+const getResolvedHeaders = (options) => {
+	const { baseHeaders, headers } = options;
+	const resolvedHeaders = isFunction(headers) ? headers({ baseHeaders: baseHeaders ?? {} }) : headers ?? baseHeaders;
+	if (!resolvedHeaders) return;
+	return objectifyHeaders(resolvedHeaders);
+};
 const getHeaders = async (options) => {
-	const { auth, body, headers } = options;
-	if (!(Boolean(headers) || Boolean(body) || Boolean(auth))) return;
+	const { auth, baseHeaders, body, headers } = options;
+	const resolvedHeaders = getResolvedHeaders({
+		baseHeaders,
+		headers
+	});
 	const headersObject = {
 		...await getAuthHeader(auth),
-		...objectifyHeaders(headers)
+		...objectifyHeaders(resolvedHeaders)
 	};
 	if (isQueryString(body)) {
 		headersObject["Content-Type"] = "application/x-www-form-urlencoded";
@@ -803,7 +810,7 @@ const initializePlugins = async (context) => {
 	let resolvedCurrentRouteSchemaKey = currentRouteSchemaKey;
 	let resolvedInitURL = mainInitURL;
 	let resolvedOptions = options;
-	let resolvedRequestOptions = request;
+	let resolvedRequest = request;
 	const executePluginSetupFn = async (pluginSetup) => {
 		if (!pluginSetup) return;
 		const initResult = await pluginSetup(context);
@@ -818,10 +825,24 @@ const initializePlugins = async (context) => {
 			resolvedCurrentRouteSchemaKey = newResult.currentRouteSchemaKey;
 			resolvedInitURL = newResult.mainInitURL;
 		}
-		if (isPlainObject(initResult.request)) resolvedRequestOptions = {
-			...resolvedRequestOptions,
-			...initResult.request
-		};
+		if (isPlainObject(initResult.request)) {
+			const initMethod = getMethod({
+				initURL: resolvedInitURL,
+				method: initResult.request.method ?? resolvedRequest.method
+			});
+			const initHeaders = await getHeaders({
+				auth: options.auth,
+				baseHeaders: baseConfig.headers,
+				body: initResult.request.body ?? resolvedRequest.body,
+				headers: initResult.request.headers ?? resolvedRequest.headers
+			});
+			resolvedRequest = {
+				...resolvedRequest,
+				...initResult.request,
+				headers: initHeaders,
+				method: initMethod
+			};
+		}
 		if (isPlainObject(initResult.options)) resolvedOptions = {
 			...resolvedOptions,
 			...initResult.options
@@ -850,7 +871,7 @@ const initializePlugins = async (context) => {
 		resolvedInitURL,
 		resolvedMiddlewares,
 		resolvedOptions,
-		resolvedRequestOptions
+		resolvedRequest
 	};
 };
 const setupHooksAndMiddlewares = (context) => {
@@ -1000,7 +1021,7 @@ const createFetchClientWithContext = () => {
 				...baseFetchOptions,
 				...!shouldSkipAutoMergeForRequest && fetchOptions
 			};
-			const { resolvedCurrentRouteSchemaKey, resolvedHooks, resolvedInitURL, resolvedMiddlewares, resolvedOptions, resolvedRequestOptions } = await initializePlugins({
+			const { resolvedCurrentRouteSchemaKey, resolvedHooks, resolvedInitURL, resolvedMiddlewares, resolvedOptions, resolvedRequest } = await initializePlugins({
 				baseConfig,
 				config,
 				initURL: initURL.toString(),
@@ -1022,14 +1043,9 @@ const createFetchClientWithContext = () => {
 				initURLNormalized: normalizedInitURL
 			};
 			const newFetchController = new AbortController();
-			const combinedSignal = createCombinedSignal(createTimeoutSignal(options.timeout), resolvedRequestOptions.signal, newFetchController.signal);
-			const initMethod = getMethod({
-				initURL: resolvedInitURL,
-				method: resolvedRequestOptions.method
-			});
+			const combinedSignal = createCombinedSignal(createTimeoutSignal(options.timeout), resolvedRequest.signal, newFetchController.signal);
 			const request = {
-				...resolvedRequestOptions,
-				method: initMethod,
+				...resolvedRequest,
 				signal: combinedSignal
 			};
 			const { getAbortErrorMessage, handleRequestCancelStrategy, handleRequestDeferStrategy, removeDedupeKeyFromCache, resolvedDedupeStrategy } = await createDedupeStrategy({
@@ -1049,32 +1065,30 @@ const createFetchClientWithContext = () => {
 					options,
 					request
 				}));
-				const { extraOptionsValidationResult, requestOptionsValidationResult, resolvedSchema, resolvedSchemaConfig, shouldApplySchemaOutput } = await handleConfigValidation({
+				const { extraOptionsValidationResult, requestOptionsValidationResult, resolvedSchema, resolvedSchemaConfig } = await handleConfigValidation({
 					baseExtraOptions,
 					currentRouteSchemaKey: resolvedCurrentRouteSchemaKey,
 					extraOptions,
 					options,
-					requestOptions: request
-				});
-				if (shouldApplySchemaOutput) Object.assign(options, extraOptionsValidationResult);
-				const validMethod = getMethod({
-					initURL: resolvedInitURL,
-					method: shouldApplySchemaOutput ? requestOptionsValidationResult?.method : request.method
+					request
 				});
+				Object.assign(options, extraOptionsValidationResult);
 				const validBody = getBody({
-					body: shouldApplySchemaOutput ? requestOptionsValidationResult?.body : request.body,
+					body: requestOptionsValidationResult.body,
 					bodySerializer: options.bodySerializer
 				});
-				const resolvedHeaders = isFunction(fetchOptions.headers) ? fetchOptions.headers({ baseHeaders: baseFetchOptions.headers ?? {} }) : fetchOptions.headers ?? baseFetchOptions.headers;
-				const validHeaders = await getHeaders({
-					auth: options.auth,
-					body: validBody,
-					headers: shouldApplySchemaOutput ? requestOptionsValidationResult?.headers : resolvedHeaders
-				});
 				Object.assign(request, {
-					...validBody && { body: validBody },
-					...validHeaders && { headers: validHeaders },
-					...validMethod && { method: validMethod }
+					body: validBody,
+					headers: await getHeaders({
+						auth: options.auth,
+						baseHeaders: baseConfig.headers,
+						body: validBody,
+						headers: requestOptionsValidationResult.headers
+					}),
+					method: getMethod({
+						initURL: resolvedInitURL,
+						method: requestOptionsValidationResult.method
+					})
 				});
 				const readyRequestContext = {
 					baseConfig,