8f13fc9 · rowtype-yoga/purescript-backend-optimizer

git.iko.soy/rowtype-yoga/purescript-backend-optimizer

on main help sign in

fix(#114): "\xdc11" string causes "An error occurred while decoding a JSON value" -> parse Array CodePoint (#116)

8f13fc9Russians tortured my 18yo friend Ivan bc of ukr flag in mobile phone1 year ago

backend-es/test/snapshots-out/Snapshot.StringLiteral01.js+2−1

compare with main

unifiedsplit

@@ -1,4 +1,5 @@

1+const test4 = "\udc11";

1const test3 = "\u0000";

2const test3 = "\u0000";

2const test2 = "\u0012";

3const test2 = "\u0012";

3const test1 = "B";

4const test1 = "B";

4−export {test1, test2, test3};

5+export {test1, test2, test3, test4};

backend-es/test/snapshots/Snapshot.StringLiteral01.purs+1

@@ -3,3 +3,4 @@ module Snapshot.StringLiteral01 where

3test1 = "\x000042"

4test2 = "\x000012"

5test3 = "\x000000"

6+test4 = "\xdc11"

src/PureScript/Backend/Optimizer/CoreFn/Json.purs+13−1

@@ -15,9 +15,11 @@ import Data.Argonaut (Json, JsonDecodeError(..), caseJson, decodeJson, isNull)

15import Data.Array as Array

16import Data.Array.ST as STArray

17import Data.Either (Either(..), note)

18+import Data.Enum (toEnum)

18import Data.Foldable (intercalate)

19import Data.Foldable (intercalate)

19import Data.Int as Int

20import Data.Int as Int

20import Data.Maybe (Maybe(..))

21import Data.Maybe (Maybe(..))

22+import Data.String.CodePoints (CodePoint, fromCodePointArray)

21import Data.String.CodeUnits as SCU

23import Data.String.CodeUnits as SCU

22import Data.Traversable (traverse)

24import Data.Traversable (traverse)

23import Data.Tuple (Tuple(..))

25import Data.Tuple (Tuple(..))

@@ -264,7 +266,7 @@ decodeLiteral dec json = do

264 "NumberLiteral" ->

266 "NumberLiteral" ->

265 LitNumber <$> getField decodeNumber obj "value"

267 LitNumber <$> getField decodeNumber obj "value"

266 "StringLiteral" ->

268 "StringLiteral" ->

267− LitString <$> getField decodeString obj "value"

269+ LitString <$> getField decodeStringLiteral obj "value"

268 "CharLiteral" -> do

270 "CharLiteral" -> do

269 str <- getField decodeString obj "value"

271 str <- getField decodeString obj "value"

270 LitChar <$> note (TypeMismatch "Char") do

272 LitChar <$> note (TypeMismatch "Char") do

@@ -358,12 +360,22 @@ decodeJArray = caseJson fail fail fail fail Right fail

358 fail :: forall a. a -> JsonDecode (Array Json)

360 fail :: forall a. a -> JsonDecode (Array Json)

359 fail _ = Left $ TypeMismatch "Array"

361 fail _ = Left $ TypeMismatch "Array"

360

362

363+decodeStringLiteral :: Json -> JsonDecode String

364+decodeStringLiteral json =

365+ decodeString json <|> \_ -> map fromCodePointArray (decodeCodePointArray json) <|> \_ -> throwError (TypeMismatch "StringLiteral")

366+

361decodeString :: Json -> JsonDecode String

367decodeString :: Json -> JsonDecode String

362decodeString = caseJson fail fail fail Right fail fail

368decodeString = caseJson fail fail fail Right fail fail

363 where

369 where

364 fail :: forall a. a -> JsonDecode String

370 fail :: forall a. a -> JsonDecode String

365 fail _ = Left $ TypeMismatch "String"

371 fail _ = Left $ TypeMismatch "String"

366

372

373+decodeCodePointArray :: Json -> JsonDecode (Array CodePoint)

374+decodeCodePointArray = decodeArray decodeCodePoint

375+

376+decodeCodePoint :: Json -> JsonDecode CodePoint

377+decodeCodePoint = note (TypeMismatch "CodePoint") <<< toEnum <=< decodeInt

378+

367decodeNumber :: Json -> JsonDecode Number

379decodeNumber :: Json -> JsonDecode Number

368decodeNumber = caseJson fail fail Right fail fail fail

380decodeNumber = caseJson fail fail Right fail fail fail

369 where

381 where