fix(getvaluefrompath): return ConditionKey type values

Can also return undefined in case doesn't exist the path fix #14
roggervalf · Mar 20, 2020 · febbcb7 · febbcb7
1 parent 61d7544
commit febbcb7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/Statement.ts b/src/Statement.ts
@@ -2,14 +2,15 @@ import {
   EffectBlock,
   ConditionBlock,
   StatementInterface,
+  ConditionKey,
   Context,
   MatchConditionInterface,
 } from './types';
 
 const reDelimiters = /\${([^}])*}/g;
 const trim = / +(?= )|^\s+|\s+$/g;
 
-export function getValueFromPath(data: any, path: string): string {
+export function getValueFromPath(data: any, path: string): ConditionKey {
   let value = data;
   path.split('.').forEach(step => {
     if (value) value = value[step];
@@ -18,7 +19,7 @@ export function getValueFromPath(data: any, path: string): string {
   if (Array.isArray(value)) return `{${value}}`;
   if (value instanceof Object) return 'undefined';
 
-  return `${value}`;
+  return value;
 }
 
 const specialTrim = (str: string): string => str.replace(trim, '');

diff --git a/tests/Statement.ts b/tests/Statement.ts
@@ -7,15 +7,15 @@ export default (): void => {
           user: { id: 456, bestfriends: [123, 532] },
         };
         expect(getValueFromPath(context, 'user.bestfriends')).toBe('{123,532}');
-        expect(getValueFromPath(context, 'user.id')).toBe('456');
+        expect(getValueFromPath(context, 'user.id')).toBe(456);
       });
 
       it('get undefined from non existed path', () => {
         const context = {
           user: { id: 456, bestfriends: [123] },
         };
-        expect(getValueFromPath(context, 'user.id.pets')).toBe('undefined');
-        expect(getValueFromPath(context, 'company')).toBe('undefined');
+        expect(getValueFromPath(context, 'user.id.pets')).toBe(undefined);
+        expect(getValueFromPath(context, 'company')).toBe(undefined);
         expect(getValueFromPath(context, 'user')).toBe('undefined');
       });
     });
@@ -66,13 +66,16 @@ export default (): void => {
         };
         const secondStatementConfig = {
           condition: {
-            greatherThan: { 'user.age': [30, 40] },
+            lessThan: { 'user.age': [30, 40] },
           },
         };
         const conditionResolver = {
           greatherThan: (data: number, expected: number): boolean => {
             return data > expected;
           },
+          lessThan: (data: number, expected: number): boolean => {
+            return data < expected;
+          },
         };
         expect(
           new Statement(firstStatementConfig).matchConditions({
@@ -82,7 +85,7 @@ export default (): void => {
         ).toBe(true);
         expect(
           new Statement(secondStatementConfig).matchConditions({
-            context: { user: { age: 42 } },
+            context: { user: { age: 35 } },
             conditionResolver,
           })
         ).toBe(true);
@@ -96,13 +99,16 @@ export default (): void => {
         };
         const secondStatementConfig = {
           condition: {
-            greatherThan: { 'user.age': [50, 45] },
+            lessThan: { 'user.age': [50, 45] },
           },
         };
         const conditionResolver = {
           greatherThan: (data: number, expected: number): boolean => {
             return data > expected;
           },
+          lessThan: (data: number, expected: number): boolean => {
+            return data < expected;
+          },
         };
         expect(
           new Statement(firstStatementConfig).matchConditions({
@@ -112,7 +118,7 @@ export default (): void => {
         ).toBe(false);
         expect(
           new Statement(secondStatementConfig).matchConditions({
-            context: { user: { age: 42 } },
+            context: { user: { age: 60 } },
             conditionResolver,
           })
         ).toBe(false);