elm-pages 3.0.0-beta.14 → 3.0.0-beta.16

package/src/Pages/Generate.elm

@@ -128,7 +128,7 @@ single input =
 
 {-| -}
 buildNoState :
-    { view : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+    { view : { maybeUrl : Elm.Expression, sharedModel : Elm.Expression, app : Elm.Expression } -> Elm.Expression
     }
     -> Builder
     -> Elm.File
@@ -136,7 +136,13 @@ buildNoState definitions builder_ =
     case builder_ of
         ServerRender builder ->
             userFunction builder.moduleName
-                { view = \_ -> definitions.view
+                { view =
+                    \maybeUrl sharedModel _ app ->
+                        definitions.view
+                            { maybeUrl = maybeUrl
+                            , sharedModel = sharedModel
+                            , app = app
+                            }
                 , localState = Nothing
                 , data = builder.data |> Tuple.second
                 , action = builder.action |> Tuple.second |> Action
@@ -151,7 +157,13 @@ buildNoState definitions builder_ =
 
         PreRender builder ->
             userFunction builder.moduleName
-                { view = \_ -> definitions.view
+                { view =
+                    \maybeUrl sharedModel _ app ->
+                        definitions.view
+                            { maybeUrl = maybeUrl
+                            , sharedModel = sharedModel
+                            , app = app
+                            }
                 , localState = Nothing
                 , data = builder.data |> Tuple.second
                 , action = builder.pages |> Pages
@@ -170,10 +182,30 @@ buildNoState definitions builder_ =
 
 {-| -}
 buildWithLocalState :
-    { view : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-    , update : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-    , init : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-    , subscriptions : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+    { view :
+        { maybeUrl : Elm.Expression, sharedModel : Elm.Expression, model : Elm.Expression, app : Elm.Expression } -> Elm.Expression
+    , update :
+        { pageUrl : Elm.Expression
+        , sharedModel : Elm.Expression
+        , app : Elm.Expression
+        , msg : Elm.Expression
+        , model : Elm.Expression
+        }
+        -> Elm.Expression
+    , init :
+        { pageUrl : Elm.Expression
+        , sharedModel : Elm.Expression
+        , app : Elm.Expression
+        }
+        -> Elm.Expression
+    , subscriptions :
+        { maybePageUrl : Elm.Expression
+        , routeParams : Elm.Expression
+        , path : Elm.Expression
+        , sharedModel : Elm.Expression
+        , model : Elm.Expression
+        }
+        -> Elm.Expression
     , msg : Type
     , model : Type
     }
@@ -183,12 +215,41 @@ buildWithLocalState definitions builder_ =
     case builder_ of
         ServerRender builder ->
             userFunction builder.moduleName
-                { view = definitions.view
+                { view =
+                    \maybeUrl sharedModel model app ->
+                        definitions.view
+                            { maybeUrl = maybeUrl
+                            , sharedModel = sharedModel
+                            , model = model
+                            , app = app
+                            }
                 , localState =
                     Just
-                        { update = definitions.update
-                        , init = definitions.init
-                        , subscriptions = definitions.subscriptions
+                        { update =
+                            \pageUrl sharedModel app msg model ->
+                                definitions.update
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    , msg = msg
+                                    , model = model
+                                    }
+                        , init =
+                            \pageUrl sharedModel app ->
+                                definitions.init
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    }
+                        , subscriptions =
+                            \maybePageUrl routeParams path sharedModel model ->
+                                definitions.subscriptions
+                                    { maybePageUrl = maybePageUrl
+                                    , routeParams = routeParams
+                                    , path = path
+                                    , sharedModel = sharedModel
+                                    , model = model
+                                    }
                         , state = LocalState
                         }
                 , data = builder.data |> Tuple.second
@@ -204,12 +265,41 @@ buildWithLocalState definitions builder_ =
 
         PreRender builder ->
             userFunction builder.moduleName
-                { view = definitions.view
+                { view =
+                    \maybeUrl sharedModel model app ->
+                        definitions.view
+                            { maybeUrl = maybeUrl
+                            , sharedModel = sharedModel
+                            , model = model
+                            , app = app
+                            }
                 , localState =
                     Just
-                        { update = definitions.update
-                        , init = definitions.init
-                        , subscriptions = definitions.subscriptions
+                        { update =
+                            \pageUrl sharedModel app msg model ->
+                                definitions.update
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    , msg = msg
+                                    , model = model
+                                    }
+                        , init =
+                            \pageUrl sharedModel app ->
+                                definitions.init
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    }
+                        , subscriptions =
+                            \maybePageUrl routeParams path sharedModel model ->
+                                definitions.subscriptions
+                                    { maybePageUrl = maybePageUrl
+                                    , routeParams = routeParams
+                                    , path = path
+                                    , sharedModel = sharedModel
+                                    , model = model
+                                    }
                         , state = LocalState
                         }
                 , data = builder.data |> Tuple.second
@@ -229,10 +319,30 @@ buildWithLocalState definitions builder_ =
 
 {-| -}
 buildWithSharedState :
-    { view : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-    , update : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-    , init : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-    , subscriptions : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+    { view :
+        { maybeUrl : Elm.Expression, sharedModel : Elm.Expression, model : Elm.Expression, app : Elm.Expression } -> Elm.Expression
+    , update :
+        { pageUrl : Elm.Expression
+        , sharedModel : Elm.Expression
+        , app : Elm.Expression
+        , msg : Elm.Expression
+        , model : Elm.Expression
+        }
+        -> Elm.Expression
+    , init :
+        { pageUrl : Elm.Expression
+        , sharedModel : Elm.Expression
+        , app : Elm.Expression
+        }
+        -> Elm.Expression
+    , subscriptions :
+        { maybePageUrl : Elm.Expression
+        , routeParams : Elm.Expression
+        , path : Elm.Expression
+        , sharedModel : Elm.Expression
+        , model : Elm.Expression
+        }
+        -> Elm.Expression
     , msg : Type
     , model : Type
     }
@@ -242,12 +352,41 @@ buildWithSharedState definitions builder_ =
     case builder_ of
         ServerRender builder ->
             userFunction builder.moduleName
-                { view = definitions.view
+                { view =
+                    \maybeUrl sharedModel model app ->
+                        definitions.view
+                            { maybeUrl = maybeUrl
+                            , sharedModel = sharedModel
+                            , model = model
+                            , app = app
+                            }
                 , localState =
                     Just
-                        { update = definitions.update
-                        , init = definitions.init
-                        , subscriptions = definitions.subscriptions
+                        { update =
+                            \pageUrl sharedModel app msg model ->
+                                definitions.update
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    , msg = msg
+                                    , model = model
+                                    }
+                        , init =
+                            \pageUrl sharedModel app ->
+                                definitions.init
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    }
+                        , subscriptions =
+                            \maybePageUrl routeParams path sharedModel model ->
+                                definitions.subscriptions
+                                    { maybePageUrl = maybePageUrl
+                                    , routeParams = routeParams
+                                    , path = path
+                                    , sharedModel = sharedModel
+                                    , model = model
+                                    }
                         , state = SharedState
                         }
                 , data = builder.data |> Tuple.second
@@ -263,12 +402,41 @@ buildWithSharedState definitions builder_ =
 
         PreRender builder ->
             userFunction builder.moduleName
-                { view = definitions.view
+                { view =
+                    \maybeUrl sharedModel model app ->
+                        definitions.view
+                            { maybeUrl = maybeUrl
+                            , sharedModel = sharedModel
+                            , model = model
+                            , app = app
+                            }
                 , localState =
                     Just
-                        { update = definitions.update
-                        , init = definitions.init
-                        , subscriptions = definitions.subscriptions
+                        { update =
+                            \pageUrl sharedModel app msg model ->
+                                definitions.update
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    , msg = msg
+                                    , model = model
+                                    }
+                        , init =
+                            \pageUrl sharedModel app ->
+                                definitions.init
+                                    { pageUrl = pageUrl
+                                    , sharedModel = sharedModel
+                                    , app = app
+                                    }
+                        , subscriptions =
+                            \maybePageUrl routeParams path sharedModel model ->
+                                definitions.subscriptions
+                                    { maybePageUrl = maybePageUrl
+                                    , routeParams = routeParams
+                                    , path = path
+                                    , sharedModel = sharedModel
+                                    , model = model
+                                    }
                         , state = SharedState
                         }
                 , data = builder.data |> Tuple.second
@@ -332,11 +500,22 @@ userFunction moduleName definitions =
                             |> Just
                         )
                         ( "sharedModel"
-                        , Nothing
+                        , Just (Elm.Annotation.named [ "Shared" ] "Model")
                         )
                         ( "model", Just (Elm.Annotation.named [] "Model") )
                         ( "app", Just appType )
-                        definitions.view
+                        (\maybeUrl sharedModel model app ->
+                            definitions.view maybeUrl sharedModel model app
+                                |> Elm.withType
+                                    (Elm.Annotation.namedWith [ "View" ]
+                                        "View"
+                                        [ Elm.Annotation.namedWith [ "Pages", "Msg" ]
+                                            "Msg"
+                                            [ localType "Msg"
+                                            ]
+                                        ]
+                                    )
+                        )
 
                 Nothing ->
                     let
@@ -354,7 +533,7 @@ userFunction moduleName definitions =
                                     |> Just
                                 )
                                 ( "sharedModel"
-                                , Nothing
+                                , Just (Elm.Annotation.named [ "Shared" ] "Model")
                                 )
                                 ( "app", Just appType )
                                 (definitions.view Elm.unit)
@@ -386,7 +565,7 @@ userFunction moduleName definitions =
                                     |> Elm.Annotation.named [ "Pages", "PageUrl" ]
                                     |> Just
                                 )
-                                ( "sharedModel", Nothing )
+                                ( "sharedModel", Just (Elm.Annotation.named [ "Shared" ] "Model") )
                                 ( "app", Just appType )
                                 ( "msg", Just (Elm.Annotation.named [] "Msg") )
                                 ( "model", Just (Elm.Annotation.named [] "Model") )
@@ -399,9 +578,16 @@ userFunction moduleName definitions =
                                     |> Elm.Annotation.maybe
                                     |> Just
                                 )
-                                ( "sharedModel", Nothing )
+                                ( "sharedModel", Just (Elm.Annotation.named [ "Shared" ] "Model") )
                                 ( "app", Just appType )
-                                localState.init
+                                (\pageUrl sharedModel app ->
+                                    localState.init pageUrl sharedModel app
+                                        |> Elm.withType
+                                            (Elm.Annotation.tuple
+                                                (localType "Model")
+                                                effectType
+                                            )
+                                )
                         , subscriptionsFn =
                             Elm.Declare.fn5
                                 "subscriptions"
@@ -411,11 +597,14 @@ userFunction moduleName definitions =
                                     |> Elm.Annotation.maybe
                                     |> Just
                                 )
-                                ( "routeParams", Nothing )
-                                ( "path", Nothing )
-                                ( "sharedModel", Nothing )
-                                ( "model", Nothing )
-                                localState.subscriptions
+                                ( "routeParams", "RouteParams" |> Elm.Annotation.named [] |> Just )
+                                ( "path", Elm.Annotation.namedWith [ "Path" ] "Path" [] |> Just )
+                                ( "sharedModel", Just (Elm.Annotation.named [ "Shared" ] "Model") )
+                                ( "model", localType "Model" |> Just )
+                                (\maybePageUrl routeParams path sharedModel model ->
+                                    localState.subscriptions maybePageUrl routeParams path sharedModel model
+                                        |> Elm.withType (Elm.Annotation.namedWith [] "Sub" [ localType "Msg" ])
+                                )
                         , state = localState.state
                         }
                     )
@@ -516,7 +705,7 @@ userFunction moduleName definitions =
                 )
             )
          , Elm.declaration "route"
-            (case definitions.action of
+            ((case definitions.action of
                 Action _ ->
                     serverRender_
                         { action =
@@ -536,7 +725,7 @@ userFunction moduleName definitions =
                         }
 
                 Pages _ ->
-                    (case actionFn of
+                    case actionFn of
                         Nothing ->
                             single_
                                 { data =
@@ -558,40 +747,40 @@ userFunction moduleName definitions =
                                                 (throwableTask (Elm.Annotation.named [] "Data"))
                                 , head = headFn.call
                                 }
-                    )
-                        |> (case localDefinitions of
-                                Just local ->
-                                    buildWithLocalState_
-                                        { view = viewFn.call
-                                        , update = local.updateFn.call
-                                        , init = local.initFn.call
-                                        , subscriptions = local.subscriptionsFn.call
-                                        , state = local.state
-                                        }
-                                        >> Elm.withType
-                                            (Elm.Annotation.namedWith [ "RouteBuilder" ]
-                                                "StatefulRoute"
-                                                [ localType "RouteParams"
-                                                , localType "Data"
-                                                , localType "ActionData"
-                                                , localType "Model"
-                                                , localType "Msg"
-                                                ]
-                                            )
+             )
+                |> (case localDefinitions of
+                        Just local ->
+                            buildWithLocalState_
+                                { view = viewFn.call
+                                , update = local.updateFn.call
+                                , init = local.initFn.call
+                                , subscriptions = local.subscriptionsFn.call
+                                , state = local.state
+                                }
+                                >> Elm.withType
+                                    (Elm.Annotation.namedWith [ "RouteBuilder" ]
+                                        "StatefulRoute"
+                                        [ localType "RouteParams"
+                                        , localType "Data"
+                                        , localType "ActionData"
+                                        , localType "Model"
+                                        , localType "Msg"
+                                        ]
+                                    )
 
-                                Nothing ->
-                                    buildNoState_
-                                        { view = viewFn.call Elm.unit
-                                        }
-                                        >> Elm.withType
-                                            (Elm.Annotation.namedWith [ "RouteBuilder" ]
-                                                "StatelessRoute"
-                                                [ localType "RouteParams"
-                                                , localType "Data"
-                                                , localType "ActionData"
-                                                ]
-                                            )
-                           )
+                        Nothing ->
+                            buildNoState_
+                                { view = viewFn.call Elm.unit
+                                }
+                                >> Elm.withType
+                                    (Elm.Annotation.namedWith [ "RouteBuilder" ]
+                                        "StatelessRoute"
+                                        [ localType "RouteParams"
+                                        , localType "Data"
+                                        , localType "ActionData"
+                                        ]
+                                    )
+                   )
             )
          ]
             ++ (case localDefinitions of
@@ -940,11 +1129,11 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                                         ]
                                     ]
                                     (Elm.Annotation.tuple
-                                        (Elm.Annotation.var "model")
+                                        (Elm.Annotation.named [] "Model")
                                         (Elm.Annotation.namedWith
                                             [ "Effect" ]
                                             "Effect"
-                                            [ Elm.Annotation.var "msg" ]
+                                            [ Elm.Annotation.named [] "Msg" ]
                                         )
                                     )
                               )
@@ -958,30 +1147,30 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                                     , Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
                                         "StaticPayload"
-                                        [ Elm.Annotation.var "data"
-                                        , Elm.Annotation.var "action"
-                                        , Elm.Annotation.var "routeParams"
+                                        [ localType "Data"
+                                        , localType "ActionData"
+                                        , localType "RouteParams"
                                         ]
-                                    , Elm.Annotation.var "msg"
-                                    , Elm.Annotation.var "model"
+                                    , Elm.Annotation.named [] "Msg"
+                                    , Elm.Annotation.named [] "Model"
                                     ]
                                     (case buildWithLocalStateArg.state of
                                         LocalState ->
                                             Elm.Annotation.tuple
-                                                (Elm.Annotation.var "model")
+                                                (localType "Model")
                                                 (Elm.Annotation.namedWith
                                                     [ "Effect" ]
                                                     "Effect"
-                                                    [ Elm.Annotation.var "msg" ]
+                                                    [ localType "Msg" ]
                                                 )
 
                                         SharedState ->
                                             Elm.Annotation.triple
-                                                (Elm.Annotation.var "model")
+                                                (localType "Model")
                                                 (Elm.Annotation.namedWith
                                                     [ "Effect" ]
                                                     "Effect"
-                                                    [ Elm.Annotation.var "msg" ]
+                                                    [ localType "Msg" ]
                                                 )
                                                 (Elm.Annotation.maybe (Elm.Annotation.named [ "Shared" ] "Msg"))
                                     )
@@ -999,25 +1188,25 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                                     , Elm.Annotation.namedWith [ "Shared" ] "Model" []
                                     , Elm.Annotation.var "model"
                                     ]
-                                    (Elm.Annotation.namedWith [] "Sub" [ Elm.Annotation.var "msg" ])
+                                    (Elm.Annotation.namedWith [] "Sub" [ localType "Msg" ])
                               )
                             ]
                         , Elm.Annotation.namedWith
                             [ "RouteBuilder" ]
                             "Builder"
-                            [ Elm.Annotation.var "routeParams"
-                            , Elm.Annotation.var "data"
-                            , Elm.Annotation.var "action"
+                            [ localType "RouteParams"
+                            , localType "Data"
+                            , localType "ActionData"
                             ]
                         ]
                         (Elm.Annotation.namedWith
                             [ "RouteBuilder" ]
                             "StatefulRoute"
-                            [ Elm.Annotation.var "routeParams"
-                            , Elm.Annotation.var "data"
-                            , Elm.Annotation.var "action"
-                            , Elm.Annotation.var "model"
-                            , Elm.Annotation.var "msg"
+                            [ localType "RouteParams"
+                            , localType "Data"
+                            , localType "ActionData"
+                            , localType "Model"
+                            , localType "Msg"
                             ]
                         )
                     )
@@ -1149,9 +1338,9 @@ buildNoState_ buildNoStateArg buildNoStateArg0 =
                                     , Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
                                         "StaticPayload"
-                                        [ Elm.Annotation.var "data"
-                                        , Elm.Annotation.var "action"
-                                        , Elm.Annotation.var "routeParams"
+                                        [ Elm.Annotation.named [] "Data"
+                                        , Elm.Annotation.named [] "ActionData"
+                                        , Elm.Annotation.named [] "RouteParams"
                                         ]
                                     ]
                                     (Elm.Annotation.namedWith
@@ -1168,17 +1357,17 @@ buildNoState_ buildNoStateArg buildNoStateArg0 =
                         , Elm.Annotation.namedWith
                             [ "RouteBuilder" ]
                             "Builder"
-                            [ Elm.Annotation.var "routeParams"
-                            , Elm.Annotation.var "data"
-                            , Elm.Annotation.var "action"
+                            [ Elm.Annotation.named [] "RouteParams"
+                            , Elm.Annotation.named [] "Data"
+                            , Elm.Annotation.named [] "ActionData"
                             ]
                         ]
                         (Elm.Annotation.namedWith
                             [ "RouteBuilder" ]
                             "StatefulRoute"
-                            [ Elm.Annotation.var "routeParams"
-                            , Elm.Annotation.var "data"
-                            , Elm.Annotation.var "action"
+                            [ Elm.Annotation.named [] "RouteParams"
+                            , Elm.Annotation.named [] "Data"
+                            , Elm.Annotation.named [] "ActionData"
                             , Elm.Annotation.record []
                             , Elm.Annotation.unit
                             ]
@@ -1208,10 +1397,18 @@ buildNoState_ buildNoStateArg buildNoStateArg0 =
         ]
 
 
+effectType : Elm.Annotation.Annotation
+effectType =
+    Elm.Annotation.namedWith
+        [ "Effect" ]
+        "Effect"
+        [ Elm.Annotation.named [] "Msg" ]
+
+
 throwableTask : Elm.Annotation.Annotation -> Elm.Annotation.Annotation
 throwableTask dataType =
     Elm.Annotation.namedWith [ "BackendTask" ]
         "BackendTask"
-        [ Elm.Annotation.named [ "Exception" ] "Throwable"
+        [ Elm.Annotation.named [ "FatalError" ] "FatalError"
         , dataType
         ]

package/src/Pages/Internal/FatalError.elm

@@ -0,0 +1,5 @@
+module Pages.Internal.FatalError exposing (FatalError(..))
+
+
+type FatalError
+    = FatalError { title : String, body : String }