@digigov/form 0.7.0 → 0.8.1

package/es/utils.js

@@ -1,84 +1,99 @@
 import _typeof from "@babel/runtime/helpers/typeof";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
+import { validateFieldsNatively } from '@hookform/resolvers';
+import { appendErrors } from 'react-hook-form';
+/**
+ * Why `path!` ? because it could be `undefined` in some case
+ * https://github.com/jquense/yup#validationerrorerrors-string--arraystring-value-any-path-string
+ */
+
 var parseErrorSchema = function parseErrorSchema(error, validateAllFieldCriteria) {
-  return Array.isArray(error.inner) && error.inner.length ? error.inner.reduce(function (previous, _ref) {
-    var path = _ref.path,
-        message = _ref.message,
-        type = _ref.type;
-    var previousTypes = path && previous[path] && previous[path].types || {};
-    var key = path || type;
-    return _extends({}, previous, key ? _defineProperty({}, key, _extends({}, previous[key] || {
-      message: message,
-      type: type
-    }, validateAllFieldCriteria ? {
-      types: _extends({}, previousTypes, _defineProperty({}, type, previousTypes[type] ? [].concat(_toConsumableArray([].concat(previousTypes[type])), [message]) : message))
-    } : {})) : {});
-  }, {}) : _defineProperty({}, error.path, {
-    message: error.message,
-    type: error.type
-  });
+  return (error.inner || []).reduce(function (previous, error) {
+    var _error$path;
+
+    error.path = (_error$path = error.path) === null || _error$path === void 0 ? void 0 : _error$path.replace(/\[([0-9]+)\]/g, '.$1');
+
+    if (!previous[error.path]) {
+      previous[error.path] = {
+        message: error.message,
+        type: error.type
+      };
+    }
+
+    if (validateAllFieldCriteria) {
+      var types = previous[error.path].types;
+      var messages = types && types[error.type];
+      previous[error.path] = appendErrors(error.path, validateAllFieldCriteria, previous, error.type, messages ? [].concat(messages, error.message) : error.message);
+    }
+
+    return previous;
+  }, {});
 };
 
 export var yupResolver = function yupResolver(schema) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-    abortEarly: false
-  };
+  var schemaOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var resolverOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values, context) {
-      var validateAllFieldCriteria,
-          parsedErrors,
-          _args = arguments;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values, context, options) {
+      var result, parsed;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              validateAllFieldCriteria = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
-              _context.prev = 1;
+              _context.prev = 0;
 
-              if (options.context && process.env.NODE_ENV === 'development') {
+              if (schemaOptions.context && process.env.NODE_ENV === 'development') {
                 // eslint-disable-next-line no-console
                 console.warn("You should not used the yup options context. Please, use the 'useForm' context object instead");
               }
 
-              _context.next = 5;
-              return schema.validate(values, _extends({}, options, {
+              _context.next = 4;
+              return schema[resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'](values, _extends({
+                abortEarly: false
+              }, schemaOptions, {
                 context: context
               }));
 
-            case 5:
-              _context.t0 = _context.sent;
-              _context.t1 = {};
+            case 4:
+              result = _context.sent;
+              options.shouldUseNativeValidation && validateFieldsNatively({}, options);
               return _context.abrupt("return", {
-                values: _context.t0,
-                errors: _context.t1
+                values: resolverOptions.rawValues ? values : result,
+                errors: {}
               });
 
-            case 10:
-              _context.prev = 10;
-              _context.t2 = _context["catch"](1);
-              parsedErrors = parseErrorSchema(_context.t2, validateAllFieldCriteria);
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](0);
+
+              if (_context.t0.inner) {
+                _context.next = 13;
+                break;
+              }
+
+              throw _context.t0;
+
+            case 13:
+              parsed = parseErrorSchema(_context.t0, !options.shouldUseNativeValidation && options.criteriaMode === 'all');
               return _context.abrupt("return", {
                 values: {},
-                errors: parsedErrors
+                errors: parsed
               });
 
-            case 14:
+            case 15:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[1, 10]]);
+      }, _callee, null, [[0, 9]]);
     }));
 
-    return function (_x, _x2) {
-      return _ref4.apply(this, arguments);
+    return function (_x, _x2, _x3) {
+      return _ref.apply(this, arguments);
     };
   }();
 };

package/es/validators/index.js

@@ -33,10 +33,26 @@ export var getYUPTypeMap = function getYUPTypeMap() {
       if (_typeof(field.extra.of) === 'object') {
         // else if the field is an object then it is a scalar type
         // eg. number, string etc.
-        return yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)); // .min(field.extra.min)
-        // .max(field.extra.max)
-        // .length(field.extra.length)
-        // .required(field.required);
+        var arrayValidator = yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)).required(field.required);
+        if (field.extra.length) arrayValidator = arrayValidator.length(field.extra.length, {
+          key: 'form.error.array.length',
+          context: {
+            length: field.extra.length
+          }
+        });
+        if (field.extra.min) arrayValidator = arrayValidator.min(field.extra.min, {
+          key: 'form.error.array.min',
+          context: {
+            min: field.extra.min
+          }
+        });
+        if (field.extra.max) arrayValidator = arrayValidator.max(field.extra.max, {
+          key: 'form.error.array.max',
+          context: {
+            max: field.extra.max
+          }
+        });
+        return arrayValidator; // .required(field.required)
       } else if (typeof field.extra.of === 'string') {
         return yup.array().of(yupTypeMap[field.extra.of]());
       } else {
@@ -77,8 +93,8 @@ export var getYUPTypeMap = function getYUPTypeMap() {
     date: function date(field) {
       var simpleDate = yup.string().nullable(true).test('date', 'form.error.date.invalid', function (value) {
         if (!value) return true;
-        value = getDate(value);
-        return value.isValid();
+        var date = getDate(value);
+        return date.isValid();
       });
       var params = field.extra || {};
 
@@ -104,8 +120,8 @@ export var getYUPTypeMap = function getYUPTypeMap() {
           },
           test: function test(value) {
             if (!value) return true;
-            value = getDate(value);
-            var isValid = +value.toDate() < +maxDate;
+            var date = getDate(value);
+            var isValid = +date.toDate() < +maxDate;
             return isValid;
           }
         });
@@ -134,8 +150,8 @@ export var getYUPTypeMap = function getYUPTypeMap() {
           },
           test: function test(value) {
             if (!value) return true;
-            value = getDate(value);
-            var isValid = +value.toDate() > +minDate;
+            var date = getDate(value);
+            var isValid = +date.toDate() > +minDate;
             return isValid;
           }
         });

package/es/validators/utils/index.js

@@ -1,5 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import * as yup from 'yup';
 export * from '@digigov/form/validators/utils/afm';
 export * from '@digigov/form/validators/utils/file';
@@ -8,29 +6,13 @@ export * from '@digigov/form/validators/utils/phone';
 export * from '@digigov/form/validators/utils/postal_code';
 export * from '@digigov/form/validators/utils/uuid4';
 export function getYupField(field, yupTypeMap) {
-  var yupField = yupTypeMap[field.type] || yupTypeMap.string;
+  var yupField = yupTypeMap[(field === null || field === void 0 ? void 0 : field.type) || 'string'] || yupTypeMap['string'];
   return yupField(field);
 }
 export function computeShape(fields, yupTypeMap, validatorRegistry) {
   var fieldSchemas = {};
   var objectFields = {};
   fields.forEach(function (field) {
-    if (field.key.includes('.')) {
-      var _field$key$split = field.key.split(/\.(.+)/),
-          _field$key$split2 = _slicedToArray(_field$key$split, 2),
-          objectKey = _field$key$split2[0],
-          fieldKey = _field$key$split2[1];
-
-      if (!objectFields[objectKey]) {
-        objectFields[objectKey] = [];
-      }
-
-      objectFields[objectKey].push(_extends({}, field, {
-        key: fieldKey
-      }));
-      return;
-    }
-
     var yupField = getYupField(field, yupTypeMap);
 
     if (field.condition) {

package/esm/Field/FieldBase.js

@@ -40,14 +40,8 @@ export var FieldBase = function FieldBase(props) {
       control: control,
       name: name,
       render: function render(_ref) {
-        var onChange = _ref.onChange,
-            onBlur = _ref.onBlur,
-            value = _ref.value;
-        return /*#__PURE__*/React.createElement(Component, _extends({
-          name: name,
-          onChange: onChange,
-          onBlur: onBlur,
-          value: value,
+        var field = _ref.field;
+        return /*#__PURE__*/React.createElement(Component, _extends({}, field, {
           defaultValue: defaultValue,
           extra: extra,
           error: !!error,
@@ -67,9 +61,7 @@ export var FieldBase = function FieldBase(props) {
     error: error,
     wrapper: wrapper,
     name: name
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
-    name: name,
-    ref: register,
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({}, register(name), {
     control: control,
     error: !!error,
     extra: extra,

package/esm/Field/FieldContainer.js

@@ -19,14 +19,17 @@ export var FieldContainer = function FieldContainer(_ref) {
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
+  var errorMessage = error !== null && error !== void 0 && error.message.key ? error.message.key : (error === null || error === void 0 ? void 0 : error.message) || '';
+  var errorContext = (error === null || error === void 0 ? void 0 : error.message.context) || {};
+
   if (wrapper === 'fieldset') {
     return /*#__PURE__*/React.createElement(CoreField, _extends({
       error: !!error
     }, layout), /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
       size: "s"
-    }, label && label.primary, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
+    }, label && label.primary), label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
       id: "".concat(name, "-error")
-    }, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
+    }, t(errorMessage, errorContext)), children));
   } else {
     return /*#__PURE__*/React.createElement(CoreField, _extends({
       error: !!error
@@ -34,7 +37,7 @@ export var FieldContainer = function FieldContainer(_ref) {
       label: label
     }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
       id: "".concat(name, "-error")
-    }, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
+    }, t(errorMessage, errorContext)), children));
   }
 };
 export default FieldContainer;

package/esm/Field/index.js

@@ -5,6 +5,8 @@ import React, { useMemo } from 'react';
 import { FieldBase } from '@digigov/form/Field/FieldBase';
 import FieldConditional from '@digigov/form/Field/FieldConditional';
 import { useField, calculateField } from '@digigov/form/Field/utils';
+import FieldArray from '@digigov/form/FieldArray';
+import Multiplicity from '@digigov/form/MultiplicityField';
 export var Field = function Field(_ref) {
   var name = _ref.name,
       children = _ref.children,
@@ -15,7 +17,13 @@ export var Field = function Field(_ref) {
       control = _useField.control,
       register = _useField.register,
       error = _useField.error,
-      componentRegistry = _useField.componentRegistry;
+      componentRegistry = _useField.componentRegistry,
+      formState = _useField.formState,
+      setValue = _useField.setValue,
+      getValues = _useField.getValues,
+      unregister = _useField.unregister,
+      trigger = _useField.trigger,
+      clearErrors = _useField.clearErrors;
 
   var calculatedField = useMemo(function () {
     return calculateField(children, field, componentRegistry);
@@ -30,6 +38,32 @@ export var Field = function Field(_ref) {
     });
   }
 
+  if (calculatedField.type === 'array' && calculatedField.multiplicity) {
+    // if (error) debugger;
+    calculatedField.name = name;
+    return /*#__PURE__*/React.createElement(Multiplicity, _extends({
+      control: control,
+      register: register,
+      trigger: trigger,
+      clearErrors: clearErrors,
+      error: error,
+      formState: formState,
+      setValue: setValue,
+      getValues: getValues,
+      unregister: unregister
+    }, calculatedField));
+  }
+
+  if (calculatedField.type === 'array') {
+    calculatedField.name = name;
+    return /*#__PURE__*/React.createElement(FieldArray, _extends({
+      control: control,
+      register: register,
+      error: error,
+      formState: formState
+    }, calculatedField));
+  }
+
   return /*#__PURE__*/React.createElement(FieldBase, _extends({}, calculatedField, {
     name: name,
     control: control,

package/esm/Field/utils.js

@@ -80,9 +80,17 @@ export var useField = function useField(name, customField) {
       fieldsMap = _useContext.fieldsMap,
       control = _useContext.control,
       register = _useContext.register,
+      trigger = _useContext.trigger,
+      clearErrors = _useContext.clearErrors,
       errors = _useContext.errors,
       registerField = _useContext.registerField,
-      componentRegistry = _useContext.componentRegistry;
+      watch = _useContext.watch,
+      componentRegistry = _useContext.componentRegistry,
+      getFieldState = _useContext.getFieldState,
+      setValue = _useContext.setValue,
+      getValues = _useContext.getValues,
+      unregister = _useContext.unregister,
+      formState = _useContext.formState;
 
   useMemo(function () {
     return (customField === null || customField === void 0 ? void 0 : customField.type) && registerField(_extends({}, customField, {
@@ -93,7 +101,15 @@ export var useField = function useField(name, customField) {
     field: customField || fieldsMap[name],
     control: control,
     register: register,
+    trigger: trigger,
+    watch: watch,
     componentRegistry: componentRegistry,
+    getFieldState: getFieldState,
+    setValue: setValue,
+    clearErrors: clearErrors,
+    getValues: getValues,
+    unregister: unregister,
+    formState: formState,
     error: errors[name]
   };
 };

package/esm/FieldArray/FieldArray.stories.js

@@ -0,0 +1,7 @@
+import FieldArray from '@digigov/form/FieldArray';
+export default {
+  title: 'Digigov Form/FieldArray',
+  component: FieldArray
+};
+export * from '@digigov/form/FieldArray/__stories__/Default';
+export * from '@digigov/form/FieldArray/__stories__/WithExactLength';

package/esm/FieldArray/__stories__/Default.js

@@ -0,0 +1,88 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { Suspense } from 'react';
+import FormBuilder, { Field } from '@digigov/form';
+import { Button } from '@digigov/ui/core';
+var fields = [{
+  key: 'string',
+  type: 'string',
+  label: {
+    primary: 'Πεδίο 1',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}, {
+  key: 'multiplicity',
+  type: 'array',
+  label: {
+    primary: 'Συνυπογράφοντες',
+    secondary: 'Οι συνυπογράφοντες είναι άνθρωποι σαν και εμάς'
+  },
+  extra: {
+    label: {
+      question: {
+        title: 'Θέλετε να προσθέσετε επιπλέον συνυπογράφοντες;',
+        yes: 'Ναι',
+        no: 'Όχι'
+      },
+      edit: 'Επεξεργασία',
+      add: 'Προσθέστε τα στοιχεία του επόμενου συνυπογράφοντα',
+      "delete": 'Αφαίρεση συνυπογράφοντος',
+      save: 'Αποθήκευση'
+    },
+    min: 2,
+    max: 4,
+    of: {
+      type: 'object',
+      extra: {
+        fields: [{
+          key: 'afm',
+          type: 'afm',
+          required: true,
+          label: {
+            primary: 'ΑΦΜ'
+          }
+        }, {
+          key: 'firstName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Όνομα'
+          }
+        }, {
+          key: 'lastName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Επώνυμο'
+          }
+        }]
+      }
+    }
+  }
+}, {
+  key: 'phonenumber',
+  type: 'phone_number',
+  required: true,
+  label: {
+    primary: 'Πεδίο 2',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}];
+
+var _ref = /*#__PURE__*/React.createElement(Button, null, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
+
+export var Default = function Default() {
+  return /*#__PURE__*/React.createElement(Suspense, {
+    fallback: "loading"
+  }, /*#__PURE__*/React.createElement(FormBuilder, {
+    onSubmit: function onSubmit(data) {
+      debugger;
+      console.log(data);
+    }
+  }, /*#__PURE__*/React.createElement(Field, _extends({
+    name: "string"
+  }, fields[0])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "multiplicity"
+  }, fields[1])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "phonenumber"
+  }, fields[2])), _ref));
+};

package/esm/FieldArray/__stories__/WithExactLength.js

@@ -0,0 +1,87 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { Suspense } from 'react';
+import FormBuilder, { Field } from '@digigov/form';
+import { Button } from '@digigov/ui/core';
+var fields = [{
+  key: 'string',
+  type: 'string',
+  label: {
+    primary: 'Πεδίο 1',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}, {
+  key: 'multiplicity',
+  type: 'array',
+  label: {
+    primary: 'Συνυπογράφοντες',
+    secondary: 'Οι συνυπογράφοντες είναι άνθρωποι σαν και εμάς'
+  },
+  extra: {
+    label: {
+      question: {
+        title: 'Θέλετε να προσθέσετε επιπλέον συνυπογράφοντες;',
+        yes: 'Ναι',
+        no: 'Όχι'
+      },
+      edit: 'Επεξεργασία',
+      add: 'Προσθέστε τα στοιχεία του επόμενου συνυπογράφοντα',
+      "delete": 'Αφαίρεση συνυπογράφοντος',
+      save: 'Αποθήκευση'
+    },
+    length: 2,
+    of: {
+      type: 'object',
+      extra: {
+        fields: [{
+          key: 'afm',
+          type: 'afm',
+          required: true,
+          label: {
+            primary: 'ΑΦΜ'
+          }
+        }, {
+          key: 'firstName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Όνομα'
+          }
+        }, {
+          key: 'lastName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Επώνυμο'
+          }
+        }]
+      }
+    }
+  }
+}, {
+  key: 'phonenumber',
+  type: 'phone_number',
+  required: true,
+  label: {
+    primary: 'Πεδίο 2',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}];
+
+var _ref = /*#__PURE__*/React.createElement(Button, null, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
+
+export var WithExactLength = function WithExactLength() {
+  return /*#__PURE__*/React.createElement(Suspense, {
+    fallback: "loading"
+  }, /*#__PURE__*/React.createElement(FormBuilder, {
+    onSubmit: function onSubmit(data) {
+      debugger;
+      console.log(data);
+    }
+  }, /*#__PURE__*/React.createElement(Field, _extends({
+    name: "string"
+  }, fields[0])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "multiplicity"
+  }, fields[1])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "phonenumber"
+  }, fields[2])), _ref));
+};