@inseefr/lunatic 3.11.2 → 3.12.0

package/src/use-lunatic/reducer/reduce-go-previous-page.ts

@@ -1,6 +1,6 @@
-import { getPrevPager } from '../commons/page-navigation';
+import { getPrevPager } from '../commons/pagination/page-navigation';
 import { autoExploreLoop } from './commons/auto-explore-loop';
-import { getPageId, isPageEmpty } from '../commons/page';
+import { getPageId, isPageEmpty } from '../commons/pagination/page';
 import type { LunaticReducerState } from '../type';
 
 export function reduceGoPreviousPage(

package/src/use-lunatic/reducer/reduce-go-to-page.ts

@@ -1,6 +1,6 @@
 import { type ActionGoToPage } from '../actions';
-import { getPageId, isPageEmpty } from '../commons/page';
-import { getPagerFromPageTag } from '../commons/page-tag';
+import { getPageId, isPageEmpty } from '../commons/pagination/page';
+import { getPagerFromPageTag } from '../commons/pagination/page-tag';
 import type { LunaticReducerState } from '../type';
 import { reduceGoNextPage } from './reduce-go-next-page';
 

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

@@ -9,7 +9,7 @@ import { checkLoops, createMapPages } from '../commons';
 import { getExpressionAsString, getExpressionType } from '../../utils/vtl';
 import { MD, VTL } from '../../utils/constants';
 import { MDLabel } from '../../components/shared/MDLabel/MDLabel';
-import { getPagerFromPageTag } from '../commons/page-tag';
+import { getPagerFromPageTag } from '../commons/pagination/page-tag';
 import { buildOverview } from './overview/overviewOnInit';
 import { forceInt } from '../../utils/number';
 import { registerSuggesters } from '../../utils/search/SuggestersDatabase';
@@ -136,7 +136,7 @@ export function reducerInitializer({
 	const initialPager = getPagerFromPageTag(initialPage);
 	const pager = {
 		page: initialPager?.page ?? 1,
-		maxPage: source.maxPage ? parseInt(source.maxPage, 10) : 1,
+		maxPage: source.maxPage ? Number.parseInt(source.maxPage, 10) : 1,
 		subPage: initialPager?.subPage,
 		nbSubPages: undefined,
 		iteration: initialPager?.iteration,

package/src/use-lunatic/type.ts

@@ -130,7 +130,7 @@ export type LunaticPager = {
 	 */
 	shallowIteration?: number;
 	/**
-	 * Only in a loop.
+	 * Only in a Pairwise.
 	 */
 	linksIterations?: number[];
 };

package/src/utils/cast.ts

@@ -10,12 +10,15 @@ export function castNumber(v: unknown): number {
 		return v;
 	}
 	if (typeof v === 'string') {
-		return parseInt(v, 10);
+		return Number.parseInt(v, 10);
 	}
 	if (Array.isArray(v) && v.length > 0) {
 		return castNumber(v[0]);
 	}
-	throw new Error(`Cannot cast "${v}" to number`);
+	if (v === null) {
+		return 0;
+	}
+	throw new TypeError(`Cannot cast "${v}" to number`);
 }
 
 /**

package/src/utils/getArticulationState.ts

@@ -8,6 +8,7 @@ import { reducerInitializer } from '../use-lunatic/reducer/reducerInitializer';
 import { type ReactNode } from 'react';
 import { times } from './array';
 import { forceInt } from './number';
+import { isRoundaboutComponent } from '../use-lunatic/commons/component';
 
 export enum ArticulationState {
 	COMPLETED = 1,
@@ -110,7 +111,7 @@ export function findComponentById(
 	id: string
 ): (ComponentRoundaboutDefinition & { page?: string }) | null {
 	for (const c of components) {
-		if ('id' in c && c.id === id && c.componentType === 'Roundabout') {
+		if ('id' in c && c.id === id && isRoundaboutComponent(c)) {
 			return c;
 		}
 		if ('components' in c) {

package/src/utils/number.ts

@@ -1,15 +1,15 @@
 export function forceInt(n: unknown): number {
 	if (typeof n === 'string') {
-		const casted = parseInt(n, 10);
+		const casted = Number.parseInt(n, 10);
 		if (Number.isNaN(casted)) {
-			throw new Error(`Cannot cast ${n} to int`);
+			throw new TypeError(`Cannot cast ${n} to int`);
 		}
 		return casted;
 	}
 	if (typeof n === 'number') {
 		return n;
 	}
-	throw new Error(`Cannot cast ${typeof n} to int`);
+	throw new TypeError(`Cannot cast ${typeof n} to int`);
 }
 
 /**
@@ -40,7 +40,7 @@ export function toNumber(v: unknown): number | null {
 		return v;
 	}
 	if (typeof v === 'string') {
-		return parseInt(v, 10);
+		return Number.parseInt(v, 10);
 	}
 	return null;
 }