@digigov/form 2.0.0-7d9a8d86 → 2.0.0-85c27c19

package/src/lazy.js

@@ -4,6 +4,8 @@ export default {
   'FieldBaseContainer': lazy(() => import('@digigov/form/Field/FieldBaseContainer').then((module)=> ({default: module['FieldBaseContainer']}))),
   'FieldConditional': lazy(() => import('@digigov/form/Field/FieldConditional').then((module)=> ({default: module['FieldConditional']}))),
   'Field': lazy(() => import('@digigov/form/internal').then((module)=> ({default: module['Field']}))),
+  'ALTERNATIVE_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module)=> ({default: module['ALTERNATIVE_COMPONENTS']}))),
+  'FIELD_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module)=> ({default: module['FIELD_COMPONENTS']}))),
   'FieldArray': lazy(() => import('@digigov/form/FieldArray').then((module)=> ({default: module['FieldArray']}))),
   'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module)=> ({default: module['FieldObject']}))),
   'FieldsetWithContext': lazy(() => import('@digigov/form/Fieldset/FieldsetWithContext').then((module)=> ({default: module['FieldsetWithContext']}))),
@@ -11,19 +13,29 @@ export default {
   'FieldsetBody': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetBody']}))),
   'FieldsetCaption': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetCaption']}))),
   'FieldsetLabel': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetLabel']}))),
-  'FormBase': lazy(() => import('@digigov/form/FormBuilder/FormBuilder').then((module)=> ({default: module['FormBase']}))),
-  'FormBuilder': lazy(() => import('@digigov/form/FormBuilder/FormBuilder').then((module)=> ({default: module['FormBuilder']}))),
+  'FormBase': lazy(() => import('@digigov/form/FormBuilder').then((module)=> ({default: module['FormBase']}))),
   'FormContext': lazy(() => import('@digigov/form/FormContext').then((module)=> ({default: module['FormContext']}))),
+  'FormBuilder': lazy(() => import('@digigov/form').then((module)=> ({default: module['FormBuilder']}))),
+  'AutoCompleteInput': lazy(() => import('@digigov/form/inputs/AutoCompleteInput').then((module)=> ({default: module['AutoCompleteInput']}))),
   'Checkboxes': lazy(() => import('@digigov/form/inputs/Checkboxes').then((module)=> ({default: module['Checkboxes']}))),
   'DateInput': lazy(() => import('@digigov/form/inputs/DateInput').then((module)=> ({default: module['DateInput']}))),
   'FileInput': lazy(() => import('@digigov/form/inputs/FileInput').then((module)=> ({default: module['FileInput']}))),
+  'Image': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['Image']}))),
+  'ImageInput': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['ImageInput']}))),
   'Input': lazy(() => import('@digigov/form/inputs/Input').then((module)=> ({default: module['Input']}))),
   'Label': lazy(() => import('@digigov/form/inputs/Label').then((module)=> ({default: module['Label']}))),
-  'Questions': lazy(() => import('@digigov/form/Questions/Questions').then((module)=> ({default: module['Questions']}))),
-  'Radio': lazy(() => import('@digigov/form/internal').then((module)=> ({default: module['Radio']}))),
+  'OtpInput': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['OtpInput']}))),
+  'Radio': lazy(() => import('@digigov/form/inputs').then((module)=> ({default: module['Radio']}))),
   'Select': lazy(() => import('@digigov/form/inputs/Select').then((module)=> ({default: module['Select']}))),
-  'Step': lazy(() => import('@digigov/form/Questions/Step/Step').then((module)=> ({default: module['Step']}))),
+  'INPUTS_FIELDS': lazy(() => import('@digigov/form/inputs/inputsScenarios').then((module)=> ({default: module['INPUTS_FIELDS']}))),
+  'REMOVE_SPACES': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['REMOVE_SPACES']}))),
+  'RE_DIGIT': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['RE_DIGIT']}))),
+  'RadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module)=> ({default: module['RadioButtonsGroup']}))),
+  'AddObjects': lazy(() => import('@digigov/form/MultiplicityField/add-objects').then((module)=> ({default: module['AddObjects']}))),
+  'ListObject': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['ListObject']}))),
+  'Multiplicity': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['Multiplicity']}))),
   'ReviewStep': lazy(() => import('@digigov/form/Questions/Step/ReviewStep').then((module)=> ({default: module['ReviewStep']}))),
+  'Step': lazy(() => import('@digigov/form/Questions/Step/Step').then((module)=> ({default: module['Step']}))),
   'StepArrayReview': lazy(() => import('@digigov/form/Questions/Step/StepArrayReview').then((module)=> ({default: module['StepArrayReview']}))),
   'StepContext': lazy(() => import('@digigov/form/Questions/Step/StepContext').then((module)=> ({default: module['StepContext']}))),
   'StepDescription': lazy(() => import('@digigov/form/Questions/Step/StepDescription').then((module)=> ({default: module['StepDescription']}))),
@@ -33,16 +45,7 @@ export default {
   'StepTitle': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitle']}))),
   'StepTitleBase': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitleBase']}))),
   'StepTitleHeading': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitleHeading']}))),
-  'RadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module)=> ({default: module['RadioButtonsGroup']}))),
-  'ImageInput': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['ImageInput']}))),
-  'OtpInput': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['OtpInput']}))),
-  'AutoCompleteInput': lazy(() => import('@digigov/form/inputs/AutoCompleteInput').then((module)=> ({default: module['AutoCompleteInput']}))),
-  'Image': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['Image']}))),
-  'REMOVE_SPACES': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['REMOVE_SPACES']}))),
-  'RE_DIGIT': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['RE_DIGIT']}))),
-  'AddObjects': lazy(() => import('@digigov/form/MultiplicityField/add-objects').then((module)=> ({default: module['AddObjects']}))),
-  'ListObject': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['ListObject']}))),
-  'Multiplicity': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['Multiplicity']}))),
+  'Questions': lazy(() => import('@digigov/form/Questions/Questions').then((module)=> ({default: module['Questions']}))),
   'QuestionsContext': lazy(() => import('@digigov/form/Questions/QuestionsContext').then((module)=> ({default: module['QuestionsContext']}))),
   'AFM_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/afm').then((module)=> ({default: module['AFM_VALIDATOR']}))),
   'FILE_MAX_SIZE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/file').then((module)=> ({default: module['FILE_MAX_SIZE_VALIDATOR']}))),

package/src/locales/el.ts

@@ -0,0 +1,3 @@
+import el from '@digigov/ui/i18n/locales/el';
+
+export default el;

package/src/registry.js

@@ -4,13 +4,15 @@ import * as _digigov_form_Field_FieldBaseContainer from '@digigov/form/Field/Fie
 import * as _digigov_form_Field_FieldConditional from '@digigov/form/Field/FieldConditional';
 import * as _digigov_form_Field from '@digigov/form/Field';
 import * as _digigov_form_Field_types from '@digigov/form/Field/types';
+import * as _digigov_form_Field_utils_calculateField from '@digigov/form/Field/utils/calculateField';
+import * as _digigov_form_Field_utils_evaluateFieldWithConditions from '@digigov/form/Field/utils/evaluateFieldWithConditions';
 import * as _digigov_form_Field_utils from '@digigov/form/Field/utils';
+import * as _digigov_form_Field_utils_useField from '@digigov/form/Field/utils/useField';
 import * as _digigov_form_FieldArray from '@digigov/form/FieldArray';
 import * as _digigov_form_FieldObject from '@digigov/form/FieldObject';
 import * as _digigov_form_Fieldset_FieldsetWithContext from '@digigov/form/Fieldset/FieldsetWithContext';
 import * as _digigov_form_Fieldset from '@digigov/form/Fieldset';
 import * as _digigov_form_Fieldset_types from '@digigov/form/Fieldset/types';
-import * as _digigov_form_FormBuilder_FormBuilder from '@digigov/form/FormBuilder/FormBuilder';
 import * as _digigov_form_FormBuilder from '@digigov/form/FormBuilder';
 import * as _digigov_form_FormContext from '@digigov/form/FormContext';
 import * as _digigov_form from '@digigov/form';
@@ -21,13 +23,17 @@ import * as _digigov_form_inputs_FileInput from '@digigov/form/inputs/FileInput'
 import * as _digigov_form_inputs_ImageInput from '@digigov/form/inputs/ImageInput';
 import * as _digigov_form_inputs from '@digigov/form/inputs';
 import * as _digigov_form_inputs_Input from '@digigov/form/inputs/Input';
+import * as _digigov_form_inputs_Input_inputsInputScenarios from '@digigov/form/inputs/Input/inputsInputScenarios';
+import * as _digigov_form_inputs_inputsScenarios from '@digigov/form/inputs/inputsScenarios';
 import * as _digigov_form_inputs_Label from '@digigov/form/inputs/Label';
 import * as _digigov_form_inputs_OtpInput from '@digigov/form/inputs/OtpInput';
 import * as _digigov_form_inputs_Radio from '@digigov/form/inputs/Radio';
 import * as _digigov_form_inputs_Select from '@digigov/form/inputs/Select';
 import * as _digigov_form_internal from '@digigov/form/internal';
+import * as _digigov_form_locales_el from '@digigov/form/locales/el';
 import * as _digigov_form_MultiplicityField_add_objects from '@digigov/form/MultiplicityField/add-objects';
 import * as _digigov_form_MultiplicityField from '@digigov/form/MultiplicityField';
+import * as _digigov_form_MultiplicityField_types from '@digigov/form/MultiplicityField/types';
 import * as _digigov_form_Questions_getNextStep from '@digigov/form/Questions/getNextStep';
 import * as _digigov_form_Questions from '@digigov/form/Questions';
 import * as _digigov_form_Questions_Questions from '@digigov/form/Questions/Questions';
@@ -85,13 +91,15 @@ export default {
   '@digigov/form/Field/FieldConditional': lazyImport(_digigov_form_Field_FieldConditional),
   '@digigov/form/Field': lazyImport(_digigov_form_Field),
   '@digigov/form/Field/types': lazyImport(_digigov_form_Field_types),
+  '@digigov/form/Field/utils/calculateField': lazyImport(_digigov_form_Field_utils_calculateField),
+  '@digigov/form/Field/utils/evaluateFieldWithConditions': lazyImport(_digigov_form_Field_utils_evaluateFieldWithConditions),
   '@digigov/form/Field/utils': lazyImport(_digigov_form_Field_utils),
+  '@digigov/form/Field/utils/useField': lazyImport(_digigov_form_Field_utils_useField),
   '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
   '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(_digigov_form_Fieldset_FieldsetWithContext),
   '@digigov/form/Fieldset': lazyImport(_digigov_form_Fieldset),
   '@digigov/form/Fieldset/types': lazyImport(_digigov_form_Fieldset_types),
-  '@digigov/form/FormBuilder/FormBuilder': lazyImport(_digigov_form_FormBuilder_FormBuilder),
   '@digigov/form/FormBuilder': lazyImport(_digigov_form_FormBuilder),
   '@digigov/form/FormContext': lazyImport(_digigov_form_FormContext),
   '@digigov/form': lazyImport(_digigov_form),
@@ -102,13 +110,17 @@ export default {
   '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
   '@digigov/form/inputs': lazyImport(_digigov_form_inputs),
   '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
+  '@digigov/form/inputs/Input/inputsInputScenarios': lazyImport(_digigov_form_inputs_Input_inputsInputScenarios),
+  '@digigov/form/inputs/inputsScenarios': lazyImport(_digigov_form_inputs_inputsScenarios),
   '@digigov/form/inputs/Label': lazyImport(_digigov_form_inputs_Label),
   '@digigov/form/inputs/OtpInput': lazyImport(_digigov_form_inputs_OtpInput),
   '@digigov/form/inputs/Radio': lazyImport(_digigov_form_inputs_Radio),
   '@digigov/form/inputs/Select': lazyImport(_digigov_form_inputs_Select),
   '@digigov/form/internal': lazyImport(_digigov_form_internal),
+  '@digigov/form/locales/el': lazyImport(_digigov_form_locales_el),
   '@digigov/form/MultiplicityField/add-objects': lazyImport(_digigov_form_MultiplicityField_add_objects),
   '@digigov/form/MultiplicityField': lazyImport(_digigov_form_MultiplicityField),
+  '@digigov/form/MultiplicityField/types': lazyImport(_digigov_form_MultiplicityField_types),
   '@digigov/form/Questions/getNextStep': lazyImport(_digigov_form_Questions_getNextStep),
   '@digigov/form/Questions': lazyImport(_digigov_form_Questions),
   '@digigov/form/Questions/Questions': lazyImport(_digigov_form_Questions_Questions),

package/src/types.tsx

@@ -1,70 +1,16 @@
 import { UseFormReturn, UseFormProps } from 'react-hook-form';
-import { FieldComponentRegistry } from '@digigov/form/Field/types';
+import {
+  FieldComponentRegistry,
+  FieldLabelProps,
+  FieldSpec,
+  FormData,
+} from '@digigov/form/Field/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
-import { GridProps } from '@digigov/ui/layouts/Grid';
-
+export * from '@digigov/form/Field/types';
 export type 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; // !TODO rename key to name;
-  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;
   fields: string[];
@@ -72,8 +18,6 @@ export interface FieldsetSpec {
   body?: React.ReactNode;
 }
 
-export type FormData = UseFormProps['defaultValues'];
-
 export interface FormContextProps {
   fieldsetsMap?: Record<string, FieldsetSpec>;
   fieldsMap: Record<string, FieldSpec>;
@@ -88,9 +32,11 @@ export interface FormContextProps {
   unregister: UseFormReturn['unregister'];
   formState: UseFormReturn['formState'];
   reset: UseFormReturn['reset'];
+  resetField: UseFormReturn['resetField'];
   registerField: (field: FieldSpec) => void;
   errors: UseFormReturn['formState']['errors'];
   componentRegistry?: FieldComponentRegistry;
+  submit: () => Promise<void>;
 }
 
 export interface FormBuilderProps {

package/src/utils.ts

@@ -38,41 +38,42 @@ const parseErrorSchema = (
   );
 };
 
-export const yupResolver = (
-  schema: any,
-  schemaOptions: any = {},
-  resolverOptions: any = {}
-) => async (values, context, options) => {
-  try {
-    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"
+export const yupResolver =
+  (schema: any, schemaOptions: any = {}, resolverOptions: any = {}) =>
+  async (values, context, options) => {
+    try {
+      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"
+        );
+      }
+
+      const result = await schema[
+        resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'
+      ](
+        values,
+        Object.assign({ abortEarly: false }, schemaOptions, { context })
       );
-    }
 
-    const result = await schema[
-      resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'
-    ](values, Object.assign({ abortEarly: false }, schemaOptions, { context }));
+      options.shouldUseNativeValidation && validateFieldsNatively({}, options);
 
-    options.shouldUseNativeValidation && validateFieldsNatively({}, options);
+      return {
+        values: resolverOptions.rawValues ? values : result,
+        errors: {},
+      };
+    } catch (e) {
+      if (!e.inner) {
+        throw e;
+      }
 
-    return {
-      values: resolverOptions.rawValues ? values : result,
-      errors: {},
-    };
-  } catch (e) {
-    if (!e.inner) {
-      throw e;
+      const parsed = parseErrorSchema(
+        e,
+        !options.shouldUseNativeValidation && options.criteriaMode === 'all'
+      );
+      return {
+        values: {},
+        errors: parsed,
+      };
     }
-
-    const parsed = parseErrorSchema(
-      e,
-      !options.shouldUseNativeValidation && options.criteriaMode === 'all'
-    );
-    return {
-      values: {},
-      errors: parsed,
-    };
-  }
-};
+  };

package/src/validators/index.ts

@@ -97,6 +97,11 @@ export const getYUPTypeMap = (): Record<string, any> => {
         return yup.array().of(yup.string());
       }
     },
+    number: (): MixedSchema =>
+      yup
+        .mixed()
+        .transform((_, val) => (val !== '' ? Number(val) : null))
+        .test(NUMBER_VALIDATOR()),
     int: (): MixedSchema =>
       yup
         .mixed()

package/src/validators/utils/file.ts

@@ -5,17 +5,17 @@ const DEFAULT_FILE_MAX_SIZE = 10000000;
 
 export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({
   name: 'file-max-size-validator',
-  message: 'form.error.file_size',
+  message: {
+    key: 'form.error.file_size',
+    context: {
+      maxSizeToMb: (field?.extra?.limit.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
+    },
+  },
   test: (value: File[]): boolean => {
-    if (field?.extra?.limit && field?.extra?.limit.maxSize && value) {
-      for (const file of value) {
-        if (file.size >= field.extra.limit.maxSize) {
-          return false;
-        }
-      }
-    } else if (value) {
+    if (value) {
       for (const file of value) {
-        if (file.size >= DEFAULT_FILE_MAX_SIZE) {
+        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE
+        if (file.size > maxSize) {
           return false;
         }
       }

package/src/validators/utils/phone.ts

@@ -4,20 +4,20 @@ import { 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,32 +105,36 @@ 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,
@@ -156,12 +144,15 @@ export function validatePhoneNumber(
   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/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', () => {
   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', () => {
   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', () => {
   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 * from "@digigov/form/Field/types";
 //# sourceMappingURL=types.js.map