From 5a8ff33234155606e37a9f76471e8f3f0bc4018c Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Wed, 2 Jul 2025 23:37:19 +0900 Subject: [PATCH 1/2] fix: typo --- packages/core-base/src/context.ts | 2 +- packages/core-base/src/datetime.ts | 4 ++-- packages/core-base/src/number.ts | 4 ++-- packages/core-base/src/translate.ts | 4 ++-- packages/core-base/test/datetime.test.ts | 16 ++++++++-------- packages/core-base/test/number.test.ts | 16 ++++++++-------- packages/core-base/test/translate.test.ts | 5 ++--- packages/vue-i18n-core/src/composer.ts | 4 ++-- 8 files changed, 27 insertions(+), 28 deletions(-) diff --git a/packages/core-base/src/context.ts b/packages/core-base/src/context.ts index dcfe923f3..2320709d7 100644 --- a/packages/core-base/src/context.ts +++ b/packages/core-base/src/context.ts @@ -335,7 +335,7 @@ export interface CoreInternalContext { */ export const VERSION = __VERSION__ -export const NOT_REOSLVED = -1 +export const NOT_RESOLVED = -1 export const DEFAULT_LOCALE = 'en-US' diff --git a/packages/core-base/src/datetime.ts b/packages/core-base/src/datetime.ts index 9bd98f4c4..8c2534dad 100644 --- a/packages/core-base/src/datetime.ts +++ b/packages/core-base/src/datetime.ts @@ -12,7 +12,7 @@ import { handleMissing, isTranslateFallbackWarn, MISSING_RESOLVE_VALUE, - NOT_REOSLVED + NOT_RESOLVED } from './context' import { CoreErrorCodes, createCoreError } from './errors' import { getLocale } from './fallbacker' @@ -275,7 +275,7 @@ export function datetime< // checking format and target locale if (!isPlainObject(format) || !isString(targetLocale)) { - return unresolving ? NOT_REOSLVED : key + return unresolving ? NOT_RESOLVED : key } let id = `${targetLocale}__${key}` diff --git a/packages/core-base/src/number.ts b/packages/core-base/src/number.ts index fb70d60b8..9fe2ccfc5 100644 --- a/packages/core-base/src/number.ts +++ b/packages/core-base/src/number.ts @@ -11,7 +11,7 @@ import { handleMissing, isTranslateFallbackWarn, MISSING_RESOLVE_VALUE, - NOT_REOSLVED + NOT_RESOLVED } from './context' import { CoreErrorCodes, createCoreError } from './errors' import { getLocale } from './fallbacker' @@ -270,7 +270,7 @@ export function number< // checking format and target locale if (!isPlainObject(format) || !isString(targetLocale)) { - return unresolving ? NOT_REOSLVED : key + return unresolving ? NOT_RESOLVED : key } let id = `${targetLocale}__${key}` diff --git a/packages/core-base/src/translate.ts b/packages/core-base/src/translate.ts index bf3e8b4b7..581be0655 100644 --- a/packages/core-base/src/translate.ts +++ b/packages/core-base/src/translate.ts @@ -25,7 +25,7 @@ import { isAlmostSameLocale, isImplicitFallback, isTranslateFallbackWarn, - NOT_REOSLVED + NOT_RESOLVED } from './context' import { translateDevTools } from './devtools' import { CoreErrorCodes, createCoreError } from './errors' @@ -713,7 +713,7 @@ export function translate< ) || !isString(targetLocale)) ) { - return unresolving ? NOT_REOSLVED : (key as MessageFunctionReturn) + return unresolving ? NOT_RESOLVED : (key as MessageFunctionReturn) } // TODO: refactor diff --git a/packages/core-base/test/datetime.test.ts b/packages/core-base/test/datetime.test.ts index 1190f0d5a..ac5291f29 100644 --- a/packages/core-base/test/datetime.test.ts +++ b/packages/core-base/test/datetime.test.ts @@ -20,14 +20,14 @@ vi.mock('../src/intl', async () => { } }) -import { createCoreContext as context, NOT_REOSLVED } from '../src/context' -import { datetime } from '../src/datetime' -import { CoreErrorCodes, errorMessages } from '../src/errors' +import { compile } from '../src/compilation' import { - registerMessageCompiler, - registerLocaleFallbacker + createCoreContext as context, + registerLocaleFallbacker, + registerMessageCompiler } from '../src/context' -import { compile } from '../src/compilation' +import { datetime } from '../src/datetime' +import { CoreErrorCodes, errorMessages } from '../src/errors' import { fallbackWithLocaleChain } from '../src/fallbacker' import type { DateTimeFormats } from '../src/types' @@ -265,7 +265,7 @@ describe('context unresolving option', () => { datetimeFormats }) - expect(datetime(ctx, dt, 'long')).toEqual(NOT_REOSLVED) + expect(datetime(ctx, dt, 'long')).toEqual(NOT_RESOLVED) expect(mockWarn).not.toHaveBeenCalled() }) @@ -284,7 +284,7 @@ describe('context unresolving option', () => { datetimeFormats }) - expect(datetime(ctx, dt, 'custom')).toEqual(NOT_REOSLVED) + expect(datetime(ctx, dt, 'custom')).toEqual(NOT_RESOLVED) expect(mockWarn).not.toHaveBeenCalled() }) }) diff --git a/packages/core-base/test/number.test.ts b/packages/core-base/test/number.test.ts index 8fb7207e5..75e1ffaa9 100644 --- a/packages/core-base/test/number.test.ts +++ b/packages/core-base/test/number.test.ts @@ -20,15 +20,15 @@ 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, + registerLocaleFallbacker, + registerMessageCompiler } from '../src/context' -import { compile } from '../src/compilation' +import { CoreErrorCodes, errorMessages } from '../src/errors' import { fallbackWithLocaleChain } from '../src/fallbacker' +import { number } from '../src/number' import { NumberFormats } from '../src/types/index' type MyNumberSchema = { @@ -238,7 +238,7 @@ describe('context unresolving option', () => { numberFormats }) - expect(number(ctx, 0.99, 'percent')).toEqual(NOT_REOSLVED) + expect(number(ctx, 0.99, 'percent')).toEqual(NOT_RESOLVED) expect(mockWarn).not.toHaveBeenCalled() }) @@ -257,7 +257,7 @@ describe('context unresolving option', () => { numberFormats }) - expect(number(ctx, 123456789, 'custom')).toEqual(NOT_REOSLVED) + expect(number(ctx, 123456789, 'custom')).toEqual(NOT_RESOLVED) expect(mockWarn).not.toHaveBeenCalled() }) }) diff --git a/packages/core-base/test/translate.test.ts b/packages/core-base/test/translate.test.ts index 027172685..a3af28c9a 100644 --- a/packages/core-base/test/translate.test.ts +++ b/packages/core-base/test/translate.test.ts @@ -16,7 +16,6 @@ vi.mock('@intlify/shared', async () => { import { compile } from '../src/compilation' import { createCoreContext as context, - NOT_REOSLVED, registerLocaleFallbacker, registerMessageCompiler, registerMessageResolver @@ -553,7 +552,7 @@ describe('context unresolving option', () => { ja: {} } }) - expect(translate(ctx, 'hello.world')).toEqual(NOT_REOSLVED) + expect(translate(ctx, 'hello.world')).toEqual(NOT_RESOLVED) }) test('fallbackWarn is false', () => { @@ -568,7 +567,7 @@ describe('context unresolving option', () => { ja: {} } }) - expect(translate(ctx, 'hello.world')).toEqual(NOT_REOSLVED) + expect(translate(ctx, 'hello.world')).toEqual(NOT_RESOLVED) }) test('fallbackFormat is true', () => { diff --git a/packages/vue-i18n-core/src/composer.ts b/packages/vue-i18n-core/src/composer.ts index f84e85b7e..585ddf6ab 100644 --- a/packages/vue-i18n-core/src/composer.ts +++ b/packages/vue-i18n-core/src/composer.ts @@ -3,7 +3,7 @@ import { DEFAULT_LOCALE, MISSING_RESOLVE_VALUE, MessageFunction, - NOT_REOSLVED, + NOT_RESOLVED, clearDateTimeFormat, clearNumberFormat, createCoreContext, @@ -2234,7 +2234,7 @@ export function createComposer(options: any = {}): any { if ( (warnType !== 'translate exists' && // for not `te` (e.g `t`) isNumber(ret) && - ret === NOT_REOSLVED) || + ret === NOT_RESOLVED) || (warnType === 'translate exists' && !ret) // for `te` ) { const [key, arg2] = argumentParser() From 62b6b1d16a7e254cfb2162340bce9c9a1eefbef2 Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Wed, 2 Jul 2025 23:47:58 +0900 Subject: [PATCH 2/2] fix: tests --- packages/core-base/test/datetime.test.ts | 1 + packages/core-base/test/number.test.ts | 1 + packages/core-base/test/translate.test.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/core-base/test/datetime.test.ts b/packages/core-base/test/datetime.test.ts index ac5291f29..5f5d62b61 100644 --- a/packages/core-base/test/datetime.test.ts +++ b/packages/core-base/test/datetime.test.ts @@ -23,6 +23,7 @@ vi.mock('../src/intl', async () => { import { compile } from '../src/compilation' import { createCoreContext as context, + NOT_RESOLVED, registerLocaleFallbacker, registerMessageCompiler } from '../src/context' diff --git a/packages/core-base/test/number.test.ts b/packages/core-base/test/number.test.ts index 75e1ffaa9..f670fd6cb 100644 --- a/packages/core-base/test/number.test.ts +++ b/packages/core-base/test/number.test.ts @@ -23,6 +23,7 @@ vi.mock('../src/intl', async () => { import { compile } from '../src/compilation' import { createCoreContext as context, + NOT_RESOLVED, registerLocaleFallbacker, registerMessageCompiler } from '../src/context' diff --git a/packages/core-base/test/translate.test.ts b/packages/core-base/test/translate.test.ts index a3af28c9a..48e6b3cfc 100644 --- a/packages/core-base/test/translate.test.ts +++ b/packages/core-base/test/translate.test.ts @@ -16,6 +16,7 @@ vi.mock('@intlify/shared', async () => { import { compile } from '../src/compilation' import { createCoreContext as context, + NOT_RESOLVED, registerLocaleFallbacker, registerMessageCompiler, registerMessageResolver