@inseefr/lunatic 2.6.2 → 2.6.3-rc.1

package/lib/use-lunatic/commons/variables/lunatic-variables-store.spec.js

@@ -0,0 +1,216 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _lunaticVariablesStore = require("./lunatic-variables-store");
+var _resizingBehaviour = require("./behaviours/resizing-behaviour");
+var _cleaningBehaviour = require("./behaviours/cleaning-behaviour");
+var _missingBehaviour = require("./behaviours/missing-behaviour");
+(0, _vitest.describe)('lunatic-variables-store', function () {
+  var variables;
+  (0, _vitest.beforeEach)(function () {
+    variables = new _lunaticVariablesStore.LunaticVariablesStore();
+  });
+  (0, _vitest.it)('should record basic variables', function () {
+    variables.set('FIRSTNAME', 'John');
+    (0, _vitest.expect)(variables.get('FIRSTNAME')).toEqual('John');
+  });
+  (0, _vitest.it)('should run simple types', function () {
+    (0, _vitest.expect)(variables.run('"Hello world"')).toEqual('Hello world');
+    (0, _vitest.expect)(variables.run('true')).toEqual(true);
+    (0, _vitest.expect)(variables.run('2')).toEqual(2);
+  });
+  (0, _vitest.it)('should handle calculated', function () {
+    variables.set('FIRSTNAME', 'John');
+    variables.set('LASTNAME', 'Doe');
+    variables.setCalculated('FULLNAME', 'FIRSTNAME || " " || LASTNAME', {
+      dependencies: ['FIRSTNAME', 'LASTNAME']
+    });
+    (0, _vitest.expect)(variables.get('FULLNAME')).toEqual('John Doe');
+    (0, _vitest.expect)(variables.interpretCount).toBe(1);
+    // The result should be cached
+    (0, _vitest.expect)(variables.get('FULLNAME')).toEqual('John Doe');
+    (0, _vitest.expect)(variables.interpretCount).toBe(1);
+    // But refreshed if a variable was updated
+    variables.set('FIRSTNAME', 'Jane');
+    (0, _vitest.expect)(variables.get('FULLNAME')).toEqual('Jane Doe');
+    (0, _vitest.expect)(variables.interpretCount).toBe(2);
+  });
+  (0, _vitest.it)('should handle deep calculation', function () {
+    variables.set('FIRSTNAME', 'John');
+    variables.set('LASTNAME', 'Doe');
+    variables.set('AGE', '18');
+    variables.setCalculated('FULLNAME', 'FIRSTNAME || " " || LASTNAME', {
+      dependencies: ['FIRSTNAME', 'LASTNAME']
+    });
+    variables.setCalculated('LABEL', 'FULLNAME || " is " || AGE', {
+      dependencies: ['FULLNAME', 'AGE']
+    });
+    (0, _vitest.expect)(variables.get('LABEL')).toEqual('John Doe is 18');
+    (0, _vitest.expect)(variables.interpretCount).toBe(2);
+    variables.set('AGE', '20');
+    (0, _vitest.expect)(variables.get('LABEL')).toEqual('John Doe is 20');
+    (0, _vitest.expect)(variables.interpretCount).toBe(3);
+    variables.set('FIRSTNAME', 'Jane');
+    (0, _vitest.expect)(variables.get('LABEL')).toEqual('Jane Doe is 20');
+    (0, _vitest.expect)(variables.interpretCount).toBe(5);
+    variables.get('LABEL');
+    (0, _vitest.expect)(variables.interpretCount).toBe(5);
+  });
+  (0, _vitest.it)('should handle dependencies resolution', function () {
+    variables.set('FIRSTNAME', 'John');
+    variables.set('LASTNAME', 'Doe');
+    variables.setCalculated('FULLNAME', 'FIRSTNAME || " " || LASTNAME');
+    (0, _vitest.expect)(variables.get('FULLNAME')).toEqual('John Doe');
+    variables.set('FIRSTNAME', 'Jane');
+    (0, _vitest.expect)(variables.get('FULLNAME')).toEqual('Jane Doe');
+  });
+  (0, _vitest.it)('should run expression on the fly', function () {
+    variables.set('FIRSTNAME', 'John');
+    variables.set('LASTNAME', 'Doe');
+    (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME')).toEqual('John Doe');
+    (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME')).toEqual('John Doe');
+    (0, _vitest.expect)(variables.interpretCount).toBe(1);
+    variables.set('FIRSTNAME', 'Jane');
+    (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME')).toEqual('Jane Doe');
+  });
+  (0, _vitest.describe)('with iteration', function () {
+    (0, _vitest.it)('should handle arrays', function () {
+      variables.set('FIRSTNAME', ['John', 'Jane']);
+      (0, _vitest.expect)(variables.get('FIRSTNAME')).toEqual(['John', 'Jane']);
+      (0, _vitest.expect)(variables.get('FIRSTNAME', [0])).toEqual('John');
+      (0, _vitest.expect)(variables.get('FIRSTNAME', [1])).toEqual('Jane');
+    });
+    (0, _vitest.it)('should handle setting at a specific index', function () {
+      variables.set('FIRSTNAME', ['John', 'Jane']);
+      variables.set('LASTNAME', null);
+      variables.set('FIRSTNAME', 'Marc', {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('FIRSTNAME')).toEqual(['John', 'Marc']);
+      variables.set('LASTNAME', 'Doe', {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('LASTNAME')).toEqual([null, 'Doe']);
+    });
+    (0, _vitest.it)('should ignore non array values', function () {
+      variables.set('FIRSTNAME', 'John');
+      (0, _vitest.expect)(variables.get('FIRSTNAME', [0])).toEqual('John');
+    });
+    (0, _vitest.it)('should handle iteration in calculation', function () {
+      variables.set('FIRSTNAME', ['John', 'Jane']);
+      variables.set('LASTNAME', ['Doe', 'Dae']);
+      variables.setCalculated('FULLNAME', 'FIRSTNAME || " " || LASTNAME', {
+        dependencies: ['FIRSTNAME', 'LASTNAME']
+      });
+      (0, _vitest.expect)(variables.get('FULLNAME', [0])).toEqual('John Doe');
+      (0, _vitest.expect)(variables.get('FULLNAME', [1])).toEqual('Jane Dae');
+      (0, _vitest.expect)(variables.interpretCount).toBe(2);
+      (0, _vitest.expect)(variables.get('FULLNAME', [0])).toEqual('John Doe');
+      (0, _vitest.expect)(variables.get('FULLNAME', [1])).toEqual('Jane Dae');
+      (0, _vitest.expect)(variables.interpretCount).toBe(2);
+      (0, _vitest.expect)(variables.get('FULLNAME', [0])).toEqual('John Doe');
+      variables.set('FIRSTNAME', ['John', 'Marc']);
+      (0, _vitest.expect)(variables.get('FULLNAME', [0])).toEqual('John Doe');
+      (0, _vitest.expect)(variables.get('FULLNAME', [1])).toEqual('Marc Dae');
+      // Only the second iteration should be calculated
+      (0, _vitest.expect)(variables.interpretCount).toBe(3);
+    });
+    (0, _vitest.it)('should handle aggregation expression', function () {
+      variables.set('FIRSTNAME', ['John', 'Jane']);
+      (0, _vitest.expect)(variables.run('count(FIRSTNAME)')).toEqual(2);
+      variables.set('FIRSTNAME', ['John', 'Jane', 'Marc']);
+      (0, _vitest.expect)(variables.run('count(FIRSTNAME)')).toEqual(3);
+    });
+    (0, _vitest.it)('should handle non array values', function () {
+      variables.set('FIRSTNAME', ['John', 'Jane']);
+      variables.set('LASTNAME', 'Doe');
+      (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME', {
+        iteration: [0]
+      })).toEqual('John Doe');
+      (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME', {
+        iteration: [1]
+      })).toEqual('Jane Doe');
+    });
+  });
+  (0, _vitest.describe)('resizing', function () {
+    (0, _vitest.it)('should resize variables', function () {
+      variables.set('PRENOM', ['John', 'Jane']);
+      variables.set('NOM', ['Doe']);
+      (0, _resizingBehaviour.resizingBehaviour)(variables, {
+        PRENOM: {
+          size: 'count(PRENOM)',
+          variables: ['NOM']
+        }
+      });
+      variables.set('PRENOM', ['John', 'Jane', 'Marc']);
+      (0, _vitest.expect)(variables.get('PRENOM').length).toEqual(3);
+      (0, _vitest.expect)(variables.get('NOM').length).toEqual(3);
+    });
+  });
+  (0, _vitest.describe)('cleaning', function () {
+    (0, _vitest.it)('should clean variables', function () {
+      variables.set('PRENOM', 'John');
+      variables.set('NOM', 'Doe');
+      variables.set('READY', true);
+      (0, _cleaningBehaviour.cleaningBehaviour)(variables, {
+        READY: {
+          PRENOM: 'READY'
+        }
+      });
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual('John');
+      variables.set('READY', false);
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual(null);
+    });
+    (0, _vitest.it)('should clean variables with initial values', function () {
+      variables.set('PRENOM', 'John');
+      variables.set('READY', true);
+      (0, _cleaningBehaviour.cleaningBehaviour)(variables, {
+        READY: {
+          PRENOM: 'READY'
+        }
+      }, {
+        PRENOM: 'Jane'
+      });
+      variables.set('READY', false);
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual('Jane');
+    });
+    (0, _vitest.it)('should clean variables at a specific iteration', function () {
+      variables.set('PRENOM', ['John', 'Jane', 'Marc']);
+      variables.set('READY', [true, true, true]);
+      (0, _cleaningBehaviour.cleaningBehaviour)(variables, {
+        READY: {
+          PRENOM: 'READY'
+        }
+      });
+      variables.set('READY', false, {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual(['John', null, 'Marc']);
+    });
+  });
+  (0, _vitest.describe)('missing', function () {
+    (0, _vitest.beforeEach)(function () {
+      (0, _missingBehaviour.missingBehaviour)(variables, {
+        PRENOM: ['PRENOM_MISSING'],
+        PRENOM_MISSING: ['PRENOM']
+      });
+    });
+    (0, _vitest.it)('should handle missing', function () {
+      variables.set('PRENOM', 'John');
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual('John');
+      (0, _vitest.expect)(variables.get('PRENOM_MISSING')).toEqual(null);
+      variables.set('PRENOM_MISSING', 'DK');
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual(null);
+      (0, _vitest.expect)(variables.get('PRENOM_MISSING')).toEqual('DK');
+    });
+    (0, _vitest.it)('should handle missing for iteration', function () {
+      variables.set('PRENOM', ['John', 'Jane', 'Marc']);
+      (0, _vitest.expect)(variables.get('PRENOM_MISSING')).toEqual(null);
+      variables.set('PRENOM_MISSING', 'DK', {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual(['John', null, 'Marc']);
+      (0, _vitest.expect)(variables.get('PRENOM_MISSING', [1])).toEqual('DK');
+    });
+  });
+});

package/lib/use-lunatic/initial-state.js

@@ -6,9 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _constants = require("../utils/constants");
 var _useSuggesters = require("./use-suggesters");
+var _lunaticVariablesStore = require("./commons/variables/lunatic-variables-store");
+var _env = require("../utils/env");
 var INITIAL_STATE = {
-  variables: {},
-  // map des variables du questionnaires
+  updatedAt: 0,
+  // There is a bug with this constructor in vitest
+  variables: (0, _env.isTestEnv)() ? null : new _lunaticVariablesStore.LunaticVariablesStore(),
   pages: {},
   isInLoop: false,
   isFirstPage: false,

package/lib/use-lunatic/reducer/overview/overview-on-change.js

@@ -37,7 +37,7 @@ var overviewOnChange = function overviewOnChange(state) {
     return _objectSpread(_objectSpread({}, overviewEntry), {}, {
       reached: isPageReached(overviewEntry.page, lastReachedPage !== null && lastReachedPage !== void 0 ? lastReachedPage : '1'),
       visible: (_executeExpression = executeExpression(overviewEntry.conditionFilter, {
-        bindingDependencies: (_overviewEntry$condit = overviewEntry.conditionFilter) === null || _overviewEntry$condit === void 0 ? void 0 : _overviewEntry$condit.bindingDependencies
+        deps: (_overviewEntry$condit = overviewEntry.conditionFilter) === null || _overviewEntry$condit === void 0 ? void 0 : _overviewEntry$condit.bindingDependencies
       })) !== null && _executeExpression !== void 0 ? _executeExpression : false,
       evaluatedLabel: executeExpression(overviewEntry.label)
     });

package/lib/use-lunatic/reducer/{reduce-handle-change/reduce-variables-simple.js → reduce-handle-change.js}

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.reduceHandleChange = reduceHandleChange;
+var _number = require("../../utils/number");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -11,18 +12,18 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /**
- * Add the value for the variable in the corresponding variable object
+ * Update collected variables
  */
-function reduceVariablesSimple(variables, _ref) {
-  var name = _ref.name,
-    value = _ref.value;
-  if (name in variables) {
-    var variable = variables[name];
-    return _objectSpread(_objectSpread({}, variables), {}, _defineProperty({}, name, _objectSpread(_objectSpread({}, variable), {}, {
-      value: value
-    })));
+function reduceHandleChange(state, action) {
+  var iteration = action.payload.iteration;
+  // Resolve iteration from pager for loops
+  if (!iteration && (0, _number.isNumber)(state.pager.iteration)) {
+    iteration = [state.pager.iteration];
   }
-  return variables;
-}
-var _default = reduceVariablesSimple;
-exports["default"] = _default;
+  state.updateBindings(action.payload.name, action.payload.value, {
+    iteration: iteration
+  });
+  return _objectSpread(_objectSpread({}, state), {}, {
+    updatedAt: Date.now()
+  });
+}

package/lib/use-lunatic/reducer/reduce-on-init.js

@@ -8,139 +8,24 @@ var _commons = require("../commons");
 var _compose = _interopRequireDefault(require("../commons/compose"));
 var _pageTag = require("../commons/page-tag");
 var _overviewOnInit = require("./overview/overview-on-init");
+var _lunaticVariablesStore = require("../commons/variables/lunatic-variables-store");
+var _constants = require("../../utils/constants");
+var _mdLabel = _interopRequireDefault(require("../../components/commons/components/md-label"));
+var _vtl = require("../../utils/vtl");
+var _number = require("../../utils/number");
+var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-/**
- * Extract value from colllected data
- */
-function getInitalValueFromCollected(variable, data) {
-  var name = variable.name;
-  var fromData;
-  if (data && name in data) {
-    var _data$name = data[name],
-      COLLECTED = _data$name.COLLECTED,
-      FORCED = _data$name.FORCED;
-    fromData = COLLECTED !== null && COLLECTED !== void 0 ? COLLECTED : FORCED;
-  }
-  if ('values' in variable && variable.values) {
-    var _ref, _fromData;
-    var _variable$values = variable.values,
-      _COLLECTED = _variable$values.COLLECTED,
-      _FORCED = _variable$values.FORCED;
-    return (_ref = (_fromData = fromData) !== null && _fromData !== void 0 ? _fromData : _FORCED) !== null && _ref !== void 0 ? _ref : _COLLECTED;
-  }
-  return undefined;
-}
-
-/**
- * Extract value from an external data
- */
-function getInitialValueFromExternal(variable) {
-  var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var name = variable.name;
-  return data === null || data === void 0 ? void 0 : data[name];
-}
-
-/**
- * Extract value from data for the variable
- */
-function getInitialValue(variable) {
-  var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var COLLECTED = data.COLLECTED,
-    EXTERNAL = data.EXTERNAL,
-    CALCULATED = data.CALCULATED;
-  switch (variable.variableType) {
-    case 'COLLECTED':
-      return getInitalValueFromCollected(variable, COLLECTED);
-    case 'EXTERNAL':
-      return getInitialValueFromExternal(variable, EXTERNAL);
-    case 'CALCULATED':
-      return getInitialValueFromExternal(variable, CALCULATED);
-    default:
-      return null;
-  }
-}
-function appendToArrayMap(map, key, entry) {
-  if (key in map) {
-    return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, [].concat(_toConsumableArray(map[key]), [entry])));
-  }
-  return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, [entry]));
-}
-function appendToObjectMap(map, variable, value) {
-  var key = variable.name;
-  var object = {
-    variable: variable,
-    value: value,
-    type: variable.variableType
-  };
-  if (key in map) {
-    return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, _objectSpread(_objectSpread({}, map[key]), object)));
-  }
-  return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, object));
-}
-
-/**
- * Creates the variables object to set in the state
- */
-function createVariables(source, data) {
-  var _source$variables = source.variables,
-    variables = _source$variables === void 0 ? [] : _source$variables;
-  var _variables$reduce = variables.reduce(function (_ref2, variable) {
-      var _ref3 = _slicedToArray(_ref2, 2),
-        mapType = _ref3[0],
-        mapVar = _ref3[1];
-      var type = variable.variableType;
-      return [appendToArrayMap(mapType, type, variable), appendToObjectMap(mapVar, variable, getInitialValue(variable, data))];
-    }, [{
-      EXTERNAL: [],
-      COLLECTED: [],
-      CALCULATED: []
-    }, {}]),
-    _variables$reduce2 = _slicedToArray(_variables$reduce, 2),
-    mapVariablesTypes = _variables$reduce2[0],
-    mapVariables = _variables$reduce2[1];
-  var _mapVariablesTypes$CA = mapVariablesTypes.CALCULATED,
-    CALCULATED = _mapVariablesTypes$CA === void 0 ? [] : _mapVariablesTypes$CA;
-  CALCULATED.forEach(function (calculated) {
-    var _calculated$bindingDe = calculated.bindingDependencies,
-      bindingDependencies = _calculated$bindingDe === void 0 ? [] : _calculated$bindingDe;
-    bindingDependencies.forEach(function (name) {
-      if (name in mapVariables) {
-        var variable = mapVariables[name];
-        var CalculatedLinked = variable.CalculatedLinked;
-        if (CalculatedLinked) {
-          CalculatedLinked.push(calculated);
-        } else {
-          variable.CalculatedLinked = [calculated];
-        }
-      }
-    });
-  });
-  return mapVariables;
-}
-
-/**
- * Check if there is a loop and populate the pager accordingly
- */
-function checkInLoop(state, initialPager) {
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /**
+                                                                                                                                                                                                                                                                                                                                                                                               * Check if there is a loop and populate the pager accordingly
+                                                                                                                                                                                                                                                                                                                                                                                               */
+function fillLoopState(state, initialPager) {
   var pager = state.pager,
-    pages = state.pages,
-    executeExpression = state.executeExpression;
+    pages = state.pages;
   var page = pager.page;
   if (page in pages) {
     var _pages$page = pages[page],
@@ -156,10 +41,9 @@ function checkInLoop(state, initialPager) {
           subPage: (_initialPager$subPage = initialPager === null || initialPager === void 0 ? void 0 : initialPager.subPage) !== null && _initialPager$subPage !== void 0 ? _initialPager$subPage : 0,
           nbSubPages: (subPages !== null && subPages !== void 0 ? subPages : []).length,
           iteration: (_initialPager$iterati = initialPager === null || initialPager === void 0 ? void 0 : initialPager.iteration) !== null && _initialPager$iterati !== void 0 ? _initialPager$iterati : 0,
-          nbIterations: executeExpression(iterations, {
-            iteration: undefined,
-            bindingDependencies: loopDependencies
-          })
+          nbIterations: (0, _number.forceInt)(state.executeExpression(iterations, {
+            deps: loopDependencies
+          }))
         })
       });
     }
@@ -167,12 +51,12 @@ function checkInLoop(state, initialPager) {
   return state;
 }
 function reduceOnInit(state, action) {
+  var _initialPager$page;
   var payload = action.payload;
   var source = payload.source,
     data = payload.data,
     initialPage = payload.initialPage,
     lastReachedPage = payload.lastReachedPage,
-    features = payload.features,
     handleChange = payload.handleChange,
     preferences = payload.preferences,
     savingType = payload.savingType,
@@ -182,57 +66,81 @@ function reduceOnInit(state, action) {
     goToPage = payload.goToPage,
     goNextPage = payload.goNextPage,
     goPreviousPage = payload.goPreviousPage;
-  if (source && data) {
-    var _initialPager$page;
-    var variables = createVariables(source, data); // map des variables
-    var _createExecuteExpress = (0, _commons.createExecuteExpression)(variables, features),
-      _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 2),
-      executeExpression = _createExecuteExpress2[0],
-      updateBindings = _createExecuteExpress2[1];
-    var pages = (0, _commons.checkLoops)((0, _commons.createMapPages)(source));
-    var maxPage = source.maxPage,
-      _source$cleaning = source.cleaning,
-      cleaning = _source$cleaning === void 0 ? {} : _source$cleaning,
-      _source$missingBlock = source.missingBlock,
-      missingBlock = _source$missingBlock === void 0 ? {} : _source$missingBlock,
-      _source$resizing = source.resizing,
-      resizing = _source$resizing === void 0 ? {} : _source$resizing;
-    var initialPager = (0, _pageTag.getPagerFromPageTag)(initialPage);
-    var pager = {
-      page: (_initialPager$page = initialPager === null || initialPager === void 0 ? void 0 : initialPager.page) !== null && _initialPager$page !== void 0 ? _initialPager$page : '1',
-      maxPage: maxPage,
-      subPage: undefined,
-      nbSubPages: undefined,
-      iteration: undefined,
-      nbIterations: undefined,
-      lastReachedPage: lastReachedPage !== null && lastReachedPage !== void 0 ? lastReachedPage : initialPage
-    };
-    var _isFirstLastPage = (0, _commons.isFirstLastPage)(pager),
-      isFirstPage = _isFirstLastPage.isFirstPage,
-      isLastPage = _isFirstLastPage.isLastPage;
-    return checkInLoop(_objectSpread(_objectSpread({}, state), {}, {
-      cleaning: cleaning,
-      missingBlock: missingBlock,
-      resizing: resizing,
-      variables: variables,
-      pages: pages,
-      isFirstPage: isFirstPage,
-      isLastPage: isLastPage,
-      pager: pager,
-      executeExpression: executeExpression,
-      updateBindings: updateBindings,
-      handleChange: handleChange,
-      preferences: preferences,
-      management: management,
-      savingType: savingType,
-      activeControls: activeControls,
-      goToPage: goToPage,
-      goNextPage: goNextPage,
-      goPreviousPage: goPreviousPage,
-      shortcut: shortcut
-    }), initialPager);
+  if (!source || !data) {
+    return state;
   }
-  return state;
+  var variables = _lunaticVariablesStore.LunaticVariablesStore.makeFromSource(source, data);
+  var pages = (0, _commons.checkLoops)((0, _commons.createMapPages)(source));
+  var maxPage = source.maxPage,
+    _source$cleaning = source.cleaning,
+    cleaning = _source$cleaning === void 0 ? {} : _source$cleaning,
+    _source$missingBlock = source.missingBlock,
+    missingBlock = _source$missingBlock === void 0 ? {} : _source$missingBlock;
+  var initialPager = (0, _pageTag.getPagerFromPageTag)(initialPage);
+  var pager = {
+    page: (_initialPager$page = initialPager === null || initialPager === void 0 ? void 0 : initialPager.page) !== null && _initialPager$page !== void 0 ? _initialPager$page : '1',
+    maxPage: maxPage,
+    subPage: undefined,
+    nbSubPages: undefined,
+    iteration: undefined,
+    nbIterations: undefined,
+    lastReachedPage: lastReachedPage !== null && lastReachedPage !== void 0 ? lastReachedPage : initialPage
+  };
+  var executeExpression = function executeExpression(expression) {
+    var args = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    // This is kept to ensure backward compatibility
+    if (args !== null && args !== void 0 && args.bindingDependencies) {
+      args.deps = args.bindingDependencies;
+    }
+    // Remove above code on next update
+    var expressionType = (0, _vtl.getExpressionType)(expression);
+    var features = action.payload.features;
+    if (!features.includes(_constants.VTL) || !expressionType.includes(_constants.VTL)) {
+      return expression;
+    }
+    var expressionString = (0, _vtl.getExpressionAsString)(expression);
+    try {
+      var result = variables.run(expressionString, _objectSpread(_objectSpread({}, args), {}, {
+        iteration: typeof args.iteration === 'number' ? [args.iteration] : args.iteration
+      }));
+      if (features.includes(_constants.MD) && expressionType.includes(_constants.MD) && typeof result === 'string') {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_mdLabel["default"], {
+          expression: result
+        });
+      }
+      return result;
+    } catch (e) {
+      // If there is an error interpreting a variable, return the raw expression
+      console.error("Cannot interpret expression : ".concat(expressionString));
+      return expressionString;
+    }
+  };
+  var updateBindings = function updateBindings(variableName, value, options) {
+    variables.set(variableName, value, options);
+  };
+  var _isFirstLastPage = (0, _commons.isFirstLastPage)(pager),
+    isFirstPage = _isFirstLastPage.isFirstPage,
+    isLastPage = _isFirstLastPage.isLastPage;
+  return fillLoopState(_objectSpread(_objectSpread({}, state), {}, {
+    cleaning: cleaning,
+    missingBlock: missingBlock,
+    variables: variables,
+    pages: pages,
+    isFirstPage: isFirstPage,
+    isLastPage: isLastPage,
+    pager: pager,
+    executeExpression: executeExpression,
+    updateBindings: updateBindings,
+    handleChange: handleChange,
+    preferences: preferences,
+    management: management,
+    savingType: savingType,
+    activeControls: activeControls,
+    goToPage: goToPage,
+    goNextPage: goNextPage,
+    goPreviousPage: goPreviousPage,
+    shortcut: shortcut
+  }), initialPager);
 }
 var reducers = (0, _compose["default"])(reduceOnInit, _overviewOnInit.reduceOverviewOnInit);
 var _default = reducers;

package/lib/use-lunatic/reducer/reducer.js

@@ -8,7 +8,7 @@ var _actions = require("../actions");
 var _reduceGoNextPage = require("./reduce-go-next-page");
 var _reduceGoPreviousPage = _interopRequireDefault(require("./reduce-go-previous-page"));
 var _reduceGoToPage = _interopRequireDefault(require("./reduce-go-to-page"));
-var _reduceHandleChange = _interopRequireDefault(require("./reduce-handle-change"));
+var _reduceHandleChange = require("./reduce-handle-change");
 var _reduceOnInit = _interopRequireDefault(require("./reduce-on-init"));
 var _reduceOnSetWaiting = _interopRequireDefault(require("./reduce-on-set-waiting"));
 var _reduceUpdateState = require("./reduce-update-state");
@@ -24,7 +24,7 @@ function reducer(state, action) {
     case _actions.ActionKind.GO_TO_PAGE:
       return (0, _reduceGoToPage["default"])(state, action);
     case _actions.ActionKind.HANDLE_CHANGE:
-      return (0, _reduceHandleChange["default"])(state, action);
+      return (0, _reduceHandleChange.reduceHandleChange)(state, action);
     case _actions.ActionKind.ON_SET_WAITING:
       return (0, _reduceOnSetWaiting["default"])(state, action);
     case _actions.ActionKind.UPDATE_STATE:

package/lib/use-lunatic/reducer/resolve-component-controls/resolve-simple-control.js

@@ -16,8 +16,7 @@ function resolveSimpleControl(state, control) {
     typeOfControl = control.typeOfControl;
   var value = (_control$control$valu = control === null || control === void 0 || (_control$control = control.control) === null || _control$control === void 0 ? void 0 : _control$control.value) !== null && _control$control$valu !== void 0 ? _control$control$valu : 'true';
   var result = executeExpression(value, {
-    iteration: iteration,
-    linksIterations: linksIterations
+    iteration: linksIterations !== null && linksIterations !== void 0 ? linksIterations : iteration
   });
   try {
     /**
@@ -28,8 +27,7 @@ function resolveSimpleControl(state, control) {
      */
     if (result) return undefined;
     var label = executeExpression(errorMessage, {
-      iteration: iteration,
-      linksIterations: linksIterations
+      iteration: iteration
     });
     return {
       criticality: criticality,