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

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

@@ -38,8 +38,6 @@ const baseState = {
 	options: { disableFilters: false },
 } satisfies LunaticReducerState;
 
-const onChange = { current: () => {} };
-
 export function reducerInitializer({
 	source,
 	data,
@@ -49,8 +47,8 @@ export function reducerInitializer({
 	withOverview = false,
 	disableFilters = false,
 	getReferentiel,
-	onVariableChange = onChange,
-	logger = console.error,
+	onVariableChange,
+	logger,
 }: {
 	source: LunaticSource;
 	data: LunaticData;
@@ -60,13 +58,14 @@ 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,
 		data,
-		onVariableChange
+		onVariableChange,
+		disableFilters
 	);
 	const pages = checkLoops(createMapPages(source));
 
@@ -112,13 +111,11 @@ export function reducerInitializer({
 			}
 			return result as any;
 		} catch (e) {
-			if (logger) {
-				// If there is an error interpreting a variable, return the raw expression
-				logger({
-					type: 'ERROR',
-					error: e as Error,
-				});
-			}
+			// If there is an error interpreting a variable, return the raw expression
+			logger({
+				type: 'ERROR',
+				error: e as Error,
+			});
 			return expressionString;
 		}
 	};
@@ -135,9 +132,9 @@ export function reducerInitializer({
 	const pager = {
 		page: initialPager?.page ?? 1,
 		maxPage: source.maxPage ? parseInt(source.maxPage, 10) : 1,
-		subPage: initialPager?.subPage,
+		subPage: undefined,
 		nbSubPages: undefined,
-		iteration: initialPager?.iteration,
+		iteration: undefined,
 		nbIterations: undefined,
 		lastReachedPage: lastReachedPage ?? initialPage,
 	};
@@ -147,7 +144,7 @@ export function reducerInitializer({
 		pager,
 		previousPager: pager,
 		pages,
-		isInLoop: pager.subPage !== undefined,
+		isInLoop: false,
 		updatedAt: Date.now(),
 		overview: withOverview ? buildOverview(source) : [],
 		updateBindings,
@@ -165,29 +162,22 @@ function fillPagerForLoop(state: LunaticReducerState): LunaticReducerState {
 		return state;
 	}
 	const { isLoop, subPages, iterations, loopDependencies } = pages[pager.page];
-
-	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,
-					})
-				),
-			},
-		};
+	if (!isLoop) {
+		return state;
 	}
-
-	return state;
+	return {
+		...state,
+		isInLoop: true,
+		pager: {
+			...pager,
+			subPage: pager?.subPage ?? 0,
+			nbSubPages: (subPages ?? []).length,
+			iteration: pager?.iteration ?? 0,
+			nbIterations: forceInt(
+				state.executeExpression(iterations, {
+					deps: loopDependencies,
+				})
+			),
+		},
+	};
 }

package/src/use-lunatic/test.utils.ts

@@ -0,0 +1,17 @@
+import { LunaticData } from './type';
+
+export const dataFromObject = (o: Record<string, unknown>): LunaticData => {
+	return {
+		EXTERNAL: {},
+		COLLECTED: Object.keys(o).reduce(
+			(acc, k) => ({
+				...acc,
+				[k]: {
+					COLLECTED: o[k],
+				},
+			}),
+			{}
+		),
+		CALCULATED: {},
+	};
+};

package/src/use-lunatic/type.ts

@@ -74,10 +74,6 @@ export type PageTag = `${number}.${number}#${number}` | `${number}`;
 export type LunaticVariable = Variable;
 export type LunaticCollectedValue = Partial<{
 	COLLECTED: unknown;
-	EDITED: unknown;
-	FORCED: unknown;
-	INPUTTED: unknown;
-	PREVIOUS: unknown;
 }>;
 
 // We need a mapped type to correlate type and variableType

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

@@ -9,29 +9,10 @@ import sourceCheckboxGroup from '../stories/checkbox-group/source.json';
 import dataOverview from '../stories/overview/dataLoop.json';
 import sourceCleaningLoop from '../stories/behaviour/cleaning/source-loop.json';
 import sourceCleaningResizing from '../stories/behaviour/resizing/source-resizing-cleaning.json';
-import type { LunaticData, PageTag } from './type';
+import type { PageTag } from './type';
 import { useLunatic } from './use-lunatic';
 import { useCallback } from 'react';
-
-const dataFromObject = (o: Record<string, unknown>): LunaticData => {
-	return {
-		EXTERNAL: {},
-		COLLECTED: Object.keys(o).reduce(
-			(acc, k) => ({
-				...acc,
-				[k]: {
-					EDITED: null,
-					FORCED: null,
-					INPUTTED: null,
-					PREVIOUS: null,
-					COLLECTED: o[k],
-				},
-			}),
-			{}
-		),
-		CALCULATED: {},
-	};
-};
+import { dataFromObject } from './test.utils';
 
 describe('use-lunatic()', () => {
 	const defaultParams = [

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

@@ -6,17 +6,18 @@ import {
 	handleChangesAction,
 } from './actions';
 import { getPageTag, isFirstLastPage } from './commons';
+
+import D from '../i18n';
+import { COLLECTED } from '../utils/constants';
+import { createLunaticProvider } from './lunatic-context';
 import type {
+	LunaticSource,
 	LunaticChangesHandler,
 	LunaticData,
 	LunaticOptions,
 	LunaticState,
 	PageTag,
 } from './type';
-import D from '../i18n';
-import { COLLECTED } from '../utils/constants';
-import { createLunaticProvider } from './lunatic-context';
-import type { LunaticSource } from './type';
 import { compileControls as compileControlsLib } from './commons/compile-controls';
 import { useLoopVariables } from './hooks/use-loop-variables';
 import { getQuestionnaireData } from './commons/variables/get-questionnaire-data';

package/src/utils/cast.ts

@@ -0,0 +1,67 @@
+/**
+ * Cast functions that force an unknown type to a specific type
+ */
+
+/**
+ * Force a number (throw if it cannot be converted)
+ */
+export function castNumber(v: unknown): number {
+	if (typeof v === 'number') {
+		return v;
+	}
+	if (typeof v === 'string') {
+		return parseInt(v, 10);
+	}
+	if (Array.isArray(v) && v.length > 0) {
+		return castNumber(v[0]);
+	}
+	throw new Error(`Cannot cast "${v}" to number`);
+}
+
+/**
+ * Force a number, with a default value if an unmanageable type is encountered
+ */
+export const castNumberWithDefault =
+	(initial: number = 0) =>
+	(v: unknown): number => {
+		try {
+			return castNumber(v);
+		} catch {
+			return initial;
+		}
+	};
+
+/**
+ * Force a bool
+ */
+export function castBool(v: unknown): boolean {
+	if (typeof v === 'boolean') {
+		return v;
+	}
+	if (Array.isArray(v) && v.length > 0) {
+		return castBool(v[0]);
+	}
+	if (Array.isArray(v)) {
+		return false;
+	}
+	return Boolean(v);
+}
+
+/**
+ * Force a string
+ */
+export function castString(v: unknown): string {
+	if (typeof v === 'string') {
+		return v;
+	}
+	if (typeof v === 'number') {
+		return v.toString();
+	}
+	if (Array.isArray(v)) {
+		return v.map(castString).join(', ');
+	}
+	if (!v) {
+		return '';
+	}
+	return v.toString();
+}

package/src/utils/constants/variable-status.ts

@@ -1,5 +1 @@
-export const PREVIOUS = 'PREVIOUS' as const;
 export const COLLECTED = 'COLLECTED' as const;
-export const FORCED = 'FORCED' as const;
-export const EDITED = 'EDITED' as const;
-export const INPUTTED = 'INPUTTED' as const;

package/src/utils/variables.spec.ts

@@ -15,10 +15,6 @@ const data = {
 		},
 		PRENOMS: {
 			COLLECTED: ['Paul', 'Pierre'],
-			EDITED: [],
-			INPUTTED: [],
-			FORCED: [],
-			PREVIOUS: [],
 		},
 		AGE: {},
 	},
@@ -49,10 +45,6 @@ const loopCollectedVariable = {
 	variableType: 'COLLECTED',
 	values: {
 		COLLECTED: [],
-		PREVIOUS: [],
-		FORCED: [],
-		EDITED: [],
-		INPUTTED: [],
 	},
 	name: 'PRENOMS',
 } as LunaticVariable;