Merge pull request #144 from wolfadex/time-what-is-time

Add support for datetime and date
wolfadex · Sep 23, 2024 · 748262a · 748262a
2 parents 0ebe901 + 9e0fb82
commit 748262a
Show file tree

Hide file tree

Showing 11 changed files with 11,648 additions and 7 deletions.
diff --git a/codegen/Gen/Date.elm b/codegen/Gen/Date.elm
diff --git a/codegen/Gen/Parser.elm b/codegen/Gen/Parser.elm
diff --git a/codegen/Gen/Parser/Advanced.elm b/codegen/Gen/Parser/Advanced.elm
diff --git a/codegen/Gen/Rfc3339.elm b/codegen/Gen/Rfc3339.elm
diff --git a/codegen/Gen/Time.elm b/codegen/Gen/Time.elm
diff --git a/codegen/Gen/Time/Extra.elm b/codegen/Gen/Time/Extra.elm
diff --git a/codegen/elm.codegen.json b/codegen/elm.codegen.json
@@ -8,8 +8,15 @@
             "elm/json": "1.1.3",
             "elm-community/json-extra": "4.3.0",
             "elm/url": "1.0.0",
-            "dillonkearns/elm-pages": "10.1.0"
+            "dillonkearns/elm-pages": "10.1.0",
+            "justinmimbs/time-extra": "1.2.0",
+            "justinmimbs/date": "4.1.0",
+            "elm/time": "1.0.0",
+            "elm/parser": "1.1.0",
+            "wolfadex/elm-rfc3339": "2.0.0"
         },
-        "local": ["helpers"]
+        "local": [
+            "helpers"
+        ]
     }
 }
diff --git a/example/elm.json b/example/elm.json
@@ -12,14 +12,17 @@
             "elm/core": "1.0.5",
             "elm/http": "2.0.0",
             "elm/json": "1.1.3",
+            "elm/parser": "1.1.0",
+            "elm/time": "1.0.0",
             "elm/url": "1.0.0",
-            "elm-community/json-extra": "4.3.0"
+            "elm-community/json-extra": "4.3.0",
+            "justinmimbs/date": "4.1.0",
+            "justinmimbs/time-extra": "1.2.0",
+            "wolfadex/elm-rfc3339": "2.0.0"
         },
         "indirect": {
             "elm/file": "1.0.5",
             "elm/html": "1.0.0",
-            "elm/parser": "1.1.0",
-            "elm/time": "1.0.0",
             "elm/virtual-dom": "1.0.3",
             "rtfeldman/elm-iso8601-date-strings": "1.1.4"
         }

diff --git a/src/Cli.elm b/src/Cli.elm
@@ -746,7 +746,14 @@ printSuccessMessageAndWarnings ( outputPaths, warnings ) =
 
         optionalPackages : List String
         optionalPackages =
-            [ "elm/bytes", "elm/url" ]
+            [ "elm/bytes"
+            , "elm/parser"
+            , "elm/time"
+            , "elm/url"
+            , "justinmimbs/date"
+            , "justinmimbs/time-extra"
+            , "wolfadex/elm-rfc3339"
+            ]
 
         toInstall : String -> String
         toInstall dependency =

diff --git a/src/Common.elm b/src/Common.elm
@@ -286,6 +286,8 @@ type Type
     | Ref (List String)
     | Bytes
     | Unit
+    | Date
+    | DateTime
 
 
 type alias Object =

diff --git a/src/SchemaUtils.elm b/src/SchemaUtils.elm
@@ -26,11 +26,16 @@ import Elm.ToString
 import FastDict
 import Gen.Basics
 import Gen.Bytes
+import Gen.Date
 import Gen.Json.Decode
 import Gen.Json.Encode
 import Gen.List
 import Gen.Maybe
 import Gen.OpenApi.Common
+import Gen.Parser.Advanced
+import Gen.Result
+import Gen.Rfc3339
+import Gen.Time
 import Json.Decode
 import Json.Schema.Definitions
 import Maybe.Extra
@@ -150,7 +155,22 @@ schemaToType qualify schema =
                             objectSchemaToType qualify subSchema
 
                         Json.Schema.Definitions.StringType ->
-                            CliMonad.succeed { type_ = Common.String, documentation = subSchema.description }
+                            case subSchema.format of
+                                Just "date-time" ->
+                                    CliMonad.succeed { type_ = Common.DateTime, documentation = subSchema.description }
+
+                                Just "date" ->
+                                    CliMonad.succeed { type_ = Common.Date, documentation = subSchema.description }
+
+                                Just "password" ->
+                                    CliMonad.succeed { type_ = Common.String, documentation = subSchema.description }
+
+                                Just format ->
+                                    CliMonad.succeed { type_ = Common.String, documentation = subSchema.description }
+                                        |> CliMonad.withWarning ("Format \"" ++ format ++ "\" not supported - using string instead")
+
+                                Nothing ->
+                                    CliMonad.succeed { type_ = Common.String, documentation = subSchema.description }
 
                         Json.Schema.Definitions.IntegerType ->
                             CliMonad.succeed { type_ = Common.Int, documentation = subSchema.description }
@@ -542,6 +562,12 @@ typeToAnnotation qualify type_ =
         Common.String ->
             CliMonad.succeed Elm.Annotation.string
 
+        Common.DateTime ->
+            CliMonad.succeed Gen.Time.annotation_.posix
+
+        Common.Date ->
+            CliMonad.succeed Gen.Date.annotation_.date
+
         Common.Int ->
             CliMonad.succeed Elm.Annotation.int
 
@@ -611,6 +637,12 @@ typeToAnnotationMaybe qualify type_ =
         Common.String ->
             CliMonad.succeed Elm.Annotation.string
 
+        Common.DateTime ->
+            CliMonad.succeed Gen.Time.annotation_.posix
+
+        Common.Date ->
+            CliMonad.succeed Gen.Date.annotation_.date
+
         Common.Int ->
             CliMonad.succeed Elm.Annotation.int
 
@@ -706,6 +738,32 @@ typeToEncoder qualify type_ =
         Common.String ->
             CliMonad.succeed Gen.Json.Encode.call_.string
 
+        Common.DateTime ->
+            CliMonad.succeed
+                (\instant ->
+                    Gen.Rfc3339.make_.dateTimeOffset
+                        (Elm.record
+                            [ ( "instant", instant )
+                            , ( "offset"
+                              , Elm.record
+                                    [ ( "hour", Elm.int 0 )
+                                    , ( "minute", Elm.int 0 )
+                                    ]
+                              )
+                            ]
+                        )
+                        |> Gen.Rfc3339.toString
+                        |> Gen.Json.Encode.call_.string
+                )
+
+        Common.Date ->
+            CliMonad.succeed
+                (\date ->
+                    date
+                        |> Gen.Date.toIsoString
+                        |> Gen.Json.Encode.call_.string
+                )
+
         Common.Int ->
             CliMonad.succeed Gen.Json.Encode.call_.int
 
@@ -934,6 +992,34 @@ typeToDecoder qualify type_ =
         Common.String ->
             CliMonad.succeed Gen.Json.Decode.string
 
+        Common.DateTime ->
+            CliMonad.succeed
+                (Gen.Json.Decode.string
+                    |> Gen.Json.Decode.andThen
+                        (\raw ->
+                            Gen.Result.caseOf_.result
+                                (Gen.Parser.Advanced.call_.run Gen.Rfc3339.dateTimeOffsetParser raw)
+                                { ok = \record -> Gen.Json.Decode.succeed (Elm.get "instant" record)
+
+                                -- TODO: improve error message
+                                , err = \_ -> Gen.Json.Decode.fail "Invalid RFC-3339 date-time"
+                                }
+                        )
+                )
+
+        Common.Date ->
+            CliMonad.succeed
+                (Gen.Json.Decode.string
+                    |> Gen.Json.Decode.andThen
+                        (\raw ->
+                            Gen.Result.caseOf_.result
+                                (Gen.Date.call_.fromIsoString raw)
+                                { ok = Gen.Json.Decode.succeed
+                                , err = Gen.Json.Decode.call_.fail
+                                }
+                        )
+                )
+
         Common.Int ->
             CliMonad.succeed Gen.Json.Decode.int
-Original file line number
+Diff line change
@@ Expand Up / @@ -286,6 +286,8 @@ type Type @@
         | Ref (List String)
         | Bytes
         | Unit
+        | Date
+        | DateTime
     type alias Object =
@@ Expand Down @@