refactor: move omit to devtools

diff --git a/src/devtools.ts b/src/devtools.ts
index 5fae19444917bf4d2c9af8cb1c33dfba0557285e..d5939724c1ff88deaca4df2e1b8bc63ac77377ef 100644 (file)
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -15,7 +15,7 @@ import { RouteRecordMatcher } from './matcher/pathMatcher'
 import { PathParser } from './matcher/pathParserRanker'
 import { Router } from './router'
 import { RouteLocationNormalized } from './types'
-import { assign, omit } from './utils'
+import { assign } from './utils'
 
 function formatRouteLocation(
   routeLocation: RouteLocationNormalized,
@@ -472,3 +472,17 @@ function isRouteMatching(route: RouteRecordMatcher, filter: string): boolean {
 
   return route.children.some(child => isRouteMatching(child, filter))
 }
+
+function omit<T extends object, K extends [...(keyof T)[]]>(obj: T, keys: K) {
+  const ret = {} as {
+    [K2 in Exclude<keyof T, K[number]>]: T[K2]
+  }
+
+  for (let key in obj) {
+    if (!keys.includes(key as any)) {
+      // @ts-ignore
+      ret[key] = obj[key]
+    }
+  }
+  return ret
+}

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 957c8b056bc7e6761e353fcfc2537924a3dd7bdb..35a2b8d06773f36fe46f55c560af9a57b2c909c6 100644 (file)
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -24,20 +24,3 @@ export function applyToParams(
 }
 
 export let noop = () => {}
-
-export const omit = <T extends Record<string, any>>(
-  object: T,
-  paths: Array<keyof T>
-) => {
-  const result: Record<string, any> = {}
-  for (let key in object) {
-    if (
-      paths.indexOf(key) >= 0 ||
-      !Object.prototype.hasOwnProperty.call(object, key)
-    ) {
-      continue
-    }
-    result[key] = object[key]
-  }
-  return result
-}