Skip to content

Commit a4dff1e

Browse files
committed
chore: format
1 parent e92abd9 commit a4dff1e

File tree

11 files changed

+57
-119
lines changed

11 files changed

+57
-119
lines changed

README.md

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ If you are directly using `@intlify/utils` as a dependency:
4545
}
4646
```
4747

48-
**Note:** Make sure to recreate lockfile and `node_modules` after reinstall to
49-
avoid hoisting issues.
48+
**Note:** Make sure to recreate lockfile and `node_modules` after reinstall to avoid hoisting issues.
5049

5150
</details>
5251

@@ -148,29 +147,21 @@ You can do `import { ... } from '@intlify/utils'` the above utilities
148147
- `getPathLocale`
149148
- `getQueryLocale`
150149

151-
The about utilies functions accpet Web APIs such as
152-
[Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) and
153-
[Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) that is
154-
supported by JS environments (such as Deno, Bun, and Browser)
150+
The about utilies functions accpet Web APIs such as [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) and [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) that is supported by JS environments (such as Deno, Bun, and Browser)
155151

156152
#### Specialized environments
157153

158-
If you will use Node.js and H3, You can do
159-
`import { ... } from '@intlify/utils/{ENV}'` the above utilities.
154+
If you will use Node.js and H3, You can do `import { ... } from '@intlify/utils/{ENV}'` the above utilities.
160155

161156
The namespace `{ENV}` is one of the following:
162157

163-
- `node`: accpet `IncomingMessage` and `Outgoing` by Node.js
164-
[http](https://nodejs.org/api/http.html) module
158+
- `node`: accpet `IncomingMessage` and `Outgoing` by Node.js [http](https://nodejs.org/api/http.html) module
165159
- `h3`: accept `H3Event` by HTTP framework [h3](https://github.com/unjs/h3)
160+
- `hono`: accept `Context` by edge-side web framework [hono](https://github.com/honojs/hono)
166161

167162
## 🙌 Contributing guidelines
168163

169-
If you are interested in contributing to `@intlify/utils`, I highly recommend
170-
checking out [the contributing guidelines](/CONTRIBUTING.md) here. You'll find
171-
all the relevant information such as
172-
[how to make a PR](/CONTRIBUTING.md#pull-request-guidelines),
173-
[how to setup development](/CONTRIBUTING.md#development-setup)) etc., there.
164+
If you are interested in contributing to `@intlify/utils`, I highly recommend checking out [the contributing guidelines](/CONTRIBUTING.md) here. You'll find all the relevant information such as [how to make a PR](/CONTRIBUTING.md#pull-request-guidelines), [how to setup development](/CONTRIBUTING.md#development-setup)) etc., there.
174165

175166
## ©️ License
176167

deno.jsonc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"include": [
55
],
66
*/
7-
"exclude": ["node_modules", "dist"],
7+
"lineWidth": 100,
8+
"exclude": ["node_modules", "dist", "**/*.md"],
89
"semiColons": false,
910
"singleQuote": true
1011
},

src/h3.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import {
2-
ACCEPT_LANGUAGE_HEADER,
3-
DEFAULT_COOKIE_NAME,
4-
DEFAULT_LANG_TAG,
5-
} from './constants.ts'
1+
import { ACCEPT_LANGUAGE_HEADER, DEFAULT_COOKIE_NAME, DEFAULT_LANG_TAG } from './constants.ts'
62
import {
73
getHeaderLanguagesWithGetter,
84
getLocaleWithGetter,
@@ -16,12 +12,7 @@ import { pathLanguageParser } from './shared.ts'
1612
import { getCookie, getHeaders, getRequestURL, setCookie } from 'h3'
1713

1814
import type { H3Event } from 'h3'
19-
import type {
20-
CookieOptions,
21-
HeaderOptions,
22-
PathOptions,
23-
QueryOptions,
24-
} from './http.ts'
15+
import type { CookieOptions, HeaderOptions, PathOptions, QueryOptions } from './http.ts'
2516

2617
/**
2718
* get languages from header
@@ -164,9 +155,7 @@ export function getHeaderLocale(
164155
parser = parseDefaultHeader,
165156
}: HeaderOptions & { lang?: string } = {},
166157
): Intl.Locale {
167-
return getLocaleWithGetter(() =>
168-
getHeaderLanguages(event, { name, parser })[0] || lang
169-
)
158+
return getLocaleWithGetter(() => getHeaderLanguages(event, { name, parser })[0] || lang)
170159
}
171160

172161
/**

src/hono.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import {
2-
ACCEPT_LANGUAGE_HEADER,
3-
DEFAULT_COOKIE_NAME,
4-
DEFAULT_LANG_TAG,
5-
} from './constants.ts'
1+
import { ACCEPT_LANGUAGE_HEADER, DEFAULT_COOKIE_NAME, DEFAULT_LANG_TAG } from './constants.ts'
62
import {
73
getHeaderLanguagesWithGetter,
84
getLocaleWithGetter,
@@ -165,9 +161,7 @@ export function getHeaderLocale(
165161
parser = parseDefaultHeader,
166162
}: HeaderOptions & { lang?: string } = {},
167163
): Intl.Locale {
168-
return getLocaleWithGetter(() =>
169-
getHeaderLanguages(context, { name, parser })[0] || lang
170-
)
164+
return getLocaleWithGetter(() => getHeaderLanguages(context, { name, parser })[0] || lang)
171165
}
172166

173167
/**

src/http.test.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import { describe, expect, test } from 'vitest'
2-
import {
3-
getPathLanguage,
4-
getPathLocale,
5-
getQueryLanguage,
6-
getQueryLocale,
7-
} from './http.ts'
2+
import { getPathLanguage, getPathLocale, getQueryLanguage, getQueryLocale } from './http.ts'
83

94
describe('getPathLanguage', () => {
105
test('basic', () => {

src/http.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ export function getHeaderLanguagesWithGetter(
131131
const langString = getter()
132132
return langString
133133
? name === ACCEPT_LANGUAGE_HEADER
134-
? parser === parseDefaultHeader
135-
? parseAcceptLanguage(langString)
136-
: parser(langString)
134+
? parser === parseDefaultHeader ? parseAcceptLanguage(langString) : parser(langString)
137135
: parser(langString)
138136
: []
139137
}

src/locale.ts

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ export type ParseUnicodeRegionSubtag<
320320
: [never, 7, RestChunks] // require characters length
321321
: ThroughErrorWithChunks<RestChunks, [never, 7, RestChunks]> // require characters length
322322

323-
type ThroughErrorWithChunks<Chunks extends unknown[], Result> =
324-
Length<Chunks> extends 0 ? Result : [never, never, Chunks]
323+
type ThroughErrorWithChunks<Chunks extends unknown[], Result> = Length<Chunks> extends 0 ? Result
324+
: [never, never, Chunks]
325325

326326
/**
327327
* parse unicode variant subtag
@@ -402,11 +402,10 @@ type ParseUnicodeExtensions<
402402
Chunks,
403403
Extensions
404404
>,
405-
Result extends [Omit<UnicodeLocaleId, 'lang'>, number, unknown[]] =
406-
Length<Chunks> extends 0 ? [{ extensions: [] }, never, Chunks]
407-
: IsNever<ResultExtensions[1]> extends false
408-
? [{ extensions: [] }, ResultExtensions[1], Chunks]
409-
: [ResultExtensions[0], never, ResultExtensions[2]],
405+
Result extends [Omit<UnicodeLocaleId, 'lang'>, number, unknown[]] = Length<Chunks> extends 0
406+
? [{ extensions: [] }, never, Chunks]
407+
: IsNever<ResultExtensions[1]> extends false ? [{ extensions: [] }, ResultExtensions[1], Chunks]
408+
: [ResultExtensions[0], never, ResultExtensions[2]],
410409
> = Result
411410

412411
// type p1 = ParseUnicodeExtensions<['x', '1234']>
@@ -427,12 +426,11 @@ type _ParseUnicodeExtensions<
427426
// : never,
428427

429428
// parse for PuExtension
430-
ResultParsePu extends [PuExtension, number, unknown[]] =
431-
_ParseUnicodeExtensionsPu<
432-
RestChunks,
433-
Type,
434-
ExistPuExtension
435-
>,
429+
ResultParsePu extends [PuExtension, number, unknown[]] = _ParseUnicodeExtensionsPu<
430+
RestChunks,
431+
Type,
432+
ExistPuExtension
433+
>,
436434
_ExtensionsPu extends UnicodeLocaleId['extensions'] = Push<
437435
Extensions,
438436
ResultParsePu[0]
@@ -467,8 +465,7 @@ type _ParseUnicodeExtensions<
467465
NextExistPuExtension extends PuExtension = ResultParsePu[0],
468466
> = IsNever<Error> extends false ? [never, Error, Chunks]
469467
: Length<RestChunks> extends 0 ? [{ extensions: Extensions }, never, Chunks]
470-
: Length<NextChunks> extends 0
471-
? [{ extensions: NextExtensions }, never, NextChunks]
468+
: Length<NextChunks> extends 0 ? [{ extensions: NextExtensions }, never, NextChunks]
472469
: _ParseUnicodeExtensions<
473470
NextChunks,
474471
NextExtensions,
@@ -482,12 +479,11 @@ type _ParseUnicodeExtensionsPu<
482479
Chunks extends unknown[],
483480
Type extends string,
484481
ExistPuExtension extends PuExtension = never,
485-
ResultParsePuExtension extends unknown[] =
486-
CheckExtensionType<Type, ['x', 'X']> extends true
487-
? ParsePuExtension<[...Chunks]>
488-
: never,
489-
_PuExtension extends PuExtension = ResultParsePuExtension[0] extends
490-
PuExtension ? ResultParsePuExtension[0]
482+
ResultParsePuExtension extends unknown[] = CheckExtensionType<Type, ['x', 'X']> extends true
483+
? ParsePuExtension<[...Chunks]>
484+
: never,
485+
_PuExtension extends PuExtension = ResultParsePuExtension[0] extends PuExtension
486+
? ResultParsePuExtension[0]
491487
: never,
492488
RestChunks extends unknown[] = ResultParsePuExtension[2] extends unknown[]
493489
? ResultParsePuExtension[2]
@@ -516,21 +512,19 @@ type _ParseUnicodeExtensionsOther<
516512
Chunks extends unknown[],
517513
Type extends string,
518514
ExistOtherExtensions extends unknown[] = never,
519-
MalformedError extends number =
520-
Includes<UnionToTuple<OtherExtensions>, Type> extends false ? 16
521-
: never,
515+
MalformedError extends number = Includes<UnionToTuple<OtherExtensions>, Type> extends false ? 16
516+
: never,
522517
Error extends number = MalformedError extends number ? MalformedError
523518
: Includes<ExistOtherExtensions, Type> extends true ? 17
524519
: never,
525-
ResultParseOtherExtension extends [string, unknown[]] = IsNever<Error> extends
526-
true ? ParseOtherExtension<[...Chunks]>
520+
ResultParseOtherExtension extends [string, unknown[]] = IsNever<Error> extends true
521+
? ParseOtherExtension<[...Chunks]>
527522
: [never, Chunks],
528523
RestChunks extends unknown[] = ResultParseOtherExtension[1] extends unknown[]
529524
? ResultParseOtherExtension[1]
530525
: Chunks,
531526
Result extends [OtherExtension, number, unknown[]] = [
532-
ResultParseOtherExtension[0] extends string
533-
? { type: 'a'; value: ResultParseOtherExtension[0] }
527+
ResultParseOtherExtension[0] extends string ? { type: 'a'; value: ResultParseOtherExtension[0] }
534528
: never,
535529
Error,
536530
RestChunks,

src/node.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,10 @@ import {
1010
parseDefaultHeader,
1111
validateLocale,
1212
} from './http.ts'
13-
import {
14-
ACCEPT_LANGUAGE_HEADER,
15-
DEFAULT_COOKIE_NAME,
16-
DEFAULT_LANG_TAG,
17-
} from './constants.ts'
13+
import { ACCEPT_LANGUAGE_HEADER, DEFAULT_COOKIE_NAME, DEFAULT_LANG_TAG } from './constants.ts'
1814
import { normalizeLanguageName, pathLanguageParser } from './shared.ts'
1915

20-
import type {
21-
CookieOptions,
22-
HeaderOptions,
23-
PathOptions,
24-
QueryOptions,
25-
} from './http.ts'
16+
import type { CookieOptions, HeaderOptions, PathOptions, QueryOptions } from './http.ts'
2617

2718
/**
2819
* get languages from header
@@ -171,9 +162,7 @@ export function getHeaderLocale(
171162
parser = parseDefaultHeader,
172163
}: HeaderOptions & { lang?: string } = {},
173164
): Intl.Locale {
174-
return getLocaleWithGetter(() =>
175-
getHeaderLanguages(request, { name, parser })[0] || lang
176-
)
165+
return getLocaleWithGetter(() => getHeaderLanguages(request, { name, parser })[0] || lang)
177166
}
178167

179168
/**

src/shared.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ export function createPathIndexLanguageParser(
112112
}
113113
}
114114

115-
export let pathLanguageParser: PathLanguageParser =
116-
/* #__PURE__*/ createPathIndexLanguageParser()
115+
export let pathLanguageParser: PathLanguageParser = /* #__PURE__*/ createPathIndexLanguageParser()
117116

118117
/**
119118
* register the path language parser

src/types.ts

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
export type IsNever<T> = [T] extends [never] ? true : false
2-
export type Split<S extends string, SEP extends string> = string extends S
3-
? string[]
4-
: S extends `${infer A}${SEP}${infer B}`
5-
? [A, ...(B extends '' ? [] : Split<B, SEP>)]
2+
export type Split<S extends string, SEP extends string> = string extends S ? string[]
3+
: S extends `${infer A}${SEP}${infer B}` ? [A, ...(B extends '' ? [] : Split<B, SEP>)]
64
: SEP extends '' ? []
75
: [S]
8-
export type Join<T extends unknown[], U extends string | number> = T extends
9-
[infer F, ...infer R] ? R['length'] extends 0 ? `${F & string}`
6+
export type Join<T extends unknown[], U extends string | number> = T extends [infer F, ...infer R]
7+
? R['length'] extends 0 ? `${F & string}`
108
: `${F & string}${U}${Join<R, U>}`
119
: never
1210
export type Shift<T extends unknown[]> = T extends [unknown, ...infer U] ? U
@@ -15,8 +13,9 @@ export type First<T extends unknown[]> = T extends [infer A, ...infer rest] ? A
1513
: never
1614
export type Last<T extends unknown[]> = [unknown, ...T][T['length']]
1715
export type Length<T extends readonly unknown[]> = T['length']
18-
export type IsEqual<X, Y> = (<T>() => T extends X ? 1 : 2) extends
19-
(<T>() => T extends Y ? 1 : 2) ? true : false
16+
export type IsEqual<X, Y> = (<T>() => T extends X ? 1 : 2) extends (<T>() => T extends Y ? 1 : 2)
17+
? true
18+
: false
2019
export type All<T extends unknown[], U> = T extends [infer L, ...infer R]
2120
? IsEqual<L, U> extends true ? All<R, U>
2221
: false
@@ -42,13 +41,13 @@ export type LastInUnion<U> = UnionToIntersection<
4241
: never
4342
export type UnionToTuple<U, Last = LastInUnion<U>> = [U] extends [never] ? []
4443
: [...UnionToTuple<Exclude<U, Last>>, Last]
45-
export type TupleToUnion<T extends readonly unknown[]> = T extends
46-
Array<infer R> ? R
44+
export type TupleToUnion<T extends readonly unknown[]> = T extends Array<infer R> ? R
4745
: never
4846

49-
export type StringToUnion<T extends string> = T extends
50-
`${infer Letter}${infer Rest}` ? Letter | StringToUnion<Rest>
47+
export type StringToUnion<T extends string> = T extends `${infer Letter}${infer Rest}`
48+
? Letter | StringToUnion<Rest>
5149
: never
5250

53-
export type StringToArray<T extends string> = T extends
54-
`${infer Letter}${infer Rest}` ? [Letter, ...StringToArray<Rest>] : []
51+
export type StringToArray<T extends string> = T extends `${infer Letter}${infer Rest}`
52+
? [Letter, ...StringToArray<Rest>]
53+
: []

0 commit comments

Comments
 (0)