fix: update typescript version and fix type error (#1277)

* fix: update typescript version and fix type error * fix: update typescript version and fix type error * fix test error and update Snapshot due to the vue version update
intlify · Dec 23, 2022 · 250446b · 250446b
1 parent a1d7259
commit 250446b
Show file tree

Hide file tree

Showing 22 changed files with 344 additions and 298 deletions.
diff --git a/package.json b/package.json
@@ -80,7 +80,6 @@
     "@types/node": "^16.18.8",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
     "@typescript-eslint/parser": "^5.46.0",
-    "@vue/server-renderer": "^3.2.4",
     "algoliasearch": "^4.9.0",
     "api-docs-gen": "^0.4.0",
     "brotli": "^1.3.2",
@@ -133,14 +132,14 @@
     "textlint-rule-write-good": "^2.0.0",
     "trash-cli": "^5.0.0",
     "ts-jest": "^26.5.4",
-    "typescript": "4.2.3",
+    "typescript": "^4.9.4",
     "vitepress": "^1.0.0-alpha.4",
-    "vue": "^3.2.4",
+    "vue": "^3.2.45",
     "vue-i18n": "workspace:*"
   },
   "peerDependencies": {
     "@microsoft/api-extractor": "7.15.2",
-    "typescript": "4.2.3"
+    "typescript": "^4.9.4"
   },
   "engines": {
     "node": ">= 14"
@@ -182,7 +181,7 @@
   "packageManager": "[email protected]",
   "pnpm": {
     "overrides": {
-      "vue": "3.2.20",
+      "vue": "3.2.45",
       "vite": "2.6.14"
     }
   }

diff --git a/packages/core-base/src/context.ts b/packages/core-base/src/context.ts
@@ -61,7 +61,7 @@ export type LocaleMessageType<T, Message = string> = T extends string
     ? LocaleMessageDictionary<P, Message>
     : T extends (...args: infer Arguments) => any
       ? (...args: Arguments) => ReturnType<T>
-      : T extends Record<string, any>
+      : T extends Record<string, unknown>
         ? LocaleMessageDictionary<T, Message>
         : T extends Array<T>
           ? { [K in keyof T]: T[K] }
@@ -107,7 +107,7 @@ export type MessageCompiler<Message = string> = (
 // prettier-ignore
 export interface CoreOptions<
   Message = string,
-  Schema extends 
+  Schema extends
     {
       message?: unknown
       datetime?: unknown

diff --git a/packages/core-base/src/datetime.ts b/packages/core-base/src/datetime.ts
@@ -109,15 +109,15 @@ export interface DateTimeOptions<Key = string, Locales = Locale>
  */
 
 export function datetime<
-  Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Message = string
 >(
   context: Context,
   value: number | string | Date
 ): string | number | Intl.DateTimeFormatPart[]
 
 export function datetime<
-  Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number | string | Date = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -134,7 +134,7 @@ export function datetime<
 ): string | number | Intl.DateTimeFormatPart[]
 
 export function datetime<
-  Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number | string | Date = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -152,7 +152,7 @@ export function datetime<
 ): string | number | Intl.DateTimeFormatPart[]
 
 export function datetime<
-  Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number | string | Date = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -170,7 +170,7 @@ export function datetime<
 ): string | number | Intl.DateTimeFormatPart[]
 
 export function datetime<
-  Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number | string | Date = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -190,7 +190,7 @@ export function datetime<
 
 // implementation of `datetime` function
 export function datetime<
-  Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Message = string
 >(
   context: Context,

diff --git a/packages/core-base/src/number.ts b/packages/core-base/src/number.ts
@@ -107,12 +107,12 @@ export interface NumberOptions<Key = string, Locales = Locale>
  */
 
 export function number<
-  Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Message = string
 >(context: Context, value: number): string | number | Intl.NumberFormatPart[]
 
 export function number<
-  Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -129,7 +129,7 @@ export function number<
 ): string | number | Intl.NumberFormatPart[]
 
 export function number<
-  Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -147,7 +147,7 @@ export function number<
 ): string | number | Intl.NumberFormatPart[]
 
 export function number<
-  Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -165,7 +165,7 @@ export function number<
 ): string | number | Intl.NumberFormatPart[]
 
 export function number<
-  Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Value extends number = number,
   Key extends string = string,
   ResourceKeys extends PickupFormatKeys<
@@ -185,7 +185,7 @@ export function number<
 
 // implementation of `number` function
 export function number<
-  Context extends CoreContext<Message, {}, {}, Context['numberFormats']>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Message = string
 >(
   context: Context,

diff --git a/packages/core-base/src/runtime.ts b/packages/core-base/src/runtime.ts
@@ -136,7 +136,7 @@ function pluralDefault(choice: number, choicesLength: number): number {
   return choice ? Math.min(choice, 2) : 0
 }
 
-function getPluralIndex<T>(options: MessageContextOptions<T>): number {
+function getPluralIndex<T, N>(options: MessageContextOptions<T, N>): number {
   // prettier-ignore
   const index = isNumber(options.pluralIndex)
 	  ? options.pluralIndex
@@ -164,7 +164,6 @@ export function createMessageContext<T = string, N = {}>(
   options: MessageContextOptions<T, N> = {}
 ): MessageContext<T> {
   const locale = options.locale
-
   const pluralIndex = getPluralIndex(options)
   const pluralRule =
     isObject(options.pluralRules) &&

diff --git a/packages/core-base/src/translate.ts b/packages/core-base/src/translate.ts
@@ -158,7 +158,7 @@ export interface TranslateOptions<Locales = Locale> {
  */
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -170,7 +170,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -183,7 +183,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -197,7 +197,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -210,7 +210,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -224,7 +224,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -237,7 +237,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -251,7 +251,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -265,7 +265,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -279,7 +279,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -292,7 +292,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -306,7 +306,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -320,7 +320,7 @@ export function translate<
 ): MessageType<Message> | number
 
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Key extends string = string,
   ResourceKeys extends PickupKeys<Context['messages']> = PickupKeys<
     Context['messages']
@@ -335,7 +335,7 @@ export function translate<
 
 // implementation of `translate` function
 export function translate<
-  Context extends CoreContext<Message, Context['messages'], {}, {}>,
+  Context extends CoreContext<Message, {}, {}, {}>,
   Message = string
 >(context: Context, ...args: unknown[]): MessageType<Message> | number {
   const {

diff --git a/packages/shared/src/utils.ts b/packages/shared/src/utils.ts
@@ -14,14 +14,18 @@ export let measure: (
 
 if (__DEV__) {
   const perf = inBrowser && window.performance
+
   if (
     perf &&
     perf.mark &&
     perf.measure &&
     perf.clearMarks &&
+    // @ts-ignore browser compat
     perf.clearMeasures
   ) {
-    mark = (tag: string): void => perf.mark(tag)
+    mark = (tag: string): void => {
+      perf.mark(tag)
+    }
     measure = (name: string, startTag: string, endTag: string): void => {
       perf.measure(name, startTag, endTag)
       perf.clearMarks(startTag)

diff --git a/packages/vue-i18n-core/src/components/DatetimeFormat.ts b/packages/vue-i18n-core/src/components/DatetimeFormat.ts
@@ -57,8 +57,10 @@ export const DatetimeFormat = /* #__PURE__*/ /*defineComponent */ {
   setup(props: any, context: any): any {
     const i18n =
       props.i18n ||
-      (useI18n({ useScope: 'parent', __useComponent: true }) as Composer &
-        ComposerInternal)
+      (useI18n({
+        useScope: 'parent',
+        __useComponent: true
+      }) as unknown as Composer & ComposerInternal)
 
     return renderFormatter<
       FormattableProps<number | Date, Intl.DateTimeFormatOptions>,

diff --git a/packages/vue-i18n-core/src/components/NumberFormat.ts b/packages/vue-i18n-core/src/components/NumberFormat.ts
@@ -56,8 +56,10 @@ export const NumberFormat = /* #__PURE__*/ /* defineComponent */ {
   setup(props: any, context: any): any {
     const i18n =
       props.i18n ||
-      (useI18n({ useScope: 'parent', __useComponent: true }) as Composer &
-        ComposerInternal)
+      (useI18n({
+        useScope: 'parent',
+        __useComponent: true
+      }) as unknown as Composer & ComposerInternal)
 
     return renderFormatter<
       FormattableProps<number, Intl.NumberFormatOptions>,

diff --git a/packages/vue-i18n-core/src/components/Translation.ts b/packages/vue-i18n-core/src/components/Translation.ts
@@ -105,7 +105,7 @@ export const Translation = /* #__PURE__*/ /* defineComponent */ {
       (useI18n({
         useScope: props.scope as 'global' | 'parent',
         __useComponent: true
-      }) as Composer & ComposerInternal)
+      }) as unknown as Composer & ComposerInternal)
 
     return (): VNodeChild => {
       const keys = Object.keys(slots).filter(key => key !== '_')