@inseefr/lunatic 0.3.2-experimental → 0.3.6-experimental

package/src/tests/utils/to-expose/state/questionnaire.json

@@ -1,61 +1,61 @@
-{
-	"components": [],
-	"variables": {
-		"EXTERNAL": { "VAR_EXTERNAL": "Value VAR_EXTERNAL" },
-		"CALCULATED": {
-			"VAR_CALCULATED": { "expression": "VTL expression", "value": null }
-		},
-		"COLLECTED": {
-			"input": {
-				"componentRef": "2",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": "My input",
-					"FORCED": null,
-					"EDITED": null,
-					"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
-				}
-			},
-			"table12": {
-				"componentRef": "4",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": null,
-					"FORCED": null,
-					"EDITED": null,
-					"INPUTED": null
-				}
-			}
-		}
-	}
-}
+{
+	"components": [],
+	"variables": {
+		"EXTERNAL": { "VAR_EXTERNAL": "Value VAR_EXTERNAL" },
+		"CALCULATED": {
+			"VAR_CALCULATED": { "expression": "VTL expression", "value": null }
+		},
+		"COLLECTED": {
+			"input": {
+				"componentRef": "2",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": "My input",
+					"FORCED": null,
+					"EDITED": null,
+					"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
+				}
+			},
+			"table12": {
+				"componentRef": "4",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": null,
+					"FORCED": null,
+					"EDITED": null,
+					"INPUTED": null
+				}
+			}
+		}
+	}
+}

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

@@ -1,78 +1,78 @@
-export const calculatedState = {
-	VAR_CALCULATED: null,
-};
-export const collectedState = {
-	input: {
-		PREVIOUS: null,
-		COLLECTED: 'My input',
-		FORCED: null,
-		EDITED: null,
-		INPUTED: null,
-	},
-	check1: {
-		PREVIOUS: null,
-		COLLECTED: true,
-		FORCED: null,
-		EDITED: null,
-		INPUTED: null,
-	},
-	check2: {
-		PREVIOUS: null,
-		COLLECTED: false,
-		FORCED: true,
-		EDITED: null,
-		INPUTED: null,
-	},
-	table11: {
-		PREVIOUS: null,
-		COLLECTED: '1',
-		FORCED: null,
-		EDITED: null,
-		INPUTED: null,
-	},
-	table12: {
-		PREVIOUS: null,
-		COLLECTED: null,
-		FORCED: null,
-		EDITED: null,
-		INPUTED: null,
-	},
-};
-
-export const externalState = { VAR_EXTERNAL: 'Value VAR_EXTERNAL' };
-
-export const state = {
-	EXTERNAL: externalState,
-	CALCULATED: calculatedState,
-	COLLECTED: collectedState,
-};
-
-export const collectedStateCollected = {
-	input: 'My input',
-	check1: true,
-	check2: false,
-	table11: '1',
-};
-
-export const collectedStateCollectedWithNull = {
-	...collectedStateCollected,
-	table12: null,
-};
-
-export const collectedStateForced = {
-	check2: true,
-};
-
-export const collectedStateForcedWithNull = {
-	input: null,
-	check1: null,
-	check2: true,
-	table11: null,
-	table12: null,
-};
-
-export const bindingsResults = {
-	...collectedStateCollectedWithNull,
-	VAR_CALCULATED: null,
-	...externalState,
-};
+export const calculatedState = {
+	VAR_CALCULATED: null,
+};
+export const collectedState = {
+	input: {
+		PREVIOUS: null,
+		COLLECTED: 'My input',
+		FORCED: null,
+		EDITED: null,
+		INPUTED: null,
+	},
+	check1: {
+		PREVIOUS: null,
+		COLLECTED: true,
+		FORCED: null,
+		EDITED: null,
+		INPUTED: null,
+	},
+	check2: {
+		PREVIOUS: null,
+		COLLECTED: false,
+		FORCED: true,
+		EDITED: null,
+		INPUTED: null,
+	},
+	table11: {
+		PREVIOUS: null,
+		COLLECTED: '1',
+		FORCED: null,
+		EDITED: null,
+		INPUTED: null,
+	},
+	table12: {
+		PREVIOUS: null,
+		COLLECTED: null,
+		FORCED: null,
+		EDITED: null,
+		INPUTED: null,
+	},
+};
+
+export const externalState = { VAR_EXTERNAL: 'Value VAR_EXTERNAL' };
+
+export const state = {
+	EXTERNAL: externalState,
+	CALCULATED: calculatedState,
+	COLLECTED: collectedState,
+};
+
+export const collectedStateCollected = {
+	input: 'My input',
+	check1: true,
+	check2: false,
+	table11: '1',
+};
+
+export const collectedStateCollectedWithNull = {
+	...collectedStateCollected,
+	table12: null,
+};
+
+export const collectedStateForced = {
+	check2: true,
+};
+
+export const collectedStateForcedWithNull = {
+	input: null,
+	check1: null,
+	check2: true,
+	table11: null,
+	table12: null,
+};
+
+export const bindingsResults = {
+	...collectedStateCollectedWithNull,
+	VAR_CALCULATED: null,
+	...externalState,
+};

package/src/utils/lib/splitting.js

@@ -1,16 +1,12 @@
 const getBindingsDependenciesCalculated = (variables) => {
 	if (!variables) return {};
-	return variables.reduce(
-		(acc, { variableType, name, bindingDependencies, shapeFrom }) => {
-			if (variableType === 'CALCULATED')
-				if (shapeFrom && bindingDependencies)
-					return { ...acc, [name]: [...bindingDependencies, shapeFrom] };
-			if (bindingDependencies) return { ...acc, [name]: bindingDependencies };
-			if (shapeFrom) return { ...acc, [name]: [shapeFrom] };
-			return acc;
-		},
-		{}
-	);
+	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) => {
@@ -24,20 +20,51 @@ const getAllDeps = (deps) => (variablesCalcDeps) => {
 	}, []);
 };
 
+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, comp) => {
-				const { bindingDependencies, conditionFilter } = comp;
-				var superBind = [];
-				if (Array.isArray(bindingDependencies))
-					superBind = [...superBind, ...bindingDependencies];
-				if (Array.isArray(conditionFilter?.bindingDependencies))
-					superBind = [...superBind, ...conditionFilter.bindingDependencies];
-				return [...acc, ...superBind];
+			.reduce((acc, c) => {
+				return [...acc, ...getNestedVarsInComponent(c)];
 			}, [])
 			.filter((v, i, a) => a.indexOf(v) === i);
 		return getAllDeps(depsVarsTemp)(variableCalculatedDependencies).filter(
@@ -46,7 +73,6 @@ const getNestedVars =
 	};
 
 const getUsefullVariablesFromSource = (variables) => (nestedVars) => {
-	if (!variables) return true;
 	return variables.filter(({ variableType, name }) => {
 		if (variableType === 'CALCULATED' && !nestedVars.includes(name))
 			return false;
@@ -60,18 +86,24 @@ export const getSplitQuestionnaireSource = (source) => {
 	const { components, variables, ...rest } = source;
 	var split = [];
 	var currentComponents = [];
-	components.map((c, i) => {
-		const { componentType } = c;
+	var previousPage = null;
+	components.map((c) => {
+		const { componentType, page } = c;
 		// splitting by Sequence or Loop
-		if (componentType === 'Sequence' || componentType === '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;

package/src/utils/lib/tooltip/build-response.js

@@ -1,41 +1,41 @@
-import { buildNewValue } from '../../to-expose/handler';
-import * as C from '../../../constants/value-types';
-
-export const buildMultiTooltipResponse = (options) => (response) => {
-	if (!response || Object.keys(response).length === 0 || !options) return {};
-	const { name, values } = response;
-	const newValues = Object.entries(values).reduce(
-		(acc, [k, v]) =>
-			v === null
-				? { ...acc, [k]: v }
-				: { ...acc, [k]: options.find((o) => o.value === v).label },
-		{}
-	);
-	return { name, values: newValues };
-};
-
-export const buildBooleanTooltipResponse = (response) => {
-	if (!response || Object.keys(response).length === 0) return {};
-	const { name, values } = response;
-	const newValues = Object.entries(values).reduce(
-		(acc, [k, v]) =>
-			v === null ? { ...acc, [k]: v } : { ...acc, [k]: v ? 'Vrai' : 'Faux' },
-		{}
-	);
-	return { name, values: newValues };
-};
-
-/**
- * Assume we use this tool in management mode only
- */
-export const buildLocalResponse = (response, value) => {
-	if (!response || Object.keys(response).length === 0) return {};
-	const { name, values } = response;
-	const newValue = buildNewValue([C.COLLECTED, C.FORCED, C.EDITED])(C.EDITED)(
-		values
-	)(value);
-	return {
-		name,
-		values: { ...values, EDITED: newValue },
-	};
-};
+import { buildNewValue } from '../../to-expose/handler';
+import * as C from '../../../constants/value-types';
+
+export const buildMultiTooltipResponse = (options) => (response) => {
+	if (!response || Object.keys(response).length === 0 || !options) return {};
+	const { name, values } = response;
+	const newValues = Object.entries(values).reduce(
+		(acc, [k, v]) =>
+			v === null
+				? { ...acc, [k]: v }
+				: { ...acc, [k]: options.find((o) => o.value === v).label },
+		{}
+	);
+	return { name, values: newValues };
+};
+
+export const buildBooleanTooltipResponse = (response) => {
+	if (!response || Object.keys(response).length === 0) return {};
+	const { name, values } = response;
+	const newValues = Object.entries(values).reduce(
+		(acc, [k, v]) =>
+			v === null ? { ...acc, [k]: v } : { ...acc, [k]: v ? 'Vrai' : 'Faux' },
+		{}
+	);
+	return { name, values: newValues };
+};
+
+/**
+ * Assume we use this tool in management mode only
+ */
+export const buildLocalResponse = (response, value) => {
+	if (!response || Object.keys(response).length === 0) return {};
+	const { name, values } = response;
+	const newValue = buildNewValue([C.COLLECTED, C.FORCED, C.EDITED])(C.EDITED)(
+		values
+	)(value);
+	return {
+		name,
+		values: { ...values, EDITED: newValue },
+	};
+};

package/src/utils/store-tools/create/index.js

@@ -1 +1 @@
-export { default } from './create';
+export { default } from './create';

package/src/utils/store-tools/create/update-store-info.js

@@ -1,26 +1,26 @@
-import CONSTANTES from '../constantes';
-
-function update(db, storeInfo) {
-	return new Promise(function (resolve, reject) {
-		try {
-			const transaction = db.transaction(
-				CONSTANTES.STORE_INFO_NAME,
-				'readwrite'
-			);
-			const store = transaction.objectStore(CONSTANTES.STORE_INFO_NAME);
-			const request = store.add(storeInfo);
-
-			request.onsuccess = function () {
-				resolve('success');
-			};
-
-			request.onerror = function (e) {
-				reject(e);
-			};
-		} catch (e) {
-			reject(e);
-		}
-	});
-}
-
-export default update;
+import CONSTANTES from '../constantes';
+
+function update(db, storeInfo) {
+	return new Promise(function (resolve, reject) {
+		try {
+			const transaction = db.transaction(
+				CONSTANTES.STORE_INFO_NAME,
+				'readwrite'
+			);
+			const store = transaction.objectStore(CONSTANTES.STORE_INFO_NAME);
+			const request = store.add(storeInfo);
+
+			request.onsuccess = function () {
+				resolve('success');
+			};
+
+			request.onerror = function (e) {
+				reject(e);
+			};
+		} catch (e) {
+			reject(e);
+		}
+	});
+}
+
+export default update;

package/src/utils/store-tools/index.js

@@ -1,5 +1,5 @@
-export * as CONSTANTES from './constantes';
-export { default as openOrCreateStore } from './open-or-create-store';
-export { default as clearStoreData } from './clear-store-data';
-export { default as useStoreIndex } from './use-store-index';
-export { default as getStoreCount } from './get-store-count';
+export * as CONSTANTES from './constantes';
+export { default as openOrCreateStore } from './open-or-create-store';
+export { default as clearStoreData } from './clear-store-data';
+export { default as useStoreIndex } from './use-store-index';
+export { default as getStoreCount } from './get-store-count';

package/src/utils/to-expose/handler.js

@@ -60,7 +60,7 @@ export const updateQuestionnaire =
 	};
 
 export const updateExternals =
-	(questionnaire) => (logFunction) => (updatedValues) => {
+	(questionnaire) => (logFunction, preferences) => (updatedValues) => {
 		const { variables, ...other } = questionnaire;
 		const { EXTERNAL } = variables;
 		const newVariables = {
@@ -71,8 +71,7 @@ export const updateExternals =
 		const newVariablesWithCalculated = addCalculatedVars(
 			newVariables,
 			updatedValues
-		)(logFunction);
-
+		)(logFunction, preferences);
 		return {
 			...other,
 			variables: newVariablesWithCalculated,
@@ -94,30 +93,29 @@ export const buildNewValue =
 
 // Separate methods to avoid perf issue on collect simplest use case
 const getCollectedAndExternal = (preferences) => (variables) => {
-	const { COLLECTED } = variables;
+	const { COLLECTED, EXTERNAL } = variables;
 	if (preferences.length === 1 && preferences[0] === 'COLLECTED')
-		return getCollectedAndExternalSimple(COLLECTED);
-	return getCollectedAndExternalByPreferences(preferences)(COLLECTED);
+		return { ...getCollectedAndExternalSimple(COLLECTED), ...EXTERNAL };
+	return {
+		...getCollectedAndExternalByPreferences(preferences)(COLLECTED),
+		...EXTERNAL,
+	};
 };
 
-const getCollectedAndExternalSimple = (variables) => {
-	const collected = Object.entries(variables).reduce(
+const getCollectedAndExternalSimple = (variables) =>
+	Object.entries(variables).reduce(
 		(acc, [k, { values }]) => ({ ...acc, [k]: values.COLLECTED }),
 		{}
 	);
-	return { ...collected, ...variables.EXTERNAL };
-};
 
-const getCollectedAndExternalByPreferences = (preferences) => (variables) => {
-	const collected = Object.entries(variables).reduce((acc, [k, { values }]) => {
+const getCollectedAndExternalByPreferences = (preferences) => (variables) =>
+	Object.entries(variables).reduce((acc, [k, { values }]) => {
 		const v = preferences.reduce((acc, p) => {
 			const value = values[p];
 			return [null, ''].includes(value) ? acc : value;
 		}, null);
 		return { ...acc, [k]: v };
 	}, {});
-	return { ...collected, ...variables.EXTERNAL };
-};
 
 const addCalculatedVars =
 	(variables, updatedValues) => (logFunction, preferences) => {