elm-pages 2.1.11 → 3.0.0-beta.1

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

@@ -1,86 +1,37 @@
-module Pages.Internal.Platform.StaticResponses exposing (FinishKind(..), NextStep(..), StaticResponses, batchUpdate, error, nextStep, renderApiRequest, renderSingleRoute)
+module Pages.Internal.Platform.StaticResponses exposing (FinishKind(..), NextStep(..), StaticResponses, batchUpdate, empty, nextStep, renderApiRequest, renderSingleRoute)
 
-import ApiRoute
 import BuildError exposing (BuildError)
 import DataSource exposing (DataSource)
-import DataSource.Http exposing (RequestDetails)
 import Dict exposing (Dict)
 import Dict.Extra
-import Html exposing (Html)
-import HtmlPrinter exposing (htmlToString)
-import Internal.ApiRoute exposing (ApiRoute(..))
-import Pages.Internal.ApplicationType as ApplicationType
 import Pages.Internal.NotFoundReason exposing (NotFoundReason)
-import Pages.SiteConfig exposing (SiteConfig)
 import Pages.StaticHttp.Request as HashRequest
 import Pages.StaticHttpRequest as StaticHttpRequest
-import Path exposing (Path)
 import RequestsAndPending exposing (RequestsAndPending)
-import Secrets
-import SecretsDict exposing (SecretsDict)
 import Set exposing (Set)
-import TerminalText as Terminal
 
 
 type StaticResponses
     = ApiRequest StaticHttpResult
-    | StaticResponses (Dict String StaticHttpResult)
-    | CheckIfHandled (DataSource (Maybe NotFoundReason)) StaticHttpResult (Dict String StaticHttpResult)
+    | StaticResponses StaticHttpResult
+    | CheckIfHandled (DataSource (Maybe NotFoundReason)) StaticHttpResult StaticHttpResult
 
 
 type StaticHttpResult
     = NotFetched (DataSource ()) (Dict String (Result () String))
 
 
-error : StaticResponses
-error =
-    StaticResponses Dict.empty
-
-
-buildTimeFilesRequest :
-    { config
-        | apiRoutes :
-            (Html Never -> String)
-            -> List (ApiRoute.ApiRoute ApiRoute.Response)
-    }
-    -> DataSource (List (Result String { path : List String, content : String }))
-buildTimeFilesRequest config =
-    config.apiRoutes htmlToString
-        |> List.map
-            (\(ApiRoute handler) ->
-                handler.buildTimeRoutes
-                    |> DataSource.andThen
-                        (\paths ->
-                            paths
-                                |> List.map
-                                    (\path ->
-                                        handler.matchesToResponse path
-                                            |> DataSource.map
-                                                (\maybeResponse ->
-                                                    case maybeResponse of
-                                                        Nothing ->
-                                                            Err ""
-
-                                                        Just response ->
-                                                            Ok { path = path |> String.split "/", content = response.body }
-                                                )
-                                    )
-                                |> DataSource.combine
-                        )
-            )
-        |> DataSource.combine
-        |> DataSource.map List.concat
+empty : StaticResponses
+empty =
+    StaticResponses
+        (NotFetched (DataSource.succeed ()) Dict.empty)
 
 
 renderSingleRoute :
-    { config
-        | routeToPath : route -> List String
-    }
-    -> { path : Path, frontmatter : route }
-    -> DataSource a
+    DataSource a
     -> DataSource (Maybe NotFoundReason)
     -> StaticResponses
-renderSingleRoute config pathAndRoute request cliData =
+renderSingleRoute request cliData =
     CheckIfHandled cliData
         (NotFetched
             (cliData
@@ -88,12 +39,7 @@ renderSingleRoute config pathAndRoute request cliData =
             )
             Dict.empty
         )
-        (Dict.fromList
-            [ ( config.routeToPath pathAndRoute.frontmatter |> String.join "/"
-              , NotFetched (DataSource.map (\_ -> ()) request) Dict.empty
-              )
-            ]
-        )
+        (NotFetched (DataSource.map (\_ -> ()) request) Dict.empty)
 
 
 renderApiRequest :
@@ -109,221 +55,176 @@ renderApiRequest request =
 
 batchUpdate :
     List
-        { request :
-            { masked : RequestDetails, unmasked : RequestDetails }
-        , response : String
+        { request : HashRequest.Request
+        , response : RequestsAndPending.Response
         }
     ->
         { model
             | staticResponses : StaticResponses
-            , allRawResponses : Dict String (Maybe String)
+            , allRawResponses : RequestsAndPending
         }
     ->
         { model
             | staticResponses : StaticResponses
-            , allRawResponses : Dict String (Maybe String)
+            , allRawResponses : RequestsAndPending
         }
 batchUpdate newEntries model =
-    let
-        newResponses : Dict String String
-        newResponses =
-            newEntries
-                |> List.map
-                    (\newEntry ->
-                        ( HashRequest.hash newEntry.request.masked, newEntry.response )
-                    )
-                |> Dict.fromList
-
-        updatedAllResponses : Dict String (Maybe String)
-        updatedAllResponses =
-            Dict.merge
-                (\key a -> Dict.insert key (Just a))
-                (\key a _ -> Dict.insert key (Just a))
-                (\key b -> Dict.insert key b)
-                newResponses
-                model.allRawResponses
-                Dict.empty
-    in
     { model
-        | allRawResponses = updatedAllResponses
+        | allRawResponses = insertAll newEntries model.allRawResponses
     }
 
 
-encode : RequestsAndPending -> Dict String StaticHttpResult -> Result (List BuildError) (Dict String (Dict String String))
-encode requestsAndPending staticResponses =
-    staticResponses
-        |> Dict.filter
-            (\key _ ->
-                key /= cliDictKey
-            )
-        |> Dict.toList
-        |> List.map
-            (\( key, NotFetched request _ ) ->
-                StaticHttpRequest.strippedResponsesEncode ApplicationType.Cli request requestsAndPending
-                    |> Result.map (Tuple.pair key)
-            )
-        |> combineMultipleErrors
-        |> Result.mapError List.concat
-        |> Result.map Dict.fromList
-
+insertAll :
+    List
+        { request : HashRequest.Request
+        , response : RequestsAndPending.Response
+        }
+    -> RequestsAndPending
+    -> RequestsAndPending
+insertAll newEntries dict =
+    case newEntries of
+        [] ->
+            dict
 
-cliDictKey : String
-cliDictKey =
-    "////elm-pages-CLI////"
+        info :: rest ->
+            insertAll
+                rest
+                (Dict.update (HashRequest.hash info.request) (\_ -> Just (Just info.response)) dict)
 
 
 type NextStep route
-    = Continue (Dict String (Maybe String)) (List { masked : RequestDetails, unmasked : RequestDetails }) (Maybe (List route))
+    = Continue RequestsAndPending (List HashRequest.Request) (Maybe (List route))
     | Finish (FinishKind route)
 
 
 type FinishKind route
     = ApiResponse
     | Errors (List BuildError)
-    | Page (Dict String String)
 
 
 nextStep :
-    { config
-        | getStaticRoutes : DataSource (List route)
-        , routeToPath : route -> List String
-        , data : route -> DataSource pageData
-        , sharedData : DataSource sharedData
-        , site : Maybe (SiteConfig siteData)
-        , apiRoutes : (Html Never -> String) -> List (ApiRoute.ApiRoute ApiRoute.Response)
+    { model
+        | staticResponses : StaticResponses
+        , errors : List BuildError
+        , allRawResponses : RequestsAndPending
     }
-    ->
-        { model
-            | staticResponses : StaticResponses
-            , secrets : SecretsDict
-            , errors : List BuildError
-            , allRawResponses : Dict String (Maybe String)
-        }
     -> Maybe (List route)
     -> ( StaticResponses, NextStep route )
-nextStep config ({ secrets, allRawResponses, errors } as model) maybeRoutes =
+nextStep ({ allRawResponses, errors } as model) maybeRoutes =
     let
-        staticResponses : Dict String StaticHttpResult
+        staticRequestsStatus : StaticHttpRequest.Status ()
+        staticRequestsStatus =
+            allRawResponses
+                |> StaticHttpRequest.cacheRequestResolution request
+
+        request : DataSource ()
+        request =
+            case staticResponses of
+                NotFetched request_ _ ->
+                    request_
+
+        staticResponses : StaticHttpResult
         staticResponses =
             case model.staticResponses of
                 StaticResponses s ->
                     s
 
                 ApiRequest staticHttpResult ->
-                    Dict.singleton cliDictKey staticHttpResult
+                    staticHttpResult
 
                 CheckIfHandled _ staticHttpResult _ ->
-                    Dict.singleton cliDictKey staticHttpResult
-
-        generatedFiles : List (Result String { path : List String, content : String })
-        generatedFiles =
-            resolvedGenerateFilesResult |> Result.withDefault []
-
-        resolvedGenerateFilesResult : Result StaticHttpRequest.Error (List (Result String { path : List String, content : String }))
-        resolvedGenerateFilesResult =
-            StaticHttpRequest.resolve ApplicationType.Cli
-                (buildTimeFilesRequest config)
-                (allRawResponses |> Dict.Extra.filterMap (\_ value -> Just value))
-
-        generatedFileErrors : List BuildError
-        generatedFileErrors =
-            generatedFiles
-                |> List.filterMap
-                    (\result ->
-                        case result of
-                            Ok _ ->
-                                Nothing
-
-                            Err error_ ->
-                                Just
-                                    { title = "Generate Files Error"
-                                    , message =
-                                        [ Terminal.text "I encountered an Err from your generateFiles function. Message:\n"
-                                        , Terminal.text <| "Error: " ++ error_
-                                        ]
-                                    , path = "Site.elm"
-                                    , fatal = True
-                                    }
-                    )
-
-        allErrors : List BuildError
-        allErrors =
-            errors ++ failedRequests ++ generatedFileErrors
+                    staticHttpResult
 
         pendingRequests : Bool
         pendingRequests =
-            staticResponses
-                |> Dict.Extra.any
-                    (\_ entry ->
-                        case entry of
-                            NotFetched request rawResponses ->
-                                let
-                                    staticRequestsStatus : StaticHttpRequest.Status ()
-                                    staticRequestsStatus =
-                                        allRawResponses
-                                            |> StaticHttpRequest.cacheRequestResolution ApplicationType.Cli request
+            case staticResponses of
+                NotFetched _ rawResponses ->
+                    let
+                        hasPermanentError : Bool
+                        hasPermanentError =
+                            case staticRequestsStatus of
+                                StaticHttpRequest.HasPermanentError _ ->
+                                    True
 
-                                    hasPermanentError : Bool
-                                    hasPermanentError =
-                                        case staticRequestsStatus of
-                                            StaticHttpRequest.HasPermanentError _ ->
-                                                True
+                                _ ->
+                                    False
 
-                                            _ ->
-                                                False
+                        hasPermanentHttpError : Bool
+                        hasPermanentHttpError =
+                            not (List.isEmpty errors)
 
-                                    hasPermanentHttpError : Bool
-                                    hasPermanentHttpError =
-                                        not (List.isEmpty errors)
+                        ( allUrlsKnown, knownUrlsToFetch ) =
+                            case staticRequestsStatus of
+                                StaticHttpRequest.Incomplete newUrlsToFetch ->
+                                    ( False, newUrlsToFetch )
 
-                                    ( allUrlsKnown, knownUrlsToFetch ) =
-                                        case staticRequestsStatus of
-                                            StaticHttpRequest.Incomplete newUrlsToFetch ->
-                                                ( False, newUrlsToFetch )
+                                _ ->
+                                    ( True, [] )
 
-                                            _ ->
-                                                ( True, [] )
-
-                                    fetchedAllKnownUrls : Bool
-                                    fetchedAllKnownUrls =
-                                        (rawResponses
-                                            |> Dict.keys
-                                            |> Set.fromList
-                                            |> Set.union (allRawResponses |> Dict.keys |> Set.fromList)
-                                        )
-                                            |> Set.diff
-                                                (knownUrlsToFetch
-                                                    |> List.map Secrets.maskedLookup
-                                                    |> List.map HashRequest.hash
-                                                    |> Set.fromList
-                                                )
-                                            |> Set.isEmpty
-                                in
-                                if hasPermanentHttpError || hasPermanentError || (allUrlsKnown && fetchedAllKnownUrls) then
-                                    False
+                        fetchedAllKnownUrls : Bool
+                        fetchedAllKnownUrls =
+                            (rawResponses
+                                |> Dict.keys
+                                |> Set.fromList
+                                |> Set.union (allRawResponses |> Dict.keys |> Set.fromList)
+                            )
+                                |> Set.diff
+                                    (knownUrlsToFetch
+                                        |> List.map HashRequest.hash
+                                        |> Set.fromList
+                                    )
+                                |> Set.isEmpty
+                    in
+                    not (hasPermanentHttpError || hasPermanentError || (allUrlsKnown && fetchedAllKnownUrls))
+    in
+    if pendingRequests then
+        let
+            urlsToPerform : List HashRequest.Request
+            urlsToPerform =
+                -- TODO is this redundant with cacheRequestResolution?
+                StaticHttpRequest.resolveUrls request allRawResponses
+
+            newAllRawResponses : RequestsAndPending
+            newAllRawResponses =
+                Dict.union allRawResponses dictOfNewUrlsToPerform
+
+            dictOfNewUrlsToPerform : RequestsAndPending
+            dictOfNewUrlsToPerform =
+                urlsToPerform
+                    |> List.map (\url -> ( HashRequest.hash url, Nothing ))
+                    |> Dict.fromList
+
+            maskedToUnmasked : Dict String HashRequest.Request
+            maskedToUnmasked =
+                urlsToPerform
+                    |> List.map
+                        (\secureUrl ->
+                            ( HashRequest.hash secureUrl, secureUrl )
+                        )
+                    |> Dict.fromList
+
+            alreadyPerformed : Set String
+            alreadyPerformed =
+                allRawResponses
+                    |> Dict.keys
+                    |> Set.fromList
+
+            newThing : List HashRequest.Request
+            newThing =
+                maskedToUnmasked
+                    |> Dict.Extra.removeMany alreadyPerformed
+                    |> Dict.values
+        in
+        ( model.staticResponses, Continue newAllRawResponses newThing maybeRoutes )
 
-                                else
-                                    True
-                    )
-
-        failedRequests : List BuildError
-        failedRequests =
-            staticResponses
-                |> Dict.toList
-                |> List.concatMap
-                    (\( path, NotFetched request _ ) ->
+    else
+        let
+            allErrors : List BuildError
+            allErrors =
+                let
+                    failedRequests : List BuildError
+                    failedRequests =
                         let
-                            staticRequestsStatus : StaticHttpRequest.Status ()
-                            staticRequestsStatus =
-                                StaticHttpRequest.cacheRequestResolution
-                                    ApplicationType.Cli
-                                    request
-                                    usableRawResponses
-
-                            usableRawResponses : RequestsAndPending
-                            usableRawResponses =
-                                allRawResponses
-
                             maybePermanentError : Maybe StaticHttpRequest.Error
                             maybePermanentError =
                                 case staticRequestsStatus of
@@ -336,205 +237,88 @@ nextStep config ({ secrets, allRawResponses, errors } as model) maybeRoutes =
                             decoderErrors : List BuildError
                             decoderErrors =
                                 maybePermanentError
-                                    |> Maybe.map (StaticHttpRequest.toBuildError path)
+                                    |> Maybe.map (StaticHttpRequest.toBuildError "TODO PATH")
                                     |> Maybe.map List.singleton
                                     |> Maybe.withDefault []
                         in
                         decoderErrors
-                    )
-    in
-    if pendingRequests then
-        let
-            requestContinuations : List ( String, DataSource () )
-            requestContinuations =
-                staticResponses
-                    |> Dict.toList
-                    |> List.map
-                        (\( path, NotFetched request _ ) ->
-                            ( path, request )
-                        )
-        in
-        case
-            performStaticHttpRequests allRawResponses secrets requestContinuations
-        of
-            Ok urlsToPerform ->
-                let
-                    newAllRawResponses : Dict String (Maybe String)
-                    newAllRawResponses =
-                        Dict.union allRawResponses dictOfNewUrlsToPerform
-
-                    dictOfNewUrlsToPerform : Dict String (Maybe String)
-                    dictOfNewUrlsToPerform =
-                        urlsToPerform
-                            |> List.map .masked
-                            |> List.map HashRequest.hash
-                            |> List.map (\hashedUrl -> ( hashedUrl, Nothing ))
-                            |> Dict.fromList
-
-                    maskedToUnmasked : Dict String { masked : RequestDetails, unmasked : RequestDetails }
-                    maskedToUnmasked =
-                        urlsToPerform
-                            --                                    |> List.map (\secureUrl -> ( Pages.Internal.Secrets.masked secureUrl, secureUrl ))
-                            |> List.map
-                                (\secureUrl ->
-                                    --                                            ( hashUrl secureUrl, { unmasked = secureUrl, masked = secureUrl } )
-                                    ( HashRequest.hash secureUrl.masked, secureUrl )
-                                )
-                            |> Dict.fromList
-
-                    alreadyPerformed : Set String
-                    alreadyPerformed =
-                        allRawResponses
-                            |> Dict.keys
-                            |> Set.fromList
-
-                    newThing : List { masked : RequestDetails, unmasked : RequestDetails }
-                    newThing =
-                        maskedToUnmasked
-                            |> Dict.Extra.removeMany alreadyPerformed
-                            |> Dict.toList
-                            |> List.map
-                                (\( _, secureUrl ) ->
-                                    secureUrl
-                                )
                 in
-                ( model.staticResponses, Continue newAllRawResponses newThing maybeRoutes )
-
-            Err error_ ->
-                ( model.staticResponses, Finish (Errors <| (error_ ++ failedRequests ++ errors)) )
-
-    else
+                errors ++ failedRequests
+        in
         case model.staticResponses of
             StaticResponses _ ->
-                --let
-                --    siteStaticData =
-                --        StaticHttpRequest.resolve ApplicationType.Cli
-                --            config.site.staticData
-                --            (allRawResponses |> Dict.Extra.filterMap (\_ value -> Just value))
-                --            |> Result.mapError (StaticHttpRequest.toBuildError "Site.elm")
-                --in
-                --case siteStaticData of
-                --    Err siteStaticDataError ->
-                --        ( staticResponses_
-                --        , ToJsPayload.toJsPayload
-                --            (encode allRawResponses mode staticResponses)
-                --            generatedOkayFiles
-                --            allRawResponses
-                --            (siteStaticDataError :: allErrors)
-                --            |> Finish
-                --        )
-                --
-                --    Ok okSiteStaticData ->
                 ( model.staticResponses
-                , case encode allRawResponses staticResponses of
-                    Ok encodedResponses ->
-                        -- TODO send all global head tags on initial call
-                        if List.length allErrors > 0 then
-                            allErrors
-                                |> Errors
-                                |> Finish
-
-                        else
-                            Page (encodedResponses |> Dict.values |> List.head |> Maybe.withDefault Dict.empty)
-                                |> Finish
-
-                    Err buildErrors ->
-                        (allErrors ++ buildErrors)
-                            |> Errors
-                            |> Finish
+                , if List.length allErrors > 0 then
+                    allErrors
+                        |> Errors
+                        |> Finish
+
+                  else
+                    Finish ApiResponse
                 )
 
             ApiRequest _ ->
                 ( model.staticResponses
-                , ApiResponse
-                    |> Finish
+                , if List.length allErrors > 0 then
+                    allErrors
+                        |> Errors
+                        |> Finish
+
+                  else
+                    ApiResponse
+                        |> Finish
                 )
 
             CheckIfHandled pageFoundDataSource (NotFetched _ _) andThenRequest ->
                 let
                     pageFoundResult : Result StaticHttpRequest.Error (Maybe NotFoundReason)
                     pageFoundResult =
-                        StaticHttpRequest.resolve ApplicationType.Cli
+                        StaticHttpRequest.resolve
                             pageFoundDataSource
-                            (allRawResponses |> Dict.Extra.filterMap (\_ value -> Just value))
+                            allRawResponses
                 in
                 case pageFoundResult of
                     Ok Nothing ->
-                        nextStep config { model | staticResponses = StaticResponses andThenRequest } maybeRoutes
+                        nextStep { model | staticResponses = StaticResponses andThenRequest } maybeRoutes
 
                     Ok (Just _) ->
-                        ( StaticResponses Dict.empty
+                        ( empty
                         , Finish ApiResponse
-                          -- TODO should there be a new type for 404response? Or something else?
+                          -- TODO change data type here so you can avoid running `resolve` again from `Cli.elm` since it can be expensive
                         )
 
                     Err error_ ->
+                        let
+                            failedRequests : List BuildError
+                            failedRequests =
+                                let
+                                    maybePermanentError : Maybe StaticHttpRequest.Error
+                                    maybePermanentError =
+                                        case staticRequestsStatus of
+                                            StaticHttpRequest.HasPermanentError theError ->
+                                                Just theError
+
+                                            _ ->
+                                                Nothing
+
+                                    decoderErrors : List BuildError
+                                    decoderErrors =
+                                        maybePermanentError
+                                            |> Maybe.map (StaticHttpRequest.toBuildError "TODO PATH")
+                                            |> Maybe.map List.singleton
+                                            |> Maybe.withDefault []
+                                in
+                                decoderErrors
+                        in
                         ( model.staticResponses
                         , Finish
                             (Errors <|
-                                ([ StaticHttpRequest.toBuildError
+                                (StaticHttpRequest.toBuildError
                                     -- TODO give more fine-grained error reference
                                     "get static routes"
                                     error_
-                                 ]
-                                    ++ failedRequests
+                                    :: failedRequests
                                     ++ errors
                                 )
                             )
                         )
-
-
-performStaticHttpRequests :
-    Dict String (Maybe String)
-    -> SecretsDict
-    -> List ( String, DataSource a )
-    -> Result (List BuildError) (List { unmasked : RequestDetails, masked : RequestDetails })
-performStaticHttpRequests allRawResponses secrets staticRequests =
-    staticRequests
-        -- TODO look for performance bottleneck in this double nesting
-        |> List.map
-            (\( _, request ) ->
-                StaticHttpRequest.resolveUrls ApplicationType.Cli request allRawResponses
-            )
-        |> List.concat
-        -- TODO prevent duplicates... can't because Set needs comparable
-        --        |> Set.fromList
-        --        |> Set.toList
-        |> List.map
-            (\urlBuilder ->
-                urlBuilder
-                    |> Secrets.lookup secrets
-                    |> Result.map
-                        (\unmasked ->
-                            { unmasked = unmasked
-                            , masked = Secrets.maskedLookup urlBuilder
-                            }
-                        )
-            )
-        |> combineMultipleErrors
-        |> Result.mapError List.concat
-
-
-combineMultipleErrors : List (Result error a) -> Result (List error) (List a)
-combineMultipleErrors results =
-    List.foldr
-        (\result soFarResult ->
-            case soFarResult of
-                Ok soFarOk ->
-                    case result of
-                        Ok value ->
-                            value :: soFarOk |> Ok
-
-                        Err error_ ->
-                            Err [ error_ ]
-
-                Err errorsSoFar ->
-                    case result of
-                        Ok _ ->
-                            Err errorsSoFar
-
-                        Err error_ ->
-                            Err <| error_ :: errorsSoFar
-        )
-        (Ok [])
-        results