v1.0.1 - Invoke function calls with correct context

Author: devMYC

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfobj",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "./index.js",
   "description": "JS proxy for safe property access.",
   "repository": "https://github.com/devMYC/sfobj.git",
@@ -10,7 +10,7 @@
     "node": ">= 6.0"
   },
   "scripts": {
-    "build": "rm -fr ./dist && tsc",
+    "build": "rm -fr ./dist && tsc && cp ./package.json ./dist",
     "codecov": "codecov -f ./coverage/coverage-final.json",
     "show:coverage": "open ./coverage/lcov-report/index.html",
     "test": "jest --runInBand"

src/index.ts

@@ -15,20 +15,26 @@ type SafeProxy<T> = {
 export function Safe<T>(v: T): SafeProxy<T> {
   let curr = v
   const proxy: any = new Proxy(NeverFail, {
-    apply() {
+    apply(_, __, args) {
+      typeof curr === 'function' && (curr = curr(...args))
       return proxy
     },
     get(_, prop) {
+      let val: any
       switch (true) {
       case prop === unwrap:
-        const val = curr
+        val = curr
         curr = v
         return val
       case prop === Symbol.toPrimitive: return () => Safe.name
       case curr == null: break
       default:
-        curr = (curr as any)[prop]
-        typeof curr === 'function' && (curr = curr())
+        val = (curr as any)[prop]
+        if (typeof val === 'function') {
+          curr = val.bind(curr)
+        } else {
+          curr = val
+        }
         break
       }
       return proxy

tests/index.spec.ts

@@ -4,13 +4,20 @@ test(Safe.name, () => {
   const obj = {
     a: 100,
     b: {
+      x: 200,
       c: [
         { d: 1e3 },
         { e: () => 1e4 },
       ],
+      add(y) {
+        return this.x + y
+      },
     },
     f: null,
     g: undefined,
+    add(x: number) {
+      return this.a + x
+    },
   }
 
   const safeObj = Safe(obj)
@@ -21,5 +28,7 @@ test(Safe.name, () => {
   expect((safeObj.g as SafeWrapper<undefined>)[unwrap]).toBe(undefined)
   expect(safeObj.b.c[0].d[unwrap]).toBe(1e3)
   expect(safeObj.b.c[1].e()[unwrap]).toBe(1e4)
+  expect(safeObj.add(1)[unwrap]).toBe(101)
+  expect(safeObj.b.add(2)[unwrap]).toBe(202)
   expect((safeObj.b.c[100] as any).xx().yy.zz().or[1].whatever['key'][unwrap]).toBe(undefined)
 })