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

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;

package/src/utils/array.spec.ts

@@ -1,10 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import {
-	firstValueItem,
-	resizeArray,
-	resizeDownArrayWithIndex,
-	setAtIndex,
-} from './array';
+import { firstValueItem, resizeArray, setAtIndex } from './array';
 
 describe('array', () => {
 	describe('resizeArray()', () => {
@@ -50,16 +45,4 @@ describe('array', () => {
 		expect(firstValueItem([null, 1, 2])).toBe(1);
 		expect(firstValueItem([null, undefined, false])).toBe(false);
 	});
-	describe('resizeDownArrayWithIndex()', () => {
-		it('should remove an element of array', () => {
-			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 2)).toEqual([1, 2, 4]);
-			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 0)).toEqual([2, 3, 4]);
-			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 3)).toEqual([1, 2, 3]);
-		});
-
-		it('should not remove element (out of index)', () => {
-			expect(resizeDownArrayWithIndex([1, 2, 3, 4], -1)).toEqual([1, 2, 3, 4]);
-			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 4)).toEqual([1, 2, 3, 4]);
-		});
-	});
 });

package/src/utils/array.ts

@@ -51,9 +51,6 @@ export function getAtIndex(arr: unknown, indexes: number[]): unknown {
 	return current;
 }
 
-/**
- * Cast the variable into an array and adjust the length if necessary
- */
 export function resizeArray<T = unknown>(
 	array: unknown,
 	newLength: number,
@@ -66,29 +63,14 @@ export function resizeArray<T = unknown>(
 	if (array.length === newLength) {
 		return array;
 	}
-	return new Array(newLength).fill(defaultValue ?? null).reduce(function (
-		step,
-		current,
+	return new Array(newLength).fill(defaultValue ?? null).map(function (
+		value,
 		index
 	) {
-		if (index < array.length) {
-			return [...step, array[index]];
-		}
-		return [...step, current];
+		return index < array.length ? array[index] : value;
 	}, []);
 }
 
-export function resizeDownArrayWithIndex<T = unknown>(
-	array: T[],
-	removedIndex: number
-): T[] {
-	// the removedIndex is not in array
-	if (0 > removedIndex || array.length <= removedIndex) {
-		return array;
-	}
-	return [...array].filter((_, i) => i !== removedIndex);
-}
-
 /**
  * Return the first non-null/undefined value of an array
  */