Skip to content

PoC annotations + subclassing rework #2641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 39 commits into from
Jan 27, 2021
Merged

PoC annotations + subclassing rework #2641

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
26b4f0e
wip
urugator Nov 24, 2020
32ad8f5
fix unused vars
urugator Nov 25, 2020
3bab5ad
fix comment
urugator Nov 25, 2020
5261dd6
Merge branch 'main' into fix-2593
urugator Nov 25, 2020
8044d5c
Merge branch 'main' into fix-2593
urugator Nov 25, 2020
3bb2a63
revert enumerability changes
urugator Dec 7, 2020
2a088cb
wip
urugator Dec 12, 2020
8df20fa
wip
urugator Dec 13, 2020
6490d33
wip
urugator Dec 14, 2020
ccfbcb3
wip
urugator Dec 15, 2020
e5cc9d2
wip
urugator Dec 16, 2020
0a96a03
wip
urugator Dec 16, 2020
79a43c2
wip
urugator Dec 16, 2020
9abcae3
wip
urugator Dec 17, 2020
6a6ebf6
wip
urugator Dec 17, 2020
f6700ec
wip
urugator Dec 18, 2020
2eaeeb8
wip
urugator Dec 19, 2020
6776820
wip
urugator Dec 20, 2020
277c2c6
wip
urugator Dec 20, 2020
cf38187
wip
urugator Dec 21, 2020
f67e12f
wip
urugator Dec 21, 2020
84fa3ae
wip
urugator Dec 29, 2020
408bf11
comments
urugator Dec 29, 2020
070fa3c
processing comments
urugator Jan 12, 2021
a04e977
processing comments
urugator Jan 18, 2021
cfa6540
descriptor cache
urugator Jan 19, 2021
1160bf8
...
urugator Jan 19, 2021
44ea51d
don't annotate proto on action.bound
urugator Jan 19, 2021
5550d51
optimize makeAutoObservable, fix symbolic action name, fix inferred a…
urugator Jan 19, 2021
4abf263
cleanup, defineProperty tests
urugator Jan 20, 2021
14656dd
fix comment
urugator Jan 21, 2021
b3fd353
fix comment
urugator Jan 21, 2021
c7f9102
extendObservable includes non-enumerable, optimize makeAutoObservable
urugator Jan 22, 2021
6782d25
little tweak
urugator Jan 22, 2021
96de304
fix imports, fix plain object detection
urugator Jan 23, 2021
9d31b92
docs
urugator Jan 26, 2021
6ee6637
docs
urugator Jan 26, 2021
62ba4a9
changeset
urugator Jan 26, 2021
8cb03b5
Merge branch 'main' into fix-2593
urugator Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/mobx/__tests__/v5/base/__snapshots__/proxies.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Object {
},
"double": Object {
"configurable": true,
"enumerable": false,
"enumerable": true,
"value": [Function],
"writable": true,
},
Expand Down Expand Up @@ -45,7 +45,7 @@ Object {
},
"double": Object {
"configurable": true,
"enumerable": false,
"enumerable": true,
"value": [Function],
"writable": true,
},
Expand Down Expand Up @@ -80,7 +80,7 @@ Object {
},
"double": Object {
"configurable": true,
"enumerable": false,
"enumerable": true,
"value": [Function],
"writable": true,
},
Expand Down
2 changes: 1 addition & 1 deletion packages/mobx/__tests__/v5/base/action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ test("bound actions bind", () => {
expect(called).toBe(2)

expect(events.filter(e => e.type === "action").map(e => e.name)).toEqual(["z"])
expect(Object.keys(x)).toEqual(["y"])
expect(Object.keys(x)).toEqual(["y", "z"])

d()
d2()
Expand Down
3 changes: 2 additions & 1 deletion packages/mobx/__tests__/v5/base/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ test("correct api should be exposed", function () {
"entries",
"when",
"_startAction",
"_endAction"
"_endAction",
"override"
].sort()
)
})
Expand Down
29 changes: 17 additions & 12 deletions packages/mobx/__tests__/v5/base/babel-decorators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,8 @@ test("inheritance", () => {
expect(values).toEqual([10, 11, 12, 14, 18])
})

test("inheritance overrides observable", () => {
// Re-annotating and re-defining is no longer possible and is covered by other tests
test.skip("inheritance overrides observable", () => {
class A {
@observable a = 2

Expand Down Expand Up @@ -629,7 +630,7 @@ test("enumerability", () => {
} // non-enumerable, (and, ideally, on proto)
@action
m() {} // non-enumerable, on proto
@action m2 = () => {} // non-enumerable, on self
@action m2 = () => {} // enumerable, on self
}

const a = new A()
Expand All @@ -639,9 +640,9 @@ test("enumerability", () => {
let props = []
for (const key in a) props.push(key)

expect(ownProps).toEqual(["a", "a2"])
expect(ownProps).toEqual(["a", "a2", "m2"])

expect(props).toEqual(["a", "a2"])
expect(props).toEqual(["a", "a2", "m2"])

expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
Expand All @@ -664,10 +665,11 @@ test("enumerability", () => {

expect(ownProps).toEqual([
"a",
"a2" // a2 is now initialized as well, altough never accessed!
"a2", // a2 is now initialized as well, altough never accessed!
"m2"
])

expect(props).toEqual(["a", "a2"])
expect(props).toEqual(["a", "a2", "m2"])

expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
Expand All @@ -687,7 +689,7 @@ test("enumerability - workaround", () => {
} // non-enumerable, (and, ideally, on proto)
@action
m() {} // non-enumerable, on proto
@action m2 = () => {} // non-enumerable, on self
@action m2 = () => {} // enumerable, on self

constructor() {
makeObservable(this)
Expand All @@ -704,10 +706,11 @@ test("enumerability - workaround", () => {

expect(ownProps).toEqual([
"a",
"a2" // a2 is now initialized as well, altough never accessed!
"a2", // a2 is now initialized as well, altough never accessed!
"m2"
])

expect(props).toEqual(["a", "a2"])
expect(props).toEqual(["a", "a2", "m2"])

expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
Expand Down Expand Up @@ -779,7 +782,6 @@ test("379, inheritable actions (babel)", () => {
makeObservable(this)
}

@action
method() {
return super.method() * 2
}
Expand All @@ -791,7 +793,6 @@ test("379, inheritable actions (babel)", () => {
makeObservable(this)
}

@action
method() {
return super.method() + 3
}
Expand All @@ -810,7 +811,8 @@ test("379, inheritable actions (babel)", () => {
expect(isAction(c.method)).toBe(true)
})

test("379, inheritable actions - 2 (babel)", () => {
// Changing annotation configuration is not supported
test.skip("379, inheritable actions - 2 (babel)", () => {
class A {
constructor() {
makeObservable(this)
Expand Down Expand Up @@ -1041,6 +1043,8 @@ test("@computed.equals (Babel)", () => {
})

test("actions are reassignable", () => {
const __DEV__PREV = __DEV__
__DEV__ = false
// See #1398, make actions reassignable to support stubbing
class A {
constructor() {
Expand Down Expand Up @@ -1068,6 +1072,7 @@ test("actions are reassignable", () => {
expect(isAction(a.m3)).toBe(false)
a.m4 = () => {}
expect(isAction(a.m4)).toBe(false)
__DEV__ = __DEV__PREV
})

test("it should support asyncAction (babel)", async () => {
Expand Down
43 changes: 17 additions & 26 deletions packages/mobx/__tests__/v5/base/babel-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,8 @@ test("inheritance - 2", () => {
expect(values).toEqual([10, 11, 12, 14, 18])
})

test("inheritance overrides observable", () => {
// Re-annotating and re-defining is no longer possible and is covered by other tests
test.skip("inheritance overrides observable", () => {
class A {
a = 2

Expand Down Expand Up @@ -795,7 +796,7 @@ test("enumerability", () => {
return this.a
} // non-enumerable, (and, ideally, on proto)
m() {} // non-enumerable, on proto
m2 = () => {} // non-enumerable, on self
m2 = () => {} // enumerable, on self
}

const a = new A()
Expand All @@ -805,9 +806,9 @@ test("enumerability", () => {
let props = []
for (const key in a) props.push(key)

expect(ownProps).toEqual(["a", "a2"])
expect(ownProps).toEqual(["a", "a2", "m2"])

expect(props).toEqual(["a", "a2"])
expect(props).toEqual(["a", "a2", "m2"])

expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
Expand All @@ -830,10 +831,11 @@ test("enumerability", () => {

expect(ownProps).toEqual([
"a",
"a2" // a2 is now initialized as well, altough never accessed!
"a2", // a2 is now initialized as well, altough never accessed!
"m2"
])

expect(props).toEqual(["a", "a2"])
expect(props).toEqual(["a", "a2", "m2"])

expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
Expand All @@ -851,7 +853,7 @@ test("enumerability - workaround", () => {
return this.a
} // non-enumerable, (and, ideally, on proto)
m() {} // non-enumerable, on proto
m2 = () => {} // non-enumerable, on self
m2 = () => {} // enumerable, on self

constructor() {
makeObservable(this, {
Expand All @@ -875,10 +877,11 @@ test("enumerability - workaround", () => {

expect(ownProps).toEqual([
"a",
"a2" // a2 is now initialized as well, altough never accessed!
"a2", // a2 is now initialized as well, altough never accessed!
"m2"
])

expect(props).toEqual(["a", "a2"])
expect(props).toEqual(["a", "a2", "m2"])

expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
Expand Down Expand Up @@ -953,28 +956,12 @@ test("379, inheritable actions (babel)", () => {
}

class B extends A {
constructor() {
super()

makeObservable(this, {
method: action
})
}

method() {
return super.method() * 2
}
}

class C extends B {
constructor() {
super()

makeObservable(this, {
method: action
})
}

method() {
return super.method() + 3
}
Expand All @@ -993,7 +980,8 @@ test("379, inheritable actions (babel)", () => {
expect(isAction(c.method)).toBe(true)
})

test("379, inheritable actions - 2 (babel)", () => {
// Changing annotation or it's configuration is not supported
test.skip("379, inheritable actions - 2 (babel)", () => {
class A {
constructor() {
makeObservable(this, {
Expand Down Expand Up @@ -1399,6 +1387,8 @@ test("computed comparer works with decorate (babel) - 3", () => {
})

test("actions are reassignable", () => {
const __DEV__PREV = __DEV__
__DEV__ = false
// See #1398, make actions reassignable to support stubbing
class A {
constructor() {
Expand Down Expand Up @@ -1429,6 +1419,7 @@ test("actions are reassignable", () => {
expect(isAction(a.m3)).toBe(false)
a.m4 = () => {}
expect(isAction(a.m4)).toBe(false)
__DEV__ = __DEV__PREV
})

test("it should support asyncAction (babel)", async () => {
Expand Down
Loading