From c01cc589d1faa4df9b73b69685d2b8a0831cf07d Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Thu, 3 Jul 2025 16:29:38 +0900 Subject: [PATCH] Revert "fix: typo (#2221)" This reverts commit 80ba5c9487c9f5cf00ec1fdbd90427516992d5a6. --- 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 | 17 ++++++++--------- packages/core-base/test/number.test.ts | 17 ++++++++--------- packages/core-base/test/translate.test.ts | 6 +++--- packages/vue-i18n-core/src/composer.ts | 4 ++-- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/packages/core-base/src/context.ts b/packages/core-base/src/context.ts index 2320709d7..dcfe923f3 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_RESOLVED = -1 +export const NOT_REOSLVED = -1 export const DEFAULT_LOCALE = 'en-US' diff --git a/packages/core-base/src/datetime.ts b/packages/core-base/src/datetime.ts index 8c2534dad..9bd98f4c4 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_RESOLVED + NOT_REOSLVED } 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_RESOLVED : key + return unresolving ? NOT_REOSLVED : key } let id = `${targetLocale}__${key}` diff --git a/packages/core-base/src/number.ts b/packages/core-base/src/number.ts index 9fe2ccfc5..fb70d60b8 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_RESOLVED + NOT_REOSLVED } 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_RESOLVED : key + return unresolving ? NOT_REOSLVED : key } let id = `${targetLocale}__${key}` diff --git a/packages/core-base/src/translate.ts b/packages/core-base/src/translate.ts index 581be0655..bf3e8b4b7 100644 --- a/packages/core-base/src/translate.ts +++ b/packages/core-base/src/translate.ts @@ -25,7 +25,7 @@ import { isAlmostSameLocale, isImplicitFallback, isTranslateFallbackWarn, - NOT_RESOLVED + NOT_REOSLVED } from './context' import { translateDevTools } from './devtools' import { CoreErrorCodes, createCoreError } from './errors' @@ -713,7 +713,7 @@ export function translate< ) || !isString(targetLocale)) ) { - return unresolving ? NOT_RESOLVED : (key as MessageFunctionReturn) + return unresolving ? NOT_REOSLVED : (key as MessageFunctionReturn) } // TODO: refactor diff --git a/packages/core-base/test/datetime.test.ts b/packages/core-base/test/datetime.test.ts index 5f5d62b61..1190f0d5a 100644 --- a/packages/core-base/test/datetime.test.ts +++ b/packages/core-base/test/datetime.test.ts @@ -20,15 +20,14 @@ vi.mock('../src/intl', async () => { } }) -import { compile } from '../src/compilation' -import { - createCoreContext as context, - NOT_RESOLVED, - registerLocaleFallbacker, - registerMessageCompiler -} from '../src/context' +import { createCoreContext as context, NOT_REOSLVED } from '../src/context' import { datetime } from '../src/datetime' import { CoreErrorCodes, errorMessages } from '../src/errors' +import { + registerMessageCompiler, + registerLocaleFallbacker +} from '../src/context' +import { compile } from '../src/compilation' import { fallbackWithLocaleChain } from '../src/fallbacker' import type { DateTimeFormats } from '../src/types' @@ -266,7 +265,7 @@ describe('context unresolving option', () => { datetimeFormats }) - expect(datetime(ctx, dt, 'long')).toEqual(NOT_RESOLVED) + expect(datetime(ctx, dt, 'long')).toEqual(NOT_REOSLVED) expect(mockWarn).not.toHaveBeenCalled() }) @@ -285,7 +284,7 @@ describe('context unresolving option', () => { datetimeFormats }) - expect(datetime(ctx, dt, 'custom')).toEqual(NOT_RESOLVED) + expect(datetime(ctx, dt, 'custom')).toEqual(NOT_REOSLVED) expect(mockWarn).not.toHaveBeenCalled() }) }) diff --git a/packages/core-base/test/number.test.ts b/packages/core-base/test/number.test.ts index f670fd6cb..8fb7207e5 100644 --- a/packages/core-base/test/number.test.ts +++ b/packages/core-base/test/number.test.ts @@ -20,16 +20,15 @@ vi.mock('../src/intl', async () => { } }) -import { compile } from '../src/compilation' +import { createCoreContext as context, NOT_REOSLVED } from '../src/context' +import { number } from '../src/number' +import { CoreErrorCodes, errorMessages } from '../src/errors' import { - createCoreContext as context, - NOT_RESOLVED, - registerLocaleFallbacker, - registerMessageCompiler + registerMessageCompiler, + registerLocaleFallbacker } from '../src/context' -import { CoreErrorCodes, errorMessages } from '../src/errors' +import { compile } from '../src/compilation' import { fallbackWithLocaleChain } from '../src/fallbacker' -import { number } from '../src/number' import { NumberFormats } from '../src/types/index' type MyNumberSchema = { @@ -239,7 +238,7 @@ describe('context unresolving option', () => { numberFormats }) - expect(number(ctx, 0.99, 'percent')).toEqual(NOT_RESOLVED) + expect(number(ctx, 0.99, 'percent')).toEqual(NOT_REOSLVED) expect(mockWarn).not.toHaveBeenCalled() }) @@ -258,7 +257,7 @@ describe('context unresolving option', () => { numberFormats }) - expect(number(ctx, 123456789, 'custom')).toEqual(NOT_RESOLVED) + expect(number(ctx, 123456789, 'custom')).toEqual(NOT_REOSLVED) expect(mockWarn).not.toHaveBeenCalled() }) }) diff --git a/packages/core-base/test/translate.test.ts b/packages/core-base/test/translate.test.ts index 48e6b3cfc..027172685 100644 --- a/packages/core-base/test/translate.test.ts +++ b/packages/core-base/test/translate.test.ts @@ -16,7 +16,7 @@ vi.mock('@intlify/shared', async () => { import { compile } from '../src/compilation' import { createCoreContext as context, - NOT_RESOLVED, + NOT_REOSLVED, registerLocaleFallbacker, registerMessageCompiler, registerMessageResolver @@ -553,7 +553,7 @@ describe('context unresolving option', () => { ja: {} } }) - expect(translate(ctx, 'hello.world')).toEqual(NOT_RESOLVED) + expect(translate(ctx, 'hello.world')).toEqual(NOT_REOSLVED) }) test('fallbackWarn is false', () => { @@ -568,7 +568,7 @@ describe('context unresolving option', () => { ja: {} } }) - expect(translate(ctx, 'hello.world')).toEqual(NOT_RESOLVED) + expect(translate(ctx, 'hello.world')).toEqual(NOT_REOSLVED) }) test('fallbackFormat is true', () => { diff --git a/packages/vue-i18n-core/src/composer.ts b/packages/vue-i18n-core/src/composer.ts index 585ddf6ab..f84e85b7e 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_RESOLVED, + NOT_REOSLVED, 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_RESOLVED) || + ret === NOT_REOSLVED) || (warnType === 'translate exists' && !ret) // for `te` ) { const [key, arg2] = argumentParser()