feat(generate-proxy): update Proxy typing

roggervalf · Oct 17, 2021 · 326c432 · 326c432
1 parent 9ac995b
commit 326c432
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 29 deletions.
diff --git a/dist/main.d.ts b/dist/main.d.ts
@@ -118,11 +118,11 @@ declare type ResourceBasedType = StatementInterface & (OptionalPrincipalBlock |
 interface ProxyOptions {
     get?: {
         allow?: boolean;
-        propertyMap?: Record<PropertyKey, PropertyKey>;
+        propertyMap?: Record<string, string>;
     };
     set?: {
         allow?: boolean;
-        propertyMap?: Record<PropertyKey, PropertyKey>;
+        propertyMap?: Record<string, string>;
     };
 }
 

diff --git a/dist/main.es.js b/dist/main.es.js
diff --git a/dist/main.es.js.map b/dist/main.es.js.map
diff --git a/dist/main.js b/dist/main.js
diff --git a/dist/main.js.map b/dist/main.js.map
diff --git a/src/ActionBasedPolicy.test.ts b/src/ActionBasedPolicy.test.ts
@@ -445,7 +445,7 @@ describe('ActionBasedPolicy Class', () => {
           'Unauthorize to get firstName property'
         );
         const expectedError2 = new Error(
-          'Unauthorize to set Symbol(id) property'
+          "'set' on proxy: trap returned falsish for property 'Symbol(id)'"
         );
         const expectedError3 = new Error(
           'Unauthorize to get otherValue property'
@@ -454,6 +454,7 @@ describe('ActionBasedPolicy Class', () => {
         expect(proxy.lastName).toBe('Wick');
         expect(() => proxy.firstName).toThrow(expectedError);
         expect(() => (proxy[sym] = 2)).toThrow(expectedError2);
+        expect(proxy[sym]).toBe(1);
         expect(() => proxy.otherValue).toThrow(expectedError3);
       });
     });

diff --git a/src/ActionBasedPolicy.ts b/src/ActionBasedPolicy.ts
@@ -102,10 +102,14 @@ export class ActionBasedPolicy<T extends object> extends Policy<
               const property = Reflect.has(propertyMapGet, prop)
                 ? Reflect.get(propertyMapGet, prop)
                 : prop;
-              if (this.evaluate({ action: property })) {
-                return Reflect.get(target, 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 {
-                throw new Error(`Unauthorize to get ${String(prop)} property`);
+                return Reflect.get(target, prop);
               }
             }
           }
@@ -116,10 +120,14 @@ export class ActionBasedPolicy<T extends object> extends Policy<
               const property = Reflect.has(propertyMapSet, prop)
                 ? Reflect.get(propertyMapSet, prop)
                 : prop;
-              if (this.evaluate({ action: property })) {
-                return Reflect.set(target, prop, value);
+              if (typeof prop === 'string') {
+                if (this.evaluate({ action: property })) {
+                  return Reflect.set(target, prop, value);
+                } else {
+                  throw new Error(`Unauthorize to set ${prop} property`);
+                }
               } else {
-                throw new Error(`Unauthorize to set ${String(prop)} property`);
+                return false;
               }
             }
           }

diff --git a/src/types.ts b/src/types.ts
@@ -130,11 +130,11 @@ type ResourceBasedType = StatementInterface &
 interface ProxyOptions {
   get?: {
     allow?: boolean;
-    propertyMap?: Record<PropertyKey, PropertyKey>;
+    propertyMap?: Record<string, string>;
   };
   set?: {
     allow?: boolean;
-    propertyMap?: Record<PropertyKey, PropertyKey>;
+    propertyMap?: Record<string, string>;
   };
 }