@inseefr/lunatic 2.7.20 → 2.7.22

package/lib/components/duration/durationUtils.js

@@ -8,7 +8,7 @@ exports.propsByUnit = exports.labelByUnit = void 0;
 var propsByUnit = exports.propsByUnit = {
   hours: {
     min: 0,
-    max: 23,
+    max: 99,
     size: 2,
     style: {
       width: '2.5em'

package/lib/components/suggester/html/suggester.js

@@ -38,7 +38,8 @@ function Suggester(_ref) {
     searching = _ref.searching,
     label = _ref.label,
     description = _ref.description,
-    errors = _ref.errors;
+    errors = _ref.errors,
+    allowArbitraryOption = _ref.allowArbitraryOption;
   var _useState = (0, _react.useState)(''),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -49,7 +50,7 @@ function Suggester(_ref) {
     setOptions = _useState4[1];
   var lastSearch = (0, _react.useRef)('');
   var handleSelect = (0, _react.useCallback)(function (id) {
-    onSelect(id ? id : null);
+    onSelect(id !== null && id !== void 0 ? id : null);
   }, [onSelect]);
   var handleChange = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
@@ -72,7 +73,7 @@ function Suggester(_ref) {
               setOptions(results);
               setSearch(search);
               // if a user does not select an option in the list, their search term is saved
-              onSelect(search);
+              allowArbitraryOption && onSelect(search);
             }
             _context.next = 13;
             break;
@@ -89,7 +90,7 @@ function Suggester(_ref) {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [searching, onSelect]);
+  }(), [searching, allowArbitraryOption, onSelect]);
   var defaultSearch = getSearch(search, value);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.ComboBox, {
     id: id,

package/lib/components/suggester/idb-suggester/idb-suggester.js

@@ -26,6 +26,8 @@ function IDBSuggester(_ref) {
     optionRenderer = _ref.optionRenderer,
     labelRenderer = _ref.labelRenderer,
     onSelect = _ref.onSelect,
+    _ref$allowArbitraryOp = _ref.allowArbitraryOption,
+    allowArbitraryOption = _ref$allowArbitraryOp === void 0 ? false : _ref$allowArbitraryOp,
     disabled = _ref.disabled,
     value = _ref.value,
     label = _ref.label,
@@ -65,7 +67,8 @@ function IDBSuggester(_ref) {
         value: value,
         label: label,
         description: description,
-        errors: errors
+        errors: errors,
+        allowArbitraryOption: allowArbitraryOption
       })
     })
   });

package/lib/components/suggester/lunatic-suggester.js

@@ -17,6 +17,7 @@ function LunaticSuggester(_ref) {
     labelRenderer = _ref.labelRenderer,
     idbVersion = _ref.idbVersion,
     focused = _ref.focused,
+    allowArbitraryOption = _ref.allowArbitraryOption,
     value = _ref.value,
     handleChange = _ref.handleChange,
     disabled = _ref.disabled,
@@ -57,6 +58,7 @@ function LunaticSuggester(_ref) {
       onSelect: onChange,
       disabled: disabled,
       id: id,
+      allowArbitraryOption: allowArbitraryOption,
       value: value,
       errors: (0, _errors.getComponentErrors)(errors, id),
       label: label,

package/lib/src/components/suggester/html/suggester.d.ts

@@ -21,6 +21,7 @@ type Props = {
     label?: ReactNode;
     description?: ReactNode;
     errors?: LunaticError[];
+    allowArbitraryOption: boolean;
 };
 declare const _default: import("react").ComponentType<Props>;
 export default _default;

package/lib/src/components/suggester/idb-suggester/idb-suggester.d.ts

@@ -1,9 +1,9 @@
 import type { LunaticError } from '../../../use-lunatic/type';
 import type { LunaticComponentProps } from '../../type';
-type Props = Pick<LunaticComponentProps<'Suggester'>, 'storeName' | 'idbVersion' | 'id' | 'className' | 'optionRenderer' | 'labelRenderer' | 'disabled' | 'readOnly' | 'value' | 'label' | 'description' | 'getSuggesterStatus'> & {
+type Props = Pick<LunaticComponentProps<'Suggester'>, 'storeName' | 'idbVersion' | 'id' | 'className' | 'optionRenderer' | 'labelRenderer' | 'disabled' | 'readOnly' | 'value' | 'label' | 'description' | 'getSuggesterStatus' | 'allowArbitraryOption'> & {
     errors?: LunaticError[];
     onSelect: (v: string | null) => void;
     workersBasePath?: string;
 };
-export declare function IDBSuggester({ storeName, idbVersion, id, className, optionRenderer, labelRenderer, onSelect, disabled, value, label, description, getSuggesterStatus, errors, readOnly, workersBasePath, }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function IDBSuggester({ storeName, idbVersion, id, className, optionRenderer, labelRenderer, onSelect, allowArbitraryOption, disabled, value, label, description, getSuggesterStatus, errors, readOnly, workersBasePath, }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/src/components/suggester/lunatic-suggester.d.ts

@@ -1,3 +1,3 @@
 import type { LunaticComponentProps } from '../type';
-declare function LunaticSuggester({ id, storeName, optionRenderer, labelRenderer, idbVersion, focused, value, handleChange, disabled, readOnly, errors, label, description, preferences, declarations, missing, missingResponse, management, response, className, getSuggesterStatus, workersBasePath, }: LunaticComponentProps<'Suggester'>): import("react/jsx-runtime").JSX.Element;
+declare function LunaticSuggester({ id, storeName, optionRenderer, labelRenderer, idbVersion, focused, allowArbitraryOption, value, handleChange, disabled, readOnly, errors, label, description, preferences, declarations, missing, missingResponse, management, response, className, getSuggesterStatus, workersBasePath, }: LunaticComponentProps<'Suggester'>): import("react/jsx-runtime").JSX.Element;
 export default LunaticSuggester;

package/lib/src/components/type.d.ts

@@ -264,6 +264,7 @@ type ComponentPropsByType = {
         response: {
             name: string;
         };
+        allowArbitraryOption: boolean;
     };
     Summary: LunaticBaseProps<string | null> & {
         sections: Array<{

package/lib/src/use-lunatic/commons/variables/lunatic-variables-store.d.ts

@@ -52,17 +52,19 @@ export declare class LunaticVariablesStore {
      */
     off<T extends keyof EventArgs>(eventName: T, cb: (e: CustomEvent<EventArgs[T]>) => void): void;
     get interpretCount(): number;
+    debug(): void;
 }
 declare class LunaticVariable {
     updatedAt: Map<string | undefined, number>;
     private calculatedAt;
     private value;
     private dependencies?;
-    private readonly expression?;
+    readonly expression?: string;
     private readonly dictionary?;
     private readonly iterationDepth?;
     private readonly shapeFrom?;
-    private readonly name?;
+    readonly name?: string;
+    calculatedCount: number;
     constructor(args?: {
         expression?: string;
         dependencies?: string[];

package/lib/src/use-lunatic/use-lunatic.d.ts

@@ -255,6 +255,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                 response: {
                     name: string;
                 };
+                allowArbitraryOption: boolean;
             };
             Summary: import("../components/type").LunaticBaseProps<string | null> & {
                 sections: {
@@ -507,6 +508,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                 response: {
                     name: string;
                 };
+                allowArbitraryOption: boolean;
             };
             Summary: import("../components/type").LunaticBaseProps<string | null> & {
                 sections: {

package/lib/stories/questionnaires/recensement/source.json

@@ -2697,7 +2697,7 @@
 							}
 						}
 					},
-					"storeName": "L_DEPNAIS-1-0-0",
+					"storeName": "L_DEPNAIS-1-1-0",
 					"bindingDependencies": [
 						"DPNAI_FRANCE",
 						"NOM",
@@ -12739,7 +12739,7 @@
 	],
 	"suggesters": [
 		{
-			"name": "L_DEPNAIS-1-0-0",
+			"name": "L_DEPNAIS-1-1-0",
 			"fields": [
 				{ "name": "label", "rules": "soft" },
 

package/lib/stories/suggester/source-component-set.json

@@ -2,21 +2,67 @@
 	"maxPage": "1",
 	"suggesters": [
 		{
-			"name": "naf-rev2",
+			"responseNames": ["VARIABLE_ACTIVITE"],
+			"name": "L_ACTIVITES-1-0-0",
 			"fields": [
 				{
 					"name": "label",
 					"rules": ["[\\w]+"],
 					"language": "French",
-					"min": 2
-				},
-				{ "name": "id" }
+					"min": 3,
+					"stemmer": false,
+					"synonyms": {
+						"EHPAD": ["EPHAD", "HEPAD", "EPAD", "EPAHD", "EPADH"],
+						"plaquisterie": ["PLACO", "PLACOPLATRE"],
+						"pneumatiques": ["PNEUS"],
+						"prestations": ["PRESTATAIRE"],
+						"echafaudages": ["ECHAFFAUDAGE", "ECHAFFAUDEUR"],
+						"URSSAF": ["URSAF", "URSAFF"],
+						"ascenseurs": ["ASCENCEUR", "ASSENCEUR", "ACSENCEUR"],
+						"briqueterie": ["BRIQUETTERIE"],
+						"joaillerie": ["JOAILLIER"],
+						"agroalimentaire": ["AGGROALIMANTAIRE", "AGROALIMANTAIRE"],
+						"alimentaire": ["ALIMANTAIRE"],
+						"alimentaires": ["ALIMANTAIRES"],
+						"agroalimentaires": ["AGGROALIMANTAIRES", "AGROALIMENTAIRES"]
+					}
+				}
 			],
 			"queryParser": {
 				"type": "tokenized",
-				"params": { "language": "French", "pattern": "[\\w.]+" }
+				"params": {
+					"language": "French",
+					"pattern": "[\\w.]+",
+					"min": 3,
+					"stemmer": false
+				}
 			},
-			"version": "1"
+			"version": "1",
+			"stopWords": [
+				"a",
+				"au",
+				"dans",
+				"de",
+				"des",
+				"du",
+				"en",
+				"er",
+				"la",
+				"le",
+				"ou",
+				"sur",
+				"d",
+				"l",
+				"aux",
+				"dans",
+				"un",
+				"une",
+				"pour",
+				"avec",
+				"chez",
+				"par",
+				"les"
+			]
 		}
 	],
 	"components": [
@@ -37,9 +83,9 @@
 				{
 					"id": "communes-2023",
 					"componentType": "Suggester",
-					"label": { "value": "\"NAF\"", "type": "VTL" },
+					"label": { "value": "\"Activité\"", "type": "VTL" },
 					"description": "\"industrie\"",
-					"storeName": "naf-rev2",
+					"storeName": "L_ACTIVITES-1-0-0",
 					"conditionFilter": {
 						"value": "true",
 						"type": "VTL"

package/lib/stories/suggester/source.json

@@ -1,254 +1,399 @@
 {
-	"maxPage": "4",
 	"suggesters": [
 		{
-			"name": "naf-rev2",
+			"responseNames": ["VARIABLE_COMMUNE"],
+			"name": "L_COMMUNEPASSEE-1-2-0",
 			"fields": [
 				{
 					"name": "label",
 					"rules": ["[\\w]+"],
 					"language": "French",
-					"min": 2
-				},
-				{ "name": "id" }
+					"min": 3,
+					"stemmer": false
+				}
+			],
+			"queryParser": {
+				"type": "tokenized",
+				"params": {
+					"language": "French",
+					"pattern": "[\\w.]+",
+					"min": 3,
+					"stemmer": false
+				}
+			},
+			"version": "1"
+		},
+		{
+			"responseNames": ["VARIABLE_PAYS"],
+			"name": "L_PAYS-1-2-0",
+			"fields": [
+				{
+					"name": "label",
+					"rules": ["[\\w]+"],
+					"language": "French",
+					"min": 3,
+					"stemmer": false
+				}
 			],
 			"queryParser": {
 				"type": "tokenized",
-				"params": { "language": "French", "pattern": "[\\w.]+" }
+				"params": {
+					"language": "French",
+					"pattern": "[\\w.]+",
+					"min": 3,
+					"stemmer": false
+				}
 			},
 			"version": "1"
 		},
 		{
-			"name": "naf-rev2-stop",
+			"responseNames": ["VARIABLE_NATIONALITE"],
+			"name": "L_NATIONALITE-1-2-0",
 			"fields": [
 				{
 					"name": "label",
 					"rules": ["[\\w]+"],
 					"language": "French",
-					"min": 2
-				},
-				{ "name": "id" }
+					"min": 3,
+					"stemmer": false
+				}
 			],
 			"queryParser": {
 				"type": "tokenized",
-				"params": { "language": "French", "pattern": "[\\w.]+" }
+				"params": {
+					"language": "French",
+					"pattern": "[\\w.]+",
+					"min": 3,
+					"stemmer": false
+				}
 			},
 			"version": "1"
 		},
 		{
-			"name": "cog-communes",
+			"responseNames": ["VARIABLE_PCS"],
+			"name": "L_PCS_HOMMES-1-5-0",
+			"fields": [
+				{
+					"name": "label",
+					"rules": ["[\\w]+"],
+					"language": "French",
+					"min": 3,
+					"stemmer": false,
+					"synonyms": {
+						"accueil": ["ACCEUIL"],
+						"échafaudage": ["ECHAFFAUDAGE"],
+						"URSSAF": ["URSAF", "URSAFF"],
+						"ingénierie": ["INGENIEURIE", "INGENERIE", "INGIENERIE"],
+						"construction": ["CONSTRUCTEUR"],
+						"distribution": ["DISTRIBUTEUR"],
+						"fabrication": ["FABRICANT"],
+						"abattoir": ["ABATOIR", "ABBATOIR", "ABATOIRE", "ABATTOIRE"],
+						"ascenseur": ["ASCENCEUR"],
+						"ascenseurs": ["ASCENCEURS"],
+						"assenseur": ["ASSENCEUR"],
+						"assenseurs": ["ASSENCEURS"],
+						"joaillerie": ["JOAILLIER"],
+						"agroalimentaire": ["AGGROALIMANTAIRE", "AGROALIMANTAIRE"],
+						"alimentaires": ["ALIMANTAIRE"],
+						"alimentaires": ["ALIMANTAIRES"],
+						"agroalimentaires": ["AGGROALIMANTAIRES", "AGROALIMENTAIRES"]
+					}
+				}
+			],
+			"queryParser": {
+				"type": "tokenized",
+				"params": {
+					"language": "French",
+					"pattern": "[\\w.]+",
+					"min": 3,
+					"stemmer": false
+				}
+			},
+			"version": "1",
+			"meloto": true,
+			"stopWords": [
+				"a",
+				"au",
+				"dans",
+				"de",
+				"des",
+				"du",
+				"en",
+				"er",
+				"la",
+				"le",
+				"ou",
+				"sur",
+				"d",
+				"l",
+				"aux",
+				"dans",
+				"un",
+				"une",
+				"pour",
+				"avec",
+				"chez",
+				"par",
+				"les"
+			]
+		},
+		{
+			"responseNames": ["VARIABLE_BAILLEURS_SOCIAUX"],
+			"name": "bailleurs_sociaux-1-5-0",
 			"fields": [
-				{ "name": "label", "rules": "soft" },
-				{ "name": "nccenr", "rules": "soft" },
-				{ "name": "id", "rules": "soft" }
+				{
+					"name": "label",
+					"rules": ["[\\w]+"],
+					"language": "French",
+					"min": 3,
+					"stemmer": false
+				}
 			],
-			"queryParser": { "type": "soft" },
+			"queryParser": {
+				"type": "tokenized",
+				"params": {
+					"language": "French",
+					"pattern": "[\\w.]+",
+					"min": 3,
+					"stemmer": false
+				}
+			},
 			"version": "1"
 		}
 	],
 	"components": [
 		{
-			"id": "nn",
-			"componentType": "InputNumber",
-			"mandatory": false,
-			"min": 1,
-			"max": 4,
-			"decimals": 0,
-			"label": { "value": "\"Number of inhabitants\"", "type": "VTL|MD" },
-			"conditionFilter": { "value": "true", "type": "VTL" },
+			"componentType": "Suggester",
 			"response": {
-				"name": "NUM"
+				"name": "VARIABLECO"
+			},
+			"storeName": "L_COMMUNEPASSEE-1-2-0",
+			"hierarchy": {
+				"sequence": {
+					"id": "lt4fhgd6",
+					"page": "1",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"I - \" || \"Sequence\""
+					}
+				}
+			},
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"id": "lt4ezymk",
+			"page": "1",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"➡ 1. \" || \"Variable Commune\""
 			},
-			"page": "1"
+			"mandatory": false,
+			"maxLength": 249
 		},
 		{
-			"id": "idLoop",
-			"label": { "value": "\"Boucle individu\"", "type": "VTL|MD" },
-			"componentType": "Loop",
-			"iterations": { "value": "cast(NUM, integer)", "type": "VTL" },
-			"paginatedLoop": false,
-			"conditionFilter": { "value": "true", "type": "VTL" },
-			"loopDependencies": ["NUM"],
+			"componentType": "Suggester",
+			"response": {
+				"name": "VARIABLEPA"
+			},
+			"storeName": "L_PAYS-1-2-0",
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"id": "lt4fjoev",
 			"page": "2",
-			"components": [
-				{
-					"id": "k3ym6x16",
-					"label": { "value": "\"Prénom :\"", "type": "VTL|MD" },
-					"componentType": "Input",
-					"conditionFilter": { "value": "true", "type": "VTL" },
-					"mandatory": false,
-					"response": {
-						"name": "PRENOM"
-					},
-					"page": "2"
-				}
-			]
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"➡ 2. \" || \"Variable Pays\""
+			},
+			"mandatory": false,
+			"maxLength": 249
 		},
 		{
-			"id": "idLoopInd",
-			"label": { "value": "\"Boucle individu\"", "type": "VTL|MD" },
-			"componentType": "Loop",
-			"iterations": { "value": "count(PRENOM)", "type": "VTL" },
-			"paginatedLoop": true,
-			"conditionFilter": { "value": "true", "type": "VTL" },
-			"loopDependencies": ["PRENOM"],
+			"componentType": "Suggester",
+			"storeName": "L_NATIONALITE-1-2-0",
+			"response": {
+				"name": "VARIABLENA"
+			},
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"id": "lt4f6i2y",
 			"page": "3",
-			"maxPage": "3",
-			"components": [
-				{
-					"id": "k3ym61vfzzzzzzzzzzzz",
-					"componentType": "Sequence",
-					"label": {
-						"value": "\"Questionnaire de : \" || PRENOM",
-						"type": "VTL|MD"
-					},
-					"conditionFilter": {
-						"value": "not(isnull(PRENOM))",
-						"type": "VTL"
-					},
-					"page": "3.1"
-				},
-				{
-					"id": "sugg1",
-					"componentType": "Suggester",
-					"mandatory": false,
-					"label": {
-						"value": "PRENOM || \" what's your favorite NAF code? (default stop words)\"",
-						"type": "VTL|MD"
-					},
-					"storeName": "naf-rev2",
-					"conditionFilter": {
-						"value": "not(isnull(PRENOM))",
-						"type": "VTL"
-					},
-					"response": {
-						"name": "NAF"
-					},
-					"page": "3.2"
-				},
-				{
-					"id": "sugg2",
-					"componentType": "Suggester",
-					"mandatory": false,
-					"label": "PRENOM || \" what's your favorite NAF code? (without stop words)\"",
-					"storeName": "naf-rev2-stop",
-					"conditionFilter": {
-						"value": "not(isnull(PRENOM))",
-						"type": "VTL"
-					},
-					"response": {
-						"name": "NAF_STOP"
-					},
-					"page": "3.2",
-					"declarations": [
-						{
-							"id": "kb9hi4j0-krnoclfe",
-							"declarationType": "INSTRUCTION",
-							"position": "BEFORE_QUESTION_TEXT",
-							"label": {
-								"value": "\"Test declaration before\"",
-								"type": "VTL|MD"
-							}
-						},
-						{
-							"id": "kb9hi4j0-krnoclfe",
-							"declarationType": "HELP",
-							"position": "AFTER_QUESTION_TEXT",
-							"label": {
-								"value": "\"Test description from declaration\"",
-								"type": "VTL|MD"
-							}
-						}
-					]
-				},
-				{
-					"id": "sugg-communes",
-					"componentType": "Suggester",
-					"mandatory": false,
-					"label": {
-						"value": "PRENOM || \" what's your favorite city?\"",
-						"type": "VTL|MD"
-					},
-					"storeName": "cog-communes",
-					"conditionFilter": {
-						"value": "not(isnull(PRENOM))",
-						"type": "VTL"
-					},
-					"response": {
-						"name": "CITY"
-					},
-					"page": "3.3"
-				}
-			]
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"➡ 3. \" || \"Variable Nationalité\""
+			},
+			"mandatory": false,
+			"maxLength": 249
+		},
+		{
+			"componentType": "Suggester",
+			"storeName": "L_PCS_HOMMES-1-5-0",
+			"response": {
+				"name": "VARIABLE_P"
+			},
+
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"id": "lt4f9q1o",
+			"page": "4",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"➡ 4. \" || \"VARIABLE_PCS\""
+			},
+			"allowArbitraryOption": true,
+			"mandatory": false,
+			"maxLength": 249
 		},
 		{
-			"id": "kk",
-			"componentType": "Sequence",
-			"label": { "value": "\"END\"", "type": "VTL|MD" },
-			"conditionFilter": { "value": "true", "type": "VTL" },
-			"page": "4"
+			"componentType": "Suggester",
+			"storeName": "bailleurs_sociaux-1-5-0",
+			"response": {
+				"name": "VARIABLE_B"
+			},
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"id": "lt4f8uba",
+			"page": "5",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"➡ 5. \" || \"VARIABLE_BAILLEURS_SOCIAUX\""
+			},
+			"mandatory": false,
+			"maxLength": 249
 		}
 	],
+	"pagination": "question",
+	"resizing": {},
+	"label": {
+		"type": "VTL|MD",
+		"value": "Suggester"
+	},
+	"lunaticModelVersion": "2.5.0",
+	"modele": "SUGGESTER",
+	"enoCoreVersion": "2.7.1",
+	"generatingDate": "27-02-2024 13:43:43",
+	"missing": false,
+	"id": "lt4f6mib",
+	"maxPage": "5",
 	"variables": [
 		{
 			"variableType": "COLLECTED",
-			"name": "NUM",
-			"componentRef": "nn",
 			"values": {
-				"PREVIOUS": null,
 				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
 				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "COMMENT_QE"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
 				"EDITED": null,
-				"INPUTED": null
-			}
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "VARIABLECO"
 		},
 		{
 			"variableType": "COLLECTED",
-			"name": "PRENOM",
-			"componentRef": "idLoop",
 			"values": {
-				"PREVIOUS": [null],
-				"COLLECTED": [null],
-				"FORCED": [null],
-				"EDITED": [null],
-				"INPUTED": [null]
-			}
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "VARIABLEPA"
 		},
 		{
 			"variableType": "COLLECTED",
-			"name": "NAF",
-			"componentRef": "idLoopInd",
 			"values": {
-				"PREVIOUS": [null],
-				"COLLECTED": [null],
-				"FORCED": [null],
-				"EDITED": [null],
-				"INPUTED": [null]
-			}
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "VARIABLENA"
 		},
 		{
 			"variableType": "COLLECTED",
-			"name": "NAF_STOP",
-			"componentRef": "idLoopInd",
 			"values": {
-				"PREVIOUS": [null],
-				"COLLECTED": [null],
-				"FORCED": [null],
-				"EDITED": [null],
-				"INPUTED": [null]
-			}
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "VARIABLE_P"
 		},
 		{
 			"variableType": "COLLECTED",
-			"name": "CITY",
-			"componentRef": "idLoopInd",
 			"values": {
-				"PREVIOUS": [null],
-				"COLLECTED": [null],
-				"FORCED": [null],
-				"EDITED": [null],
-				"INPUTED": [null]
-			}
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "VARIABLE_B"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"name": "FILTER_RESULT_VARIABLECO",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"name": "FILTER_RESULT_VARIABLEPA",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"name": "FILTER_RESULT_VARIABLENA",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"name": "FILTER_RESULT_VARIABLE_P",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"name": "FILTER_RESULT_VARIABLE_B",
+			"inFilter": "false"
 		}
 	]
 }

package/lib/stories/suggester/suggester.stories.js

@@ -3,12 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Simple = exports.Default = exports.ComponentSet = void 0;
+exports["default"] = exports.Default = exports.ComponentSet = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
 var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 var _referentiel = require("../utils/referentiel");
-var _simple = _interopRequireDefault(require("./simple"));
 var _source = _interopRequireDefault(require("./source"));
 var _sourceComponentSet = _interopRequireDefault(require("./source-component-set"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -36,19 +35,6 @@ Default.args = {
   getReferentiel: _referentiel.getReferentiel,
   pagination: true
 };
-var Simple = exports.Simple = Template.bind({});
-Simple.args = {
-  source: _simple["default"],
-  getReferentiel: _referentiel.getReferentiel,
-  autoSuggesterLoading: true,
-  missing: {
-    table: {
-      disable: false
-    },
-    control: 'boolean',
-    defaultValue: true
-  }
-};
 var ComponentSet = exports.ComponentSet = Template.bind({});
 ComponentSet.args = {
   source: _sourceComponentSet["default"],

package/lib/stories/utils/orchestrator.js

@@ -182,6 +182,7 @@ function OrchestratorForStories(_ref3) {
       custom: custom,
       autoSuggesterLoading: autoSuggesterLoading,
       getReferentiel: getReferentiel,
+      workersBasePath: "./workers",
       management: management,
       missing: missing,
       missingStrategy: missingStrategy,

package/lib/stories/utils/referentiel.js

@@ -13,28 +13,19 @@ var getReferentiel = exports.getReferentiel = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.t0 = name;
-          _context.next = _context.t0 === 'libelle-pcs2020' ? 3 : _context.t0 === 'naf-rev2-stop' ? 4 : _context.t0 === 'naf-rev2' ? 4 : _context.t0 === 'cog-communes' ? 5 : 6;
-          break;
-        case 3:
-          return _context.abrupt("return", fetch('./libelles-pcs-2020.json').then(function (r) {
+          _context.prev = 0;
+          return _context.abrupt("return", fetch("./".concat(name, ".json")).then(function (r) {
             return r.json();
           }));
         case 4:
-          return _context.abrupt("return", fetch('./naf-rev2.json').then(function (r) {
-            return r.json();
-          }));
-        case 5:
-          return _context.abrupt("return", fetch('./communes-2019.json').then(function (r) {
-            return r.json();
-          }));
-        case 6:
+          _context.prev = 4;
+          _context.t0 = _context["catch"](0);
           throw new Error("Unknown r\xE9f\xE9rentiel ".concat(name));
         case 7:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[0, 4]]);
   }));
   return function getReferentiel(_x) {
     return _ref.apply(this, arguments);

package/lib/use-lunatic/commons/variables/lunatic-variables-store.js

@@ -137,10 +137,31 @@ var LunaticVariablesStore = exports.LunaticVariablesStore = /*#__PURE__*/functio
     get: function get() {
       return interpretCount;
     }
+
+    // Displays a table of the most calculated variable (useful for debug)
+  }, {
+    key: "debug",
+    value: function debug() {
+      console.table(Array.from(this.dictionary.values()).sort(function (a, b) {
+        return b.calculatedCount - a.calculatedCount;
+      }).slice(0, 25).map(function (v) {
+        return {
+          name: v.name,
+          calculations: v.calculatedCount,
+          expression: v.expression
+        };
+      }));
+      console.log('Total calculations : ' + Array.from(this.dictionary.values()).reduce(function (acc, v) {
+        return acc + v.calculatedCount;
+      }, 0));
+      Array.from(this.dictionary.values()).map(function (v) {
+        return v.calculatedCount = 0;
+      });
+    }
   }], [{
     key: "makeFromSource",
     value: function makeFromSource(source, data) {
-      var _variable$name;
+      var _variable$shapeFrom, _variable$name;
       var store = new LunaticVariablesStore();
       if (!source.variables) {
         return store;
@@ -153,6 +174,7 @@ var LunaticVariablesStore = exports.LunaticVariablesStore = /*#__PURE__*/functio
         if (name === 'yAxis') return 1;
         return undefined;
       };
+      store.set('1', 1); // Fake variable to use on the shapeFrom, we will use "variableDimension" in the future
       var _iterator = _createForOfIteratorHelper(source.variables),
         _step;
       try {
@@ -163,7 +185,7 @@ var LunaticVariablesStore = exports.LunaticVariablesStore = /*#__PURE__*/functio
               store.setCalculated(variable.name, variable.expression.value, {
                 dependencies: variable.bindingDependencies,
                 iterationDepth: getIterationDepth(variable.name),
-                shapeFrom: variable.shapeFrom
+                shapeFrom: (_variable$shapeFrom = variable.shapeFrom) !== null && _variable$shapeFrom !== void 0 ? _variable$shapeFrom : '1'
               });
               break;
             case 'COLLECTED':
@@ -223,6 +245,8 @@ var LunaticVariable = /*#__PURE__*/function () {
     this.shapeFrom = void 0;
     // Keep a record of variable name (optional, used for debug)
     this.name = void 0;
+    // Count the number of calculation
+    this.calculatedCount = 0;
     if (args.expression && !args.dictionary) {
       throw new Error("A calculated variable needs a dictionary to retrieve his deps");
     }
@@ -270,6 +294,13 @@ var LunaticVariable = /*#__PURE__*/function () {
       if ((0, _env.isTestEnv)()) {
         interpretCount++;
       }
+      // Scale down iteration if its dimension > shapeFrom dimension
+      var shapeDimension = arrayDimension(shapeFromValue);
+      if (Array.isArray(iteration) && Array.isArray(shapeFromValue) && shapeDimension < iteration.length) {
+        iteration = iteration.slice(0, shapeDimension);
+      }
+      // Uncomment this if you want to track the number of calculation
+      // this.calculatedCount++;
       // Remember the value
       try {
         this.setValue((0, _vtl.interpretVTL)(this.expression, bindings), iteration);
@@ -415,4 +446,10 @@ var LunaticVariable = /*#__PURE__*/function () {
     }
   }]);
   return LunaticVariable;
-}();
+}();
+function arrayDimension(arr) {
+  if (!Array.isArray(arr)) {
+    return 0;
+  }
+  return 1 + arrayDimension(arr[0]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.20",
+	"version": "2.7.22",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -75,9 +75,6 @@
 		"antlr4": "4.11.0",
 		"classnames": "^2.3.1",
 		"date-fns": "^2.25.0",
-		"lodash.camelcase": "^4.3.0",
-		"lodash.debounce": "^4.0.8",
-		"lodash.isequal": "^4.5.0",
 		"object-hash": "^2.2.0",
 		"prop-types": "^15.7.2",
 		"react-keyboard-event-handler": "^1.5.4",

package/lib/stories/suggester/simple.json

@@ -1,168 +0,0 @@
-{
-	"maxPage": "5",
-	"suggesters": [
-		{
-			"name": "naf-rev2",
-			"fields": [
-				{
-					"name": "label",
-					"rules": ["[\\w]+"],
-					"language": "French",
-					"min": 2
-				},
-				{ "name": "id" }
-			],
-			"queryParser": {
-				"type": "tokenized",
-				"params": { "language": "French", "pattern": "[\\w.]+" }
-			},
-			"version": "1"
-		},
-		{
-			"name": "cog-communes",
-			"fields": [
-				{ "name": "id", "rules": "soft" },
-				{ "name": "label", "rules": "soft" }
-			],
-			"queryParser": { "type": "soft" },
-			"version": "1"
-		},
-		{
-			"name": "in-error",
-			"fields": [{ "name": "id", "rules": "soft" }],
-			"queryParser": { "type": "soft" },
-			"version": "1"
-		}
-	],
-	"components": [
-		{
-			"id": "suggestions-naf",
-			"componentType": "Suggester",
-			"mandatory": false,
-			"label": {
-				"value": "\"Code ou terme des libellés de la Naf-rev2\"",
-				"type": "VTL|MD"
-			},
-			"description": { "value": "\"Exemple: 01 ou tabac\"", "type": "VTL|MD" },
-			"storeName": "naf-rev2",
-			"conditionFilter": {
-				"value": "true",
-				"type": "VTL"
-			},
-			"readOnly": {
-				"value": "true",
-				"type": "VTL"
-			},
-			"controls": [
-				{
-					"id": "age-controls",
-					"criticality": "ERROR",
-					"typeOfControl": "FORMAT",
-					"control": {
-						"value": "not(isnull(HELLO))",
-						"type": "VTL"
-					},
-					"errorMessage": {
-						"value": "\"Veuillez selectionner quelquechose\"",
-						"type": "VTL"
-					}
-				}
-			],
-			"response": {
-				"name": "HELLO"
-			},
-			"missingResponse": { "name": "HELLO_MISSING" },
-			"page": "1"
-		},
-		{
-			"id": "suggestions-cog",
-			"componentType": "Suggester",
-			"mandatory": false,
-			"label": "\"Hello!\"",
-			"storeName": "cog-communes",
-			"conditionFilter": {
-				"value": "true",
-				"type": "VTL"
-			},
-			"response": {
-				"name": "HELLO"
-			},
-			"missingResponse": { "name": "HELLO_MISSING" },
-			"page": "1"
-		},
-		{
-			"id": "suggestions-inconnu",
-			"componentType": "Suggester",
-			"mandatory": false,
-			"label": "\"Hello!\"",
-			"storeName": "inconnu-au-bataillon",
-			"conditionFilter": {
-				"value": "true",
-				"type": "VTL"
-			},
-			"response": {
-				"name": "HELLO"
-			},
-			"missingResponse": { "name": "HELLO_MISSING" },
-			"page": "3"
-		},
-		{
-			"id": "suggestions-in-error",
-			"componentType": "Suggester",
-			"mandatory": false,
-			"label": "\"Hello!\"",
-			"storeName": "in-error",
-			"conditionFilter": {
-				"value": "true",
-				"type": "VTL"
-			},
-			"missingResponse": { "name": "HELLO_MISSING" },
-			"response": {
-				"name": "HELLO"
-			},
-			"page": "4"
-		},
-		{
-			"id": "bye!",
-			"componentType": "Sequence",
-			"page": "5",
-			"declarations": [
-				{
-					"id": "kb9hi4j0-krnoclfe",
-					"declarationType": "INSTRUCTION",
-					"position": "BEFORE_QUESTION_TEXT",
-					"label": {
-						"value": "\"Merci beaucoup.\"",
-						"type": "VTL|MD"
-					}
-				}
-			]
-		}
-	],
-	"variables": [
-		{
-			"variableType": "COLLECTED",
-			"name": "HELLO",
-			"componentRef": "nn",
-			"values": {
-				"PREVIOUS": null,
-				"COLLECTED": null,
-				"FORCED": null,
-				"EDITED": null,
-				"INPUTED": null
-			}
-		},
-		{
-			"variableType": "COLLECTED",
-			"name": "HELLO_MISSING",
-			"componentRef": "nn",
-			"values": {
-				"PREVIOUS": null,
-				"COLLECTED": null,
-				"FORCED": null,
-				"EDITED": null,
-				"INPUTED": null
-			}
-		}
-	]
-}