@zayne-labs/callapi 1.11.31 → 1.11.33

package/dist/index.js

@@ -17,17 +17,22 @@ const getAuthHeader = async (auth) => {
 			if (username === void 0 || password === void 0) return;
 			return { Authorization: `Basic ${globalThis.btoa(`${username}:${password}`)}` };
 		}
+		case "Bearer": {
+			const value = await resolveAuthValue(auth.value);
+			if (value === void 0) return;
+			return { Authorization: `Bearer ${value}` };
+		}
 		case "Custom": {
 			const [prefix, value] = await Promise.all([resolveAuthValue(auth.prefix), resolveAuthValue(auth.value)]);
 			if (value === void 0) return;
 			return { Authorization: `${prefix} ${value}` };
 		}
-		default: {
-			const [bearer, token] = await Promise.all([resolveAuthValue(auth.bearer), resolveAuthValue(auth.token)]);
-			if (bearer !== void 0) return { Authorization: `Bearer ${bearer}` };
-			if (token === void 0) return;
-			return { Authorization: `Token ${token}` };
+		case "Token": {
+			const value = await resolveAuthValue(auth.value);
+			if (value === void 0) return;
+			return { Authorization: `Token ${value}` };
 		}
+		default: return;
 	}
 };
 
@@ -80,7 +85,8 @@ const handleSchemaValidation = async (fullSchema, schemaName, validationOptions)
 const extraOptionsToBeValidated = [
 	"meta",
 	"params",
-	"query"
+	"query",
+	"auth"
 ];
 const handleExtraOptionsValidation = async (validationOptions) => {
 	const { options, schema, schemaConfig } = validationOptions;
@@ -322,21 +328,16 @@ const pickKeys = (initialObject, keysToPick) => {
 const splitBaseConfig = (baseConfig) => [pickKeys(baseConfig, fetchSpecificKeys), omitKeys(baseConfig, fetchSpecificKeys)];
 const splitConfig = (config) => [pickKeys(config, fetchSpecificKeys), omitKeys(config, fetchSpecificKeys)];
 const objectifyHeaders = (headers) => {
-	if (!headers || isPlainObject(headers)) return headers;
+	if (!headers) return {};
+	if (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);
+	return objectifyHeaders(isFunction(headers) ? headers({ baseHeaders: objectifyHeaders(baseHeaders) }) : headers ?? baseHeaders);
 };
 const getHeaders = async (options) => {
-	const { auth, baseHeaders, body, headers } = options;
-	const resolvedHeaders = getResolvedHeaders({
-		baseHeaders,
-		headers
-	});
+	const { auth, body, resolvedHeaders } = options;
 	const headersObject = {
 		...await getAuthHeader(auth),
 		...objectifyHeaders(resolvedHeaders)
@@ -795,58 +796,47 @@ const getResolvedPlugins = (context) => {
 	const { baseConfig, options } = context;
 	return isFunction(options.plugins) ? options.plugins({ basePlugins: baseConfig.plugins ?? [] }) : options.plugins ?? [];
 };
-const initializePlugins = async (context) => {
-	const { baseConfig, config, initURL, options, request } = context;
+const initializePlugins = async (setupContext) => {
+	const { baseConfig, config, initURL, options, request } = setupContext;
 	const { addMainHooks, addMainMiddlewares, addPluginHooks, addPluginMiddlewares, getResolvedHooks, getResolvedMiddlewares } = setupHooksAndMiddlewares({
 		baseConfig,
 		config,
 		options
 	});
-	const { currentRouteSchemaKey, mainInitURL } = getCurrentRouteSchemaKeyAndMainInitURL({
+	const initURLResult = getCurrentRouteSchemaKeyAndMainInitURL({
 		baseExtraOptions: baseConfig,
 		extraOptions: config,
 		initURL
 	});
-	let resolvedCurrentRouteSchemaKey = currentRouteSchemaKey;
-	let resolvedInitURL = mainInitURL;
-	let resolvedOptions = options;
-	let resolvedRequest = request;
+	let resolvedCurrentRouteSchemaKey = initURLResult.currentRouteSchemaKey;
+	let resolvedInitURL = initURLResult.mainInitURL;
+	const resolvedOptions = options;
+	const resolvedRequest = Object.assign(request, {
+		headers: getResolvedHeaders({
+			baseHeaders: baseConfig.headers,
+			headers: config.headers
+		}),
+		method: getMethod({
+			initURL: resolvedInitURL,
+			method: request.method
+		})
+	});
 	const executePluginSetupFn = async (pluginSetup) => {
 		if (!pluginSetup) return;
-		const initResult = await pluginSetup(context);
-		if (!isPlainObject(initResult)) return;
+		const initResult = await pluginSetup(setupContext);
+		if (!initResult) return;
 		const urlString = initResult.initURL?.toString();
 		if (isString(urlString)) {
-			const newResult = getCurrentRouteSchemaKeyAndMainInitURL({
+			const newURLResult = getCurrentRouteSchemaKeyAndMainInitURL({
 				baseExtraOptions: baseConfig,
 				extraOptions: config,
 				initURL: urlString
 			});
-			resolvedCurrentRouteSchemaKey = newResult.currentRouteSchemaKey;
-			resolvedInitURL = newResult.mainInitURL;
-		}
-		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
-			};
+			resolvedCurrentRouteSchemaKey = newURLResult.currentRouteSchemaKey;
+			resolvedInitURL = newURLResult.mainInitURL;
 		}
-		if (isPlainObject(initResult.options)) resolvedOptions = {
-			...resolvedOptions,
-			...initResult.options
-		};
+		if (initResult.request) Object.assign(resolvedRequest, initResult.request);
+		if (initResult.options) Object.assign(resolvedOptions, initResult.options);
 	};
 	const resolvedPlugins = getResolvedPlugins({
 		baseConfig,
@@ -855,8 +845,8 @@ const initializePlugins = async (context) => {
 	for (const plugin of resolvedPlugins) {
 		const [, pluginHooks, pluginMiddlewares] = await Promise.all([
 			executePluginSetupFn(plugin.setup),
-			isFunction(plugin.hooks) ? plugin.hooks(context) : plugin.hooks,
-			isFunction(plugin.middlewares) ? plugin.middlewares(context) : plugin.middlewares
+			isFunction(plugin.hooks) ? plugin.hooks(setupContext) : plugin.hooks,
+			isFunction(plugin.middlewares) ? plugin.middlewares(setupContext) : plugin.middlewares
 		]);
 		pluginHooks && addPluginHooks(pluginHooks);
 		pluginMiddlewares && addPluginMiddlewares(pluginMiddlewares);
@@ -1017,7 +1007,6 @@ const createFetchClientWithContext = () => {
 				...!shouldSkipAutoMergeForOptions && extraOptions
 			};
 			const mergedRequestOptions = {
-				headers: {},
 				...baseFetchOptions,
 				...!shouldSkipAutoMergeForRequest && fetchOptions
 			};
@@ -1073,17 +1062,15 @@ const createFetchClientWithContext = () => {
 					request
 				});
 				Object.assign(options, extraOptionsValidationResult);
-				const validBody = getBody({
-					body: requestOptionsValidationResult.body,
-					bodySerializer: options.bodySerializer
-				});
 				Object.assign(request, {
-					body: validBody,
+					body: getBody({
+						body: requestOptionsValidationResult.body,
+						bodySerializer: options.bodySerializer
+					}),
 					headers: await getHeaders({
 						auth: options.auth,
-						baseHeaders: baseConfig.headers,
-						body: validBody,
-						headers: requestOptionsValidationResult.headers
+						body: requestOptionsValidationResult.body,
+						resolvedHeaders: requestOptionsValidationResult.headers
 					}),
 					method: getMethod({
 						initURL: resolvedInitURL,