Skip to content

Commit 7afd493

Browse files
kazuponkazupon
committed
refactor
1 parent f7bf71c commit 7afd493

File tree

6 files changed

+93
-104
lines changed

6 files changed

+93
-104
lines changed

‎src/composer.ts‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ export function createComposer(
374374

375375
// runtime context
376376
let _context: RuntimeContext // eslint-disable-line prefer-const
377-
const getRuntimeContext = (): RuntimeContext => {
377+
function getRuntimeContext(): RuntimeContext {
378378
return createRuntimeContext({
379379
locale: _locale.value,
380380
fallbackLocale: _fallbackLocale.value,
@@ -442,9 +442,9 @@ export function createComposer(
442442
isFunction(_postTranslation) ? _postTranslation : null
443443

444444
// setPostTranslationHandler
445-
const setPostTranslationHandler = (
445+
function setPostTranslationHandler(
446446
handler: PostTranslationHandler | null
447-
): void => {
447+
): void {
448448
_postTranslation = handler
449449
_context.postTranslation = handler
450450
}
@@ -453,22 +453,22 @@ export function createComposer(
453453
const getMissingHandler = (): MissingHandler | null => _missing
454454

455455
// setMissingHandler
456-
const setMissingHandler = (handler: MissingHandler | null): void => {
456+
function setMissingHandler(handler: MissingHandler | null): void {
457457
if (handler !== null) {
458458
_runtimeMissing = defineRuntimeMissingHandler(handler)
459459
}
460460
_missing = handler
461461
_context.missing = _runtimeMissing
462462
}
463463

464-
const defineComputed = <T>(
464+
function defineComputed<T>(
465465
fn: (context: RuntimeContext) => unknown,
466466
argumentParser: () => string,
467467
warnType: string,
468468
fallbackSuccess: (root: Composer & ComposerInternal) => T,
469469
fallbackFail: (key: string) => T,
470470
successCondition: (val: unknown) => boolean
471-
): ComputedRef<T> => {
471+
): ComputedRef<T> {
472472
// NOTE:
473473
// if this composer is global (__root is `undefined`), add dependency trakcing!
474474
// by containing this, we can reactively notify components that reference the global composer.
@@ -503,7 +503,7 @@ export function createComposer(
503503
}
504504

505505
// t
506-
const t = (...args: unknown[]): string => {
506+
function t(...args: unknown[]): string {
507507
return defineComputed<string>(
508508
context => translate(context, ...args),
509509
() => parseTranslateArgs(...args)[0],
@@ -515,7 +515,7 @@ export function createComposer(
515515
}
516516

517517
// d
518-
const d = (...args: unknown[]): string => {
518+
function d(...args: unknown[]): string {
519519
return defineComputed<string>(
520520
context => datetime(context, ...args),
521521
() => parseDateTimeArgs(...args)[0],
@@ -527,7 +527,7 @@ export function createComposer(
527527
}
528528

529529
// n
530-
const n = (...args: unknown[]): string => {
530+
function n(...args: unknown[]): string {
531531
return defineComputed<string>(
532532
context => number(context, ...args),
533533
() => parseNumberArgs(...args)[0],
@@ -539,7 +539,7 @@ export function createComposer(
539539
}
540540

541541
// for custom processor
542-
const normalize = (values: unknown[]): unknown => {
542+
function normalize(values: unknown[]): unknown {
543543
return values.map(val =>
544544
isString(val) ? createVNode(Text, null, val, 0) : val
545545
)
@@ -552,7 +552,7 @@ export function createComposer(
552552
} as MessageProcessor
553553

554554
// __transrateVNode, using for `i18n-t` component
555-
const __transrateVNode = (...args: unknown[]): unknown => {
555+
function __transrateVNode(...args: unknown[]): unknown {
556556
return defineComputed<unknown>(
557557
context => {
558558
let ret: unknown
@@ -573,9 +573,7 @@ export function createComposer(
573573
}
574574

575575
// __numberParts, using for `i18n-n` component
576-
const __numberParts = (
577-
...args: unknown[]
578-
): string | Intl.NumberFormatPart[] => {
576+
function __numberParts(...args: unknown[]): string | Intl.NumberFormatPart[] {
579577
return defineComputed<string | Intl.NumberFormatPart[]>(
580578
context => number(context, ...args),
581579
() => parseNumberArgs(...args)[0],
@@ -587,9 +585,9 @@ export function createComposer(
587585
}
588586

589587
// __datetimeParts, using for `i18n-d` component
590-
const __datetimeParts = (
588+
function __datetimeParts(
591589
...args: unknown[]
592-
): string | Intl.DateTimeFormatPart[] => {
590+
): string | Intl.DateTimeFormatPart[] {
593591
return defineComputed<string | Intl.DateTimeFormatPart[]>(
594592
context => datetime(context, ...args),
595593
() => parseDateTimeArgs(...args)[0],
@@ -605,13 +603,13 @@ export function createComposer(
605603
_messages.value[locale] || {}
606604

607605
// setLocaleMessage
608-
const setLocaleMessage = (locale: Locale, message: LocaleMessage): void => {
606+
function setLocaleMessage(locale: Locale, message: LocaleMessage): void {
609607
_messages.value[locale] = message
610608
_context.messages = _messages.value
611609
}
612610

613611
// mergeLocaleMessage
614-
const mergeLocaleMessage = (locale: Locale, message: LocaleMessage): void => {
612+
function mergeLocaleMessage(locale: Locale, message: LocaleMessage): void {
615613
_messages.value[locale] = Object.assign(
616614
_messages.value[locale] || {},
617615
message
@@ -624,17 +622,14 @@ export function createComposer(
624622
_datetimeFormats.value[locale] || {}
625623

626624
// setDateTimeFormat
627-
const setDateTimeFormat = (locale: Locale, format: DateTimeFormat): void => {
625+
function setDateTimeFormat(locale: Locale, format: DateTimeFormat): void {
628626
_datetimeFormats.value[locale] = format
629627
_context.datetimeFormats = _datetimeFormats.value
630628
clearDateTimeFormat(_context, locale, format)
631629
}
632630

633631
// mergeDateTimeFormat
634-
const mergeDateTimeFormat = (
635-
locale: Locale,
636-
format: DateTimeFormat
637-
): void => {
632+
function mergeDateTimeFormat(locale: Locale, format: DateTimeFormat): void {
638633
_datetimeFormats.value[locale] = Object.assign(
639634
_datetimeFormats.value[locale] || {},
640635
format
@@ -648,14 +643,14 @@ export function createComposer(
648643
_numberFormats.value[locale] || {}
649644

650645
// setNumberFormat
651-
const setNumberFormat = (locale: Locale, format: NumberFormat): void => {
646+
function setNumberFormat(locale: Locale, format: NumberFormat): void {
652647
_numberFormats.value[locale] = format
653648
_context.numberFormats = _numberFormats.value
654649
clearNumberFormat(_context, locale, format)
655650
}
656651

657652
// mergeNumberFormat
658-
const mergeNumberFormat = (locale: Locale, format: NumberFormat): void => {
653+
function mergeNumberFormat(locale: Locale, format: NumberFormat): void {
659654
_numberFormats.value[locale] = Object.assign(
660655
_numberFormats.value[locale] || {},
661656
format

‎src/message/generator.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,27 @@ function createCodeGenerator(source?: string): CodeGenerator {
4444

4545
const context = (): CodeGenContext => _context
4646

47-
const push = (code: string): void => {
47+
function push(code: string): void {
4848
_context.code += code
4949
}
5050

51-
const _newline = (n: number): void => {
51+
function _newline(n: number): void {
5252
push('\n' + ` `.repeat(n))
5353
}
5454

55-
const indent = (): void => {
55+
function indent(): void {
5656
_newline(++_context.indentLevel)
5757
}
5858

59-
const deindent = (withoutNewLine?: boolean): void => {
59+
function deindent(withoutNewLine?: boolean): void {
6060
if (withoutNewLine) {
6161
--_context.indentLevel
6262
} else {
6363
_newline(--_context.indentLevel)
6464
}
6565
}
6666

67-
const newline = (): void => {
67+
function newline(): void {
6868
_newline(_context.indentLevel)
6969
}
7070

‎src/message/parser.ts‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ export function createParser(options: ParserOptions = {}): Parser {
120120
const location = !options.location
121121

122122
const { onError } = options
123-
const emitError = (
123+
function emitError(
124124
tokenzer: Tokenizer,
125125
code: CompileErrorCodes,
126126
start: Position,
127127
offset: number,
128128
...args: unknown[]
129-
): void => {
129+
): void {
130130
const end = tokenzer.currentPosition()
131131
end.offset += offset
132132
end.column += offset
@@ -140,7 +140,7 @@ export function createParser(options: ParserOptions = {}): Parser {
140140
}
141141
}
142142

143-
const startNode = (type: NodeTypes, offset: number, loc: Position): Node => {
143+
function startNode(type: NodeTypes, offset: number, loc: Position): Node {
144144
const node = {
145145
type,
146146
start: offset,
@@ -154,12 +154,12 @@ export function createParser(options: ParserOptions = {}): Parser {
154154
return node
155155
}
156156

157-
const endNode = (
157+
function endNode(
158158
node: Node,
159159
offset: number,
160160
pos: Position,
161161
type?: NodeTypes
162-
): void => {
162+
): void {
163163
node.end = offset
164164

165165
if (type) {
@@ -171,7 +171,7 @@ export function createParser(options: ParserOptions = {}): Parser {
171171
}
172172
}
173173

174-
const parseText = (tokenizer: Tokenizer, value: string): TextNode => {
174+
function parseText(tokenizer: Tokenizer, value: string): TextNode {
175175
const context = tokenizer.context()
176176
const node = startNode(
177177
NodeTypes.Text,
@@ -183,7 +183,7 @@ export function createParser(options: ParserOptions = {}): Parser {
183183
return node
184184
}
185185

186-
const parseList = (tokenizer: Tokenizer, index: string): ListNode => {
186+
function parseList(tokenizer: Tokenizer, index: string): ListNode {
187187
const context = tokenizer.context()
188188
const { lastOffset: offset, lastStartLoc: loc } = context // get brace left loc
189189
const node = startNode(NodeTypes.List, offset, loc) as ListNode
@@ -193,7 +193,7 @@ export function createParser(options: ParserOptions = {}): Parser {
193193
return node
194194
}
195195

196-
const parseNamed = (tokenizer: Tokenizer, key: string): NamedNode => {
196+
function parseNamed(tokenizer: Tokenizer, key: string): NamedNode {
197197
const context = tokenizer.context()
198198
const { lastOffset: offset, lastStartLoc: loc } = context // get brace left loc
199199
const node = startNode(NodeTypes.Named, offset, loc) as NamedNode
@@ -203,7 +203,7 @@ export function createParser(options: ParserOptions = {}): Parser {
203203
return node
204204
}
205205

206-
const parseLiteral = (tokenizer: Tokenizer, value: string): LiteralNode => {
206+
function parseLiteral(tokenizer: Tokenizer, value: string): LiteralNode {
207207
const context = tokenizer.context()
208208
const { lastOffset: offset, lastStartLoc: loc } = context // get brace left loc
209209
const node = startNode(NodeTypes.Literal, offset, loc) as LiteralNode
@@ -213,7 +213,7 @@ export function createParser(options: ParserOptions = {}): Parser {
213213
return node
214214
}
215215

216-
const parseLinkedModifier = (tokenizer: Tokenizer): LinkedModitierNode => {
216+
function parseLinkedModifier(tokenizer: Tokenizer): LinkedModitierNode {
217217
const token = tokenizer.nextToken()
218218
const context = tokenizer.context()
219219
// check token
@@ -237,10 +237,7 @@ export function createParser(options: ParserOptions = {}): Parser {
237237
return node
238238
}
239239

240-
const parseLinkedKey = (
241-
tokenizer: Tokenizer,
242-
value: string
243-
): LinkedKeyNode => {
240+
function parseLinkedKey(tokenizer: Tokenizer, value: string): LinkedKeyNode {
244241
const context = tokenizer.context()
245242
const node = startNode(
246243
NodeTypes.LinkedKey,
@@ -252,7 +249,7 @@ export function createParser(options: ParserOptions = {}): Parser {
252249
return node
253250
}
254251

255-
const parseLinked = (tokenizer: Tokenizer): LinkedNode => {
252+
function parseLinked(tokenizer: Tokenizer): LinkedNode {
256253
const context = tokenizer.context()
257254
const linkedNode = startNode(
258255
NodeTypes.Linked,
@@ -338,7 +335,7 @@ export function createParser(options: ParserOptions = {}): Parser {
338335
return linkedNode
339336
}
340337

341-
const parseMessage = (tokenizer: Tokenizer): MessageNode => {
338+
function parseMessage(tokenizer: Tokenizer): MessageNode {
342339
const context = tokenizer.context()
343340
const startOffset =
344341
context.currentType === TokenTypes.Pipe
@@ -429,12 +426,12 @@ export function createParser(options: ParserOptions = {}): Parser {
429426
return node
430427
}
431428

432-
const parsePlural = (
429+
function parsePlural(
433430
tokenizer: Tokenizer,
434431
offset: number,
435432
loc: Position,
436433
msgNode: MessageNode
437-
): PluralNode => {
434+
): PluralNode {
438435
const context = tokenizer.context()
439436
let hasEmptyMessage = msgNode.items.length === 0
440437

@@ -463,7 +460,7 @@ export function createParser(options: ParserOptions = {}): Parser {
463460
return node
464461
}
465462

466-
const parseResource = (tokenizer: Tokenizer): MessageNode | PluralNode => {
463+
function parseResource(tokenizer: Tokenizer): MessageNode | PluralNode {
467464
const context = tokenizer.context()
468465
const { offset, startLoc } = context
469466

‎src/message/runtime.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export function createMessageContext<N = {}>(
147147
const modifier = (name: string): LinkedModify =>
148148
options.modifiers ? options.modifiers[name] : DEFAULT_MODIFIER
149149

150-
const message = (name: string): MessageFunction => {
150+
function message(name: string): MessageFunction {
151151
// TODO: need to design resolve message function?
152152
// prettier-ignore
153153
const msg = isFunction(options.messages)

‎src/message/scanner.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function createScanner(str: string): Scanner {
4444
const currentChar = (): string => charAt(_index)
4545
const currentPeek = (): string => charAt(_index + _peekOffset)
4646

47-
const next = (): string => {
47+
function next(): string {
4848
_peekOffset = 0
4949
if (isLineEnd(_index)) {
5050
_line++
@@ -58,26 +58,26 @@ export function createScanner(str: string): Scanner {
5858
return _buf[_index]
5959
}
6060

61-
const peek = (): string => {
61+
function peek(): string {
6262
if (isCRLF(_index + _peekOffset)) {
6363
_peekOffset++
6464
}
6565
_peekOffset++
6666
return _buf[_index + _peekOffset]
6767
}
6868

69-
const reset = (): void => {
69+
function reset(): void {
7070
_index = 0
7171
_line = 1
7272
_column = 1
7373
_peekOffset = 0
7474
}
7575

76-
const resetPeek = (offset = 0): void => {
76+
function resetPeek(offset = 0): void {
7777
_peekOffset = offset
7878
}
7979

80-
const skipToPeek = (): void => {
80+
function skipToPeek(): void {
8181
const target = _index + _peekOffset
8282
// eslint-disable-next-line no-unmodified-loop-condition
8383
while (target !== _index) {

0 commit comments

Comments
 (0)