@digigov/form 2.0.0-cbc56209 → 2.0.0-d2ffc726

package/src/validators/utils/phone.ts

@@ -1,23 +1,23 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export type PhoneNumberType = 'landline' | 'mobile' | null;
 // add more countries from here libphonenumber-js/metadata.full.json
 const countryPhoneData = {
-  "GR": [
-    "30",
-    "00",
-    "5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}",
+  GR: [
+    '30',
+    '00',
+    '5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}',
     [10, 11, 12],
     [
-      ["(\\d{2})(\\d{4})(\\d{4})", "$1 $2 $3", ["21|7"]],
+      ['(\\d{2})(\\d{4})(\\d{4})', '$1 $2 $3', ['21|7']],
       [
-        "(\\d{4})(\\d{6})",
-        "$1 $2",
-        ["2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5"]
+        '(\\d{4})(\\d{6})',
+        '$1 $2',
+        ['2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5'],
       ],
-      ["(\\d{3})(\\d{3})(\\d{4})", "$1 $2 $3", ["[2689]"]],
-      ["(\\d{3})(\\d{3,4})(\\d{5})", "$1 $2 $3", ["8"]]
+      ['(\\d{3})(\\d{3})(\\d{4})', '$1 $2 $3', ['[2689]']],
+      ['(\\d{3})(\\d{3,4})(\\d{5})', '$1 $2 $3', ['8']],
     ],
     0,
     0,
@@ -27,93 +27,77 @@ const countryPhoneData = {
     0,
     [
       [
-        "2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}",
-        [10]
+        '2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}',
+        [10],
       ],
-      ["68[57-9]\\d{7}|(?:69|94)\\d{8}", [10]],
-      ["800\\d{7,9}"],
-      ["90[19]\\d{7}", [10]],
-      ["70\\d{8}", [10]],
+      ['68[57-9]\\d{7}|(?:69|94)\\d{8}', [10]],
+      ['800\\d{7,9}'],
+      ['90[19]\\d{7}', [10]],
+      ['70\\d{8}', [10]],
       0,
-      ["5005000\\d{3}", [10]],
+      ['5005000\\d{3}', [10]],
       0,
       0,
-      ["8(?:0[16]|12|[27]5|50)\\d{7}", [10]]
-    ]
-  ]
-}
+      ['8(?:0[16]|12|[27]5|50)\\d{7}', [10]],
+    ],
+  ],
+};
 
 function expandPhoneNumberStructure(compressed) {
   const countries = Object.keys(compressed);
-  const expanded: any = {}
+  const expanded: any = {};
   for (const country of countries) {
     expanded[country] = {
       fixedLine: {
         possibleLengths: {
-          _national:
-            compressed[country][3].map(
-              String
-            ),
+          _national: compressed[country][3].map(String),
         },
-        nationalNumberPattern:
-          compressed[country][11][0][0],
+        nationalNumberPattern: compressed[country][11][0][0],
       },
       mobile: {
-        nationalNumberPattern:
-          compressed[country][11][1][0],
+        nationalNumberPattern: compressed[country][11][1][0],
       },
       tollFree: {
-        nationalNumberPattern:
-          compressed[country][11][2][0],
+        nationalNumberPattern: compressed[country][11][2][0],
       },
       premiumRate: {
-        nationalNumberPattern:
-          compressed[country][11][3][0],
+        nationalNumberPattern: compressed[country][11][3][0],
       },
       sharedCost: {
-        nationalNumberPattern:
-          compressed[country][11][9][0],
+        nationalNumberPattern: compressed[country][11][9][0],
       },
       personalNumber: {
-        nationalNumberPattern:
-          compressed[country][11][4][0],
+        nationalNumberPattern: compressed[country][11][4][0],
       },
       uan: {
-        nationalNumberPattern:
-          compressed[country][11][6][0],
+        nationalNumberPattern: compressed[country][11][6][0],
       },
       id: country,
-      countryCode:
-        compressed[country][0],
-      internationalPrefix:
-        compressed[country][1],
-
-    }
+      countryCode: compressed[country][0],
+      internationalPrefix: compressed[country][1],
+    };
   }
   return expanded;
 }
 const PHONENUMBER_SPEC = expandPhoneNumberStructure(countryPhoneData);
-export function discoverPhoneType(
-  phoneNumber: string,
-  config: any
-): string {
+export function discoverPhoneType(phoneNumber: string, config: any): string {
   const cleanNumber = phoneNumber
-    .replace(/\D/g, "")
-    .replace(/\s/g, "")
-    .replace(/^\+/, "")
-    .replace(new RegExp("^" + config.internationalPrefix, ""), "")
-    .replace(new RegExp("^" + config.countryCode, ""), "");
+    .replace(/\D/g, '')
+    .replace(/\s/g, '')
+    .replace(/^\+/, '')
+    .replace(new RegExp('^' + config.internationalPrefix, ''), '')
+    .replace(new RegExp('^' + config.countryCode, ''), '');
   const categories = {
-    "landline": config.fixedLine,
+    landline: config.fixedLine,
     mobile: config.mobile,
-    "toll-free": config.tollFree,
-    "premium-rate": config.premiumRate,
+    'toll-free': config.tollFree,
+    'premium-rate': config.premiumRate,
   };
 
   for (const [categoryName, categoryDetails] of Object.entries(categories)) {
     const pattern = new RegExp(
-      "^(" + categoryDetails.nationalNumberPattern.replace(/\s/g, "") + ")$",
-      ""
+      '^(' + categoryDetails.nationalNumberPattern.replace(/\s/g, '') + ')$',
+      ''
     );
     if (cleanNumber.match(pattern)) {
       return categoryName; // Returns the category name if the number matches the pattern
@@ -121,47 +105,54 @@ export function discoverPhoneType(
   }
 
   // If no category matches, return 'Unknown'
-  return "unknown";
+  return 'unknown';
 }
 function getNumberType(phoneNumber: string, country: string) {
   const spec = PHONENUMBER_SPEC[country.toUpperCase()];
-  if(!spec) {
+  if (!spec) {
     throw new Error(`Country ${country} is not supported`);
   }
   const type = discoverPhoneType(phoneNumber, spec);
   return type;
 }
 
-function isPhoneNumberValid(phoneNumber: string, countries: string[], types=['mobile', 'landline']) {
+function isPhoneNumberValid(
+  phoneNumber: string,
+  countries: string[],
+  types = ['mobile', 'landline']
+) {
   return countries.some((country) => {
     const numberType = getNumberType(phoneNumber, country);
     if (numberType && types.includes(numberType)) {
-      return true
+      return true;
     }
-    return false
-  })
+    return false;
+  });
 }
 function isNumberOfType(phoneNumber: string, country: string, type: string) {
   const numberType = getNumberType(phoneNumber, country);
   if (numberType === type) {
-    return true
+    return true;
   }
-  return false
+  return false;
 }
 export function validatePhoneNumber(
   phoneNumber: string,
-  countries: Array<string> = ['gr'],
+  countries: string[] = ['gr'],
   typeOfPhoneNumber?: PhoneNumberType
 ): boolean {
   if (!countries || countries.length === 0) {
     return true;
   }
-  return isPhoneNumberValid(phoneNumber, countries, typeOfPhoneNumber? [typeOfPhoneNumber] : undefined);
+  return isPhoneNumberValid(
+    phoneNumber,
+    countries,
+    typeOfPhoneNumber ? [typeOfPhoneNumber] : undefined
+  );
 }
 
-
 function validateMobile(value): boolean {
-  return isNumberOfType(value, 'gr','mobile');
+  return isNumberOfType(value, 'gr', 'mobile');
 }
 
 export const MOBILE_PHONE_VALIDATOR = {

package/src/validators/utils/postal_code.ts

@@ -1,10 +1,10 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 const CODE_REGEX = /^[12345678][0-9]{4}$/;
 export function validatePostalCode(
   number: string,
-  countries: Array<string>
+  countries: string[]
 ): boolean {
   if (!countries) {
     return false;

package/src/validators/utils/text_limit.ts

@@ -1,5 +1,5 @@
-import { FieldSpec } from '@digigov/form/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldSpec } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 
 export function validateText(value: string, min: number, max: number): boolean {
   let validator;

package/src/validators/utils/uuid4.ts

@@ -1,4 +1,5 @@
-const UUID4_PATTERN = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
+const UUID4_PATTERN =
+  /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
 
 export function validateUUID4(uuid4: string): boolean {
   if (uuid4.length !== 36) {

package/src/validators/validators.spec.ts

@@ -69,54 +69,20 @@ it('validates phone number type landline with greek country code', () => {
   expect(validatePhoneNumber('2102934896', ['GR'], 'landline')).toBe(true);
 });
 
-it('validates phone number type landline with ch country code', () => {
-  expect(validatePhoneNumber('2102934896', ['CH'], 'landline')).toBe(false);
-});
-
-it('validates phone number type landline with ch  and  gr countries code', () => {
-  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'landline')).toBe(
-    true
-  );
-});
-
-it('validatesphone number type landline with ch  and  gr countries code', () => {
-  expect(validatePhoneNumber('41446681800', ['GR', 'CH'], 'landline')).toBe(
-    true
+it('throws if given country is not supported', () => {
+  expect(() => validatePhoneNumber('2102934896', ['CH'], 'landline')).toThrow(
+    'Country CH is not supported'
   );
 });
 
-it('validates phone number type landline with ch  and  gr countries code but phone number is mobile', () => {
-  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'mobile')).toBe(false);
-});
-
-it('validates phone number type mobile with ch  and  gr countries code', () => {
-  expect(validatePhoneNumber('6934100982', ['GR', 'CH'], 'mobile')).toBe(true);
-});
-
-it('validates  phone number type mobile with gr country code', () => {
+it('validates phone number type mobile with gr country code', () => {
   expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
 });
 
-it('validates  phone number type mobile with ch country code', () => {
-  expect(validatePhoneNumber('6934100982', ['CH'], 'mobile')).toBe(false);
-});
-
-it('validates  phone number with no type and ch country code', () => {
-  expect(validatePhoneNumber('6934100982', ['CH'], null)).toBe(false);
-});
-
-it('validates  phone number with no type and gr country code', () => {
+it('validates phone number with no type and gr country code', () => {
   expect(validatePhoneNumber('6934100982', ['gr'], null)).toBe(true);
 });
 
-it('validates  phone number with no type and ch country code', () => {
-  expect(validatePhoneNumber('41446681800', ['CH'], null)).toBe(true);
-});
-
-it('validates  phone number with no type and gr country code', () => {
+it('validates invalid phone number with no type and gr country code', () => {
   expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
 });
-
-it('validates  phone number with no type and gr and ch countries code', () => {
-  expect(validatePhoneNumber('41446681800', ['gr', 'ch'], null)).toBe(true);
-});

package/types/index.js

@@ -1 +1,2 @@
-export {};
+export * from "@digigov/form/Field/types";
+//# sourceMappingURL=types.js.map

package/types.d.ts

@@ -1,40 +1,10 @@
-/// <reference types="react" />
-import { UseFormReturn, UseFormProps } from 'react-hook-form';
-import { FieldComponentRegistry } from '@digigov/form/Field/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
-import { GridProps } from '@digigov/ui/layouts/Grid';
-export type FieldError = {
+import type { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
+import type { FieldLabelProps, FieldSpec, FormData } from '@digigov/form/Field/types';
+import type { FieldComponentRegistry } from '@digigov/form/inputs/registry';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
+export * from '@digigov/form/Field/types';
+export interface FieldError {
     message: string;
-};
-export type FieldLabelProps = {
-    primary?: string;
-    secondary?: string;
-};
-export interface FieldCondition {
-    is: string | string[] | number | number[] | boolean | boolean[];
-    then?: Partial<FieldSpec>;
-    else?: Partial<FieldSpec>;
-}
-export interface FieldSpec {
-    key: string;
-    type?: 'int' | 'string' | 'text' | 'boolean' | 'email' | 'uuid4' | 'choice:multiple' | 'choice:single' | 'mobile_phone' | 'date' | 'otp' | 'afm' | 'iban' | 'file' | 'image' | 'postal_code' | 'phone_number' | 'array' | 'object';
-    component?: any;
-    maxLength?: number;
-    condition?: Record<string, FieldCondition>;
-    controlled?: boolean;
-    label?: FieldLabelProps;
-    extra?: {
-        [key: string]: any;
-    };
-    editable?: boolean;
-    required?: boolean;
-    enabled?: boolean;
-    layout?: Record<string, GridProps['xs'] | GridProps['sm'] | GridProps['md'] | GridProps['lg'] | GridProps['xl']>;
-    validators?: ValidatorSchema[];
-    wrapper?: 'label' | 'fieldset';
-    maxWidth?: string;
-    maxHeight?: string;
-    width?: string;
 }
 export interface FieldsetSpec {
     key: string;
@@ -42,24 +12,29 @@ export interface FieldsetSpec {
     label?: FieldLabelProps;
     body?: React.ReactNode;
 }
-export type FormData = UseFormProps['defaultValues'];
+export type registerFieldFocus = (fieldName: string, element: HTMLElement) => (name: string) => void;
 export interface FormContextProps {
     fieldsetsMap?: Record<string, FieldsetSpec>;
     fieldsMap: Record<string, FieldSpec>;
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     trigger: UseFormReturn['trigger'];
+    setError: UseFormReturn['setError'];
     clearErrors: UseFormReturn['clearErrors'];
     watch: UseFormReturn['watch'];
     getFieldState: UseFormReturn['getFieldState'];
     setValue: UseFormReturn['setValue'];
     getValues: UseFormReturn['getValues'];
+    getValuesFromParentForm?: UseFormReturn['getValues'];
     unregister: UseFormReturn['unregister'];
     formState: UseFormReturn['formState'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     registerField: (field: FieldSpec) => void;
+    registerFieldFocus: registerFieldFocus;
     errors: UseFormReturn['formState']['errors'];
     componentRegistry?: FieldComponentRegistry;
+    submit: () => Promise<void> | void;
 }
 export interface FormBuilderProps {
     fields?: FieldSpec[];
@@ -75,6 +50,8 @@ export interface FormBuilderProps {
     validatorRegistry?: Record<string, ValidatorSchema[]>;
     componentRegistry?: FieldComponentRegistry;
     grid?: boolean;
+    controlledFieldsOnly?: boolean;
+    errors?: ErrorOption;
 }
 export interface FormBaseProps extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {
     fieldsetsMap?: Record<string, FieldsetSpec>;

package/types.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/types.tsx"],
+  "sourcesContent": ["import type { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';\nimport type {\n  FieldLabelProps,\n  FieldSpec,\n  FormData,\n} from '@digigov/form/Field/types';\nimport type { FieldComponentRegistry } from '@digigov/form/inputs/registry';\nimport type { ValidatorSchema } from '@digigov/form/validators/types';\nexport * from '@digigov/form/Field/types';\nexport interface FieldError {\n  message: string;\n}\n\nexport interface FieldsetSpec {\n  key: string;\n  fields: string[];\n  label?: FieldLabelProps;\n  body?: React.ReactNode;\n}\n\nexport type registerFieldFocus = (\n  fieldName: string,\n  element: HTMLElement\n) => (name: string) => void;\n\nexport interface FormContextProps {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  trigger: UseFormReturn['trigger'];\n  setError: UseFormReturn['setError'];\n  clearErrors: UseFormReturn['clearErrors'];\n  watch: UseFormReturn['watch'];\n  getFieldState: UseFormReturn['getFieldState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  getValuesFromParentForm?: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  formState: UseFormReturn['formState'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  registerField: (field: FieldSpec) => void;\n  registerFieldFocus: registerFieldFocus;\n  errors: UseFormReturn['formState']['errors'];\n  componentRegistry?: FieldComponentRegistry;\n  submit: () => Promise<void> | void;\n}\n\nexport interface FormBuilderProps {\n  fields?: FieldSpec[];\n  fieldsets?: FieldsetSpec[];\n  initial?: FormData;\n  onSubmit?: (data: FormData) => void | null | FieldError[];\n  mode?: UseFormProps['mode'];\n  reValidateMode?: UseFormProps['reValidateMode'];\n  criteriaMode?: UseFormProps['criteriaMode'];\n  children?: React.ReactNode;\n  shouldFocusError?: boolean;\n  auto?: boolean;\n  validatorRegistry?: Record<string, ValidatorSchema[]>;\n  componentRegistry?: FieldComponentRegistry;\n  grid?: boolean;\n  controlledFieldsOnly?: boolean;\n  errors?: ErrorOption;\n}\n\nexport interface FormBaseProps\n  extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  registerField: (field: FieldSpec) => void;\n  resolver: any;\n}\n"],
+  "mappings": "AAQA,cAAc;",
+  "names": []
+}

package/utils/index.js

@@ -1,80 +1,74 @@
-import _typeof from "@babel/runtime/helpers/typeof";
-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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-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 (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);
+import { validateFieldsNatively } from "@hookform/resolvers";
+import { appendErrors } from "react-hook-form";
+const parseErrorSchema = (error, validateAllFieldCriteria) => {
+  return (error.inner || []).reduce(
+    (previous, error2) => {
+      error2.path = error2.path?.replace(/\[([0-9]+)\]/g, ".$1");
+      if (!previous[error2.path]) {
+        previous[error2.path] = { message: error2.message, type: error2.type };
+      }
+      if (validateAllFieldCriteria) {
+        const types = previous[error2.path].types;
+        const messages = types && types[error2.type];
+        previous[error2.path] = appendErrors(
+          error2.path,
+          validateAllFieldCriteria,
+          previous,
+          error2.type,
+          messages ? [].concat(messages, error2.message) : error2.message
+        );
+      }
+      return previous;
+    },
+    {}
+  );
+};
+function isPlainObject(obj) {
+  return typeof obj === "object" && obj !== null && Object.prototype.toString.call(obj) === "[object Object]";
+}
+function flattenObject(obj, prefix = "") {
+  return Object.keys(obj).reduce((acc, key) => {
+    const prefixedKey = prefix ? `${prefix}.${key}` : key;
+    if (isPlainObject(obj[key])) {
+      Object.assign(acc, flattenObject(obj[key], prefixedKey));
+    } else {
+      acc[prefixedKey] = obj[key];
     }
-    return previous;
+    return acc;
   }, {});
-};
-export var yupResolver = function yupResolver(schema) {
-  var schemaOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var resolverOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return /*#__PURE__*/function () {
-    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:
-            _context.prev = 0;
-            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 = 4;
-            return schema[resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'](values, _extends({
-              abortEarly: false
-            }, schemaOptions, {
-              context: context
-            }));
-          case 4:
-            result = _context.sent;
-            options.shouldUseNativeValidation && validateFieldsNatively({}, options);
-            return _context.abrupt("return", {
-              values: resolverOptions.rawValues ? values : result,
-              errors: {}
-            });
-          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: parsed
-            });
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 9]]);
-    }));
-    return function (_x, _x2, _x3) {
-      return _ref.apply(this, arguments);
+}
+const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async (values, context, options) => {
+  try {
+    if (schemaOptions.context && process.env.NODE_ENV === "development") {
+      console.warn(
+        "You should not used the yup options context. Please, use the 'useForm' context object instead"
+      );
+    }
+    const result = await schema[resolverOptions.mode === "sync" ? "validateSync" : "validate"](
+      flattenObject(values),
+      Object.assign({ abortEarly: false }, schemaOptions, { context })
+    );
+    if (options.shouldUseNativeValidation)
+      validateFieldsNatively({}, options);
+    return {
+      values: resolverOptions.rawValues ? values : result,
+      errors: {}
     };
-  }();
-};
+  } catch (e) {
+    if (!e.inner) {
+      throw e;
+    }
+    return {
+      values: {},
+      errors: parseErrorSchema(
+        e,
+        !options.shouldUseNativeValidation && options.criteriaMode === "all"
+      ),
+      options
+    };
+  }
+};
+export {
+  yupResolver
+};
+//# sourceMappingURL=utils.js.map

package/utils.d.ts

@@ -1,8 +1,10 @@
-import { FieldError } from 'react-hook-form';
+import type { FieldError } from 'react-hook-form';
 export declare const yupResolver: (schema: any, schemaOptions?: any, resolverOptions?: any) => (values: any, context: any, options: any) => Promise<{
     values: any;
     errors: {};
+    options?: undefined;
 } | {
     values: {};
     errors: Record<string, FieldError>;
+    options: any;
 }>;

package/utils.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/utils.ts"],
+  "sourcesContent": ["import { validateFieldsNatively } from '@hookform/resolvers';\nimport type { FieldError } from 'react-hook-form';\nimport { appendErrors } from 'react-hook-form';\nimport type * as Yup from 'yup';\n\n/**\n * Why `path!` ? because it could be `undefined` in some case\n * https://github.com/jquense/yup#validationerrorerrors-string--arraystring-value-any-path-string\n */\nconst parseErrorSchema = (\n  error: Yup.ValidationError,\n  validateAllFieldCriteria: boolean\n) => {\n  return (error.inner || []).reduce<Record<string, FieldError>>(\n    (previous, error) => {\n      error.path = error.path?.replace(/\\[([0-9]+)\\]/g, '.$1');\n      // error.path = error.path?.replace(/\\[\"(.*?)\"\\]/g, '$1');\n      if (!previous[error.path!]) {\n        previous[error.path!] = { message: error.message, type: error.type! };\n      }\n\n      if (validateAllFieldCriteria) {\n        const types = previous[error.path!].types;\n        const messages = types && types[error.type!];\n\n        previous[error.path!] = appendErrors(\n          error.path!,\n          validateAllFieldCriteria,\n          previous,\n          error.type!,\n          messages\n            ? ([] as string[]).concat(messages as string[], error.message)\n            : error.message\n        ) as FieldError;\n      }\n\n      return previous;\n    },\n    {}\n  );\n};\nfunction isPlainObject(obj) {\n  return (\n    typeof obj === 'object' &&\n    obj !== null &&\n    Object.prototype.toString.call(obj) === '[object Object]'\n  );\n}\nfunction flattenObject(obj, prefix = '') {\n  return Object.keys(obj).reduce((acc, key) => {\n    const prefixedKey = prefix ? `${prefix}.${key}` : key;\n\n    if (isPlainObject(obj[key])) {\n      Object.assign(acc, flattenObject(obj[key], prefixedKey));\n    } else {\n      acc[prefixedKey] = obj[key];\n    }\n\n    return acc;\n  }, {});\n}\n\nexport const yupResolver =\n  (schema: any, schemaOptions: any = {}, resolverOptions: any = {}) =>\n  async (values, context, options) => {\n    try {\n      if (schemaOptions.context && process.env.NODE_ENV === 'development') {\n        console.warn(\n          \"You should not used the yup options context. Please, use the 'useForm' context object instead\"\n        );\n      }\n\n      const result = await schema[\n        resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'\n      ](\n        flattenObject(values),\n        Object.assign({ abortEarly: false }, schemaOptions, { context })\n      );\n\n      if (options.shouldUseNativeValidation)\n        validateFieldsNatively({}, options);\n\n      return {\n        values: resolverOptions.rawValues ? values : result,\n        errors: {},\n      };\n    } catch (e) {\n      if (!e.inner) {\n        throw e;\n      }\n\n      return {\n        values: {},\n        errors: parseErrorSchema(\n          e,\n          !options.shouldUseNativeValidation && options.criteriaMode === 'all'\n        ),\n        options,\n      };\n    }\n  };\n"],
+  "mappings": "AAAA,SAAS,8BAA8B;AAEvC,SAAS,oBAAoB;AAO7B,MAAM,mBAAmB,CACvB,OACA,6BACG;AACH,UAAQ,MAAM,SAAS,CAAC,GAAG;AAAA,IACzB,CAAC,UAAUA,WAAU;AACnB,MAAAA,OAAM,OAAOA,OAAM,MAAM,QAAQ,iBAAiB,KAAK;AAEvD,UAAI,CAAC,SAASA,OAAM,IAAK,GAAG;AAC1B,iBAASA,OAAM,IAAK,IAAI,EAAE,SAASA,OAAM,SAAS,MAAMA,OAAM,KAAM;AAAA,MACtE;AAEA,UAAI,0BAA0B;AAC5B,cAAM,QAAQ,SAASA,OAAM,IAAK,EAAE;AACpC,cAAM,WAAW,SAAS,MAAMA,OAAM,IAAK;AAE3C,iBAASA,OAAM,IAAK,IAAI;AAAA,UACtBA,OAAM;AAAA,UACN;AAAA,UACA;AAAA,UACAA,OAAM;AAAA,UACN,WACK,CAAC,EAAe,OAAO,UAAsBA,OAAM,OAAO,IAC3DA,OAAM;AAAA,QACZ;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EACH;AACF;AACA,SAAS,cAAc,KAAK;AAC1B,SACE,OAAO,QAAQ,YACf,QAAQ,QACR,OAAO,UAAU,SAAS,KAAK,GAAG,MAAM;AAE5C;AACA,SAAS,cAAc,KAAK,SAAS,IAAI;AACvC,SAAO,OAAO,KAAK,GAAG,EAAE,OAAO,CAAC,KAAK,QAAQ;AAC3C,UAAM,cAAc,SAAS,GAAG,MAAM,IAAI,GAAG,KAAK;AAElD,QAAI,cAAc,IAAI,GAAG,CAAC,GAAG;AAC3B,aAAO,OAAO,KAAK,cAAc,IAAI,GAAG,GAAG,WAAW,CAAC;AAAA,IACzD,OAAO;AACL,UAAI,WAAW,IAAI,IAAI,GAAG;AAAA,IAC5B;AAEA,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACP;AAEO,MAAM,cACX,CAAC,QAAa,gBAAqB,CAAC,GAAG,kBAAuB,CAAC,MAC/D,OAAO,QAAQ,SAAS,YAAY;AAClC,MAAI;AACF,QAAI,cAAc,WAAW,QAAQ,IAAI,aAAa,eAAe;AACnE,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,UAAM,SAAS,MAAM,OACnB,gBAAgB,SAAS,SAAS,iBAAiB,UACrD;AAAA,MACE,cAAc,MAAM;AAAA,MACpB,OAAO,OAAO,EAAE,YAAY,MAAM,GAAG,eAAe,EAAE,QAAQ,CAAC;AAAA,IACjE;AAEA,QAAI,QAAQ;AACV,6BAAuB,CAAC,GAAG,OAAO;AAEpC,WAAO;AAAA,MACL,QAAQ,gBAAgB,YAAY,SAAS;AAAA,MAC7C,QAAQ,CAAC;AAAA,IACX;AAAA,EACF,SAAS,GAAG;AACV,QAAI,CAAC,EAAE,OAAO;AACZ,YAAM;AAAA,IACR;AAEA,WAAO;AAAA,MACL,QAAQ,CAAC;AAAA,MACT,QAAQ;AAAA,QACN;AAAA,QACA,CAAC,QAAQ,6BAA6B,QAAQ,iBAAiB;AAAA,MACjE;AAAA,MACA;AAAA,IACF;AAAA,EACF;AACF;",
+  "names": ["error"]
+}