Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
@kazupon
kazupon committed Jul 14, 2021
1 parent f371ec0 commit e4b1d37
Show file tree
Hide file tree
Showing 16 changed files with 112 additions and 133 deletions.
15 changes: 5 additions & 10 deletions docs-old/.vuepress/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,11 @@ module.exports = {
items: [
{
text: 'BabelEdit',
link:
'https://www.codeandweb.com/babeledit?utm_campaign=vue-i18n-2019-01'
link: 'https://www.codeandweb.com/babeledit?utm_campaign=vue-i18n-2019-01'
},
{
text: 'i18n Ally',
link:
'https://marketplace.visualstudio.com/items?itemName=antfu.i18n-ally'
link: 'https://marketplace.visualstudio.com/items?itemName=antfu.i18n-ally'
}
]
}
Expand Down Expand Up @@ -163,8 +161,7 @@ module.exports = {
items: [
{
text: 'BabelEdit',
link:
'https://www.codeandweb.com/babeledit?utm_campaign=vue-i18n-2019-01'
link: 'https://www.codeandweb.com/babeledit?utm_campaign=vue-i18n-2019-01'
}
]
}
Expand Down Expand Up @@ -253,13 +250,11 @@ module.exports = {
items: [
{
text: 'BabelEdit',
link:
'https://www.codeandweb.com/babeledit?utm_campaign=vue-i18n-2019-01'
link: 'https://www.codeandweb.com/babeledit?utm_campaign=vue-i18n-2019-01'
},
{
text: 'i18n Ally',
link:
'https://marketplace.visualstudio.com/items?itemName=antfu.i18n-ally'
link: 'https://marketplace.visualstudio.com/items?itemName=antfu.i18n-ally'
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions packages/core-base/src/context.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ export function createCoreContext<Message = string>(options: any = {}): any {

// for vue-devtools timeline event
if (__DEV__) {
;((context as unknown) as CoreInternalContext).__v_emitter =
;(context as unknown as CoreInternalContext).__v_emitter =
internalOptions.__v_emitter != null
? internalOptions.__v_emitter
: undefined
Expand Down Expand Up @@ -457,7 +457,7 @@ export function handleMissing<Message = string>(

// for vue-devtools timeline event
if (__DEV__) {
const emitter = ((context as unknown) as CoreInternalContext).__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter) {
emitter.emit(VueDevToolsTimelineEvents.MISSING, {
locale,
Expand Down Expand Up @@ -485,7 +485,7 @@ export function getLocaleChain<Message = string>(
fallback: FallbackLocale,
start: Locale
): Locale[] {
const context = (ctx as unknown) as CoreInternalContext
const context = ctx as unknown as CoreInternalContext

if (!context.__localeChainCache) {
context.__localeChainCache = new Map()
Expand Down Expand Up @@ -582,7 +582,7 @@ export function updateFallbackLocale<Message = string>(
locale: Locale,
fallback: FallbackLocale
): void {
const context = (ctx as unknown) as CoreInternalContext
const context = ctx as unknown as CoreInternalContext
context.__localeChainCache = new Map()
getLocaleChain<Message>(ctx, fallback, locale)
}
Expand Down
8 changes: 4 additions & 4 deletions packages/core-base/src/datetime.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export function datetime<
...args: unknown[]
): string | number | Intl.DateTimeFormatPart[] {
const { datetimeFormats, unresolving, fallbackLocale, onWarn } = context
const { __datetimeFormatters } = (context as unknown) as CoreInternalContext
const { __datetimeFormatters } = context as unknown as CoreInternalContext

if (__DEV__ && !Availabilities.dateTimeFormat) {
onWarn(getWarnMessage(CoreWarnCodes.CANNOT_FORMAT_DATE))
Expand Down Expand Up @@ -248,7 +248,7 @@ export function datetime<

// for vue-devtools timeline event
if (__DEV__ && locale !== targetLocale) {
const emitter = ((context as unknown) as CoreInternalContext).__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter) {
emitter.emit(VueDevToolsTimelineEvents.FALBACK, {
type,
Expand All @@ -261,7 +261,7 @@ export function datetime<
}

datetimeFormat =
((datetimeFormats as unknown) as DateTimeFormatsType)[targetLocale] || {}
(datetimeFormats as unknown as DateTimeFormatsType)[targetLocale] || {}
format = datetimeFormat[key]

if (isPlainObject(format)) break
Expand Down Expand Up @@ -357,7 +357,7 @@ export function clearDateTimeFormat<DateTimeFormats = {}, Message = string>(
locale: Locale,
format: DateTimeFormat
): void {
const context = (ctx as unknown) as CoreInternalContext
const context = ctx as unknown as CoreInternalContext
for (const key in format) {
const id = `${locale}__${key}`
if (!context.__datetimeFormatters.has(id)) {
Expand Down
8 changes: 4 additions & 4 deletions packages/core-base/src/number.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export function number<
...args: unknown[]
): string | number | Intl.NumberFormatPart[] {
const { numberFormats, unresolving, fallbackLocale, onWarn } = context
const { __numberFormatters } = (context as unknown) as CoreInternalContext
const { __numberFormatters } = context as unknown as CoreInternalContext

if (__DEV__ && !Availabilities.numberFormat) {
onWarn(getWarnMessage(CoreWarnCodes.CANNOT_FORMAT_NUMBER))
Expand Down Expand Up @@ -243,7 +243,7 @@ export function number<

// for vue-devtools timeline event
if (__DEV__ && locale !== targetLocale) {
const emitter = ((context as unknown) as CoreInternalContext).__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter) {
emitter.emit(VueDevToolsTimelineEvents.FALBACK, {
type,
Expand All @@ -256,7 +256,7 @@ export function number<
}

numberFormat =
((numberFormats as unknown) as NumberFormatsType)[targetLocale] || {}
(numberFormats as unknown as NumberFormatsType)[targetLocale] || {}

format = numberFormat[key]
if (isPlainObject(format)) break
Expand Down Expand Up @@ -323,7 +323,7 @@ export function clearNumberFormat<NumberFormats, Message = string>(
locale: Locale,
format: NumberFormat
): void {
const context = (ctx as unknown) as CoreInternalContext
const context = ctx as unknown as CoreInternalContext
for (const key in format) {
const id = `${locale}__${key}`
if (!context.__numberFormatters.has(id)) {
Expand Down
21 changes: 10 additions & 11 deletions packages/core-base/src/translate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ export function translate<
: [
key,
locale,
((messages as unknown) as LocaleMessages<Message>)[locale] || {}
(messages as unknown as LocaleMessages<Message>)[locale] || {}
]

// if you use default message, set it as message format!
Expand Down Expand Up @@ -492,7 +492,7 @@ export function translate<
}
;(payloads as AdditionalPayloads).meta = assign(
{},
((context as unknown) as CoreInternalContext).__meta,
(context as unknown as CoreInternalContext).__meta,
getAdditionalMeta() || {}
)
translateDevTools(payloads)
Expand Down Expand Up @@ -551,7 +551,7 @@ function resolveMessageFormat<Messages, Message>(

// for vue-devtools timeline event
if (__DEV__ && locale !== targetLocale) {
const emitter = ((context as unknown) as CoreInternalContext).__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter) {
emitter.emit(VueDevToolsTimelineEvents.FALBACK, {
type,
Expand All @@ -564,7 +564,7 @@ function resolveMessageFormat<Messages, Message>(
}

message =
((messages as unknown) as LocaleMessages<Message>)[targetLocale] || {}
(messages as unknown as LocaleMessages<Message>)[targetLocale] || {}

// for vue-devtools timeline event
let start: number | null = null
Expand All @@ -585,7 +585,7 @@ function resolveMessageFormat<Messages, Message>(
// for vue-devtools timeline event
if (__DEV__ && inBrowser) {
const end = window.performance.now()
const emitter = ((context as unknown) as CoreInternalContext).__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter && start && format) {
emitter.emit(VueDevToolsTimelineEvents.MESSAGE_RESOLVE, {
type: VueDevToolsTimelineEvents.MESSAGE_RESOLVE,
Expand Down Expand Up @@ -661,7 +661,7 @@ function compileMessageFormat<Messages, Message>(
// for vue-devtools timeline event
if (__DEV__ && inBrowser) {
const end = window.performance.now()
const emitter = ((context as unknown) as CoreInternalContext).__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter && start) {
emitter.emit(VueDevToolsTimelineEvents.MESSAGE_COMPILATION, {
type: VueDevToolsTimelineEvents.MESSAGE_COMPILATION,
Expand Down Expand Up @@ -704,7 +704,7 @@ function evaluateMessage<Messages, Message>(
// for vue-devtools timeline event
if (__DEV__ && inBrowser) {
const end = window.performance.now()
const emitter = ((context as unknown) as CoreInternalContext).__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter && start) {
emitter.emit(VueDevToolsTimelineEvents.MESSAGE_EVALUATION, {
type: VueDevToolsTimelineEvents.MESSAGE_EVALUATION,
Expand Down Expand Up @@ -782,8 +782,7 @@ function getCompileOptions<Messages, Message>(
err.location.start.offset,
err.location.end.offset
)
const emitter = ((context as unknown) as CoreInternalContext)
.__v_emitter
const emitter = (context as unknown as CoreInternalContext).__v_emitter
if (emitter) {
emitter.emit(VueDevToolsTimelineEvents.COMPILE_ERROR, {
message: source,
Expand Down Expand Up @@ -818,14 +817,14 @@ function getMessageContextOptions<Messages, Message = string>(
const errorDetector = () => {
occurred = true
}
const msg = (compileMessageFormat<Messages, Message>(
const msg = compileMessageFormat<Messages, Message>(
context,
key,
locale,
val,
key,
errorDetector
) as unknown) as MessageFunction<Message>
) as unknown as MessageFunction<Message>
return !occurred
? msg
: (NOOP_MESSAGE_FUNCTION as MessageFunction<Message>)
Expand Down
3 changes: 2 additions & 1 deletion packages/devtools-if/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export type AdditionalPayloads = {
meta?: Record<string, unknown>
}

export type IntlifyDevToolsHooks = typeof IntlifyDevToolsHooks[keyof typeof IntlifyDevToolsHooks]
export type IntlifyDevToolsHooks =
typeof IntlifyDevToolsHooks[keyof typeof IntlifyDevToolsHooks]

export type IntlifyDevToolsHookPayloads = {
[IntlifyDevToolsHooks.I18nInit]: {
Expand Down
3 changes: 2 additions & 1 deletion packages/message-compiler/src/errors.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ export const CompileErrorCodes = {
__EXTEND_POINT__: 15
} as const

export type CompileErrorCodes = typeof CompileErrorCodes[keyof typeof CompileErrorCodes]
export type CompileErrorCodes =
typeof CompileErrorCodes[keyof typeof CompileErrorCodes]

/** @internal */
export const errorMessages: { [code: number]: string } = {
Expand Down
8 changes: 2 additions & 6 deletions packages/message-compiler/src/parser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,7 @@ export function createParser(options: ParserOptions = {}): Parser {
return node
}

function parseLinkedModifier(
tokenizer: Tokenizer
): {
function parseLinkedModifier(tokenizer: Tokenizer): {
nextConsumeToken?: Token
node: LinkedModifierNode
} {
Expand Down Expand Up @@ -272,9 +270,7 @@ export function createParser(options: ParserOptions = {}): Parser {
return node
}

function parseLinked(
tokenizer: Tokenizer
): {
function parseLinked(tokenizer: Tokenizer): {
nextConsumeToken?: Token
node: LinkedNode
} {
Expand Down
8 changes: 4 additions & 4 deletions packages/runtime/src/context.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,25 +177,25 @@ export function createMessageContext<T = string, N = {}>(
return !msg
? options.parent
? options.parent.message(key) // resolve from parent messages
: ((DEFAULT_MESSAGE as unknown) as MessageFunction<T>)
: (DEFAULT_MESSAGE as unknown as MessageFunction<T>)
: msg
}

const _modifier = (name: string): LinkedModify<T> =>
options.modifiers
? options.modifiers[name]
: ((DEFAULT_MODIFIER as unknown) as LinkedModify<T>)
: (DEFAULT_MODIFIER as unknown as LinkedModify<T>)

const normalize =
isPlainObject(options.processor) && isFunction(options.processor.normalize)
? options.processor.normalize
: ((DEFAULT_NORMALIZE as unknown) as MessageNormalize<T>)
: (DEFAULT_NORMALIZE as unknown as MessageNormalize<T>)

const interpolate =
isPlainObject(options.processor) &&
isFunction(options.processor.interpolate)
? options.processor.interpolate
: ((DEFAULT_INTERPOLATE as unknown) as MessageInterpolate<T>)
: (DEFAULT_INTERPOLATE as unknown as MessageInterpolate<T>)

const type =
isPlainObject(options.processor) && isString(options.processor.type)
Expand Down
17 changes: 8 additions & 9 deletions packages/vue-i18n/src/composer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1949,13 +1949,13 @@ export function createComposer(options: any = {}): any {
escapeParameter: _escapeParameter,
messageResolver: options.messageResolver,
__datetimeFormatters: isPlainObject(_context)
? ((_context as unknown) as CoreInternalContext).__datetimeFormatters
? (_context as unknown as CoreInternalContext).__datetimeFormatters
: undefined,
__numberFormatters: isPlainObject(_context)
? ((_context as unknown) as CoreInternalContext).__numberFormatters
? (_context as unknown as CoreInternalContext).__numberFormatters
: undefined,
__v_emitter: isPlainObject(_context)
? ((_context as unknown) as CoreInternalContext).__v_emitter
? (_context as unknown as CoreInternalContext).__v_emitter
: undefined,
__meta: { framework: 'vue' }
}
Expand Down Expand Up @@ -2085,9 +2085,8 @@ export function createComposer(options: any = {}): any {
}
// for vue-devtools timeline event
if (__DEV__) {
const {
__v_emitter: emitter
} = (_context as unknown) as CoreInternalContext
const { __v_emitter: emitter } =
_context as unknown as CoreInternalContext
if (emitter && _fallbackRoot) {
emitter.emit(VueDevToolsTimelineEvents.FALBACK, {
type: warnType,
Expand All @@ -2099,7 +2098,7 @@ export function createComposer(options: any = {}): any {
}
}
return __root && _fallbackRoot
? fallbackSuccess((__root as unknown) as Composer<T> & ComposerInternal)
? fallbackSuccess(__root as unknown as Composer<T> & ComposerInternal)
: fallbackFail(key)
} else if (successCondition(ret)) {
return ret as U
Expand Down Expand Up @@ -2451,11 +2450,11 @@ export function createComposer(options: any = {}): any {
if (__DEV__) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(composer as any)[EnableEmitter] = (emitter: VueDevToolsEmitter): void => {
;((_context as unknown) as CoreInternalContext).__v_emitter = emitter
;(_context as unknown as CoreInternalContext).__v_emitter = emitter
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(composer as any)[DisableEmitter] = (): void => {
;((_context as unknown) as CoreInternalContext).__v_emitter = undefined
;(_context as unknown as CoreInternalContext).__v_emitter = undefined
}
}

Expand Down
10 changes: 5 additions & 5 deletions packages/vue-i18n/src/devtools.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export async function enableDevTools(app: App, i18n: _I18n): Promise<boolean> {
// ignore global scope on legacy mode
if (
componentInstance.vnode.el.__VUE_I18N__ !==
((i18n.global as unknown) as VueI18nInternal).__composer
(i18n.global as unknown as VueI18nInternal).__composer
) {
inspectComposer(
instanceData,
Expand Down Expand Up @@ -315,16 +315,16 @@ function getComponentInstance(
function getComposer(nodeId: string, i18n: _I18n): Composer | null {
if (nodeId === 'global') {
return i18n.mode === 'composition'
? ((i18n.global as unknown) as Composer)
: ((i18n.global as unknown) as VueI18nInternal).__composer
? (i18n.global as unknown as Composer)
: (i18n.global as unknown as VueI18nInternal).__composer
} else {
const instance = Array.from(i18n.__instances.values()).find(
item => item.id.toString() === nodeId
)
if (instance) {
return i18n.mode === 'composition'
? ((instance as unknown) as Composer)
: ((instance as unknown) as VueI18nInternal).__composer
? (instance as unknown as Composer)
: (instance as unknown as VueI18nInternal).__composer
} else {
return null
}
Expand Down
Loading

0 comments on commit e4b1d37

Please sign in to comment.