feat(generate-proxy): update Proxy types (#58)

.prettierrc.js

@@ -6,6 +6,5 @@ module.exports = {
   printWidth: 80,
   semi: true,
   bracketSpacing: true,
-  jsxBracketSameLine: false,
   endOfLine: 'lf'
 };

dist/main.d.ts

@@ -216,7 +216,7 @@ declare class ActionBasedPolicy<T extends object> extends Policy<T, ActionBasedT
     evaluate(this: ActionBasedPolicy<T>, { action, context }: EvaluateActionBasedInterface<T>): boolean;
     can(this: ActionBasedPolicy<T>, { action, context }: EvaluateActionBasedInterface<T>): boolean;
     cannot(this: ActionBasedPolicy<T>, { action, context }: EvaluateActionBasedInterface<T>): boolean;
-    generateProxy<U extends object, W extends keyof U>(this: ActionBasedPolicy<T>, obj: U, options?: ProxyOptions): U;
+    generateProxy<U extends object>(this: ActionBasedPolicy<T>, obj: U, options?: ProxyOptions): U;
 }
 
 interface IdentityBasedPolicyInterface<T extends object> {

package.json

@@ -62,9 +62,9 @@
     "@babel/core": "7.7.2",
     "@babel/preset-env": "7.7.1",
     "@babel/preset-typescript": "7.7.2",
-    "@commitlint/cli": "11.0.0",
-    "@commitlint/config-conventional": "11.0.0",
-    "@commitlint/travis-cli": "11.0.0",
+    "@commitlint/cli": "8.3.5",
+    "@commitlint/config-conventional": "8.3.4",
+    "@commitlint/travis-cli": "10.0.0",
     "@rollup/plugin-babel": "5.0.0",
     "@rollup/plugin-commonjs": "16.0.0",
     "@rollup/plugin-node-resolve": "10.0.0",
@@ -87,15 +87,15 @@
     "lint-staged": "10.5.4",
     "markdownlint": "0.18.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.1.2",
-    "pretty-quick": "3.1.0",
+    "prettier": "2.4.1",
+    "pretty-quick": "3.1.1",
     "rimraf": "3.0.0",
     "rollup": "2.33.3",
     "rollup-plugin-dts": "1.4.13",
     "rollup-plugin-peer-deps-external": "2.2.4",
     "rollup-plugin-typescript2": "0.25.3",
     "semantic-release": "17.3.9",
-    "tslib": "1.10.0",
+    "tslib": "1.14.1",
     "typescript": "4.0.3"
   },
   "files": [

src/ActionBasedPolicy.test.ts

@@ -434,7 +434,7 @@ describe('ActionBasedPolicy Class', () => {
             }
           ]
         });
-        const sym: string = (Symbol('id') as unknown) as string;
+        const sym: string = Symbol('id') as unknown as string;
         const user = {
           firstName: 'John',
           lastName: 'Wick',
@@ -444,12 +444,18 @@ describe('ActionBasedPolicy Class', () => {
         const expectedError = new Error(
           'Unauthorize to get firstName property'
         );
+        const expectedError2 = new Error(
+          "'set' on proxy: trap returned falsish for property 'Symbol(id)'"
+        );
+        const expectedError3 = new Error(
+          'Unauthorize to get otherValue property'
+        );
 
         expect(proxy.lastName).toBe('Wick');
-        expect(() => (proxy[sym] = 2)).not.toThrow();
-        expect(proxy[sym]).toBe(1);
-        expect(proxy.otherValue).toBe(undefined);
         expect(() => proxy.firstName).toThrow(expectedError);
+        expect(() => (proxy[sym] = 2)).toThrow(expectedError2);
+        expect(proxy[sym]).toBe(1);
+        expect(() => proxy.otherValue).toThrow(expectedError3);
       });
     });
 

src/ActionBasedPolicy.ts

@@ -87,7 +87,7 @@ export class ActionBasedPolicy<T extends object> extends Policy<
     );
   }
 
-  generateProxy<U extends object, W extends keyof U>(
+  generateProxy<U extends object>(
     this: ActionBasedPolicy<T>,
     obj: U,
     options: ProxyOptions = {}
@@ -98,29 +98,37 @@ export class ActionBasedPolicy<T extends object> extends Policy<
     const handler = {
       ...(allowGet
         ? {
-            get: (target: U, prop: W): any => {
-              if (prop in target) {
-                if (typeof prop === 'string') {
-                  const property = propertyMapGet[prop] || prop;
-                  if (this.evaluate({ action: property })) return target[prop];
+            get: (target: U, prop: string | symbol): any => {
+              const property = Reflect.has(propertyMapGet, prop)
+                ? Reflect.get(propertyMapGet, prop)
+                : prop;
+              if (typeof prop === 'string') {
+                if (this.evaluate({ action: property })) {
+                  return Reflect.get(target, prop);
+                } else {
                   throw new Error(`Unauthorize to get ${prop} property`);
                 }
+              } else {
+                return Reflect.get(target, prop);
               }
-              return target[prop];
             }
           }
         : {}),
       ...(allowSet
         ? {
-            set: (target: U, prop: W, value: any): boolean => {
+            set: (target: U, prop: string | symbol, value: any): boolean => {
+              const property = Reflect.has(propertyMapSet, prop)
+                ? Reflect.get(propertyMapSet, prop)
+                : prop;
               if (typeof prop === 'string') {
-                const property = propertyMapSet[prop] || prop;
                 if (this.evaluate({ action: property })) {
-                  target[prop] = value;
-                  return true;
-                } else throw new Error(`Unauthorize to set ${prop} property`);
+                  return Reflect.set(target, prop, value);
+                } else {
+                  throw new Error(`Unauthorize to set ${prop} property`);
+                }
+              } else {
+                return false;
               }
-              return true;
             }
           }
         : {})

src/types.ts

@@ -71,7 +71,7 @@ export interface MatchConditionInterface<T extends object> {
 }
 
 export interface MatchConditionResolverInterface<T extends object> {
-  context: T
+  context: T;
   conditionResolver?: ConditionResolver;
   path: string;
   condition: string;