FIO-9783: refactor evaluator

config/webpack.config.js

@@ -5,7 +5,6 @@ module.exports = {
   mode: 'development',
   entry: {
     'formio.core.js': './lib/index.js',
-    'formio.modules.js': './lib/modules/index.js',
     'formio.js': './lib/sdk/index.js',
     'formio.utils.js': './lib/utils/index.js',
     'formio.process.js': './lib/process/index.js',

config/webpack.prod.js

@@ -2,7 +2,6 @@ const config = require('./webpack.config');
 config.mode = 'production';
 config.entry = {
   'formio.core.min.js': './lib/index.js',
-  'formio.modules.min.js': './lib/modules/index.js',
   'formio.min.js': './lib/sdk/index.js',
   'formio.utils.min.js': './lib/utils/index.js',
 };

src/experimental/core.ts

@@ -1,11 +1,10 @@
 import 'core-js/features/object/from-entries';
 import { Formio } from '../sdk';
-import { Evaluator, Utils } from '../utils';
+import { Evaluator, Utils, registerEvaluator } from '../utils';
 import { Components, render } from './base';
 import { Template } from './template';
 import { merge } from 'lodash';
 import components from './components';
-import modules from '../modules';
 
 export default class FormioCore extends Formio {
   static Components = Components;
@@ -60,7 +59,7 @@ export default class FormioCore extends Formio {
         if (!(Formio as any).Evaluator) {
           return;
         }
-        (Formio as any).Evaluator.registerEvaluator(plugin);
+        registerEvaluator(plugin);
         break;
       default:
         console.log('Unknown plugin option', key);
@@ -95,4 +94,3 @@ export default class FormioCore extends Formio {
 }
 
 FormioCore.use(components);
-FormioCore.use(modules);

src/index.ts

@@ -1,4 +1,3 @@
-export * from './modules';
 export * from './utils';
 export * from './process/validation';
 export * from './process/validation/rules';

src/process/calculation/index.ts

@@ -1,4 +1,3 @@
-import { JSONLogicEvaluator } from 'modules/jsonlogic';
 import {
   ProcessorFn,
   ProcessorFnSync,
@@ -8,7 +7,7 @@ import {
   FetchScope,
 } from 'types';
 import { set } from 'lodash';
-import { normalizeContext } from 'utils/formUtil';
+import { evaluate } from 'utils';
 
 export const shouldCalculate = (context: CalculationContext): boolean => {
   const { component, config } = context;
@@ -21,20 +20,25 @@ export const shouldCalculate = (context: CalculationContext): boolean => {
 export const calculateProcessSync: ProcessorFnSync<CalculationScope> = (
   context: CalculationContext,
 ) => {
-  const { component, data, evalContext, scope, path, value } = context;
-  if (!shouldCalculate(context)) {
+  const { component, data, scope, path, value } = context;
+  if (!shouldCalculate(context) || !component.calculateValue) {
     return;
   }
 
   const calculationContext = (scope as FetchScope).fetched
     ? { ...context, data: { ...data, ...(scope as FetchScope).fetched } }
     : context;
-  const evalContextValue = evalContext
-    ? evalContext(normalizeContext(calculationContext))
-    : normalizeContext(calculationContext);
-  evalContextValue.value = value || null;
+
   if (!scope.calculated) scope.calculated = [];
-  const newValue = JSONLogicEvaluator.evaluate(component.calculateValue, evalContextValue, 'value');
+  const newValue = evaluate(
+    component.calculateValue,
+    calculationContext,
+    'value',
+    false,
+    (context) => {
+      context.value = value || null;
+    },
+  );
 
   // Only set a new value if it is not "null" which would be the case if no calculation occurred.
   if (newValue !== null) {

src/process/clearHidden/__tests__/clearHidden.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { clearHiddenProcess } from '../index';
+import { clearHiddenProcessSync } from '../index';
 
 describe('clearHidden', function () {
   it('Shoud not clear conditionally hidden component data when clearOnHide is false', function () {
@@ -28,7 +28,7 @@ describe('clearHidden', function () {
       },
       path: 'foo',
     };
-    clearHiddenProcess(context);
+    clearHiddenProcessSync(context);
     expect(context.data).to.deep.equal({ foo: 'bar' });
   });
 
@@ -57,7 +57,7 @@ describe('clearHidden', function () {
       },
       path: 'foo',
     };
-    clearHiddenProcess(context);
+    clearHiddenProcessSync(context);
     expect(context.data).to.deep.equal({});
   });
 
@@ -81,7 +81,7 @@ describe('clearHidden', function () {
       },
       path: 'foo',
     };
-    clearHiddenProcess(context);
+    clearHiddenProcessSync(context);
     expect(context.data).to.deep.equal({ foo: 'bar' });
   });
 });

src/process/clearHidden/index.ts

@@ -5,6 +5,7 @@ import {
   ProcessorInfo,
   ProcessorFnSync,
   ConditionsScope,
+  ProcessorFn,
 } from 'types';
 
 type ClearHiddenScope = ProcessorScope & {
@@ -16,7 +17,7 @@ type ClearHiddenScope = ProcessorScope & {
 /**
  * This processor function checks components for the `hidden` property and unsets corresponding data
  */
-export const clearHiddenProcess: ProcessorFnSync<ClearHiddenScope> = (context) => {
+export const clearHiddenProcessSync: ProcessorFnSync<ClearHiddenScope> = (context) => {
   const { component, data, value, scope, path } = context;
 
   // No need to unset the value if it's undefined
@@ -45,8 +46,13 @@ export const clearHiddenProcess: ProcessorFnSync<ClearHiddenScope> = (context) =
   }
 };
 
+export const clearHiddenProcess: ProcessorFn<ClearHiddenScope> = async (context) => {
+  return clearHiddenProcessSync(context);
+};
+
 export const clearHiddenProcessInfo: ProcessorInfo<ProcessorContext<ClearHiddenScope>, void> = {
   name: 'clearHidden',
   shouldProcess: () => true,
-  processSync: clearHiddenProcess,
+  process: clearHiddenProcess,
+  processSync: clearHiddenProcessSync,
 };

src/process/defaultValue/index.ts

@@ -1,4 +1,3 @@
-import { JSONLogicEvaluator } from 'modules/jsonlogic';
 import {
   ProcessorFn,
   ProcessorFnSync,
@@ -7,7 +6,8 @@ import {
   DefaultValueContext,
 } from 'types';
 import { set, has } from 'lodash';
-import { getComponentKey, normalizeContext } from 'utils/formUtil';
+import { evaluate } from 'utils';
+import { getComponentKey } from 'utils/formUtil';
 
 export const hasCustomDefaultValue = (context: DefaultValueContext): boolean => {
   const { component } = context;
@@ -38,7 +38,7 @@ export const customDefaultValueProcess: ProcessorFn<ConditionsScope> = async (
 export const customDefaultValueProcessSync: ProcessorFnSync<ConditionsScope> = (
   context: DefaultValueContext,
 ) => {
-  const { component, row, data, scope, evalContext, path } = context;
+  const { component, row, data, scope, path } = context;
   if (!hasCustomDefaultValue(context)) {
     return;
   }
@@ -48,14 +48,12 @@ export const customDefaultValueProcessSync: ProcessorFnSync<ConditionsScope> = (
   }
   let defaultValue = null;
   if (component.customDefaultValue) {
-    const evalContextValue = evalContext
-      ? evalContext(normalizeContext(context))
-      : normalizeContext(context);
-    evalContextValue.value = null;
-    defaultValue = JSONLogicEvaluator.evaluate(
+    defaultValue = evaluate(
       component.customDefaultValue,
-      evalContextValue,
+      context,
       'value',
+      false,
+      (context) => (context.value = null),
     );
     if (component.multiple && !Array.isArray(defaultValue)) {
       defaultValue = defaultValue ? [defaultValue] : [];

src/process/fetch/index.ts

@@ -8,8 +8,8 @@ import {
   FilterContext,
 } from 'types';
 import { get, set } from 'lodash';
-import { Evaluator } from 'utils';
-import { getComponentKey, normalizeContext } from 'utils/formUtil';
+import { evaluate, interpolate } from 'utils';
+import { getComponentKey } from 'utils/formUtil';
 
 export const shouldFetch = (context: FetchContext): boolean => {
   const { component, config } = context;
@@ -23,7 +23,7 @@ export const shouldFetch = (context: FetchContext): boolean => {
 };
 
 export const fetchProcess: ProcessorFn<FetchScope> = async (context: FetchContext) => {
-  const { component, row, evalContext, path, scope, config } = context;
+  const { component, row, path, scope, config } = context;
   let _fetch: FetchFn | null = null;
   try {
     _fetch = context.fetch ? context.fetch : fetch;
@@ -38,10 +38,7 @@ export const fetchProcess: ProcessorFn<FetchScope> = async (context: FetchContex
     return;
   }
   if (!scope.fetched) scope.fetched = {};
-  const evalContextValue = evalContext
-    ? evalContext(normalizeContext(context))
-    : normalizeContext(context);
-  const url = Evaluator.interpolateString(get(component, 'fetch.url', ''), evalContextValue);
+  const url = interpolate(get(component, 'fetch.url', ''), context);
   if (!url) {
     return;
   }
@@ -66,7 +63,7 @@ export const fetchProcess: ProcessorFn<FetchScope> = async (context: FetchContex
   request.headers['Accept'] = '*/*';
   request.headers['user-agent'] = 'Form.io DataSource Component';
   get(component, 'fetch.headers', []).map((header: any) => {
-    header.value = Evaluator.interpolateString(header.value, evalContextValue);
+    header.value = interpolate(header.value, context);
     if (header.value && header.key) {
       request.headers[header.key] = header.value;
     }
@@ -79,7 +76,7 @@ export const fetchProcess: ProcessorFn<FetchScope> = async (context: FetchContex
 
   const body = get(component, 'fetch.specifyBody', '');
   if (request.method === 'POST') {
-    request.body = JSON.stringify(Evaluator.evaluate(body, evalContextValue, 'body'));
+    request.body = JSON.stringify(evaluate(body, context, 'body'));
   }
 
   try {
@@ -93,10 +90,10 @@ export const fetchProcess: ProcessorFn<FetchScope> = async (context: FetchContex
       row,
       key,
       mapFunction
-        ? Evaluator.evaluate(
+        ? evaluate(
             mapFunction,
             {
-              ...evalContextValue,
+              ...context,
               ...{ responseData: result },
             },
             'value',

src/process/validation/rules/validateAvailableItems.ts

@@ -1,6 +1,6 @@
 import { isEmpty, isUndefined, difference } from 'lodash';
 import { FieldError, ProcessorError } from 'error';
-import { Evaluator } from 'utils';
+import { evaluate } from 'utils';
 import {
   RadioComponent,
   SelectComponent,
@@ -102,7 +102,7 @@ async function getAvailableSelectValues(component: SelectComponent, context: Val
       }
     }
     case 'custom': {
-      const customItems = Evaluator.evaluate(
+      const customItems = evaluate(
         component.data.custom,
         {
           values: [],
@@ -178,7 +178,7 @@ function getAvailableSelectValuesSync(component: SelectComponent, context: Valid
       }
     }
     case 'custom': {
-      const customItems = Evaluator.evaluate(
+      const customItems = evaluate(
         component.data.custom,
         {
           values: [],