From b6073fe4baf8a402784841eb4d7acd8348540f0b Mon Sep 17 00:00:00 2001 From: Thijs Louisse Date: Mon, 21 Mar 2022 23:28:50 +0100 Subject: [PATCH] chore(form-core): improve type structure + exports --- packages/form-core/src/validate/Validator.js | 12 ++++++------ .../test-suites/ValidateMixinFeedbackPart.suite.js | 2 +- packages/form-core/types/choice-group/index.d.ts | 2 ++ packages/form-core/types/form-group/index.d.ts | 1 + packages/form-core/types/index.d.ts | 10 ++++++++++ packages/form-core/types/registration/index.d.ts | 3 +++ packages/form-core/types/utils/index.d.ts | 1 + packages/form-core/types/validate/index.d.ts | 2 ++ .../index.d.ts => types/validate/validate.d.ts} | 2 +- 9 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 packages/form-core/types/choice-group/index.d.ts create mode 100644 packages/form-core/types/form-group/index.d.ts create mode 100644 packages/form-core/types/index.d.ts create mode 100644 packages/form-core/types/registration/index.d.ts create mode 100644 packages/form-core/types/utils/index.d.ts create mode 100644 packages/form-core/types/validate/index.d.ts rename packages/form-core/{src/validate/types/index.d.ts => types/validate/validate.d.ts} (97%) diff --git a/packages/form-core/src/validate/Validator.js b/packages/form-core/src/validate/Validator.js index f272a3c0e..f4ec60243 100644 --- a/packages/form-core/src/validate/Validator.js +++ b/packages/form-core/src/validate/Validator.js @@ -1,10 +1,10 @@ /** - * @typedef {import('./types').FeedbackMessageData} FeedbackMessageData - * @typedef {import('./types').ValidatorParam} ValidatorParam - * @typedef {import('./types').ValidatorConfig} ValidatorConfig - * @typedef {import('./types').ValidatorOutcome} ValidatorOutcome - * @typedef {import('./types').ValidatorName} ValidatorName - * @typedef {import('./types').ValidationType} ValidationType + * @typedef {import('../../types/validate/validate').FeedbackMessageData} FeedbackMessageData + * @typedef {import('../../types/validate/validate').ValidatorParam} ValidatorParam + * @typedef {import('../../types/validate/validate').ValidatorConfig} ValidatorConfig + * @typedef {import('../../types/validate/validate').ValidatorOutcome} ValidatorOutcome + * @typedef {import('../../types/validate/validate').ValidatorName} ValidatorName + * @typedef {import('../../types/validate/validate').ValidationType} ValidationType * @typedef {import('../FormControlMixin').FormControlHost} FormControlHost */ diff --git a/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js b/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js index bd92897be..f9f8dce01 100644 --- a/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js +++ b/packages/form-core/test-suites/ValidateMixinFeedbackPart.suite.js @@ -8,7 +8,7 @@ import { DefaultSuccess, MinLength, Required, ValidateMixin, Validator } from '. import { AlwaysInvalid } from '../test-helpers/index.js'; /** - * @typedef {import('../src/validate/types').FeedbackMessageData} FeedbackMessageData + * @typedef {import('../types').FeedbackMessageData} FeedbackMessageData */ export function runValidateMixinFeedbackPart() { diff --git a/packages/form-core/types/choice-group/index.d.ts b/packages/form-core/types/choice-group/index.d.ts new file mode 100644 index 000000000..a567894cd --- /dev/null +++ b/packages/form-core/types/choice-group/index.d.ts @@ -0,0 +1,2 @@ +export * from './ChoiceInputMixinTypes'; +export * from './ChoiceGroupMixinTypes'; diff --git a/packages/form-core/types/form-group/index.d.ts b/packages/form-core/types/form-group/index.d.ts new file mode 100644 index 000000000..aa2781265 --- /dev/null +++ b/packages/form-core/types/form-group/index.d.ts @@ -0,0 +1 @@ +export * from './FormGroupMixinTypes'; diff --git a/packages/form-core/types/index.d.ts b/packages/form-core/types/index.d.ts new file mode 100644 index 000000000..576fec513 --- /dev/null +++ b/packages/form-core/types/index.d.ts @@ -0,0 +1,10 @@ +export * from './FocusMixinTypes'; +export * from './FormatMixinTypes'; +export * from './FormControlMixinTypes'; +export * from './InteractionStateMixinTypes'; +export * from './NativeTextFieldMixinTypes'; +export * from './validate'; +export * from './utils'; +export * from './registration'; +export * from './form-group'; +export * from './choice-group'; diff --git a/packages/form-core/types/registration/index.d.ts b/packages/form-core/types/registration/index.d.ts new file mode 100644 index 000000000..d1fbc9b48 --- /dev/null +++ b/packages/form-core/types/registration/index.d.ts @@ -0,0 +1,3 @@ +export * from './FormRegisteringMixinTypes'; +export * from './FormRegistrarMixinTypes'; +export * from './FormRegistrarPortalMixinTypes'; diff --git a/packages/form-core/types/utils/index.d.ts b/packages/form-core/types/utils/index.d.ts new file mode 100644 index 000000000..01b93e0f4 --- /dev/null +++ b/packages/form-core/types/utils/index.d.ts @@ -0,0 +1 @@ +export * from './SyncUpdatableMixinTypes'; diff --git a/packages/form-core/types/validate/index.d.ts b/packages/form-core/types/validate/index.d.ts new file mode 100644 index 000000000..e8a6ab654 --- /dev/null +++ b/packages/form-core/types/validate/index.d.ts @@ -0,0 +1,2 @@ +export * from './validate'; +export * from './ValidateMixinTypes'; diff --git a/packages/form-core/src/validate/types/index.d.ts b/packages/form-core/types/validate/validate.d.ts similarity index 97% rename from packages/form-core/src/validate/types/index.d.ts rename to packages/form-core/types/validate/validate.d.ts index 36741865a..2b2c96f8d 100644 --- a/packages/form-core/src/validate/types/index.d.ts +++ b/packages/form-core/types/validate/validate.d.ts @@ -1,4 +1,4 @@ -import { FormControlHost } from '../../FormControlMixin'; +import { FormControlHost } from '../../src/FormControlMixin'; export { ValidationType } from '../../types/ValidateMixinTypes'; /**