@inseefr/lunatic 2.7.20-rc.1 → 2.7.20-rc.2

package/lib/components/commons/components/errors/errors.spec.js

@@ -4,7 +4,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 var _react = require("@testing-library/react");
 var _vitest = require("vitest");
 var _errors = _interopRequireWildcard(require("./errors"));
-var _typeSource = require("../../../../use-lunatic/type-source");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -13,19 +12,19 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
     id1: [{
       id: 'error1',
       errorMessage: 'Error 1 message',
-      criticality: _typeSource.Criticality.ERROR,
-      typeOfControl: _typeSource.TypeOfControl.CONSISTENCY
+      criticality: 'ERROR',
+      typeOfControl: 'CONSISTENCY'
     }],
     id2: [{
       id: 'error2',
       errorMessage: 'Error 2 message',
-      criticality: _typeSource.Criticality.ERROR,
-      typeOfControl: _typeSource.TypeOfControl.CONSISTENCY
+      criticality: 'ERROR',
+      typeOfControl: 'CONSISTENCY'
     }, {
       id: 'error3',
       errorMessage: 'Error 3 message',
-      criticality: _typeSource.Criticality.ERROR,
-      typeOfControl: _typeSource.TypeOfControl.CONSISTENCY
+      criticality: 'ERROR',
+      typeOfControl: 'CONSISTENCY'
     }]
   };
   (0, _vitest.it)('renders null when no active errors', function () {

package/lib/components/modal-controls/modal-controls.spec.js

@@ -3,7 +3,6 @@
 var _react = require("@testing-library/react");
 var _modalControls = _interopRequireDefault(require("./modal-controls"));
 var _vitest = require("vitest");
-var _typeSource = require("../../use-lunatic/type-source");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 (0, _vitest.describe)('ModalControls component', function () {
@@ -11,15 +10,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
     var errors = {
       field1: [{
         id: 'message1',
-        criticality: _typeSource.Criticality.ERROR,
+        criticality: 'ERROR',
         errorMessage: 'Error message 1',
-        typeOfControl: _typeSource.TypeOfControl.CONSISTENCY
+        typeOfControl: 'CONSISTENCY'
       }],
       field2: [{
         id: 'message2',
-        criticality: _typeSource.Criticality.ERROR,
+        criticality: 'ERROR',
         errorMessage: 'Error message 2',
-        typeOfControl: _typeSource.TypeOfControl.CONSISTENCY
+        typeOfControl: 'CONSISTENCY'
       }]
     };
     var goNext = _vitest.vi.fn();
@@ -46,16 +45,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
   (0, _vitest.it)('should call the goNext function when the skip button is clicked', function () {
     var errors = {
       field1: [{
-        criticality: _typeSource.Criticality.ERROR,
+        criticality: 'ERROR',
         errorMessage: 'Error message 1',
         id: 'message1',
-        typeOfControl: _typeSource.TypeOfControl.CONSISTENCY
+        typeOfControl: 'CONSISTENCY'
       }],
       field2: [{
-        criticality: _typeSource.Criticality.ERROR,
+        criticality: 'ERROR',
         errorMessage: 'Error message 2',
         id: 'message2',
-        typeOfControl: _typeSource.TypeOfControl.CONSISTENCY
+        typeOfControl: 'CONSISTENCY'
       }]
     };
     var goNext = _vitest.vi.fn();

package/lib/index.js

@@ -1,9 +1,11 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  components: true,
   LunaticComponents: true,
   useLunatic: true
 };
@@ -13,13 +15,15 @@ Object.defineProperty(exports, "LunaticComponents", {
     return _lunaticComponents.LunaticComponents;
   }
 });
+exports.components = void 0;
 Object.defineProperty(exports, "useLunatic", {
   enumerable: true,
   get: function get() {
     return _useLunatic["default"];
   }
 });
-var _components = require("./components");
+var _components = _interopRequireWildcard(require("./components"));
+exports.components = _components;
 Object.keys(_components).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -33,4 +37,6 @@ Object.keys(_components).forEach(function (key) {
 });
 var _lunaticComponents = require("./components/lunatic-components");
 var _useLunatic = _interopRequireDefault(require("./use-lunatic"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }

package/lib/src/index.d.ts

@@ -1,4 +1,5 @@
 export * from './components';
+export * as components from './components';
 export { LunaticComponents } from './components/lunatic-components';
 export { default as useLunatic } from './use-lunatic';
 export type { LunaticComponentDefinition, LunaticControl, LunaticData, LunaticValues, LunaticError, LunaticExpression, LunaticVariable, LunaticCollectedValue, LunaticStateVariable, LunaticState, } from './use-lunatic/type';

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

@@ -28,28 +28,14 @@ export type DeclarationType = {
 export type ConditionFilterType = LabelType & {
     bindingDependencies?: string[];
 };
-export declare enum Criticality {
-    INFO = "INFO",
-    WARN = "WARN",
-    ERROR = "ERROR"
-}
-export declare enum TypeOfControl {
-    FORMAT = "FORMAT",
-    CONSISTENCY = "CONSISTENCY"
-}
-export declare enum ControlTypeEnum {
-    roundabout = "roundabout",
-    row = "ROW",
-    simple = "simple"
-}
 export type ControlType = {
     id: string;
-    criticality: Criticality;
-    typeOfControl: TypeOfControl;
+    criticality: 'INFO' | 'WARN' | 'ERROR';
+    typeOfControl: 'FORMAT' | 'CONSISTENCY';
     control: LabelType;
     errorMessage: LabelType;
     bindingDependencies: string[];
-    type: ControlTypeEnum;
+    type: 'roundabout' | 'ROW' | 'simple';
     iterations?: number;
 };
 export type ResponseType = {

package/lib/stories/behaviour/others/V2_QuestSimple_Boucles.json

@@ -1773,7 +1773,10 @@
 			"mandatory": false,
 			"page": "28",
 			"positioning": "HORIZONTAL",
-			"label": { "value": "\"➡ 3. \" || \"Tableau 2 axes\"", "type": "VTL|MD" },
+			"label": {
+				"value": "\"➡ 3. \" || \"Tableau 2 axes\"",
+				"type": "VTL|MD"
+			},
 			"conditionFilter": {
 				"value": "(COCHECASE = true)",
 				"type": "VTL",

package/lib/use-lunatic/commons/compile-controls.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.compileControls = compileControls;
 var _replaceComponentSequence = require("../replace-component-sequence");
-var _typeSource = require("../type-source");
 var _fillComponentExpressions = _interopRequireDefault(require("./fill-components/fill-component-expressions"));
 var _getComponentsFromState = _interopRequireDefault(require("./get-components-from-state"));
 var _checkRoundaboutControl = require("../reducer/controls/check-roundabout-control");
@@ -40,7 +39,7 @@ function checkComponents(state, components) {
       // The component has global level controls
       if (Array.isArray(controls)) {
         var componentErrors = checkControls(controls.filter(function (c) {
-          return c.type !== _typeSource.ControlTypeEnum.row;
+          return c.type !== 'ROW';
         }), state.executeExpression, state.pager);
         if (componentErrors.length > 0) {
           errors[id] = componentErrors;
@@ -51,7 +50,7 @@ function checkComponents(state, components) {
       if (isLoopComponent(component)) {
         var _component$controls;
         var rowControls = (_component$controls = component.controls) === null || _component$controls === void 0 ? void 0 : _component$controls.filter(function (c) {
-          return c.type === _typeSource.ControlTypeEnum.row;
+          return c.type === 'ROW';
         });
         if (rowControls !== null && rowControls !== void 0 && rowControls.length) {
           errors = checkComponentInLoop(state, _objectSpread(_objectSpread({}, component), {}, {
@@ -82,7 +81,7 @@ function checkComponents(state, components) {
 function checkControls(controls, executeExpression, pager) {
   return controls.map(function (control) {
     switch (control.type) {
-      case _typeSource.ControlTypeEnum.roundabout:
+      case 'roundabout':
         return (0, _checkRoundaboutControl.checkRoundaboutControl)(control, executeExpression);
       default:
         return (0, _checkBaseControl.checkBaseControl)(control, executeExpression, pager);
@@ -153,7 +152,7 @@ function hasCriticalError(errors) {
   }
   // Look for at least one critical error in the list
   var criticalError = Object.values(errors).flat().find(function (error) {
-    return error.criticality.startsWith(_typeSource.Criticality.ERROR) || error.typeOfControl === _typeSource.TypeOfControl.FORMAT;
+    return error.criticality.startsWith('ERROR') || error.typeOfControl === 'FORMAT';
   });
   return criticalError !== undefined;
 }

package/lib/use-lunatic/type-source.js

@@ -2,25 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-exports.TypeOfControl = exports.Criticality = exports.ControlTypeEnum = void 0;
-/**
- * Types used for source data (lunatic models and data.json)
- */
-var Criticality = exports.Criticality = /*#__PURE__*/function (Criticality) {
-  Criticality["INFO"] = "INFO";
-  Criticality["WARN"] = "WARN";
-  Criticality["ERROR"] = "ERROR";
-  return Criticality;
-}({});
-var TypeOfControl = exports.TypeOfControl = /*#__PURE__*/function (TypeOfControl) {
-  TypeOfControl["FORMAT"] = "FORMAT";
-  TypeOfControl["CONSISTENCY"] = "CONSISTENCY";
-  return TypeOfControl;
-}({});
-var ControlTypeEnum = exports.ControlTypeEnum = /*#__PURE__*/function (ControlTypeEnum) {
-  ControlTypeEnum["roundabout"] = "roundabout";
-  ControlTypeEnum["row"] = "ROW";
-  ControlTypeEnum["simple"] = "simple";
-  return ControlTypeEnum;
-}({}); //Is it realy needed ?
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.20-rc.1",
+	"version": "2.7.20-rc.2",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -159,7 +159,7 @@
 		"jsdom-global": "^3.0.2",
 		"postcss": "^8.2.6",
 		"postcss-scss": "^3.0.4",
-		"prettier": "^2.0.5",
+		"prettier": "^3.2.5",
 		"react": "^18.0.0",
 		"react-dom": "^18.0.0",
 		"regenerator-runtime": "^0.13.7",
@@ -180,13 +180,6 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"prettier": {
-		"singleQuote": true,
-		"semi": true,
-		"useTabs": true,
-		"bracketSpacing": true,
-		"trailingComma": "es5"
-	},
 	"peerDependencies": {
 		"react": "^18.0.0"
 	},