Axios pre request options deep merge

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@unistudents/saffron",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "A fairly intuitive & powerful framework that enables you to collect & save articles and news from all over the web. ",
     "license": "MIT",
     "homepage": "https://github.com/unistudents/saffron#readme",

src/components/Utils.ts

@@ -8,6 +8,7 @@ import {Job} from "./job";
 import {Worker} from "../modules/worker";
 import striptags from "striptags";
 import type {DynamicSourceFile} from "./DynamicSourceFile";
+import {deepmerge} from "../utils/deepmerge.util";
 
 export class Utils {
 
@@ -296,7 +297,7 @@ export class Utils {
                 axiosConfig = await axiosConfig(this.source);
             }
 
-            options = {...options, ...axiosConfig} as AxiosRequestConfig
+            options = deepmerge(options, axiosConfig);
         }
 
         options.responseType = 'arraybuffer';

src/components/config.ts

@@ -265,7 +265,7 @@ export class Config {
 
     private mergeObject(src: any, original: object): any {
         return _.mergeWith({}, original, src, (o, s) => {
-            if (typeof o == 'object' && !Array.isArray(o) && typeof o != 'function' && typeof s != 'function')
+            if (typeof o == 'object' && !Array.isArray(o) && typeof s != 'function' && typeof s != 'function')
                 return this.mergeObject(s, o);
             return s != null ? s : o;
         });

src/utils/deepmerge.util.ts

@@ -0,0 +1,9 @@
+import _ from "lodash";
+
+export function deepmerge<T>(a: T, b: T): T {
+    return _.mergeWith({}, a, b, (o, s) => {
+        if (typeof o == 'object' && !Array.isArray(o) && typeof o != 'function' && typeof s != 'function')
+            return deepmerge(s, o);
+        return s != null ? s : o;
+    });
+}

test/config.test.ts

@@ -56,6 +56,7 @@ describe('Configuration', function () {
                 headers: {
                     'User-Agent': 'saffron-'
                 },
+                validateStatus: (_) => true,
                 maxRedirects: 5
             },
             preprocessor: async (r, s) => r,
@@ -98,6 +99,7 @@ describe('Configuration', function () {
         expect((c.workers?.axios as any)?.timeout).to.equal((ec.workers?.axios as any)?.timeout);
         expect((c.workers?.axios as any)?.maxRedirects).to.equal((ec.workers?.axios as any)?.maxRedirects);
         expect((c.workers?.axios as any)?.headers).to.deep.equal((ec.workers?.axios as any)?.headers);
+        expect((c.workers?.axios as any)?.validateStatus).to.be.a('function');
         expect(c.workers?.preprocessor).to.equal(ec.workers?.preprocessor);
         expect(c.workers?.articles?.amount).to.equal(ec.workers.articles?.amount);
         expect(c.workers?.articles?.includeContentAttachments).to.equal(ec.workers.articles?.includeContentAttachments);