@inseefr/lunatic 2.6.5 → 2.6.7

package/lib/components/summary/html/summary-responses.js

@@ -19,8 +19,7 @@ function ListResponses(_ref) {
   });
 }
 function Responses(_ref2) {
-  var values = _ref2.values,
-    sectionIndex = _ref2.sectionIndex;
+  var values = _ref2.values;
   if (!values) {
     return null;
   }
@@ -31,7 +30,7 @@ function Responses(_ref2) {
         id = _ref3.id;
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
         children: [label, " : ", value]
-      }, "".concat(id, "-").concat(sectionIndex));
+      }, "response-".concat(index));
     })
   });
 }
@@ -48,8 +47,7 @@ function SummaryResponses(_ref4) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(ListResponses, {
         title: title,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Responses, {
-          values: values,
-          sectionIndex: index
+          values: values
         })
       }, "".concat(id, "-").concat(index));
     })

package/lib/src/components/loop/block-for-loop.d.ts

@@ -14,6 +14,7 @@ export declare const BlockForLoop: import("react").ComponentType<import("../type
         linksIterations?: number[] | undefined;
         logging?: import("../../use-lunatic/commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     value: Record<string, unknown[]>;
     headers?: {

package/lib/src/components/loop/roster-for-loop/roster-for-loop.d.ts

@@ -14,6 +14,7 @@ export declare const RosterForLoop: import("react").ComponentType<import("../../
         linksIterations?: number[] | undefined;
         logging?: import("../../../use-lunatic/commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     value: Record<string, unknown[]>;
     headers?: {

package/lib/src/use-lunatic/commons/execute-expression/create-refresh-calculated.d.ts

@@ -16,9 +16,10 @@ type Args = {
  */
 declare function createRefreshCalculated({ variables, execute, bindings }: Args): readonly [(map: {
     [variableName: string]: unknown;
-}, { rootExpression, iteration, linksIterations, }?: {
+}, { rootExpression, iteration, linksIterations, skipCleaningRefresh, }?: {
     rootExpression?: string | undefined;
     iteration?: number | undefined;
     linksIterations?: number[] | undefined;
+    skipCleaningRefresh?: boolean | undefined;
 }) => Record<string, unknown>, (name: string, variable: LunaticVariable) => void];
 export default createRefreshCalculated;

package/lib/src/use-lunatic/commons/fill-components/fill-from-state.d.ts

@@ -20,6 +20,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -55,6 +56,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -91,6 +93,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -163,6 +166,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -208,6 +212,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -279,6 +284,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -319,6 +325,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -358,6 +365,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -398,6 +406,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -435,6 +444,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -476,6 +486,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -512,6 +523,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -553,6 +565,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -593,6 +606,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -632,6 +646,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -668,6 +683,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -706,6 +722,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -741,6 +758,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -776,6 +794,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {
@@ -812,6 +831,7 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
         linksIterations?: number[] | undefined;
         logging?: import("../execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     preferences: ["COLLECTED"];
     goToPage: (page: {

package/lib/src/use-lunatic/reducer/overview/overview-on-init.d.ts

@@ -84,6 +84,7 @@ export declare function reduceOverviewOnInit(state: LunaticState, action: Action
         linksIterations?: number[] | undefined;
         logging?: import("../../commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
         bindingDependencies?: string[] | undefined;
+        skipCleaningRefresh?: boolean | undefined;
     } | undefined) => T;
     updateBindings: (variableName: string, value: unknown) => unknown;
     activeControls: boolean;

package/lib/src/use-lunatic/type.d.ts

@@ -125,6 +125,7 @@ export type LunaticState = {
         linksIterations?: number[];
         logging?: ExpressionLogger;
         bindingDependencies?: string[];
+        skipCleaningRefresh?: boolean;
     }) => T;
     updateBindings: (variableName: string, value: unknown) => unknown;
     activeControls: boolean;

package/lib/src/use-lunatic/use-lunatic.d.ts

@@ -72,6 +72,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -91,6 +92,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -113,6 +115,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 iteration: number | undefined;
             };
@@ -225,6 +228,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 xAxisIterations: number;
                 yAxisIterations: number;
@@ -321,6 +325,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -340,6 +345,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -362,6 +368,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 iteration: number | undefined;
             };
@@ -474,6 +481,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"CALCULA
                     linksIterations?: number[] | undefined;
                     logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
                     bindingDependencies?: string[] | undefined;
+                    skipCleaningRefresh?: boolean | undefined;
                 } | undefined) => T;
                 xAxisIterations: number;
                 yAxisIterations: number;

package/lib/stories/behaviour/cleaning/{test.stories.js → cleaning.stories.js}

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.Loop = exports.Default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
 var _source = _interopRequireDefault(require("./source.json"));
+var _sourceLoop = _interopRequireDefault(require("./source-loop.json"));
 var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-types"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -79,6 +80,13 @@ var Template = function Template(args) {
 var Default = Template.bind({});
 exports.Default = Default;
 Default.args = {
-  id: 'resizing-default',
+  id: 'cleaning-default',
   pagination: true
+};
+var Loop = Template.bind({});
+exports.Loop = Loop;
+Loop.args = {
+  id: 'cleaning-loop',
+  pagination: true,
+  source: _sourceLoop["default"]
 };

package/lib/stories/behaviour/cleaning/source-loop.json

@@ -0,0 +1,130 @@
+{
+	"resizing": {
+		"PRENOM": {
+			"variables": ["AGE", "HIDE_AGE"],
+			"size": "count(PRENOM)"
+		}
+	},
+	"cleaning": {
+		"HIDE_AGE": {
+			"AGE": "false"
+		}
+	},
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": ["John", "Jane"],
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "PRENOM"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": [null],
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "AGE"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": [null],
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "HIDE_AGE"
+		}
+	],
+	"components": [
+		{
+			"componentType": "Loop",
+			"id": "loop",
+			"label": "Ajouter",
+			"bindingDependencies": ["PRENOM"],
+			"lines": {
+				"min": { "value": 1, "type": "VTL" },
+				"max": { "value": 10, "type": "VTL" }
+			},
+			"page": "1",
+			"components": [
+				{
+					"componentType": "Input",
+					"label": "Prénom",
+					"bindingDependencies": ["PRENOM"],
+					"id": "prenom",
+					"response": {
+						"name": "PRENOM"
+					}
+				}
+			]
+		},
+		{
+			"componentType": "Loop",
+			"id": "loop2",
+			"paginatedLoop": true,
+			"bindingDependencies": ["PRENOM"],
+			"iterations": { "value": "count(PRENOM)", "type": "VTL" },
+			"page": "2",
+			"maxPage": "2",
+			"components": [
+				{
+					"componentType": "Input",
+					"label": {
+						"value": "\"Age de \" || PRENOM",
+						"type": "VTL"
+					},
+					"bindingDependencies": ["AGE"],
+					"id": "age",
+					"page": "2.1",
+					"response": {
+						"name": "AGE"
+					}
+				},
+				{
+					"componentType": "CheckboxBoolean",
+					"label": {
+						"value": "\"Masquer l'age de \" || PRENOM || \" ?\"",
+						"type": "VTL"
+					},
+					"bindingDependencies": ["HIDE_AGE"],
+					"id": "hideage",
+					"page": "2.2",
+					"response": {
+						"name": "HIDE_AGE"
+					}
+				}
+			]
+		},
+		{
+			"componentType": "Sequence",
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"id": "ksyjs7vy",
+			"page": "3",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"END\""
+			}
+		}
+	],
+	"pagination": "question",
+	"lunaticModelVersion": "2.3.2-rc4",
+	"modele": "TESTSURSUM",
+	"enoCoreVersion": "2.4.1-pairwise",
+	"generatingDate": "14-04-2023 09:00:09",
+	"missing": false,
+	"id": "lb3ei722",
+	"maxPage": "3"
+}

package/lib/stories/roundabout/source.json

@@ -84,11 +84,11 @@
 					"type": "VTL"
 				},
 				"complete": {
-					"value": "not(isnull(KNOWREC)) and not(isnull(SEXE)) and not(isnull(SOMETHING))",
+					"value": "COMPLETE",
 					"type": "VTL"
 				},
 				"partial": {
-					"value": "not(isnull(KNOWREC)) or not(isnull(SEXE)) or not(isnull(SOMETHING))",
+					"value": "PARTIAL",
 					"type": "VTL"
 				},
 				"label": {
@@ -96,22 +96,7 @@
 					"type": "VTL"
 				}
 			},
-			"controls": [
-				{
-					"id": "roundabout-Carefull",
-					"criticality": "WARN",
-					"control": {
-						"value": "not(isnull(KNOWREC)) and not(isnull(SEXE)) and not(isnull(SOMETHING))",
-						"type": "VTL"
-					},
-					"type": "roundabout",
-					"iterations": { "value": "NB_HAB", "type": "VTL" },
-					"errorMessage": {
-						"value": "\"Le formulaire n'est pas complet pour \" || PRENOMS",
-						"type": "VTL|MD"
-					}
-				}
-			],
+			"controls": [],
 			"components": [
 				{
 					"id": "radio",
@@ -278,6 +263,28 @@
 			"expression": { "value": "first_value(PRENOMS over())", "type": "VTL" },
 			"bindingDependencies": ["PRENOMS"],
 			"inFilter": "true"
+		},
+		{
+			"variableType": "CALCULATED",
+			"name": "COMPLETE",
+			"expression": {
+				"value": "not(isnull(KNOWREC)) and not(isnull(SEXE)) and not(isnull(SOMETHING))",
+				"type": "VTL"
+			},
+			"bindingDependencies": ["KNOWREC", "SEXE", "SOMETHING"],
+			"shapeFrom": "PRENOMS",
+			"inFilter": "true"
+		},
+		{
+			"variableType": "CALCULATED",
+			"name": "PARTIAL",
+			"expression": {
+				"value": "not(isnull(KNOWREC)) or not(isnull(SEXE)) or not(isnull(SOMETHING))",
+				"type": "VTL"
+			},
+			"bindingDependencies": ["KNOWREC", "SEXE", "SOMETHING"],
+			"shapeFrom": "PRENOMS",
+			"inFilter": "true"
 		}
 	],
 	"resizing": {

package/lib/use-lunatic/commons/execute-expression/create-execute-expression.js

@@ -214,7 +214,8 @@ function createExecuteExpression(variables, features) {
     }), {
       rootExpression: expression,
       iteration: iteration,
-      linksIterations: linksIterations
+      linksIterations: linksIterations,
+      skipCleaningRefresh: args.skipCleaningRefresh
     });
     // Add index has a specific variable
     vtlBindings['GLOBAL_ITERATION_INDEX'] = (((_args$iteration = args === null || args === void 0 ? void 0 : args.iteration) !== null && _args$iteration !== void 0 ? _args$iteration : 0) + 1).toString();

package/lib/use-lunatic/commons/execute-expression/create-refresh-calculated.js

@@ -107,7 +107,8 @@ function createRefreshCalculated(_ref) {
     var _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       rootExpression = _ref4.rootExpression,
       iteration = _ref4.iteration,
-      linksIterations = _ref4.linksIterations;
+      linksIterations = _ref4.linksIterations,
+      skipCleaningRefresh = _ref4.skipCleaningRefresh;
     return Object.entries(map).reduce(function (sub, _ref5) {
       var _ref6 = _slicedToArray(_ref5, 2),
         name = _ref6[0],
@@ -134,7 +135,7 @@ function createRefreshCalculated(_ref) {
           iteration: iteration,
           linksIterations: linksIterations
         });
-        if (iteration !== undefined) toRefreshVariables["delete"](name);
+        if (!skipCleaningRefresh) toRefreshVariables["delete"](name);
         return _objectSpread(_objectSpread({}, sub), {}, _defineProperty({}, name, value));
       }
       return _objectSpread(_objectSpread({}, sub), {}, _defineProperty({}, name, current));

package/lib/use-lunatic/commons/execute-expression/create-refresh-calculated.spec.js

@@ -88,8 +88,9 @@ var fakeExecute = function fakeExecute(bindings) {
       }),
       _createRefreshCalcula2 = _slicedToArray(_createRefreshCalcula, 1),
       refresh = _createRefreshCalcula2[0];
-    (0, _vitest.expect)(refresh(variables, {}).COUNT_AGES).toBe(3);
-    (0, _vitest.expect)(refresh(variables, {
+    var refreshedVariables = refresh(variables, {});
+    (0, _vitest.expect)(refreshedVariables.COUNT_AGES).toBe(3);
+    (0, _vitest.expect)(refresh(refreshedVariables, {
       iteration: 1
     }).COUNT_AGES).toBe(3);
     (0, _vitest.expect)(bindings.AGE).toEqual([10, 20, 30]);

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

@@ -24,15 +24,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * - expressions, VTL that states the level of completion for each iteration
  */
 function fillRoundaboutProps(component, state) {
-  var iterations = component.iterations,
-    expressions = component.expressions;
-  var compiled = Object.entries(expressions).reduce(function (result, _ref) {
+  var iterations = component.iterations; // iterations is the result of an expression but we know it's a number
+  var compiled = Object.entries(component.expressions).reduce(function (result, _ref) {
     var _ref2 = _slicedToArray(_ref, 2),
       name = _ref2[0],
       expression = _ref2[1];
     var values = new Array(iterations).fill(null).map(function (_, iteration) {
       return state.executeExpression(expression, {
-        iteration: iteration
+        iteration: iteration,
+        skipCleaningRefresh: iteration < iterations - 1
       });
     });
     return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, name, values));

package/lib/use-lunatic/reducer/reduce-handle-change/reduce-cleaning.js

@@ -65,7 +65,7 @@ function cleanedValue(variable, iteration) {
     var _variable$variable$va;
     initialValue = (_variable$variable$va = variable.variable.values.COLLECTED) !== null && _variable$variable$va !== void 0 ? _variable$variable$va : null;
   }
-  if (!iteration || !Array.isArray(variable.value)) {
+  if (iteration === undefined || !Array.isArray(variable.value)) {
     return initialValue;
   }
 

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

@@ -8,6 +8,7 @@ var _source2 = _interopRequireDefault(require("../stories/questionnaires/logemen
 var _source3 = _interopRequireDefault(require("../stories/questionnaires/simpsons/source.json"));
 var _source4 = _interopRequireDefault(require("../stories/component-set/source.json"));
 var _source5 = _interopRequireDefault(require("../stories/behaviour/cleaning/source.json"));
+var _sourceLoop = _interopRequireDefault(require("../stories/behaviour/cleaning/source-loop.json"));
 var _sourceResizingCleaning = _interopRequireDefault(require("../stories/behaviour/resizing/source-resizing-cleaning.json"));
 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); }
@@ -206,6 +207,35 @@ var dataFromObject = function dataFromObject(o) {
       });
       (0, _vitest.expect)(spy.mock.calls[2][1]).toEqual('US');
     });
+    (0, _vitest.it)('should handle cleaning in a loop', function () {
+      var _renderHook11 = (0, _reactHooks.renderHook)(function () {
+          return (0, _useLunatic["default"])(_sourceLoop["default"], undefined, {});
+        }),
+        result = _renderHook11.result;
+      (0, _reactHooks.act)(function () {
+        result.current.onChange({
+          name: 'PRENOM'
+        }, ['John', 'Doe', 'Marc']);
+        result.current.onChange({
+          name: 'AGE'
+        }, [18, 18, 18]);
+        // Go in the first iteration
+        result.current.goNextPage();
+        result.current.goNextPage();
+      });
+      var expectCollectedAgeToEqual = function expectCollectedAgeToEqual(expectation) {
+        (0, _vitest.expect)(result.current.getData(false).COLLECTED.AGE.COLLECTED).toEqual(expectation);
+      };
+      expectCollectedAgeToEqual([18, 18, 18]);
+      (0, _reactHooks.act)(function () {
+        result.current.onChange({
+          name: 'HIDE_AGE'
+        }, true, {
+          iteration: 0
+        });
+      });
+      expectCollectedAgeToEqual([null, 18, 18]);
+    });
   });
   (0, _vitest.describe)('resizing', function () {
     var expectValueForResponse = function expectValueForResponse(spy, responseName, expectedValue) {
@@ -217,12 +247,12 @@ var dataFromObject = function dataFromObject(o) {
     };
     (0, _vitest.it)('should resize after cleaning', function () {
       var spy = _vitest.vi.fn();
-      var _renderHook11 = (0, _reactHooks.renderHook)(function () {
+      var _renderHook12 = (0, _reactHooks.renderHook)(function () {
           return (0, _useLunatic["default"])(_sourceResizingCleaning["default"], undefined, {
             onChange: spy
           });
         }),
-        result = _renderHook11.result;
+        result = _renderHook12.result;
       result.current.onChange({
         name: 'NB'
       }, 3);
@@ -235,10 +265,10 @@ var dataFromObject = function dataFromObject(o) {
   });
   (0, _vitest.describe)('getComponents()', function () {
     (0, _vitest.describe)('componentSet', function () {
-      var _renderHook12 = (0, _reactHooks.renderHook)(function () {
+      var _renderHook13 = (0, _reactHooks.renderHook)(function () {
           return (0, _useLunatic["default"])(_source4["default"], undefined, {});
         }),
-        result = _renderHook12.result;
+        result = _renderHook13.result;
       var getComponents = function getComponents() {
         return result.current.getComponents();
       };

package/package.json

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