+version and truly on demand

willguitaradmfar · Oct 14, 2018 · 56c7272 · 56c7272
1 parent 1c8e7e0
commit 56c7272
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cdi-node",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "",
   "main": "src/index.js",
   "index": "src/index.js",

diff --git a/src/index.js b/src/index.js
@@ -42,20 +42,24 @@ module.exports = class CDI {
 
             if (arg && arg.constructor !== {}.constructor) throw new Error(`only 1 argument of object type is allowed`)
 
-            const resolveInterceptor = {}
-            for (let _var in arg) {
-              if (this.interceptorsVariable && this.interceptorsVariable[_var]) {
-                resolveInterceptor[_var] = await this.interceptorsVariable[_var](prop, arg)
-              } else {
-                resolveInterceptor[_var] = arg[_var]
+            const resolveInterceptor = new Proxy({
+              ...arg,
+              ...this.interceptorsVariable
+            }, {
+              get: (_obj, _prop) => {
+                if (!_obj[_prop]) return
+
+                if (typeof _obj[_prop] === 'function') return this.interceptorsVariable[_prop](prop, arg)
+
+                return _obj[_prop]
               }
-            }
+            })
+            // for (let _var in this.interceptorsVariable) {
+            //   resolveInterceptor[_var] = await this.interceptorsVariable[_var](prop, arg)
+            // }
 
             try {
-              const response = await obj[prop].call(ctx, {
-                ...arg,
-                ...resolveInterceptor
-              })
+              const response = await obj[prop].call(ctx, resolveInterceptor)
 
               if (this.interceptorDone) {
                 return this.interceptorDone(response, prop, arg)

diff --git a/test/catchs/inject-catchs-var-with-intercept.test.js b/test/catchs/inject-catchs-var-with-intercept.test.js
@@ -30,7 +30,7 @@ describe('Catchs inject variable with intercept', function () {
   before(function () {
     this.target = new Controller()
 
-    this.target.fn = async ({ _var1 }) => {
+    this.target.fn = async () => {
       throw new Error(`capture error catch interceptor`)
     }
   })

diff --git a/test/class/inject-class-var-with-intercept.test.js b/test/class/inject-class-var-with-intercept.test.js
@@ -6,7 +6,7 @@ class Controller {
     const cdi = new CDI()
 
     cdi.addInterceptorVariable('_var1', async (fnName, args) => {
-      return args._var1 ? args._var1 + '_interceptor' : '_interceptor'
+      return args && args._var1 ? args._var1 + '_interceptor' : '_interceptor'
     })
 
     cdi.addInterceptorVariable('_notexitst', async (fnName, args) => {
@@ -35,6 +35,6 @@ describe('Class inject variable with intercept', function () {
   })
 
   it('should pass _var1 undefined and response with interceptor', async function () {
-    expect.isUndefined(await this.target.fn())
+    expect.equal(await this.target.fn(), '_interceptor')
   })
 })
diff --git a/test/simples/inject-simple-var-with-intercept.test.js b/test/simples/inject-simple-var-with-intercept.test.js
@@ -6,7 +6,7 @@ describe('Simples inject variable with intercept', function () {
     this.cdiClass = new CDI()
 
     this.cdiClass.addInterceptorVariable('_var1', async (fnName, args) => {
-      return args._var1 ? args._var1 + '_interceptor' : '_interceptor'
+      return args && args._var1 ? args._var1 + '_interceptor' : '_interceptor'
     })
 
     this.target = this.cdiClass.configure({})
@@ -23,6 +23,6 @@ describe('Simples inject variable with intercept', function () {
   })
 
   it('should pass _var1 undefined and response with interceptor', async function () {
-    expect.isUndefined(await this.target.fn())
+    expect.equal(await this.target.fn(), '_interceptor')
   })
 })
diff --git a/test/with-error/inject-with-error-var-with-intercept.test.js b/test/with-error/inject-with-error-var-with-intercept.test.js
@@ -22,11 +22,12 @@ describe('throw error normal and Interceptor', function () {
   })
 
   it('should pass _var1 undefined and response with interceptor', async function () {
-    this.cdiClass.addInterceptorVariable('_var1', async (fnName, args) => {
+    this.cdiClass.addInterceptorVariable('_var1', (fnName, args) => {
       throw new Error(`error from interceptor`)
     })
     try {
-      await this.target.fn({ _var1: 'test222' })
+      await this.target.fn()
+      throw new Error()
     } catch (err) {
       expect.equal(err.message, 'error from interceptor')
     }