aboutsummaryrefslogtreecommitdiffstats
path: root/style-generator/src
diff options
context:
space:
mode:
authorJakub Hampl <kopomir@gmail.com>2019-02-14 15:23:49 +0000
committerGitHub <noreply@github.com>2019-02-14 15:23:49 +0000
commit6bd5f8ccbd8c44c3311ef36b0e2de9ede4fa71ed (patch)
treede40a36d34cb734c2765a705506436f8b38e28a9 /style-generator/src
parentf0c36a3d49fad46e0fb6cafeb7a021dd5d775993 (diff)
New Style Generator (#8)
Diffstat (limited to 'style-generator/src')
-rw-r--r--style-generator/src/Color.elm104
-rw-r--r--style-generator/src/Decoder.elm707
-rw-r--r--style-generator/src/Decoder/Expression.elm345
-rw-r--r--style-generator/src/Decoder/Generic.elm52
-rw-r--r--style-generator/src/Decoder/Helpers.elm9
-rw-r--r--style-generator/src/Decoder/Legacy.elm110
-rw-r--r--style-generator/src/Lib.elm101
-rw-r--r--style-generator/src/Main.elm209
-rw-r--r--style-generator/src/MyElm/Advanced.elm46
-rw-r--r--style-generator/src/MyElm/Stringify.elm282
-rw-r--r--style-generator/src/MyElm/Syntax.elm678
-rw-r--r--style-generator/src/MyElm/Types.elm56
-rw-r--r--style-generator/src/Writer.elm640
13 files changed, 2039 insertions, 1300 deletions
diff --git a/style-generator/src/Color.elm b/style-generator/src/Color.elm
index b4e8b73..b1c0f59 100644
--- a/style-generator/src/Color.elm
+++ b/style-generator/src/Color.elm
@@ -13,13 +13,111 @@ parser =
oneOf
[ keywords
, hsla
-
- -- , rgba
- -- , hex
+ , rgba
+ , hex
]
|. end
+hexNumber =
+ Parser.number
+ { int = Nothing
+ , hex = Just identity
+ , octal = Nothing
+ , binary = Nothing
+ , float = Nothing
+ }
+
+
+hexDigit : Parser Int
+hexDigit =
+ oneOf
+ [ succeed 0 |. symbol "0"
+ , succeed 1 |. symbol "1"
+ , succeed 2 |. symbol "2"
+ , succeed 3 |. symbol "3"
+ , succeed 4 |. symbol "4"
+ , succeed 5 |. symbol "5"
+ , succeed 6 |. symbol "6"
+ , succeed 7 |. symbol "7"
+ , succeed 8 |. symbol "8"
+ , succeed 9 |. symbol "9"
+ , succeed 10 |. symbol "A"
+ , succeed 11 |. symbol "B"
+ , succeed 12 |. symbol "C"
+ , succeed 13 |. symbol "D"
+ , succeed 14 |. symbol "E"
+ , succeed 15 |. symbol "F"
+ , succeed 10 |. symbol "a"
+ , succeed 11 |. symbol "b"
+ , succeed 12 |. symbol "c"
+ , succeed 13 |. symbol "d"
+ , succeed 14 |. symbol "e"
+ , succeed 15 |. symbol "f"
+ ]
+
+
+twoDigits : Int -> Int -> Int
+twoDigits a b =
+ Bitwise.shiftLeftBy 4 a + b
+
+
+hex : Parser Color
+hex =
+ succeed
+ (\a b c maybe ->
+ case maybe of
+ Just ( d, e, f ) ->
+ { r = twoDigits a b
+ , g = twoDigits c d
+ , b = twoDigits e f
+ , a = 1
+ }
+
+ Nothing ->
+ { r = twoDigits a a
+ , g = twoDigits b b
+ , b = twoDigits c c
+ , a = 1
+ }
+ )
+ |. symbol "#"
+ |= hexDigit
+ |= hexDigit
+ |= hexDigit
+ |= oneOf
+ [ succeed (\a b c -> Just ( a, b, c ))
+ |= hexDigit
+ |= hexDigit
+ |= hexDigit
+ , succeed Nothing
+ ]
+
+
+rgba : Parser Color
+rgba =
+ succeed Color
+ |. oneOf [ keyword "rgba", keyword "rgb" ]
+ |. symbol "("
+ |= Parser.int
+ |. spaces
+ |. symbol ","
+ |. spaces
+ |= Parser.int
+ |. spaces
+ |. symbol ","
+ |. spaces
+ |= Parser.int
+ |= oneOf
+ [ succeed identity
+ |. symbol ","
+ |. spaces
+ |= Parser.float
+ , succeed 1
+ ]
+ |. symbol ")"
+
+
fromHSLA hue sat light alpha =
let
( h, s, l ) =
diff --git a/style-generator/src/Decoder.elm b/style-generator/src/Decoder.elm
index 65dc0a2..5acb722 100644
--- a/style-generator/src/Decoder.elm
+++ b/style-generator/src/Decoder.elm
@@ -1,104 +1,74 @@
module Decoder exposing (styleCode)
-import Color
-import Elm.Syntax.Declaration exposing (Declaration(..))
-import Elm.Syntax.Exposing exposing (Exposing(..), TopLevelExpose(..))
-import Elm.Syntax.Expression exposing (Expression(..), RecordSetter)
-import Elm.Syntax.Infix exposing (InfixDirection(..))
-import Elm.Syntax.Module exposing (Module(..))
-import Elm.Syntax.Node exposing (Node(..))
-import Elm.Syntax.Pattern
-import Elm.Syntax.Range exposing (emptyRange)
-import Elm.Syntax.TypeAnnotation exposing (TypeAnnotation(..))
+import Decoder.Expression as Decode
+import Decoder.Generic as Decode
+import Decoder.Helpers exposing (todo)
+import Decoder.Legacy
import Json.Decode as D exposing (Decoder)
-import Json.Encode
+import Lib
+import MyElm.Advanced as Advanced
+import MyElm.Syntax exposing (..)
import String.Case exposing (toCamelCaseLower)
-import Writer
-node =
- Node emptyRange
+styleNs =
+ [ "Mapbox", "Style" ]
-wrapNodes =
- List.map node
+layerNs =
+ [ "Mapbox", "Layer" ]
+
+
+sourceNs =
+ [ "Mapbox", "Source" ]
+
+
+styleName nm =
+ Advanced.aliasedName
+ { modulePath = styleNs
+ , aliasName =
+ "Style"
+ , name = nm
+ , typeName = Nothing
+ }
+
+
+layerName nm =
+ Advanced.aliasedName
+ { modulePath = layerNs
+ , aliasName =
+ "Layer"
+ , name = nm
+ , typeName = Nothing
+ }
styleCode : Decoder String
styleCode =
- D.map (file >> Writer.writeFile >> Writer.write) style
+ D.map file style
declarations styleDec =
- [ FunctionDeclaration
- { documentation = Nothing
- , signature =
- Just
- (node
- { name = node "style"
- , typeAnnotation = node (Typed (node ( [], "Style" )) [])
- }
- )
- , declaration =
- node
- { name = node "style"
- , arguments = []
- , expression =
- node <|
- Application <|
- wrapNodes
- [ FunctionOrValue [] "Style"
- , RecordExpr styleDec
- ]
- }
- }
- ]
+ [ variable "style" (type0 (typeName styleNs "Style")) (call1 (constructorName [ "Mapbox", "Style" ] "Style" "Style") (record styleDec)) ]
file styleDec =
- { moduleDefinition =
- node
- (NormalModule
- { moduleName = node [ "Style" ]
- , exposingList = node (Explicit [ node (FunctionExpose "style") ])
- }
- )
- , imports =
- [ node
- { moduleName = node [ "Mapbox", "Style" ]
- , moduleAlias = Just (node [ "Style" ])
- , exposingList = Just (Explicit [ node (TypeExpose { name = "Style", open = Just emptyRange }) ])
- }
- , node
- { moduleName = node [ "Mapbox", "Source" ]
- , moduleAlias = Just (node [ "Source" ])
- , exposingList = Nothing
- }
- , node
- { moduleName = node [ "Mapbox", "Layer" ]
- , moduleAlias = Just (node [ "Layer" ])
- , exposingList = Nothing
- }
- , node
- { moduleName = node [ "Mapbox", "Expression" ]
- , moduleAlias = Just (node [ "E" ])
- , exposingList = Just (Explicit [ node (FunctionExpose "str"), node (FunctionExpose "float"), node (FunctionExpose "int"), node (FunctionExpose "true"), node (FunctionExpose "false") ])
- }
- ]
- , declarations = List.map node (declarations styleDec)
- , comments = []
- }
-
-
-style : Decoder (List (Node RecordSetter))
+ build
+ { name = [ "Style" ]
+ , exposes = [ exposeFn "style" ]
+ , doc = Nothing
+ , declarations = declarations styleDec
+ }
+
+
style =
D.map5
(\transition light layers sources misc ->
- [ node ( node "transition", transition )
- , node ( node "light", light )
- , node ( node "layers", layers )
- , node ( node "sources", sources )
- , node ( node "misc", misc )
+ [ ( "transition", transition )
+ , ( "light", light )
+ , ( "layers", layers )
+ , ( "sources", sources )
+ , ( "misc", misc )
]
)
(D.oneOf
@@ -116,48 +86,38 @@ style =
decodeMisc
-decodeTransition : Decoder (Node Expression)
decodeTransition =
D.map2
(\duration delay ->
- node
- (RecordExpr
- [ node ( node "duration", node (Integer duration) )
- , node ( node "delay", node (Integer delay) )
- ]
- )
+ record
+ [ ( "duration", int duration )
+ , ( "delay", int delay )
+ ]
)
(D.oneOf [ D.field "duration" D.int, D.succeed 300 ])
(D.oneOf [ D.field "delay" D.int, D.succeed 0 ])
-decodeLight : Decoder (Node Expression)
decodeLight =
valueDecoder "Style" "defaultLight"
-addBogusRange index (Node _ v) =
- Node { start = { row = index, column = 0 }, end = { row = index + 1, column = 0 } } v
-
-
-decodeLayers : Decoder (Node Expression)
decodeLayers =
D.list decodeLayer
- |> D.map (\layers -> node (ListExpr (List.indexedMap addBogusRange layers)))
+ |> D.map list
layerDecodeHelp t =
- D.map3 (\id source attrs -> call "Layer" t [ str id, str source, list attrs ]) (D.field "id" D.string) (D.field "source" D.string) decodeAttrs
+ D.map3 (\id source attrs -> call3 (layerName t) (string id) (string source) (list attrs)) (D.field "id" D.string) (D.field "source" D.string) decodeAttrs
-decodeLayer : Decoder (Node Expression)
decodeLayer =
D.field "type" D.string
|> D.andThen
(\t ->
case t of
"background" ->
- D.map2 (\id attrs -> call "Layer" "background" [ str id, list attrs ]) (D.field "id" D.string) decodeAttrs
+ D.map2 (\id attrs -> call2 (layerName "background") (string id) (list attrs)) (D.field "id" D.string) decodeAttrs
"fill" ->
layerDecodeHelp "fill"
@@ -188,9 +148,8 @@ decodeLayer =
)
-decodeAttrs : Decoder (List (Node Expression))
decodeAttrs =
- D.map3 (\top paint layout -> top ++ paint ++ layout) (D.keyValuePairs D.value) (D.field "paint" (D.keyValuePairs D.value)) (D.field "layout" (D.keyValuePairs D.value))
+ D.map3 (\top paint layout -> top ++ paint ++ layout) (D.keyValuePairs D.value) (Decode.withDefault [] (D.field "paint" (D.keyValuePairs D.value))) (Decode.withDefault [] (D.field "layout" (D.keyValuePairs D.value)))
|> D.andThen
(List.filterMap
(\( attrName, attrValue ) ->
@@ -210,8 +169,11 @@ decodeAttrs =
"layout" ->
Nothing
+ "metadata" ->
+ Nothing
+
"source-layer" ->
- decodeAttr "sourceLayer" (D.map str D.string) attrValue
+ decodeAttr "sourceLayer" (D.map string D.string) attrValue
"minzoom" ->
decodeAttr "minzoom" (D.map float D.float) attrValue
@@ -220,472 +182,29 @@ decodeAttrs =
decodeAttr "maxzoom" (D.map float D.float) attrValue
"filter" ->
- decodeAttr "filter" (D.oneOf [ decodeLegacyFilter, decodeValue ]) attrValue
+ decodeAttr "filter" (D.oneOf [ Decoder.Legacy.filter, Decode.expression ]) attrValue
other ->
- decodeAttr (toCamelCaseLower attrName) decodeValue attrValue
+ decodeAttr (toCamelCaseLower attrName) Decode.expression attrValue
)
- >> combine
+ >> Decode.combine
)
- |> D.map (List.indexedMap addBogusRange)
-decodeAttr : String -> Decoder (Node Expression) -> D.Value -> Maybe (Decoder (Node Expression))
decodeAttr attrName expressionNodeDecoder attrValue =
Just
(D.decodeValue expressionNodeDecoder attrValue
- |> resultToDecoder
- |> D.map (\v -> call "Layer" (toCamelCaseLower attrName) [ v ])
+ |> Decode.resultToDecoder
+ |> D.map (call1 (layerName (toCamelCaseLower attrName)))
)
-resultToDecoder : Result D.Error a -> Decoder a
-resultToDecoder res =
- case res of
- Ok a ->
- D.succeed a
-
- Err e ->
- D.fail (D.errorToString e)
-
-
-decodeBool : Decoder (Node Expression)
-decodeBool =
- D.bool
- |> D.map
- (\b ->
- if b then
- evalue "true"
- else
- evalue "false"
- )
-
-
-decodeValue : Decoder (Node Expression)
-decodeValue =
- D.oneOf
- [ D.string |> D.map makeConstant
- , decodeBool
- , D.float |> D.map (Floatable >> node >> ecall "float")
- , D.int |> D.map (Integer >> node >> ecall "int")
- , D.index 0 D.string |> D.andThen decodeExpression
- , todo
- ]
- |> D.map (ParenthesizedExpression >> node)
-
-
-makeConstant s =
- case s of
- "map" ->
- value "E" "anchorMap"
-
- "viewport" ->
- value "E" "anchorViewport"
-
- "auto" ->
- value "E" "anchorAuto"
-
- "center" ->
- value "E" "positionCenter"
-
- "left" ->
- value "E" "positionLeft"
-
- "right" ->
- value "E" "positionRight"
-
- "top" ->
- value "E" "positionTop"
-
- "bottom" ->
- value "E" "positionBottom"
-
- "topRight" ->
- value "E" "positionTopRight"
-
- "topLeft" ->
- value "E" "positionTopLeft"
-
- "bottomLeft" ->
- value "E" "positionBottomLeft"
-
- "bottomRight" ->
- value "E" "positionBottomRight"
-
- "none" ->
- value "E" "textFitNone"
-
- "width" ->
- value "E" "textFitWidth"
-
- "height" ->
- value "E" "textFitHeight"
-
- "both" ->
- value "E" "textFitBoth"
-
- "butt" ->
- value "E" "lineCapButt"
-
- "round" ->
- value "E" "lineCapRound"
-
- "square" ->
- value "E" "lineCapSquare"
-
- "bevel" ->
- value "E" "lineJoinBevel"
-
- "miter" ->
- value "E" "lineJoinMiter"
-
- "point" ->
- value "E" "symbolPlacementPoint"
-
- "line-center" ->
- value "E" "symbolPlacementLineCenter"
-
- "line" ->
- value "E" "symbolPlacementLine"
-
- "uppercase" ->
- value "E" "textTransformUppercase"
-
- "lowercase" ->
- value "E" "textTransformLowercase"
-
- "linear" ->
- value "E" "rasterResamplingLinear"
-
- "nearest" ->
- value "E" "rasterResamplingNearest"
-
- _ ->
- case Color.parse s of
- Ok { r, g, b, a } ->
- call "E" "rgba" [ integer r, integer g, integer b, float a ]
-
- Err err ->
- str s |> ecall "str"
-
-
-
--- legacy filter
-
-
-decodeLegacyFilter : Decoder (Node Expression)
-decodeLegacyFilter =
- let
- decodeProp =
- D.index 1 D.string
- |> D.map
- (\prop ->
- case prop of
- "$type" ->
- value "E" "geometryType"
-
- "$id" ->
- value "E" "id"
-
- _ ->
- call "E" "getProperty" [ ecall "str" (str prop) ]
- )
-
- decodeVal =
- D.index 2 <|
- D.oneOf
- [ D.map (str >> ecall "str") D.string
- , D.map (float >> ecall "float") D.float
- , decodeBool
- ]
-
- decodeVals =
- D.list <|
- D.oneOf
- [ D.map (str >> ecall "str") D.string
- , D.map (float >> ecall "float") D.float
- , decodeBool
- ]
- in
- D.index 0 D.string
- |> D.andThen
- (\filter ->
- case filter of
- "all" ->
- decodeTail decodeLegacyFilter |> D.map (\filters -> call "E" "all" [ list filters ])
-
- "any" ->
- decodeTail decodeLegacyFilter |> D.map (\filters -> call "E" "any" [ list filters ])
-
- "none" ->
- decodeTail decodeLegacyFilter |> D.map (\filters -> call "E" "all" [ list (List.map (\f -> call "E" "not" [ f ]) filters) ])
-
- "has" ->
- D.index 1 D.string |> D.map (\prop -> call "E" "hasProperty" [ ecall "str" (str prop) ])
-
- "!has" ->
- D.index 1 D.string |> D.map (\prop -> call "E" "not" [ call "E" "hasProperty" [ ecall "str" (str prop) ] ])
-
- "==" ->
- D.map2 (\prop val -> pipelineCall "E" "isEqual" [ prop, val ]) decodeProp decodeVal
-
- "!=" ->
- D.map2 (\prop val -> pipelineCall "E" "notEqual" [ prop, val ]) decodeProp decodeVal
-
- ">" ->
- D.map2 (\prop val -> pipelineCall "E" "greaterThan" [ prop, val ]) decodeProp decodeVal
-
- ">=" ->
- D.map2 (\prop val -> pipelineCall "E" "greaterThanOrEqual" [ prop, val ]) decodeProp decodeVal
-
- "<" ->
- D.map2 (\prop val -> pipelineCall "E" "lessThan" [ prop, val ]) decodeProp decodeVal
-
- "<=" ->
- D.map2 (\prop val -> pipelineCall "E" "lessThanOrEqual" [ prop, val ]) decodeProp decodeVal
-
- "in" ->
- D.map2
- (\prop values ->
- List.drop 2 values
- |> List.map (\v -> pipelineCall "E" "isEqual" [ prop, v ])
- |> list
- |> List.singleton
- |> call "E" "any"
- )
- decodeProp
- decodeVals
-
- "!in" ->
- D.map2
- (\prop values ->
- List.drop 2 values
- |> List.map (\v -> pipelineCall "E" "notEqual" [ prop, v ])
- |> list
- |> List.singleton
- |> call "E" "all"
- )
- decodeProp
- decodeVals
-
- _ ->
- D.fail "not actually a legacy filter"
- )
-
-
-
--- Expressions
-
-
-decodeTail : Decoder a -> Decoder (List a)
-decodeTail itemDecoder =
- D.list D.value
- |> D.andThen
- (\l ->
- case l of
- [] ->
- D.fail "Can't get tail of empty"
-
- head :: t ->
- List.map (subdecode itemDecoder) t |> combine
- )
-
-
-subdecode : Decoder a -> D.Value -> Decoder a
-subdecode d v =
- D.decodeValue d v |> resultToDecoder
-
-
-decodeMatch : Bool -> any -> Decoder (Node Expression)
-decodeMatch isString _ =
- decodeTail D.value
- |> D.andThen
- (\args ->
- case args of
- [] ->
- todo
-
- head :: tail ->
- D.map2
- (\cond rest ->
- parens
- (node
- (OperatorApplication "|>"
- Right
- cond
- (call "E"
- (if isString then
- "matchesStr"
- else
- "matchesFloat"
- )
- rest
- )
- )
- )
- )
- (subdecode decodeValue head)
- (organizeArgs
- (if isString then
- D.map str D.string
- else
- D.map float D.float
- )
- []
- tail
- )
- )
-
-
-organizeArgs : Decoder (Node Expression) -> List (Decoder (Node Expression)) -> List D.Value -> Decoder (List (Node Expression))
-organizeArgs inpDec accu args =
- case args of
- [] ->
- combine [ D.map list (List.reverse accu |> combine) ]
-
- [ default ] ->
- combine [ D.map list (List.reverse accu |> combine), subdecode decodeValue default ]
-
- a :: b :: rest ->
- let
- newAccu =
- D.map2
- (\inp out ->
- parens (node (TupledExpression [ inp, out ]))
- )
- (subdecode inpDec a)
- (subdecode decodeValue b)
- :: accu
- in
- organizeArgs inpDec newAccu rest
-
-
-decodeExpression : String -> Decoder (Node Expression)
-decodeExpression funName =
- case funName of
- "literal" ->
- D.index 1
- (D.oneOf
- [ D.list D.string |> D.map (\strs -> call "E" "strings" [ list (List.map str strs) ])
- , D.list D.float |> D.map (\floats -> call "E" "floats" [ list (List.map float floats) ])
- ]
- )
-
- "match" ->
- D.oneOf
- [ D.index 2 D.string |> D.andThen (decodeMatch True)
- , D.index 2 D.float |> D.andThen (decodeMatch False)
- ]
-
- "exponential" ->
- D.map (\base -> call "E" "Exponential" [ float base ]) (D.index 1 D.float)
-
- "interpolate" ->
- D.map3
- (\interpolation options input ->
- pipelineCall "E" "interpolate" (input :: interpolation :: options)
- )
- (D.index 1 decodeValue)
- (decodeTail D.value |> D.map (List.drop 2) |> D.andThen (organizeArgs (D.map float D.float) []))
- (D.index 2 decodeValue)
-
- "step" ->
- D.map3
- (\inp def stps ->
- pipelineCall "E" "step" (inp :: def :: stps)
- )
- (D.index 1 decodeValue)
- (D.index 2 decodeValue)
- (decodeTail D.value |> D.map (List.drop 2) |> D.andThen (organizeArgs (D.map float D.float) []))
-
- _ ->
- let
- fallback =
- decodeTail decodeValue
- |> D.map
- (\arguments ->
- case funName of
- "==" ->
- pipelineCall "E" "isEqual" arguments
-
- "!=" ->
- pipelineCall "E" "notEqual" arguments
-
- "!has" ->
- todoExpr "!has is not supported"
-
- "!in" ->
- todoExpr "!in is not supported"
-
- "in" ->
- todoExpr "in is not supported"
-
- ">=" ->
- pipelineCall "E" "greaterThanOrEqual" arguments
-
- "<=" ->
- pipelineCall "E" "lessThanOrEqual" arguments
-
- "concat" ->
- pipelineCall "E" "append" arguments
-
- "linear" ->
- call "E" "Linear" arguments
-
- "rgb" ->
- call "E" "makeRGBColor" arguments
-
- "rgba" ->
- call "E" "makeRGBAColor" arguments
-
- "to-rgba" ->
- call "E" "rgbaChannels" arguments
-
- "-" ->
- pipelineCall "E" "minus" arguments
-
- "*" ->
- pipelineCall "E" "multiply" arguments
-
- "+" ->
- pipelineCall "E" "plus" arguments
-
- "/" ->
- pipelineCall "E" "divideBy" arguments
-
- "%" ->
- pipelineCall "E" "modBy" arguments
-
- "^" ->
- pipelineCall "E" "raiseBy" arguments
-
- "get" ->
- if List.length arguments == 1 then
- call "E" "getProperty" arguments
- else
- call "E" "get" arguments
-
- _ ->
- call "E" (toCamelCaseLower funName) arguments
- )
- in
- if String.toLower funName /= funName then
- D.oneOf
- [ D.map (\strs -> call "E" "strings" [ list (List.map str strs) ]) <| D.list D.string
- , fallback
- ]
- else
- fallback
-
-
-decodeSources : Decoder (Node Expression)
decodeSources =
D.keyValuePairs decodeSource
|> D.map (List.map (\( key, fn ) -> fn key))
- |> D.map (\sources -> node (ListExpr sources))
+ |> D.map list
-decodeSource : Decoder (String -> Node Expression)
decodeSource =
D.field "type" D.string
|> D.andThen
@@ -696,81 +215,45 @@ decodeSource =
|> D.map
(\url ->
\id ->
- call "Source"
- "vectorFromUrl"
- [ str id
- , str url
- ]
+ call2 (Advanced.aliasedName { modulePath = sourceNs, aliasName = "Source", name = "vectorFromUrl", typeName = Nothing })
+ (string id)
+ (string url)
)
+ "raster" ->
+ D.map
+ (\url ->
+ \id ->
+ call2 (Advanced.aliasedName { modulePath = sourceNs, aliasName = "Source", name = "rasterFromUrl", typeName = Nothing })
+ (string id)
+ (string url)
+ )
+ (D.field "url" D.string)
+
_ ->
- D.succeed (\a -> todoExpr ("type " ++ t ++ "not yet supported"))
+ D.succeed (\a -> Lib.todo ("type " ++ t ++ " not yet supported"))
)
-decodeMisc : Decoder (Node Expression)
decodeMisc =
- D.succeed (node (ListExpr []))
-
-
-list l =
- node (ListExpr l)
-
+ D.map6 (\sprite glyphs name zoom bearing pitch -> [ sprite, glyphs, name, zoom, bearing, pitch ] |> List.filterMap identity |> list)
+ (miscField "sprite" "sprite" D.string string)
+ (miscField "glyphs" "glyphs" D.string string)
+ (miscField "name" "name" D.string string)
+ (miscField "zoom" "defaultZoomLevel" D.float float)
+ (miscField "bearing" "defaultBearing" D.float float)
+ (miscField "pitch" "defaultPitch" D.float float)
-str s =
- node (Literal s)
+miscField : String -> String -> Decoder a -> (a -> Expression) -> Decoder (Maybe Expression)
+miscField name elmName decoder toExpr =
+ D.maybe (D.field name (D.map (\item -> call1 (styleName elmName) (toExpr item)) decoder))
-ecall name arg =
- parens (node (Application [ node (FunctionOrValue [] name), arg ]))
-call ns name args =
- parens (node (Application (node (FunctionOrValue [ ns ] name) :: args)))
-
-
-pipelineCall ns name args =
- case args of
- fst :: rest ->
- parens (node (OperatorApplication "|>" Left fst (call ns name rest)))
-
- _ ->
- todoExpr <| "Wrong number of arguments passed to " ++ ns ++ "." ++ name
-
-
-value ns name =
- node (FunctionOrValue [ ns ] name)
-
-
-evalue name =
- node (FunctionOrValue [] name)
-
-
-integer =
- Integer >> node
-
-
-float =
- Floatable >> node
-
-
-parens =
- ParenthesizedExpression >> node
+-- (D.field "center" D.maybe (D.map (\sprite -> call1 (styleName "defaultCenter") (str sprite) )) D.string)
+--
valueDecoder ns name =
- D.succeed (node (FunctionOrValue [ ns ] name))
-
-
-todo : Decoder (Node Expression)
-todo =
- D.map (\val -> todoExpr ("The expression " ++ Json.Encode.encode 0 val ++ " is not yet supported")) D.value
-
-
-todoExpr msg =
- node (ParenthesizedExpression (call "Debug" "todo" [ str msg ]))
-
-
-combine : List (Decoder a) -> Decoder (List a)
-combine =
- List.foldr (D.map2 (::)) (D.succeed [])
+ D.succeed (call0 (Advanced.aliasedName { modulePath = [ "Mapbox", ns ], aliasName = ns, name = name, typeName = Nothing }))
diff --git a/style-generator/src/Decoder/Expression.elm b/style-generator/src/Decoder/Expression.elm
new file mode 100644
index 0000000..137ab26
--- /dev/null
+++ b/style-generator/src/Decoder/Expression.elm
@@ -0,0 +1,345 @@
+module Decoder.Expression exposing (decodeBool, expression)
+
+import Color
+import Decoder.Generic as Decode
+import Decoder.Helpers exposing (todo)
+import Json.Decode as D exposing (Decoder)
+import Lib
+import MyElm.Syntax exposing (Expression, call1, calln, float, int, list, pair, string)
+import String.Case exposing (toCamelCaseLower)
+
+
+expression =
+ D.oneOf
+ [ D