@arquimedes.co/eureka-forms 2.0.39 → 2.0.41

package/dist/App/AppFunctions.d.ts

@@ -3,6 +3,7 @@ import { FormStep, Mapper } from '../@Types/FormStep';
 import { SiteState, ValuesStore } from '../States/SiteSlice';
 import { CustomStep } from '../FormSteps/CustomStep';
 import { MapperElement } from '../@Types/MapperElement';
+import { Condition } from '../@Types/Condition';
 export declare const calcValuesStore: (form: Readonly<Form>, originalValues?: Record<string, any>, postview?: boolean, customSteps?: Record<string, CustomStep>) => ValuesStore;
 export declare const addMapperStep: <Type>(step: Mapper, customSteps: Record<string, CustomStep>) => {
     element: MapperElement<Type>;
@@ -12,5 +13,6 @@ export declare const addMapperStep: <Type>(step: Mapper, customSteps: Record<str
     steps: Record<string, FormStep>;
 };
 export declare function calcRecursiveData<Type>(element: Readonly<MapperElement<Type>>, newSteps: Record<string, FormStep>, customSteps: Record<string, CustomStep>): void;
+export declare const calcRecursiveCondition: (condition: Condition, ids: Record<string, string>) => void;
 export declare const mapOriginalValue: (step: FormStep, value: any, values: ValuesStore, form?: Readonly<Form>) => any;
 export declare const calcInitialSections: (form: Form) => Pick<SiteState, 'previousSections' | 'idCurrentSection' | 'nextSections'>;

package/dist/App/AppFunctions.js

@@ -13,6 +13,7 @@ import { nanoid } from 'nanoid';
 import StepTypes, { FormTypes } from '../constants/FormStepTypes';
 import { getRawText, stringToDraft } from '../Utils/DraftFunctions';
 import { calcSubSteps } from '../FormSteps/StepFunctions';
+import ConditionTypes from '../constants/ConditionTypes';
 export var calcValuesStore = function (form, originalValues, postview, customSteps) {
     var _a;
     var _b, _c;
@@ -106,9 +107,31 @@ export function calcRecursiveData(element, newSteps, customSteps) {
         if (custom === null || custom === void 0 ? void 0 : custom.calcRecursiveData) {
             custom.calcRecursiveData(step, element.ids);
         }
+        if (step.condition) {
+            calcRecursiveCondition(step.condition, element.ids);
+        }
         calcSubSteps(step.id, newSteps, function (idStep) { var _a; return (_a = element.ids[idStep]) !== null && _a !== void 0 ? _a : idStep; });
     }
 }
+export var calcRecursiveCondition = function (condition, ids) {
+    switch (condition.type) {
+        case ConditionTypes.EXPRESSION:
+            for (var _i = 0, _a = condition.conditions; _i < _a.length; _i++) {
+                var subCondition = _a[_i];
+                calcRecursiveCondition(subCondition, ids);
+            }
+            break;
+        case ConditionTypes.FORM_STEP: {
+            var newId = ids[condition.idStep];
+            if (newId) {
+                condition.idStep = newId;
+            }
+            break;
+        }
+        default:
+            break;
+    }
+};
 export var mapOriginalValue = function (step, value, values, form) {
     var _a, _b, _c, _d, _e, _f;
     if (!value)

package/dist/App/AppHooks.js

@@ -154,8 +154,7 @@ export var useSetupApp = function (isEmbedded, _a) {
                                 for (var _b = 0, _c = section.steps; _b < _c.length; _b++) {
                                     var idStep = _c[_b];
                                     iterateNestedSteps(idStep, form.steps, function (step) {
-                                        if (step)
-                                            step.idSection = section.id;
+                                        step.idSection = section.id;
                                     });
                                 }
                             };

package/dist/Form/FormFunctions.js

@@ -130,15 +130,15 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
         sections: {},
     }; }
     if (addDependents === void 0) { addDependents = true; }
-    for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
-        var step = _c[_i];
+    var _loop_1 = function (step) {
         var idDeps = calcStepDeps(step);
         for (var _d = 0, idDeps_1 = idDeps; _d < idDeps_1.length; _d++) {
             var idDep = idDeps_1[_d];
             if (dependencies[idDep] === undefined &&
                 (addDependents || allSteps[idDep]))
                 dependencies[idDep] = calcStepDependency(idDep, allSteps, values, customSteps);
-            if (addDependents)
+            if (addDependents &&
+                !dependencies[idDep].dependents.find(function (dep) { return dep.id === step.id; }))
                 dependencies[idDep].dependents.push(step);
         }
         if (step.type === StepTypes.ENTITYVALUEPICKER) {
@@ -161,6 +161,10 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
             var hasSubSteps = Object.keys(subSteps).length > 0;
             calcDependencies(hasSubSteps ? subSteps : step.steps, customSteps, __assign(__assign({}, allSteps), subSteps), dependencies, values, hasSubSteps);
         }
+    };
+    for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
+        var step = _c[_i];
+        _loop_1(step);
     }
     return dependencies;
 }

package/dist/FormSteps/StepFunctions.d.ts

@@ -8,7 +8,7 @@ export type FillerSteps = FormSelector | ClassifierSelector | EntityValuePicker
 export declare function calcFillerSize(step: FillerSteps, steps: Record<string, FormStep>, values: Record<string, unknown>, size: FormSize): number;
 export declare const calcStepWidth: (stepSize: 1 | 2 | 3 | 4, size: FormSize) => number;
 export declare const calcDefaultValue: (step: FormStep | CBRFormStep) => any;
-export declare const iterateNestedSteps: (idStep: string, steps: Record<string, FormStep>, iteration: (step: FormStep | undefined) => void) => void;
+export declare const iterateNestedSteps: (idStep: string, steps: Record<string, FormStep>, iteration: (step: FormStep) => void) => void;
 /**
  * Utility function to calc the substeps of a step
  * @param step step to calc the substeps

package/dist/FormSteps/StepFunctions.js

@@ -148,6 +148,10 @@ export var calcDefaultValue = function (step) {
 };
 export var iterateNestedSteps = function (idStep, steps, iteration) {
     var step = steps[idStep];
+    if (!step) {
+        console.error('Missing Step:', idStep);
+        return;
+    }
     iteration(step);
     if (step.type === StepTypes.MAPPER) {
         for (var _i = 0, _a = step.rootSteps; _i < _a.length; _i++) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version": "2.0.39",
+    "version": "2.0.41",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",