theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip: state -> reactive, value -> ref

Browse Source
This commit is contained in:
Evan You
2019-08-16 09:42:46 -04:00
parent 09141b56fd
commit caba6d5c9e
17 changed files with 398 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
packages/reactivity/__tests__/collections/Map.spec.ts
View File

@@ -1,18 +1,18 @@
import { state, effect, toRaw, isState } from '../../src'
import { reactive, effect, toRaw, isReactive } from '../../src'
describe('observer/collections', () => {
describe('Map', () => {
test('instanceof', () => {
const original = new Map()
const observed = state(original)
expect(isState(observed)).toBe(true)
const observed = reactive(original)
expect(isReactive(observed)).toBe(true)
expect(original instanceof Map).toBe(true)
expect(observed instanceof Map).toBe(true)
})
it('should observe mutations', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => {
dummy = map.get('key')
})
@@ -28,7 +28,7 @@ describe('observer/collections', () => {
it('should observe size mutations', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => (dummy = map.size))
expect(dummy).toBe(0)
@@ -43,7 +43,7 @@ describe('observer/collections', () => {
it('should observe for of iteration', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => {
dummy = 0
// eslint-disable-next-line no-unused-vars
@@ -66,7 +66,7 @@ describe('observer/collections', () => {
it('should observe forEach iteration', () => {
let dummy: any
const map = state(new Map())
const map = reactive(new Map())
effect(() => {
dummy = 0
map.forEach((num: any) => (dummy += num))
@@ -85,7 +85,7 @@ describe('observer/collections', () => {
it('should observe keys iteration', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => {
dummy = 0
for (let key of map.keys()) {
@@ -106,7 +106,7 @@ describe('observer/collections', () => {
it('should observe values iteration', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => {
dummy = 0
for (let num of map.values()) {
@@ -127,7 +127,7 @@ describe('observer/collections', () => {
it('should observe entries iteration', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => {
dummy = 0
// eslint-disable-next-line no-unused-vars
@@ -150,7 +150,7 @@ describe('observer/collections', () => {
it('should be triggered by clearing', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => (dummy = map.get('key')))
expect(dummy).toBe(undefined)
@@ -162,7 +162,7 @@ describe('observer/collections', () => {
it('should not observe custom property mutations', () => {
let dummy
const map: any = state(new Map())
const map: any = reactive(new Map())
effect(() => (dummy = map.customProp))
expect(dummy).toBe(undefined)
@@ -172,7 +172,7 @@ describe('observer/collections', () => {
it('should not observe non value changing mutations', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
const mapSpy = jest.fn(() => (dummy = map.get('key')))
effect(mapSpy)
@@ -197,7 +197,7 @@ describe('observer/collections', () => {
it('should not observe raw data', () => {
let dummy
const map = state(new Map())
const map = reactive(new Map())
effect(() => (dummy = toRaw(map).get('key')))
expect(dummy).toBe(undefined)
@@ -209,24 +209,24 @@ describe('observer/collections', () => {
it('should not pollute original Map with Proxies', () => {
const map = new Map()
const observed = state(map)
const value = state({})
const observed = reactive(map)
const value = reactive({})
observed.set('key', value)
expect(map.get('key')).not.toBe(value)
expect(map.get('key')).toBe(toRaw(value))
})
it('should return observable versions of contained values', () => {
const observed = state(new Map())
const observed = reactive(new Map())
const value = {}
observed.set('key', value)
const wrapped = observed.get('key')
expect(isState(wrapped)).toBe(true)
expect(isReactive(wrapped)).toBe(true)
expect(toRaw(wrapped)).toBe(value)
})
it('should observed nested data', () => {
const observed = state(new Map())
const observed = reactive(new Map())
observed.set('key', { a: 1 })
let dummy
effect(() => {
@@ -237,12 +237,12 @@ describe('observer/collections', () => {
})
it('should observe nested values in iterations (forEach)', () => {
const map = state(new Map([[1, { foo: 1 }]]))
const map = reactive(new Map([[1, { foo: 1 }]]))
let dummy: any
effect(() => {
dummy = 0
map.forEach(value => {
expect(isState(value)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
})
})
@@ -252,12 +252,12 @@ describe('observer/collections', () => {
})
it('should observe nested values in iterations (values)', () => {
const map = state(new Map([[1, { foo: 1 }]]))
const map = reactive(new Map([[1, { foo: 1 }]]))
let dummy: any
effect(() => {
dummy = 0
for (const value of map.values()) {
expect(isState(value)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
}
})
@@ -268,14 +268,14 @@ describe('observer/collections', () => {
it('should observe nested values in iterations (entries)', () => {
const key = {}
const map = state(new Map([[key, { foo: 1 }]]))
const map = reactive(new Map([[key, { foo: 1 }]]))
let dummy: any
effect(() => {
dummy = 0
for (const [key, value] of map.entries()) {
key
expect(isState(key)).toBe(true)
expect(isState(value)).toBe(true)
expect(isReactive(key)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
}
})
@@ -286,14 +286,14 @@ describe('observer/collections', () => {
it('should observe nested values in iterations (for...of)', () => {
const key = {}
const map = state(new Map([[key, { foo: 1 }]]))
const map = reactive(new Map([[key, { foo: 1 }]]))
let dummy: any
effect(() => {
dummy = 0
for (const [key, value] of map) {
key
expect(isState(key)).toBe(true)
expect(isState(value)).toBe(true)
expect(isReactive(key)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
}
})

60
packages/reactivity/__tests__/collections/Set.spec.ts
View File

@@ -1,18 +1,18 @@
import { state, effect, isState, toRaw } from '../../src'
import { reactive, effect, isReactive, toRaw } from '../../src'
describe('observer/collections', () => {
describe('Set', () => {
it('instanceof', () => {
const original = new Set()
const observed = state(original)
expect(isState(observed)).toBe(true)
const observed = reactive(original)
expect(isReactive(observed)).toBe(true)
expect(original instanceof Set).toBe(true)
expect(observed instanceof Set).toBe(true)
})
it('should observe mutations', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
effect(() => (dummy = set.has('value')))
expect(dummy).toBe(false)
@@ -24,7 +24,7 @@ describe('observer/collections', () => {
it('should observe for of iteration', () => {
let dummy
const set = state(new Set() as Set<number>)
const set = reactive(new Set() as Set<number>)
effect(() => {
dummy = 0
for (let num of set) {
@@ -44,7 +44,7 @@ describe('observer/collections', () => {
it('should observe forEach iteration', () => {
let dummy: any
const set = state(new Set())
const set = reactive(new Set())
effect(() => {
dummy = 0
set.forEach(num => (dummy += num))
@@ -62,7 +62,7 @@ describe('observer/collections', () => {
it('should observe values iteration', () => {
let dummy
const set = state(new Set() as Set<number>)
const set = reactive(new Set() as Set<number>)
effect(() => {
dummy = 0
for (let num of set.values()) {
@@ -82,7 +82,7 @@ describe('observer/collections', () => {
it('should observe keys iteration', () => {
let dummy
const set = state(new Set() as Set<number>)
const set = reactive(new Set() as Set<number>)
effect(() => {
dummy = 0
for (let num of set.keys()) {
@@ -102,7 +102,7 @@ describe('observer/collections', () => {
it('should observe entries iteration', () => {
let dummy
const set = state(new Set() as Set<number>)
const set = reactive(new Set() as Set<number>)
effect(() => {
dummy = 0
// eslint-disable-next-line no-unused-vars
@@ -124,7 +124,7 @@ describe('observer/collections', () => {
it('should be triggered by clearing', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
effect(() => (dummy = set.has('key')))
expect(dummy).toBe(false)
@@ -136,7 +136,7 @@ describe('observer/collections', () => {
it('should not observe custom property mutations', () => {
let dummy
const set: any = state(new Set())
const set: any = reactive(new Set())
effect(() => (dummy = set.customProp))
expect(dummy).toBe(undefined)
@@ -146,7 +146,7 @@ describe('observer/collections', () => {
it('should observe size mutations', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
effect(() => (dummy = set.size))
expect(dummy).toBe(0)
@@ -161,7 +161,7 @@ describe('observer/collections', () => {
it('should not observe non value changing mutations', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
const setSpy = jest.fn(() => (dummy = set.has('value')))
effect(setSpy)
@@ -186,7 +186,7 @@ describe('observer/collections', () => {
it('should not observe raw data', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
effect(() => (dummy = toRaw(set).has('value')))
expect(dummy).toBe(false)
@@ -196,7 +196,7 @@ describe('observer/collections', () => {
it('should not observe raw iterations', () => {
let dummy = 0
const set = state(new Set() as Set<number>)
const set = reactive(new Set() as Set<number>)
effect(() => {
dummy = 0
for (let [num] of toRaw(set).entries()) {
@@ -226,7 +226,7 @@ describe('observer/collections', () => {
it('should not be triggered by raw mutations', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
effect(() => (dummy = set.has('value')))
expect(dummy).toBe(false)
@@ -241,7 +241,7 @@ describe('observer/collections', () => {
it('should not observe raw size mutations', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
effect(() => (dummy = toRaw(set).size))
expect(dummy).toBe(0)
@@ -251,7 +251,7 @@ describe('observer/collections', () => {
it('should not be triggered by raw size mutations', () => {
let dummy
const set = state(new Set())
const set = reactive(new Set())
effect(() => (dummy = set.size))
expect(dummy).toBe(0)
@@ -262,7 +262,7 @@ describe('observer/collections', () => {
it('should support objects as key', () => {
let dummy
const key = {}
const set = state(new Set())
const set = reactive(new Set())
const setSpy = jest.fn(() => (dummy = set.has(key)))
effect(setSpy)
@@ -280,20 +280,20 @@ describe('observer/collections', () => {
it('should not pollute original Set with Proxies', () => {
const set = new Set()
const observed = state(set)
const value = state({})
const observed = reactive(set)
const value = reactive({})
observed.add(value)
expect(observed.has(value)).toBe(true)
expect(set.has(value)).toBe(false)
})
it('should observe nested values in iterations (forEach)', () => {
const set = state(new Set([{ foo: 1 }]))
const set = reactive(new Set([{ foo: 1 }]))
let dummy: any
effect(() => {
dummy = 0
set.forEach(value => {
expect(isState(value)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
})
})
@@ -305,12 +305,12 @@ describe('observer/collections', () => {
})
it('should observe nested values in iterations (values)', () => {
const set = state(new Set([{ foo: 1 }]))
const set = reactive(new Set([{ foo: 1 }]))
let dummy: any
effect(() => {
dummy = 0
for (const value of set.values()) {
expect(isState(value)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
}
})
@@ -322,13 +322,13 @@ describe('observer/collections', () => {
})
it('should observe nested values in iterations (entries)', () => {
const set = state(new Set([{ foo: 1 }]))
const set = reactive(new Set([{ foo: 1 }]))
let dummy: any
effect(() => {
dummy = 0
for (const [key, value] of set.entries()) {
expect(isState(key)).toBe(true)
expect(isState(value)).toBe(true)
expect(isReactive(key)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
}
})
@@ -340,12 +340,12 @@ describe('observer/collections', () => {
})
it('should observe nested values in iterations (for...of)', () => {
const set = state(new Set([{ foo: 1 }]))
const set = reactive(new Set([{ foo: 1 }]))
let dummy: any
effect(() => {
dummy = 0
for (const value of set) {
expect(isState(value)).toBe(true)
expect(isReactive(value)).toBe(true)
dummy += value.foo
}
})

24
packages/reactivity/__tests__/collections/WeakMap.spec.ts
View File

@@ -1,11 +1,11 @@
import { state, effect, toRaw, isState } from '../../src'
import { reactive, effect, toRaw, isReactive } from '../../src'
describe('observer/collections', () => {
describe('WeakMap', () => {
test('instanceof', () => {
const original = new WeakMap()
const observed = state(original)
expect(isState(observed)).toBe(true)
const observed = reactive(original)
expect(isReactive(observed)).toBe(true)
expect(original instanceof WeakMap).toBe(true)
expect(observed instanceof WeakMap).toBe(true)
})
@@ -13,7 +13,7 @@ describe('observer/collections', () => {
it('should observe mutations', () => {
let dummy
const key = {}
const map = state(new WeakMap())
const map = reactive(new WeakMap())
effect(() => {
dummy = map.get(key)
})
@@ -29,7 +29,7 @@ describe('observer/collections', () => {
it('should not observe custom property mutations', () => {
let dummy
const map: any = state(new WeakMap())
const map: any = reactive(new WeakMap())
effect(() => (dummy = map.customProp))
expect(dummy).toBe(undefined)
@@ -40,7 +40,7 @@ describe('observer/collections', () => {
it('should not observe non value changing mutations', () => {
let dummy
const key = {}
const map = state(new WeakMap())
const map = reactive(new WeakMap())
const mapSpy = jest.fn(() => (dummy = map.get(key)))
effect(mapSpy)
@@ -63,7 +63,7 @@ describe('observer/collections', () => {
it('should not observe raw data', () => {
let dummy
const key = {}
const map = state(new WeakMap())
const map = reactive(new WeakMap())
effect(() => (dummy = toRaw(map).get(key)))
expect(dummy).toBe(undefined)
@@ -75,26 +75,26 @@ describe('observer/collections', () => {
it('should not pollute original Map with Proxies', () => {
const map = new WeakMap()
const observed = state(map)
const observed = reactive(map)
const key = {}
const value = state({})
const value = reactive({})
observed.set(key, value)
expect(map.get(key)).not.toBe(value)
expect(map.get(key)).toBe(toRaw(value))
})
it('should return observable versions of contained values', () => {
const observed = state(new WeakMap())
const observed = reactive(new WeakMap())
const key = {}
const value = {}
observed.set(key, value)
const wrapped = observed.get(key)
expect(isState(wrapped)).toBe(true)
expect(isReactive(wrapped)).toBe(true)
expect(toRaw(wrapped)).toBe(value)
})
it('should observed nested data', () => {
const observed = state(new Map())
const observed = reactive(new Map())
const key = {}
observed.set(key, { a: 1 })
let dummy

20
packages/reactivity/__tests__/collections/WeakSet.spec.ts
View File

@@ -1,11 +1,11 @@
import { state, isState, effect, toRaw } from '../../src'
import { reactive, isReactive, effect, toRaw } from '../../src'
describe('observer/collections', () => {
describe('WeakSet', () => {
it('instanceof', () => {
const original = new Set()
const observed = state(original)
expect(isState(observed)).toBe(true)
const observed = reactive(original)
expect(isReactive(observed)).toBe(true)
expect(original instanceof Set).toBe(true)
expect(observed instanceof Set).toBe(true)
})
@@ -13,7 +13,7 @@ describe('observer/collections', () => {
it('should observe mutations', () => {
let dummy
const value = {}
const set = state(new WeakSet())
const set = reactive(new WeakSet())
effect(() => (dummy = set.has(value)))
expect(dummy).toBe(false)
@@ -25,7 +25,7 @@ describe('observer/collections', () => {
it('should not observe custom property mutations', () => {
let dummy
const set: any = state(new WeakSet())
const set: any = reactive(new WeakSet())
effect(() => (dummy = set.customProp))
expect(dummy).toBe(undefined)
@@ -36,7 +36,7 @@ describe('observer/collections', () => {
it('should not observe non value changing mutations', () => {
let dummy
const value = {}
const set = state(new WeakSet())
const set = reactive(new WeakSet())
const setSpy = jest.fn(() => (dummy = set.has(value)))
effect(setSpy)
@@ -59,7 +59,7 @@ describe('observer/collections', () => {
it('should not observe raw data', () => {
const value = {}
let dummy
const set = state(new WeakSet())
const set = reactive(new WeakSet())
effect(() => (dummy = toRaw(set).has(value)))
expect(dummy).toBe(false)
@@ -70,7 +70,7 @@ describe('observer/collections', () => {
it('should not be triggered by raw mutations', () => {
const value = {}
let dummy
const set = state(new WeakSet())
const set = reactive(new WeakSet())
effect(() => (dummy = set.has(value)))
expect(dummy).toBe(false)
@@ -80,8 +80,8 @@ describe('observer/collections', () => {
it('should not pollute original Set with Proxies', () => {
const set = new WeakSet()
const observed = state(set)
const value = state({})
const observed = reactive(set)
const value = reactive({})
observed.add(value)
expect(observed.has(value)).toBe(true)
expect(set.has(value)).toBe(false)