Merge remote-tracking branch 'origin' into 7.0.x

This commit is contained in:
William Cheng
2023-03-03 21:52:50 +08:00
10595 changed files with 418520 additions and 73194 deletions

View File

@@ -91,7 +91,7 @@ type alias Absent =
type alias Array =
{ array : List (String)
, arrayOfArray : List (List (String))
, arrayOfPrimitve : Maybe (List (Primitive))
, arrayOfPrimitive : Maybe (List (Primitive))
, arrayOfEnum : Maybe (List (Enum))
}
@@ -297,7 +297,7 @@ encodeArrayPairs model =
pairs =
[ encode "array" (Json.Encode.list Json.Encode.string) model.array
, encode "arrayOfArray" (Json.Encode.list (Json.Encode.list Json.Encode.string)) model.arrayOfArray
, maybeEncode "arrayOfPrimitve" (Json.Encode.list encodePrimitive) model.arrayOfPrimitve
, maybeEncode "arrayOfPrimitive" (Json.Encode.list encodePrimitive) model.arrayOfPrimitive
, maybeEncode "arrayOfEnum" (Json.Encode.list encodeEnum) model.arrayOfEnum
]
in
@@ -646,7 +646,7 @@ arrayDecoder =
Json.Decode.succeed Array
|> decode "array" (Json.Decode.list Json.Decode.string)
|> decode "arrayOfArray" (Json.Decode.list (Json.Decode.list Json.Decode.string))
|> maybeDecode "arrayOfPrimitve" (Json.Decode.list primitiveDecoder) Nothing
|> maybeDecode "arrayOfPrimitive" (Json.Decode.list primitiveDecoder) Nothing
|> maybeDecode "arrayOfEnum" (Json.Decode.list enumDecoder) Nothing