@inseefr/lunatic 0.3.0-experimental → 0.3.4-experimental

package/src/tests/utils/to-expose/handler/results/res-input-edited.json

@@ -1,158 +1,158 @@
-{
-	"components": [
-		{ "id": "1", "componentType": "Sequence", "depth": 1 },
-		{
-			"id": "2",
-			"componentType": "Input",
-			"response": {
-				"name": "inputOk",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": "My input",
-					"FORCED": null,
-					"EDITED": "My new input",
-					"INPUTED": null
-				}
-			},
-			"depth": 1
-		},
-		{
-			"id": "3",
-			"componentType": "CheckboxGroup",
-			"responses": [
-				{
-					"response": {
-						"name": "check1",
-						"values": {
-							"PREVIOUS": null,
-							"COLLECTED": true,
-							"FORCED": null,
-							"EDITED": null,
-							"INPUTED": null
-						}
-					}
-				},
-				{
-					"response": {
-						"name": "check2",
-						"values": {
-							"PREVIOUS": null,
-							"COLLECTED": false,
-							"FORCED": true,
-							"EDITED": null,
-							"INPUTED": null
-						}
-					}
-				}
-			],
-			"depth": 1
-		},
-		{
-			"id": "4",
-			"componentType": "Table",
-			"cells": [
-				[
-					{ "label": "label", "depth": 1 },
-					{
-						"componentType": "Radio",
-						"response": {
-							"name": "table11",
-							"values": {
-								"PREVIOUS": null,
-								"COLLECTED": "1",
-								"FORCED": null,
-								"EDITED": null,
-								"INPUTED": null
-							}
-						},
-						"depth": 1
-					}
-				]
-			],
-			"depth": 1
-		},
-		{
-			"id": "5",
-			"componentType": "RosterForLoop",
-			"components": [
-				{
-					"componentType": "Input",
-					"response": {
-						"name": "Roster",
-						"values": {
-							"PREVIOUS": [null],
-							"COLLECTED": ["ok"],
-							"FORCED": [null],
-							"EDITED": [null],
-							"INPUTED": [null]
-						}
-					},
-					"depth": 2
-				}
-			],
-			"depth": 1
-		}
-	],
-	"variables": {
-		"EXTERNAL": { "VAR_EXTERNAL": "Value VAR_EXTERNAL" },
-		"CALCULATED": {
-			"Test": {
-				"expression": "inputOk || \" ok\"",
-				"value": "My input ok",
-				"bindingDependencies": ["inputOk"]
-			}
-		},
-		"COLLECTED": {
-			"inputOk": {
-				"componentRef": "2",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": "My input",
-					"FORCED": null,
-					"EDITED": "My new input",
-					"INPUTED": null
-				}
-			},
-			"check1": {
-				"componentRef": "3",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": true,
-					"FORCED": null,
-					"EDITED": null,
-					"INPUTED": null
-				}
-			},
-			"check2": {
-				"componentRef": "3",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": false,
-					"FORCED": true,
-					"EDITED": null,
-					"INPUTED": null
-				}
-			},
-			"table11": {
-				"componentRef": "4",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": "1",
-					"FORCED": null,
-					"EDITED": null,
-					"INPUTED": null
-				}
-			},
-			"Roster": {
-				"componentRef": "5",
-				"values": {
-					"PREVIOUS": [null],
-					"COLLECTED": ["ok"],
-					"FORCED": [null],
-					"EDITED": [null],
-					"INPUTED": [null]
-				}
-			}
-		}
-	}
-}
+{
+	"components": [
+		{ "id": "1", "componentType": "Sequence", "depth": 1 },
+		{
+			"id": "2",
+			"componentType": "Input",
+			"response": {
+				"name": "inputOk",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": "My input",
+					"FORCED": null,
+					"EDITED": "My new input",
+					"INPUTED": null
+				}
+			},
+			"depth": 1
+		},
+		{
+			"id": "3",
+			"componentType": "CheckboxGroup",
+			"responses": [
+				{
+					"response": {
+						"name": "check1",
+						"values": {
+							"PREVIOUS": null,
+							"COLLECTED": true,
+							"FORCED": null,
+							"EDITED": null,
+							"INPUTED": null
+						}
+					}
+				},
+				{
+					"response": {
+						"name": "check2",
+						"values": {
+							"PREVIOUS": null,
+							"COLLECTED": false,
+							"FORCED": true,
+							"EDITED": null,
+							"INPUTED": null
+						}
+					}
+				}
+			],
+			"depth": 1
+		},
+		{
+			"id": "4",
+			"componentType": "Table",
+			"cells": [
+				[
+					{ "label": "label", "depth": 1 },
+					{
+						"componentType": "Radio",
+						"response": {
+							"name": "table11",
+							"values": {
+								"PREVIOUS": null,
+								"COLLECTED": "1",
+								"FORCED": null,
+								"EDITED": null,
+								"INPUTED": null
+							}
+						},
+						"depth": 1
+					}
+				]
+			],
+			"depth": 1
+		},
+		{
+			"id": "5",
+			"componentType": "RosterForLoop",
+			"components": [
+				{
+					"componentType": "Input",
+					"response": {
+						"name": "Roster",
+						"values": {
+							"PREVIOUS": [null],
+							"COLLECTED": ["ok"],
+							"FORCED": [null],
+							"EDITED": [null],
+							"INPUTED": [null]
+						}
+					},
+					"depth": 2
+				}
+			],
+			"depth": 1
+		}
+	],
+	"variables": {
+		"EXTERNAL": { "VAR_EXTERNAL": "Value VAR_EXTERNAL" },
+		"CALCULATED": {
+			"Test": {
+				"expression": "inputOk || \" ok\"",
+				"value": "My new input ok",
+				"bindingDependencies": ["inputOk"]
+			}
+		},
+		"COLLECTED": {
+			"inputOk": {
+				"componentRef": "2",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": "My input",
+					"FORCED": null,
+					"EDITED": "My new input",
+					"INPUTED": null
+				}
+			},
+			"check1": {
+				"componentRef": "3",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": true,
+					"FORCED": null,
+					"EDITED": null,
+					"INPUTED": null
+				}
+			},
+			"check2": {
+				"componentRef": "3",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": false,
+					"FORCED": true,
+					"EDITED": null,
+					"INPUTED": null
+				}
+			},
+			"table11": {
+				"componentRef": "4",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": "1",
+					"FORCED": null,
+					"EDITED": null,
+					"INPUTED": null
+				}
+			},
+			"Roster": {
+				"componentRef": "5",
+				"values": {
+					"PREVIOUS": [null],
+					"COLLECTED": ["ok"],
+					"FORCED": [null],
+					"EDITED": [null],
+					"INPUTED": [null]
+				}
+			}
+		}
+	}
+}

package/src/tests/utils/to-expose/state/state.spec.js

@@ -1,59 +1,59 @@
-import {
-	getState,
-	getCollectedState,
-	getCollectedStateByValueType,
-	getBindings,
-} from 'utils/to-expose/state';
-import questionnaire from './questionnaire';
-import * as R from './results';
-
-describe('state', () => {
-	describe('getState', () => {
-		it('should return empty object', () => {
-			expect(getState([])).toEqual({
-				COLLECTED: {},
-				CALCULATED: {},
-				EXTERNAL: {},
-			});
-		});
-		it('should return object', () => {
-			expect(getState(questionnaire)).toEqual(R.state);
-		});
-	});
-	describe('getCollectedState', () => {
-		it('should return empty object', () => {
-			expect(getCollectedState([])).toEqual({});
-		});
-		it('should return object', () => {
-			expect(getCollectedState(questionnaire)).toEqual(R.collectedState);
-		});
-	});
-	describe('getCollectedStateByValueType', () => {
-		it('should return empty object', () => {
-			expect(getCollectedStateByValueType([])('')).toEqual({});
-			expect(getCollectedStateByValueType(questionnaire)('')).toEqual({});
-		});
-		it('should return object', () => {
-			expect(getCollectedStateByValueType(questionnaire)('COLLECTED')).toEqual(
-				R.collectedStateCollected
-			);
-			expect(getCollectedStateByValueType(questionnaire)('FORCED')).toEqual(
-				R.collectedStateForced
-			);
-			expect(
-				getCollectedStateByValueType(questionnaire)('COLLECTED', true)
-			).toEqual(R.collectedStateCollectedWithNull);
-			expect(
-				getCollectedStateByValueType(questionnaire)('FORCED', true)
-			).toEqual(R.collectedStateForcedWithNull);
-		});
-	});
-	describe('getBindings', () => {
-		it('should return empty object', () => {
-			expect(getBindings([])).toEqual({});
-		});
-		it('should return object', () => {
-			expect(getBindings(questionnaire)).toEqual(R.bindingsResults);
-		});
-	});
-});
+import {
+	getState,
+	getCollectedState,
+	getCollectedStateByValueType,
+	getBindings,
+} from 'utils/to-expose/state';
+import questionnaire from './questionnaire';
+import * as R from './results';
+
+describe('state', () => {
+	describe('getState', () => {
+		it('should return empty object', () => {
+			expect(getState([])).toEqual({
+				COLLECTED: {},
+				CALCULATED: {},
+				EXTERNAL: {},
+			});
+		});
+		it('should return object', () => {
+			expect(getState(questionnaire)).toEqual(R.state);
+		});
+	});
+	describe('getCollectedState', () => {
+		it('should return empty object', () => {
+			expect(getCollectedState([])).toEqual({});
+		});
+		it('should return object', () => {
+			expect(getCollectedState(questionnaire)).toEqual(R.collectedState);
+		});
+	});
+	describe('getCollectedStateByValueType', () => {
+		it('should return empty object', () => {
+			expect(getCollectedStateByValueType([])('')).toEqual({});
+			expect(getCollectedStateByValueType(questionnaire)('')).toEqual({});
+		});
+		it('should return object', () => {
+			expect(getCollectedStateByValueType(questionnaire)('COLLECTED')).toEqual(
+				R.collectedStateCollected
+			);
+			expect(getCollectedStateByValueType(questionnaire)('FORCED')).toEqual(
+				R.collectedStateForced
+			);
+			expect(
+				getCollectedStateByValueType(questionnaire)('COLLECTED', true)
+			).toEqual(R.collectedStateCollectedWithNull);
+			expect(
+				getCollectedStateByValueType(questionnaire)('FORCED', true)
+			).toEqual(R.collectedStateForcedWithNull);
+		});
+	});
+	describe('getBindings', () => {
+		it('should return empty object', () => {
+			expect(getBindings([])).toEqual({});
+		});
+		it('should return object', () => {
+			expect(getBindings(questionnaire)).toEqual(R.bindingsResults);
+		});
+	});
+});

package/src/utils/lib/index.js

@@ -18,3 +18,4 @@ export * from './table';
 export * from './tooltip';
 export { isFunction } from './function';
 export { createObjectEvent } from './event';
+export * from './splitting';

package/src/utils/lib/pagination/navigation/shared.js

@@ -221,28 +221,28 @@ const getIterations = ({ component, bindings, featuresWithoutMD }) => {
 export const splitPage = (currentPage = '1', depth) => {
 	const currentPageWithDepth = depth
 		? currentPage
-				.split('.')
+				?.split('.')
 				.slice(0, depth + 1) // scoped
 				.join('.')
 		: currentPage;
 
 	const currentPageWithoutIteration = currentPageWithDepth
-		.split('#')
+		?.split('#')
 		.slice(0, -1)
 		.join('#');
 
 	const currentPageWithoutAnyIteration = currentPageWithDepth
-		.split('.')
+		?.split('.')
 		.map((e) => e.split('#')[0])
 		.join('.');
 
 	const currentRootPage = currentPageWithoutIteration
-		.split('.')
+		?.split('.')
 		.slice(0, -1)
 		.join('.');
 
 	const [currentComponentIndex, currentIteration] = currentPageWithDepth
-		.split('.')
+		?.split('.')
 		.pop()
 		.split('#')
 		.map((c) => parseInt(c, 10));

package/src/utils/lib/splitting.js

@@ -0,0 +1,142 @@
+const getBindingsDependenciesCalculated = (variables) => {
+	if (!variables) return {};
+	return variables.reduce((acc, { name, bindingDependencies, shapeFrom }) => {
+		if (shapeFrom && bindingDependencies)
+			return { ...acc, [name]: [...bindingDependencies, shapeFrom] };
+		if (bindingDependencies) return { ...acc, [name]: bindingDependencies };
+		if (shapeFrom) return { ...acc, [name]: [shapeFrom] };
+		return acc;
+	}, {});
+};
+
+const getAllDeps = (deps) => (variablesCalcDeps) => {
+	if (!deps || !variablesCalcDeps) return [];
+	return deps.reduce((acc, dep) => {
+		const depsOfDep = variablesCalcDeps[dep];
+		if (Array.isArray(depsOfDep)) {
+			return [...acc, dep, ...getAllDeps(depsOfDep)(variablesCalcDeps)];
+		}
+		return [...acc, dep];
+	}, []);
+};
+
+const getNestedVarsInFilterOrControl = (element) => {
+	if (element && Array.isArray(element?.bindingDependencies))
+		return element?.bindingDependencies;
+	return [];
+};
+
+const getNestedVarsInComponent = (component) => {
+	const {
+		componentType,
+		bindingDependencies = [],
+		conditionFilter,
+		controls = [],
+	} = component;
+	var bindings = [
+		...bindingDependencies, // bindingDependencies of Component
+		...getNestedVarsInFilterOrControl(conditionFilter), // bindingDependencies of its conditionFilter
+		...controls.reduce(
+			(acc, c) => [...acc, ...getNestedVarsInFilterOrControl(c)],
+			[]
+		), // bindingDependencies of its controls
+	];
+
+	if (componentType === 'Loop') {
+		const { components, loopDependencies } = component;
+		if (Array.isArray(loopDependencies))
+			bindings = [...bindings, ...loopDependencies];
+		if (Array.isArray(components)) {
+			bindings = components.reduce(
+				(acc, c) => [...acc, ...getNestedVarsInComponent(c)],
+				[...bindings]
+			);
+		}
+	}
+
+	return bindings;
+};
+
+const getNestedVars =
+	(components = []) =>
+	(variables) => {
+		const variableCalculatedDependencies =
+			getBindingsDependenciesCalculated(variables);
+		const depsVarsTemp = components
+			.reduce((acc, c) => {
+				return [...acc, ...getNestedVarsInComponent(c)];
+			}, [])
+			.filter((v, i, a) => a.indexOf(v) === i);
+		return getAllDeps(depsVarsTemp)(variableCalculatedDependencies).filter(
+			(v, i, a) => a.indexOf(v) === i
+		);
+	};
+
+const getUsefullVariablesFromSource = (variables) => (nestedVars) => {
+	return variables.filter(({ variableType, name }) => {
+		if (variableType === 'CALCULATED' && !nestedVars.includes(name))
+			return false;
+		if (variableType === 'COLLECTED' && !nestedVars.includes(name))
+			return false;
+		return true;
+	});
+};
+
+export const getSplitQuestionnaireSource = (source) => {
+	const { components, variables, ...rest } = source;
+	var split = [];
+	var currentComponents = [];
+	var previousPage = null;
+	components.map((c) => {
+		const { componentType, page } = c;
+		// splitting by Sequence or Loop
+		if (
+			(componentType === 'Sequence' || componentType === 'Loop') &&
+			previousPage !== page
+		) {
+			if (currentComponents.length > 0) split.push(currentComponents);
+			currentComponents = [c];
+		} else {
+			currentComponents.push(c);
+		}
+		previousPage = page;
+		return null;
+	});
+	if (currentComponents.length > 0) split.push(currentComponents);
+
+	return split.reduce((prev, currentSource) => {
+		const firstPage = currentSource[0].page;
+		const maxPage = currentSource[currentSource.length - 1].page;
+		const nestedVars = getNestedVars(currentSource)(variables);
+		const newVariables = getUsefullVariablesFromSource(variables)(nestedVars);
+
+		return [
+			...prev,
+			{
+				...rest,
+				variables: newVariables,
+				firstPage,
+				maxPage,
+				components: currentSource,
+			},
+		];
+	}, []);
+};
+
+export const getRootPageInSources = (sources) => {
+	return sources.map((source) => {
+		const { components } = source;
+		return components.reduce((acc, { page }) => {
+			if (page) return [...acc, page];
+			return acc;
+		}, []);
+	});
+};
+
+export const mergeStateData = (oldData, newData) => {
+	return {
+		COLLECTED: { ...oldData.COLLECTED, ...newData.COLLECTED },
+		CALCULATED: { ...oldData.CALCULATED, ...newData.CALCULATED },
+		EXTERNAL: { ...oldData.EXTERNAL, ...newData.EXTERNAL },
+	};
+};

package/src/utils/suggester-workers/commons-tokenizer/create-entity-tokenizer.js

@@ -3,7 +3,8 @@ import { composeFilters, createFilterStopWords } from './filters';
 import filterStemmer from './filters/filter-stemmer';
 import filterLength from './filters/filter-length';
 import filterSynonyms from './filters/filter-synonyms';
-import filterAccentsToLower from './filters/filter-accents-to-lower';
+import filterAccents from './filters/filter-accents';
+import filterToLower from './filters/filter-to-lower';
 import filterDouble from './filters/filter-double';
 
 function createMapFieldsTokenizer(fields, filters) {
@@ -20,9 +21,10 @@ function createFilterTokens(fields, stopWords) {
 	const filterStopWords = createFilterStopWords(stopWords);
 	const getFilters = composeFilters(
 		filterDouble,
-		filterAccentsToLower,
+		filterAccents,
 		filterStemmer,
 		filterSynonyms,
+		filterToLower,
 		filterStopWords,
 		filterLength
 	);

package/src/utils/suggester-workers/commons-tokenizer/filters/{filter-accents-to-lower.js → filter-accents.js}

@@ -1,6 +1,6 @@
 import removeAccents from 'remove-accents';
 
-function filterAccentsToLower(tokens = []) {
+function filterAccents(tokens = []) {
 	return tokens.map(function (token) {
 		if (typeof token === 'string') {
 			return removeAccents(token).toLowerCase();
@@ -9,4 +9,4 @@ function filterAccentsToLower(tokens = []) {
 	});
 }
 
-export default filterAccentsToLower;
+export default filterAccents;

package/src/utils/suggester-workers/commons-tokenizer/filters/{filter-accents-to-lower.spec.js → filter-accents.spec.js}

@@ -1,4 +1,4 @@
-import filterATL from './filter-accents-to-lower';
+import filterATL from './filter-accents';
 
 describe('filter-length', function () {
 	it('maj accent', function () {