@@ -5,20 +5,14 @@ import Prelude
55import Control.Monad.Writer.Trans (tell)
66import Data.Array (foldRecM)
77import Data.Array as Array
8−import Data.ArrayBuffer.ArrayBuffer (byteLength)
9−import Data.ArrayBuffer.Builder (Builder, DataBuff(..), PutM, execPut, putArrayBuffer, putInt16be, putInt32be, putInt32le, putInt8, subBuilder)
8+import Data.ArrayBuffer.Builder (Builder, DataBuff(..), PutM, execPut, putInt16be, putInt32le, putInt8, subBuilder)
109import Data.ArrayBuffer.Builder.Internal (cons, encodeInt8, execBuilder, length, singleton, (<>>))
1110import Data.ArrayBuffer.DataView as DV
12−import Data.ArrayBuffer.Typed (buffer)
1311import Data.ArrayBuffer.Typed as AT
14−import Data.ArrayBuffer.Typed as AV
15−import Data.ArrayBuffer.Types (ArrayBuffer, Uint8Array, Int8Array)
12+import Data.ArrayBuffer.Types (ArrayBuffer, Uint8Array)
1613import Data.UInt as UInt
1714import Effect (Effect)
18−import Effect.Class (class MonadEffect, liftEffect)
1915import Test.Assert (assertEqual')
20−import Web.Encoding.TextEncoder (encode)
21−import Web.Encoding.TextEncoder as TextEncoder
2216
2317asBytes :: ArrayBuffer -> Effect (Array Int)
2418asBytes x = do
@@ -28,48 +22,48 @@ asBytes x = do
2822putTest :: String -> Array Int -> PutM Effect Unit -> Effect Unit
2923putTest label expected put = do
3024 actual <- asBytes =<< execPut put
31− assertEqual' label { actual, expected }
25+ assertEqual' label {actual,expected}
3226
3327buildTest :: String -> Array Int -> Effect Builder -> Effect Unit
3428buildTest label expected bldr = do
3529 actual <- asBytes =<< execBuilder =<< bldr
36− assertEqual' label { actual, expected }
30+ assertEqual' label {actual,expected}
3731
3832main :: Effect Unit
3933main = do
40− putTest "Test 0" [ 6, 7, 8 ] do
34+ putTest "Test 0" [6,7,8] do
4135 putInt8 6
4236 putInt8 7
4337 putInt8 8
4438
45− putTest "Test 1" [ 255, 254 ] do
39+ putTest "Test 1" [255,254] do
4640 putInt16be (-2)
4741
48− putTest "Test 3" [ 3, 0, 0, 0 ] do
42+ putTest "Test 3" [3,0,0,0] do
4943 putInt32le 3
5044
51− buildTest "Test 4" [ 1, 2, 3, 4 ] do
45+ buildTest "Test 4" [1,2,3,4] do
5246 b1 <- Buff <$> encodeInt8 1
5347 b2 <- Buff <$> encodeInt8 2
5448 b3 <- Buff <$> encodeInt8 3
5549 b4 <- Buff <$> encodeInt8 4
5650 pure $ singleton b1 <> singleton b2 <> singleton b3 <> singleton b4
5751
58− buildTest "Test 5" [ 1, 2, 3, 4 ] do
52+ buildTest "Test 5" [1,2,3,4] do
5953 b1 <- Buff <$> encodeInt8 1
6054 b2 <- Buff <$> encodeInt8 2
6155 b3 <- Buff <$> encodeInt8 3
6256 b4 <- Buff <$> encodeInt8 4
6357 pure $ singleton b1 <>> singleton b2 <>> singleton b3 <>> singleton b4
6458
65− buildTest "Test 6" [ 1, 2, 3, 4 ] do
59+ buildTest "Test 6" [1,2,3,4] do
6660 b1 <- Buff <$> encodeInt8 1
6761 b2 <- Buff <$> encodeInt8 2
6862 b3 <- Buff <$> encodeInt8 3
6963 b4 <- Buff <$> encodeInt8 4
7064 pure $ singleton b1 <> (singleton b2 <> singleton b3) <> singleton b4
7165
72− buildTest "Test 6" [ 1, 2, 3, 4, 5, 6, 7, 8 ] do
66+ buildTest "Test 6" [1,2,3,4,5,6,7,8] do
7367 b1 <- Buff <$> encodeInt8 1
7468 b2 <- Buff <$> encodeInt8 2
7569 b3 <- Buff <$> encodeInt8 3
@@ -79,11 +73,9 @@ main = do
7973 b7 <- Buff <$> encodeInt8 7
8074 b8 <- Buff <$> encodeInt8 8
8175 pure $ singleton b1 <> (singleton b2 <> singleton b3) <> singleton b4
82− <> singleton b5
83− <> (singleton b6 <> singleton b7)
84− <> singleton b8
76+ <> singleton b5 <> (singleton b6 <> singleton b7) <> singleton b8
8577
86− buildTest "Test 7" [ 1, 2, 3, 4, 5, 6, 7, 8 ] do
78+ buildTest "Test 7" [1,2,3,4,5,6,7,8] do
8779 b1 <- Buff <$> encodeInt8 1
8880 b2 <- Buff <$> encodeInt8 2
8981 b3 <- Buff <$> encodeInt8 3
@@ -93,16 +85,16 @@ main = do
9385 b7 <- Buff <$> encodeInt8 7
9486 b8 <- Buff <$> encodeInt8 8
9587 pure $ ((singleton b1 <> singleton b2) <> (singleton b3 <> singleton b4))
96− <> ((singleton b5 <> singleton b6) <> (singleton b7 <> singleton b8))
88+ <> ((singleton b5 <> singleton b6) <> (singleton b7 <> singleton b8))
9789
98− buildTest "Test 8" [ 1, 2, 3, 4 ] do
90+ buildTest "Test 8" [1,2,3,4] do
9991 b1 <- Buff <$> encodeInt8 1
10092 b2 <- Buff <$> encodeInt8 2
10193 b3 <- Buff <$> encodeInt8 3
10294 b4 <- Buff <$> encodeInt8 4
10395 pure $ (cons b1 (singleton b2)) <> (cons b3 (singleton b4))
10496
105− putTest "Test 9" [ 1, 2, 2, 3, 4 ] do
97+ putTest "Test 9" [1,2,2,3,4] do
10698 x <- subBuilder do
10799 putInt8 3
108100 putInt8 4
@@ -111,7 +103,7 @@ main = do
111103 putInt8 $ length x
112104 tell x
113105
114− buildTest "Test 10" [ 1, 2, 3, 4, 5, 6, 7, 8 ] do
106+ buildTest "Test 10" [1,2,3,4,5,6,7,8] do
115107 b1 <- View <$> DV.whole <$> encodeInt8 1
116108 b2 <- View <$> DV.whole <$> encodeInt8 2
117109 b3 <- View <$> DV.whole <$> encodeInt8 3
@@ -121,26 +113,8 @@ main = do
121113 b7 <- View <$> DV.whole <$> encodeInt8 7
122114 b8 <- View <$> DV.whole <$> encodeInt8 8
123115 pure $ ((singleton b1 <> singleton b2) <> (singleton b3 <> singleton b4))
124− <> ((singleton b5 <> singleton b6) <> (singleton b7 <> singleton b8))
116+ <> ((singleton b5 <> singleton b6) <> (singleton b7 <> singleton b8))
125117
126118 let stackblower = Array.replicate 20000 2
127119 putTest "Stack test" stackblower do
128120 foldRecM (\_ x -> putInt8 x) unit stackblower
129−
130− do
131− let
132− putStringUtf8 :: forall m. MonadEffect m => String -> PutM m Unit
133− putStringUtf8 s = do
134− textEncoder <- liftEffect TextEncoder.new
135− let stringbuf = buffer $ encode s textEncoder
136− -- Put a 32-bit big-endian length prefix for the length of the utf8 string, in bytes.
137− putInt32be $ byteLength stringbuf
138− putArrayBuffer stringbuf
139−
140− arraybuffer :: ArrayBuffer <- execPut $ putStringUtf8 "🦝"
141− view :: Int8Array <- AV.whole arraybuffer
142− viewarray <- AV.toArray view
143− assertEqual' "utf-8 test"
144− { actual: viewarray
145− , expected: [ 0, 0, 0, 4, -16, -97, -90, -99 ]
146− }