Skip to content
This repository was archived by the owner on Feb 23, 2019. It is now read-only.

Commit 5fff05a

Browse files
committed
Update to new state syntax.
1 parent 210fcf3 commit 5fff05a

File tree

6 files changed

+37
-69
lines changed

6 files changed

+37
-69
lines changed

tests/Http.mint

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,16 @@ suite "Http.sendWithID" {
148148
}
149149
}
150150

151-
record Test.Http {
152-
status : Number,
153-
error : String,
154-
body : String
155-
}
156-
157151
component Test.Http {
158152
property method : String = "GET"
159153
property timeout : Bool = false
160154
property url : String = "/blah"
161155
property abort : Bool = false
162156
property error : Bool = false
163157

164-
state : Test.Http {
165-
status = 0,
166-
error = "",
167-
body = ""
168-
}
158+
state errorMessage : String = ""
159+
state status : Number = 0
160+
state body : String = ""
169161

170162
fun componentDidMount : Void {
171163
do {
@@ -190,34 +182,34 @@ component Test.Http {
190182
})
191183
`)
192184

193-
next { state | status = response.status }
185+
next { status = response.status }
194186
} catch Http.ErrorResponse => error {
195187
case (error.type) {
196188
Http.Error::NetworkError =>
197189
next
198-
{ state |
199-
error = "network-error",
190+
{
191+
errorMessage = "network-error",
200192
status = error.status
201193
}
202194

203195
Http.Error::BadUrl =>
204196
next
205-
{ state |
206-
error = "bad-url",
197+
{
198+
errorMessage = "bad-url",
207199
status = error.status
208200
}
209201

210202
Http.Error::Timeout =>
211203
next
212-
{ state |
213-
error = "timeout",
204+
{
205+
errorMessage = "timeout",
214206
status = error.status
215207
}
216208

217209
Http.Error::Aborted =>
218210
next
219-
{ state |
220-
error = "aborted",
211+
{
212+
errorMessage = "aborted",
221213
status = error.status
222214
}
223215

@@ -229,15 +221,15 @@ component Test.Http {
229221
fun render : Html {
230222
<div>
231223
<error>
232-
<{ state.error }>
224+
<{ errorMessage }>
233225
</error>
234226

235227
<content>
236-
<{ state.body }>
228+
<{ body }>
237229
</content>
238230

239231
<status>
240-
<{ Number.toString(state.status) }>
232+
<{ Number.toString(status) }>
241233
</status>
242234
</div>
243235
}

tests/Promise.mint

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
record Test.Promise {
2-
result : String
3-
}
4-
51
component Test.Promise {
6-
state : Test.Promise { result = "" }
2+
state result : String = ""
73

84
fun reject : Void {
95
do {
106
Promise.reject("rejected")
117
} catch String => result {
12-
next { state | result = result }
8+
next { result = result }
139
}
1410
}
1511

@@ -18,14 +14,14 @@ component Test.Promise {
1814
result =
1915
Promise.resolve("resolved")
2016

21-
next { state | result = result }
17+
next { result = result }
2218
}
2319
}
2420

2521
fun render : Html {
2622
<div>
2723
<result>
28-
<{ state.result }>
24+
<{ result }>
2925
</result>
3026

3127
<resolve onClick={(event : Html.Event) : Void => { resolve() }}/>

tests/Provider/AnimationFrame.mint

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
record Test.Provider.AnimationFrame {
2-
frames : Number
3-
}
4-
51
component Test.Provider.AnimationFrame {
6-
state : Test.Provider.AnimationFrame { frames = 0 }
2+
state frames : Number = 0
73

8-
use Provider.AnimationFrame { frames = () : Void => { next { state | frames = state.frames + 1 } } }
4+
use Provider.AnimationFrame { frames = () : Void => { next { frames = frames + 1 } } }
95

106
fun render : Html {
117
<div>
12-
<{ Number.toString(state.frames) }>
8+
<{ Number.toString(frames) }>
139
</div>
1410
}
1511
}

tests/Provider/Mouse.mint

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
1-
record Test.Provider.Mouse {
2-
clicks : Number,
3-
moves : Number,
4-
ups : Number
5-
}
6-
71
component Test.Provider.Mouse {
8-
state : Test.Provider.Mouse {
9-
clicks = 0,
10-
moves = 0,
11-
ups = 0
12-
}
2+
state clicks : Number = 0
3+
state moves : Number = 0
4+
state ups : Number = 0
135

146
use Provider.Mouse {
15-
clicks = (event : Html.Event) : Void => { next { state | clicks = state.clicks + 1 } },
16-
moves = (event : Html.Event) : Void => { next { state | moves = state.moves + 1 } },
17-
ups = (event : Html.Event) : Void => { next { state | ups = state.ups + 1 } }
7+
clicks = (event : Html.Event) : Void => { next { clicks = clicks + 1 } },
8+
moves = (event : Html.Event) : Void => { next { moves = moves + 1 } },
9+
ups = (event : Html.Event) : Void => { next { ups = ups + 1 } }
1810
}
1911

2012
fun render : Html {
2113
<div>
2214
<clicks>
23-
<{ Number.toString(state.clicks) }>
15+
<{ Number.toString(clicks) }>
2416
</clicks>
2517

2618
<moves>
27-
<{ Number.toString(state.moves) }>
19+
<{ Number.toString(moves) }>
2820
</moves>
2921

3022
<ups>
31-
<{ Number.toString(state.ups) }>
23+
<{ Number.toString(ups) }>
3224
</ups>
3325
</div>
3426
}

tests/Provider/Scroll.mint

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
record Test.Provider.Scroll {
2-
position : Number
3-
}
4-
51
component Test.Provider.Scroll {
6-
use Provider.Scroll { scrolls = (event : Html.Event) : Void => { next { state | position = Window.scrollTop() } } }
2+
use Provider.Scroll { scrolls = (event : Html.Event) : Void => { next { position = Window.scrollTop() } } }
73

8-
state : Test.Provider.Scroll { position = 0 }
4+
state position : Number = 0
95

106
style base {
117
height: 3000px;
@@ -14,7 +10,7 @@ component Test.Provider.Scroll {
1410

1511
fun render : Html {
1612
<div::base>
17-
<{ Number.toString(state.position) }>
13+
<{ Number.toString(position) }>
1814
</div>
1915
}
2016
}

tests/Provider/Tick.mint

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
record Test.Provider.Tick {
2-
counter : Number
3-
}
4-
51
component Test.Provider.Tick {
6-
state : Test.Provider.Tick { counter = 0 }
2+
state counter : Number = 0
73

8-
use Provider.Tick { ticks = () : Void => { next { state | counter = state.counter + 1 } } }
4+
use Provider.Tick { ticks = () : Void => { next { counter = counter + 1 } } }
95

106
fun render : Html {
117
<div>
12-
<{ Number.toString(state.counter) }>
8+
<{ Number.toString(counter) }>
139
</div>
1410
}
1511
}

0 commit comments

Comments
 (0)