refactor: rename things

packages/observer/__tests__/collections/Map.spec.ts

@@ -1,4 +1,4 @@
-import { observable, autorun, unwrap, isObservable } from '../../src'
+import { observable, effect, unwrap, isObservable } from '../../src'
 
 describe('observer/collections', () => {
   describe('Map', () => {
@@ -13,7 +13,7 @@ describe('observer/collections', () => {
     it('should observe mutations', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => {
+      effect(() => {
         dummy = map.get('key')
       })
 
@@ -29,7 +29,7 @@ describe('observer/collections', () => {
     it('should observe size mutations', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => (dummy = map.size))
+      effect(() => (dummy = map.size))
 
       expect(dummy).toBe(0)
       map.set('key1', 'value')
@@ -44,7 +44,7 @@ describe('observer/collections', () => {
     it('should observe for of iteration', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         // eslint-disable-next-line no-unused-vars
         for (let [key, num] of map) {
@@ -67,7 +67,7 @@ describe('observer/collections', () => {
     it('should observe forEach iteration', () => {
       let dummy: any
       const map = observable(new Map())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         map.forEach((num: any) => (dummy += num))
       })
@@ -86,7 +86,7 @@ describe('observer/collections', () => {
     it('should observe keys iteration', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (let key of map.keys()) {
           dummy += key
@@ -107,7 +107,7 @@ describe('observer/collections', () => {
     it('should observe values iteration', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (let num of map.values()) {
           dummy += num
@@ -128,7 +128,7 @@ describe('observer/collections', () => {
     it('should observe entries iteration', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         // eslint-disable-next-line no-unused-vars
         for (let [key, num] of map.entries()) {
@@ -151,7 +151,7 @@ describe('observer/collections', () => {
     it('should be triggered by clearing', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => (dummy = map.get('key')))
+      effect(() => (dummy = map.get('key')))
 
       expect(dummy).toBe(undefined)
       map.set('key', 3)
@@ -163,7 +163,7 @@ describe('observer/collections', () => {
     it('should not observe custom property mutations', () => {
       let dummy
       const map: any = observable(new Map())
-      autorun(() => (dummy = map.customProp))
+      effect(() => (dummy = map.customProp))
 
       expect(dummy).toBe(undefined)
       map.customProp = 'Hello World'
@@ -174,7 +174,7 @@ describe('observer/collections', () => {
       let dummy
       const map = observable(new Map())
       const mapSpy = jest.fn(() => (dummy = map.get('key')))
-      autorun(mapSpy)
+      effect(mapSpy)
 
       expect(dummy).toBe(undefined)
       expect(mapSpy).toHaveBeenCalledTimes(1)
@@ -198,7 +198,7 @@ describe('observer/collections', () => {
     it('should not observe raw data', () => {
       let dummy
       const map = observable(new Map())
-      autorun(() => (dummy = unwrap(map).get('key')))
+      effect(() => (dummy = unwrap(map).get('key')))
 
       expect(dummy).toBe(undefined)
       map.set('key', 'Hello')
@@ -229,7 +229,7 @@ describe('observer/collections', () => {
       const observed = observable(new Map())
       observed.set('key', { a: 1 })
       let dummy
-      autorun(() => {
+      effect(() => {
         dummy = observed.get('key').a
       })
       observed.get('key').a = 2
@@ -239,7 +239,7 @@ describe('observer/collections', () => {
     it('should observe nested values in iterations (forEach)', () => {
       const map = observable(new Map([[1, { foo: 1 }]]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         map.forEach(value => {
           expect(isObservable(value)).toBe(true)
@@ -254,7 +254,7 @@ describe('observer/collections', () => {
     it('should observe nested values in iterations (values)', () => {
       const map = observable(new Map([[1, { foo: 1 }]]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (const value of map.values()) {
           expect(isObservable(value)).toBe(true)
@@ -270,7 +270,7 @@ describe('observer/collections', () => {
       const key = {}
       const map = observable(new Map([[key, { foo: 1 }]]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (const [key, value] of map.entries()) {
           key
@@ -288,7 +288,7 @@ describe('observer/collections', () => {
       const key = {}
       const map = observable(new Map([[key, { foo: 1 }]]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (const [key, value] of map) {
           key

packages/observer/__tests__/collections/Set.spec.ts

@@ -1,4 +1,4 @@
-import { observable, autorun, isObservable, unwrap } from '../../src'
+import { observable, effect, isObservable, unwrap } from '../../src'
 
 describe('observer/collections', () => {
   describe('Set', () => {
@@ -13,7 +13,7 @@ describe('observer/collections', () => {
     it('should observe mutations', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => (dummy = set.has('value')))
+      effect(() => (dummy = set.has('value')))
 
       expect(dummy).toBe(false)
       set.add('value')
@@ -25,7 +25,7 @@ describe('observer/collections', () => {
     it('should observe for of iteration', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (let num of set) {
           dummy += num
@@ -45,7 +45,7 @@ describe('observer/collections', () => {
     it('should observe forEach iteration', () => {
       let dummy: any
       const set = observable(new Set())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         set.forEach(num => (dummy += num))
       })
@@ -63,7 +63,7 @@ describe('observer/collections', () => {
     it('should observe values iteration', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (let num of set.values()) {
           dummy += num
@@ -83,7 +83,7 @@ describe('observer/collections', () => {
     it('should observe keys iteration', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (let num of set.keys()) {
           dummy += num
@@ -103,7 +103,7 @@ describe('observer/collections', () => {
     it('should observe entries iteration', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         // eslint-disable-next-line no-unused-vars
         for (let [key, num] of set.entries()) {
@@ -125,7 +125,7 @@ describe('observer/collections', () => {
     it('should be triggered by clearing', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => (dummy = set.has('key')))
+      effect(() => (dummy = set.has('key')))
 
       expect(dummy).toBe(false)
       set.add('key')
@@ -137,7 +137,7 @@ describe('observer/collections', () => {
     it('should not observe custom property mutations', () => {
       let dummy
       const set: any = observable(new Set())
-      autorun(() => (dummy = set.customProp))
+      effect(() => (dummy = set.customProp))
 
       expect(dummy).toBe(undefined)
       set.customProp = 'Hello World'
@@ -147,7 +147,7 @@ describe('observer/collections', () => {
     it('should observe size mutations', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => (dummy = set.size))
+      effect(() => (dummy = set.size))
 
       expect(dummy).toBe(0)
       set.add('value')
@@ -163,7 +163,7 @@ describe('observer/collections', () => {
       let dummy
       const set = observable(new Set())
       const setSpy = jest.fn(() => (dummy = set.has('value')))
-      autorun(setSpy)
+      effect(setSpy)
 
       expect(dummy).toBe(false)
       expect(setSpy).toHaveBeenCalledTimes(1)
@@ -187,7 +187,7 @@ describe('observer/collections', () => {
     it('should not observe raw data', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => (dummy = unwrap(set).has('value')))
+      effect(() => (dummy = unwrap(set).has('value')))
 
       expect(dummy).toBe(false)
       set.add('value')
@@ -197,7 +197,7 @@ describe('observer/collections', () => {
     it('should not observe raw iterations', () => {
       let dummy = 0
       const set = observable(new Set())
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (let [num] of unwrap(set).entries()) {
           dummy += num
@@ -227,7 +227,7 @@ describe('observer/collections', () => {
     it('should not be triggered by raw mutations', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => (dummy = set.has('value')))
+      effect(() => (dummy = set.has('value')))
 
       expect(dummy).toBe(false)
       unwrap(set).add('value')
@@ -242,7 +242,7 @@ describe('observer/collections', () => {
     it('should not observe raw size mutations', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => (dummy = unwrap(set).size))
+      effect(() => (dummy = unwrap(set).size))
 
       expect(dummy).toBe(0)
       set.add('value')
@@ -252,7 +252,7 @@ describe('observer/collections', () => {
     it('should not be triggered by raw size mutations', () => {
       let dummy
       const set = observable(new Set())
-      autorun(() => (dummy = set.size))
+      effect(() => (dummy = set.size))
 
       expect(dummy).toBe(0)
       unwrap(set).add('value')
@@ -264,7 +264,7 @@ describe('observer/collections', () => {
       const key = {}
       const set = observable(new Set())
       const setSpy = jest.fn(() => (dummy = set.has(key)))
-      autorun(setSpy)
+      effect(setSpy)
 
       expect(dummy).toBe(false)
       expect(setSpy).toHaveBeenCalledTimes(1)
@@ -290,7 +290,7 @@ describe('observer/collections', () => {
     it('should observe nested values in iterations (forEach)', () => {
       const set = observable(new Set([{ foo: 1 }]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         set.forEach(value => {
           expect(isObservable(value)).toBe(true)
@@ -307,7 +307,7 @@ describe('observer/collections', () => {
     it('should observe nested values in iterations (values)', () => {
       const set = observable(new Set([{ foo: 1 }]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (const value of set.values()) {
           expect(isObservable(value)).toBe(true)
@@ -324,7 +324,7 @@ describe('observer/collections', () => {
     it('should observe nested values in iterations (entries)', () => {
       const set = observable(new Set([{ foo: 1 }]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (const [key, value] of set.entries()) {
           expect(isObservable(key)).toBe(true)
@@ -342,7 +342,7 @@ describe('observer/collections', () => {
     it('should observe nested values in iterations (for...of)', () => {
       const set = observable(new Set([{ foo: 1 }]))
       let dummy: any
-      autorun(() => {
+      effect(() => {
         dummy = 0
         for (const value of set) {
           expect(isObservable(value)).toBe(true)

packages/observer/__tests__/collections/WeakMap.spec.ts

@@ -1,4 +1,4 @@
-import { observable, autorun, unwrap, isObservable } from '../../src'
+import { observable, effect, unwrap, isObservable } from '../../src'
 
 describe('observer/collections', () => {
   describe('WeakMap', () => {
@@ -14,7 +14,7 @@ describe('observer/collections', () => {
       let dummy
       const key = {}
       const map = observable(new WeakMap())
-      autorun(() => {
+      effect(() => {
         dummy = map.get(key)
       })
 
@@ -30,7 +30,7 @@ describe('observer/collections', () => {
     it('should not observe custom property mutations', () => {
       let dummy
       const map: any = observable(new WeakMap())
-      autorun(() => (dummy = map.customProp))
+      effect(() => (dummy = map.customProp))
 
       expect(dummy).toBe(undefined)
       map.customProp = 'Hello World'
@@ -42,7 +42,7 @@ describe('observer/collections', () => {
       const key = {}
       const map = observable(new WeakMap())
       const mapSpy = jest.fn(() => (dummy = map.get(key)))
-      autorun(mapSpy)
+      effect(mapSpy)
 
       expect(dummy).toBe(undefined)
       expect(mapSpy).toHaveBeenCalledTimes(1)
@@ -64,7 +64,7 @@ describe('observer/collections', () => {
       let dummy
       const key = {}
       const map = observable(new WeakMap())
-      autorun(() => (dummy = unwrap(map).get(key)))
+      effect(() => (dummy = unwrap(map).get(key)))
 
       expect(dummy).toBe(undefined)
       map.set(key, 'Hello')
@@ -98,7 +98,7 @@ describe('observer/collections', () => {
       const key = {}
       observed.set(key, { a: 1 })
       let dummy
-      autorun(() => {
+      effect(() => {
         dummy = observed.get(key).a
       })
       observed.get(key).a = 2

packages/observer/__tests__/collections/WeakSet.spec.ts

@@ -1,4 +1,4 @@
-import { observable, isObservable, autorun, unwrap } from '../../src'
+import { observable, isObservable, effect, unwrap } from '../../src'
 
 describe('observer/collections', () => {
   describe('WeakSet', () => {
@@ -14,7 +14,7 @@ describe('observer/collections', () => {
       let dummy
       const value = {}
       const set = observable(new WeakSet())
-      autorun(() => (dummy = set.has(value)))
+      effect(() => (dummy = set.has(value)))
 
       expect(dummy).toBe(false)
       set.add(value)
@@ -26,7 +26,7 @@ describe('observer/collections', () => {
     it('should not observe custom property mutations', () => {
       let dummy
       const set: any = observable(new WeakSet())
-      autorun(() => (dummy = set.customProp))
+      effect(() => (dummy = set.customProp))
 
       expect(dummy).toBe(undefined)
       set.customProp = 'Hello World'
@@ -38,7 +38,7 @@ describe('observer/collections', () => {
       const value = {}
       const set = observable(new WeakSet())
       const setSpy = jest.fn(() => (dummy = set.has(value)))
-      autorun(setSpy)
+      effect(setSpy)
 
       expect(dummy).toBe(false)
       expect(setSpy).toHaveBeenCalledTimes(1)
@@ -60,7 +60,7 @@ describe('observer/collections', () => {
       const value = {}
       let dummy
       const set = observable(new WeakSet())
-      autorun(() => (dummy = unwrap(set).has(value)))
+      effect(() => (dummy = unwrap(set).has(value)))
 
       expect(dummy).toBe(false)
       set.add(value)
@@ -71,7 +71,7 @@ describe('observer/collections', () => {
       const value = {}
       let dummy
       const set = observable(new WeakSet())
-      autorun(() => (dummy = set.has(value)))
+      effect(() => (dummy = set.has(value)))
 
       expect(dummy).toBe(false)
       unwrap(set).add(value)

packages/observer/__tests__/computed.spec.ts

@@ -1,4 +1,4 @@
-import { computed, observable, autorun, stop } from '../src'
+import { computed, observable, effect, stop } from '../src'
 
 describe('observer/computed', () => {
   it('should return updated value', () => {
@@ -52,11 +52,11 @@ describe('observer/computed', () => {
     expect(callArg).toBe(ctx)
   })
 
-  it('should trigger autorun', () => {
+  it('should trigger effect', () => {
     const value: any = observable({})
     const cValue = computed(() => value.foo)
     let dummy
-    autorun(() => {
+    effect(() => {
       dummy = cValue()
     })
     expect(dummy).toBe(undefined)
@@ -75,7 +75,7 @@ describe('observer/computed', () => {
     expect(c1()).toBe(1)
   })
 
-  it('should trigger autorun when chained', () => {
+  it('should trigger effect when chained', () => {
     const value: any = observable({ foo: 0 })
     const getter1 = jest.fn(() => value.foo)
     const getter2 = jest.fn(() => {
@@ -85,7 +85,7 @@ describe('observer/computed', () => {
     const c2 = computed(getter2)
 
     let dummy
-    autorun(() => {
+    effect(() => {
       dummy = c2()
     })
     expect(dummy).toBe(1)
@@ -98,7 +98,7 @@ describe('observer/computed', () => {
     expect(getter2).toHaveBeenCalledTimes(2)
   })
 
-  it('should trigger autorun when chained (mixed invocations)', () => {
+  it('should trigger effect when chained (mixed invocations)', () => {
     const value: any = observable({ foo: 0 })
     const getter1 = jest.fn(() => value.foo)
     const getter2 = jest.fn(() => {
@@ -108,7 +108,7 @@ describe('observer/computed', () => {
     const c2 = computed(getter2)
 
     let dummy
-    autorun(() => {
+    effect(() => {
       dummy = c1() + c2()
     })
     expect(dummy).toBe(1)
@@ -126,13 +126,13 @@ describe('observer/computed', () => {
     const value: any = observable({})
     const cValue = computed(() => value.foo)
     let dummy
-    autorun(() => {
+    effect(() => {
       dummy = cValue()
     })
     expect(dummy).toBe(undefined)
     value.foo = 1
     expect(dummy).toBe(1)
-    stop(cValue.runner)
+    stop(cValue.effect)
     value.foo = 2
     expect(dummy).toBe(1)
   })

packages/observer/__tests__/effect.spec.ts

@@ -1,25 +1,25 @@
 import {
   observable,
-  autorun,
+  effect,
   stop,
   unwrap,
   OperationTypes,
   DebuggerEvent,
   markNonReactive
 } from '../src/index'
-import { ITERATE_KEY } from '../src/autorun'
+import { ITERATE_KEY } from '../src/effect'
 
-describe('observer/autorun', () => {
-  it('should run the passed function once (wrapped by a autorun)', () => {
+describe('observer/effect', () => {
+  it('should run the passed function once (wrapped by a effect)', () => {
     const fnSpy = jest.fn(() => {})
-    autorun(fnSpy)
+    effect(fnSpy)
     expect(fnSpy).toHaveBeenCalledTimes(1)
   })
 
   it('should observe basic properties', () => {
     let dummy
     const counter = observable({ num: 0 })
-    autorun(() => (dummy = counter.num))
+    effect(() => (dummy = counter.num))
 
     expect(dummy).toBe(0)
     counter.num = 7
@@ -29,18 +29,18 @@ describe('observer/autorun', () => {
   it('should observe multiple properties', () => {
     let dummy
     const counter = observable({ num1: 0, num2: 0 })
-    autorun(() => (dummy = counter.num1 + counter.num1 + counter.num2))
+    effect(() => (dummy = counter.num1 + counter.num1 + counter.num2))
 
     expect(dummy).toBe(0)
     counter.num1 = counter.num2 = 7
     expect(dummy).toBe(21)
   })
 
-  it('should handle multiple autoruns', () => {
+  it('should handle multiple effects', () => {
     let dummy1, dummy2
     const counter = observable({ num: 0 })
-    autorun(() => (dummy1 = counter.num))
-    autorun(() => (dummy2 = counter.num))
+    effect(() => (dummy1 = counter.num))
+    effect(() => (dummy2 = counter.num))
 
     expect(dummy1).toBe(0)
     expect(dummy2).toBe(0)
@@ -52,7 +52,7 @@ describe('observer/autorun', () => {
   it('should observe nested properties', () => {
     let dummy
     const counter = observable({ nested: { num: 0 } })
-    autorun(() => (dummy = counter.nested.num))
+    effect(() => (dummy = counter.nested.num))
 
     expect(dummy).toBe(0)
     counter.nested.num = 8
@@ -62,7 +62,7 @@ describe('observer/autorun', () => {
   it('should observe delete operations', () => {
     let dummy
     const obj = observable({ prop: 'value' })
-    autorun(() => (dummy = obj.prop))
+    effect(() => (dummy = obj.prop))
 
     expect(dummy).toBe('value')
     delete obj.prop
@@ -72,7 +72,7 @@ describe('observer/autorun', () => {
   it('should observe has operations', () => {
     let dummy
     const obj: any = observable({ prop: 'value' })
-    autorun(() => (dummy = 'prop' in obj))
+    effect(() => (dummy = 'prop' in obj))
 
     expect(dummy).toBe(true)
     delete obj.prop
@@ -86,7 +86,7 @@ describe('observer/autorun', () => {
     const counter = observable({ num: 0 })
     const parentCounter = observable({ num: 2 })
     Object.setPrototypeOf(counter, parentCounter)
-    autorun(() => (dummy = counter.num))
+    effect(() => (dummy = counter.num))
 
     expect(dummy).toBe(0)
     delete counter.num
@@ -102,7 +102,7 @@ describe('observer/autorun', () => {
     const counter = observable({ num: 0 })
     const parentCounter = observable({ num: 2 })
     Object.setPrototypeOf(counter, parentCounter)
-    autorun(() => (dummy = 'num' in counter))
+    effect(() => (dummy = 'num' in counter))
 
     expect(dummy).toBe(true)
     delete counter.num
@@ -125,8 +125,8 @@ describe('observer/autorun', () => {
       }
     })
     Object.setPrototypeOf(obj, parent)
-    autorun(() => (dummy = obj.prop))
-    autorun(() => (parentDummy = parent.prop))
+    effect(() => (dummy = obj.prop))
+    effect(() => (parentDummy = parent.prop))
 
     expect(dummy).toBe(undefined)
     expect(parentDummy).toBe(undefined)
@@ -142,7 +142,7 @@ describe('observer/autorun', () => {
   it('should observe function call chains', () => {
     let dummy
     const counter = observable({ num: 0 })
-    autorun(() => (dummy = getNum()))
+    effect(() => (dummy = getNum()))
 
     function getNum() {
       return counter.num
@@ -156,7 +156,7 @@ describe('observer/autorun', () => {
   it('should observe iteration', () => {
     let dummy
     const list = observable(['Hello'])
-    autorun(() => (dummy = list.join(' ')))
+    effect(() => (dummy = list.join(' ')))
 
     expect(dummy).toBe('Hello')
     list.push('World!')
@@ -168,7 +168,7 @@ describe('observer/autorun', () => {
   it('should observe implicit array length changes', () => {
     let dummy
     const list = observable(['Hello'])
-    autorun(() => (dummy = list.join(' ')))
+    effect(() => (dummy = list.join(' ')))
 
     expect(dummy).toBe('Hello')
     list[1] = 'World!'
@@ -181,7 +181,7 @@ describe('observer/autorun', () => {
     let dummy
     const list: any[] = observable([])
     list[1] = 'World!'
-    autorun(() => (dummy = list.join(' ')))
+    effect(() => (dummy = list.join(' ')))
 
     expect(dummy).toBe(' World!')
     list[0] = 'Hello'
@@ -193,7 +193,7 @@ describe('observer/autorun', () => {
   it('should observe enumeration', () => {
     let dummy = 0
     const numbers: any = observable({ num1: 3 })
-    autorun(() => {
+    effect(() => {
       dummy = 0
       for (let key in numbers) {
         dummy += numbers[key]
@@ -211,8 +211,8 @@ describe('observer/autorun', () => {
     const key = Symbol('symbol keyed prop')
     let dummy, hasDummy
     const obj = observable({ [key]: 'value' })
-    autorun(() => (dummy = obj[key]))
-    autorun(() => (hasDummy = key in obj))
+    effect(() => (dummy = obj[key]))
+    effect(() => (hasDummy = key in obj))
 
     expect(dummy).toBe('value')
     expect(hasDummy).toBe(true)
@@ -227,7 +227,7 @@ describe('observer/autorun', () => {
     const key = Symbol.isConcatSpreadable
     let dummy
     const array: any = observable([])
-    autorun(() => (dummy = array[key]))
+    effect(() => (dummy = array[key]))
 
     expect(array[key]).toBe(undefined)
     expect(dummy).toBe(undefined)
@@ -242,7 +242,7 @@ describe('observer/autorun', () => {
 
     let dummy
     const obj = observable({ func: oldFunc })
-    autorun(() => (dummy = obj.func))
+    effect(() => (dummy = obj.func))
 
     expect(dummy).toBe(oldFunc)
     obj.func = newFunc
@@ -255,8 +255,8 @@ describe('observer/autorun', () => {
 
     const getSpy = jest.fn(() => (getDummy = obj.prop))
     const hasSpy = jest.fn(() => (hasDummy = 'prop' in obj))
-    autorun(getSpy)
-    autorun(hasSpy)
+    effect(getSpy)
+    effect(hasSpy)
 
     expect(getDummy).toBe('value')
     expect(hasDummy).toBe(true)
@@ -270,7 +270,7 @@ describe('observer/autorun', () => {
   it('should not observe raw mutations', () => {
     let dummy
     const obj: any = observable()
-    autorun(() => (dummy = unwrap(obj).prop))
+    effect(() => (dummy = unwrap(obj).prop))
 
     expect(dummy).toBe(undefined)
     obj.prop = 'value'
@@ -280,7 +280,7 @@ describe('observer/autorun', () => {
   it('should not be triggered by raw mutations', () => {
     let dummy
     const obj: any = observable()
-    autorun(() => (dummy = obj.prop))
+    effect(() => (dummy = obj.prop))
 
     expect(dummy).toBe(undefined)
     unwrap(obj).prop = 'value'
@@ -299,8 +299,8 @@ describe('observer/autorun', () => {
       }
     })
     Object.setPrototypeOf(obj, parent)
-    autorun(() => (dummy = obj.prop))
-    autorun(() => (parentDummy = parent.prop))
+    effect(() => (dummy = obj.prop))
+    effect(() => (parentDummy = parent.prop))
 
     expect(dummy).toBe(undefined)
     expect(parentDummy).toBe(undefined)
@@ -313,7 +313,7 @@ describe('observer/autorun', () => {
     const counter = observable({ num: 0 })
 
     const counterSpy = jest.fn(() => counter.num++)
-    autorun(counterSpy)
+    effect(counterSpy)
     expect(counter.num).toBe(1)
     expect(counterSpy).toHaveBeenCalledTimes(1)
     counter.num = 4
@@ -329,18 +329,18 @@ describe('observer/autorun', () => {
         numSpy()
       }
     })
-    autorun(numSpy)
+    effect(numSpy)
     expect(counter.num).toEqual(10)
     expect(numSpy).toHaveBeenCalledTimes(10)
   })
 
-  it('should avoid infinite loops with other autoruns', () => {
+  it('should avoid infinite loops with other effects', () => {
     const nums = observable({ num1: 0, num2: 1 })
 
     const spy1 = jest.fn(() => (nums.num1 = nums.num2))
     const spy2 = jest.fn(() => (nums.num2 = nums.num1))
-    autorun(spy1)
-    autorun(spy2)
+    effect(spy1)
+    effect(spy2)
     expect(nums.num1).toBe(1)
     expect(nums.num2).toBe(1)
     expect(spy1).toHaveBeenCalledTimes(1)
@@ -361,12 +361,12 @@ describe('observer/autorun', () => {
     function greet() {
       return 'Hello World'
     }
-    const autorun1 = autorun(greet)
-    const autorun2 = autorun(greet)
-    expect(typeof autorun1).toBe('function')
-    expect(typeof autorun2).toBe('function')
-    expect(autorun1).not.toBe(greet)
-    expect(autorun1).not.toBe(autorun2)
+    const effect1 = effect(greet)
+    const effect2 = effect(greet)
+    expect(typeof effect1).toBe('function')
+    expect(typeof effect2).toBe('function')
+    expect(effect1).not.toBe(greet)
+    expect(effect1).not.toBe(effect2)
   })
 
   it('should discover new branches while running automatically', () => {
@@ -376,7 +376,7 @@ describe('observer/autorun', () => {
     const conditionalSpy = jest.fn(() => {
       dummy = obj.run ? obj.prop : 'other'
     })
-    autorun(conditionalSpy)
+    effect(conditionalSpy)
 
     expect(dummy).toBe('other')
     expect(conditionalSpy).toHaveBeenCalledTimes(1)
@@ -395,7 +395,7 @@ describe('observer/autorun', () => {
     let dummy
     let run = false
     const obj = observable({ prop: 'value' })
-    const runner = autorun(() => {
+    const runner = effect(() => {
       dummy = run ? obj.prop : 'other'
     })
 
@@ -416,7 +416,7 @@ describe('observer/autorun', () => {
     const conditionalSpy = jest.fn(() => {
       dummy = obj.run ? obj.prop : 'other'
     })
-    autorun(conditionalSpy)
+    effect(conditionalSpy)
 
     expect(dummy).toBe('value')
     expect(conditionalSpy).toHaveBeenCalledTimes(1)
@@ -428,9 +428,9 @@ describe('observer/autorun', () => {
     expect(conditionalSpy).toHaveBeenCalledTimes(2)
   })
 
-  it('should not double wrap if the passed function is a autorun', () => {
-    const runner = autorun(() => {})
-    const otherRunner = autorun(runner)
+  it('should not double wrap if the passed function is a effect', () => {
+    const runner = effect(() => {})
+    const otherRunner = effect(runner)
     expect(runner).not.toBe(otherRunner)
     expect(runner.raw).toBe(otherRunner.raw)
   })
@@ -444,7 +444,7 @@ describe('observer/autorun', () => {
       }
       dummy = obj.prop
     })
-    autorun(fnSpy)
+    effect(fnSpy)
 
     expect(fnSpy).toHaveBeenCalledTimes(1)
     obj.prop = 16
@@ -452,33 +452,33 @@ describe('observer/autorun', () => {
     expect(fnSpy).toHaveBeenCalledTimes(2)
   })
 
-  it('should allow nested autoruns', () => {
+  it('should allow nested effects', () => {
     const nums = observable({ num1: 0, num2: 1, num3: 2 })
     const dummy: any = {}
 
     const childSpy = jest.fn(() => (dummy.num1 = nums.num1))
-    const childautorun = autorun(childSpy)
+    const childeffect = effect(childSpy)
     const parentSpy = jest.fn(() => {
       dummy.num2 = nums.num2
-      childautorun()
+      childeffect()
       dummy.num3 = nums.num3
     })
-    autorun(parentSpy)
+    effect(parentSpy)
 
     expect(dummy).toEqual({ num1: 0, num2: 1, num3: 2 })
     expect(parentSpy).toHaveBeenCalledTimes(1)
     expect(childSpy).toHaveBeenCalledTimes(2)
-    // this should only call the childautorun
+    // this should only call the childeffect
     nums.num1 = 4
     expect(dummy).toEqual({ num1: 4, num2: 1, num3: 2 })
     expect(parentSpy).toHaveBeenCalledTimes(1)
     expect(childSpy).toHaveBeenCalledTimes(3)
-    // this calls the parentautorun, which calls the childautorun once
+    // this calls the parenteffect, which calls the childeffect once
     nums.num2 = 10
     expect(dummy).toEqual({ num1: 4, num2: 10, num3: 2 })
     expect(parentSpy).toHaveBeenCalledTimes(2)
     expect(childSpy).toHaveBeenCalledTimes(4)
-    // this calls the parentautorun, which calls the childautorun once
+    // this calls the parenteffect, which calls the childeffect once
     nums.num3 = 7
     expect(dummy).toEqual({ num1: 4, num2: 10, num3: 7 })
     expect(parentSpy).toHaveBeenCalledTimes(3)
@@ -497,7 +497,7 @@ describe('observer/autorun', () => {
     }
     const model = observable(new Model())
     let dummy
-    autorun(() => {
+    effect(() => {
       dummy = model.count
     })
     expect(dummy).toBe(0)
@@ -511,7 +511,7 @@ describe('observer/autorun', () => {
       runner = _runner
     })
     const obj = observable({ foo: 1 })
-    autorun(
+    effect(
       () => {
         dummy = obj.foo
       },
@@ -537,7 +537,7 @@ describe('observer/autorun', () => {
       events.push(e)
     })
     const obj = observable({ foo: 1, bar: 2 })
-    const runner = autorun(
+    const runner = effect(
       () => {
         dummy = obj.foo
         dummy = 'bar' in obj
@@ -549,19 +549,19 @@ describe('observer/autorun', () => {
     expect(onTrack).toHaveBeenCalledTimes(3)
     expect(events).toEqual([
       {
-        runner,
+        effect: runner,
         target: unwrap(obj),
         type: OperationTypes.GET,
         key: 'foo'
       },
       {
-        runner,
+        effect: runner,
         target: unwrap(obj),
         type: OperationTypes.HAS,
         key: 'bar'
       },
       {
-        runner,
+        effect: runner,
         target: unwrap(obj),
         type: OperationTypes.ITERATE,
         key: ITERATE_KEY
@@ -576,7 +576,7 @@ describe('observer/autorun', () => {
       events.push(e)
     })
     const obj = observable({ foo: 1 })
-    const runner = autorun(
+    const runner = effect(
       () => {
         dummy = obj.foo
       },
@@ -587,7 +587,7 @@ describe('observer/autorun', () => {
     expect(dummy).toBe(2)
     expect(onTrigger).toHaveBeenCalledTimes(1)
     expect(events[0]).toEqual({
-      runner,
+      effect: runner,
       target: unwrap(obj),
       type: OperationTypes.SET,
       key: 'foo',
@@ -599,7 +599,7 @@ describe('observer/autorun', () => {
     expect(dummy).toBeUndefined()
     expect(onTrigger).toHaveBeenCalledTimes(2)
     expect(events[1]).toEqual({
-      runner,
+      effect: runner,
       target: unwrap(obj),
       type: OperationTypes.DELETE,
       key: 'foo',
@@ -610,7 +610,7 @@ describe('observer/autorun', () => {
   it('stop', () => {
     let dummy
     const obj = observable({ prop: 1 })
-    const runner = autorun(() => {
+    const runner = effect(() => {
       dummy = obj.prop
     })
     obj.prop = 2
@@ -619,7 +619,7 @@ describe('observer/autorun', () => {
     obj.prop = 3
     expect(dummy).toBe(2)
 
-    // stopped runner should still be manually callable
+    // stopped effect should still be manually callable
     runner()
     expect(dummy).toBe(3)
   })
@@ -631,7 +631,7 @@ describe('observer/autorun', () => {
       })
     })
     let dummy
-    autorun(() => {
+    effect(() => {
       dummy = obj.foo.prop
     })
     expect(dummy).toBe(0)

packages/observer/__tests__/immutable.spec.ts

@@ -8,7 +8,7 @@ import {
   markImmutable,
   lock,
   unlock,
-  autorun
+  effect
 } from '../src'
 
 describe('observer/immutable', () => {
@@ -75,10 +75,10 @@ describe('observer/immutable', () => {
       expect(warn).not.toHaveBeenCalled()
     })
 
-    it('should not trigger autoruns when locked', () => {
+    it('should not trigger effects when locked', () => {
       const observed = immutable({ a: 1 })
       let dummy
-      autorun(() => {
+      effect(() => {
         dummy = observed.a
       })
       expect(dummy).toBe(1)
@@ -87,10 +87,10 @@ describe('observer/immutable', () => {
       expect(dummy).toBe(1)
     })
 
-    it('should trigger autoruns when unlocked', () => {
+    it('should trigger effects when unlocked', () => {
       const observed = immutable({ a: 1 })
       let dummy
-      autorun(() => {
+      effect(() => {
         dummy = observed.a
       })
       expect(dummy).toBe(1)
@@ -161,10 +161,10 @@ describe('observer/immutable', () => {
       expect(warn).not.toHaveBeenCalled()
     })
 
-    it('should not trigger autoruns when locked', () => {
+    it('should not trigger effects when locked', () => {
       const observed = immutable([{ a: 1 }])
       let dummy
-      autorun(() => {
+      effect(() => {
         dummy = observed[0].a
       })
       expect(dummy).toBe(1)
@@ -176,10 +176,10 @@ describe('observer/immutable', () => {
       expect(dummy).toBe(1)
     })
 
-    it('should trigger autoruns when unlocked', () => {
+    it('should trigger effects when unlocked', () => {
       const observed = immutable([{ a: 1 }])
       let dummy
-      autorun(() => {
+      effect(() => {
         dummy = observed[0].a
       })
       expect(dummy).toBe(1)
@@ -220,11 +220,11 @@ describe('observer/immutable', () => {
         expect(isImmutable(original.get(key1))).toBe(false)
       })
 
-      test('should not allow mutation & not trigger autorun', () => {
+      test('should not allow mutation & not trigger effect', () => {
         const map = immutable(new Collection())
         const key = {}
         let dummy
-        autorun(() => {
+        effect(() => {
           dummy = map.get(key)
         })
         expect(dummy).toBeUndefined()
@@ -234,12 +234,12 @@ describe('observer/immutable', () => {
         expect(warn).toHaveBeenCalledTimes(1)
       })
 
-      test('should allow mutation & trigger autorun when unlocked', () => {
+      test('should allow mutation & trigger effect when unlocked', () => {
         const map = immutable(new Collection())
         const isWeak = Collection === WeakMap
         const key = {}
         let dummy
-        autorun(() => {
+        effect(() => {
           dummy = map.get(key) + (isWeak ? 0 : map.size)
         })
         expect(dummy).toBeNaN()
@@ -289,11 +289,11 @@ describe('observer/immutable', () => {
         expect(original.has(observable(key1))).toBe(false)
       })
 
-      test('should not allow mutation & not trigger autorun', () => {
+      test('should not allow mutation & not trigger effect', () => {
         const set = immutable(new Collection())
         const key = {}
         let dummy
-        autorun(() => {
+        effect(() => {
           dummy = set.has(key)
         })
         expect(dummy).toBe(false)
@@ -303,11 +303,11 @@ describe('observer/immutable', () => {
         expect(warn).toHaveBeenCalledTimes(1)
       })
 
-      test('should allow mutation & trigger autorun when unlocked', () => {
+      test('should allow mutation & trigger effect when unlocked', () => {
         const set = immutable(new Collection())
         const key = {}
         let dummy
-        autorun(() => {
+        effect(() => {
           dummy = set.has(key)
         })
         expect(dummy).toBe(false)