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

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

@@ -75,19 +75,19 @@ let testsCount, todoTests;
 let reporter;
 let runners = [];
 let working = false;
-let workersCount = 10;
+let workersCount = 2;
 let startWorkCallback = function(){};
 const verbosity = 0;
 
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1174461056,
+  initialSeed: 4021965449,
   fuzzRuns: 100,
-  mode: "consoleColor",
+  mode: "consoleNoColor",
   verbosity: verbosity,
   globs: [],
-  paths: ["/Users/dillonkearns/src/github.com/dillonkearns/elm-pages-v3-beta/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm"],
+  paths: ["/home/runner/work/elm-pages-v3-beta/elm-pages-v3-beta/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm"],
 };
 reporter = Elm.Reporter.init({ flags: flags });
 

package/generator/dead-code-review/src/Pages/Review/DeadCodeEliminateData.elm

@@ -7,6 +7,7 @@ import Elm.Syntax.Expression as Expression exposing (Expression)
 import Elm.Syntax.Import exposing (Import)
 import Elm.Syntax.ModuleName exposing (ModuleName)
 import Elm.Syntax.Node as Node exposing (Node)
+import Elm.Syntax.Range exposing (Range)
 import Review.Fix
 import Review.ModuleNameLookupTable as ModuleNameLookupTable exposing (ModuleNameLookupTable)
 import Review.Rule as Rule exposing (Error, Rule)
@@ -15,6 +16,7 @@ import Review.Rule as Rule exposing (Error, Rule)
 type alias Context =
     { lookupTable : ModuleNameLookupTable
     , importContext : Dict (List String) ImportContext
+    , firstImport : Maybe Range
     }
 
 
@@ -66,15 +68,39 @@ rule =
         |> Rule.withExpressionEnterVisitor expressionVisitor
         |> Rule.withDeclarationEnterVisitor declarationVisitor
         |> Rule.withImportVisitor importVisitor
+        |> Rule.withFinalModuleEvaluation finalEvaluation
         |> Rule.fromModuleRuleSchema
 
 
+finalEvaluation : Context -> List (Rule.Error {})
+finalEvaluation context =
+    case Dict.get [ "Exception" ] context.importContext of
+        Nothing ->
+            let
+                importAddRange : { start : { row : Int, column : Int }, end : { row : Int, column : Int } }
+                importAddRange =
+                    context.firstImport |> Maybe.withDefault { start = { row = 0, column = 0 }, end = { row = 0, column = 0 } }
+            in
+            [ Rule.errorWithFix
+                { message = "Codemod"
+                , details = [ "" ]
+                }
+                importAddRange
+                [ Review.Fix.insertAt importAddRange.end "\nimport Exception\n"
+                ]
+            ]
+
+        _ ->
+            []
+
+
 initialContext : Rule.ContextCreator () Context
 initialContext =
     Rule.initContextCreator
         (\lookupTable () ->
             { lookupTable = lookupTable
             , importContext = Dict.empty
+            , firstImport = Nothing
             }
         )
         |> Rule.withModuleNameLookupTable
@@ -91,12 +117,20 @@ importVisitor node context =
     , { context
         | importContext =
             context.importContext |> Dict.insert key value
+        , firstImport = context.firstImport |> Maybe.withDefault (Node.range node) |> Just
       }
     )
 
 
 declarationVisitor : Node Declaration -> Context -> ( List (Error {}), Context )
 declarationVisitor node context =
+    let
+        exceptionFromString : String
+        exceptionFromString =
+            "("
+                ++ referenceFunction context.importContext ( [ "Exception" ], "fromString" )
+                ++ " \"\")"
+    in
     case Node.value node of
         Declaration.FunctionDeclaration { declaration } ->
             case Node.value declaration of
@@ -133,8 +167,11 @@ declarationVisitor node context =
                                                 (Node.range dataValue)
                                                 -- TODO need to replace `action` as well
                                                 [ ("data = "
-                                                    ++ referenceFunction context.importContext ( [ "DataSource" ], "fail" )
-                                                    ++ " \"\"\n    "
+                                                    ++ referenceFunction context.importContext ( [ "BackendTask" ], "fail" )
+                                                    -- TODO add `import Exception` if not present (and use alias if present)
+                                                    ++ " "
+                                                    ++ exceptionFromString
+                                                    ++ "\n    "
                                                   )
                                                     |> Review.Fix.replaceRangeBy (Node.range dataValue)
                                                 ]
@@ -180,6 +217,13 @@ expressionVisitor node context =
                     ( dataFieldValue
                         |> List.concatMap
                             (\( key, dataValue ) ->
+                                let
+                                    exceptionFromString : String
+                                    exceptionFromString =
+                                        "("
+                                            ++ referenceFunction context.importContext ( [ "Exception" ], "fromString" )
+                                            ++ " \"\")"
+                                in
                                 [ Rule.errorWithFix
                                     { message = "Codemod"
                                     , details = [ "" ]
@@ -191,13 +235,15 @@ expressionVisitor node context =
                                             ++ (case pageBuilderName of
                                                     "preRender" ->
                                                         "\\_ -> "
-                                                            ++ referenceFunction context.importContext ( [ "DataSource" ], "fail" )
-                                                            ++ " \"\""
+                                                            ++ referenceFunction context.importContext ( [ "BackendTask" ], "fail" )
+                                                            ++ " "
+                                                            ++ exceptionFromString
 
                                                     "preRenderWithFallback" ->
                                                         "\\_ -> "
-                                                            ++ referenceFunction context.importContext ( [ "DataSource" ], "fail" )
-                                                            ++ " \"\""
+                                                            ++ referenceFunction context.importContext ( [ "BackendTask" ], "fail" )
+                                                            ++ " "
+                                                            ++ exceptionFromString
 
                                                     "serverRender" ->
                                                         "\\_ -> "
@@ -205,8 +251,10 @@ expressionVisitor node context =
                                                             ++ " []\n        "
 
                                                     "single" ->
-                                                        referenceFunction context.importContext ( [ "DataSource" ], "fail" )
-                                                            ++ " \"\"\n       "
+                                                        referenceFunction context.importContext ( [ "BackendTask" ], "fail" )
+                                                            ++ " "
+                                                            ++ exceptionFromString
+                                                            ++ "\n       "
 
                                                     _ ->
                                                         "data"
@@ -260,7 +308,7 @@ isAlreadyApplied lookupTable expression =
                                             )
                                         |> Maybe.withDefault []
                             in
-                            resolvedModuleName == [ "DataSource" ]
+                            resolvedModuleName == [ "BackendTask" ]
 
                         (Expression.FunctionOrValue _ "oneOf") :: (Expression.ListExpr []) :: _ ->
                             let
@@ -296,7 +344,7 @@ isAlreadyApplied lookupTable expression =
                                     )
                                 |> Maybe.withDefault []
                     in
-                    resolvedModuleName == [ "DataSource" ]
+                    resolvedModuleName == [ "BackendTask" ]
 
                 _ ->
                     False

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

@@ -14,7 +14,8 @@ all =
 
 import Server.Request as Request
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import Exception
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -49,9 +50,9 @@ route =
        |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 """
                     |> Review.Test.run rule
                     |> Review.Test.expectErrors
@@ -68,7 +69,8 @@ data =
 
 import Server.Request as Request
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import Exception
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -98,22 +100,23 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    single
        { head = head
-       , data = DataSource.fail ""
+       , data = BackendTask.fail (Exception.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 """
                         ]
-        , test "supports aliased DataSource module import" <|
+        , test "supports aliased BackendTask module import" <|
             \() ->
                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import DataSource as DS
+import Exception
+import BackendTask as DS
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -148,9 +151,9 @@ route =
        |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 """
                     |> Review.Test.run rule
                     |> Review.Test.expectErrors
@@ -166,7 +169,8 @@ data =
                                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
-import DataSource as DS
+import Exception
+import BackendTask as DS
 import RouteBuilder exposing (Page, StaticPayload, single)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -196,14 +200,14 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    single
        { head = head
-       , data = DS.fail ""
+       , data = DS.fail (Exception.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 """
                         ]
         , test "replaces data record setter with non-empty RouteParams" <|
@@ -212,7 +216,8 @@ data =
 
 import Server.Request as Request
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import Exception
 import RouteBuilder exposing (Page, StaticPayload)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -248,9 +253,9 @@ route =
         |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 """
                     |> Review.Test.run rule
                     |> Review.Test.expectErrors
@@ -266,7 +271,8 @@ data =
 
 import Server.Request as Request
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import Exception
 import RouteBuilder exposing (Page, StaticPayload)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -295,16 +301,16 @@ type alias Data =
 route : StatelessRoute RouteParams Data ActionData
 route =
     RouteBuilder.preRender
-        { data = \\_ -> DataSource.fail ""
+        { data = \\_ -> BackendTask.fail (Exception.fromString "")
         , head = head
         , pages = pages
         }
         |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 """
                         ]
         , test "replaces data record setter with RouteBuilder.serverRendered" <|
@@ -312,6 +318,7 @@ data =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
+import Exception
 
 type alias Model =
     {}
@@ -348,6 +355,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
+import Exception
 
 type alias Model =
     {}
@@ -382,6 +390,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
+import Exception
 
 type alias Model =
     {}
@@ -410,6 +419,7 @@ route =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
+import Exception
 
 type alias Model =
     {}
@@ -446,6 +456,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
+import Exception
 
 type alias Model =
     {}
@@ -480,6 +491,7 @@ route =
                                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request
+import Exception
 
 type alias Model =
     {}
@@ -508,6 +520,7 @@ route =
                 """module Route.Login exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
+import Exception
 
 type alias Model =
     {}
@@ -536,8 +549,9 @@ route =
                 """module Route.Index exposing (Data, Model, Msg, route)
 
 import Server.Request as Request
+import Exception
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
 import RouteBuilder exposing (Page, StaticPayload)
 import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
@@ -567,14 +581,14 @@ route : StatelessRoute RouteParams Data ActionData
 route =
    RouteBuilder.single
        { head = head
-       , data = DataSource.fail ""
+       , data = BackendTask.fail (Exception.fromString "")
        }
        |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 """
                     |> Review.Test.run rule
                     |> Review.Test.expectNoErrors
@@ -583,9 +597,10 @@ data =
                 """module Shared exposing (Data, Model, Msg, template)
 
 import Server.Request as Request
+import Exception
 
 import Browser.Navigation
-import DataSource
+import BackendTask
 import Html exposing (Html)
 import Html.Styled
 import Pages.Flags
@@ -633,9 +648,10 @@ type alias Model =
                                 """module Shared exposing (Data, Model, Msg, template)
 
 import Server.Request as Request
+import Exception
 
 import Browser.Navigation
-import DataSource
+import BackendTask
 import Html exposing (Html)
 import Html.Styled
 import Pages.Flags
@@ -653,7 +669,7 @@ template =
     { init = init
     , update = update
     , view = view
-    , data = DataSource.fail ""
+    , data = BackendTask.fail (Exception.fromString "")
     , subscriptions = subscriptions
     , onPageChange = Just OnPageChange
     }

package/generator/review/elm-stuff/tests-0.19.1/elm.json

@@ -1 +1 @@
-{"type":"application","source-directories":["../../src","../../tests","../../../../src","src"],"elm-version":"0.19.1","dependencies":{"direct":{"elm/core":"1.0.5","elm/html":"1.0.0","elm/json":"1.1.3","elm/regex":"1.0.0","elm-explorations/test":"2.1.0","jfmengels/elm-review":"2.10.0","mdgriffith/elm-codegen":"2.0.0","mpizenberg/elm-test-runner":"6.0.0","stil4m/elm-syntax":"7.2.9","the-sett/elm-syntax-dsl":"6.0.2"},"indirect":{"Chadtech/elm-bool-extra":"2.4.2","elm/bytes":"1.0.8","elm/parser":"1.1.0","elm/project-metadata-utils":"1.0.2","elm/random":"1.0.0","elm/time":"1.0.0","elm/virtual-dom":"1.0.3","elm-community/basics-extra":"4.1.0","elm-community/list-extra":"8.7.0","elm-community/maybe-extra":"5.3.0","miniBill/elm-unicode":"1.0.2","rtfeldman/elm-hex":"1.0.0","stil4m/structured-writer":"1.0.3","the-sett/elm-pretty-printer":"3.0.0"}},"test-dependencies":{"direct":{},"indirect":{}}}
+{"type":"application","source-directories":["../../src","../../tests","../../../../src","src"],"elm-version":"0.19.1","dependencies":{"direct":{"elm/core":"1.0.5","elm/html":"1.0.0","elm/json":"1.1.3","elm/regex":"1.0.0","elm-explorations/test":"2.1.0","jfmengels/elm-review":"2.10.0","mdgriffith/elm-codegen":"2.0.0","mpizenberg/elm-test-runner":"6.0.0","stil4m/elm-syntax":"7.2.9","the-sett/elm-syntax-dsl":"6.0.2"},"indirect":{"Chadtech/elm-bool-extra":"2.4.2","elm/bytes":"1.0.8","elm/parser":"1.1.0","elm/project-metadata-utils":"1.0.2","elm/random":"1.0.0","elm/time":"1.0.0","elm/virtual-dom":"1.0.3","elm-community/basics-extra":"4.1.0","elm-community/list-extra":"8.7.0","elm-community/maybe-extra":"5.3.0","miniBill/elm-unicode":"1.0.3","rtfeldman/elm-hex":"1.0.0","stil4m/structured-writer":"1.0.3","the-sett/elm-pretty-printer":"3.0.0"}},"test-dependencies":{"direct":{},"indirect":{}}}

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

@@ -7897,7 +7897,7 @@ _Platform_export({'Reporter':{'init':$author$project$Reporter$main(
 					'paths',
 					$elm$json$Json$Decode$list($elm$json$Json$Decode$string)));
 		},
-		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
+		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {