refactor(api-core): pass config object to core classes

BREAKING CHANGE: Options to core classes are being passed in as config object instead of parameters.

packages/api-angular/src/api.js

@@ -9,7 +9,13 @@ function factory($http, $q, avApiOptions) {
         throw new Error('[options] cannot be null or undefined');
       }
       options = angular.merge({}, avApiOptions, options);
-      super($http, $q, options);
+
+      super({
+        http: $http,
+        promise: $q,
+        merge: angular.merge,
+        config: options,
+      });
     }
   }
   return AvApi;

packages/api-angular/src/logs.js

@@ -2,4 +2,9 @@ import angular from 'angular';
 import { AvLogMessages } from '@availity/api-core';
 
 export default ($http, $q, avApiOptions) =>
-  new AvLogMessages($http, $q, angular.copy(avApiOptions));
+  new AvLogMessages({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/navigation.js

@@ -3,4 +3,9 @@ import angular from 'angular';
 import { AvNavigation } from '@availity/api-core';
 
 export default ($http, $q, avApiOptions) =>
-  new AvNavigation($http, $q, angular.copy(avApiOptions));
+  new AvNavigation({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/notification.js

@@ -2,13 +2,10 @@ import angular from 'angular';
 
 import { AvNotification } from '@availity/api-core';
 
-function factory($http, $q, avApiOptions) {
-  class AvNotificationApi extends AvNotification {
-    constructor() {
-      const theseOptions = angular.copy(avApiOptions);
-      super($http, $q, theseOptions);
-    }
-  }
-  return new AvNotificationApi();
-}
-export default factory;
+export default ($http, $q, avApiOptions) =>
+  new AvNotification({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/organizations.js

@@ -3,4 +3,10 @@ import angular from 'angular';
 import { AvOrganizations } from '@availity/api-core';
 
 export default ($http, $q, avUsersApi, avApiOptions) =>
-  new AvOrganizations($http, $q, avUsersApi, angular.copy(avApiOptions));
+  new AvOrganizations({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    avUsers: avUsersApi,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/pdfs.js

@@ -3,4 +3,9 @@ import angular from 'angular';
 import { AvPdf } from '@availity/api-core';
 
 export default ($http, $q, avApiOptions) =>
-  new AvPdf($http, $q, angular.copy(avApiOptions));
+  new AvPdf({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/permissions.js

@@ -3,4 +3,9 @@ import angular from 'angular';
 import { AvPermissions } from '@availity/api-core';
 
 export default ($http, $q, avApiOptions) =>
-  new AvPermissions($http, $q, angular.copy(avApiOptions));
+  new AvPermissions({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/providers.js

@@ -3,4 +3,9 @@ import angular from 'angular';
 import { AvProviders } from '@availity/api-core';
 
 export default ($http, $q, avApiOptions) =>
-  new AvProviders($http, $q, angular.copy(avApiOptions));
+  new AvProviders({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/proxy.js

@@ -6,7 +6,12 @@ function factory($http, $q, avApiOptions) {
   class AvProxyApi extends AvProxy {
     constructor(options) {
       options = angular.merge({}, avApiOptions, options);
-      super($http, $q, options);
+      super({
+        http: $http,
+        promise: $q,
+        merge: angular.merge,
+        config: options,
+      });
     }
   }
   return AvProxyApi;

packages/api-angular/src/regions.js

@@ -3,4 +3,10 @@ import angular from 'angular';
 import { AvRegions } from '@availity/api-core';
 
 export default ($http, $q, avUsersApi, avApiOptions) =>
-  new AvRegions($http, $q, avUsersApi, angular.copy(avApiOptions));
+  new AvRegions({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    avUsers: avUsersApi,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/spaces.js

@@ -2,14 +2,10 @@ import angular from 'angular';
 
 import { AvSpaces } from '@availity/api-core';
 
-function factory($http, $q, avApiOptions) {
-  class AvSpacesApi extends AvSpaces {
-    constructor() {
-      const options = angular.copy(avApiOptions);
-      super($http, $q, options);
-    }
-  }
-  return new AvSpacesApi();
-}
-
-export default factory;
+export default ($http, $q, avApiOptions) =>
+  new AvSpaces({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/user.js

@@ -3,4 +3,9 @@ import angular from 'angular';
 import { AvUsers } from '@availity/api-core';
 
 export default ($http, $q, avApiOptions) =>
-  new AvUsers($http, $q, angular.copy(avApiOptions));
+  new AvUsers({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-angular/src/userPermissions.js

@@ -3,4 +3,9 @@ import angular from 'angular';
 import { AvUserPermissions } from '@availity/api-core';
 
 export default ($http, $q, avApiOptions) =>
-  new AvUserPermissions($http, $q, angular.copy(avApiOptions));
+  new AvUserPermissions({
+    http: $http,
+    promise: $q,
+    merge: angular.merge,
+    config: angular.copy(avApiOptions),
+  });

packages/api-axios/src/api.js

@@ -1,9 +1,16 @@
 import axios from 'axios';
-
+import utils from 'axios/lib/utils';
 import Api from '@availity/api-core';
 
+const { merge } = utils;
+
 export default class AvApi extends Api {
   constructor(options) {
-    super(axios, Promise, options);
+    super({
+      http: axios,
+      promise: Promise,
+      merge,
+      config: options,
+    });
   }
 }

packages/api-axios/src/logs.js

@@ -1,5 +1,11 @@
 import axios from 'axios';
-
+import utils from 'axios/lib/utils';
 import { AvLogMessages } from '@availity/api-core';
 
-export default new AvLogMessages(axios, Promise);
+const { merge } = utils;
+
+export default new AvLogMessages({
+  http: axios,
+  promise: Promise,
+  merge,
+});

packages/api-axios/src/navigation.js

@@ -1,4 +1,10 @@
 import axios from 'axios';
+import utils from 'axios/lib/utils';
 import { AvNavigation } from '@availity/api-core';
 
-export default new AvNavigation(axios, Promise);
+const { merge } = utils;
+export default new AvNavigation({
+  http: axios,
+  promise: Promise,
+  merge,
+});

packages/api-axios/src/notification.js

@@ -1,10 +1,16 @@
 import axios from 'axios';
-
+import utils from 'axios/lib/utils';
 import { AvNotification } from '@availity/api-core';
 
+const { merge } = utils;
 class AvNotificationApi extends AvNotification {
   constructor(options) {
-    super(axios, Promise, options);
+    super({
+      http: axios,
+      promise: Promise,
+      merge,
+      config: options,
+    });
   }
 }
 

packages/api-axios/src/organizations.js

@@ -1,6 +1,12 @@
 import axios from 'axios';
-
+import utils from 'axios/lib/utils';
 import { AvOrganizations } from '@availity/api-core';
 import avUserApi from './user';
 
-export default new AvOrganizations(axios, Promise, avUserApi);
+const { merge } = utils;
+export default new AvOrganizations({
+  http: axios,
+  promise: Promise,
+  merge,
+  avUsers: avUserApi,
+});

packages/api-axios/src/pdf.js

@@ -1,4 +1,10 @@
 import axios from 'axios';
+import utils from 'axios/lib/utils';
 import { AvPdf } from '@availity/api-core';
 
-export default new AvPdf(axios, Promise);
+const { merge } = utils;
+export default new AvPdf({
+  http: axios,
+  promise: Promise,
+  merge,
+});

packages/api-axios/src/permissions.js

@@ -1,4 +1,10 @@
 import axios from 'axios';
+import utils from 'axios/lib/utils';
 import { AvPermissions } from '@availity/api-core';
 
-export default new AvPermissions(axios, Promise);
+const { merge } = utils;
+export default new AvPermissions({
+  http: axios,
+  promise: Promise,
+  merge,
+});

packages/api-axios/src/providers.js

@@ -1,5 +1,10 @@
 import axios from 'axios';
-
+import utils from 'axios/lib/utils';
 import { AvProviders } from '@availity/api-core';
 
-export default new AvProviders(axios, Promise);
+const { merge } = utils;
+export default new AvProviders({
+  http: axios,
+  promise: Promise,
+  merge,
+});

packages/api-axios/src/proxy.js

@@ -1,9 +1,15 @@
 import axios from 'axios';
-
+import utils from 'axios/lib/utils';
 import { AvProxy } from '@availity/api-core';
 
+const { merge } = utils;
 export default class AvProxyApi extends AvProxy {
   constructor(options) {
-    super(axios, Promise, options);
+    super({
+      http: axios,
+      promise: Promise,
+      merge,
+      config: options,
+    });
   }
 }

packages/api-axios/src/regions.js

@@ -1,5 +1,12 @@
 import axios from 'axios';
+import utils from 'axios/lib/utils';
 import { AvRegions } from '@availity/api-core';
 import userApi from './user';
 
-export default new AvRegions(axios, Promise, userApi);
+const { merge } = utils;
+export default new AvRegions({
+  http: axios,
+  promise: Promise,
+  merge,
+  avUsers: userApi,
+});

packages/api-axios/src/spaces.js

@@ -1,4 +1,10 @@
 import axios from 'axios';
+import utils from 'axios/lib/utils';
 import { AvSpaces } from '@availity/api-core';
 
-export default new AvSpaces(axios, Promise);
+const { merge } = utils;
+export default new AvSpaces({
+  http: axios,
+  promise: Promise,
+  merge,
+});

packages/api-axios/src/user.js

@@ -1,4 +1,10 @@
 import axios from 'axios';
+import utils from 'axios/lib/utils';
 import { AvUsers } from '@availity/api-core';
 
-export default new AvUsers(axios, Promise);
+const { merge } = utils;
+export default new AvUsers({
+  http: axios,
+  promise: Promise,
+  merge,
+});

packages/api-axios/src/userPermissions.js

@@ -1,4 +1,10 @@
 import axios from 'axios';
+import utils from 'axios/lib/utils';
 import { AvUserPermissions } from '@availity/api-core';
 
-export default new AvUserPermissions(axios, Promise);
+const { merge } = utils;
+export default new AvUserPermissions({
+  http: axios,
+  promise: Promise,
+  merge,
+});