@inseefr/lunatic 2.4.2-beta → 2.4.2

package/lib/src/use-lunatic/commons/use-components-from-state.d.ts

@@ -1,4 +1,4 @@
 import { LunaticState } from '../type';
 import { LunaticComponentProps } from './fill-components/fill-components';
-declare function useComponentsFromState(state: LunaticState): LunaticComponentProps<"CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "Roundabout">[];
+declare function useComponentsFromState(state: LunaticState): LunaticComponentProps<"CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "ComponentSet" | "Roundabout">[];
 export default useComponentsFromState;

package/lib/src/use-lunatic/reducer/commons/is-loop-component.d.ts

@@ -1,11 +1,11 @@
 import { LunaticComponentDefinition } from '../../type';
 export declare const isLoopComponent: (component: LunaticComponentDefinition) => component is (import("../../type-source").ComponentTypeBase & import("../../type-source").ComponentRosterForLoopType & {
-    componentType: "CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "Roundabout";
+    componentType: "CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "ComponentSet" | "Roundabout";
     errors?: Record<string, import("../../type").LunaticError[]> | undefined;
 } & {
     componentType: 'Loop' | 'RosterForLoop';
 }) | (import("../../type-source").ComponentTypeBase & import("../../type-source").ComponentLoopType & {
-    componentType: "CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "Roundabout";
+    componentType: "CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "ComponentSet" | "Roundabout";
     errors?: Record<string, import("../../type").LunaticError[]> | undefined;
 } & {
     componentType: 'Loop' | 'RosterForLoop';

package/lib/src/use-lunatic/reducer/resolve-component-controls/index.d.ts

@@ -0,0 +1 @@
+export { resolveComponentControls } from './resolve-component-control';

package/lib/src/use-lunatic/reducer/resolve-component-controls/resolve-roundabout-control.d.ts

@@ -0,0 +1,10 @@
+import { StateForControls } from '../../commons/compile-controls';
+import { LunaticControl, LunaticError } from '../../type';
+/**
+ * Pour le Roundabout, le controle doit être validé pour chaque itération
+ * composants l'unité enquêtée.
+ * Itération prend pour valeur le rang de l'unité stat au sein de l'unité enquêté.
+ * Le rondpoint ne peut pas être placé dans une boucle car l'itération est effacée.
+ * TODO intégrer cela dans le cadre de boucle de bloucle.
+ */
+export declare function resolveRoundaboutControl(state: StateForControls, control: LunaticControl): LunaticError | undefined;

package/lib/src/use-lunatic/reducer/resolve-component-controls/resolve-simple-control.d.ts

@@ -0,0 +1,3 @@
+import { StateForControls } from '../../commons/compile-controls';
+import { LunaticControl, LunaticError } from '../../type';
+export declare function resolveSimpleControl(state: StateForControls, control: LunaticControl): LunaticError | undefined;

package/lib/src/use-lunatic/replace-component-sequence.d.ts

@@ -0,0 +1,9 @@
+import { LunaticComponentDefinition } from './type';
+/**
+ * Pour le ComponentSet : les composants du fieldset n'existe pas dans pages.
+ * Ils échappent donc aux controls. On les substitue ici au ComponentSet.
+ * On ne peut pas les ajouter directement dans pages (en spécifiant un page), car ils s'afficheraient 2 fois : dans le fieldset et en dessus, comme
+ * des composant à part entière.
+ * D'autres composant pourraient un jour figurer ici.
+ */
+export declare function replaceComponentSequence(components: Array<LunaticComponentDefinition>): LunaticComponentDefinition<"CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "ComponentSet" | "Roundabout">[];

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

@@ -7,7 +7,7 @@ export type LabelType = {
     value: string;
     type: 'VTL' | 'VTL|MD';
 };
-export type ComponentTypeEnum = 'Sequence' | 'Subsequence' | 'RosterForLoop' | 'Loop' | 'Table' | 'Input' | 'InputNumber' | 'Datepicker' | 'CheckboxGroup' | 'CheckboxOne' | 'CheckboxBoolean' | 'Radio' | 'Dropdown' | 'Textarea' | 'FilterDescription' | 'PairwiseLinks' | 'Suggester';
+export type ComponentTypeEnum = 'Sequence' | 'Subsequence' | 'RosterForLoop' | 'Loop' | 'Table' | 'Input' | 'InputNumber' | 'Datepicker' | 'CheckboxGroup' | 'CheckboxOne' | 'CheckboxBoolean' | 'Radio' | 'Dropdown' | 'Textarea' | 'FilterDescription' | 'PairwiseLinks' | 'Suggester' | 'ComponentSet';
 export type ValuesType<T = unknown> = {
     PREVIOUS: T | null;
     COLLECTED: T | null;
@@ -40,6 +40,10 @@ export declare enum TypeOfControl {
     FORMAT = "FORMAT",
     CONSISTENCY = "CONSISTENCY"
 }
+export declare enum ControlTypeEnum {
+    roundabout = "roundabout",
+    simple = "simple"
+}
 export type ControlType = {
     id: string;
     criticality: Criticality;
@@ -47,6 +51,8 @@ export type ControlType = {
     control: LabelType;
     errorMessage: LabelType;
     bindingDependencies: string[];
+    type: ControlTypeEnum;
+    iterations?: number;
 };
 export type ResponseType = {
     name: string;
@@ -75,7 +81,7 @@ export type ComponentTypeBase = {
 };
 export type ComponentType = (ComponentTypeBase & ComponentSequenceType) | (ComponentTypeBase & ComponentSubSequenceType) | (ComponentTypeBase & ComponentRosterForLoopType) | (ComponentTypeBase & ComponentLoopType) | (ComponentTypeBase & ComponentTableType) | (ComponentTypeBase & ComponentNumberType) | (ComponentTypeBase & ComponentDatePickerType) | (ComponentTypeBase & ComponentCheckboxGroupType) | (ComponentTypeBase & ComponentCheckboxBooleanType) | (ComponentTypeBase & ComponentRadioType) | (ComponentTypeBase & ComponentFilterDescriptionType) | (ComponentTypeBase & ComponentDropdownType) | (ComponentTypeBase & ComponentPairWiseLinksType) | (ComponentTypeBase & ComponentRoundaboutType) | (ComponentTypeBase & {
     componentType: 'Input' | 'CheckboxOne' | 'Textarea';
-});
+}) | (ComponentTypeBase & ComponentComponentSet);
 export type ComponentSequenceType = {
     componentType: 'Sequence';
 };
@@ -205,6 +211,10 @@ export type ComponentPairWiseLinksType = {
         [variableName: string]: Record<string, string>;
     };
 };
+export type ComponentComponentSet = {
+    componentType: 'ComponentSet';
+    components: ComponentType[];
+};
 export type SuggesterType = {
     name: string;
     fields: {
@@ -234,6 +244,7 @@ export type SuggesterType = {
     };
     url?: string;
     version: number;
+    meloto?: boolean;
 };
 export type Variable = {
     variableType: 'EXTERNAL';
@@ -249,7 +260,7 @@ export type Variable = {
     expression: LabelType;
     bindingDependencies: string[];
     inFilter: string;
-    shapeFrom: string;
+    shapeFrom?: string;
 };
 export type LunaticSource = {
     id: string;

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

@@ -24,7 +24,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
     dontKnowButton?: string;
     refusedButton?: string;
 }): {
-    getComponents: () => import("./commons/fill-components/fill-components").LunaticComponentProps<"CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "Roundabout">[];
+    getComponents: () => import("./commons/fill-components/fill-components").LunaticComponentProps<"CheckboxGroup" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "Input" | "InputNumber" | "Datepicker" | "CheckboxOne" | "CheckboxBoolean" | "Radio" | "Dropdown" | "Textarea" | "FilterDescription" | "PairwiseLinks" | "ComponentSet" | "Roundabout">[];
     goPreviousPage: () => void;
     goNextPage: (payload?: {}) => void;
     goToPage: (payload?: {}) => void;

package/lib/src/utils/suggester-workers/commons-tokenizer/prepare-string-indexation.d.ts

@@ -0,0 +1,2 @@
+declare function prepare(token?: string, replacement?: string): string;
+export default prepare;

package/lib/src/utils/suggester-workers/searching/compute-score.d.ts

@@ -0,0 +1,3 @@
+import { Entities } from './meloto-order';
+declare function computeScore(documents: Entities, tokens: Array<string>, meloto?: boolean): Entities;
+export default computeScore;

package/lib/src/utils/suggester-workers/searching/meloto-order.d.ts

@@ -0,0 +1,24 @@
+export type Entity = Record<string, unknown> & {
+    id: string | number;
+    suggestion: {
+        label: string;
+    };
+    tokensSearch: {};
+};
+export type Entities = Array<Entity>;
+export declare function value(entity: Entity, tokens?: Array<string>): number;
+/**
+ * Applique une fonction de score supplémentaire pour approcher au mieux
+ * la classification obtenue avec l'outil Meloto, developpé par un prestataire
+ * pour le compte de l'Insee.
+ * Le nouveau classement favorise l'ordre d'apparation des token de recherche
+ * dans la chaine label des entités indéxées. Si la recherche contient électricien,
+ * la suggestion avec un label électricien sera mieux classée que celle avec chef électricien.
+ * S'il y a plusieur tokens de recherche, un poid dégréssif leur est appliqué lors du tri.
+ *
+ * @param {*} entities
+ * @param {*} tokens
+ * @param {*} active
+ * @returns
+ */
+export declare function melotoOrder(entities: Entities, tokens: Array<string>, active?: boolean): Entities;

package/lib/stories/Introduction.stories.mdx

@@ -1,5 +1,6 @@
 import { Meta } from '@storybook/addon-docs';
 import Lunatic from '../../docs/img/lunatic-logo.png';
+import { version } from '../../package.json';
 
 <Meta title="Introduction" />
 
@@ -107,8 +108,7 @@ import Lunatic from '../../docs/img/lunatic-logo.png';
   `}
 </style>
 
-# Welcome to Lunatic storybook
-
-<p>
+<>
+	<h1>Welcome to Lunatic storybook version: {version} </h1>
 	<img src={Lunatic} alt="Lunatic logo" />
-</p>
+</>

package/lib/stories/checkboxGroup/source.json

@@ -28,13 +28,12 @@
 				}
 			},
 			"missingResponse": { "name": "SITUMATRI_MISSING" },
-			"bindingDependencies": ["NATIO1N1", "NATIO1N2", "NATIO1N3", "NATIO1N4"],
 			"responses": [
 				{
 					"id": "kmort6x9-QOP-kmosa98y",
 					"label": {
 						"value": "Française de naissance ou par réintégration",
-						"type": "VTL|MD"
+						"type": "VTL"
 					},
 					"response": { "name": "NATIO1N1" }
 				},
@@ -43,14 +42,14 @@
 					"id": "kmort6x9-QOP-kmos360k",
 					"label": {
 						"value": "\"Française par déclaration, naturalisation, option à la majorité\"",
-						"type": "VTL|MD"
+						"type": "VTL"
 					},
 					"response": { "name": "NATIO1N2" }
 				},
 
 				{
 					"id": "kmort6x9-QOP-kmos37e1",
-					"label": { "value": "Étrangère", "type": "VTL|MD" },
+					"label": { "value": "Étrangère", "type": "VTL" },
 					"response": { "name": "NATIO1N3" }
 				},
 
@@ -58,7 +57,7 @@
 					"id": "kmort6x9-QOP-kmorue9c",
 					"label": {
 						"value": "Apatride (pas de nationalité)",
-						"type": "VTL|MD"
+						"type": "VTL"
 					},
 					"response": { "name": "NATIO1N4" }
 				}

package/lib/stories/component-set/component-set.stories.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.InRoundabout = exports.InLoop = exports.Default = void 0;
+var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
+var _source = _interopRequireDefault(require("./source"));
+var _data = _interopRequireDefault(require("./data"));
+var _source2 = _interopRequireDefault(require("./source1"));
+var _data2 = _interopRequireDefault(require("./data1"));
+var _source3 = _interopRequireDefault(require("./source2"));
+var _data3 = _interopRequireDefault(require("./data2"));
+var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var stories = {
+  title: 'Components/ComponentSet',
+  component: _orchestrator["default"],
+  argTypes: _defaultArgTypes["default"]
+};
+var _default = stories;
+exports["default"] = _default;
+var Template = function Template(args) {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_orchestrator["default"], _objectSpread({}, args));
+};
+var Default = Template.bind({});
+exports.Default = Default;
+Default.args = {
+  id: 'component-set',
+  source: _source["default"],
+  pagination: true,
+  data: _data["default"]
+};
+var InRoundabout = Template.bind({});
+exports.InRoundabout = InRoundabout;
+InRoundabout.args = {
+  id: 'component-set-roundabout',
+  source: _source3["default"],
+  pagination: true,
+  data: _data3["default"]
+};
+var InLoop = Template.bind({});
+exports.InLoop = InLoop;
+InLoop.args = {
+  id: 'component-set-loop',
+  source: _source2["default"],
+  pagination: true,
+  data: _data2["default"]
+};

package/lib/stories/component-set/data.json

@@ -0,0 +1,18 @@
+{
+	"COLLECTED": {
+		"PRENOMS": {
+			"EDITED": null,
+			"FORCED": null,
+			"INPUTED": null,
+			"PREVIOUS": null,
+			"COLLECTED": "Fanny"
+		},
+		"AGE": {
+			"EDITED": null,
+			"FORCED": null,
+			"INPUTED": null,
+			"PREVIOUS": null,
+			"COLLECTED": 15
+		}
+	}
+}

package/lib/stories/component-set/data1.json

@@ -0,0 +1,18 @@
+{
+	"COLLECTED": {
+		"PRENOMS": {
+			"EDITED": [null],
+			"FORCED": [null],
+			"INPUTED": [null],
+			"PREVIOUS": [null],
+			"COLLECTED": ["Fanny", "Renaud"]
+		},
+		"AGE": {
+			"EDITED": [null],
+			"FORCED": [null],
+			"INPUTED": [null],
+			"PREVIOUS": [null],
+			"COLLECTED": [15, 4]
+		}
+	}
+}

package/lib/stories/component-set/data2.json

@@ -0,0 +1,18 @@
+{
+	"COLLECTED": {
+		"PRENOM": {
+			"EDITED": [null],
+			"FORCED": [null],
+			"INPUTED": [null],
+			"PREVIOUS": [null],
+			"COLLECTED": ["Fanny", "Renaud"]
+		},
+		"AGELOOP": {
+			"EDITED": [null],
+			"FORCED": [null],
+			"INPUTED": [null],
+			"PREVIOUS": [null],
+			"COLLECTED": [15, 4]
+		}
+	}
+}

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

@@ -0,0 +1,99 @@
+{
+	"maxPage": "5",
+	"components": [
+		{
+			"id": "component-set",
+			"componentType": "ComponentSet",
+			"page": "1",
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"label": {
+				"value": "\"## Who are you?\"",
+				"type": "VTL|MD"
+			},
+			"description": {
+				"value": "\"This is your opportunity to tell me about yourself!\"",
+				"type": "VTL|MD"
+			},
+			"components": [
+				{
+					"id": "prenom",
+					"componentType": "Input",
+					"mandatory": false,
+					"maxLength": 20,
+					"label": {
+						"value": "\"Prénom\"))",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"response": { "name": "PRENOMS" },
+					"controls": [
+						{
+							"criticality": "WARN",
+							"errorMessage": {
+								"type": "VTL",
+								"value": "\"booleen pas coché et on affiche un message un peu long histoire de tester le truc \""
+							},
+							"typeOfControl": "CONSISTENCY",
+							"control": {
+								"type": "VTL",
+								"value": "false"
+							},
+							"id": "kfxmjupm-CI-0"
+						}
+					]
+				},
+				{
+					"id": "age",
+					"componentType": "InputNumber",
+					"maxLength": 3,
+					"label": {
+						"value": "\"Age\"))",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"response": { "name": "AGE" }
+				}
+			]
+		},
+		{
+			"id": "seq",
+			"componentType": "Sequence",
+			"label": {
+				"value": "\"Merci !\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"page": "2"
+		}
+	],
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "AGE",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOMS",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		}
+	]
+}