refactor: use Intl.ListFormat for error messages

exuanbo · Oct 14, 2024 · 3c4bae7 · 3c4bae7
1 parent 590d3a0
commit 3c4bae7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/container.ts b/src/container.ts
@@ -136,7 +136,8 @@ export class Container {
       const token = injection
       return token.name
     })
-    assert(false, ErrorMessage.UnresolvableToken, tokenNames.join(', '))
+    const formatter = new Intl.ListFormat('en', {style: 'narrow', type: 'conjunction'})
+    assert(false, ErrorMessage.UnresolvableToken, formatter.format(tokenNames))
   }
 
   resolveProvider<Value>(token: InjectionToken<Value>): InjectionProvider<Value> | undefined {

diff --git a/src/errors.ts b/src/errors.ts
@@ -1,14 +1,15 @@
 export const ErrorMessage = {
-  ReservedToken: 'reserved token:',
-  UnresolvableToken: 'unresolvable token:',
-  CircularDependency: 'circular dependency:',
+  ReservedToken: 'reserved token',
+  UnresolvableToken: 'unresolvable token',
+  CircularDependency: 'circular dependency',
   InvariantViolation: 'invariant violation',
   InjectOutsideOfContext: 'inject outside of context',
 } as const
 
 export function assert(condition: unknown, ...args: any[]): asserts condition {
   if (!condition) {
-    throw new Error(args.join(' '))
+    const formatter = new Intl.ListFormat('en', {style: 'narrow', type: 'unit'})
+    throw new Error(formatter.format(args))
   }
 }