fix(baseget): validate value as object instead of null

allow to evaluate non-existed paths for more than 1 step

.eslintrc.json

@@ -42,6 +42,9 @@
       }
     ],
     "@typescript-eslint/no-explicit-any": "off",
+
+    // "@typescript-eslint/ban-ts-ignore": "off",
+
     "no-console": "off",
 
     "no-param-reassign": [

README.md

@@ -61,12 +61,12 @@ const contextForAllowExample = { user: { id: 456 } };
 
 allowExample.evaluate({
   action: 'read',
-  resource: 'secrets:456:ultrasecret',
+  resource: 'secrets:456:ultraSecret',
   context: contextForAllowExample
 }); // true
 allowExample.evaluate({
   action: 'create',
-  resource: 'secrets:456:ultrasecret',
+  resource: 'secrets:456:ultraSecret',
   context: contextForAllowExample
 }); // false
 allowExample.evaluate({

example/index.js

@@ -20,15 +20,15 @@ const contextForAllowExample = { user: { id: 456 } };
 console.log(
   allowExample.evaluate({
     action: 'read',
-    resource: 'secrets:456:ultrasecret',
+    resource: 'secrets:456:ultraSecret',
     context: contextForAllowExample
   })
 );
 // false
 console.log(
   allowExample.evaluate({
     action: 'create',
-    resource: 'secrets:456:ultrasecret',
+    resource: 'secrets:456:ultraSecret',
     context: contextForAllowExample
   })
 );

src/Matcher.ts

@@ -81,7 +81,7 @@ export class Matcher {
       ? this.expand(balance.post, false)
       : [''];
 
-    parts.forEach(part => {
+    parts.forEach((part: string) => {
       postParts.forEach(postPart => {
         const expansion = pre + part + postPart;
         if (!isTop || expansion) expansions.push(expansion);

src/Policies.ts

@@ -1,4 +1,3 @@
-//import { Statement, StatementInterface, ConditionResolver } from './Statement';
 import {
   IdentityBasedType,
   ResourceBasedType,

src/Statement.test.ts

@@ -17,16 +17,26 @@ describe('Statement Class', () => {
       expect(applyContext('secrets:${user.bestFriends}:account', context)).toBe(
         'secrets:{123,532,987}:account'
       );
+
+      expect(
+        applyContext(
+          'secrets:${user.id}:bestFriends:${user.bestFriends}',
+          context
+        )
+      ).toBe('secrets:456:bestFriends:{123,532,987}');
     });
 
-    it('can match undefined path', () => {
+    it('can match non-existed path', () => {
       const context = {
         user: { id: 456, bestFriends: [123, 987] }
       };
 
       expect(applyContext('secrets:${}:account', context)).toBe(
         'secrets:undefined:account'
       );
+      expect(applyContext('secrets:${company.address}:account', context)).toBe(
+        'secrets:undefined:account'
+      );
     });
   });
 

src/Statement.ts

@@ -2,13 +2,12 @@ import {
   EffectBlock,
   ConditionBlock,
   StatementInterface,
-  // ConditionKey,
   Context,
   MatchConditionInterface
 } from './types';
 import { getValueFromPath } from './utils/getValueFromPath';
 
-const reDelimiters = /\${([^}])*}/g;
+const reDelimiters = /\${([^}]*)}/g;
 const trim = / +(?= )|^\s+|\s+$/g;
 
 const specialTrim = (str: string): string => str.replace(trim, '');
@@ -17,13 +16,12 @@ export function applyContext(str: string, context?: Context): string {
   if (!context) return str;
 
   return specialTrim(
-    str.replace(reDelimiters, match => {
-      const path = match.substr(2, match.length - 3);
-      let value = getValueFromPath(context, path);
-      if (Array.isArray(value)) value = `{${value}}`;
-      if (value instanceof Object) value = undefined;
+    str.replace(reDelimiters, (_, path: string) => {
+      const value = getValueFromPath(context, path);
+      if (Array.isArray(value)) return `{${value}}`;
+      if (value instanceof Object) return String(undefined);
 
-      return match ? String(value) : '';
+      return String(value);
     })
   );
 }

src/utils/decomposeString.ts

@@ -4,6 +4,7 @@ import { DecomposeString } from '../types';
  * Get index range where separators are found.
  *
  * @private
+ * @since 3.1.1
  * @param {string} initialSeparator First string to be found.
  * @param {string} finalSeparator Second string to be found.
  * @param {string} str String to be decomposed.
@@ -47,6 +48,7 @@ function getIndexRange(
  * Decompose string in pre, body and post strings by using separators.
  *
  * @private
+ * @since 3.1.1
  * @param {string} initialSeparator First string to be found.
  * @param {string} finalSeparator Second string to be found.
  * @param {string} str String to be decomposed.

src/utils/getValueFromPath.test.ts

@@ -42,6 +42,7 @@ describe('getValueFromPath', () => {
         };
         expect(getValueFromPath(context, 'user.id.pets')).toBe(undefined);
         expect(getValueFromPath(context, 'company')).toBe(undefined);
+        expect(getValueFromPath(context, 'company.address')).toBe(undefined);
       });
     });
 

src/utils/getValueFromPath.ts

@@ -33,7 +33,7 @@ export function baseGet<T>(object: object, path: Array<T> | string): any {
   const length = newPath.length;
 
   let value: any = object;
-  while (value !== null && index < length) {
+  while (value instanceof Object && index < length) {
     value = value[toKey(newPath[index++])];
   }
 

src/utils/isKey.ts

@@ -2,7 +2,7 @@ import { isSymbol } from './isSymbol';
 
 /** Used to match property names within property paths. */
 const reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/;
-const reIsPlainProp = /^\w*$/; //maches any word caracter (alphanumeric and underscore)
+const reIsPlainProp = /^\w*$/; //matches any word caracter (alphanumeric and underscore)
 
 /**
  * Checks if `value` is a property name and not a property path.

translations/README.zh-CN.md

@@ -60,12 +60,12 @@ const contextForAllowExample = { user: { id: 456 } };
 
 allowExample.evaluate({
   action: 'read',
-  resource: 'secrets:456:ultrasecret',
+  resource: 'secrets:456:ultraSecret',
   context: contextForAllowExample
 }); // true
 allowExample.evaluate({
   action: 'create',
-  resource: 'secrets:456:ultrasecret',
+  resource: 'secrets:456:ultraSecret',
   context: contextForAllowExample
 }); // false
 allowExample.evaluate({