elm-pages 3.0.16 → 3.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/codegen/elm-pages-codegen.cjs +7017 -6455
  2. package/generator/review/elm.json +1 -1
  3. package/generator/template/codegen/elm.codegen.json +1 -1
  4. package/generator/template/elm-pages.config.mjs +1 -1
  5. package/package.json +26 -27
  6. package/src/ApiRoute.elm +19 -19
  7. package/src/Scaffold/Form.elm +113 -116
  8. package/src/Scaffold/Route.elm +40 -52
package/src/Scaffold/Route.elm CHANGED
@@ -50,6 +50,7 @@ import Cli.Option as Option
50
50
  import Cli.Validate
51
51
  import Elm
52
52
  import Elm.Annotation
53
+ import Elm.Arg
53
54
  import Elm.Declare
54
55
  import Elm.Op
55
56
  import Pages.Internal.RoutePattern as RoutePattern
@@ -541,21 +542,16 @@ userFunction :
541
542
  -> { path : String, body : String }
542
543
  userFunction moduleName definitions =
543
544
  let
544
- viewFn :
545
- { declaration : Elm.Declaration
546
- , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
547
- , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
548
- , value : List String -> Elm.Expression
549
- }
545
+ viewFn : Elm.Declare.Function (Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression)
550
546
  viewFn =
551
547
  case definitions.localState of
552
548
  Just _ ->
553
549
  Elm.Declare.fn3 "view"
554
- ( "app", Just appType )
555
- ( "shared"
556
- , Just (Elm.Annotation.named [ "Shared" ] "Model")
550
+ (Elm.Arg.varWith "app" appType)
551
+ (Elm.Arg.varWith "shared"
552
+ (Elm.Annotation.named [ "Shared" ] "Model")
557
553
  )
558
- ( "model", Just (Elm.Annotation.named [] "Model") )
554
+ (Elm.Arg.varWith "model" (Elm.Annotation.named [] "Model"))
559
555
  (\app shared model ->
560
556
  definitions.view app shared model
561
557
  |> Elm.withType
@@ -571,17 +567,12 @@ userFunction moduleName definitions =
571
567
 
572
568
  Nothing ->
573
569
  let
574
- viewDeclaration :
575
- { declaration : Elm.Declaration
576
- , call : Elm.Expression -> Elm.Expression -> Elm.Expression
577
- , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression
578
- , value : List String -> Elm.Expression
579
- }
570
+ viewDeclaration : Elm.Declare.Function (Elm.Expression -> Elm.Expression -> Elm.Expression)
580
571
  viewDeclaration =
581
572
  Elm.Declare.fn2 "view"
582
- ( "app", Just appType )
583
- ( "shared"
584
- , Just (Elm.Annotation.named [ "Shared" ] "Model")
573
+ (Elm.Arg.varWith "app" appType)
574
+ (Elm.Arg.varWith "shared"
575
+ (Elm.Annotation.named [ "Shared" ] "Model")
585
576
  )
586
577
  (\app shared ->
587
578
  definitions.view app shared Elm.unit
@@ -595,33 +586,30 @@ userFunction moduleName definitions =
595
586
  ]
596
587
  )
597
588
  )
589
+
590
+ viewDeclarationExternal : Elm.Declare.Function (Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression)
591
+ viewDeclarationExternal =
592
+ Elm.Declare.fn3 "view"
593
+ (Elm.Arg.varWith "app" appType)
594
+ (Elm.Arg.varWith "shared"
595
+ (Elm.Annotation.named [ "Shared" ] "Model")
596
+ )
597
+ (Elm.Arg.varWith "model" (Elm.Annotation.named [] "Model"))
598
+ (\_ _ _ ->
599
+ Elm.unit
600
+ )
598
601
  in
599
602
  { declaration = viewDeclaration.declaration
600
603
  , call = \app shared _ -> viewDeclaration.call app shared
601
- , callFrom = \a _ c d -> viewDeclaration.callFrom a c d
602
604
  , value = viewDeclaration.value
605
+ , internal = viewDeclarationExternal.internal
603
606
  }
604
607
 
605
608
  localDefinitions :
606
609
  Maybe
607
- { updateFn :
608
- { declaration : Elm.Declaration
609
- , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
610
- , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
611
- , value : List String -> Elm.Expression
612
- }
613
- , initFn :
614
- { declaration : Elm.Declaration
615
- , call : Elm.Expression -> Elm.Expression -> Elm.Expression
616
- , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression
617
- , value : List String -> Elm.Expression
618
- }
619
- , subscriptionsFn :
620
- { declaration : Elm.Declaration
621
- , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
622
- , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
623
- , value : List String -> Elm.Expression
624
- }
610
+ { updateFn : Elm.Declare.Function (Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression)
611
+ , initFn : Elm.Declare.Function (Elm.Expression -> Elm.Expression -> Elm.Expression)
612
+ , subscriptionsFn : Elm.Declare.Function (Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression)
625
613
  , state : State
626
614
  }
627
615
  localDefinitions =
@@ -630,10 +618,10 @@ userFunction moduleName definitions =
630
618
  (\localState ->
631
619
  { updateFn =
632
620
  Elm.Declare.fn4 "update"
633
- ( "app", Just appType )
634
- ( "shared", Just (Elm.Annotation.named [ "Shared" ] "Model") )
635
- ( "msg", Just (Elm.Annotation.named [] "Msg") )
636
- ( "model", Just (Elm.Annotation.named [] "Model") )
621
+ (Elm.Arg.varWith "app" appType)
622
+ (Elm.Arg.varWith "shared" (Elm.Annotation.named [ "Shared" ] "Model"))
623
+ (Elm.Arg.varWith "msg" (Elm.Annotation.named [] "Msg"))
624
+ (Elm.Arg.varWith "model" (Elm.Annotation.named [] "Model"))
637
625
  (\app shared msg model ->
638
626
  localState.update app shared msg model
639
627
  |> Elm.withType
@@ -644,8 +632,8 @@ userFunction moduleName definitions =
644
632
  )
645
633
  , initFn =
646
634
  Elm.Declare.fn2 "init"
647
- ( "app", Just appType )
648
- ( "shared", Just (Elm.Annotation.named [ "Shared" ] "Model") )
635
+ (Elm.Arg.varWith "app" appType)
636
+ (Elm.Arg.varWith "shared" (Elm.Annotation.named [ "Shared" ] "Model"))
649
637
  (\shared app ->
650
638
  localState.init app shared
651
639
  |> Elm.withType
@@ -657,10 +645,10 @@ userFunction moduleName definitions =
657
645
  , subscriptionsFn =
658
646
  Elm.Declare.fn4
659
647
  "subscriptions"
660
- ( "routeParams", "RouteParams" |> Elm.Annotation.named [] |> Just )
661
- ( "path", Elm.Annotation.namedWith [ "UrlPath" ] "UrlPath" [] |> Just )
662
- ( "shared", Just (Elm.Annotation.named [ "Shared" ] "Model") )
663
- ( "model", localType "Model" |> Just )
648
+ (Elm.Arg.varWith "routeParams" (Elm.Annotation.named [] "RouteParams"))
649
+ (Elm.Arg.varWith "path" (Elm.Annotation.named [ "UrlPath" ] "UrlPath"))
650
+ (Elm.Arg.varWith "shared" (Elm.Annotation.named [ "Shared" ] "Model"))
651
+ (Elm.Arg.varWith "model" (localType "Model"))
664
652
  (\routeParams path shared model ->
665
653
  localState.subscriptions routeParams path shared model
666
654
  |> Elm.withType (Elm.Annotation.namedWith [] "Sub" [ localType "Msg" ])
@@ -669,7 +657,7 @@ userFunction moduleName definitions =
669
657
  }
670
658
  )
671
659
 
672
- dataFn : { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
660
+ dataFn : Elm.Declare.Function (List Elm.Expression -> Elm.Expression)
673
661
  dataFn =
674
662
  case definitions.action of
675
663
  Pages Nothing ->
@@ -743,7 +731,7 @@ userFunction moduleName definitions =
743
731
  Elm.unit
744
732
  )
745
733
 
746
- actionFn : Maybe { declaration : Elm.Declaration, call : List Elm.Expression -> Elm.Expression, callFrom : List String -> List Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
734
+ actionFn : Maybe (Elm.Declare.Function (List Elm.Expression -> Elm.Expression))
747
735
  actionFn =
748
736
  case definitions.action of
749
737
  Action action_ ->
@@ -778,10 +766,10 @@ userFunction moduleName definitions =
778
766
  (\_ -> justPagesExpression)
779
767
  )
780
768
 
781
- headFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression, value : List String -> Elm.Expression }
769
+ headFn : Elm.Declare.Function (Elm.Expression -> Elm.Expression)
782
770
  headFn =
783
771
  Elm.Declare.fn "head"
784
- ( "app", Just appType )
772
+ (Elm.Arg.varWith "app" appType)
785
773
  (definitions.head
786
774
  >> Elm.withType
787
775
  (Elm.Annotation.list