Skip to content

Commit 80d1eb7

Browse files
yyx990803yyx990803
committed
refactor: rename things
1 parent 0cd8183 commit 80d1eb7

22 files changed

+423
-414
lines changed

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { observable, autorun, unwrap, isObservable } from '../../src'
1+
import { observable, effect, unwrap, isObservable } from '../../src'
22

33
describe('observer/collections', () => {
44
describe('Map', () => {
@@ -13,7 +13,7 @@ describe('observer/collections', () => {
1313
it('should observe mutations', () => {
1414
let dummy
1515
const map = observable(new Map())
16-
autorun(() => {
16+
effect(() => {
1717
dummy = map.get('key')
1818
})
1919

@@ -29,7 +29,7 @@ describe('observer/collections', () => {
2929
it('should observe size mutations', () => {
3030
let dummy
3131
const map = observable(new Map())
32-
autorun(() => (dummy = map.size))
32+
effect(() => (dummy = map.size))
3333

3434
expect(dummy).toBe(0)
3535
map.set('key1', 'value')
@@ -44,7 +44,7 @@ describe('observer/collections', () => {
4444
it('should observe for of iteration', () => {
4545
let dummy
4646
const map = observable(new Map())
47-
autorun(() => {
47+
effect(() => {
4848
dummy = 0
4949
// eslint-disable-next-line no-unused-vars
5050
for (let [key, num] of map) {
@@ -67,7 +67,7 @@ describe('observer/collections', () => {
6767
it('should observe forEach iteration', () => {
6868
let dummy: any
6969
const map = observable(new Map())
70-
autorun(() => {
70+
effect(() => {
7171
dummy = 0
7272
map.forEach((num: any) => (dummy += num))
7373
})
@@ -86,7 +86,7 @@ describe('observer/collections', () => {
8686
it('should observe keys iteration', () => {
8787
let dummy
8888
const map = observable(new Map())
89-
autorun(() => {
89+
effect(() => {
9090
dummy = 0
9191
for (let key of map.keys()) {
9292
dummy += key
@@ -107,7 +107,7 @@ describe('observer/collections', () => {
107107
it('should observe values iteration', () => {
108108
let dummy
109109
const map = observable(new Map())
110-
autorun(() => {
110+
effect(() => {
111111
dummy = 0
112112
for (let num of map.values()) {
113113
dummy += num
@@ -128,7 +128,7 @@ describe('observer/collections', () => {
128128
it('should observe entries iteration', () => {
129129
let dummy
130130
const map = observable(new Map())
131-
autorun(() => {
131+
effect(() => {
132132
dummy = 0
133133
// eslint-disable-next-line no-unused-vars
134134
for (let [key, num] of map.entries()) {
@@ -151,7 +151,7 @@ describe('observer/collections', () => {
151151
it('should be triggered by clearing', () => {
152152
let dummy
153153
const map = observable(new Map())
154-
autorun(() => (dummy = map.get('key')))
154+
effect(() => (dummy = map.get('key')))
155155

156156
expect(dummy).toBe(undefined)
157157
map.set('key', 3)
@@ -163,7 +163,7 @@ describe('observer/collections', () => {
163163
it('should not observe custom property mutations', () => {
164164
let dummy
165165
const map: any = observable(new Map())
166-
autorun(() => (dummy = map.customProp))
166+
effect(() => (dummy = map.customProp))
167167

168168
expect(dummy).toBe(undefined)
169169
map.customProp = 'Hello World'
@@ -174,7 +174,7 @@ describe('observer/collections', () => {
174174
let dummy
175175
const map = observable(new Map())
176176
const mapSpy = jest.fn(() => (dummy = map.get('key')))
177-
autorun(mapSpy)
177+
effect(mapSpy)
178178

179179
expect(dummy).toBe(undefined)
180180
expect(mapSpy).toHaveBeenCalledTimes(1)
@@ -198,7 +198,7 @@ describe('observer/collections', () => {
198198
it('should not observe raw data', () => {
199199
let dummy
200200
const map = observable(new Map())
201-
autorun(() => (dummy = unwrap(map).get('key')))
201+
effect(() => (dummy = unwrap(map).get('key')))
202202

203203
expect(dummy).toBe(undefined)
204204
map.set('key', 'Hello')
@@ -229,7 +229,7 @@ describe('observer/collections', () => {
229229
const observed = observable(new Map())
230230
observed.set('key', { a: 1 })
231231
let dummy
232-
autorun(() => {
232+
effect(() => {
233233
dummy = observed.get('key').a
234234
})
235235
observed.get('key').a = 2
@@ -239,7 +239,7 @@ describe('observer/collections', () => {
239239
it('should observe nested values in iterations (forEach)', () => {
240240
const map = observable(new Map([[1, { foo: 1 }]]))
241241
let dummy: any
242-
autorun(() => {
242+
effect(() => {
243243
dummy = 0
244244
map.forEach(value => {
245245
expect(isObservable(value)).toBe(true)
@@ -254,7 +254,7 @@ describe('observer/collections', () => {
254254
it('should observe nested values in iterations (values)', () => {
255255
const map = observable(new Map([[1, { foo: 1 }]]))
256256
let dummy: any
257-
autorun(() => {
257+
effect(() => {
258258
dummy = 0
259259
for (const value of map.values()) {
260260
expect(isObservable(value)).toBe(true)
@@ -270,7 +270,7 @@ describe('observer/collections', () => {
270270
const key = {}
271271
const map = observable(new Map([[key, { foo: 1 }]]))
272272
let dummy: any
273-
autorun(() => {
273+
effect(() => {
274274
dummy = 0
275275
for (const [key, value] of map.entries()) {
276276
key
@@ -288,7 +288,7 @@ describe('observer/collections', () => {
288288
const key = {}
289289
const map = observable(new Map([[key, { foo: 1 }]]))
290290
let dummy: any
291-
autorun(() => {
291+
effect(() => {
292292
dummy = 0
293293
for (const [key, value] of map) {
294294
key

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

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { observable, autorun, isObservable, unwrap } from '../../src'
1+
import { observable, effect, isObservable, unwrap } from '../../src'
22

33
describe('observer/collections', () => {
44
describe('Set', () => {
@@ -13,7 +13,7 @@ describe('observer/collections', () => {
1313
it('should observe mutations', () => {
1414
let dummy
1515
const set = observable(new Set())
16-
autorun(() => (dummy = set.has('value')))
16+
effect(() => (dummy = set.has('value')))
1717

1818
expect(dummy).toBe(false)
1919
set.add('value')
@@ -25,7 +25,7 @@ describe('observer/collections', () => {
2525
it('should observe for of iteration', () => {
2626
let dummy
2727
const set = observable(new Set())
28-
autorun(() => {
28+
effect(() => {
2929
dummy = 0
3030
for (let num of set) {
3131
dummy += num
@@ -45,7 +45,7 @@ describe('observer/collections', () => {
4545
it('should observe forEach iteration', () => {
4646
let dummy: any
4747
const set = observable(new Set())
48-
autorun(() => {
48+
effect(() => {
4949
dummy = 0
5050
set.forEach(num => (dummy += num))
5151
})
@@ -63,7 +63,7 @@ describe('observer/collections', () => {
6363
it('should observe values iteration', () => {
6464
let dummy
6565
const set = observable(new Set())
66-
autorun(() => {
66+
effect(() => {
6767
dummy = 0
6868
for (let num of set.values()) {
6969
dummy += num
@@ -83,7 +83,7 @@ describe('observer/collections', () => {
8383
it('should observe keys iteration', () => {
8484
let dummy
8585
const set = observable(new Set())
86-
autorun(() => {
86+
effect(() => {
8787
dummy = 0
8888
for (let num of set.keys()) {
8989
dummy += num
@@ -103,7 +103,7 @@ describe('observer/collections', () => {
103103
it('should observe entries iteration', () => {
104104
let dummy
105105
const set = observable(new Set())
106-
autorun(() => {
106+
effect(() => {
107107
dummy = 0
108108
// eslint-disable-next-line no-unused-vars
109109
for (let [key, num] of set.entries()) {
@@ -125,7 +125,7 @@ describe('observer/collections', () => {
125125
it('should be triggered by clearing', () => {
126126
let dummy
127127
const set = observable(new Set())
128-
autorun(() => (dummy = set.has('key')))
128+
effect(() => (dummy = set.has('key')))
129129

130130
expect(dummy).toBe(false)
131131
set.add('key')
@@ -137,7 +137,7 @@ describe('observer/collections', () => {
137137
it('should not observe custom property mutations', () => {
138138
let dummy
139139
const set: any = observable(new Set())
140-
autorun(() => (dummy = set.customProp))
140+
effect(() => (dummy = set.customProp))
141141

142142
expect(dummy).toBe(undefined)
143143
set.customProp = 'Hello World'
@@ -147,7 +147,7 @@ describe('observer/collections', () => {
147147
it('should observe size mutations', () => {
148148
let dummy
149149
const set = observable(new Set())
150-
autorun(() => (dummy = set.size))
150+
effect(() => (dummy = set.size))
151151

152152
expect(dummy).toBe(0)
153153
set.add('value')
@@ -163,7 +163,7 @@ describe('observer/collections', () => {
163163
let dummy
164164
const set = observable(new Set())
165165
const setSpy = jest.fn(() => (dummy = set.has('value')))
166-
autorun(setSpy)
166+
effect(setSpy)
167167

168168
expect(dummy).toBe(false)
169169
expect(setSpy).toHaveBeenCalledTimes(1)
@@ -187,7 +187,7 @@ describe('observer/collections', () => {
187187
it('should not observe raw data', () => {
188188
let dummy
189189
const set = observable(new Set())
190-
autorun(() => (dummy = unwrap(set).has('value')))
190+
effect(() => (dummy = unwrap(set).has('value')))
191191

192192
expect(dummy).toBe(false)
193193
set.add('value')
@@ -197,7 +197,7 @@ describe('observer/collections', () => {
197197
it('should not observe raw iterations', () => {
198198
let dummy = 0
199199
const set = observable(new Set())
200-
autorun(() => {
200+
effect(() => {
201201
dummy = 0
202202
for (let [num] of unwrap(set).entries()) {
203203
dummy += num
@@ -227,7 +227,7 @@ describe('observer/collections', () => {
227227
it('should not be triggered by raw mutations', () => {
228228
let dummy
229229
const set = observable(new Set())
230-
autorun(() => (dummy = set.has('value')))
230+
effect(() => (dummy = set.has('value')))
231231

232232
expect(dummy).toBe(false)
233233
unwrap(set).add('value')
@@ -242,7 +242,7 @@ describe('observer/collections', () => {
242242
it('should not observe raw size mutations', () => {
243243
let dummy
244244
const set = observable(new Set())
245-
autorun(() => (dummy = unwrap(set).size))
245+
effect(() => (dummy = unwrap(set).size))
246246

247247
expect(dummy).toBe(0)
248248
set.add('value')
@@ -252,7 +252,7 @@ describe('observer/collections', () => {
252252
it('should not be triggered by raw size mutations', () => {
253253
let dummy
254254
const set = observable(new Set())
255-
autorun(() => (dummy = set.size))
255+
effect(() => (dummy = set.size))
256256

257257
expect(dummy).toBe(0)
258258
unwrap(set).add('value')
@@ -264,7 +264,7 @@ describe('observer/collections', () => {
264264
const key = {}
265265
const set = observable(new Set())
266266
const setSpy = jest.fn(() => (dummy = set.has(key)))
267-
autorun(setSpy)
267+
effect(setSpy)
268268

269269
expect(dummy).toBe(false)
270270
expect(setSpy).toHaveBeenCalledTimes(1)
@@ -290,7 +290,7 @@ describe('observer/collections', () => {
290290
it('should observe nested values in iterations (forEach)', () => {
291291
const set = observable(new Set([{ foo: 1 }]))
292292
let dummy: any
293-
autorun(() => {
293+
effect(() => {
294294
dummy = 0
295295
set.forEach(value => {
296296
expect(isObservable(value)).toBe(true)
@@ -307,7 +307,7 @@ describe('observer/collections', () => {
307307
it('should observe nested values in iterations (values)', () => {
308308
const set = observable(new Set([{ foo: 1 }]))
309309
let dummy: any
310-
autorun(() => {
310+
effect(() => {
311311
dummy = 0
312312
for (const value of set.values()) {
313313
expect(isObservable(value)).toBe(true)
@@ -324,7 +324,7 @@ describe('observer/collections', () => {
324324
it('should observe nested values in iterations (entries)', () => {
325325
const set = observable(new Set([{ foo: 1 }]))
326326
let dummy: any
327-
autorun(() => {
327+
effect(() => {
328328
dummy = 0
329329
for (const [key, value] of set.entries()) {
330330
expect(isObservable(key)).toBe(true)
@@ -342,7 +342,7 @@ describe('observer/collections', () => {
342342
it('should observe nested values in iterations (for...of)', () => {
343343
const set = observable(new Set([{ foo: 1 }]))
344344
let dummy: any
345-
autorun(() => {
345+
effect(() => {
346346
dummy = 0
347347
for (const value of set) {
348348
expect(isObservable(value)).toBe(true)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { observable, autorun, unwrap, isObservable } from '../../src'
1+
import { observable, effect, unwrap, isObservable } from '../../src'
22

33
describe('observer/collections', () => {
44
describe('WeakMap', () => {
@@ -14,7 +14,7 @@ describe('observer/collections', () => {
1414
let dummy
1515
const key = {}
1616
const map = observable(new WeakMap())
17-
autorun(() => {
17+
effect(() => {
1818
dummy = map.get(key)
1919
})
2020

@@ -30,7 +30,7 @@ describe('observer/collections', () => {
3030
it('should not observe custom property mutations', () => {
3131
let dummy
3232
const map: any = observable(new WeakMap())
33-
autorun(() => (dummy = map.customProp))
33+
effect(() => (dummy = map.customProp))
3434

3535
expect(dummy).toBe(undefined)
3636
map.customProp = 'Hello World'
@@ -42,7 +42,7 @@ describe('observer/collections', () => {
4242
const key = {}
4343
const map = observable(new WeakMap())
4444
const mapSpy = jest.fn(() => (dummy = map.get(key)))
45-
autorun(mapSpy)
45+
effect(mapSpy)
4646

4747
expect(dummy).toBe(undefined)
4848
expect(mapSpy).toHaveBeenCalledTimes(1)
@@ -64,7 +64,7 @@ describe('observer/collections', () => {
6464
let dummy
6565
const key = {}
6666
const map = observable(new WeakMap())
67-
autorun(() => (dummy = unwrap(map).get(key)))
67+
effect(() => (dummy = unwrap(map).get(key)))
6868

6969
expect(dummy).toBe(undefined)
7070
map.set(key, 'Hello')
@@ -98,7 +98,7 @@ describe('observer/collections', () => {
9898
const key = {}
9999
observed.set(key, { a: 1 })
100100
let dummy
101-
autorun(() => {
101+
effect(() => {
102102
dummy = observed.get(key).a
103103
})
104104
observed.get(key).a = 2

0 commit comments

Comments
 (0)