From f4a70f257acd335e40b5230900d1e619522805d3 Mon Sep 17 00:00:00 2001 From: Abdelrahman Awad Date: Tue, 13 Aug 2024 22:49:50 +0300 Subject: [PATCH] refactor: move form folder to useform --- packages/core/src/index.ts | 2 +- packages/core/src/useCheckbox/useCheckboxGroup.ts | 2 +- packages/core/src/{form => useForm}/formContext.ts | 0 packages/core/src/{form => useForm}/formSnapshot.ts | 0 packages/core/src/{form => useForm}/index.ts | 0 packages/core/src/{form => useForm}/useForm.spec.ts | 0 packages/core/src/{form => useForm}/useForm.ts | 0 packages/core/src/{form => useForm}/useFormActions.ts | 0 packages/core/src/{form => useForm}/useFormTransactions.ts | 0 .../core/src/{form => useFormField}/useErrorDisplay.spec.ts | 2 +- packages/core/src/{form => useFormField}/useErrorDisplay.ts | 2 +- packages/core/src/useFormField/useFormField.spec.ts | 2 +- packages/core/src/useFormField/useFormField.ts | 2 +- packages/core/src/useNumberField/index.ts | 2 +- packages/core/src/useRadio/useRadioGroup.ts | 2 +- packages/core/src/useSearchField/index.ts | 2 +- packages/core/src/useTextField/index.ts | 2 +- packages/core/src/validation/useInputValidity.ts | 2 +- 18 files changed, 11 insertions(+), 11 deletions(-) rename packages/core/src/{form => useForm}/formContext.ts (100%) rename packages/core/src/{form => useForm}/formSnapshot.ts (100%) rename packages/core/src/{form => useForm}/index.ts (100%) rename packages/core/src/{form => useForm}/useForm.spec.ts (100%) rename packages/core/src/{form => useForm}/useForm.ts (100%) rename packages/core/src/{form => useForm}/useFormActions.ts (100%) rename packages/core/src/{form => useForm}/useFormTransactions.ts (100%) rename packages/core/src/{form => useFormField}/useErrorDisplay.spec.ts (96%) rename packages/core/src/{form => useFormField}/useErrorDisplay.ts (83%) diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 679a0ab4..8f32603d 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -8,7 +8,7 @@ export * from './useNumberField'; export * from './useSpinButton'; export * from './types'; export * from './config'; -export * from './form'; +export * from './useForm'; export * from './useFormGroup'; export * from './validation'; export { normalizePath } from './utils/path'; diff --git a/packages/core/src/useCheckbox/useCheckboxGroup.ts b/packages/core/src/useCheckbox/useCheckboxGroup.ts index 66bcf6cb..2f8b7f23 100644 --- a/packages/core/src/useCheckbox/useCheckboxGroup.ts +++ b/packages/core/src/useCheckbox/useCheckboxGroup.ts @@ -14,7 +14,7 @@ import { useUniqId, createDescribedByProps, normalizeProps, isEqual } from '../u import { useLocale } from '../i18n/useLocale'; import { useFormField } from '../useFormField'; import { FieldTypePrefixes } from '../constants'; -import { useErrorDisplay } from '../form/useErrorDisplay'; +import { useErrorDisplay } from '../useFormField/useErrorDisplay'; export type CheckboxGroupValue = TCheckbox[]; diff --git a/packages/core/src/form/formContext.ts b/packages/core/src/useForm/formContext.ts similarity index 100% rename from packages/core/src/form/formContext.ts rename to packages/core/src/useForm/formContext.ts diff --git a/packages/core/src/form/formSnapshot.ts b/packages/core/src/useForm/formSnapshot.ts similarity index 100% rename from packages/core/src/form/formSnapshot.ts rename to packages/core/src/useForm/formSnapshot.ts diff --git a/packages/core/src/form/index.ts b/packages/core/src/useForm/index.ts similarity index 100% rename from packages/core/src/form/index.ts rename to packages/core/src/useForm/index.ts diff --git a/packages/core/src/form/useForm.spec.ts b/packages/core/src/useForm/useForm.spec.ts similarity index 100% rename from packages/core/src/form/useForm.spec.ts rename to packages/core/src/useForm/useForm.spec.ts diff --git a/packages/core/src/form/useForm.ts b/packages/core/src/useForm/useForm.ts similarity index 100% rename from packages/core/src/form/useForm.ts rename to packages/core/src/useForm/useForm.ts diff --git a/packages/core/src/form/useFormActions.ts b/packages/core/src/useForm/useFormActions.ts similarity index 100% rename from packages/core/src/form/useFormActions.ts rename to packages/core/src/useForm/useFormActions.ts diff --git a/packages/core/src/form/useFormTransactions.ts b/packages/core/src/useForm/useFormTransactions.ts similarity index 100% rename from packages/core/src/form/useFormTransactions.ts rename to packages/core/src/useForm/useFormTransactions.ts diff --git a/packages/core/src/form/useErrorDisplay.spec.ts b/packages/core/src/useFormField/useErrorDisplay.spec.ts similarity index 96% rename from packages/core/src/form/useErrorDisplay.spec.ts rename to packages/core/src/useFormField/useErrorDisplay.spec.ts index c8264466..1a175186 100644 --- a/packages/core/src/form/useErrorDisplay.spec.ts +++ b/packages/core/src/useFormField/useErrorDisplay.spec.ts @@ -1,6 +1,6 @@ import { renderSetup } from '@test-utils/index'; import { useErrorDisplay } from './useErrorDisplay'; -import { useFormField } from '../useFormField'; +import { useFormField } from './useFormField'; test('displays field errors only if they are touched', async () => { const { setErrors, isValid, errorMessage, displayError, setTouched } = await renderSetup(() => { diff --git a/packages/core/src/form/useErrorDisplay.ts b/packages/core/src/useFormField/useErrorDisplay.ts similarity index 83% rename from packages/core/src/form/useErrorDisplay.ts rename to packages/core/src/useFormField/useErrorDisplay.ts index 6a921c4b..ce881c84 100644 --- a/packages/core/src/form/useErrorDisplay.ts +++ b/packages/core/src/useFormField/useErrorDisplay.ts @@ -1,4 +1,4 @@ -import { FormField } from '../useFormField'; +import { FormField } from './useFormField'; export function useErrorDisplay(field: FormField) { function displayError(msg?: string) { diff --git a/packages/core/src/useFormField/useFormField.spec.ts b/packages/core/src/useFormField/useFormField.spec.ts index 61681180..b20945b3 100644 --- a/packages/core/src/useFormField/useFormField.spec.ts +++ b/packages/core/src/useFormField/useFormField.spec.ts @@ -1,6 +1,6 @@ import { renderSetup } from '@test-utils/index'; import { useFormField } from './useFormField'; -import { useForm } from '../form/useForm'; +import { useForm } from '../useForm/useForm'; test('it initializes the field value', async () => { const { fieldValue } = await renderSetup(() => { diff --git a/packages/core/src/useFormField/useFormField.ts b/packages/core/src/useFormField/useFormField.ts index c0660674..43c73195 100644 --- a/packages/core/src/useFormField/useFormField.ts +++ b/packages/core/src/useFormField/useFormField.ts @@ -10,7 +10,7 @@ import { toValue, watch, } from 'vue'; -import { FormContext, FormKey } from '../form/useForm'; +import { FormContext, FormKey } from '../useForm/useForm'; import { Arrayable, Getter } from '../types'; import { useSyncModel } from '../reactivity/useModelSync'; import { cloneDeep, isEqual, normalizeArrayable } from '../utils/common'; diff --git a/packages/core/src/useNumberField/index.ts b/packages/core/src/useNumberField/index.ts index 00a8e023..424d790b 100644 --- a/packages/core/src/useNumberField/index.ts +++ b/packages/core/src/useNumberField/index.ts @@ -23,7 +23,7 @@ import { useSpinButton } from '../useSpinButton'; import { useLocale } from '../i18n/useLocale'; import { useFormField } from '../useFormField'; import { FieldTypePrefixes } from '../constants'; -import { useErrorDisplay } from '../form/useErrorDisplay'; +import { useErrorDisplay } from '../useFormField/useErrorDisplay'; export interface NumberInputDOMAttributes { name?: string; diff --git a/packages/core/src/useRadio/useRadioGroup.ts b/packages/core/src/useRadio/useRadioGroup.ts index 8a48ed59..5cd38955 100644 --- a/packages/core/src/useRadio/useRadioGroup.ts +++ b/packages/core/src/useRadio/useRadioGroup.ts @@ -14,7 +14,7 @@ import { useUniqId, createDescribedByProps, getNextCycleArrIdx, normalizeProps, import { useLocale } from '../i18n/useLocale'; import { useFormField } from '../useFormField'; import { FieldTypePrefixes } from '../constants'; -import { useErrorDisplay } from '../form/useErrorDisplay'; +import { useErrorDisplay } from '../useFormField/useErrorDisplay'; export interface RadioGroupContext { name: string; diff --git a/packages/core/src/useSearchField/index.ts b/packages/core/src/useSearchField/index.ts index d8e2c538..7283d953 100644 --- a/packages/core/src/useSearchField/index.ts +++ b/packages/core/src/useSearchField/index.ts @@ -13,7 +13,7 @@ import { useInputValidity } from '../validation/useInputValidity'; import { useLabel } from '../a11y/useLabel'; import { useFormField } from '../useFormField'; import { FieldTypePrefixes } from '../constants'; -import { useErrorDisplay } from '../form/useErrorDisplay'; +import { useErrorDisplay } from '../useFormField/useErrorDisplay'; export interface SearchInputDOMAttributes extends TextInputBaseAttributes { type?: 'search'; diff --git a/packages/core/src/useTextField/index.ts b/packages/core/src/useTextField/index.ts index 806c2ee1..ce16e4b3 100644 --- a/packages/core/src/useTextField/index.ts +++ b/packages/core/src/useTextField/index.ts @@ -13,7 +13,7 @@ import { useInputValidity } from '../validation/useInputValidity'; import { useLabel } from '../a11y/useLabel'; import { useFormField } from '../useFormField'; import { FieldTypePrefixes } from '../constants'; -import { useErrorDisplay } from '../form/useErrorDisplay'; +import { useErrorDisplay } from '../useFormField/useErrorDisplay'; export type TextInputDOMType = 'text' | 'password' | 'email' | 'number' | 'tel' | 'url'; diff --git a/packages/core/src/validation/useInputValidity.ts b/packages/core/src/validation/useInputValidity.ts index 14ed6f1b..c4262076 100644 --- a/packages/core/src/validation/useInputValidity.ts +++ b/packages/core/src/validation/useInputValidity.ts @@ -1,6 +1,6 @@ import { Ref, inject, nextTick, onMounted, shallowRef, watch } from 'vue'; import { useEventListener } from '../helpers/useEventListener'; -import { FormKey } from '../form'; +import { FormKey } from '../useForm'; import { Maybe } from '../types'; import { FormField } from '../useFormField';