refactor: use key in instead of instanceof

posva · posva · commit 82be30fc9e9f · 2021-07-28T10:23:59.000+02:00
key in is faster in most browsers https://jsbench.me/3qkrn7gwez/2
diff --git a/packages/reactivity/__tests__/computed.spec.ts b/packages/reactivity/__tests__/computed.spec.ts
@@ -9,7 +9,8 @@ import {
   toRaw,
   TrackOpTypes,
   ITERATE_KEY,
-  TriggerOpTypes
+  TriggerOpTypes,
+  isComputed
 } from '../src'
 
 describe('reactivity/computed', () => {
@@ -272,4 +273,16 @@ describe('reactivity/computed', () => {
       oldValue: 2
     })
   })
+
+  it('isComputed', () => {
+    expect(isComputed(undefined)).toBe(false)
+    expect(isComputed(null)).toBe(false)
+    expect(isComputed(3)).toBe(false)
+    expect(isComputed({})).toBe(false)
+    expect(isComputed(computed(() => 1))).toBe(true)
+    expect(isComputed(ref(1))).toBe(false)
+    expect(isComputed(reactive({}))).toBe(false)
+    expect(isComputed(reactive({ c: computed(() => 1) }).c)).toBe(false)
+    expect(isComputed(toRaw(reactive({ c: computed(() => 1) })).c)).toBe(true)
+  })
 })
diff --git a/packages/reactivity/__tests__/deferredComputed.spec.ts b/packages/reactivity/__tests__/deferredComputed.spec.ts
@@ -1,12 +1,4 @@
-import {
-  computed,
-  deferredComputed,
-  effect,
-  isComputed,
-  reactive,
-  ref,
-  toRaw
-} from '../src'
+import { computed, deferredComputed, effect, ref } from '../src'
 
 describe('deferred computed', () => {
   const tick = Promise.resolve()
@@ -190,13 +182,4 @@ describe('deferred computed', () => {
     await tick
     expect(c1Spy).toHaveBeenCalledTimes(1)
   })
-
-  it('isComputed', () => {
-    expect(isComputed(computed(() => 1))).toBe(true)
-    expect(isComputed(deferredComputed(() => 1))).toBe(true)
-    expect(isComputed(ref(1))).toBe(false)
-    expect(isComputed(reactive({}))).toBe(false)
-    expect(isComputed(reactive({ c: computed(() => 1) }).c)).toBe(false)
-    expect(isComputed(toRaw(reactive({ c: computed(() => 1) })).c)).toBe(true)
-  })
 })
diff --git a/packages/reactivity/src/computed.ts b/packages/reactivity/src/computed.ts
@@ -20,7 +20,14 @@ export interface WritableComputedOptions<T> {
   set: ComputedSetter<T>
 }
 
-export class ComputedRefImpl<T> {
+export function isComputed<T>(
+  value: ComputedRef<T> | unknown
+): value is ComputedRef<T>
+export function isComputed(value: any): value is ComputedRef {
+  return Boolean(value && value.effect)
+}
+
+class ComputedRefImpl<T> {
   public dep?: Dep = undefined
 
   private _value!: T
diff --git a/packages/reactivity/src/deferredComputed.ts b/packages/reactivity/src/deferredComputed.ts
@@ -1,6 +1,6 @@
 import { Dep } from './dep'
 import { ReactiveEffect } from './effect'
-import { ComputedGetter, ComputedRef, ComputedRefImpl } from './computed'
+import { ComputedGetter, ComputedRef } from './computed'
 import { ReactiveFlags, toRaw } from './reactive'
 import { trackRefValue, triggerRefValue } from './ref'
 
@@ -24,15 +24,6 @@ const flush = () => {
   queued = false
 }
 
-export function isComputed<T>(
-  value: ComputedRef<T> | unknown
-): value is ComputedRef<T>
-export function isComputed(value: any): value is ComputedRef {
-  return (
-    value instanceof ComputedRefImpl || value instanceof DeferredComputedRefImpl
-  )
-}
-
 class DeferredComputedRefImpl<T> {
   public dep?: Dep = undefined
 
diff --git a/packages/reactivity/src/index.ts b/packages/reactivity/src/index.ts
@@ -30,13 +30,14 @@ export {
 } from './reactive'
 export {
   computed,
+  isComputed,
   ComputedRef,
   WritableComputedRef,
   WritableComputedOptions,
   ComputedGetter,
   ComputedSetter
 } from './computed'
-export { deferredComputed, isComputed } from './deferredComputed'
+export { deferredComputed } from './deferredComputed'
 export {
   effect,
   stop,
