From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 12 May 2022 09:37:23 +0000 (+0200)
Subject: refactor(types): missing generic constraint
X-Git-Tag: v4.1.0~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ce2a861c6e52c19509962bce6f903ec7dd133af;p=thirdparty%2Fvuejs%2Frouter.git

refactor(types): missing generic constraint
---

diff --git a/src/matcher/index.ts b/src/matcher/index.ts
index d8b2dfb8..e6d2ceac 100644
--- a/src/matcher/index.ts
+++ b/src/matcher/index.ts
@@ -415,7 +415,10 @@ function mergeMetaFields(matched: MatcherLocation['matched']) {
   )
 }
 
-function mergeOptions<T>(defaults: T, partialOptions: Partial<T>): T {
+function mergeOptions<T extends object>(
+  defaults: T,
+  partialOptions: Partial<T>
+): T {
   const options = {} as T
   for (const key in defaults) {
     options[key] = key in partialOptions ? partialOptions[key]! : defaults[key]