@inseefr/lunatic 3.11.2 → 3.12.0

package/src/use-lunatic/commons/fill-components/fill-component-expressions.ts

@@ -5,6 +5,7 @@ import type {
 	LunaticReducerState,
 } from '../../type';
 import { isObject } from '../../../utils/object';
+import { castBool, castNumber, castString } from '../../../utils/cast';
 
 const VTL_ATTRIBUTES = [
 	['label', null],
@@ -37,51 +38,6 @@ const VTL_ATTRIBUTES = [
 // List of property that can be simple string instead of expressions
 const allowString = new Set(['unit']);
 
-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]);
-	}
-	if (v === null) {
-		return 0;
-	}
-	throw new Error(`Cannot cast "${v}" to number`);
-}
-
-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);
-}
-
-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();
-}
-
 // Utility type to replace all expression from an object into a translated version
 type UntranslatedProperties =
 	| 'expressions'
@@ -91,7 +47,8 @@ type UntranslatedProperties =
 	| 'controls'
 	| 'conditionFilter'
 	| 'conditionReadOnly'
-	| 'components';
+	| 'components'
+	| 'optionFilter';
 export type DeepTranslateExpression<T> = T extends LunaticExpression
 	? ReactNode
 	: T extends (infer ElementType)[]

package/src/use-lunatic/commons/fill-components/fill-components.ts

@@ -11,7 +11,7 @@ import type { LunaticComponentProps } from '../../../components/type';
 import { getMissingResponseProp } from '../../props/propMissingResponse';
 import { getValueProp } from '../../props/propValue';
 import { getIterationsProp } from '../../props/propIterations';
-import { getOptionsProp } from '../../props/propOptions';
+import { computeOptionsFromComponent } from '../../props/propOptions';
 import { LunaticLogger } from '../../logger/type';
 import { VTLScalarExpression } from '../../../type.source';
 
@@ -80,16 +80,15 @@ export const fillComponent = (
 		missingResponse: getMissingResponseProp(component, state),
 		management: state.management,
 		iterations: getIterationsProp(component, state),
-		options: getOptionsProp(
-			interpretedProps,
-			state.variables,
-			state.handleChanges,
-			state.pager.iteration,
+		options: computeOptionsFromComponent(interpretedProps, {
+			variables: state.variables,
+			handleChanges: state.handleChanges,
+			pagerIteration: state.pager.iteration,
 			value,
-			state.logger,
-			state.disableFilters,
-			shouldBeFiltered
-		),
+			logger: state.logger,
+			disableFilters: state.disableFilters,
+			shouldParentBeFiltered: shouldBeFiltered,
+		}),
 		...getComponentTypeProps(interpretedProps, state),
 		// This is too dynamic to be typed correctly, so we allow any here
 	} as any;

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

@@ -1,6 +1,10 @@
-export { default as checkLoops } from './check-loops';
-export { default as createMapPages } from './create-map-pages';
+export { default as checkLoops } from './pagination/check-loops';
+export { default as createMapPages } from './pagination/create-map-pages';
 export { default as executeConditionFilter } from './execute-condition-filter';
 export { default as getCompatibleVTLExpression } from './get-compatible-vtl-expression';
-export { default as isFirstLastPage } from './is-First-last-page';
-export { getNewReachedPage, getPageTag, isNewReachedPage } from './page-tag';
+export { default as isFirstLastPage } from './pagination/is-First-last-page';
+export {
+	getNewReachedPage,
+	getPageTag,
+	isNewReachedPage,
+} from './pagination/page-tag';

package/src/use-lunatic/commons/{check-loops.ts → pagination/check-loops.ts}

@@ -4,7 +4,7 @@ import type {
 	LunaticComponentDefinition,
 	LunaticExpression,
 	LunaticReducerState,
-} from '../type';
+} from '../../type';
 
 /**
  * Extract the list of subpages linked to a component
@@ -22,7 +22,7 @@ function extractSubPages(
 		(pages, component) => {
 			const { page } = component;
 
-			if (page && pages.indexOf(page) === -1) {
+			if (page && !pages.includes(page)) {
 				return [...pages, page];
 			}
 			return pages;
@@ -33,35 +33,29 @@ function extractSubPages(
 
 function extractLoop(components: LunaticComponentDefinition[] = []) {
 	return components.reduce(
-		function (
-			{ isLoop, subPages, iterations, loopDependencies, roundabout },
-			component
-		) {
+		function ({ isLoop, subPages, iterations, loopDependencies }, component) {
 			const currentIsLoop = isPaginatedLoop(component);
 			const currentIsRoundabout = isRoundabout(component);
 			if (currentIsLoop || currentIsRoundabout) {
 				return {
 					isLoop: isLoop || currentIsLoop,
-					roundabout: roundabout || currentIsRoundabout,
 					subPages: extractSubPages(component, subPages),
 					iterations: iterations || component.iterations,
 					loopDependencies: loopDependencies || undefined,
 				};
 			}
-			return { isLoop, subPages, iterations, roundabout };
+			return { isLoop, subPages, iterations };
 		},
 		{
 			isLoop: false,
 			subPages: undefined,
 			iterations: undefined,
 			loopDependencies: undefined,
-			roundabout: undefined,
 		} as {
 			isLoop: boolean;
 			iterations?: LunaticExpression;
 			loopDependencies?: string[];
 			subPages?: string[];
-			roundabout?: boolean;
 		}
 	);
 }

package/src/use-lunatic/commons/{check-pager.ts → pagination/check-pager.ts}

@@ -1,4 +1,4 @@
-import type { LunaticReducerState } from '../type';
+import type { LunaticReducerState } from '../../type';
 
 /**
  * Reset the pager at his initial state

package/src/use-lunatic/commons/{create-map-pages.ts → pagination/create-map-pages.ts}

@@ -1,7 +1,7 @@
 import isPaginatedLoop from './is-paginated-loop';
 import isRoundabout from './is-roundabout';
-import type { LunaticReducerState, LunaticSource } from '../type';
-import type { ItemOf } from '../../type.utils';
+import type { LunaticReducerState, LunaticSource } from '../../type';
+import type { ItemOf } from '../../../type.utils';
 
 function isUnpaginated(questionnaire: { maxPage?: unknown }): boolean {
 	const { maxPage } = questionnaire;

package/src/use-lunatic/commons/{is-First-last-page.ts → pagination/is-First-last-page.ts}

@@ -1,4 +1,4 @@
-import type { LunaticReducerState } from '../type';
+import type { LunaticReducerState } from '../../type';
 
 function isFirstLastPage(pager: LunaticReducerState['pager']) {
 	const { page, maxPage } = pager;

package/src/use-lunatic/commons/{is-paginated-loop.ts → pagination/is-paginated-loop.ts}

@@ -1,4 +1,4 @@
-import type { LunaticComponentDefinition } from '../type';
+import type { LunaticComponentDefinition } from '../../type';
 
 function isPaginatedLoop(
 	component: LunaticComponentDefinition

package/src/use-lunatic/commons/{is-roundabout.ts → pagination/is-roundabout.ts}

@@ -1,4 +1,4 @@
-import type { LunaticComponentDefinition } from '../type';
+import type { LunaticComponentDefinition } from '../../type';
 
 export default function isRoundabout(
 	component: LunaticComponentDefinition

package/src/use-lunatic/commons/{page-navigation.spec.ts → pagination/page-navigation.spec.ts}

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { getNextPager, getPrevPager } from './page-navigation';
-import type { LunaticReducerState } from '../type';
+import type { LunaticReducerState } from '../../type';
 
 describe('page-navigation', () => {
 	describe('getNextPager', () => {

package/src/use-lunatic/commons/{page-navigation.ts → pagination/page-navigation.ts}

@@ -1,5 +1,5 @@
-import type { LunaticReducerState } from '../type';
-import type { LunaticComponentType } from '../../components/type';
+import type { LunaticReducerState } from '../../type';
+import type { LunaticComponentType } from '../../../components/type';
 
 const resetIteration = {
 	subPage: undefined,
@@ -18,9 +18,9 @@ export function getNextPager(
 	// Increment the page or subPage
 	// eslint-disable-next-line prefer-const
 	let [page, subPage] =
-		pager.subPage !== undefined
-			? [pager.page, pager.subPage + 1]
-			: [pager.page + 1, undefined];
+		pager.subPage === undefined
+			? [pager.page + 1, undefined]
+			: [pager.page, pager.subPage + 1];
 	let iteration = pager.iteration;
 
 	// We reached the end of the questionnaire
@@ -77,9 +77,9 @@ export function getPrevPager(
 	// Decrement the page or subPage
 	// eslint-disable-next-line prefer-const
 	let [page, subPage] =
-		pager.subPage !== undefined
-			? [pager.page, pager.subPage - 1]
-			: [pager.page - 1, undefined];
+		pager.subPage === undefined
+			? [pager.page - 1, undefined]
+			: [pager.page, pager.subPage - 1];
 	let iteration = pager.iteration;
 	const moveUpOnStart =
 		parent === 'Roundabout' && pager.nbIterations && pager.nbIterations > 1;

package/src/use-lunatic/commons/{page-tag.spec.ts → pagination/page-tag.spec.ts}

@@ -1,6 +1,10 @@
 import { describe, it, expect } from 'vitest';
-import { getPagerFromPageTag, pageTagComparator } from './page-tag';
-import type { PageTag } from '../type';
+import {
+	addIterationToPage,
+	getPagerFromPageTag,
+	pageTagComparator,
+} from './page-tag';
+import type { PageTag } from '../../type';
 
 describe('page-tag', () => {
 	describe('getPagerFromPageTag', () => {
@@ -18,6 +22,15 @@ describe('page-tag', () => {
 		});
 	});
 
+	describe('addIterationToPage', () => {
+		it('should add itereation to simple page', () => {
+			expect(addIterationToPage('2', 0)).toEqual('2#1');
+			expect(addIterationToPage('2.1', 0)).toEqual('2.1#1');
+			expect(addIterationToPage('2', 1)).toEqual('2#2');
+			expect(addIterationToPage('2.1', 1)).toEqual('2.1#2');
+		});
+	});
+
 	it.each([
 		['4.1', '4.2', -1],
 		['4.2#1', '4.2#1', 0],

package/src/use-lunatic/commons/{page-tag.ts → pagination/page-tag.ts}

@@ -1,4 +1,15 @@
-import type { LunaticReducerState, PageTag } from '../type';
+import type { LunaticReducerState, PageTag } from '../../type';
+
+/**
+ * Add iteration to existing pageTag (with subpage, use for overview)
+ * @param pageTag
+ * @param iteration
+ * @returns
+ */
+export function addIterationToPage(page: string, iteration?: number): PageTag {
+	if (iteration === undefined) return page as PageTag;
+	return `${page}#${iteration + 1}` as PageTag;
+}
 
 /**
  * Generate page name from the pager
@@ -38,12 +49,12 @@ export function getPagerFromPageTag(pageTag: string | number = 1) {
 		},
 	] = match;
 	if (!subPagePlusUn) {
-		return { page: parseInt(page, 10) };
+		return { page: Number.parseInt(page, 10) };
 	}
 	return {
-		page: parseInt(page, 10),
-		subPage: parseInt(subPagePlusUn, 10) - 1,
-		iteration: parseInt(iterationPlusUn, 10) - 1,
+		page: Number.parseInt(page, 10),
+		subPage: Number.parseInt(subPagePlusUn, 10) - 1,
+		iteration: Number.parseInt(iterationPlusUn, 10) - 1,
 	};
 }
 
@@ -66,8 +77,8 @@ export function getNewReachedPage(
  * - 0 if a is the same as b
  */
 export function pageTagComparator(a: PageTag, b: PageTag) {
-	const pageA = a.split(/\D/).map((v) => parseInt(v, 10));
-	const pageB = b.split(/\D/).map((v) => parseInt(v, 10));
+	const pageA = a.split(/\D/).map((v) => Number.parseInt(v, 10));
+	const pageB = b.split(/\D/).map((v) => Number.parseInt(v, 10));
 	// [0, 2, 1] is used to extract the significant part of the pageTag part (start with page, then iteration, then subpage)
 	for (const index of [0, 2, 1]) {
 		if (pageA[index] !== pageB[index]) {

package/src/use-lunatic/commons/{page.ts → pagination/page.ts}

@@ -1,6 +1,9 @@
-import type { LunaticComponentDefinition, LunaticReducerState } from '../type';
-import { getComponentsFromState } from './get-components-from-state';
-import executeConditionFilter from './execute-condition-filter';
+import type {
+	LunaticComponentDefinition,
+	LunaticReducerState,
+} from '../../type';
+import { getComponentsFromState } from '../get-components-from-state';
+import executeConditionFilter from '../execute-condition-filter';
 
 export function getPageId({
 	subPage,

package/src/use-lunatic/hooks/use-page-has-response.ts

@@ -15,6 +15,54 @@ export function usePageHasResponse(
 	}, [components, executeExpression]);
 }
 
+const hasMissingResponse = (component: LunaticComponentProps): boolean => {
+	if ('missingResponse' in component && component.missingResponse?.value)
+		return true;
+	return false;
+};
+
+const hasArbitraryValue = (component: LunaticComponentProps): boolean => {
+	if ('arbitraryValue' in component && component.arbitraryValue !== undefined)
+		return true;
+	return false;
+};
+
+const hasOneResponseInQuestion = (
+	component: LunaticComponentProps<'Question'>,
+	executeExpression: LunaticReducerState['executeExpression']
+): boolean => {
+	return (
+		'components' in component &&
+		Array.isArray(component.components) &&
+		hasOneResponse(component.components, executeExpression)
+	);
+};
+
+// For Table, we have to extract components from its body and apply isSubComponentsEmpty function
+const hasOneResponseInTable = (
+	component: LunaticComponentProps<'Table'>,
+	executeExpression: LunaticReducerState['executeExpression']
+): boolean => {
+	const childrenComponent = component.body.reduce((_, row) => {
+		const componentsInRow = row.filter(
+			(cell) => isObject(cell) && 'componentType' in cell
+		);
+		return [..._, ...componentsInRow];
+	}, [] as LunaticComponentProps[]);
+	return !isSubComponentsEmpty(childrenComponent, executeExpression);
+};
+
+const hasOneResponseInRosterForLoop = (
+	component: LunaticComponentProps<'RosterForLoop'>,
+	executeExpression: LunaticReducerState['executeExpression']
+): boolean => {
+	return (
+		'components' in component &&
+		Array.isArray(component.components) &&
+		!isSubComponentsEmpty(component.components, executeExpression)
+	);
+};
+
 function hasOneResponse(
 	components: LunaticComponentProps[],
 	executeExpression: LunaticReducerState['executeExpression']
@@ -35,29 +83,17 @@ function hasOneResponse(
 		}
 
 		// We have a missing response for this component
-		if (
-			'missingResponse' in component &&
-			component.missingResponse &&
-			component.missingResponse.value
-		) {
-			return true;
-		}
+		if (hasMissingResponse(component)) return true;
 
 		// We have an arbitrary response for this component
-		if ('arbitraryValue' in component && component.arbitraryValue) {
-			return true;
-		}
+		if (hasArbitraryValue(component)) 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.
-			const childrenComponent = component.body.reduce((_, row) => {
-				const componentsInRow = row.filter(
-					(cell) => isObject(cell) && 'componentType' in cell
-				);
-				return [..._, ...componentsInRow];
-			}, [] as LunaticComponentProps[]);
-			return !isSubComponentsEmpty(childrenComponent, executeExpression);
+		if (
+			component.componentType === 'Table' &&
+			hasOneResponseInTable(component, executeExpression)
+		) {
+			return true;
 		}
 
 		// We found a value in one of the root component. Used for Loop
@@ -68,19 +104,14 @@ function hasOneResponse(
 		// For Question, we need to check subcomponents
 		if (
 			component.componentType === 'Question' &&
-			'components' in component &&
-			Array.isArray(component.components) &&
-			hasOneResponse(component.components, executeExpression)
-		) {
+			hasOneResponseInQuestion(component, executeExpression)
+		)
 			return true;
-		}
 
 		// For rosterForLoop we need to inspect child components
 		if (
 			component.componentType === 'RosterForLoop' &&
-			'components' in component &&
-			Array.isArray(component.components) &&
-			!isSubComponentsEmpty(component.components, executeExpression)
+			hasOneResponseInRosterForLoop(component, executeExpression)
 		) {
 			return true;
 		}
@@ -99,7 +130,7 @@ function isEmpty(value: unknown): boolean {
 	// Array is empty if all items are empty
 	if (Array.isArray(value)) {
 		// We find one value that is not empty
-		return value.find((v) => !isEmpty(v)) === undefined;
+		return !value.some((v) => !isEmpty(v));
 	}
 	// For object inspect each values
 	if (typeof value === 'object' && value !== null) {

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

@@ -5,7 +5,11 @@ import type {
 	PageTag,
 } from '../type';
 import { type DependencyList, type ReactNode, useMemo } from 'react';
-import { getPageTag, pageTagComparator } from '../commons/page-tag';
+import {
+	addIterationToPage,
+	getPageTag,
+	pageTagComparator,
+} from '../commons/pagination/page-tag';
 
 export type InterpretedLunaticOverviewItem = {
 	id: string;
@@ -126,8 +130,7 @@ const interpretOverviewItem = (
 	}
 
 	// Append the item to the list of items
-	const page =
-		`${item.pageTag}${iteration !== undefined ? `#${iteration + 1}` : ''}` as PageTag;
+	const page = addIterationToPage(item.pageTag, iteration);
 
 	const reached =
 		pageTagComparator(state.pager ? getPageTag(state.pager) : '-1', page) >= 0;

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

@@ -33,7 +33,7 @@ function getRoundaboutProps(
 	}));
 	return {
 		items: items,
-		page: parseInt(component.page ?? '1', 10),
+		page: Number.parseInt(component.page ?? '1', 10),
 	};
 }
 
@@ -121,6 +121,7 @@ function getPairwiseProps(
 	state: State
 ) {
 	return {
+		size: state.pager.nbIterations ?? component.xAxisIterations,
 		getComponents: (x: number, y: number) => {
 			if (x === y) {
 				return [];