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

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: 1016531122, 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: 1016531122,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

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

@@ -64,29 +64,31 @@ 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"),
+  // 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;
-  }
+  //     path.join(process.cwd(), "elm-stuff/elm-pages-codegen.js")
+  //   );
+  // } catch (error) {
+  //   console.log(restoreColorSafe(error));
+  //   process.exit(1);
+  //   // throw error;
+  // }
+
+  const filePath = path.join(__dirname, `../../codegen/elm-pages-codegen.js`);
 
   // TODO use uncached require here to prevent stale code from running
 
   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;
+      // path.join(
+      // process.cwd(),
+      // "./elm-stuff/elm-pages-codegen.js")
 
     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.1",
   "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/"
   ],