Merge pull request #19 from bmartel/master

allow axios instance to be provided to plugin

Author: KaniRobinson

.babelrc

@@ -3,6 +3,6 @@
     "@babel/preset-env"
   ],
   "plugins": [
-    "@babel/transform-runtime"
+    "@babel/plugin-transform-runtime"
   ]
-}
+}

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "@vuex-orm/plugin-axios",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Vuex-ORM Plugin to sync the data against a RESTful API.",
   "main": "dist/index.js",
   "scripts": {
@@ -29,20 +29,18 @@
     }
   },
   "dependencies": {
-    "@vuex-orm/core": "^0.30.0",
+    "@vuex-orm/core": "^0.31.6",
     "axios": "^0.18.0",
     "lodash": "^4.17.11"
   },
   "devDependencies": {
-    "@babel/core": "^7.1.6",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/runtime": "^7.3.1",
     "babel-core": "7.0.0-bridge.0",
-    "@babel/runtime": "^7.1.5",
-    "@babel/plugin-transform-runtime": "^7.1.0",
-    "@babel/preset-env": "^7.1.6",
-    "babel-jest": "^23.6.0",
-    "babel-loader": "^8.0.4",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.7.0",
+    "babel-jest": "^23.4.2",
+    "babel-loader": "^8.0.0",
     "eslint": "^5.4.0",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-plugin-import": "^2.14.0",

package.json

@@ -1,4 +1,7 @@
-import _ from 'lodash';
+import forEach from 'lodash/forEach';
+import has from 'lodash/has';
+import map from 'lodash/map';
+import merge from 'lodash/merge';
 import Context from '../common/context';
 import { ModuleConfig, ModelConfig } from '../support/interfaces';
 
@@ -8,7 +11,7 @@ export default class Action {
    * @param {object} model
    */
   static transformModule(module) {
-    return _.merge({}, ModuleConfig, module);
+    return merge({}, ModuleConfig, module);
   }
 
   /**
@@ -17,22 +20,22 @@ export default class Action {
    */
   static transformModel(model) {
     const context = Context.getInstance();
-    ModelConfig.http = _.merge({}, ModelConfig.http, context.options.http);
-    model.methodConf = _.merge({}, ModelConfig, model.methodConf);
+    ModelConfig.http = merge({}, ModelConfig.http, context.options.http);
+    model.methodConf = merge({}, ModelConfig, model.methodConf);
     model.methodConf.http.url = (model.methodConf.http.url === '/') ? `/${model.entity}` : model.methodConf.http.url;
 
     /**
      * Add Model Interface to each model
      */
     model.getFields = () => {
       if (!model.cachedFields) {
-        model.cachedFields = _.merge({}, {
+        model.cachedFields = merge({}, {
           $id: model.attr(undefined),
           $isUpdating: model.boolean(false),
           $updateErrors: model.attr([]),
           $isDeleting: model.boolean(false),
           $deleteErrors: model.attr([]),
-        }, model.fields())
+        }, model.fields());
       }
 
       return model.cachedFields;
@@ -47,14 +50,14 @@ export default class Action {
    * @param {object} model
    * @param {object} config
    */
-  static transformParams (type, model, config = {}) {
+  static transformParams(type, model, config = {}) {
     let endpoint = `${model.methodConf.http.url}${model.methodConf.methods[type].http.url}`;
-    let params = _.map(endpoint.match(/(\/?)(\:)([A-z]*)/gm), (param) => { return param.replace('/', '') })
+    const params = map(endpoint.match(/(\/?)(\:)([A-z]*)/gm), param => param.replace('/', ''));
 
-    _.forEach(params, (param) => {
-      const paramValue = _.has(config.params, param.replace(':', '')) ? config.params[param.replace(':', '')] : ''
-      endpoint = endpoint.replace(param, paramValue).replace('//', '/')
-    })
+    forEach(params, (param) => {
+      const paramValue = has(config.params, param.replace(':', '')) ? config.params[param.replace(':', '')] : '';
+      endpoint = endpoint.replace(param, paramValue).replace('//', '/');
+    });
     if (config.query) endpoint += `?${Object.keys(config.query).map(k => `${encodeURIComponent(k)}=${encodeURIComponent(config.query[k])}`).join('&')}`;
     return endpoint;
   }

src/actions/Action.js

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import merge from 'lodash/merge';
 import Axios from '../orm/axios';
 import Action from './Action'
 import Context from '../common/context'
@@ -53,7 +53,7 @@ export default class Update extends Action {
   static onSuccess(model, params, data) {
     model.update({
       where: params.params.id || data.id,
-      data: _.merge({}, data, {
+      data: merge({}, data, {
         $isUpdating: false,
         $updateErrors: []
       })

src/actions/Update.js

@@ -1,4 +1,5 @@
-import _ from 'lodash';
+import merge from 'lodash/merge'
+import find from 'lodash/find'
 import { VuexOrmPluginConfig } from '../support/interfaces';
 
 export default class Context {
@@ -11,7 +12,7 @@ export default class Context {
    */
   constructor(components, options) {
     this.components = components;
-    this.options = _.merge({}, VuexOrmPluginConfig, options);
+    this.options = merge({}, VuexOrmPluginConfig, options);
     this.database = options.database;
 
     if (!options.database) {
@@ -43,7 +44,7 @@ export default class Context {
    * @param {object} state
    */
   getModelFromState(state) {
-    return _.find(this.database.entities, {
+    return find(this.database.entities, {
       name: state.$name
     }).model;
   }

src/common/context.js

@@ -2,20 +2,21 @@ import axios from 'axios';
 
 export default class Axios {
   constructor(http) {
-    this.instance = axios.create(http);
+    this.instance = http.axios || axios.create(http);
     this.setAuthentication(http.access_token);
 
     this.instance.interceptors.response.use(
-      response => http.onResponse(response),
-      error => http.onError(error),
+      response => http.onResponse(response, this.instance),
+      error => http.onError(error, this.instance),
     );
 
     return this.instance;
   }
 
   setAuthentication(token) {
     if (!token) return;
-    const isFunction = typeof token === "function";
+    const isFunction = typeof token 
+    "function";
     const tokenStr = isFunction ? token() : token;
 
     this.instance.defaults.headers.common['Authorization'] = `Bearer ${tokenStr}`;

src/orm/axios.js

@@ -1,6 +1,12 @@
 import { Database } from '@vuex-orm/core';
 
 export const AxiosRequestConfig = {
+  /**
+   * Default create new axios instance, provide
+   * option to pass an existing instance through.
+   */
+  axios: undefined,
+
   /**
    * Default Base URL
    */

src/support/interfaces.js

@@ -1,3 +1,4 @@
+import map from 'lodash/map';
 import Context from './common/context';
 import Action from './actions/Action'
 import Fetch from './actions/Fetch'
@@ -41,7 +42,7 @@ export default class VuexOrmAxios {
     /**
      * Transform Model and Modules
      */
-    _.map(context.database.entities, entity => {
+    map(context.database.entities, entity => {
       entity.module = Action.transformModule(entity.module);
       entity.model = Action.transformModel(entity.model);
       return entity;