@inseefr/lunatic 3.0.0-rc.8 → 3.0.0-rc.9

package/lib/components/LunaticComponents.js

@@ -19,24 +19,28 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var LunaticComponentWrapper = (0, _slottableComponent.slottableComponent)('ComponentWrapper', function (_ref) {
+  var children = _ref.children;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: "lunatic lunatic-component",
+    children: children
+  });
+});
+
 /**
  * Entry point for orchestrators, this component display the list of fields
  */
-function LunaticComponents(_ref) {
-  var components = _ref.components,
-    autoFocusKey = _ref.autoFocusKey,
-    componentProps = _ref.componentProps,
-    blocklist = _ref.blocklist,
-    memo = _ref.memo,
-    slots = _ref.slots,
-    _ref$wrapper = _ref.wrapper,
-    wrapper = _ref$wrapper === void 0 ? function (_ref2) {
-      var children = _ref2.children;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "lunatic lunatic-component",
-        children: children
-      });
-    } : _ref$wrapper;
+function LunaticComponents(_ref2) {
+  var components = _ref2.components,
+    autoFocusKey = _ref2.autoFocusKey,
+    componentProps = _ref2.componentProps,
+    blocklist = _ref2.blocklist,
+    memo = _ref2.memo,
+    slots = _ref2.slots,
+    _ref2$wrapper = _ref2.wrapper,
+    wrapper = _ref2$wrapper === void 0 ? function (args) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponentWrapper, _objectSpread({}, args));
+    } : _ref2$wrapper;
   var wrapperRef = (0, _react.useRef)(null);
   var hasComponents = components.length > 0;
   var WrapperComponent = autoFocusKey ? 'div' : _react.Fragment;

package/lib/components/Subsequence/Subsequence.spec.js

@@ -14,7 +14,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
   var mockDeclarations = [{
     id: '1',
     label: 'Declaration 1',
-    declarationType: 'TYPE_1',
+    declarationType: 'COMMENT',
     position: 'AFTER_QUESTION_TEXT'
   }];
   var mockProps = {

package/lib/components/Suggester/Suggester.js

@@ -88,13 +88,21 @@ function Suggester(_ref) {
       return o.attribute === 'label';
     });
     if (!labelResponse) {
-      return [];
+      return [{
+        id: value,
+        label: value,
+        value: value
+      }];
     }
     var label = executeExpression(labelResponse.name, {
       iteration: iteration
     });
-    if (!label) {
-      return [];
+    if (typeof label !== 'string') {
+      return [{
+        id: value,
+        label: value,
+        value: value
+      }];
     }
     return [{
       id: value,

package/lib/components/Suggester/SuggesterType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/components/shared/Declarations/Declarations.js

@@ -10,10 +10,10 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var Declaration = exports.Declaration = (0, _slottableComponent.slottableComponent)('Declaration', function (_ref) {
   var children = _ref.children,
-    type = _ref.type;
+    declarationType = _ref.declarationType;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     "data-testid": "declaration",
-    className: (0, _classnames["default"])('declaration-lunatic', "declaration-".concat(type.toLowerCase())),
+    className: (0, _classnames["default"])('declaration-lunatic', "declaration-".concat(declarationType.toLowerCase())),
     children: children
   });
 });
@@ -37,7 +37,7 @@ function LunaticDeclarations(_ref2) {
         label = _ref3.label,
         declarationType = _ref3.declarationType;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(Declaration, {
-        type: declarationType,
+        declarationType: declarationType,
         children: label
       }, id);
     })

package/lib/components/shared/Declarations/Declarations.spec.js

@@ -7,17 +7,17 @@ var _jsxRuntime = require("react/jsx-runtime");
 var declarations = [{
   id: '1',
   label: 'Declaration 1',
-  declarationType: 'AFTER',
+  declarationType: 'COMMENT',
   position: 'AFTER_QUESTION_TEXT'
 }, {
   id: '2',
   label: 'Declaration 2',
-  declarationType: 'BEFORE',
+  declarationType: 'COMMENT',
   position: 'BEFORE_QUESTION_TEXT'
 }, {
   id: '3',
   label: 'Declaration 3',
-  declarationType: 'DETACHABLE',
+  declarationType: 'COMMENT',
   position: 'DETACHABLE'
 }];
 (0, _vitest.describe)('Declarations component', function () {
@@ -38,13 +38,13 @@ var declarations = [{
     var declarationElement = getByText('Declaration 1');
     (0, _vitest.expect)(declarationElement).toBeInTheDocument();
     (0, _vitest.expect)(declarationElement).toHaveClass('declaration-lunatic');
-    (0, _vitest.expect)(declarationElement).toHaveClass('declaration-after');
+    (0, _vitest.expect)(declarationElement).toHaveClass('declaration-comment');
   });
   (0, _vitest.it)('renders nothing with unfiltered Declarations', function () {
     var declarationstest = [{
       id: '3',
       label: 'Declaration 3',
-      declarationType: 'DETACHABLE',
+      declarationType: 'COMMENT',
       position: 'DETACHABLE'
     }];
     var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/src/components/Suggester/CustomSuggester.d.ts

@@ -1,7 +1,7 @@
 import { type ReactNode } from 'react';
 import type { LunaticError } from '../../use-lunatic/type';
 import type { LunaticComponentProps } from '../type';
-import type { ComboboxOptionType } from '../shared/Combobox/ComboboxType';
+import type { SuggesterOptionType } from './SuggesterType';
 type Props = {
     className?: string;
     classNamePrefix?: string;
@@ -17,13 +17,13 @@ type Props = {
     readOnly?: boolean;
     id?: string;
     searching?: (s: string | null) => Promise<{
-        results: ComboboxOptionType[];
+        results: SuggesterOptionType[];
         search: string;
     }>;
     label?: ReactNode;
     description?: ReactNode;
     errors?: LunaticError[];
-    defaultOptions?: ComboboxOptionType[];
+    defaultOptions?: SuggesterOptionType[];
 };
 export declare const CustomSuggester: import("react").ComponentType<Props>;
 export {};

package/lib/src/components/Suggester/SuggesterType.d.ts

@@ -0,0 +1,6 @@
+export type SuggesterOptionType = {
+    id: string;
+    label: string;
+    value: string;
+    [k: string]: string;
+};

package/lib/src/components/Suggester/helpers.d.ts

@@ -1,6 +1,6 @@
-import type { ComboboxOptionType } from '../shared/Combobox/ComboboxType';
+import type { SuggesterOptionType } from './SuggesterType';
 export declare function isWorkerCompatible(): boolean;
 export declare function createSearching(name: string, version: string, workersBasePath?: string): (search: string | null) => Promise<{
-    results: ComboboxOptionType[];
+    results: SuggesterOptionType[];
     search: string;
 }>;

package/lib/src/components/shared/Declarations/Declarations.d.ts

@@ -1,13 +1,13 @@
 import { type PropsWithChildren, type ReactNode } from 'react';
 export declare const Declaration: import("react").ComponentType<PropsWithChildren<{
-    type: string;
+    declarationType: 'INSTRUCTION' | 'COMMENT' | 'HELP' | 'CODECARD' | 'WARNING' | 'STATEMENT';
 }>>;
 type Props = {
     id?: string;
     type?: 'AFTER_QUESTION_TEXT' | 'BEFORE_QUESTION_TEXT' | 'DETACHABLE';
     declarations?: {
         id: string;
-        declarationType: string;
+        declarationType: 'INSTRUCTION' | 'COMMENT' | 'HELP' | 'CODECARD' | 'WARNING' | 'STATEMENT';
         position: string;
         label: ReactNode;
     }[];

package/lib/src/components/shared/HOC/slottableComponent.d.ts

@@ -36,6 +36,7 @@ import type { CustomSuggester } from '../../Suggester/CustomSuggester';
 import type { CustomCheckboxGroup } from '../../CheckboxGroup/CustomCheckboxGroup';
 import type { RouterLink } from '../MDLabel/RouterLink';
 import type { SummaryResponses, SummaryTitle } from '../../Summary/Summary';
+import type { FilledLunaticComponentProps } from '../../../use-lunatic/commons/fill-components/fill-components';
 /**
  * Contains the type of every customizable component
  */
@@ -89,6 +90,9 @@ export type LunaticSlotComponents = {
     Fieldset: typeof Fieldset;
     Notification: typeof Notification;
     RouterLink: typeof RouterLink;
+    ComponentWrapper: ComponentType<PropsWithChildren<FilledLunaticComponentProps & {
+        index: number;
+    }>>;
 };
 export declare const SlotsProvider: ({ slots, children, }: PropsWithChildren<{
     slots?: Partial<LunaticSlotComponents> | undefined;

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

@@ -35,7 +35,7 @@ export type LunaticBaseProps<ValueType = unknown> = {
     iteration?: number;
     declarations?: {
         id: string;
-        declarationType: string;
+        declarationType: 'INSTRUCTION' | 'COMMENT' | 'HELP' | 'CODECARD' | 'WARNING' | 'STATEMENT';
         position: string;
         label: ReactNode;
     }[];

package/lib/src/use-lunatic/commons/fill-components/fill-component-required.d.ts

@@ -362,6 +362,10 @@ export declare function fillComponentRequired(component: LunaticComponentDefinit
     componentType: "Suggester";
     storeName: string;
     response: import("../../type-source").ResponseType;
+    optionResponses: {
+        name: string;
+        attribute: string;
+    };
 } | {
     required: boolean;
     label: import("../../type-source").LabelType;

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

@@ -697,6 +697,10 @@ declare function fillFromState(component: LunaticComponentDefinition, state: Lun
     componentType: "Suggester";
     storeName: string;
     response: import("../../type-source").ResponseType;
+    optionResponses: {
+        name: string;
+        attribute: string;
+    };
 } | {
     handleChange: (response: {
         name: string;

package/lib/src/use-lunatic/commons/fill-components/fill-specific-expression.d.ts

@@ -707,6 +707,10 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
         response: {
             name: string;
         };
+        optionResponses: {
+            name: string;
+            attribute: string;
+        };
     } & import("./fill-management").FilledProps & import("./fill-component-value").FilledProps & import("./fill-missing-response").FilledProps & import("./fill-from-state").FilledProps & import("./fill-pagination").FilledProps & {
         conditionFilter?: boolean | undefined;
     }) | ({
@@ -1124,6 +1128,10 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
     response: {
         name: string;
     };
+    optionResponses: {
+        name: string;
+        attribute: string;
+    };
 } | {
     label: import("react").ReactNode;
     description?: import("react").ReactNode;

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

@@ -205,6 +205,10 @@ export type ComponentSuggesterType = {
     componentType: 'Suggester';
     storeName: string;
     response: ResponseType;
+    optionResponses: {
+        name: string;
+        attribute: string;
+    };
 };
 export type SuggesterType = {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "3.0.0-rc.8",
+	"version": "3.0.0-rc.9",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {