@inseefr/lunatic 0.1.13-hackathon → 0.2.0-prisme

package/src/utils/store-tools/clear-store-data.js

@@ -1,8 +1,8 @@
-import { clearDb } from '../idb-tools';
-import CONSTANTES from './constantes';
-
-async function clear(db) {
-	await clearDb(db, CONSTANTES.STORE_DATA_NAME);
-}
-
-export default clear;
+import { clearDb } from '../idb-tools';
+import CONSTANTES from './constantes';
+
+async function clear(db) {
+	await clearDb(db, CONSTANTES.STORE_DATA_NAME);
+}
+
+export default clear;

package/src/utils/store-tools/clear-store-info.js

@@ -1,8 +1,8 @@
-import { clearDb } from '../idb-tools';
-import CONSTANTES from './constantes';
-
-async function clear(db) {
-	await clearDb(db, CONSTANTES.STORE_INFO_NAME);
-}
-
-export default clear;
+import { clearDb } from '../idb-tools';
+import CONSTANTES from './constantes';
+
+async function clear(db) {
+	await clearDb(db, CONSTANTES.STORE_INFO_NAME);
+}
+
+export default clear;

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

@@ -1,20 +1,20 @@
-export const STORE_DATA_NAME = 'store/entities';
-export const STORE_INFO_NAME = 'store/info';
-export const STORE_INDEX_NAME = 'store/entities/index';
-export const STORE_INDEX_PATH = 'searching';
-export const MAX_STRING = String.fromCharCode(65535);
-export const SEARCH_TYPES = {
-	prefix: 'search/prefix',
-	tokens: 'search/tokens',
-};
-
-const CONSTANTES = {
-	STORE_DATA_NAME,
-	STORE_INDEX_NAME,
-	STORE_INDEX_PATH,
-	MAX_STRING,
-	SEARCH_TYPES,
-	STORE_INFO_NAME,
-};
-
-export default CONSTANTES;
+export const STORE_DATA_NAME = 'store/entities';
+export const STORE_INFO_NAME = 'store/info';
+export const STORE_INDEX_NAME = 'store/entities/index';
+export const STORE_INDEX_PATH = 'searching';
+export const MAX_STRING = String.fromCharCode(65535);
+export const SEARCH_TYPES = {
+	prefix: 'search/prefix',
+	tokens: 'search/tokens',
+};
+
+const CONSTANTES = {
+	STORE_DATA_NAME,
+	STORE_INDEX_NAME,
+	STORE_INDEX_PATH,
+	MAX_STRING,
+	SEARCH_TYPES,
+	STORE_INFO_NAME,
+};
+
+export default CONSTANTES;

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

@@ -1,19 +1,19 @@
-import { clearDb } from '../../idb-tools';
-import CONSTANTES from '../constantes';
-import openOrCreateStore from '../open-or-create-store';
-import updateStoreInfo from './update-store-info';
-
-async function create(storeInfo, idbVersion) {
-	const { name } = storeInfo;
-	try {
-		const db = await openOrCreateStore(name, idbVersion);
-		await clearDb(db, CONSTANTES.STORE_INFO_NAME);
-		await updateStoreInfo(db, storeInfo);
-
-		return db;
-	} catch (e) {
-		throw e;
-	}
-}
-
-export default create;
+import { clearDb } from '../../idb-tools';
+import CONSTANTES from '../constantes';
+import openOrCreateStore from '../open-or-create-store';
+import updateStoreInfo from './update-store-info';
+
+async function create(storeInfo, idbVersion) {
+	const { name } = storeInfo;
+	try {
+		const db = await openOrCreateStore(name, idbVersion);
+		await clearDb(db, CONSTANTES.STORE_INFO_NAME);
+		await updateStoreInfo(db, storeInfo);
+
+		return db;
+	} catch (e) {
+		throw e;
+	}
+}
+
+export default create;

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/get-store-count.js

@@ -1,22 +1,22 @@
-import CONSTANTES from './constantes';
-
-function get(db) {
-	return new Promise(function (resolve, reject) {
-		try {
-			const transaction = db.transaction(
-				[CONSTANTES.STORE_DATA_NAME],
-				'readonly'
-			);
-
-			const store = transaction.objectStore(CONSTANTES.STORE_DATA_NAME);
-			const countRequest = store.count();
-			countRequest.onsuccess = function () {
-				resolve(countRequest.result);
-			};
-		} catch (e) {
-			reject(e);
-		}
-	});
-}
-
-export default get;
+import CONSTANTES from './constantes';
+
+function get(db) {
+	return new Promise(function (resolve, reject) {
+		try {
+			const transaction = db.transaction(
+				[CONSTANTES.STORE_DATA_NAME],
+				'readonly'
+			);
+
+			const store = transaction.objectStore(CONSTANTES.STORE_DATA_NAME);
+			const countRequest = store.count();
+			countRequest.onsuccess = function () {
+				resolve(countRequest.result);
+			};
+		} catch (e) {
+			reject(e);
+		}
+	});
+}
+
+export default get;

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/store-tools/open-or-create-store.js

@@ -1,47 +1,47 @@
-/* eslint-disable no-restricted-globals */
-import CONSTANTE from './constantes';
-import { getIDB } from '../idb-tools';
-
-const IDB_REF = getIDB();
-
-function openStorage(name, idbVersion = 1) {
-	return new Promise(function (resolve, reject) {
-		if (!IDB_REF) {
-			reject('indexedDb not supported !');
-		}
-		const request = IDB_REF.open(name, idbVersion);
-		let db;
-		let doIt = true;
-
-		request.onupgradeneeded = function (e) {
-			doIt = false;
-			db = e.target.result;
-			const store = db.createObjectStore(CONSTANTE.STORE_DATA_NAME, {
-				keyPath: 'id',
-			});
-			db.createObjectStore(CONSTANTE.STORE_INFO_NAME, {
-				keyPath: 'name',
-			});
-			store.createIndex(CONSTANTE.STORE_INDEX_NAME, 'tokens', {
-				multiEntry: true,
-			});
-
-			const txn = e.target.transaction;
-			txn.oncomplete = function () {
-				resolve(db);
-			};
-		};
-
-		request.onsuccess = function () {
-			if (doIt) {
-				resolve(request.result);
-			}
-		};
-
-		request.onerror = function (e) {
-			reject(e);
-		};
-	});
-}
-
-export default openStorage;
+/* eslint-disable no-restricted-globals */
+import CONSTANTE from './constantes';
+import { getIDB } from '../idb-tools';
+
+const IDB_REF = getIDB();
+
+function openStorage(name, idbVersion = 1) {
+	return new Promise(function (resolve, reject) {
+		if (!IDB_REF) {
+			reject('indexedDb not supported !');
+		}
+		const request = IDB_REF.open(name, idbVersion);
+		let db;
+		let doIt = true;
+
+		request.onupgradeneeded = function (e) {
+			doIt = false;
+			db = e.target.result;
+			const store = db.createObjectStore(CONSTANTE.STORE_DATA_NAME, {
+				keyPath: 'id',
+			});
+			db.createObjectStore(CONSTANTE.STORE_INFO_NAME, {
+				keyPath: 'name',
+			});
+			store.createIndex(CONSTANTE.STORE_INDEX_NAME, 'tokens', {
+				multiEntry: true,
+			});
+
+			const txn = e.target.transaction;
+			txn.oncomplete = function () {
+				resolve(db);
+			};
+		};
+
+		request.onsuccess = function () {
+			if (doIt) {
+				resolve(request.result);
+			}
+		};
+
+		request.onerror = function (e) {
+			reject(e);
+		};
+	});
+}
+
+export default openStorage;

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

@@ -1,24 +1,24 @@
-import { useEffect, useState } from 'react';
-import createStore from './create';
-
-function useStoreIndex(storeInfo, idbVersion) {
-	const [db, setDb] = useState(undefined);
-
-	useEffect(
-		function () {
-			async function init() {
-				if (storeInfo && idbVersion) {
-					const db = await createStore(storeInfo, idbVersion);
-					setDb(db);
-				}
-			}
-
-			init();
-			return function () {};
-		},
-		[storeInfo, idbVersion]
-	);
-	return db;
-}
-
-export default useStoreIndex;
+import { useEffect, useState } from 'react';
+import createStore from './create';
+
+function useStoreIndex(storeInfo, idbVersion) {
+	const [db, setDb] = useState(undefined);
+
+	useEffect(
+		function () {
+			async function init() {
+				if (storeInfo && idbVersion) {
+					const db = await createStore(storeInfo, idbVersion);
+					setDb(db);
+				}
+			}
+
+			init();
+			return function () {};
+		},
+		[storeInfo, idbVersion]
+	);
+	return db;
+}
+
+export default useStoreIndex;

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/create-fields-tokenizer.js

@@ -7,10 +7,14 @@ function defaultTokenizeIt(string) {
 	return [prepareStringIndexation(string)];
 }
 
+function toArray(content) {
+	return Array.isArray(content) ? content : [content];
+}
+
 function tokensToArray(tokenized) {
 	return Object.entries(tokenized).reduce(function (a, [k, values]) {
 		if (k.startsWith('pattern')) {
-			return [...a, ...values];
+			return [...a, ...toArray(values)];
 		}
 		return a;
 	}, []);

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 () {

package/src/utils/suggester-workers/commons-tokenizer/filters/filter-synonyms.js

@@ -1,4 +1,6 @@
-function filterSynonyms(tokens, { synonyms }) {
+const MAPS_FROM_ARRAY = new Map(); // Pour éviter de recalculer une map à chaque fois
+
+function filterFromObject(tokens, synonyms) {
 	return tokens.reduce(function (prec, token) {
 		if (token in synonyms) {
 			return [...prec, token, ...synonyms[token]];
@@ -7,4 +9,28 @@ function filterSynonyms(tokens, { synonyms }) {
 	}, []);
 }
 
+function buildSynonymsMap(array) {
+	return array.reduce(function (map, { source, target }) {
+		return { ...map, [source]: target };
+	}, {});
+}
+
+function filterFromArray(tokens, synonyms) {
+	if (!MAPS_FROM_ARRAY.has(synonyms)) {
+		MAPS_FROM_ARRAY.set(synonyms, buildSynonymsMap(synonyms));
+	}
+	return filterFromObject(tokens, MAPS_FROM_ARRAY.get(synonyms));
+}
+
+function filterSynonyms(tokens, { synonyms }) {
+	if (Array.isArray(synonyms) && synonyms.length) {
+		return filterFromArray(tokens, synonyms);
+	}
+	if (typeof synonyms === 'object') {
+		return filterFromObject(tokens, synonyms);
+	}
+
+	return tokens;
+}
+
 export default filterSynonyms;

package/src/utils/suggester-workers/commons-tokenizer/filters/filter-to-lower.js

@@ -0,0 +1,10 @@
+function filterToLower(tokens) {
+	return tokens.map(function (token) {
+		if (typeof token === 'string') {
+			return token.toLocaleLowerCase();
+		}
+		return token;
+	});
+}
+
+export default filterToLower;

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

@@ -0,0 +1,12 @@
+import filterToLower from './filter-to-lower';
+
+describe('filter-to-lower', function () {
+	it('UN', function () {
+		const tokens = ['UN', 'no'];
+		const results = filterToLower(tokens);
+		expect(Array.isArray(results)).toBe(true);
+		expect(results.length).toBe(2);
+		expect(results[0]).toBe('un');
+		expect(results[1]).toBe('no');
+	});
+});

package/src/utils/suggester-workers/commons-tokenizer/index.js

@@ -4,5 +4,6 @@ export { default as prepareStringIndexation } from './prepare-string-indexation'
 export { default as filterStemmer } from './filters/filter-stemmer';
 export { default as filterLength } from './filters/filter-length';
 export { default as filterDouble } from './filters/filter-double';
-export { default as filterAccentsToLower } from './filters/filter-accents-to-lower';
+export { default as filterAccents } from './filters/filter-accents';
+export { default as filterToLower } from './filters/filter-to-lower';
 export { default as getRegExpFromPattern } from './get-regexp-from-pattern';

package/src/utils/suggester-workers/searching/query-parser/query-parser-tokenized.js

@@ -4,10 +4,16 @@ import {
 	filterLength,
 	filterDouble,
 	getRegExpFromPattern,
+	filterToLower,
 } from '../../commons-tokenizer';
 import { composeFilters } from '../../commons-tokenizer/filters';
 
-const filterTokens = composeFilters(filterDouble, filterStemmer, filterLength);
+const filterTokens = composeFilters(
+	filterDouble,
+	filterStemmer,
+	filterToLower,
+	filterLength
+);
 
 function toArray(tokens) {
 	if (tokens) {

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);
@@ -59,6 +59,25 @@ export const updateQuestionnaire =
 		};
 	};
 
+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;
@@ -72,41 +91,59 @@ export const buildNewValue =
 		return lastValue === value ? null : value;
 	};
 
-const getCollectedAndExternal = (variables) => {
-	const { COLLECTED } = variables;
-	const collected = Object.entries(COLLECTED).reduce(
+// 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 }),
 		{}
 	);
-	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) =>
+	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 };
+	}, {});
 
-	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;
 
-	const { COLLECTED, EXTERNAL, CALCULATED: calculatedVariables } = variables;
+		if (isDev) {
+			console.log('Start var calculation');
+			var start = new Date().getTime();
+		}
 
-	const updatedVars = Object.keys(updatedValues);
+		const { COLLECTED, EXTERNAL, CALCULATED: calculatedVariables } = variables;
 
-	const bindings = getCollectedAndExternal(variables);
+		const updatedVars = Object.keys(updatedValues);
 
-	const CALCULATED = getCalculatedVariables(calculatedVariables)({
-		bindings,
-		updatedVars,
-		logFunction,
-	});
+		const bindings = getCollectedAndExternal(preferences)(variables);
 
-	if (isDev)
-		console.log(`End var calculation: ${new Date().getTime() - start} ms`);
+		const CALCULATED = getCalculatedVariables(calculatedVariables)({
+			bindings,
+			updatedVars,
+			logFunction,
+		});
 
-	return { EXTERNAL, COLLECTED, CALCULATED };
-};
+		if (isDev)
+			console.log(`End var calculation: ${new Date().getTime() - start} ms`);
+
+		return { EXTERNAL, COLLECTED, CALCULATED };
+	};