fix: tweak path language parser interface (#14)

intlify · Sep 27, 2023 · b13785b · b13785b
1 parent a15885a
commit b13785b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/src/http.test.ts b/src/http.test.ts
@@ -17,9 +17,7 @@ describe('getPathLanguage', () => {
   })
 
   test('parser option', () => {
-    const nullLangParser = {
-      parse: () => 'null',
-    }
+    const nullLangParser = () => 'null'
     expect(getPathLanguage('/en/foo', nullLangParser)).toBe('null')
   })
 })
@@ -35,9 +33,7 @@ describe('getPathLocale', () => {
   })
 
   test('RangeError', () => {
-    const nullLangParser = {
-      parse: () => 'null',
-    }
+    const nullLangParser = () => 'null'
     expect(() => getPathLocale('/en/foo', nullLangParser)).toThrowError(
       RangeError,
     )

diff --git a/src/http.ts b/src/http.ts
@@ -166,8 +166,7 @@ export function getPathLanguage(
   path: string | URL,
   parser?: PathLanguageParser,
 ): string {
-  const _parser = parser || pathLanguageParser
-  return _parser.parse(path)
+  return (parser || pathLanguageParser)(path)
 }
 
 /**

diff --git a/src/shared.test.ts b/src/shared.test.ts
@@ -79,15 +79,15 @@ describe('normalizeLanguageName', () => {
 
 describe('PathIndexLanguageParser', () => {
   test('default index: 0', () => {
-    expect(pathLanguageParser.parse('/en/hello')).toEqual('en')
+    expect(pathLanguageParser('/en/hello')).toEqual('en')
   })
 
   test('index 1', () => {
     const parser = createPathIndexLanguageParser(1)
-    expect(parser.parse('/hello/ja/bar')).toEqual('ja')
+    expect(parser('/hello/ja/bar')).toEqual('ja')
   })
 
   test('empty', () => {
-    expect(pathLanguageParser.parse('/')).toEqual('')
+    expect(pathLanguageParser('/')).toEqual('')
   })
 })
diff --git a/src/shared.ts b/src/shared.ts
@@ -83,22 +83,20 @@ export interface PathLanguageParser {
    *
    * @returns {string} the language, if it cannot parse the path is not found, you need to return empty string (`''`)
    */
-  parse(path: string | URL): string
+  (path: string | URL): string
 }
 
 export function createPathIndexLanguageParser(
   index = 0,
 ): PathLanguageParser {
-  return {
-    parse(path: string | URL): string {
-      const rawPath = typeof path === 'string' ? path : path.pathname
-      const normalizedPath = rawPath.split('?')[0]
-      const parts = normalizedPath.split('/')
-      if (parts[0] === '') {
-        parts.shift()
-      }
-      return parts.length > index ? parts[index] || '' : ''
-    },
+  return (path: string | URL): string => {
+    const rawPath = typeof path === 'string' ? path : path.pathname
+    const normalizedPath = rawPath.split('?')[0]
+    const parts = normalizedPath.split('/')
+    if (parts[0] === '') {
+      parts.shift()
+    }
+    return parts.length > index ? parts[index] || '' : ''
   }
 }