Fixed a bug with wrong context of the request method;

Deeply refactored;

Author: DigitalBrainJS

Diff for: CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 For changes before version 0.1.6, please see the commit history
 
+## [0.1.9] - 2020-12-13
+
+### Fixed
+- a bug with wrong context of the `request` method;
+
+### Updated
+- deeply refactored;
+
 ## [0.1.8] - 2020-12-07
 
 ### Updated

Diff for: lib/index.js

@@ -1,44 +1,30 @@
-const axios= require('axios');
-const utils = require('axios/lib/utils');
-const bind = require('axios/lib/helpers/bind');
 const mergeConfig = require('axios/lib/core/mergeConfig');
 const defaults = require('axios/lib/defaults');
 const CPAxios = require('./core/CPAxios');
+const {proxyContext}= require('./utils');
 const CPromise= require('c-promise2');
 
 function createInstance(defaultConfig) {
     const context = new CPAxios(defaultConfig);
-    const instance = bind(CPAxios.prototype.request, context);
 
-    utils.extend(instance, axios.Axios.prototype, context);
+    const instance = CPAxios.prototype.request.bind(context);
 
-    utils.extend(instance, context);
-
-    return instance;
+    return proxyContext(instance, context);
 }
 
-const _axios = createInstance(defaults);
-
-_axios.Axios = CPAxios;
+const cpAxios = createInstance(defaults);
 
-(()=>{
-    const props= Object.getOwnPropertyNames(axios);
-    props.forEach(prop=>{
-       if(!Object.prototype.hasOwnProperty.call(_axios, prop)){
-           _axios[prop]= axios[prop];
-       }
-    });
-})();
+cpAxios.Axios = CPAxios;
 
-_axios.create = function create(instanceConfig) {
-    return createInstance(mergeConfig(_axios.defaults, instanceConfig));
+cpAxios.create = function create(instanceConfig) {
+    return createInstance(mergeConfig(cpAxios.defaults, instanceConfig));
 };
 
-_axios.all = function all(promises) {
+cpAxios.all = function all(promises) {
     return CPromise.all(promises);
 };
 
-module.exports = _axios;
+module.exports = cpAxios;
 
-module.exports.default = _axios;
+module.exports.default = cpAxios;
 

Diff for: lib/utils.js

@@ -0,0 +1,44 @@
+function collectProps(obj){
+    const propMap= {};
+    do {
+        Object.getOwnPropertyNames(obj).forEach(prop=>{
+            !propMap[prop] && (propMap[prop]= true);
+        })
+    } while ((obj = Object.getPrototypeOf(obj)) && obj !== Object);
+    return Object.getOwnPropertyNames(propMap);
+}
+
+function proxyContext(obj, context){
+    const descriptors= {};
+    collectProps(context).forEach(prop=>{
+        const value= context[prop];
+
+        if(typeof value==='function'){
+            descriptors[prop]= {
+                value: value.bind(context),
+                enumerable: true,
+                writable: false
+            }
+            return;
+        }
+
+        descriptors[prop]= {
+            get(){
+                return context[prop];
+            },
+
+            set(v){
+                return context[prop]= v;
+            },
+
+            enumerable: true
+        }
+    })
+    Object.defineProperties(obj, descriptors);
+    return obj;
+}
+
+module.exports= {
+    collectProps,
+    proxyContext
+}