refactor: verbatimModuleSyntax option

kazupon · kazupon · commit 255ae0314906 · 2025-01-08T00:08:35.000+09:00
diff --git a/packages/core-base/src/translate.ts b/packages/core-base/src/translate.ts
@@ -19,7 +19,6 @@ import {
 } from '@intlify/shared'
 import { isMessageAST } from './compilation'
 import {
-  CoreContext,
   getAdditionalMeta,
   handleMissing,
   isAlmostSameLocale,
@@ -36,6 +35,7 @@ import { CoreWarnCodes, getWarnMessage } from './warnings'
 import type { AdditionalPayloads } from '@intlify/devtools-types'
 import type { CompileError, ResourceNode } from '@intlify/message-compiler'
 import type {
+  CoreContext,
   CoreInternalContext,
   DefineCoreLocaleMessage,
   LocaleMessages,
diff --git a/packages/core-base/test/context.test-d.ts b/packages/core-base/test/context.test-d.ts
@@ -1,12 +1,12 @@
-import {
-  createCoreContext,
+import { createCoreContext } from '../src'
+
+import type {
   DateTimeFormat,
   Locale,
   LocaleDetector,
   NumberFormat,
   PickupFallbackLocales
 } from '../src'
-
 import type { MyDatetimeScehma, MyNumberSchema, ResourceSchema } from './schema'
 
 // loose options
diff --git a/packages/core-base/test/fallbacker.test.ts b/packages/core-base/test/fallbacker.test.ts
@@ -1,11 +1,13 @@
-import { createCoreContext as context, CoreContext } from '../src/context'
+import { createCoreContext as context } from '../src/context'
+import { CoreErrorCodes, errorMessages } from '../src/errors'
 import {
   fallbackWithLocaleChain,
   fallbackWithSimple,
   resolveLocale
 } from '../src/fallbacker'
-import { errorMessages, CoreErrorCodes } from '../src/errors'
-import { LocaleDetector } from '@intlify/core-base'
+
+import type { LocaleDetector } from '@intlify/core-base'
+import type { CoreContext } from '../src/context'
 
 describe('fallbackWithSimple', () => {
   let ctx: CoreContext<string>
diff --git a/packages/core-base/test/issues.test.ts b/packages/core-base/test/issues.test.ts
@@ -1,7 +1,8 @@
+import { NodeTypes } from '@intlify/message-compiler'
 import { format } from '../src/format'
 import { createMessageContext as context } from '../src/runtime'
 
-import { NodeTypes, ResourceNode } from '@intlify/message-compiler'
+import type { ResourceNode } from '@intlify/message-compiler'
 
 describe('CVE-2024-52809', () => {
   function attackGetter() {
diff --git a/packages/core-base/test/number.test.ts b/packages/core-base/test/number.test.ts
@@ -20,16 +20,18 @@ vi.mock('../src/intl', async () => {
   }
 })
 
-import { createCoreContext as context, NOT_REOSLVED } from '../src/context'
-import { number } from '../src/number'
-import { CoreErrorCodes, errorMessages } from '../src/errors'
+import { compile } from '../src/compilation'
 import {
-  registerMessageCompiler,
-  registerLocaleFallbacker
+  createCoreContext as context,
+  NOT_REOSLVED,
+  registerLocaleFallbacker,
+  registerMessageCompiler
 } from '../src/context'
-import { compile } from '../src/compilation'
+import { CoreErrorCodes, errorMessages } from '../src/errors'
 import { fallbackWithLocaleChain } from '../src/fallbacker'
-import { NumberFormats } from '../src/types/index'
+import { number } from '../src/number'
+
+import type { NumberFormats } from '../src/types/index'
 
 type MyNumberSchema = {
   currency: {} // loose schema
diff --git a/packages/core-base/test/runtime.test-d.ts b/packages/core-base/test/runtime.test-d.ts
@@ -1,4 +1,4 @@
-import { MessageType } from '../src/runtime'
+import type { MessageType } from '../src/runtime'
 
 /**
  * Message Type
diff --git a/packages/format-explorer/vite.config.ts b/packages/format-explorer/vite.config.ts
@@ -1,16 +1,16 @@
-import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import { execaSync } from 'execa'
 import path from 'node:path'
 import { URL } from 'node:url'
+import { defineConfig } from 'vite'
 
 const commit = execaSync('git', ['rev-parse', 'HEAD']).stdout.slice(0, 7)
 console.log('commit', commit)
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname)
 
 // https://vitejs.dev/config/
-export default defineConfig({
+const config = defineConfig({
   define: {
     __COMMIT__: JSON.stringify(commit),
     __BROWSER__: false
@@ -25,3 +25,5 @@ export default defineConfig({
   },
   plugins: [vue()]
 })
+
+export default config
diff --git a/packages/message-compiler/src/nodes.ts b/packages/message-compiler/src/nodes.ts
@@ -1,4 +1,4 @@
-import { SourceLocation } from './location'
+import type { SourceLocation } from './location'
 
 export const enum NodeTypes {
   Resource, // 0
diff --git a/packages/vue-i18n-core/src/components/base.ts b/packages/vue-i18n-core/src/components/base.ts
@@ -1,6 +1,5 @@
-import { Composer } from '../composer'
-
 import type { Locale } from '@intlify/core-base'
+import type { Composer } from '../composer'
 import type { I18nScope } from '../i18n'
 
 export type ComponentI18nScope = Exclude<I18nScope, 'local'>
diff --git a/packages/vue-i18n-core/src/components/index.ts b/packages/vue-i18n-core/src/components/index.ts
@@ -1,5 +1,9 @@
-export { BaseFormatProps, ComponentI18nScope } from './base'
-export { DatetimeFormat, DatetimeFormatProps, I18nD } from './DatetimeFormat'
-export { FormattableProps } from './formatRenderer'
-export { I18nN, NumberFormat, NumberFormatProps } from './NumberFormat'
-export { I18nT, Translation, TranslationProps } from './Translation'
+export { DatetimeFormat, I18nD } from './DatetimeFormat'
+export { I18nN, NumberFormat } from './NumberFormat'
+export { I18nT, Translation } from './Translation'
+
+export type { BaseFormatProps, ComponentI18nScope } from './base'
+export type { DatetimeFormatProps } from './DatetimeFormat'
+export type { FormattableProps } from './formatRenderer'
+export type { NumberFormatProps } from './NumberFormat'
+export type { TranslationProps } from './Translation'
diff --git a/packages/vue-i18n-core/src/composer.ts b/packages/vue-i18n-core/src/composer.ts
@@ -2,7 +2,6 @@
 import {
   DEFAULT_LOCALE,
   MISSING_RESOLVE_VALUE,
-  MessageFunction,
   NOT_REOSLVED,
   clearDateTimeFormat,
   clearNumberFormat,
@@ -80,6 +79,7 @@ import type {
   LocaleMessages,
   LocaleParams,
   MessageCompiler,
+  MessageFunction,
   MessageFunctions,
   MessageProcessor,
   MessageResolver,
diff --git a/packages/vue-i18n-core/src/devtools.ts b/packages/vue-i18n-core/src/devtools.ts
@@ -6,11 +6,7 @@ import {
   isObject,
   isString
 } from '@intlify/shared'
-import {
-  ComponentTreeNode,
-  Hooks,
-  setupDevtoolsPlugin
-} from '@vue/devtools-api'
+import { setupDevtoolsPlugin } from '@vue/devtools-api'
 
 import type {
   VueDevToolsIDs,
@@ -19,9 +15,11 @@ import type {
 } from '@intlify/devtools-types'
 import type {
   ComponentStateBase,
+  ComponentTreeNode,
   CustomInspectorState,
   DevtoolsPluginApi,
   HookPayloads,
+  Hooks,
   InspectedComponentData
 } from '@vue/devtools-api'
 import type { App, ComponentInternalInstance } from 'vue'
diff --git a/packages/vue-i18n-core/src/i18n.ts b/packages/vue-i18n-core/src/i18n.ts
@@ -9,7 +9,6 @@ import {
   warnOnce
 } from '@intlify/shared'
 import {
-  InjectionKey,
   effectScope,
   getCurrentInstance,
   inject,
@@ -42,7 +41,12 @@ import type {
   VueDevToolsEmitter,
   VueDevToolsEmitterEvents
 } from '@intlify/devtools-types'
-import type { App, ComponentInternalInstance, EffectScope } from 'vue'
+import type {
+  App,
+  ComponentInternalInstance,
+  EffectScope,
+  InjectionKey
+} from 'vue'
 import type {
   Composer,
   ComposerInternalOptions,
diff --git a/packages/vue-i18n-core/src/legacy.ts b/packages/vue-i18n-core/src/legacy.ts
@@ -9,7 +9,7 @@ import {
   isRegExp,
   isString
 } from '@intlify/shared'
-import { createComposer, DefineLocaleMessage } from './composer'
+import { createComposer } from './composer'
 import { DisableEmitter, EnableEmitter } from './symbols'
 
 import type {
@@ -55,6 +55,7 @@ import type {
   DefaultLocaleMessageSchema,
   DefaultNumberFormatSchema,
   DefineDateTimeFormat,
+  DefineLocaleMessage,
   DefineNumberFormat,
   MissingHandler,
   VueMessageType
diff --git a/packages/vue-i18n-core/test/components/DatetimeFormat.test.ts b/packages/vue-i18n-core/test/components/DatetimeFormat.test.ts
@@ -10,10 +10,11 @@ import {
   registerMessageResolver,
   resolveValue
 } from '@intlify/core-base'
-import { defineComponent, h, SetupContext, VNodeChild } from 'vue'
+import { defineComponent, h } from 'vue'
 import { createI18n } from '../../src/index'
 import { mount } from '../helper'
 
+import type { SetupContext, VNodeChild } from 'vue'
 import type { IntlDateTimeFormats } from '../../src/index'
 
 const datetimeFormats: IntlDateTimeFormats = {
diff --git a/packages/vue-i18n-core/test/components/NumberFormat.test.ts b/packages/vue-i18n-core/test/components/NumberFormat.test.ts
@@ -10,10 +10,11 @@ import {
   registerMessageResolver,
   resolveValue
 } from '@intlify/core-base'
-import { defineComponent, h, SetupContext, VNodeChild } from 'vue'
+import { defineComponent, h } from 'vue'
 import { createI18n } from '../../src/index'
 import { mount } from '../helper'
 
+import type { SetupContext, VNodeChild } from 'vue'
 import type { IntlNumberFormats } from '../../src/index'
 
 const numberFormats: IntlNumberFormats = {
diff --git a/packages/vue-i18n-core/test/components/Translation.test.ts b/packages/vue-i18n-core/test/components/Translation.test.ts
@@ -10,19 +10,12 @@ import {
   registerMessageResolver,
   resolveValue
 } from '@intlify/core-base'
-import {
-  defineComponent,
-  h,
-  nextTick,
-  ref,
-  SetupContext,
-  VNodeChild
-} from 'vue'
+import { defineComponent, h, nextTick, ref } from 'vue'
 import { createI18n, useI18n } from '../../src/index'
 import { mount } from '../helper'
 
 import type { Path, PathValue } from '@intlify/core-base'
-import type { Ref } from 'vue'
+import type { Ref, SetupContext, VNodeChild } from 'vue'
 
 const messages = {
   en: {
diff --git a/packages/vue-i18n-core/test/composer.test.ts b/packages/vue-i18n-core/test/composer.test.ts
@@ -5,41 +5,44 @@
 
 // utils
 import * as shared from '@intlify/shared'
+import { pluralRules as _pluralRules } from './helper'
 vi.mock('@intlify/shared', async () => {
   const actual = await vi.importActual<object>('@intlify/shared')
   return {
     ...actual,
     warn: vi.fn()
   }
 })
-import { pluralRules as _pluralRules } from './helper'
 
 import {
-  createComposer,
-  MissingHandler,
-  ComposerOptions,
-  VueMessageType
-} from '../src/composer'
+  compile,
+  fallbackWithLocaleChain,
+  registerLocaleFallbacker,
+  registerMessageCompiler,
+  registerMessageResolver,
+  resolveValue
+} from '@intlify/core-base'
+import { createVNode, nextTick, Text, watch, watchEffect } from 'vue'
+import { createComposer } from '../src/composer'
 import {
-  TranslateVNodeSymbol,
+  DatetimePartsSymbol,
   NumberPartsSymbol,
-  DatetimePartsSymbol
+  TranslateVNodeSymbol
 } from '../src/symbols'
 import { getWarnMessage, I18nWarnCodes } from '../src/warnings'
-import { watch, watchEffect, nextTick, Text, createVNode } from 'vue'
-import {
+
+import type {
   Locale,
-  compile,
-  registerMessageCompiler,
-  resolveValue,
-  registerMessageResolver,
-  fallbackWithLocaleChain,
-  registerLocaleFallbacker,
   MessageContext,
+  MessageFunction,
   Path,
-  PathValue,
-  MessageFunction
+  PathValue
 } from '@intlify/core-base'
+import type {
+  ComposerOptions,
+  MissingHandler,
+  VueMessageType
+} from '../src/composer'
 
 beforeEach(() => {
   registerMessageCompiler(compile)
diff --git a/packages/vue-i18n-core/test/helper.ts b/packages/vue-i18n-core/test/helper.ts
@@ -1,22 +1,24 @@
+import { assign, isBoolean, isPlainObject } from '@intlify/shared'
+import { compile } from '@vue/compiler-dom'
+import * as runtimeDom from 'vue'
 import {
   createApp,
   defineComponent,
   h,
-  ComponentPublicInstance,
-  reactive,
   nextTick,
-  ComponentObjectPropsOptions,
-  App,
-  VNode,
-  shallowRef,
   onErrorCaptured,
-  ComponentOptions
+  reactive,
+  shallowRef
 } from 'vue'
-import { compile } from '@vue/compiler-dom'
-import * as runtimeDom from 'vue'
-import { isBoolean, isPlainObject, assign } from '@intlify/shared'
-import { I18n } from '../src/i18n'
 
+import type {
+  App,
+  ComponentObjectPropsOptions,
+  ComponentOptions,
+  ComponentPublicInstance,
+  VNode
+} from 'vue'
+import type { I18n } from '../src/i18n'
 import type { I18nPluginOptions } from '../src/plugin/types'
 
 export interface MountOptions {
diff --git a/packages/vue-i18n-core/test/i18n.test.ts b/packages/vue-i18n-core/test/i18n.test.ts
@@ -24,21 +24,20 @@ import {
 } from '@intlify/core-base'
 import { createEmitter } from '@intlify/shared'
 import {
-  ComponentOptions,
   defineComponent,
   defineCustomElement,
   getCurrentInstance,
   h,
   nextTick,
   ref
 } from 'vue'
-import { Composer } from '../src/composer'
 import { errorMessages, I18nErrorCodes } from '../src/errors'
 import { createI18n, useI18n } from '../src/i18n'
 import { pluralRules as _pluralRules, mount, randStr } from './helper'
 
 import type { IntlifyDevToolsEmitterHooks } from '@intlify/devtools-types'
-import type { App } from 'vue'
+import type { App, ComponentOptions } from 'vue'
+import type { Composer } from '../src/composer'
 import type { I18n } from '../src/i18n'
 import type { VueI18n } from '../src/legacy'
 /* eslint-disable @typescript-eslint/no-explicit-any */
diff --git a/packages/vue-i18n-core/test/legacy.test.ts b/packages/vue-i18n-core/test/legacy.test.ts
diff --git a/packages/vue-i18n-core/test/mixin.test.ts b/packages/vue-i18n-core/test/mixin.test.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/vitest.config.ts b/vitest.config.ts
diff --git a/vitest.e2e.config.ts b/vitest.e2e.config.ts
diff --git a/vitest.unit.config.ts b/vitest.unit.config.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { MessageType } from '../src/runtime'`
	`1`	`+import type { MessageType } from '../src/runtime'`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Message Type`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { SourceLocation } from './location'`
	`1`	`+import type { SourceLocation } from './location'`
`2`	`2`
`3`	`3`	`export const enum NodeTypes {`
`4`	`4`	`Resource, // 0`