elm-pages 3.0.8 → 3.0.10

package/src/BackendTask/Glob.elm

@@ -28,7 +28,7 @@ With the `BackendTask.Glob` API, you could get all of those files like so:
 
     import BackendTask exposing (BackendTask)
 
-    blogPostsGlob : BackendTask (List String)
+    blogPostsGlob : BackendTask error (List String)
     blogPostsGlob =
         Glob.succeed (\slug -> slug)
             |> Glob.match (Glob.literal "content/blog/")
@@ -69,7 +69,7 @@ There will be one argument for every `capture` in your pipeline, whereas `match`
     import BackendTask exposing (BackendTask)
     import BackendTask.Glob as Glob
 
-    blogPostsGlob : BackendTask (List String)
+    blogPostsGlob : BackendTask error (List String)
     blogPostsGlob =
         Glob.succeed (\slug -> slug)
             -- no argument from this, but we will only
@@ -97,7 +97,7 @@ Let's try our blogPostsGlob from before, but change every `match` to `capture`.
     import BackendTask exposing (BackendTask)
 
     blogPostsGlob :
-        BackendTask
+        BackendTask error
             (List
                 { filePath : String
                 , slug : String
@@ -155,20 +155,22 @@ This is my first post!
 Then we could read that title for our blog post list page using our `blogPosts` `BackendTask` that we defined above.
 
     import BackendTask.File
+    import FatalError exposing (FatalError)
     import Json.Decode as Decode exposing (Decoder)
 
-    titles : BackendTask (List BlogPost)
+    titles : BackendTask FatalError (List BlogPost)
     titles =
         blogPosts
             |> BackendTask.map
                 (List.map
                     (\blogPost ->
-                        BackendTask.File.request
+                        BackendTask.File.onlyFrontmatter
+                            blogFrontmatterDecoder
                             blogPost.filePath
-                            (BackendTask.File.frontmatter blogFrontmatterDecoder)
                     )
                 )
             |> BackendTask.resolve
+            |> BackendTask.allowFatal
 
     type alias BlogPost =
         { title : String }
@@ -249,7 +251,7 @@ could use
     import BackendTask exposing (BackendTask)
     import BackendTask.Glob as Glob
 
-    blogPostsGlob : BackendTask (List String)
+    blogPostsGlob : BackendTask error (List String)
     blogPostsGlob =
         Glob.succeed (\slug -> slug)
             |> Glob.match (Glob.literal "content/blog/")
@@ -258,14 +260,14 @@ could use
             |> Glob.toBackendTask
 
 If you want to validate file formats, you can combine that with some `BackendTask` helpers to turn a `Glob (Result String value)` into
-a `BackendTask (List value)`.
+a `BackendTask FatalError (List value)`.
 
 For example, you could take a date and parse it.
 
     import BackendTask exposing (BackendTask)
     import BackendTask.Glob as Glob
 
-    example : BackendTask (List ( String, String ))
+    example : BackendTask FatalError (List ( String, String ))
     example =
         Glob.succeed
             (\dateResult slug ->
@@ -281,14 +283,14 @@ For example, you could take a date and parse it.
             |> BackendTask.map (List.map BackendTask.fromResult)
             |> BackendTask.resolve
 
-    expectDateFormat : List String -> Result String String
+    expectDateFormat : List String -> Result FatalError String
     expectDateFormat dateParts =
         case dateParts of
             [ year, month, date ] ->
                 Ok (String.join "-" [ year, month, date ])
 
             _ ->
-                Err "Unexpected date format, expected yyyy/mm/dd folder structure."
+                Err <| FatalError.fromString "Unexpected date format, expected yyyy/mm/dd folder structure."
 
 -}
 map : (a -> b) -> Glob a -> Glob b
@@ -322,7 +324,7 @@ fullFilePath =
     import BackendTask.Glob as Glob
 
     blogPosts :
-        BackendTask
+        BackendTask error
             (List
                 { filePath : String
                 , slug : String
@@ -368,11 +370,11 @@ match 0 or more path parts like, see `recursiveWildcard`.
         , slug : String
         }
 
-    example : BackendTask (List BlogPost)
+    example : BackendTask error (List BlogPost)
     example =
         Glob.succeed BlogPost
             |> Glob.match (Glob.literal "blog/")
-            |> Glob.match Glob.wildcard
+            |> Glob.capture Glob.wildcard
             |> Glob.match (Glob.literal "-")
             |> Glob.capture Glob.wildcard
             |> Glob.match (Glob.literal "-")
@@ -391,7 +393,7 @@ match 0 or more path parts like, see `recursiveWildcard`.
 
 That will match to:
 
-    results : BackendTask (List BlogPost)
+    results : BackendTask error (List BlogPost)
     results =
         BackendTask.succeed
             [ { year = "2021"
@@ -443,7 +445,7 @@ Leading 0's are ignored.
     import BackendTask exposing (BackendTask)
     import BackendTask.Glob as Glob
 
-    slides : BackendTask (List Int)
+    slides : BackendTask error (List Int)
     slides =
         Glob.succeed identity
             |> Glob.match (Glob.literal "slide-")
@@ -472,7 +474,7 @@ With files
 
 Yields
 
-    matches : BackendTask (List Int)
+    matches : BackendTask error (List Int)
     matches =
         BackendTask.succeed
             [ 1
@@ -513,7 +515,7 @@ This is the elm-pages equivalent of `**/*.txt` in standard shell syntax:
     import BackendTask exposing (BackendTask)
     import BackendTask.Glob as Glob
 
-    example : BackendTask (List ( List String, String ))
+    example : BackendTask error (List ( List String, String ))
     example =
         Glob.succeed Tuple.pair
             |> Glob.match (Glob.literal "articles/")
@@ -537,7 +539,7 @@ With these files:
 
 We would get the following matches:
 
-    matches : BackendTask (List ( List String, String ))
+    matches : BackendTask error (List ( List String, String ))
     matches =
         BackendTask.succeed
             [ ( [ "archive", "1977", "06", "10" ], "apple-2-announced" )
@@ -552,14 +554,14 @@ And also note that it matches 0 path parts into an empty list.
 If we didn't include the `wildcard` after the `recursiveWildcard`, then we would only get
 a single level of matches because it is followed by a file extension.
 
-    example : BackendTask (List String)
+    example : BackendTask error (List String)
     example =
         Glob.succeed identity
             |> Glob.match (Glob.literal "articles/")
             |> Glob.capture Glob.recursiveWildcard
             |> Glob.match (Glob.literal ".txt")
 
-    matches : BackendTask (List String)
+    matches : BackendTask error (List String)
     matches =
         BackendTask.succeed
             [ "google-io-2021-recap"
@@ -677,7 +679,7 @@ Exactly the same as `match` except it also captures the matched sub-pattern.
         , slug : String
         }
 
-    archives : BackendTask ArchivesArticle
+    archives : BackendTask error ArchivesArticle
     archives =
         Glob.succeed ArchivesArticle
             |> Glob.match (Glob.literal "archive/")
@@ -693,7 +695,7 @@ Exactly the same as `match` except it also captures the matched sub-pattern.
 
 The file `archive/1977/06/10/apple-2-released.md` will give us this match:
 
-    matches : List ArchivesArticle
+    matches : List error ArchivesArticle
     matches =
         BackendTask.succeed
             [ { year = 1977
@@ -744,7 +746,7 @@ capture (Glob matcherPattern apply1) (Glob pattern apply2) =
         , extension : String
         }
 
-    dataFiles : BackendTask (List DataFile)
+    dataFiles : BackendTask error (List DataFile)
     dataFiles =
         Glob.succeed DataFile
             |> Glob.match (Glob.literal "my-data/")
@@ -768,7 +770,7 @@ If we have the following files
 
 That gives us
 
-    results : BackendTask (List DataFile)
+    results : BackendTask error (List DataFile)
     results =
         BackendTask.succeed
             [ { name = "authors"
@@ -781,7 +783,7 @@ That gives us
 
 You could also match an optional file path segment using `oneOf`.
 
-    rootFilesMd : BackendTask (List String)
+    rootFilesMd : BackendTask error (List String)
     rootFilesMd =
         Glob.succeed (\slug -> slug)
             |> Glob.match (Glob.literal "blog/")
@@ -806,7 +808,7 @@ With these files:
 
 This would give us:
 
-    results : BackendTask (List String)
+    results : BackendTask error (List String)
     results =
         BackendTask.succeed
             [ "first-post"
@@ -965,7 +967,7 @@ encodeOptions options =
 
     import BackendTask.Glob as Glob exposing (OnlyFolders, defaultOptions)
 
-    matchingFiles : Glob a -> BackendTask (List a)
+    matchingFiles : Glob a -> BackendTask error (List a)
     matchingFiles glob =
         glob
             |> Glob.toBackendTaskWithOptions { defaultOptions | include = OnlyFolders }
@@ -1010,12 +1012,12 @@ For example, maybe you can have
     import BackendTask exposing (BackendTask)
     import BackendTask.Glob as Glob
 
-    findBlogBySlug : String -> BackendTask String
+    findBlogBySlug : String -> BackendTask FatalError String
     findBlogBySlug slug =
         Glob.succeed identity
             |> Glob.captureFilePath
             |> Glob.match (Glob.literal "blog/")
-            |> Glob.capture (Glob.literal slug)
+            |> Glob.match (Glob.literal slug)
             |> Glob.match
                 (Glob.oneOf
                     ( ( "", () )
@@ -1024,6 +1026,7 @@ For example, maybe you can have
                 )
             |> Glob.match (Glob.literal ".md")
             |> Glob.expectUniqueMatch
+            |> BackendTask.allowFatal
 
 If we used `findBlogBySlug "first-post"` with these files:
 
@@ -1035,7 +1038,7 @@ If we used `findBlogBySlug "first-post"` with these files:
 
 This would give us:
 
-    results : BackendTask String
+    results : BackendTask FatalError String
     results =
         BackendTask.succeed "blog/first-post/index.md"
 

package/src/BackendTask.elm

@@ -88,6 +88,7 @@ Any place in your `elm-pages` app where the framework lets you pass in a value o
 
 import FatalError exposing (FatalError)
 import Json.Encode
+import List.Chunks
 import Pages.StaticHttpRequest exposing (RawRequest(..))
 
 
@@ -140,6 +141,7 @@ resolve =
 {-| Turn a list of `BackendTask`s into a single one.
 
     import BackendTask
+    import FatalError exposing (FatalError)
     import Json.Decode as Decode exposing (Decoder)
 
     type alias Pokemon =
@@ -147,7 +149,7 @@ resolve =
         , sprite : String
         }
 
-    pokemonDetailRequest : BackendTask (List Pokemon)
+    pokemonDetailRequest : BackendTask FatalError (List Pokemon)
     pokemonDetailRequest =
         BackendTask.Http.getJson
             "https://pokeapi.co/api/v2/pokemon/?limit=3"
@@ -169,34 +171,56 @@ resolve =
                 )
             )
             |> BackendTask.andThen BackendTask.combine
+            |> BackendTask.allowFatal
 
 -}
 combine : List (BackendTask error value) -> BackendTask error (List value)
 combine items =
+    items
+        |> List.Chunks.chunk 100
+        |> List.map combineHelp
+        |> List.Chunks.chunk 100
+        |> List.map combineHelp
+        |> List.Chunks.chunk 100
+        |> List.map combineHelp
+        |> combineHelp
+        |> map (List.concat >> List.concat >> List.concat)
+
+
+{-| `combineHelp` on its own will overflow the stack with larger lists of tasks
+
+dividing the tasks into smaller nested chunks and recombining makes `combine` stack safe
+
+There's probably a way of doing this without the Lists but it's a neat trick to safely combine lots of tasks!
+
+-}
+combineHelp : List (BackendTask error value) -> BackendTask error (List value)
+combineHelp items =
     List.foldl (map2 (::)) (succeed []) items |> map List.reverse
 
 
-{-| Like map, but it takes in two `Request`s.
+{-| Like map, but it takes in two `BackendTask`s.
 
-    view siteMetadata page =
-        StaticHttp.map2
-            (\elmPagesStars elmMarkdownStars ->
-                { view =
-                    \model viewForPage ->
-                        { title = "Repo Stargazers"
-                        , body = starsView elmPagesStars elmMarkdownStars
-                        }
-                , head = head elmPagesStars elmMarkdownStars
-                }
-            )
-            (get
-                (Secrets.succeed "https://api.github.com/repos/dillonkearns/elm-pages")
-                (Decode.field "stargazers_count" Decode.int)
-            )
-            (get
-                (Secrets.succeed "https://api.github.com/repos/dillonkearns/elm-markdown")
-                (Decode.field "stargazers_count" Decode.int)
+    import BackendTask exposing (BackendTask)
+    import BackendTask.Env as Env
+    import BackendTask.Http
+    import FatalError exposing (FatalError)
+    import Json.Decode as Decode
+
+    type alias Data =
+        { pokemon : List String, envValue : Maybe String }
+
+    data : BackendTask FatalError Data
+    data =
+        BackendTask.map2 Data
+            (BackendTask.Http.getJson
+                "https://pokeapi.co/api/v2/pokemon/?limit=100&offset=0"
+                (Decode.field "results"
+                    (Decode.list (Decode.field "name" Decode.string))
+                )
+                |> BackendTask.allowFatal
             )
+            (Env.get "HELLO")
 
 -}
 map2 : (a -> b -> c) -> BackendTask error a -> BackendTask error b -> BackendTask error c
@@ -239,17 +263,19 @@ map2 fn request1 request2 =
 from the previous response to build up the URL, headers, etc. that you send to the subsequent request.
 
     import BackendTask
+    import FatalError exposing (FatalError)
     import Json.Decode as Decode exposing (Decoder)
 
-    licenseData : BackendTask String
+    licenseData : BackendTask FatalError String
     licenseData =
-        BackendTask.Http.get
-            (Secrets.succeed "https://api.github.com/repos/dillonkearns/elm-pages")
+        BackendTask.Http.getJson
+            "https://api.github.com/repos/dillonkearns/elm-pages"
             (Decode.at [ "license", "url" ] Decode.string)
             |> BackendTask.andThen
                 (\licenseUrl ->
-                    BackendTask.Http.get (Secrets.succeed licenseUrl) (Decode.field "description" Decode.string)
+                    BackendTask.Http.getJson licenseUrl (Decode.field "description" Decode.string)
                 )
+            |> BackendTask.allowFatal
 
 -}
 andThen : (a -> BackendTask error b) -> BackendTask error a -> BackendTask error b
@@ -309,28 +335,15 @@ andMap =
     map2 (|>)
 
 
-{-| This is useful for prototyping with some hardcoded data, or for having a view that doesn't have any StaticHttp data.
+{-| This is useful for prototyping with some hardcoded data, or for having a view that doesn't have any BackendTask data.
 
-    import BackendTask
+    import BackendTask exposing (BackendTask)
+
+    type alias RouteParams = { name : String }
 
-    view :
-        List ( PagePath, Metadata )
-        ->
-            { path : PagePath
-            , frontmatter : Metadata
-            }
-        ->
-            StaticHttp.Request
-                { view : Model -> View -> { title : String, body : Html Msg }
-                , head : List (Head.Tag Pages.PathKey)
-                }
-    view siteMetadata page =
-        StaticHttp.succeed
-            { view =
-                \model viewForPage ->
-                    mainView model viewForPage
-            , head = head page.frontmatter
-            }
+    pages : BackendTask error (List RouteParams)
+    pages =
+        BackendTask.succeed [ { name = "elm-pages" } ]
 
 -}
 succeed : a -> BackendTask error a

package/src/FatalError.elm

@@ -20,8 +20,8 @@ For example, if you wanted to handle possible errors to present them to the user
         BackendTask.Http.getJson "https://api.github.com/repos/dillonkearns/elm-pages"
             (Decode.field "description" Decode.string)
             |> BackendTask.onError
-                (\error ->
-                    case FatalError.unwrap error of
+                (\{ recoverable } ->
+                    case recoverable of
                         BackendTask.Http.BadStatus metadata string ->
                             if metadata.statusCode == 401 || metadata.statusCode == 403 || metadata.statusCode == 404 then
                                 BackendTask.succeed "Either this repo doesn't exist or you don't have access to it."

package/src/Head/Seo.elm

@@ -52,8 +52,8 @@ includes common meta tags used for rich link previews, namely [OpenGraph tags](h
 import DateOrDateTime exposing (DateOrDateTime)
 import Head
 import Head.Twitter as Twitter
-import LanguageTag.Country
 import LanguageTag.Language
+import LanguageTag.Region
 import MimeType exposing (MimeType)
 import Pages.Url
 
@@ -315,7 +315,7 @@ localeToString : Locale -> String
 localeToString ( language, territory ) =
     LanguageTag.Language.toCodeString language
         ++ "_"
-        ++ LanguageTag.Country.toCodeString territory
+        ++ LanguageTag.Region.toCodeString territory
 
 
 tagsForCommon : Common -> List ( String, Maybe Head.AttributeValue )
@@ -361,7 +361,7 @@ tagsForAudio audio =
 
 
 type alias Locale =
-    ( LanguageTag.Language.Language, LanguageTag.Country.Country )
+    ( LanguageTag.Language.Language, LanguageTag.Region.Region )
 
 
 type Content

package/src/List/Chunks.elm

@@ -0,0 +1,51 @@
+module List.Chunks exposing (chunk)
+
+import Array exposing (Array)
+
+
+{-| Adapted from <https://package.elm-lang.org/packages/krisajenkins/elm-exts/latest/Exts-List>
+
+Split a list into chunks of length `n`.
+
+Be aware that the last sub-list may be smaller than `n`-items long.
+
+For example `chunk 3 [1..10] => [[1,2,3], [4,5,6], [7,8,9], [10]]`
+
+-}
+chunk : Int -> List a -> List (List a)
+chunk n xs =
+    if n < 1 then
+        List.singleton xs
+
+    else
+        evaluate (chunkInternal n xs Array.empty)
+
+
+chunkInternal : Int -> List a -> Array (List a) -> Trampoline (List (List a))
+chunkInternal n xs acc =
+    -- elm-review: known-unoptimized-recursion
+    if List.isEmpty xs then
+        Done (Array.toList acc)
+
+    else
+        Jump
+            (\_ ->
+                chunkInternal n
+                    (List.drop n xs)
+                    (Array.push (List.take n xs) acc)
+            )
+
+
+type Trampoline a
+    = Done a
+    | Jump (() -> Trampoline a)
+
+
+evaluate : Trampoline a -> a
+evaluate trampoline =
+    case trampoline of
+        Done value ->
+            value
+
+        Jump f ->
+            evaluate (f ())

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

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

package/src/Pages/Manifest.elm

@@ -72,8 +72,8 @@ import FatalError exposing (FatalError)
 import Head
 import Json.Encode as Encode
 import LanguageTag exposing (LanguageTag, emptySubtags)
-import LanguageTag.Country as Country
 import LanguageTag.Language
+import LanguageTag.Region as Region
 import MimeType
 import Pages.Manifest.Category as Category exposing (Category)
 import Pages.Url
@@ -140,7 +140,7 @@ usEnglish =
     LanguageTag.Language.en
         |> LanguageTag.build
             { emptySubtags
-                | region = Just Country.us
+                | region = Just Region.us
             }