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

package/src/Pages/Internal/Platform/Cli.elm

@@ -53,7 +53,6 @@ currentCompatibilityKey =
 type alias Model route =
     { staticResponses : BackendTask Throwable Effect
     , errors : List BuildError
-    , allRawResponses : RequestsAndPending
     , maybeRequestJson : RenderRequest route
     , isDevServer : Bool
     }
@@ -310,7 +309,6 @@ init site renderRequest config flags =
                           , path = ""
                           }
                         ]
-                    , allRawResponses = Json.Encode.object []
                     , maybeRequestJson = renderRequest
                     , isDevServer = False
                     }
@@ -325,7 +323,6 @@ init site renderRequest config flags =
                       , path = ""
                       }
                     ]
-                , allRawResponses = Json.Encode.object []
                 , maybeRequestJson = renderRequest
                 , isDevServer = False
                 }
@@ -763,12 +760,11 @@ initLegacy site ((RenderRequest.SinglePage includeHtml singleRequest _) as rende
         initialModel =
             { staticResponses = staticResponsesNew
             , errors = []
-            , allRawResponses = Json.Encode.object []
             , maybeRequestJson = renderRequest
             , isDevServer = isDevServer
             }
     in
-    StaticResponses.nextStep initialModel
+    StaticResponses.nextStep (Json.Encode.object []) initialModel.staticResponses initialModel
         |> nextStepToEffect
             initialModel
 
@@ -777,7 +773,8 @@ updateAndSendPortIfDone :
     Model route
     -> ( Model route, Effect )
 updateAndSendPortIfDone model =
-    StaticResponses.nextStep
+    StaticResponses.nextStep (Json.Encode.object [])
+        model.staticResponses
         model
         |> nextStepToEffect model
 
@@ -790,15 +787,10 @@ update :
 update msg model =
     case msg of
         GotDataBatch batch ->
-            let
-                updatedModel : Model route
-                updatedModel =
-                    model
-                        |> StaticResponses.batchUpdate batch
-            in
-            StaticResponses.nextStep
-                updatedModel
-                |> nextStepToEffect updatedModel
+            StaticResponses.nextStep batch
+                model.staticResponses
+                model
+                |> nextStepToEffect model
 
         GotBuildError buildError ->
             let
@@ -809,7 +801,8 @@ update msg model =
                             buildError :: model.errors
                     }
             in
-            StaticResponses.nextStep
+            StaticResponses.nextStep (Json.Encode.object [])
+                updatedModel.staticResponses
                 updatedModel
                 |> nextStepToEffect updatedModel
 
@@ -821,27 +814,14 @@ nextStepToEffect :
 nextStepToEffect model nextStep =
     case nextStep of
         StaticResponses.Continue httpRequests updatedStaticResponsesModel ->
-            let
-                updatedModel : Model route
-                updatedModel =
-                    { model
-                        | staticResponses = updatedStaticResponsesModel
-                    }
-            in
-            if List.isEmpty httpRequests then
-                nextStepToEffect
-                    updatedModel
-                    (StaticResponses.nextStep
-                        updatedModel
-                    )
-
-            else
-                ( updatedModel
-                , (httpRequests
-                    |> List.map Effect.FetchHttp
-                  )
-                    |> Effect.Batch
-                )
+            ( { model
+                | staticResponses = updatedStaticResponsesModel
+              }
+            , (httpRequests
+                |> List.map Effect.FetchHttp
+              )
+                |> Effect.Batch
+            )
 
         StaticResponses.FinishedWithErrors errors ->
             ( model

package/src/Pages/Internal/Platform/CompatibilityKey.elm

@@ -3,4 +3,4 @@ module Pages.Internal.Platform.CompatibilityKey exposing (currentCompatibilityKe
 
 currentCompatibilityKey : Int
 currentCompatibilityKey =
-    4
+    5

package/src/Pages/Internal/Platform/GeneratorApplication.elm

@@ -22,7 +22,6 @@ import Pages.Internal.Platform.StaticResponses as StaticResponses
 import Pages.Internal.Platform.ToJsPayload as ToJsPayload
 import Pages.Internal.Script
 import Pages.StaticHttp.Request
-import RequestsAndPending exposing (RequestsAndPending)
 import TerminalText as Terminal
 
 
@@ -36,8 +35,6 @@ type alias Flags =
 type alias Model =
     { staticResponses : BackendTask Throwable ()
     , errors : List BuildError
-    , allRawResponses : RequestsAndPending
-    , done : Bool
     }
 
 
@@ -281,8 +278,6 @@ init execute flags =
                   , path = ""
                   }
                 ]
-            , allRawResponses = Encode.object []
-            , done = False
             }
 
 
@@ -299,11 +294,9 @@ initLegacy execute =
         initialModel =
             { staticResponses = staticResponses
             , errors = []
-            , allRawResponses = Encode.object []
-            , done = False
             }
     in
-    StaticResponses.nextStep initialModel
+    StaticResponses.nextStep (Encode.object []) initialModel.staticResponses initialModel
         |> nextStepToEffect
             initialModel
 
@@ -312,7 +305,8 @@ updateAndSendPortIfDone :
     Model
     -> ( Model, Effect )
 updateAndSendPortIfDone model =
-    StaticResponses.nextStep
+    StaticResponses.nextStep (Encode.object [])
+        model.staticResponses
         model
         |> nextStepToEffect model
 
@@ -325,15 +319,10 @@ update :
 update msg model =
     case msg of
         GotDataBatch batch ->
-            let
-                updatedModel : Model
-                updatedModel =
-                    model
-                        |> StaticResponses.batchUpdate batch
-            in
-            StaticResponses.nextStep
-                updatedModel
-                |> nextStepToEffect updatedModel
+            StaticResponses.nextStep batch
+                model.staticResponses
+                model
+                |> nextStepToEffect model
 
         GotBuildError buildError ->
             let
@@ -344,7 +333,8 @@ update msg model =
                             buildError :: model.errors
                     }
             in
-            StaticResponses.nextStep
+            StaticResponses.nextStep (Encode.object [])
+                updatedModel.staticResponses
                 updatedModel
                 |> nextStepToEffect updatedModel
 
@@ -356,28 +346,14 @@ nextStepToEffect :
 nextStepToEffect model nextStep =
     case nextStep of
         StaticResponses.Continue httpRequests updatedStaticResponsesModel ->
-            let
-                updatedModel : Model
-                updatedModel =
-                    { model
-                        | allRawResponses = Encode.object []
-                        , staticResponses = updatedStaticResponsesModel
-                    }
-            in
-            if List.isEmpty httpRequests then
-                nextStepToEffect
-                    updatedModel
-                    (StaticResponses.nextStep
-                        updatedModel
-                    )
-
-            else
-                ( updatedModel
-                , (httpRequests
-                    |> List.map Effect.FetchHttp
-                  )
-                    |> Effect.Batch
-                )
+            ( { model
+                | staticResponses = updatedStaticResponsesModel
+              }
+            , (httpRequests
+                |> List.map Effect.FetchHttp
+              )
+                |> Effect.Batch
+            )
 
         StaticResponses.Finish () ->
             ( model

package/src/Pages/Internal/Platform/StaticResponses.elm

@@ -1,9 +1,8 @@
-module Pages.Internal.Platform.StaticResponses exposing (NextStep(..), batchUpdate, empty, nextStep, renderApiRequest)
+module Pages.Internal.Platform.StaticResponses exposing (NextStep(..), empty, nextStep, renderApiRequest)
 
 import BackendTask exposing (BackendTask)
 import BuildError exposing (BuildError)
-import Exception exposing (Catchable(..), Throwable)
-import Json.Decode as Decode
+import Exception exposing (Exception(..), Throwable)
 import List.Extra
 import Pages.StaticHttp.Request as HashRequest
 import Pages.StaticHttpRequest as StaticHttpRequest
@@ -23,20 +22,6 @@ renderApiRequest request =
     request
 
 
-batchUpdate :
-    Decode.Value
-    ->
-        { model
-            | allRawResponses : Decode.Value
-        }
-    ->
-        { model
-            | allRawResponses : Decode.Value
-        }
-batchUpdate newEntries model =
-    { model | allRawResponses = newEntries }
-
-
 type NextStep route value
     = Continue (List HashRequest.Request) (StaticHttpRequest.RawRequest Throwable value)
     | Finish value
@@ -44,18 +29,19 @@ type NextStep route value
 
 
 nextStep :
-    { model
-        | staticResponses : BackendTask Throwable a
-        , errors : List BuildError
-        , allRawResponses : RequestsAndPending
-    }
+    RequestsAndPending
+    -> BackendTask Throwable a
+    ->
+        { model
+            | errors : List BuildError
+        }
     -> NextStep route a
-nextStep ({ allRawResponses, errors } as model) =
+nextStep allRawResponses staticResponses { errors } =
     let
         staticRequestsStatus : StaticHttpRequest.Status Throwable a
         staticRequestsStatus =
             allRawResponses
-                |> StaticHttpRequest.cacheRequestResolution model.staticResponses
+                |> StaticHttpRequest.cacheRequestResolution staticResponses
 
         ( ( pendingRequests, completedValue ), urlsToPerform, progressedBackendTask ) =
             case staticRequestsStatus of
@@ -125,7 +111,7 @@ nextStep ({ allRawResponses, errors } as model) =
                 Just (Ok completed) ->
                     Finish completed
 
-                Just (Err (Catchable () buildError)) ->
+                Just (Err (Exception () buildError)) ->
                     FinishedWithErrors
                         [ { title = buildError.title |> String.toUpper
                           , path = "" -- TODO include path here

package/src/Pages/Script.elm

@@ -34,7 +34,7 @@ import BackendTask.Http
 import BackendTask.Internal.Request
 import Cli.OptionsParser as OptionsParser
 import Cli.Program as Program
-import Exception exposing (Catchable, Throwable)
+import Exception exposing (Exception, Throwable)
 import Json.Decode as Decode
 import Json.Encode as Encode
 import Pages.Internal.Script
@@ -52,7 +52,7 @@ type Error
 
 
 {-| -}
-writeFile : { path : String, body : String } -> BackendTask (Catchable Error) ()
+writeFile : { path : String, body : String } -> BackendTask (Exception Error) ()
 writeFile { path, body } =
     BackendTask.Internal.Request.request
         { name = "write-file"

package/src/Pages/StaticHttpRequest.elm

@@ -65,7 +65,7 @@ cacheRequestResolution request rawResponses =
     case request of
         Request urlList lookupFn ->
             if List.isEmpty urlList then
-                cacheRequestResolutionHelp urlList rawResponses (lookupFn Nothing rawResponses)
+                cacheRequestResolution (lookupFn Nothing rawResponses) rawResponses
 
             else
                 Incomplete urlList (Request [] lookupFn)
@@ -78,25 +78,3 @@ type Status error value
     = Incomplete (List Pages.StaticHttp.Request.Request) (RawRequest error value)
     | HasPermanentError Error
     | Complete (Result error value)
-
-
-cacheRequestResolutionHelp :
-    List Pages.StaticHttp.Request.Request
-    -> RequestsAndPending
-    -> RawRequest error value
-    -> Status error value
-cacheRequestResolutionHelp foundUrls rawResponses request =
-    case request of
-        Request urlList lookupFn ->
-            if (urlList ++ foundUrls) |> List.isEmpty then
-                cacheRequestResolutionHelp
-                    []
-                    rawResponses
-                    (lookupFn Nothing rawResponses)
-
-            else
-                Incomplete (urlList ++ foundUrls)
-                    (Request [] lookupFn)
-
-        ApiRoute value ->
-            Complete value

package/src/Server/Request.elm

@@ -89,6 +89,7 @@ module Server.Request exposing
 import BackendTask exposing (BackendTask)
 import CookieParser
 import Dict exposing (Dict)
+import Exception exposing (Throwable)
 import Form
 import Form.Validation as Validation
 import FormData
@@ -881,8 +882,8 @@ fileField_ name =
 
 {-| -}
 formDataWithServerValidation :
-    Form.ServerForms error (BackendTask error (Validation.Validation error combined kind constraints))
-    -> Parser (BackendTask error (Result (Form.Response error) ( Form.Response error, combined )))
+    Form.ServerForms error (BackendTask Throwable (Validation.Validation error combined kind constraints))
+    -> Parser (BackendTask Throwable (Result (Form.Response error) ( Form.Response error, combined )))
 formDataWithServerValidation formParsers =
     rawFormData
         |> andThen

package/src/MultiDict.elm

@@ -1,49 +0,0 @@
-module MultiDict exposing (MultiDict, empty, get, insert, keys, remove, set)
-
-import Dict exposing (Dict)
-import List.Extra
-import List.Nonempty as NonEmpty
-
-
-type alias NonEmpty a =
-    NonEmpty.Nonempty a
-
-
-type MultiDict k v
-    = MultiDict (Dict k (NonEmpty v))
-
-
-empty : MultiDict k v
-empty =
-    MultiDict Dict.empty
-
-
-insert : comparable -> v -> MultiDict comparable v -> MultiDict comparable v
-insert key value (MultiDict dict) =
-    MultiDict
-        (Dict.update key (Maybe.map (NonEmpty.cons value) >> Maybe.withDefault (NonEmpty.fromElement value) >> Just) dict)
-
-
-get : comparable -> MultiDict comparable v -> List v
-get key (MultiDict dict) =
-    Dict.get key dict
-        |> Maybe.map NonEmpty.toList
-        |> Maybe.withDefault []
-
-
-keys : MultiDict k v -> List k
-keys (MultiDict dict) =
-    Dict.toList dict
-        |> List.concatMap (\( k, vs ) -> List.repeat (NonEmpty.length vs) k)
-
-
-remove : comparable -> v -> MultiDict comparable v -> MultiDict comparable v
-remove key value (MultiDict dict) =
-    MultiDict
-        (Dict.update key (Maybe.andThen (NonEmpty.toList >> List.Extra.remove value >> NonEmpty.fromList)) dict)
-
-
-set : comparable -> List v -> MultiDict comparable v -> MultiDict comparable v
-set key values (MultiDict dict) =
-    MultiDict
-        (Dict.update key (\_ -> NonEmpty.fromList values) dict)

package/src/PairingHeap.elm

@@ -1,137 +0,0 @@
-module PairingHeap exposing
-    ( PairingHeap, empty
-    , insert, merge, findMin, deleteMin
-    , fromList, toSortedList
-    )
-
-{-| This is a simple pairing heap implementation written in Elm usable as a priority queue. This code is
-based heavily on the pseudocode available at [the Wikipedia page](https://en.wikipedia.org/wiki/Pairing_heap).
-
-
-# Type and Constructor
-
-@docs PairingHeap, empty
-
-
-# Operations
-
-@docs insert, merge, findMin, deleteMin
-
-
-# Convenience functions
-
-@docs fromList, toSortedList
-
--}
-
-
-{-| A `PairingHeap` has comparable keys and values of an arbitrary type.
--}
-type PairingHeap comparable a
-    = Empty
-    | Heap comparable a (List (PairingHeap comparable a))
-
-
-{-| Create an empty PairingHeap.
--}
-empty : PairingHeap comparable a
-empty =
-    Empty
-
-
-{-| Find the minimum value in a heap returning Nothing if the heap is empty.
-Complexity: O(1)
-
-    findMin (fromList [ ( 10, () ), ( 3, () ), ( 8, () ) ]) == Just 3
-
--}
-findMin : PairingHeap comparable a -> Maybe ( comparable, a )
-findMin x =
-    case x of
-        Empty ->
-            Nothing
-
-        Heap k v _ ->
-            Just ( k, v )
-
-
-{-| Merges two `PairingHeap`s together into one new heap containing all of the key-value pairs from both inputs.
-Complexity: O(1)
--}
-merge : PairingHeap comparable a -> PairingHeap comparable a -> PairingHeap comparable a
-merge heap1 heap2 =
-    case ( heap1, heap2 ) of
-        ( Empty, _ ) ->
-            heap2
-
-        ( _, Empty ) ->
-            heap1
-
-        ( Heap k1 v1 hs1, Heap k2 v2 hs2 ) ->
-            if k1 < k2 then
-                Heap k1 v1 (heap2 :: hs1)
-
-            else
-                Heap k2 v2 (heap1 :: hs2)
-
-
-{-| Inserts a new element into a `PairingHeap`.
-Complexity: O(1)
--}
-insert : comparable -> a -> PairingHeap comparable a -> PairingHeap comparable a
-insert k v heap =
-    merge (Heap k v []) heap
-
-
-{-| Removes the minimum element from a `PairingHeap` returning a new heap without that element.
-This will return an empty heap if given an empty heap as input.
-Complexity: O(log n)
--}
-deleteMin : PairingHeap comparable a -> PairingHeap comparable a
-deleteMin heap =
-    case heap of
-        Empty ->
-            Empty
-
-        Heap k v heaps ->
-            mergePairs heaps
-
-
-{-| This is an internal function used by deleteMin.
--}
-mergePairs : List (PairingHeap comparable a) -> PairingHeap comparable a
-mergePairs heaps =
-    case heaps of
-        [] ->
-            Empty
-
-        x :: [] ->
-            x
-
-        x :: (y :: xs) ->
-            merge (merge x y) (mergePairs xs)
-
-
-
--- Extra convenience functions
-
-
-{-| This function turns a list of key-value pairs into a `PairingHeap`.
-Complexity: O(n)
--}
-fromList : List ( comparable, a ) -> PairingHeap comparable a
-fromList =
-    List.foldl (\( k, v ) -> insert k v) empty
-
-
-{-| This function turns a `PairingHeap` into a sorted list of key-value pairs.
-Complexity: O(n log n)
--}
-toSortedList : PairingHeap comparable a -> List ( comparable, a )
-toSortedList heap =
-    case heap of
-        Empty ->
-            []
-
-        Heap k v _ ->
-            ( k, v ) :: toSortedList (deleteMin heap)

package/src/Parser/Extra/String.elm

@@ -1,33 +0,0 @@
-module Parser.Extra.String exposing (string)
-
-import Parser exposing (..)
-
-
-string : Parser String
-string =
-    succeed identity
-        |. token "\""
-        |= loop [] stringHelp
-
-
-stringHelp : List String -> Parser (Step (List String) String)
-stringHelp revChunks =
-    oneOf
-        [ succeed (\chunk -> Loop (chunk :: revChunks))
-            |. token "\\"
-            |= oneOf
-                [ map (\_ -> "\n") (token "n")
-                , map (\_ -> "\t") (token "t")
-                , map (\_ -> "\u{000D}") (token "r")
-                ]
-        , token "\""
-            |> map (\_ -> Done (String.join "" (List.reverse revChunks)))
-        , chompWhile isUninteresting
-            |> getChompedString
-            |> map (\chunk -> Loop (chunk :: revChunks))
-        ]
-
-
-isUninteresting : Char -> Bool
-isUninteresting char =
-    char /= '\\' && char /= '"'

package/src/Parser/Extra.elm

@@ -1,69 +0,0 @@
-module Parser.Extra exposing (deadEndsToString)
-
-{-| [No implementation for deadEndsToString · Issue #9 · elm/parser](https://github.com/elm/parser/issues/9)
--}
-
-import Parser exposing (DeadEnd, Problem(..))
-
-
-deadEndsToString : List DeadEnd -> String
-deadEndsToString deadEnds =
-    String.join "\n" (List.map deadEndToString deadEnds)
-
-
-deadEndToString : DeadEnd -> String
-deadEndToString deadEnd =
-    problemToString deadEnd.problem
-        ++ " at "
-        ++ deadEndToRowColString deadEnd
-
-
-problemToString : Problem -> String
-problemToString prob =
-    case prob of
-        Expecting s ->
-            "Expecting " ++ s
-
-        ExpectingInt ->
-            "Expecting Int"
-
-        ExpectingHex ->
-            "Expecting Hex"
-
-        ExpectingOctal ->
-            "Expecting Octal"
-
-        ExpectingBinary ->
-            "Expecting Binary"
-
-        ExpectingFloat ->
-            "Expecting Float"
-
-        ExpectingNumber ->
-            "Expecting Number"
-
-        ExpectingVariable ->
-            "Expecting Variable"
-
-        ExpectingSymbol s ->
-            "Expecting Symbol " ++ s
-
-        ExpectingKeyword s ->
-            "Expecting Keyword " ++ s
-
-        ExpectingEnd ->
-            "Expecting End"
-
-        UnexpectedChar ->
-            "Unexpected Char"
-
-        Problem s ->
-            "Problem: " ++ s
-
-        BadRepeat ->
-            "Bad Repeat"
-
-
-deadEndToRowColString : DeadEnd -> String
-deadEndToRowColString deadEnd =
-    "row " ++ String.fromInt deadEnd.row ++ ", " ++ "col " ++ String.fromInt deadEnd.col