fix: support isolatedDeclarations (WIP)

kazupon · kazupon · commit 5551342f7848 · 2024-12-31T23:40:16.000+09:00
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -97,6 +97,7 @@ export default [
       '.eslintrc.cjs',
       'packages/*/index.js',
       'docsgen.config.js',
+      'packages/format-explorer/vite.config.ts',
       'scripts/api/*.js'
     ]
   }
diff --git a/package.json b/package.json
@@ -152,7 +152,7 @@
     "trash-cli": "^6.0.0",
     "tslib": "^2.6.2",
     "tsx": "^4.11.2",
-    "typescript": "^5.5.3",
+    "typescript": "^5.6.3",
     "typescript-eslint": "^8.4.0",
     "vitepress": "1.5.0",
     "vitest": "^2.1.5",
diff --git a/packages/core-base/src/context.ts b/packages/core-base/src/context.ts
@@ -333,7 +333,7 @@ export interface CoreInternalContext {
  * Intlify core-base version
  * @internal
  */
-export const VERSION = __VERSION__
+export const VERSION: string = __VERSION__
 
 export const NOT_REOSLVED = -1
 
diff --git a/packages/core-base/src/datetime.ts b/packages/core-base/src/datetime.ts
@@ -295,7 +295,7 @@ export function datetime<
 }
 
 /** @internal */
-export const DATETIME_FORMAT_OPTIONS_KEYS = [
+export const DATETIME_FORMAT_OPTIONS_KEYS: string[] = [
   'localeMatcher',
   'weekday',
   'era',
diff --git a/packages/core-base/src/devtools.ts b/packages/core-base/src/devtools.ts
@@ -30,10 +30,14 @@ export function initI18nDevTools(
     })
 }
 
-export const translateDevTools =
+export const translateDevTools: ReturnType<typeof createDevToolsHook> =
   /* #__PURE__*/ createDevToolsHook('function:translate')
 
-function createDevToolsHook(hook: IntlifyDevToolsHooks) {
+function createDevToolsHook(
+  hook: IntlifyDevToolsHooks
+): (
+  payloads: IntlifyDevToolsHookPayloads[IntlifyDevToolsHooks]
+) => void | null {
   return (payloads: IntlifyDevToolsHookPayloads[IntlifyDevToolsHooks]) =>
     devtools && devtools.emit(hook, payloads)
 }
diff --git a/packages/core-base/src/errors.ts b/packages/core-base/src/errors.ts
@@ -8,7 +8,7 @@ import type { BaseError } from '@intlify/shared'
 export interface CoreError extends BaseError {}
 
 export const CoreErrorCodes = {
-  INVALID_ARGUMENT: COMPILE_ERROR_CODES_EXTEND_POINT, // 17
+  INVALID_ARGUMENT: COMPILE_ERROR_CODES_EXTEND_POINT as number, // 17
   INVALID_DATE_ARGUMENT: 18,
   INVALID_ISO_DATE_ARGUMENT: 19,
   NOT_SUPPORT_NON_STRING_MESSAGE: 20,
diff --git a/packages/core-base/src/fallbacker.ts b/packages/core-base/src/fallbacker.ts
@@ -35,7 +35,7 @@ export function getLocale<Messages, Message>(
 let _resolveLocale: string
 
 /** @internal */
-export function resolveLocale(locale: Locale | LocaleDetector) {
+export function resolveLocale(locale: Locale | LocaleDetector): string {
   if (isString(locale)) {
     return locale
   } else {
diff --git a/packages/core-base/src/format.ts b/packages/core-base/src/format.ts
@@ -163,7 +163,7 @@ export function formatMessagePart<Message = string>(
 
 const PROPS_TYPE = ['t', 'type']
 
-export function resolveType(node: Node) {
+export function resolveType(node: Node): ReturnType<typeof resolveProps> {
   return resolveProps<NodeTypes>(node, PROPS_TYPE)
 }
 
diff --git a/packages/core-base/src/number.ts b/packages/core-base/src/number.ts
@@ -290,7 +290,7 @@ export function number<
 }
 
 /** @internal */
-export const NUMBER_FORMAT_OPTIONS_KEYS = [
+export const NUMBER_FORMAT_OPTIONS_KEYS: string[] = [
   'localeMatcher',
   'style',
   'currency',
diff --git a/packages/format-explorer/src/theme.ts b/packages/format-explorer/src/theme.ts
@@ -241,4 +241,4 @@ export default {
     'editorCursor.foreground': '#AEAFAD',
     'editorWhitespace.foreground': '#4B4E55'
   }
-}
+} as const
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/minifier.ts b/packages/message-compiler/src/minifier.ts
@@ -1,25 +1,25 @@
+import { CompileErrorCodes, createCompileError } from './errors'
 import { NodeTypes } from './nodes'
-import { createCompileError, CompileErrorCodes } from './errors'
 
 import type {
-  MessageNode,
-  ResourceNode,
-  Node,
-  PluralNode,
-  TextNode,
-  LiteralNode,
-  LinkedNode,
   LinkedKeyNode,
   LinkedModifierNode,
+  LinkedNode,
   ListNode,
-  NamedNode
+  LiteralNode,
+  MessageNode,
+  NamedNode,
+  Node,
+  PluralNode,
+  ResourceNode,
+  TextNode
 } from './nodes'
 
 export const ERROR_DOMAIN = 'minifier'
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-export function minify(node: Node) {
+export function minify(node: Node): void {
   node.t = node.type
 
   switch (node.type) {
diff --git a/packages/message-compiler/src/scanner.ts b/packages/message-compiler/src/scanner.ts
@@ -16,8 +16,8 @@ export interface Scanner {
 export const CHAR_SP = ' '
 export const CHAR_CR = '\r'
 export const CHAR_LF = '\n'
-export const CHAR_LS = String.fromCharCode(0x2028)
-export const CHAR_PS = String.fromCharCode(0x2029)
+export const CHAR_LS: string = String.fromCharCode(0x2028)
+export const CHAR_PS: string = String.fromCharCode(0x2029)
 
 export function createScanner(str: string): Scanner {
   const _buf = str
diff --git a/packages/shared/src/utils.ts b/packages/shared/src/utils.ts
@@ -3,7 +3,7 @@
  * written by kazuya kawaguchi
  */
 
-export const inBrowser = typeof window !== 'undefined'
+export const inBrowser: boolean = typeof window !== 'undefined'
 
 export let mark: (tag: string) => void | undefined
 export let measure: (
@@ -79,7 +79,7 @@ export const isRegExp = (val: unknown): val is RegExp =>
 export const isEmptyObject = (val: unknown): val is boolean =>
   isPlainObject(val) && Object.keys(val).length === 0
 
-export const assign = Object.assign
+export const assign: typeof Object.assign = Object.assign
 
 const _create = Object.create
 export const create = (obj: object | null = null): object => _create(obj)
@@ -124,7 +124,7 @@ export function hasOwn(obj: object | Array<any>, key: string): boolean {
  * https://github.com/vuejs/vue-next/blob/master/packages/shared/src/index.ts
  * https://github.com/vuejs/vue-next/blob/master/packages/shared/src/codeframe.ts
  */
-export const isArray = Array.isArray
+export const isArray: typeof Array.isArray = Array.isArray
 export const isFunction = (val: unknown): val is Function =>
   typeof val === 'function'
 export const isString = (val: unknown): val is string => typeof val === 'string'
@@ -140,7 +140,8 @@ export const isPromise = <T = any>(val: unknown): val is Promise<T> => {
   return isObject(val) && isFunction(val.then) && isFunction(val.catch)
 }
 
-export const objectToString = Object.prototype.toString
+export const objectToString: typeof Object.prototype.toString =
+  Object.prototype.toString
 export const toTypeString = (value: unknown): string =>
   objectToString.call(value)
 
@@ -168,7 +169,7 @@ const RANGE = 2
 export function generateCodeFrame(
   source: string,
   start = 0,
-  end = source.length
+  end: number = source.length
 ): string {
   const lines = source.split(/\r?\n/)
   let count = 0
diff --git a/packages/shared/src/warn.ts b/packages/shared/src/warn.ts
@@ -10,7 +10,7 @@ export function warn(msg: string, err?: Error): void {
 
 const hasWarned: Record<string, boolean> = {}
 
-export function warnOnce(msg: string) {
+export function warnOnce(msg: string): void {
   if (!hasWarned[msg]) {
     hasWarned[msg] = true
     warn(msg)
diff --git a/packages/vue-i18n-core/src/components/DatetimeFormat.ts b/packages/vue-i18n-core/src/components/DatetimeFormat.ts
@@ -7,7 +7,7 @@ import { baseFormatProps } from './base'
 import { renderFormatter } from './formatRenderer'
 
 import type { DateTimeOptions } from '@intlify/core-base'
-import type { VNodeProps } from 'vue'
+import type { SetupContext, VNodeProps } from 'vue'
 import type { Composer, ComposerInternal } from '../composer'
 import type { BaseFormatProps } from './base'
 import type { FormattableProps } from './formatRenderer'
@@ -25,7 +25,7 @@ export type DatetimeFormatProps = FormattableProps<
 export const DatetimeFormatImpl = /* #__PURE__*/ defineComponent({
   /* eslint-disable */
   name: 'i18n-d',
-  props: assign(
+  props: /* #__PURE__*/ assign(
     {
       value: {
         type: [Number, Date],
@@ -38,8 +38,7 @@ export const DatetimeFormatImpl = /* #__PURE__*/ defineComponent({
     baseFormatProps
   ),
   /* eslint-enable */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  setup(props: any, context: any): any {
+  setup(props: DatetimeFormatProps, context: SetupContext) {
     const i18n =
       props.i18n ||
       (useI18n({
@@ -53,13 +52,9 @@ export const DatetimeFormatImpl = /* #__PURE__*/ defineComponent({
       Intl.DateTimeFormatOptions,
       DateTimeOptions,
       Intl.DateTimeFormatPart
-    >(
-      props as DatetimeFormatProps,
-      context,
-      DATETIME_FORMAT_OPTIONS_KEYS,
-      (...args: unknown[]) =>
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (i18n as any)[DatetimePartsSymbol](...args)
+    >(props, context, DATETIME_FORMAT_OPTIONS_KEYS, (...args: unknown[]) =>
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (i18n as any)[DatetimePartsSymbol](...args)
     )
   }
 })
@@ -87,4 +82,4 @@ export const DatetimeFormat = DatetimeFormatImpl as unknown as {
   }
 }
 
-export const I18nD = DatetimeFormat
+export const I18nD: typeof DatetimeFormat = DatetimeFormat
diff --git a/packages/vue-i18n-core/src/components/NumberFormat.ts b/packages/vue-i18n-core/src/components/NumberFormat.ts
@@ -7,7 +7,7 @@ import { baseFormatProps } from './base'
 import { renderFormatter } from './formatRenderer'
 
 import type { NumberOptions } from '@intlify/core-base'
-import type { VNodeProps } from 'vue'
+import type { SetupContext, VNodeProps } from 'vue'
 import type { Composer, ComposerInternal } from '../composer'
 import type { BaseFormatProps } from './base'
 import type { FormattableProps } from './formatRenderer'
@@ -25,7 +25,7 @@ export type NumberFormatProps = FormattableProps<
 export const NumberFormatImpl = /*#__PURE__*/ defineComponent({
   /* eslint-disable */
   name: 'i18n-n',
-  props: assign(
+  props: /*#__PURE__*/ assign(
     {
       value: {
         type: Number,
@@ -38,8 +38,8 @@ export const NumberFormatImpl = /*#__PURE__*/ defineComponent({
     baseFormatProps
   ),
   /* eslint-enable */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  setup(props: any, context: any): any {
+
+  setup(props: NumberFormatProps, context: SetupContext) {
     const i18n =
       props.i18n ||
       (useI18n({
@@ -53,13 +53,9 @@ export const NumberFormatImpl = /*#__PURE__*/ defineComponent({
       Intl.NumberFormatOptions,
       NumberOptions,
       Intl.NumberFormatPart
-    >(
-      props as NumberFormatProps,
-      context,
-      NUMBER_FORMAT_OPTIONS_KEYS,
-      (...args: unknown[]) =>
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (i18n as any)[NumberPartsSymbol](...args)
+    >(props, context, NUMBER_FORMAT_OPTIONS_KEYS, (...args: unknown[]) =>
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (i18n as any)[NumberPartsSymbol](...args)
     )
   }
 })
@@ -92,4 +88,4 @@ export const NumberFormat = NumberFormatImpl as unknown as {
   }
 }
 
-export const I18nN = NumberFormat
+export const I18nN: typeof NumberFormat = NumberFormat
diff --git a/packages/vue-i18n-core/src/components/Translation.ts b/packages/vue-i18n-core/src/components/Translation.ts
@@ -6,7 +6,7 @@ import { baseFormatProps } from './base'
 import { getFragmentableTag, getInterpolateArg } from './utils'
 
 import type { TranslateOptions } from '@intlify/core-base'
-import type { VNodeChild, VNodeProps } from 'vue'
+import type { SetupContext, VNodeChild, VNodeProps } from 'vue'
 import type { Composer, ComposerInternal } from '../composer'
 import type { BaseFormatProps } from './base'
 
@@ -31,7 +31,7 @@ export interface TranslationProps extends BaseFormatProps {
 export const TranslationImpl = /*#__PURE__*/ defineComponent({
   /* eslint-disable */
   name: 'i18n-t',
-  props: assign(
+  props: /*#__PURE__*/ assign(
     {
       keypath: {
         type: String,
@@ -46,8 +46,7 @@ export const TranslationImpl = /*#__PURE__*/ defineComponent({
     baseFormatProps
   ),
   /* eslint-enable */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  setup(props: any, context: any): any {
+  setup(props: TranslationProps, context: SetupContext) {
     const { slots, attrs } = context
     // NOTE: avoid https://github.com/microsoft/rushstack/issues/1050
     const i18n =
@@ -143,4 +142,4 @@ export const Translation = TranslationImpl as unknown as {
   }
 }
 
-export const I18nT = Translation
+export const I18nT: typeof Translation = Translation
diff --git a/packages/vue-i18n-core/src/components/base.ts b/packages/vue-i18n-core/src/components/base.ts
@@ -48,7 +48,22 @@ export interface BaseFormatProps {
   i18n?: Composer
 }
 
-export const baseFormatProps = {
+export const baseFormatProps: {
+  tag: {
+    type: (StringConstructor | ObjectConstructor)[]
+  }
+  locale: {
+    type: StringConstructor
+  }
+  scope: {
+    type: StringConstructor
+    validator: (val: Exclude<I18nScope, 'local'>) => boolean
+    default: Exclude<I18nScope, 'local'>
+  }
+  i18n: {
+    type: ObjectConstructor
+  }
+} = {
   tag: {
     type: [String, Object]
   },
diff --git a/packages/vue-i18n-core/src/components/utils.ts b/packages/vue-i18n-core/src/components/utils.ts
@@ -2,11 +2,10 @@ import { create } from '@intlify/shared'
 import { Fragment } from 'vue'
 
 import type { NamedValue } from '@intlify/core-base'
-import type { VNode } from 'vue'
+import type { SetupContext, VNode } from 'vue'
 
 export function getInterpolateArg(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  { slots }: any, // SetupContext,
+  { slots }: SetupContext,
   keys: string[]
 ): NamedValue | unknown[] {
   if (keys.length === 1 && keys[0] === 'default') {
diff --git a/packages/vue-i18n-core/src/errors.ts b/packages/vue-i18n-core/src/errors.ts
diff --git a/packages/vue-i18n-core/src/misc.ts b/packages/vue-i18n-core/src/misc.ts
diff --git a/packages/vue-i18n-core/src/symbols.ts b/packages/vue-i18n-core/src/symbols.ts
diff --git a/packages/vue-i18n-core/src/warnings.ts b/packages/vue-i18n-core/src/warnings.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ export default [`
`97`	`97`	`'.eslintrc.cjs',`
`98`	`98`	`'packages/*/index.js',`
`99`	`99`	`'docsgen.config.js',`
	`100`	`+ 'packages/format-explorer/vite.config.ts',`
`100`	`101`	`'scripts/api/*.js'`
`101`	`102`	`]`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ export function datetime<`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`/** @internal */`
`298`		`-export const DATETIME_FORMAT_OPTIONS_KEYS = [`
	`298`	`+export const DATETIME_FORMAT_OPTIONS_KEYS: string[] = [`
`299`	`299`	`'localeMatcher',`
`300`	`300`	`'weekday',`
`301`	`301`	`'era',`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ export function formatMessagePart<Message = string>(`
`163`	`163`
`164`	`164`	`const PROPS_TYPE = ['t', 'type']`
`165`	`165`
`166`		`-export function resolveType(node: Node) {`
	`166`	`+export function resolveType(node: Node): ReturnType<typeof resolveProps> {`
`167`	`167`	`return resolveProps<NodeTypes>(node, PROPS_TYPE)`
`168`	`168`	`}`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ export function number<`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`/** @internal */`
`293`		`-export const NUMBER_FORMAT_OPTIONS_KEYS = [`
	`293`	`+export const NUMBER_FORMAT_OPTIONS_KEYS: string[] = [`
`294`	`294`	`'localeMatcher',`
`295`	`295`	`'style',`
`296`	`296`	`'currency',`
Original file line number	Diff line number	Diff line change
`@@ -241,4 +241,4 @@ export default {`
`241`	`241`	`'editorCursor.foreground': '#AEAFAD',`
`242`	`242`	`'editorWhitespace.foreground': '#4B4E55'`
`243`	`243`	`}`
`244`		`-}`
	`244`	`+} as const`