@inseefr/lunatic 3.4.11-rc.0 → 3.5.0-rc.0

package/src/use-lunatic/__snapshots__/use-lunatic.test.ts.snap

@@ -1855,6 +1855,329 @@ exports[`use-lunatic() > overview > with loop > should handle initialPage 1`] =
 ]
 `;
 
+exports[`use-lunatic() > overview > with loop > should handle lastReachedPage 1`] = `
+[
+  {
+    "children": [
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lujqeci5",
+        "label": <MDLabel
+          expression="Votre santé"
+        />,
+        "page": "2",
+        "reached": true,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lujqbyzl",
+        "label": <MDLabel
+          expression="Votre logement"
+        />,
+        "page": "3",
+        "reached": true,
+        "type": "Subsequence",
+      },
+    ],
+    "current": true,
+    "description": undefined,
+    "id": "lujqfpva",
+    "label": <MDLabel
+      expression="I - Séquence 1"
+    />,
+    "page": "1",
+    "reached": true,
+    "type": "Sequence",
+  },
+  {
+    "children": [
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lulbmyhr",
+        "label": <MDLabel
+          expression="Commentaire sur composition du logement"
+        />,
+        "page": "8",
+        "reached": true,
+        "type": "Subsequence",
+      },
+    ],
+    "current": false,
+    "description": undefined,
+    "id": "lujqrqmp",
+    "label": <MDLabel
+      expression="II - Habitants du logement"
+    />,
+    "page": "5",
+    "reached": true,
+    "type": "Sequence",
+  },
+  {
+    "children": [
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lujykwaz",
+        "label": <MDLabel
+          expression="Caractéristiques de Quentin"
+        />,
+        "page": "10.1#1",
+        "reached": true,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lujykwaz",
+        "label": <MDLabel
+          expression="Caractéristiques de Luna"
+        />,
+        "page": "10.1#2",
+        "reached": true,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lujykwaz",
+        "label": <MDLabel
+          expression="Caractéristiques de Paul"
+        />,
+        "page": "10.1#3",
+        "reached": true,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lujyik5q",
+        "label": <MDLabel
+          expression="Autres caractéristiques de Luna : filtrée pour le premier individu"
+        />,
+        "page": "11.1#2",
+        "reached": true,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "luk0swcz",
+        "label": <MDLabel
+          expression="Encore d'autres caractéristiques de Luna : filtrée pour le premier individu"
+        />,
+        "page": "11.2#2",
+        "reached": true,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lujyik5q",
+        "label": <MDLabel
+          expression="Autres caractéristiques de Paul : filtrée pour le premier individu"
+        />,
+        "page": "11.1#3",
+        "reached": false,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "luk0swcz",
+        "label": <MDLabel
+          expression="Encore d'autres caractéristiques de Paul : filtrée pour le premier individu"
+        />,
+        "page": "11.2#3",
+        "reached": false,
+        "type": "Subsequence",
+      },
+    ],
+    "current": false,
+    "description": undefined,
+    "id": "lujyi4pe",
+    "label": <MDLabel
+      expression="III - Détail des individus"
+    />,
+    "page": "9",
+    "reached": true,
+    "type": "Sequence",
+  },
+  {
+    "children": [
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lumfc98o",
+        "label": <MDLabel
+          expression="Belle sous-séquence pour Quentin"
+        />,
+        "page": "12.2#1",
+        "reached": false,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lumfe3bj",
+        "label": <MDLabel
+          expression="Autre belle sous-seq"
+        />,
+        "page": "12.3#1",
+        "reached": false,
+        "type": "Subsequence",
+      },
+    ],
+    "current": false,
+    "description": undefined,
+    "id": "luk1ojt5",
+    "label": <MDLabel
+      expression="IV - Belle séquence pour Quentin"
+    />,
+    "page": "12.1#1",
+    "reached": false,
+    "type": "Sequence",
+  },
+  {
+    "children": [],
+    "current": false,
+    "description": undefined,
+    "id": "lulbelgr",
+    "label": <MDLabel
+      expression="V - Autre séquence pour Quentin"
+    />,
+    "page": "12.4#1",
+    "reached": false,
+    "type": "Sequence",
+  },
+  {
+    "children": [
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lumfc98o",
+        "label": <MDLabel
+          expression="Belle sous-séquence pour Luna"
+        />,
+        "page": "12.2#2",
+        "reached": false,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lumfe3bj",
+        "label": <MDLabel
+          expression="Autre belle sous-seq"
+        />,
+        "page": "12.3#2",
+        "reached": false,
+        "type": "Subsequence",
+      },
+    ],
+    "current": false,
+    "description": undefined,
+    "id": "luk1ojt5",
+    "label": <MDLabel
+      expression="IV - Belle séquence pour Luna"
+    />,
+    "page": "12.1#2",
+    "reached": false,
+    "type": "Sequence",
+  },
+  {
+    "children": [],
+    "current": false,
+    "description": undefined,
+    "id": "lulbelgr",
+    "label": <MDLabel
+      expression="V - Autre séquence pour Luna"
+    />,
+    "page": "12.4#2",
+    "reached": false,
+    "type": "Sequence",
+  },
+  {
+    "children": [
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lumfc98o",
+        "label": <MDLabel
+          expression="Belle sous-séquence pour Paul"
+        />,
+        "page": "12.2#3",
+        "reached": false,
+        "type": "Subsequence",
+      },
+      {
+        "children": [],
+        "current": false,
+        "description": undefined,
+        "id": "lumfe3bj",
+        "label": <MDLabel
+          expression="Autre belle sous-seq"
+        />,
+        "page": "12.3#3",
+        "reached": false,
+        "type": "Subsequence",
+      },
+    ],
+    "current": false,
+    "description": undefined,
+    "id": "luk1ojt5",
+    "label": <MDLabel
+      expression="IV - Belle séquence pour Paul"
+    />,
+    "page": "12.1#3",
+    "reached": false,
+    "type": "Sequence",
+  },
+  {
+    "children": [],
+    "current": false,
+    "description": undefined,
+    "id": "lulbelgr",
+    "label": <MDLabel
+      expression="V - Autre séquence pour Paul"
+    />,
+    "page": "12.4#3",
+    "reached": false,
+    "type": "Sequence",
+  },
+  {
+    "children": [],
+    "current": false,
+    "description": undefined,
+    "id": "COMMENT-SEQ",
+    "label": <MDLabel
+      expression="Commentaire"
+    />,
+    "page": "13",
+    "reached": false,
+    "type": "Sequence",
+  },
+]
+`;
+
 exports[`use-lunatic() > overview > with loop > should work with loop 1`] = `
 [
   {

package/src/use-lunatic/commons/variables/behaviours/resizing-behaviour.ts

@@ -1,8 +1,9 @@
 import type { LunaticVariablesStore } from '../lunatic-variables-store';
 import type { LunaticSource } from '../../../type';
 import { forceInt } from '../../../../utils/number';
+import { resizeArrayVariable } from '../../../reducer/commons';
 import { getExpressionAsString } from '../../../../utils/vtl';
-import { resizeArray, resizeDownArrayWithIndex } from '../../../../utils/array';
+import { resizeArray } from '../../../../utils/array';
 
 /**
  * Resizing behaviour for the store
@@ -41,20 +42,8 @@ export function resizingBehaviour(
 		const newSize = forceInt(store.run(resizingInfo.size));
 		for (const variableName of resizingInfo.variables) {
 			const value = store.get(variableName);
-			if (Array.isArray(value) && e.detail.removedIndex) {
-				store.set(
-					variableName,
-					resizeDownArrayWithIndex(value, e.detail.removedIndex),
-					{
-						cause: 'resizing',
-					}
-				);
-			}
-			if (
-				!e.detail.removedIndex &&
-				(!Array.isArray(value) || value.length !== newSize)
-			) {
-				store.set(variableName, resizeArray(value, newSize, null), {
+			if (!Array.isArray(value) || value.length !== newSize) {
+				store.set(variableName, resizeArrayVariable(value, newSize, null), {
 					cause: 'resizing',
 				});
 			}
@@ -72,7 +61,6 @@ function resizePairwise(
 	},
 	args: {
 		iteration?: number[];
-		removedIndex?: number;
 	}
 ) {
 	// Handle expression being sent as an array or an object (ensure backward compatibility)
@@ -90,25 +78,12 @@ function resizePairwise(
 	});
 	resizingInfo.linksVariables.forEach((variable) => {
 		const value = store.get(variable, args.iteration);
-		let resizedValue;
-		if (args.removedIndex) {
-			const removedIndex = args.removedIndex;
-			resizedValue = resizeDownArrayWithIndex(
-				Array.isArray(value)
-					? value.map((i) => resizeDownArrayWithIndex(i, removedIndex))
-					: [],
-				removedIndex
-			);
-		} else {
-			resizedValue = resizeArray(
-				// The value is not an array, force an array
-				Array.isArray(value)
-					? value.map((i) => resizeArray(i, ySize, null))
-					: [],
-				xSize,
-				new Array(ySize).fill(null)
-			);
-		}
+		const resizedValue = resizeArray(
+			// The value is not an array, force an array
+			Array.isArray(value) ? value.map((i) => resizeArray(i, ySize, null)) : [],
+			xSize,
+			new Array(ySize).fill(null)
+		);
 		store.set(variable, resizedValue);
 	});
 }

package/src/use-lunatic/commons/variables/lunatic-variables-store.spec.ts

@@ -281,28 +281,6 @@ describe('lunatic-variables-store', () => {
 				cause: 'resizing',
 			});
 		});
-
-		it('should resize variables with Index', () => {
-			variables.set('PRENOM', ['John', 'Jane', 'Marc']);
-			variables.set('AGE', [20, 30, 40]);
-			const spy = vi.fn();
-			variables.on('change', (e) => spy(e.detail));
-			resizingBehaviour(variables, {
-				PRENOM: {
-					size: 'count(PRENOM)',
-					variables: ['AGE'],
-				},
-			});
-			variables.set('PRENOM', ['John', 'Marc'], { removedIndex: 1 });
-			expect((variables.get('PRENOM') as string[]).length).toEqual(2);
-			expect((variables.get('AGE') as string[]).length).toEqual(2);
-			expect(spy).toHaveBeenLastCalledWith({
-				name: 'AGE',
-				value: [20, 40],
-				cause: 'resizing',
-			});
-		});
-
 		it('should resize pairwise with the array syntax', () => {
 			variables.set('PRENOM', []);
 			variables.set('LINKS', [[]]);
@@ -338,29 +316,7 @@ describe('lunatic-variables-store', () => {
 				[null, null, null],
 			]);
 		});
-		it('should resize pairwise with the object syntax with index', () => {
-			variables.set('PRENOM', ['John', 'Jane', 'Marc']);
-			variables.set('LINKS', [
-				[null, 2, 4],
-				[1, null, 2],
-				[3, 2, null],
-			]);
-			resizingBehaviour(variables, {
-				PRENOM: {
-					sizeForLinksVariables: {
-						xAxisSize: 'count(PRENOM)',
-						yAxisSize: 'count(PRENOM)',
-					},
-					linksVariables: ['LINKS'],
-				},
-			});
-			variables.set('PRENOM', ['John', 'Marc'], { removedIndex: 1 });
-			expect(variables.get('LINKS') as string[][]).toEqual([
-				[null, 4],
-				[3, null],
-			]);
-		});
-		it('should handle both: pairwise and normal resize', () => {
+		it('should handle both pairwise and normal resize', () => {
 			variables.set('PRENOM', []);
 			variables.set('NOM', []);
 			variables.set('LINKS', [[]]);
@@ -380,29 +336,6 @@ describe('lunatic-variables-store', () => {
 			]);
 			expect(variables.get('NOM') as string[]).toEqual([null, null, null]);
 		});
-		it('should handle both: pairwise and normal resize with index', () => {
-			variables.set('PRENOM', ['John', 'Jane', 'Marc']);
-			variables.set('AGE', [40, 30, 20]);
-			variables.set('LINKS', [
-				[null, 2, 4],
-				[1, null, 2],
-				[3, 2, null],
-			]);
-			resizingBehaviour(variables, {
-				PRENOM: {
-					sizeForLinksVariables: ['count(PRENOM)', 'count(PRENOM)'],
-					linksVariables: ['LINKS'],
-					size: 'count(PRENOM)',
-					variables: ['AGE'],
-				},
-			});
-			variables.set('PRENOM', ['John', 'Marc'], { removedIndex: 1 });
-			expect(variables.get('LINKS') as string[][]).toEqual([
-				[null, 4],
-				[3, null],
-			]);
-			expect(variables.get('AGE') as string[]).toEqual([40, 20]);
-		});
 	});
 
 	describe('cleaning', () => {

package/src/use-lunatic/commons/variables/lunatic-variables-store.ts

@@ -33,8 +33,6 @@ export type EventArgs = {
 		value: unknown;
 		/** Iteration changed (for array). */
 		iteration?: IterationLevel | undefined;
-		/** removedIndex: when resize an array directly with only one handleChange (remove one line in tableLoop) */
-		removedIndex?: number;
 		/** What triggered this change. */
 		cause?: 'resizing' | 'cleaning';
 		/** Extra sent when setting the variable. */
@@ -62,7 +60,7 @@ export class LunaticVariablesStore {
 		if (!source.variables) {
 			return store;
 		}
-		// Source data (picked from "variables" in the source.json)s
+		// Source data (picked from "variables" in the source.json)
 		const sourceValues: Record<string, unknown> = {};
 		// Starting data for the form (merged with data.json or injected data)
 		const initialValues: Record<string, unknown> = {};
@@ -125,7 +123,7 @@ export class LunaticVariablesStore {
 	public set(
 		name: string,
 		value: unknown,
-		args: Pick<EventArgs['change'], 'iteration' | 'cause' | 'removedIndex'> = {}
+		args: Pick<EventArgs['change'], 'iteration' | 'cause'> = {}
 	): LunaticVariable {
 		if (!this.dictionary.has(name)) {
 			this.dictionary.set(

package/src/use-lunatic/reducer/commons/index.ts

@@ -1 +1,2 @@
+export { default as resizeArrayVariable } from './resize-array-variable';
 export * from './validate-condition-filter';

package/src/use-lunatic/reducer/commons/resize-array-variable.ts

@@ -0,0 +1,28 @@
+/**
+ * Cast the variable into an array and adjust the length if necessary
+ */
+function resizeArrayVariable<T = unknown>(
+	array: unknown,
+	length: number,
+	defaultValue?: T
+): T[] {
+	if (!Array.isArray(array)) {
+		// create the array
+		return new Array(length).fill(defaultValue);
+	} else if (array.length !== length) {
+		// renew array end keep previous values
+		return new Array(length).fill(defaultValue).reduce(function (
+			step,
+			current,
+			index
+		) {
+			if (index < array.length) {
+				return [...step, array[index]];
+			}
+			return [...step, current];
+		}, []);
+	}
+	return array;
+}
+
+export default resizeArrayVariable;

package/src/use-lunatic/reducer/reducerInitializer.tsx

@@ -38,6 +38,8 @@ const baseState = {
 	options: { disableFilters: false },
 } satisfies LunaticReducerState;
 
+const onChange = { current: () => {} };
+
 export function reducerInitializer({
 	source,
 	data,
@@ -47,8 +49,8 @@ export function reducerInitializer({
 	withOverview = false,
 	disableFilters = false,
 	getReferentiel,
-	onVariableChange,
-	logger,
+	onVariableChange = onChange,
+	logger = console.error,
 }: {
 	source: LunaticSource;
 	data: LunaticData;
@@ -58,8 +60,8 @@ export function reducerInitializer({
 	withOverview?: LunaticOptions['withOverview'];
 	disableFilters?: LunaticOptions['disableFilters'];
 	getReferentiel?: LunaticOptions['getReferentiel'];
-	onVariableChange: RefObject<LunaticOptions['onVariableChange']>;
-	logger: LunaticLogger;
+	onVariableChange?: RefObject<LunaticOptions['onVariableChange']>;
+	logger?: LunaticLogger;
 }): LunaticReducerState {
 	const variables = LunaticVariablesStore.makeFromSource(
 		source,
@@ -110,11 +112,13 @@ export function reducerInitializer({
 			}
 			return result as any;
 		} catch (e) {
-			// If there is an error interpreting a variable, return the raw expression
-			logger({
-				type: 'ERROR',
-				error: e as Error,
-			});
+			if (logger) {
+				// If there is an error interpreting a variable, return the raw expression
+				logger({
+					type: 'ERROR',
+					error: e as Error,
+				});
+			}
 			return expressionString;
 		}
 	};
@@ -131,9 +135,9 @@ export function reducerInitializer({
 	const pager = {
 		page: initialPager?.page ?? 1,
 		maxPage: source.maxPage ? parseInt(source.maxPage, 10) : 1,
-		subPage: undefined,
+		subPage: initialPager?.subPage,
 		nbSubPages: undefined,
-		iteration: undefined,
+		iteration: initialPager?.iteration,
 		nbIterations: undefined,
 		lastReachedPage: lastReachedPage ?? initialPage,
 	};
@@ -143,7 +147,7 @@ export function reducerInitializer({
 		pager,
 		previousPager: pager,
 		pages,
-		isInLoop: false,
+		isInLoop: pager.subPage !== undefined,
 		updatedAt: Date.now(),
 		overview: withOverview ? buildOverview(source) : [],
 		updateBindings,
@@ -161,22 +165,29 @@ function fillPagerForLoop(state: LunaticReducerState): LunaticReducerState {
 		return state;
 	}
 	const { isLoop, subPages, iterations, loopDependencies } = pages[pager.page];
-	if (!isLoop) {
-		return state;
+
+	if (
+		// For loop, jump at the first page
+		isLoop ||
+		// For roundabout, jump at the desired iteration / subpage (only if defined)
+		(pager?.iteration !== undefined && subPages)
+	) {
+		return {
+			...state,
+			isInLoop: true,
+			pager: {
+				...pager,
+				subPage: pager?.subPage ?? 1,
+				nbSubPages: (subPages ?? []).length,
+				iteration: pager?.iteration ?? 0,
+				nbIterations: forceInt(
+					state.executeExpression(iterations, {
+						deps: loopDependencies,
+					})
+				),
+			},
+		};
 	}
-	return {
-		...state,
-		isInLoop: true,
-		pager: {
-			...pager,
-			subPage: pager?.subPage ?? 0,
-			nbSubPages: (subPages ?? []).length,
-			iteration: pager?.iteration ?? 0,
-			nbIterations: forceInt(
-				state.executeExpression(iterations, {
-					deps: loopDependencies,
-				})
-			),
-		},
-	};
+
+	return state;
 }

package/src/use-lunatic/type.ts

@@ -349,6 +349,5 @@ export type LunaticChangesHandler = (
 		name: string;
 		value: any;
 		iteration?: number[];
-		removedIndex?: number;
 	}[]
 ) => void;