Skip to content

Commit 283caa0

Browse files
committed
feat: deprecate the 'required' flag
1 parent 7af3ed2 commit 283caa0

6 files changed

Lines changed: 12 additions & 10 deletions

File tree

packages/core/src/Observer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { computed, provide, h, defineComponent } from 'vue';
22
import { normalizeChildren } from './utils/vnode';
33
import { useForm } from './useForm';
4-
import { ValidationFlags, SubmissionHandler } from './types';
4+
import { ValidationFlags, SubmissionHandler, Flag } from './types';
55

66
export const ValidationObserver = defineComponent({
77
name: 'ValidationObserver',
@@ -24,7 +24,7 @@ export const ValidationObserver = defineComponent({
2424
provide('$_veeObserver', form);
2525
const unwrappedMeta = computed(() =>
2626
Object.keys(meta).reduce((acc: ValidationFlags, key) => {
27-
acc[key] = (meta as any)[key].value;
27+
acc[key as Flag] = meta[key as Flag].value;
2828

2929
return acc;
3030
}, {} as ValidationFlags)

packages/core/src/Provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export const ValidationProvider = defineComponent({
6363

6464
const unwrappedMeta = computed(() => {
6565
return Object.keys(meta).reduce((acc, key) => {
66-
acc[key] = meta[key as Flag].value;
66+
acc[key as Flag] = meta[key as Flag].value;
6767

6868
return acc;
6969
}, {} as ValidationFlags);

packages/core/src/types.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ export interface ValidationFlags {
4545
failed: boolean;
4646
validated: boolean;
4747
pending: boolean;
48-
required: boolean;
4948
changed: boolean;
50-
[x: string]: boolean | undefined;
5149
}
5250

5351
export interface VeeObserver {
@@ -74,7 +72,6 @@ export type Flag =
7472
| 'failed'
7573
| 'validated'
7674
| 'pending'
77-
| 'required'
7875
| 'changed';
7976

8077
export interface FieldComposite {

packages/core/src/useField.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
import { watch, ref, Ref, isRef, reactive, computed, onMounted, toRefs, watchEffect } from 'vue';
22
import { validate } from './validate';
3-
import { FormController, ValidationResult, MaybeReactive, FieldComposite, GenericValidateFunction } from './types';
3+
import {
4+
FormController,
5+
ValidationResult,
6+
MaybeReactive,
7+
FieldComposite,
8+
GenericValidateFunction,
9+
Flag,
10+
} from './types';
411
import { createFlags, normalizeRules, extractLocators } from './utils';
512
import { normalizeEventValue } from './utils/events';
613
import { unwrap } from './utils/refs';
@@ -222,7 +229,7 @@ function useMeta() {
222229
return;
223230
}
224231

225-
flags[key] = defaults[key];
232+
flags[key as Flag] = defaults[key as Flag];
226233
});
227234
}
228235

packages/core/src/useForm.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const mergeStrategies: Record<Flag, 'every' | 'some'> = {
1414
changed: 'some',
1515
passed: 'every',
1616
failed: 'some',
17-
required: 'some',
1817
};
1918

2019
function computeMeta(fields: Ref<any[]>) {

packages/core/src/utils/factories.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export function createFlags(): ValidationFlags {
1010
invalid: false,
1111
validated: false,
1212
pending: false,
13-
required: false,
1413
changed: false,
1514
passed: false,
1615
failed: false,

0 commit comments

Comments
 (0)