diff --git a/packages/ui/components/form-core/test-suites/form-group/FormGroupMixin.suite.js b/packages/ui/components/form-core/test-suites/form-group/FormGroupMixin.suite.js index 2d4b4153a..13ef9e4e1 100644 --- a/packages/ui/components/form-core/test-suites/form-group/FormGroupMixin.suite.js +++ b/packages/ui/components/form-core/test-suites/form-group/FormGroupMixin.suite.js @@ -1234,7 +1234,7 @@ export function runFormGroupMixinSuite(cfg = {}) { `) ); - const childFieldsetEl = el.querySelector(tagString); + const childFieldsetEl = /** @type {FormGroup} */ (el.querySelector(tagString)); const resetGroupSpy = sinon.spy(childFieldsetEl, 'resetGroup'); el.resetGroup(); expect(resetGroupSpy.callCount).to.equal(1); @@ -1270,7 +1270,7 @@ export function runFormGroupMixinSuite(cfg = {}) { `) ); - const childFieldsetEl = el.querySelector(tagString); + const childFieldsetEl = /** @type {FormGroup} */ (el.querySelector(tagString)); const clearGroupSpy = sinon.spy(childFieldsetEl, 'clearGroup'); el.clearGroup(); expect(clearGroupSpy.callCount).to.equal(1); diff --git a/packages/ui/components/input-tel-dropdown/src/LionInputTelDropdown.js b/packages/ui/components/input-tel-dropdown/src/LionInputTelDropdown.js index 3671db4b1..261660a2e 100644 --- a/packages/ui/components/input-tel-dropdown/src/LionInputTelDropdown.js +++ b/packages/ui/components/input-tel-dropdown/src/LionInputTelDropdown.js @@ -27,7 +27,6 @@ import { getFlagSymbol } from './getFlagSymbol.js'; * @typedef {import('../types/index.js').OnDropdownChangeEvent} OnDropdownChangeEvent * @typedef {import('../types/index.js').DropdownRef} DropdownRef * @typedef {import('../types/index.js').RegionMeta} RegionMeta - * @typedef {* & import('awesome-phonenumber').default} AwesomePhoneNumber * @typedef {import('../../select-rich/src/LionSelectRich.js').LionSelectRich} LionSelectRich * @typedef {import('../../overlays/src/OverlayController.js').OverlayController} OverlayController * @typedef {TemplateDataForDropdownInputTel & {data: {regionMetaList:RegionMeta[]}}} TemplateDataForIntlInputTel diff --git a/packages/ui/components/input-tel/src/LionInputTel.js b/packages/ui/components/input-tel/src/LionInputTel.js index 6ad700eca..88d49d3d4 100644 --- a/packages/ui/components/input-tel/src/LionInputTel.js +++ b/packages/ui/components/input-tel/src/LionInputTel.js @@ -14,7 +14,7 @@ import { localizeNamespaceLoader } from './localizeNamespaceLoader.js'; * @typedef {import('awesome-phonenumber').PhoneNumberFormat} PhoneNumberFormat * @typedef {import('awesome-phonenumber').PhoneNumberTypes} PhoneNumberTypes * @typedef {import('../../form-core/types/FormatMixinTypes.js').FormatOptions} FormatOptions - * @typedef {* & import('awesome-phonenumber').default} AwesomePhoneNumber + * @typedef {* & import('awesome-phonenumber')} AwesomePhoneNumber * @typedef {FormatOptions & {regionCode: RegionCode; formatStrategy: PhoneNumberFormat; formatCountryCodeStyle: string;}} FormatOptionsTel */ diff --git a/packages/ui/components/input-tel/src/preprocessors.js b/packages/ui/components/input-tel/src/preprocessors.js index dc1866ad3..a92efdb4d 100644 --- a/packages/ui/components/input-tel/src/preprocessors.js +++ b/packages/ui/components/input-tel/src/preprocessors.js @@ -4,7 +4,6 @@ import { PhoneUtilManager } from './PhoneUtilManager.js'; /** * @typedef {import('../types/index.js').RegionCode} RegionCode * @typedef {import('awesome-phonenumber').PhoneNumberFormat} PhoneNumberFormat - * @typedef {* & import('awesome-phonenumber').default} AwesomePhoneNumber */ /** @@ -27,9 +26,8 @@ export function liveFormatPhoneNumber( return undefined; } - // eslint-disable-next-line prefer-destructuring - const PhoneNumber = /** @type {AwesomePhoneNumber} */ (PhoneUtilManager.PhoneUtil); - const ayt = PhoneNumber.getAsYouType(regionCode); + const AwesomePhoneNumber = PhoneUtilManager.PhoneUtil; + const ayt = AwesomePhoneNumber.getAsYouType(regionCode); for (const char of viewValue) { if (char !== '') { diff --git a/packages/ui/components/input-tel/src/validators.js b/packages/ui/components/input-tel/src/validators.js index 3636fef9c..8e2432be4 100644 --- a/packages/ui/components/input-tel/src/validators.js +++ b/packages/ui/components/input-tel/src/validators.js @@ -3,7 +3,6 @@ import { PhoneUtilManager } from './PhoneUtilManager.js'; /** * @typedef {import('../types/index.js').RegionCode} RegionCode - * @typedef {* & import('awesome-phonenumber').default} AwesomePhoneNumber * @typedef {import('../../form-core/types/validate/validate.js').FeedbackMessageData} FeedbackMessageData */ @@ -13,14 +12,13 @@ import { PhoneUtilManager } from './PhoneUtilManager.js'; * @returns {false|'invalid-country-code'|'unknown'|'too-long'|'too-short'} */ function hasFeedback(modelValue, regionCode) { - // eslint-disable-next-line prefer-destructuring - const PhoneNumber = /** @type {AwesomePhoneNumber} */ (PhoneUtilManager.PhoneUtil); + const AwesomePhoneNumber = PhoneUtilManager.PhoneUtil; let invalidCountryCode = false; if (regionCode && modelValue?.length >= 4 && modelValue?.length <= 16) { let pn; try { - pn = PhoneNumber.parsePhoneNumber(modelValue, { regionCode }); + pn = AwesomePhoneNumber.parsePhoneNumber(modelValue, { regionCode }); invalidCountryCode = pn.regionCode !== regionCode; if (invalidCountryCode) { return 'invalid-country-code';