elm-pages 3.0.0-beta.0 → 3.0.0-beta.2

package/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm

@@ -0,0 +1,455 @@
+module Pages.Review.DeadCodeEliminateDataTest exposing (all)
+
+import Pages.Review.DeadCodeEliminateData exposing (rule)
+import Review.Test
+import Test exposing (Test, describe, test)
+
+
+all : Test
+all =
+    describe "dead code elimination"
+        [ test "replaces data record setter" <|
+            \() ->
+                """module Route.Index exposing (Data, Model, Msg, route)
+
+import DataSource exposing (DataSource)
+import RouteBuilder exposing (Page, StaticPayload, single)
+import Pages.PageUrl exposing (PageUrl)
+import Pages.Url
+import Path
+import Route exposing (Route)
+import Shared
+import View exposing (View)
+
+
+type alias Model =
+   {}
+
+
+type alias Msg =
+   ()
+
+
+type alias RouteParams =
+   {}
+
+
+type alias Data =
+   ()
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+   single
+       { head = head
+       , data = data
+       }
+       |> RouteBuilder.buildNoState { view = view }
+
+
+data : DataSource Data
+data =
+    DataSource.succeed ()
+"""
+                    |> Review.Test.run rule
+                    |> Review.Test.expectErrors
+                        [ Review.Test.error
+                            { message = "Codemod"
+                            , details =
+                                [ "" ]
+                            , under =
+                                """data = data
+       }"""
+                            }
+                            |> Review.Test.whenFixed
+                                """module Route.Index exposing (Data, Model, Msg, route)
+
+import DataSource exposing (DataSource)
+import RouteBuilder exposing (Page, StaticPayload, single)
+import Pages.PageUrl exposing (PageUrl)
+import Pages.Url
+import Path
+import Route exposing (Route)
+import Shared
+import View exposing (View)
+
+
+type alias Model =
+   {}
+
+
+type alias Msg =
+   ()
+
+
+type alias RouteParams =
+   {}
+
+
+type alias Data =
+   ()
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+   single
+       { head = head
+       , data = DataSource.fail ""
+       }
+       |> RouteBuilder.buildNoState { view = view }
+
+
+data : DataSource Data
+data =
+    DataSource.succeed ()
+"""
+                        ]
+        , test "replaces data record setter with non-empty RouteParams" <|
+            \() ->
+                """module Route.Blog.Slug_ exposing (Data, Model, Msg, route)
+
+import DataSource exposing (DataSource)
+import RouteBuilder exposing (Page, StaticPayload)
+import Pages.PageUrl exposing (PageUrl)
+import Pages.Url
+import Path
+import Route exposing (Route)
+import Shared
+import View exposing (View)
+
+
+type alias Model =
+   {}
+
+
+type alias Msg =
+   ()
+
+
+type alias RouteParams =
+    { slug : String }
+
+
+type alias Data =
+   ()
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+    RouteBuilder.preRender
+        { data = data
+        , head = head
+        , pages = pages
+        }
+        |> RouteBuilder.buildNoState { view = view }
+
+
+data : DataSource Data
+data =
+    DataSource.succeed ()
+"""
+                    |> Review.Test.run rule
+                    |> Review.Test.expectErrors
+                        [ Review.Test.error
+                            { message = "Codemod"
+                            , details =
+                                [ "" ]
+                            , under =
+                                """data = data"""
+                            }
+                            |> Review.Test.whenFixed
+                                """module Route.Blog.Slug_ exposing (Data, Model, Msg, route)
+
+import DataSource exposing (DataSource)
+import RouteBuilder exposing (Page, StaticPayload)
+import Pages.PageUrl exposing (PageUrl)
+import Pages.Url
+import Path
+import Route exposing (Route)
+import Shared
+import View exposing (View)
+
+
+type alias Model =
+   {}
+
+
+type alias Msg =
+   ()
+
+
+type alias RouteParams =
+    { slug : String }
+
+
+type alias Data =
+   ()
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+    RouteBuilder.preRender
+        { data = \\_ -> DataSource.fail ""
+        , head = head
+        , pages = pages
+        }
+        |> RouteBuilder.buildNoState { view = view }
+
+
+data : DataSource Data
+data =
+    DataSource.succeed ()
+"""
+                        ]
+        , test "replaces data record setter with RouteBuilder.serverRendered" <|
+            \() ->
+                """module Route.Login exposing (Data, Model, Msg, route)
+
+type alias Model =
+    {}
+
+
+type alias Msg =
+    ()
+
+
+type alias RouteParams =
+    {}
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+    RouteBuilder.serverRender
+        { head = head
+        , data = data
+        , action = action
+        }
+        |> RouteBuilder.buildNoState { view = view }
+"""
+                    |> Review.Test.run rule
+                    |> Review.Test.expectErrors
+                        [ Review.Test.error
+                            { message = "Codemod"
+                            , details =
+                                [ "" ]
+                            , under =
+                                """data = data
+        ,"""
+                            }
+                            |> Review.Test.whenFixed
+                                """module Route.Login exposing (Data, Model, Msg, route)
+
+type alias Model =
+    {}
+
+
+type alias Msg =
+    ()
+
+
+type alias RouteParams =
+    {}
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+    RouteBuilder.serverRender
+        { head = head
+        , data = \\_ -> Request.oneOf []
+        , action = action
+        }
+        |> RouteBuilder.buildNoState { view = view }
+"""
+                        , Review.Test.error
+                            { message = "Codemod"
+                            , details =
+                                [ "" ]
+                            , under =
+                                """action = action
+        }"""
+                            }
+                            |> Review.Test.whenFixed
+                                """module Route.Login exposing (Data, Model, Msg, route)
+
+type alias Model =
+    {}
+
+
+type alias Msg =
+    ()
+
+
+type alias RouteParams =
+    {}
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+    RouteBuilder.serverRender
+        { head = head
+        , data = data
+        , action = \\_ -> Request.oneOf []
+        }
+        |> RouteBuilder.buildNoState { view = view }
+"""
+                        ]
+        , test "no Request.oneOf fix after replacement is made" <|
+            \() ->
+                """module Route.Login exposing (Data, Model, Msg, route)
+
+type alias Model =
+    {}
+
+
+type alias Msg =
+    ()
+
+
+type alias RouteParams =
+    {}
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+    RouteBuilder.serverRender
+        { head = head
+        , data = \\_ -> Request.oneOf []
+        }
+        |> RouteBuilder.buildNoState { view = view }
+"""
+                    |> Review.Test.run rule
+                    |> Review.Test.expectNoErrors
+        , test "no fix after replacement is made" <|
+            \() ->
+                """module Route.Index exposing (Data, Model, Msg, route)
+
+import DataSource exposing (DataSource)
+import RouteBuilder exposing (Page, StaticPayload)
+import Pages.PageUrl exposing (PageUrl)
+import Pages.Url
+import Path
+import Route exposing (Route)
+import Shared
+import View exposing (View)
+
+
+type alias Model =
+   {}
+
+
+type alias Msg =
+   ()
+
+
+type alias RouteParams =
+   {}
+
+
+type alias Data =
+   ()
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+   RouteBuilder.single
+       { head = head
+       , data = DataSource.fail ""
+       }
+       |> RouteBuilder.buildNoState { view = view }
+
+
+data : DataSource Data
+data =
+    DataSource.succeed ()
+"""
+                    |> Review.Test.run rule
+                    |> Review.Test.expectNoErrors
+        , test "replaces data record setter in Shared module" <|
+            \() ->
+                """module Shared exposing (Data, Model, Msg, template)
+
+import Browser.Navigation
+import DataSource
+import Html exposing (Html)
+import Html.Styled
+import Pages.Flags
+import Pages.PageUrl exposing (PageUrl)
+import Path exposing (Path)
+import Route exposing (Route)
+import SharedTemplate exposing (SharedTemplate)
+import TableOfContents
+import View exposing (View)
+import View.Header
+
+
+template : SharedTemplate Msg Model Data msg
+template =
+    { init = init
+    , update = update
+    , view = view
+    , data = data
+    , subscriptions = subscriptions
+    , onPageChange = Just OnPageChange
+    }
+
+
+type alias Data =
+    TableOfContents.TableOfContents TableOfContents.Data
+
+
+type alias Model =
+    { showMobileMenu : Bool
+    , counter : Int
+    , navigationKey : Maybe Browser.Navigation.Key
+    }
+"""
+                    |> Review.Test.run rule
+                    |> Review.Test.expectErrors
+                        [ Review.Test.error
+                            { message = "Codemod"
+                            , details =
+                                [ "" ]
+                            , under =
+                                """data = data
+    ,"""
+                            }
+                            |> Review.Test.whenFixed
+                                """module Shared exposing (Data, Model, Msg, template)
+
+import Browser.Navigation
+import DataSource
+import Html exposing (Html)
+import Html.Styled
+import Pages.Flags
+import Pages.PageUrl exposing (PageUrl)
+import Path exposing (Path)
+import Route exposing (Route)
+import SharedTemplate exposing (SharedTemplate)
+import TableOfContents
+import View exposing (View)
+import View.Header
+
+
+template : SharedTemplate Msg Model Data msg
+template =
+    { init = init
+    , update = update
+    , view = view
+    , data = DataSource.fail ""
+    , subscriptions = subscriptions
+    , onPageChange = Just OnPageChange
+    }
+
+
+type alias Data =
+    TableOfContents.TableOfContents TableOfContents.Data
+
+
+type alias Model =
+    { showMobileMenu : Bool
+    , counter : Int
+    , navigationKey : Maybe Browser.Navigation.Key
+    }
+"""
+                        ]
+        ]

package/generator/review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 1851114818, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 2471752417, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1851114818,
+  initialSeed: 2471752417,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/src/SharedTemplate.elm

@@ -34,7 +34,7 @@ type alias SharedTemplate msg sharedModel sharedData mappedMsg =
         -> sharedModel
         -> (msg -> mappedMsg)
         -> View mappedMsg
-        -> { body : Html mappedMsg, title : String }
+        -> { body : List (Html mappedMsg), title : String }
     , data : DataSource.DataSource sharedData
     , subscriptions : Path -> sharedModel -> Sub msg
     , onPageChange :

package/generator/src/generate-template-module-connector.js

@@ -63,30 +63,10 @@ async function generateTemplateModuleConnector(basePath, phase) {
 }
 
 async function runElmCodegenCli(templates, basePath, phase) {
-  // await runElmCodegenInstall();
-  try {
-    await compileCliApp(
-      // { debug: true },
-      {},
-      `Generate.elm`,
-      path.join(process.cwd(), "elm-stuff/elm-pages-codegen.js"),
-      path.join(__dirname, "../../codegen"),
-
-      path.join(process.cwd(), "elm-stuff/elm-pages-codegen.js")
-    );
-  } catch (error) {
-    console.log(restoreColorSafe(error));
-    process.exit(1);
-    // throw error;
-  }
-
-  // TODO use uncached require here to prevent stale code from running
+  const filePath = path.join(__dirname, `../../codegen/elm-pages-codegen.js`);
 
   const promise = new Promise((resolve, reject) => {
-    const elmPagesCodegen = require(path.join(
-      process.cwd(),
-      "./elm-stuff/elm-pages-codegen.js"
-    )).Elm.Generate;
+    const elmPagesCodegen = require(filePath).Elm.Generate;
 
     const app = elmPagesCodegen.init({
       flags: { templates: templates, basePath, phase },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.0",
+  "version": "3.0.0-beta.2",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -10,7 +10,8 @@
     "test": "./test.sh",
     "test:snapshot": "(cd examples/escaping && npm install && npm test) && (cd examples/base-path && npm install && npm test)",
     "cypress": "npm start & cypress run",
-    "prepare": "elm-codegen install",
+    "prepare": "npm run build:generator",
+    "build:generator": "elm-codegen install && (cd codegen && lamdera make Generate.elm --output elm-pages-codegen.js)",
     "review": "elm-review"
   },
   "repository": "https://github.com/dillonkearns/elm-pages",
@@ -68,7 +69,9 @@
   "files": [
     "generator/src/",
     "generator/review/",
+    "generator/dead-code-review/",
     "src/",
+    "codegen/elm-pages-codegen.js",
     "generator/template/",
     "generator/static-code/"
   ],

package/src/DataSource/File.elm

@@ -171,7 +171,7 @@ just the metadata.
             (Decode.field "tags" (Decode.list Decode.string))
 
 If you wanted to use this to get this metadata for all blog posts in a folder, you could use
-the [`DataSource`](DataSource) API along with [`DataSource.Glob`](DataSource.Glob).
+the [`DataSource`](DataSource) API along with [`DataSource.Glob`](DataSource-Glob).
 
     import DataSource exposing (DataSource)
     import DataSource.File as File

package/src/DataSource/Internal/Request.elm

@@ -1,10 +1,5 @@
 module DataSource.Internal.Request exposing (request)
 
-{-| Build a `DataSource.Http` request (analogous to [Http.request](https://package.elm-lang.org/packages/elm/http/latest/Http#request)).
-This function takes in all the details to build a `DataSource.Http` request, but you can build your own simplified helper functions
-with this as a low-level detail, or you can use functions like [DataSource.Http.get](#get).
--}
-
 import DataSource exposing (DataSource)
 import DataSource.Http exposing (Body, Expect)
 

package/src/Form.elm

@@ -575,7 +575,7 @@ field name (Field fieldParser kind) (Form definitions parseFn toInitialValues) =
 
 {-| Declare a hidden field for the form.
 
-Unlike [`field`](#field) declarations which are rendered using [`Form.ViewField`](Form-ViewField)
+Unlike [`field`](#field) declarations which are rendered using [`Form.FieldView`](Form-FieldView)
 functions, `hiddenField` inputs are automatically inserted into the form when you render it.
 
 You define the field's validations the same way as for `field`, with the

package/src/Head/Seo.elm

@@ -49,10 +49,12 @@ with the `head` function that you pass to your Pages config (`Pages.application`
 
 -}
 
+import DateOrDateTime exposing (DateOrDateTime)
 import Head
 import Head.Twitter as Twitter
 import LanguageTag.Country
 import LanguageTag.Language
+import MimeType exposing (MimeType)
 import Pages.Url
 
 
@@ -235,9 +237,9 @@ website common =
 article :
     { tags : List String
     , section : Maybe String
-    , publishedTime : Maybe Iso8601DateTime
-    , modifiedTime : Maybe Iso8601DateTime
-    , expirationTime : Maybe Iso8601DateTime
+    , publishedTime : Maybe DateOrDateTime
+    , modifiedTime : Maybe DateOrDateTime
+    , expirationTime : Maybe DateOrDateTime
     }
     -> Common
     -> List Head.Tag
@@ -252,7 +254,7 @@ book :
     ->
         { tags : List String
         , isbn : Maybe String
-        , releaseDate : Maybe Iso8601DateTime
+        , releaseDate : Maybe DateOrDateTime
         }
     -> List Head.Tag
 book common details =
@@ -354,7 +356,7 @@ tagsForAudio : Audio -> List ( String, Maybe Head.AttributeValue )
 tagsForAudio audio =
     [ ( "og:audio", audio.url |> Head.raw |> Just )
     , ( "og:audio:secure_url", audio.url |> Head.raw |> Just )
-    , ( "og:audio:type", audio.mimeType |> Maybe.map Head.raw )
+    , ( "og:audio:type", audio.mimeType |> Maybe.map (MimeType.toString >> Head.raw) )
     ]
 
 
@@ -371,14 +373,14 @@ type ContentDetails
     | Article
         { tags : List String
         , section : Maybe String
-        , publishedTime : Maybe Iso8601DateTime
-        , modifiedTime : Maybe Iso8601DateTime
-        , expirationTime : Maybe Iso8601DateTime
+        , publishedTime : Maybe DateOrDateTime
+        , modifiedTime : Maybe DateOrDateTime
+        , expirationTime : Maybe DateOrDateTime
         }
     | Book
         { tags : List String
         , isbn : Maybe String
-        , releaseDate : Maybe Iso8601DateTime
+        , releaseDate : Maybe DateOrDateTime
         }
     | Song
         {-
@@ -399,20 +401,6 @@ type ContentDetails
         }
 
 
-{-| <https://en.wikipedia.org/wiki/ISO_8601>
--}
-type alias Iso8601DateTime =
-    -- TODO should be more type-safe here
-    String
-
-
-{-| <https://en.wikipedia.org/wiki/Media_type>
--}
-type alias MimeType =
-    -- TODO should be more type-safe here
-    String
-
-
 {-| See <https://ogp.me/#structured>
 -}
 type alias Image =
@@ -448,6 +436,7 @@ tagsForVideo video =
     , ( "og:video:secure_url", video.url |> Head.raw |> Just )
     , ( "og:video:width", video.dimensions |> Maybe.map .width |> Maybe.map String.fromInt |> Maybe.map Head.raw )
     , ( "og:video:height", video.dimensions |> Maybe.map .height |> Maybe.map String.fromInt |> Maybe.map Head.raw )
+    , ( "og:video:type", video.mimeType |> Maybe.map (MimeType.toString >> Head.raw) )
     ]
 
 
@@ -466,9 +455,9 @@ tags (Content common details) =
                     -}
                     [ ( "og:type", "article" |> Head.raw |> Just )
                     , ( "article:section", articleDetails.section |> Maybe.map Head.raw )
-                    , ( "article:published_time", articleDetails.publishedTime |> Maybe.map Head.raw )
-                    , ( "article:modified_time", articleDetails.modifiedTime |> Maybe.map Head.raw )
-                    , ( "article:expiration_time", articleDetails.expirationTime |> Maybe.map Head.raw )
+                    , ( "article:published_time", articleDetails.publishedTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
+                    , ( "article:modified_time", articleDetails.modifiedTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
+                    , ( "article:expiration_time", articleDetails.expirationTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
                     ]
                         ++ List.map
                             (\tag -> ( "article:tag", tag |> Head.raw |> Just ))
@@ -477,7 +466,7 @@ tags (Content common details) =
                 Book bookDetails ->
                     [ ( "og:type", "book" |> Head.raw |> Just )
                     , ( "og:isbn", bookDetails.isbn |> Maybe.map Head.raw )
-                    , ( "og:release_date", bookDetails.releaseDate |> Maybe.map Head.raw )
+                    , ( "og:release_date", bookDetails.releaseDate |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
                     ]
                         ++ List.map
                             (\tag -> ( "book:tag", tag |> Head.raw |> Just ))