@inseefr/lunatic 0.3.1-experimental → 0.3.2-experimental

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

@@ -43,10 +43,10 @@ export const updateQuestionnaire =
 			{ newVariables: variables, refs: [] }
 		);
 		const { newVariables, refs: r } = varsAndRefs;
-		const newVariablesWithCalculated =
-			valueType === C.COLLECTED
-				? addCalculatedVars(newVariables, updatedValues)(logFunction)
-				: newVariables;
+		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);
@@ -92,41 +92,60 @@ export const buildNewValue =
 		return lastValue === value ? null : value;
 	};
 
-const getCollectedAndExternal = (variables) => {
+// Separate methods to avoid perf issue on collect simplest use case
+const getCollectedAndExternal = (preferences) => (variables) => {
 	const { COLLECTED } = variables;
-	const collected = Object.entries(COLLECTED).reduce(
+	if (preferences.length === 1 && preferences[0] === 'COLLECTED')
+		return getCollectedAndExternalSimple(COLLECTED);
+	return getCollectedAndExternalByPreferences(preferences)(COLLECTED);
+};
+
+const getCollectedAndExternalSimple = (variables) => {
+	const collected = Object.entries(variables).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;
+const getCollectedAndExternalByPreferences = (preferences) => (variables) => {
+	const collected = 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 };
+};
 
-	if (isDev) {
-		console.log('Start var calculation');
-		var start = new Date().getTime();
-	}
+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 { COLLECTED, EXTERNAL, CALCULATED: calculatedVariables } = variables;
 
-	const updatedVars = Object.keys(updatedValues);
+		const updatedVars = Object.keys(updatedValues);
 
-	const bindings = getCollectedAndExternal(variables);
+		const bindings = getCollectedAndExternal(preferences)(variables);
 
-	const CALCULATED = getCalculatedVariables(calculatedVariables)({
-		bindings,
-		updatedVars,
-		logFunction,
-	});
+		const CALCULATED = getCalculatedVariables(calculatedVariables)({
+			bindings,
+			updatedVars,
+			logFunction,
+		});
 
-	if (isDev)
-		console.log(`End var calculation: ${new Date().getTime() - start} ms`);
+		if (isDev)
+			console.log(`End var calculation: ${new Date().getTime() - start} ms`);
 
-	return { EXTERNAL, COLLECTED, CALCULATED };
-};
+		return { EXTERNAL, COLLECTED, CALCULATED };
+	};

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

@@ -1,106 +1,106 @@
-import { interpret } from '../interpret';
-import { isDev, buildVectorialBindings } from '../../lib';
-
-let cache = {};
-
-const customFilterPagination = ({ page }, pagination, currentPage) => {
-	return pagination ? currentPage.split('.')[0] === page : true;
-};
-
-const filterComponents = ({ components, updatedVars, features, bindings }) => {
-	const localCache = {};
-	const filtered = components.filter(({ conditionFilter }) => {
-		if (!conditionFilter || !conditionFilter.value) return true;
-		const { bindingDependencies, value } = conditionFilter;
-		if (localCache[value] !== undefined) return localCache[value];
-		if (
-			(!bindingDependencies ||
-				!updatedVars.some((t) => bindingDependencies.includes(t))) &&
-			cache[value] !== undefined
-		)
-			return cache[value];
-		const vectorialBindings = buildVectorialBindings(bindings);
-		const inter = interpret(features)(vectorialBindings)(value);
-		localCache[value] = inter;
-		return inter;
-	});
-	cache = { ...cache, ...localCache };
-	return filtered;
-};
-
-const buildComponents = ({
-	components,
-	management,
-	bindings,
-	features,
-	page,
-	pagination,
-	todo,
-}) => {
-	if (management && !pagination) return components;
-
-	if (management && pagination)
-		return components.filter((c) =>
-			customFilterPagination(c, pagination, page)
-		);
-
-	if (isDev) {
-		console.log('Start filter');
-		var start = new Date().getTime();
-	}
-
-	const updatedVars = Object.keys(todo);
-
-	if (!pagination) {
-		const filtered = filterComponents({
-			components,
-			updatedVars,
-			features,
-			bindings,
-		});
-		if (isDev) console.log(`End filter: ${new Date().getTime() - start} ms`);
-		return filtered;
-	}
-
-	const pageComponents = components.filter((c) =>
-		customFilterPagination(c, pagination, page)
-	);
-
-	const pageComponentsFiltered = filterComponents({
-		components: pageComponents,
-		updatedVars,
-		features,
-		bindings,
-	});
-	if (isDev) console.log(`End filter: ${new Date().getTime() - start}`);
-	return pageComponentsFiltered;
-};
-
-let oldComponents = [];
-let memoryTodo = {};
-
-export const useFilterComponents = ({
-	questionnaire,
-	management,
-	bindings,
-	features,
-	page,
-	pagination,
-	todo,
-}) => {
-	if (Object.keys(todo).length > 0) {
-		memoryTodo = todo;
-		return oldComponents;
-	}
-	const components = buildComponents({
-		components: questionnaire.components,
-		management,
-		bindings,
-		features,
-		page,
-		pagination,
-		todo: memoryTodo,
-	});
-	oldComponents = components;
-	return components;
-};
+import { interpret } from '../interpret';
+import { isDev, buildVectorialBindings } from '../../lib';
+
+let cache = {};
+
+const customFilterPagination = ({ page }, pagination, currentPage) => {
+	return pagination ? currentPage?.split('.')[0] === page : true;
+};
+
+const filterComponents = ({ components, updatedVars, features, bindings }) => {
+	const localCache = {};
+	const filtered = components.filter(({ conditionFilter }) => {
+		if (!conditionFilter || !conditionFilter.value) return true;
+		const { bindingDependencies, value } = conditionFilter;
+		if (localCache[value] !== undefined) return localCache[value];
+		if (
+			(!bindingDependencies ||
+				!updatedVars.some((t) => bindingDependencies.includes(t))) &&
+			cache[value] !== undefined
+		)
+			return cache[value];
+		const vectorialBindings = buildVectorialBindings(bindings);
+		const inter = interpret(features)(vectorialBindings)(value);
+		localCache[value] = inter;
+		return inter;
+	});
+	cache = { ...cache, ...localCache };
+	return filtered;
+};
+
+const buildComponents = ({
+	components,
+	management,
+	bindings,
+	features,
+	page,
+	pagination,
+	todo,
+}) => {
+	if (management && !pagination) return components;
+
+	if (management && pagination)
+		return components.filter((c) =>
+			customFilterPagination(c, pagination, page)
+		);
+
+	if (isDev) {
+		console.log('Start filter');
+		var start = new Date().getTime();
+	}
+
+	const updatedVars = Object.keys(todo);
+
+	if (!pagination) {
+		const filtered = filterComponents({
+			components,
+			updatedVars,
+			features,
+			bindings,
+		});
+		if (isDev) console.log(`End filter: ${new Date().getTime() - start} ms`);
+		return filtered;
+	}
+
+	const pageComponents = components.filter((c) =>
+		customFilterPagination(c, pagination, page)
+	);
+
+	const pageComponentsFiltered = filterComponents({
+		components: pageComponents,
+		updatedVars,
+		features,
+		bindings,
+	});
+	if (isDev) console.log(`End filter: ${new Date().getTime() - start}`);
+	return pageComponentsFiltered;
+};
+
+let oldComponents = [];
+let memoryTodo = {};
+
+export const useFilterComponents = ({
+	questionnaire,
+	management,
+	bindings,
+	features,
+	page,
+	pagination,
+	todo,
+}) => {
+	if (Object.keys(todo).length > 0) {
+		memoryTodo = todo;
+		return oldComponents;
+	}
+	const components = buildComponents({
+		components: questionnaire.components,
+		management,
+		bindings,
+		features,
+		page,
+		pagination,
+		todo: memoryTodo,
+	});
+	oldComponents = 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';