@inseefr/lunatic 0.3.0-experimental → 0.3.0-prisme

package/src/utils/suggester-workers/searching/searching.worker.js

@@ -1,11 +1,11 @@
-/* eslint-disable no-restricted-globals */
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';
-import searching from './searching';
-
-self.onmessage = function (e) {
-	const { search, name, version } = e.data;
-	searching(search, { name, version }).then(function (result) {
-		self.postMessage(result);
-	});
-};
+/* eslint-disable no-restricted-globals */
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+import searching from './searching';
+
+self.onmessage = function (e) {
+	const { search, name, version } = e.data;
+	searching(search, { name, version }).then(function (result) {
+		self.postMessage(result);
+	});
+};

package/src/utils/to-expose/calculated-variables.js

@@ -1,113 +1,113 @@
-import { interpret } from './interpret';
-import {
-	buildVectorialBindings,
-	buildBindingsForDeeperComponents,
-} from '../lib/loops/bindings';
-import { isFunction } from '../lib';
-import {
-	CALCULATED_VAR_CATEGORY,
-	EVENT_VALUE_CHANGE,
-} from '../../constants/event-types';
-
-export const getCalculatedVariables =
-	(variables) =>
-	({ bindings, updatedVars, logFunction, init = false }) => {
-		let wip = {};
-		return Object.entries(variables).reduce((acc, [name, v]) => {
-			const value = getCalculatedVariable(v, name)(variables)({
-				bindings,
-				wip,
-				updatedVars,
-				logFunction,
-				init,
-			});
-			return {
-				...acc,
-				[name]: value,
-			};
-		}, {});
-	};
-
-const getCalculatedVariable =
-	(v, name) =>
-	(variables) =>
-	({ bindings, wip, updatedVars, logFunction, init }) => {
-		const { bindingDependencies } = v;
-		if (!init && !Array.isArray(bindingDependencies)) return v;
-		if (
-			Array.isArray(updatedVars) &&
-			updatedVars.length > 0 &&
-			Array.isArray(bindingDependencies) &&
-			!updatedVars.some((ai) => bindingDependencies.includes(ai))
-		)
-			return v;
-		const exactBindings = (bindingDependencies || []).reduce((acc, b) => {
-			if (bindings[b] !== undefined) return { ...acc, [b]: bindings[b] };
-			if (wip[b] !== undefined) return { ...acc, [b]: wip[b] };
-			const varToCalc = variables[b];
-			if (!varToCalc) return acc;
-			const newValue = getCalculatedVariable(varToCalc)(variables)({
-				bindings,
-				wip,
-				updatedVars,
-				init,
-			});
-			wip[b] = newValue.value;
-			return { ...acc, [b]: newValue.value };
-		}, {});
-		const { expression, shapeFrom } = v;
-		const value =
-			wip[name] !== undefined
-				? wip[name]
-				: getValue(bindings, exactBindings, expression, shapeFrom);
-		const handleTempMomentValue =
-			value && value._isAMomentObject ? value.format('DD-MM-YYYY') : value;
-
-		if (
-			isFunction(logFunction) &&
-			// Filter only filterResult vars : name.startsWith('FILTER_RESULT_') &&
-			JSON.stringify(value) !== JSON.stringify(variables[name].value)
-		) {
-			logFunction({
-				idParadataObject: `${name}`,
-				typeParadataObject: CALCULATED_VAR_CATEGORY,
-				type: EVENT_VALUE_CHANGE,
-				oldValue: value,
-				newValue: variables[name]?.value,
-			});
-		}
-
-		if (shapeFrom)
-			return {
-				expression,
-				bindingDependencies,
-				value: handleTempMomentValue,
-				shapeFrom,
-			};
-		return {
-			expression,
-			bindingDependencies,
-			value: handleTempMomentValue,
-		};
-	};
-
-const getValue = (bindings, exactBindings, expression, shapeFrom) => {
-	if (!shapeFrom) {
-		const vectorialBindings = buildVectorialBindings(exactBindings);
-		const res = interpret(['VTL'])(vectorialBindings)(expression);
-		return Array.isArray(res) ? res[0] : res;
-	}
-	const shape = bindings[shapeFrom];
-	return buildShape(exactBindings, expression)(shape);
-};
-
-const buildShape = (exactBindings, expression) => (array) =>
-	array.map((a, i) => {
-		const loopBindings = buildBindingsForDeeperComponents(i)(exactBindings);
-		if (Array.isArray(a)) {
-			return buildShape(loopBindings, expression)(a);
-		}
-		const vectorialBindings = buildVectorialBindings(loopBindings);
-		const res = interpret(['VTL'])(vectorialBindings)(expression);
-		return Array.isArray(res) ? res[0] : res;
-	});
+import { interpret } from './interpret';
+import {
+	buildVectorialBindings,
+	buildBindingsForDeeperComponents,
+} from '../lib/loops/bindings';
+import { isFunction } from '../lib';
+import {
+	CALCULATED_VAR_CATEGORY,
+	EVENT_VALUE_CHANGE,
+} from '../../constants/event-types';
+
+export const getCalculatedVariables =
+	(variables) =>
+	({ bindings, updatedVars, logFunction, init = false }) => {
+		let wip = {};
+		return Object.entries(variables).reduce((acc, [name, v]) => {
+			const value = getCalculatedVariable(v, name)(variables)({
+				bindings,
+				wip,
+				updatedVars,
+				logFunction,
+				init,
+			});
+			return {
+				...acc,
+				[name]: value,
+			};
+		}, {});
+	};
+
+const getCalculatedVariable =
+	(v, name) =>
+	(variables) =>
+	({ bindings, wip, updatedVars, logFunction, init }) => {
+		const { bindingDependencies } = v;
+		if (!init && !Array.isArray(bindingDependencies)) return v;
+		if (
+			Array.isArray(updatedVars) &&
+			updatedVars.length > 0 &&
+			Array.isArray(bindingDependencies) &&
+			!updatedVars.some((ai) => bindingDependencies.includes(ai))
+		)
+			return v;
+		const exactBindings = (bindingDependencies || []).reduce((acc, b) => {
+			if (bindings[b] !== undefined) return { ...acc, [b]: bindings[b] };
+			if (wip[b] !== undefined) return { ...acc, [b]: wip[b] };
+			const varToCalc = variables[b];
+			if (!varToCalc) return acc;
+			const newValue = getCalculatedVariable(varToCalc)(variables)({
+				bindings,
+				wip,
+				updatedVars,
+				init,
+			});
+			wip[b] = newValue.value;
+			return { ...acc, [b]: newValue.value };
+		}, {});
+		const { expression, shapeFrom } = v;
+		const value =
+			wip[name] !== undefined
+				? wip[name]
+				: getValue(bindings, exactBindings, expression, shapeFrom);
+		const handleTempMomentValue =
+			value && value._isAMomentObject ? value.format('DD-MM-YYYY') : value;
+
+		if (
+			isFunction(logFunction) &&
+			// Filter only filterResult vars : name.startsWith('FILTER_RESULT_') &&
+			JSON.stringify(value) !== JSON.stringify(variables[name].value)
+		) {
+			logFunction({
+				idParadataObject: `${name}`,
+				typeParadataObject: CALCULATED_VAR_CATEGORY,
+				type: EVENT_VALUE_CHANGE,
+				oldValue: value,
+				newValue: variables[name]?.value,
+			});
+		}
+
+		if (shapeFrom)
+			return {
+				expression,
+				bindingDependencies,
+				value: handleTempMomentValue,
+				shapeFrom,
+			};
+		return {
+			expression,
+			bindingDependencies,
+			value: handleTempMomentValue,
+		};
+	};
+
+const getValue = (bindings, exactBindings, expression, shapeFrom) => {
+	if (!shapeFrom) {
+		const vectorialBindings = buildVectorialBindings(exactBindings);
+		const res = interpret(['VTL'])(vectorialBindings)(expression);
+		return Array.isArray(res) ? res[0] : res;
+	}
+	const shape = bindings[shapeFrom];
+	return buildShape(exactBindings, expression)(shape);
+};
+
+const buildShape = (exactBindings, expression) => (array) =>
+	array.map((a, i) => {
+		const loopBindings = buildBindingsForDeeperComponents(i)(exactBindings);
+		if (Array.isArray(a)) {
+			return buildShape(loopBindings, expression)(a);
+		}
+		const vectorialBindings = buildVectorialBindings(loopBindings);
+		const res = interpret(['VTL'])(vectorialBindings)(expression);
+		return Array.isArray(res) ? res[0] : res;
+	});

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

@@ -1,112 +1,149 @@
-import * as C from '../../constants';
-import { buildFilledComponent } from './init-questionnaire';
-import { supportedPreferences } from '../../constants/supported-preferences';
-import { getCalculatedVariables } from './calculated-variables';
-import { isDev } from '../lib';
-
-export const updateQuestionnaire =
-	(valueType) =>
-	(questionnaire) =>
-	(preferences, logFunction) =>
-	(updatedValues) => {
-		if (
-			!supportedPreferences.includes(valueType) ||
-			preferences.length === 0 ||
-			!updatedValues
-		)
-			return questionnaire;
-		const { variables, components, ...other } = questionnaire;
-		if (!components || components.length === 0) return questionnaire;
-		const varsAndRefs = Object.entries(updatedValues).reduce(
-			(acc, [key, value]) => {
-				const {
-					newVariables: { COLLECTED, ...otherVars },
-					refs,
-				} = acc;
-				const { componentRef, values } = COLLECTED[key];
-				const updated = {
-					componentRef,
-					values: {
-						...values,
-						[valueType]: buildNewValue(preferences)(valueType)(values)(value),
-					},
-				};
-				const newCollected = { ...COLLECTED, [key]: updated };
-				return {
-					newVariables: {
-						...otherVars,
-						COLLECTED: newCollected,
-					},
-					refs: [...refs, componentRef],
-				};
-			},
-			{ newVariables: variables, refs: [] }
-		);
-		const { newVariables, refs: r } = varsAndRefs;
-		const newVariablesWithCalculated =
-			valueType === C.COLLECTED
-				? addCalculatedVars(newVariables, updatedValues)(logFunction)
-				: newVariables;
-		const collectedVars = newVariables[C.COLLECTED];
-		const newComponents = components.map((c) => {
-			if (r.includes(c.id)) return buildFilledComponent(collectedVars)(c);
-			return c;
-		});
-		return {
-			...other,
-			variables: newVariablesWithCalculated,
-			components: newComponents,
-		};
-	};
-
-export const buildNewValue =
-	(preferences) => (valueType) => (oldValues) => (value) => {
-		if (preferences.length === 1) return value;
-		const index = preferences.indexOf(valueType);
-		if (index < 1) return value;
-		const valuesByPreference = preferences
-			.slice(0, index)
-			.map((p) => oldValues[p])
-			.filter((v) => v !== null);
-		const lastValue = valuesByPreference[valuesByPreference.length - 1];
-		return lastValue === value ? null : value;
-	};
-
-const getCollectedAndExternal = (variables) => {
-	const { COLLECTED } = variables;
-	const collected = Object.entries(COLLECTED).reduce(
-		(acc, [k, { values }]) => ({ ...acc, [k]: values.COLLECTED }),
-		{}
-	);
-	return { ...collected, ...variables.EXTERNAL };
-};
-
-const addCalculatedVars = (variables, updatedValues) => (logFunction) => {
-	if (
-		!variables[C.CALCULATED] ||
-		Object.keys(variables[C.CALCULATED]).length === 0
-	)
-		return variables;
-
-	if (isDev) {
-		console.log('Start var calculation');
-		var start = new Date().getTime();
-	}
-
-	const { COLLECTED, EXTERNAL, CALCULATED: calculatedVariables } = variables;
-
-	const updatedVars = Object.keys(updatedValues);
-
-	const bindings = getCollectedAndExternal(variables);
-
-	const CALCULATED = getCalculatedVariables(calculatedVariables)({
-		bindings,
-		updatedVars,
-		logFunction,
-	});
-
-	if (isDev)
-		console.log(`End var calculation: ${new Date().getTime() - start} ms`);
-
-	return { EXTERNAL, COLLECTED, CALCULATED };
-};
+import * as C from '../../constants';
+import { buildFilledComponent } from './init-questionnaire';
+import { supportedPreferences } from '../../constants/supported-preferences';
+import { getCalculatedVariables } from './calculated-variables';
+import { isDev } from '../lib';
+
+export const updateQuestionnaire =
+	(valueType) =>
+	(questionnaire) =>
+	(preferences, logFunction) =>
+	(updatedValues) => {
+		if (
+			!supportedPreferences.includes(valueType) ||
+			preferences.length === 0 ||
+			!updatedValues
+		)
+			return questionnaire;
+		const { variables, components, ...other } = questionnaire;
+		if (!components || components.length === 0) return questionnaire;
+		const varsAndRefs = Object.entries(updatedValues).reduce(
+			(acc, [key, value]) => {
+				const {
+					newVariables: { COLLECTED, ...otherVars },
+					refs,
+				} = acc;
+				const { componentRef, values } = COLLECTED[key];
+				const updated = {
+					componentRef,
+					values: {
+						...values,
+						[valueType]: buildNewValue(preferences)(valueType)(values)(value),
+					},
+				};
+				const newCollected = { ...COLLECTED, [key]: updated };
+				return {
+					newVariables: {
+						...otherVars,
+						COLLECTED: newCollected,
+					},
+					refs: [...refs, componentRef],
+				};
+			},
+			{ newVariables: variables, refs: [] }
+		);
+		const { newVariables, refs: r } = varsAndRefs;
+		const newVariablesWithCalculated = addCalculatedVars(
+			newVariables,
+			updatedValues
+		)(logFunction, preferences);
+		const collectedVars = newVariables[C.COLLECTED];
+		const newComponents = components.map((c) => {
+			if (r.includes(c.id)) return buildFilledComponent(collectedVars)(c);
+			return c;
+		});
+		return {
+			...other,
+			variables: newVariablesWithCalculated,
+			components: newComponents,
+		};
+	};
+
+export const updateExternals =
+	(questionnaire) => (logFunction, preferences) => (updatedValues) => {
+		const { variables, ...other } = questionnaire;
+		const { EXTERNAL } = variables;
+		const newVariables = {
+			...variables,
+			EXTERNAL: { ...EXTERNAL, ...updatedValues },
+		};
+
+		const newVariablesWithCalculated = addCalculatedVars(
+			newVariables,
+			updatedValues
+		)(logFunction, preferences);
+		return {
+			...other,
+			variables: newVariablesWithCalculated,
+		};
+	};
+
+export const buildNewValue =
+	(preferences) => (valueType) => (oldValues) => (value) => {
+		if (preferences.length === 1) return value;
+		const index = preferences.indexOf(valueType);
+		if (index < 1) return value;
+		const valuesByPreference = preferences
+			.slice(0, index)
+			.map((p) => oldValues[p])
+			.filter((v) => v !== null);
+		const lastValue = valuesByPreference[valuesByPreference.length - 1];
+		return lastValue === value ? null : value;
+	};
+
+// Separate methods to avoid perf issue on collect simplest use case
+const getCollectedAndExternal = (preferences) => (variables) => {
+	const { COLLECTED, EXTERNAL } = variables;
+	if (preferences.length === 1 && preferences[0] === 'COLLECTED')
+		return { ...getCollectedAndExternalSimple(COLLECTED), ...EXTERNAL };
+	return {
+		...getCollectedAndExternalByPreferences(preferences)(COLLECTED),
+		...EXTERNAL,
+	};
+};
+
+const getCollectedAndExternalSimple = (variables) =>
+	Object.entries(variables).reduce(
+		(acc, [k, { values }]) => ({ ...acc, [k]: values.COLLECTED }),
+		{}
+	);
+
+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 };
+	}, {});
+
+const addCalculatedVars =
+	(variables, updatedValues) => (logFunction, preferences) => {
+		if (
+			!variables[C.CALCULATED] ||
+			Object.keys(variables[C.CALCULATED]).length === 0
+		)
+			return variables;
+
+		if (isDev) {
+			console.log('Start var calculation');
+			var start = new Date().getTime();
+		}
+
+		const { COLLECTED, EXTERNAL, CALCULATED: calculatedVariables } = variables;
+
+		const updatedVars = Object.keys(updatedValues);
+
+		const bindings = getCollectedAndExternal(preferences)(variables);
+
+		const CALCULATED = getCalculatedVariables(calculatedVariables)({
+			bindings,
+			updatedVars,
+			logFunction,
+		});
+
+		if (isDev)
+			console.log(`End var calculation: ${new Date().getTime() - start} ms`);
+
+		return { EXTERNAL, COLLECTED, CALCULATED };
+	};

package/src/utils/to-expose/hooks/filter-components.js

@@ -1,13 +1,18 @@
 import { interpret } from '../interpret';
 import { isDev, buildVectorialBindings } from '../../lib';
 
-let cache = {};
-
 const customFilterPagination = ({ page }, pagination, currentPage) => {
-	return pagination ? currentPage.split('.')[0] === page : true;
+	return pagination ? currentPage?.split('.')[0] === page : true;
 };
 
-const filterComponents = ({ components, updatedVars, features, bindings }) => {
+const filterComponents = ({
+	components,
+	updatedVars,
+	features,
+	bindings,
+	cache,
+	setCache,
+}) => {
 	const localCache = {};
 	const filtered = components.filter(({ conditionFilter }) => {
 		if (!conditionFilter || !conditionFilter.value) return true;
@@ -24,7 +29,11 @@ const filterComponents = ({ components, updatedVars, features, bindings }) => {
 		localCache[value] = inter;
 		return inter;
 	});
-	cache = { ...cache, ...localCache };
+	if (
+		Object.keys(localCache).some((value) => cache[value] !== localCache[value])
+	) {
+		setCache((prevCache) => ({ ...prevCache, ...localCache }));
+	}
 	return filtered;
 };
 
@@ -36,6 +45,8 @@ const buildComponents = ({
 	page,
 	pagination,
 	todo,
+	cache,
+	setCache,
 }) => {
 	if (management && !pagination) return components;
 
@@ -57,6 +68,8 @@ const buildComponents = ({
 			updatedVars,
 			features,
 			bindings,
+			cache,
+			setCache,
 		});
 		if (isDev) console.log(`End filter: ${new Date().getTime() - start} ms`);
 		return filtered;
@@ -71,14 +84,13 @@ const buildComponents = ({
 		updatedVars,
 		features,
 		bindings,
+		cache,
+		setCache,
 	});
 	if (isDev) console.log(`End filter: ${new Date().getTime() - start}`);
 	return pageComponentsFiltered;
 };
 
-let oldComponents = [];
-let memoryTodo = {};
-
 export const useFilterComponents = ({
 	questionnaire,
 	management,
@@ -87,10 +99,12 @@ export const useFilterComponents = ({
 	page,
 	pagination,
 	todo,
+	cache,
+	setCache,
+	memoryTodo,
 }) => {
 	if (Object.keys(todo).length > 0) {
-		memoryTodo = todo;
-		return oldComponents;
+		return { todo };
 	}
 	const components = buildComponents({
 		components: questionnaire.components,
@@ -100,7 +114,8 @@ export const useFilterComponents = ({
 		page,
 		pagination,
 		todo: memoryTodo,
+		cache,
+		setCache,
 	});
-	oldComponents = components;
-	return components;
+	return { components };
 };

package/src/utils/to-expose/hooks/index.js

@@ -1 +1,2 @@
-export { default } from './lunatic';
+export { default as useLunatic } from './lunatic';
+export { default as useLunaticSplit } from './lunatic-split';