@inseefr/lunatic 2.7.13 → 2.7.15

package/lib/stories/behaviour/performance/performance.stories.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.Default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
+var _source = _interopRequireDefault(require("./source.json"));
+var _lunatic = require("../../../../tests/utils/lunatic");
+var _array = require("../../../utils/array");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
+var stories = {
+  title: 'Behaviour/Performance',
+  component: _orchestrator["default"]
+};
+var _default = exports["default"] = stories;
+var Template = function Template(args) {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_orchestrator["default"], _objectSpread({}, args));
+};
+var Default = exports.Default = Template.bind({});
+Default.args = {
+  id: 'performance-default',
+  pagination: true,
+  source: _source["default"],
+  data: (0, _lunatic.generateData)({
+    PRENOM: (0, _array.times)(200, function (k) {
+      return "John".concat(k);
+    }),
+    NOM: (0, _array.times)(200, function (k) {
+      return "Doe".concat(k);
+    }),
+    AGE: (0, _array.times)(200, function (k) {
+      return k + 1;
+    }),
+    BIRTHDAY: (0, _array.times)(200, function (k) {
+      return "2".concat(k.toString().padStart(3, '0'), "-01-01");
+    })
+  })
+};

package/lib/stories/behaviour/performance/source.json

@@ -0,0 +1,172 @@
+{
+	"maxPage": "3",
+	"components": [
+		{
+			"id": "seq",
+			"componentType": "Sequence",
+			"label": {
+				"value": "\"Description des individus de votre logement\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"page": "1"
+		},
+		{
+			"id": "loop-prenom",
+			"componentType": "RosterForLoop",
+			"header": [
+				{ "headerCell": true, "label": "Prénom" },
+				{ "headerCell": true, "label": "Nom" },
+				{ "headerCell": true, "label": "Date de naissance" },
+				{ "headerCell": true, "label": "Age" }
+			],
+			"label": { "value": "\"Ajouter un individu\"", "type": "VTL|MD" },
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"bindingDependencies": ["PRENOM", "AGE"],
+			"lines": {
+				"min": { "value": 1, "type": "VTL" },
+				"max": { "value": 250, "type": "VTL" }
+			},
+			"page": "1",
+			"components": [
+				{
+					"componentType": "Input",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["PRENOM"],
+					"id": "prenom",
+					"response": {
+						"name": "PRENOM"
+					}
+				},
+				{
+					"componentType": "Input",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["NOM"],
+					"id": "nom",
+					"response": {
+						"name": "NOM"
+					}
+				},
+				{
+					"componentType": "Datepicker",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["BIRTHDAY"],
+					"id": "birthday",
+					"dateFormat": "YYYY-MM-DD",
+					"response": {
+						"name": "BIRTHDAY"
+					}
+				},
+				{
+					"componentType": "Input",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["AGE"],
+					"id": "age",
+					"response": {
+						"name": "AGE"
+					}
+				}
+			]
+		},
+		{
+			"id": "loop",
+			"componentType": "Loop",
+
+			"loopDependencies": ["PRENOM"],
+			"iterations": { "value": "count(PRENOM)", "type": "VTL" },
+			"page": "2",
+			"maxPage": "1",
+			"depth": 1,
+			"paginatedLoop": true,
+			"conditionFilter": {
+				"value": "true",
+				"type": "VTL"
+			},
+			"components": [
+				{
+					"id": "age",
+					"label": {
+						"value": "PRENOM || \", quel est vôtre âge ?\"",
+						"type": "VTL"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"page": "2.1",
+					"componentType": "InputNumber",
+					"min": 0,
+					"max": 120,
+					"decimals": 0,
+					"response": { "name": "AGE" }
+				}
+			]
+		},
+		{
+			"id": "seq-end",
+			"componentType": "Sequence",
+			"label": {
+				"value": "\"End\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"page": "3"
+		}
+	],
+	"resizing": {
+		"PRENOM": {
+			"size": "count(PRENOM)",
+			"variables": ["AGE"]
+		}
+	},
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOM",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "NOM",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "BIRTHDAY",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "AGE",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		}
+	]
+}

package/lib/stories/utils/orchestrator.js

@@ -204,7 +204,8 @@ function OrchestratorForStories(_ref3) {
     overview = _lunatic$useLunatic.overview,
     compileControls = _lunatic$useLunatic.compileControls,
     getData = _lunatic$useLunatic.getData,
-    Provider = _lunatic$useLunatic.Provider;
+    Provider = _lunatic$useLunatic.Provider,
+    hasPageResponse = _lunatic$useLunatic.hasPageResponse;
   var components = getComponents();
   var lastReachedPage = pager.lastReachedPage;
   var _useState3 = (0, _react.useState)({}),
@@ -286,6 +287,17 @@ function OrchestratorForStories(_ref3) {
           maxPage: maxPage,
           getData: getData,
           pager: pager
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "story-pager",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h3", {
+            children: "Misc"
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("strong", {
+                children: "pageHasResponse:"
+              }), ' ', JSON.stringify(hasPageResponse())]
+            })
+          })]
         }), showOverview && /*#__PURE__*/(0, _jsxRuntime.jsx)(_overview.Overview, {
           overview: overview,
           goToPage: goToPage

package/lib/stories/utils/referentiel.js

@@ -17,15 +17,15 @@ var getReferentiel = exports.getReferentiel = /*#__PURE__*/function () {
           _context.next = _context.t0 === 'libelle-pcs2020' ? 3 : _context.t0 === 'naf-rev2-stop' ? 4 : _context.t0 === 'naf-rev2' ? 4 : _context.t0 === 'cog-communes' ? 5 : 6;
           break;
         case 3:
-          return _context.abrupt("return", fetch('/libelles-pcs-2020.json').then(function (r) {
+          return _context.abrupt("return", fetch('./libelles-pcs-2020.json').then(function (r) {
             return r.json();
           }));
         case 4:
-          return _context.abrupt("return", fetch('/naf-rev2.json').then(function (r) {
+          return _context.abrupt("return", fetch('./naf-rev2.json').then(function (r) {
             return r.json();
           }));
         case 5:
-          return _context.abrupt("return", fetch('/communes-2019.json').then(function (r) {
+          return _context.abrupt("return", fetch('./communes-2019.json').then(function (r) {
             return r.json();
           }));
         case 6:

package/lib/use-lunatic/commons/compile-controls.js

@@ -1,11 +1,9 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compileControls = compileControls;
-var _commons = require("../reducer/commons");
 var _replaceComponentSequence = require("../replace-component-sequence");
 var _typeSource = require("../type-source");
 var _fillComponentExpressions = _interopRequireDefault(require("./fill-components/fill-component-expressions"));
@@ -13,6 +11,7 @@ var _getComponentsFromState = _interopRequireDefault(require("./get-components-f
 var _checkRoundaboutControl = require("../reducer/controls/check-roundabout-control");
 var _checkBaseControl = require("../reducer/controls/check-base-control");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -21,6 +20,10 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 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 _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; }
+var isLoopComponent = function isLoopComponent(component) {
+  return ['Loop', 'RosterForLoop'].includes(component.componentType);
+};
+
 /**
  * Check if components of the current page have errors, and return a map of error (indexed by component ID)
  */
@@ -33,6 +36,7 @@ function checkComponents(state, components) {
       var component = _step.value;
       var controls = component.controls,
         id = component.id;
+
       // The component has global level controls
       if (Array.isArray(controls)) {
         var componentErrors = checkControls(controls.filter(function (c) {
@@ -44,7 +48,7 @@ function checkComponents(state, components) {
       }
 
       // For loop, inspect children
-      if ((0, _commons.isLoopComponent)(component)) {
+      if (isLoopComponent(component)) {
         var _component$controls;
         var rowControls = (_component$controls = component.controls) === null || _component$controls === void 0 ? void 0 : _component$controls.filter(function (c) {
           return c.type === _typeSource.ControlTypeEnum.row;
@@ -92,7 +96,7 @@ function checkControls(controls, executeExpression, pager) {
  * Figure out the number of iterations of a component
  */
 function computeIterations(component, executeExpression) {
-  if ('iterations' in component) {
+  if ('iterations' in component && component.iterations && _typeof(component.iterations) === 'object' && 'value' in component.iterations) {
     return executeExpression(component.iterations.value);
   }
   if ('response' in component) {
@@ -127,7 +131,9 @@ function checkComponentInLoop(state, component, errors) {
       nbIterations: iterations
     });
     // The component is filtered on this iteration, skip it
-    if (component.conditionFilter && !state.executeExpression(component.conditionFilter.value, iterationPager)) {
+    if (
+    // conditionFilter can be the interpreted expression, or the object representing the expression
+    _typeof(component.conditionFilter) == 'object' && !state.executeExpression(component.conditionFilter.value, iterationPager) || component.conditionFilter === false) {
       continue;
     }
     var componentErrors = checkControls(component.controls, state.executeExpression, iterationPager);

package/lib/use-lunatic/commons/execute-condition-filter.js

@@ -5,13 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _getCompatibleVtlExpression = _interopRequireDefault(require("./get-compatible-vtl-expression"));
+var _array = require("../../utils/array");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function executeConditionFilter(filter, execute, iteration) {
   if (filter && typeof execute === 'function') {
     var value = filter.value;
-    return execute((0, _getCompatibleVtlExpression["default"])(value), {
+    var result = execute((0, _getCompatibleVtlExpression["default"])(value), {
       iteration: iteration
     });
+    // Todo : replace this with a casting system on execute
+    return Array.isArray(result) ? (0, _array.firstItem)(result) : result;
   }
   return undefined;
 }

package/lib/use-lunatic/commons/fill-components/fill-component-expressions.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _isObject = require("../../../utils/is-object");
+var _array = require("../../../utils/array");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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."); }
@@ -38,9 +39,10 @@ function createCrawl(_ref) {
   function executeAndFillObject(object, path) {
     var candidate = object[path];
     try {
-      return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, executeExpression(candidate, {
+      var result = executeExpression(candidate, {
         iteration: linksIterations !== null && linksIterations !== void 0 ? linksIterations : iteration
-      })));
+      });
+      return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, Array.isArray(result) ? (0, _array.firstItem)(result) : result));
     } catch (e) {
       return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, e instanceof Error ? e.toString() : e));
     }

package/lib/use-lunatic/commons/fill-components/fill-specific-expression.js

@@ -59,11 +59,7 @@ function fillChildComponentsWithIteration(component, state) {
   return _objectSpread(_objectSpread({}, component), {}, {
     getComponents: function getComponents(iteration) {
       return (0, _fillComponents["default"])(component.components, _objectSpread(_objectSpread({}, state), {}, {
-        handleChange: function handleChange(response, value) {
-          state.handleChange(response, value, {
-            iteration: [iteration]
-          });
-        },
+        handleChange: createChangeHandlerForIteration(state.handleChange, iteration),
         pager: _objectSpread(_objectSpread({}, state.pager), {}, {
           iteration: iteration,
           subPage: 0 // Fake a subpage to simulate an iteration
@@ -73,6 +69,27 @@ function fillChildComponentsWithIteration(component, state) {
   });
 }
 
+// Create change handler memoized for every iteration
+var changeHandler = null;
+var changeHandlerMap = new Map();
+function createChangeHandlerForIteration(handleChange, iteration) {
+  if (handleChange !== changeHandler) {
+    changeHandler = handleChange;
+    changeHandlerMap.clear();
+  }
+  var handler = changeHandlerMap.get(iteration);
+  if (handler) {
+    return handler;
+  }
+  handler = function handler(response, value) {
+    handleChange(response, value, {
+      iteration: [iteration]
+    });
+  };
+  changeHandlerMap.set(iteration, handler);
+  return handler;
+}
+
 /**
  * For pairwise, inject a method to retrieve component at a specific iteration combination
  */

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

@@ -260,6 +260,11 @@ var LunaticVariable = /*#__PURE__*/function () {
 
       // Calculate bindings first to refresh "updatedAt" on calculated dependencies
       var bindings = this.getDependenciesValues(iteration);
+      // A variable without binding is a primitive (string, boolean...)
+      // it yields the same results for every iteration, so we can ignore iteration
+      if (Object.keys(bindings).length === 0) {
+        iteration = undefined;
+      }
       if (!this.isOutdated(iteration)) {
         return this.getSavedValue(iteration);
       }

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

@@ -212,6 +212,16 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
       (0, _vitest.expect)(variables.get('AGE', [1])).toEqual(12);
       (0, _vitest.expect)(variables.get('AGE_AND_MAX', [0])).toEqual(13);
     });
+    (0, _vitest.it)('should handle primitive value', function () {
+      variables.run('"hello"', {
+        iteration: [0]
+      });
+      variables.run('"hello"', {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.run('"hello"')).toEqual('hello');
+      (0, _vitest.expect)(variables.interpretCount).toBe(1);
+    });
   });
   (0, _vitest.describe)('resizing', function () {
     (0, _vitest.it)('should resize variables', function () {

package/lib/use-lunatic/hooks/use-page-has-response.js

@@ -19,8 +19,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
  */
 function usePageHasResponse(components, executeExpression) {
   return (0, _react.useCallback)(function () {
-    if (!Array.isArray(components)) {
-      return false;
+    if (!Array.isArray(components) || components.length === 0) {
+      return true;
     }
     var _iterator = _createForOfIteratorHelper(components),
       _step;
@@ -28,9 +28,16 @@ function usePageHasResponse(components, executeExpression) {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var component = _step.value;
         // Some components are considered as "filled" by default
-        if (['PairwiseLinks', 'Roundabout'].includes(component.componentType)) {
+        // We assume they are not in the same page has other components
+        if (['PairwiseLinks', 'Roundabout', 'Sequence', 'Subsequence'].includes(component.componentType)) {
           return true;
         }
+
+        // We have a missing response for this component
+        if ('missingResponse' in component && component.missingResponse && component.missingResponse.value) {
+          return true;
+        }
+
         // For Table, we have to extract components from its body and apply isSubComponentsEmpty function
         if (component.componentType === 'Table') {
           // Body is array for array (row), each "cell" could be an Label or Component, so we filter array.
@@ -47,6 +54,7 @@ function usePageHasResponse(components, executeExpression) {
         if ('value' in component && !isEmpty(component.value)) {
           return true;
         }
+
         // For rosterForLoop we need to inspect child components
         if ('components' in component && Array.isArray(component.components) && !isSubComponentsEmpty(component.components, executeExpression)) {
           return true;

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

@@ -4,15 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  resizeArrayVariable: true,
-  isLoopComponent: true
+  resizeArrayVariable: true
 };
-Object.defineProperty(exports, "isLoopComponent", {
-  enumerable: true,
-  get: function get() {
-    return _isLoopComponent.isLoopComponent;
-  }
-});
 Object.defineProperty(exports, "resizeArrayVariable", {
   enumerable: true,
   get: function get() {
@@ -20,7 +13,6 @@ Object.defineProperty(exports, "resizeArrayVariable", {
   }
 });
 var _resizeArrayVariable = _interopRequireDefault(require("./resize-array-variable"));
-var _isLoopComponent = require("./is-loop-component");
 var _validateConditionFilter = require("./validate-condition-filter");
 Object.keys(_validateConditionFilter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/utils/array.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.firstItem = firstItem;
 exports.getAtIndex = getAtIndex;
 exports.resizeArray = resizeArray;
 exports.setAtIndex = setAtIndex;
@@ -81,4 +82,24 @@ function resizeArray(array, newLength, defaultValue) {
   return new Array(newLength).fill(defaultValue !== null && defaultValue !== void 0 ? defaultValue : null).map(function (value, index) {
     return index < array.length ? array[index] : value;
   }, []);
+}
+function firstItem(items) {
+  if (!Array.isArray(items)) {
+    return items;
+  }
+  var _iterator2 = _createForOfIteratorHelper(items),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var item = _step2.value;
+      if (item !== undefined) {
+        return item;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return undefined;
 }

package/lib/utils/variables.js

@@ -8,29 +8,18 @@ exports.getInitialVariableValue = getInitialVariableValue;
  * Extract the initial value from the source.json and data.json
  */
 function getInitialVariableValue(variable) {
-  var _data$variable$variab;
+  var _data$variable$variab, _data$COLLECTED;
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   switch (variable.variableType) {
     case 'EXTERNAL':
     case 'CALCULATED':
       return (_data$variable$variab = data[variable.variableType]) === null || _data$variable$variab === void 0 ? void 0 : _data$variable$variab[variable.name];
     case 'COLLECTED':
-      var collectedData = data.COLLECTED;
-      var fromData;
-      if (collectedData && variable.name in collectedData) {
-        var _collectedData$variab = collectedData[variable.name],
-          COLLECTED = _collectedData$variab.COLLECTED,
-          FORCED = _collectedData$variab.FORCED;
-        fromData = COLLECTED !== null && COLLECTED !== void 0 ? COLLECTED : FORCED;
-      }
+      var fromData = (_data$COLLECTED = data.COLLECTED) === null || _data$COLLECTED === void 0 || (_data$COLLECTED = _data$COLLECTED[variable.name]) === null || _data$COLLECTED === void 0 ? void 0 : _data$COLLECTED.COLLECTED;
       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 fromData !== null && fromData !== void 0 ? fromData : variable.values.COLLECTED;
       }
-      return undefined;
+      return fromData;
     default:
       return null;
   }

package/lib/utils/variables.spec.js

@@ -0,0 +1,74 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _variables = require("./variables");
+var data = {
+  EXTERNAL: {
+    ADRESSE: 'mon adresse'
+  },
+  CALCULATED: {
+    PRENOMSB: ['Paul', 'Pierre']
+  },
+  COLLECTED: {
+    NB_HAB: {
+      COLLECTED: 2
+    },
+    PRENOMS: {
+      COLLECTED: ['Paul', 'Pierre'],
+      EDITED: [],
+      INPUTED: [],
+      FORCED: [],
+      PREVIOUS: []
+    },
+    AGE: {}
+  }
+};
+var externalVariable = {
+  variableType: 'EXTERNAL',
+  name: 'ADRESSE'
+};
+var calculatedVariable = {
+  variableType: 'CALCULATED',
+  bindingDependencies: ['PRENOMS'],
+  expression: {
+    type: 'VTL',
+    value: 'PRENOMS'
+  },
+  name: 'PRENOMSB',
+  shapeFrom: 'PRENOMS'
+};
+var simpleCollectedVariable = {
+  variableType: 'COLLECTED',
+  name: 'NB_HAB'
+};
+var loopCollectedVariable = {
+  variableType: 'COLLECTED',
+  values: {
+    COLLECTED: []
+  },
+  name: 'PRENOMS'
+};
+var emptyCollectedVariable = {
+  variableType: 'COLLECTED',
+  name: 'AGE'
+};
+(0, _vitest.describe)('getInitialVariableValue', function () {
+  (0, _vitest.it)('should return external value', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(externalVariable, data)).toEqual('mon adresse');
+  });
+  (0, _vitest.it)('should return calculated value', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(calculatedVariable, data)).toEqual(['Paul', 'Pierre']);
+  });
+  (0, _vitest.it)('should return collected value out of a loop', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(simpleCollectedVariable, data)).toEqual(2);
+  });
+  (0, _vitest.it)('should return array of collected values in a loop', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(loopCollectedVariable, data)).toEqual(['Paul', 'Pierre']);
+  });
+  (0, _vitest.it)('should return undefined value out of a loop', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(emptyCollectedVariable, data)).toEqual(undefined);
+  });
+  (0, _vitest.it)('should set empty undefined if no data', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(simpleCollectedVariable)).toEqual(undefined);
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.13",
+	"version": "2.7.15",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {