Move to Piaf as the server implementation (reason-native-web#41)

* It compiles

* Add .gitattributes

* Update docs and move things into morph

* Don't use Piaf.Server in examples

* Update CI esy version

* Try to fix lint

* Update lockdir

* More cleanup and prepare for 0.4.0

* Fix docs build

* Fix CI lint

* Update lockdir

Co-authored-by: Github Runner <[email protected]>

Author: ulrikstrid

.ci/utils/use-esy.yml

@@ -1,5 +1,5 @@
 # steps to install esy globally
 
 steps:
-  - script: "npm install -g esy@0.5.8"
+  - script: "npm install -g esy@0.6.4"
     displayName: "install esy"

.gitattributes

@@ -0,0 +1,16 @@
+# Some settings for the github language statistics
+# This also supresses the lock folder from the diffs
+esy.lock/* linguist-generated=true
+# Tell github that .re and .rei files are Reason
+*.re linguist-language=Reason
+*.rei linguist-language=Reason
+# Tell github that .ml and .mli files are OCaml
+*.ml linguist-language=OCaml
+*.mli linguist-language=OCaml
+
+# Declare shell files to have LF endings on checkout
+# On Windows, the default git setting for `core.autocrlf`
+# means that when checking out code, LF endings get converted
+# to CRLF. This causes problems for shell scripts, as bash
+# gets choked up on the extra `\r` character.
+* text eol=lf

.github/workflows/lint_pr.yml

@@ -63,7 +63,7 @@ jobs:
       - name: format sources files
         run: |
           esy fmt
-          git add "*.re" "*.rei" "*.ml" "*.mli"
+          git add "*.re" "*.rei"
       - name: Update version in packages
         run: |
           node .github/workflows/update_package_version.js
@@ -78,7 +78,7 @@ jobs:
           git config user.email "[email protected]"
           git commit -am "Update lockdir"
           git status
-          git push origin HEAD:$GITHUB_REF
+          git push origin HEAD:$GITHUB_HEAD_REF
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Display status should be clean

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "ocaml.packageManager": "esy",
+  "ocaml.sandbox": {
+    "root": "/Users/ulrik.strid/dev/reason-native-web/morph",
+    "kind": "esy"
+  }
+}

VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

docs/markdown/dune

@@ -1,6 +1,6 @@
 (executables
- (libraries morph morph_server_http morph_graphql_server mtime mtime.clock.os
-   routes logs logs.fmt fmt.tty lwt graphql graphql-lwt uri)
+ (libraries morph morph_graphql_server mtime mtime.clock.os routes logs
+   logs.fmt fmt.tty lwt graphql graphql-lwt uri)
  (names getting_started simple_switch_based_router with_routes_package
    writing_middleware graphql_server))
 

docs/markdown/getting-started.md

@@ -13,8 +13,8 @@ There are some helpers to create some of the common responses, we will use the t
 <!--Reason-->
 
 ```reason
-let server = Morph_server_http.make();
-let handler = _request => Morph.Response.text("Hello World!", Morph.Response.empty);
+let server = Morph.Server.make();
+let handler = _request => Morph.Response.text("Hello World!") |> Lwt.return;
 
 Morph.start(~servers=[server], handler) |> Lwt_main.run;
 ```
@@ -23,9 +23,9 @@ Morph.start(~servers=[server], handler) |> Lwt_main.run;
 
 ```ocaml
 let () =
-    let server = Morph_server_http.make () in
+    let server = Morph.Server.make () in
     let handler _request =
-        Morph.Response.text "Hello World!" Morph.Response.empty in
+        Morph.Response.text "Hello World!" |> Lwt.return in
     Morph.start ~servers:[server] handler |> Lwt_main.run
 ```
 

docs/markdown/graphql-server.md

@@ -181,7 +181,7 @@ When we have our handler we can create a server and start serving requests. This
 <!--Reason-->
 
 ```reason
-let server = Morph_server_http.make();
+let server = Morph.Server.make();
 
 Morph.start(~servers=[server], handler) |> Lwt_main.run;
 ```
@@ -190,7 +190,7 @@ Morph.start(~servers=[server], handler) |> Lwt_main.run;
 
 ```ocaml
 let () =
-  let server = Morph_server_http.make () in
+  let server = Morph.Server.make () in
   Morph.start ~servers:[server] handler |> Lwt_main.run
 ```
 

docs/markdown/simple-switch-based-router.md

@@ -13,44 +13,45 @@ The example code bellow shows some common usecases
 <!--Reason-->
 
 ```reason
-let handler = request => {
+let handler = ({request, _}: Morph.Request.t) => {
   let path_parts =
-    request.target
+    request.message.target
     |> Uri.of_string
     |> Uri.path
     |> String.split_on_char('/')
     |> List.filter(s => s != "");
 
-  switch (request.meth, path_parts) {
-  | (_, []) => Morph.Response.text("Hello world!", Morph.Response.empty)
+  switch (request.message.meth, path_parts) {
+  | (_, []) => Morph.Response.text("Hello world!")
   | (_, ["greet", name]) =>
-    Morph.Response.text("Hello " ++ name ++ "!", Morph.Response.empty)
+    Morph.Response.text("Hello " ++ name ++ "!")
   | (`GET, ["static", ...file_path]) =>
-    Morph_base.Response.static(~file_path=String.concat("/", file_path), Morph.Response.empty)
-  | (_, _) => Morph.Response.not_found(Morph.Response.empty)
-  };
+    Morph.Response.static(~file_path=String.concat("/", file_path))
+  | (_, _) => Morph.Response.not_found()
+  }
+  |> Lwt.return;
 };
 ```
 
 <!--OCaml-->
 
 ```ocaml
-let handler request =
-  let open Morph.Request in
+let handler ({request; _}: Morph.Request.t) =
   let path_parts =
-      request.target
+      request.message.target
       |> Uri.of_string
       |> Uri.path
       |> String.split_on_char '/'
       |> List.filter (fun s  -> s <> "") in
-  match ((request.meth), path_parts) with
+  (match (request.message.meth, path_parts) with
   | (_,[]) ->
-      Morph.Response.text "Hello world!" Morph.Response.empty
+      Morph.Response.text "Hello world!"
   | (_,"greet"::name::[]) ->
-      Morph.Response.text ("Hello " ^ name ^ "!") Morph.Response.empty
+      Morph.Response.text ("Hello " ^ name ^ "!")
   | (`GET, "static"::file_path) ->
-      Morph_base.Response.static ~file_path:(String.concat "/" file_path) Morph.Response.empty
-  | (_,_) -> Morph.Response.not_found Morph.Response.empty
+      Morph.Response.static ~file_path:(String.concat "/" file_path)
+  | (_,_) -> Morph.Response.not_found ())
+  |> Lwt.return
 ```
 
 <!--END_DOCUSAURUS_CODE_TABS-->
@@ -61,15 +62,15 @@ When you have built out the routes you want inside of the handler you simply pas
 <!--Reason-->
 
 ```reason
-let server = Morph_server_http.make();
+let server = Morph.Server.make();
 Morph.start(~servers=[server], handler)
 |> Lwt_main.run;
 ```
 
 <!--OCaml-->
 
 ```ocaml
-let server = Morph_server_http.make () in
+let server = Morph.Server.make () in
 Morph.start ~servers:[server] handler
 |> Lwt_main.run
 ```

docs/markdown/with-routes-package.md

@@ -14,22 +14,22 @@ First step is to create handlers. A handler is just a function that returns a `R
 
 ```reason
 /* Just respond with "ok" on every request */
-let root_handler = (_request) => Morph.Response.ok(Morph.Response.empty);
+let root_handler = (_request) => Morph.Response.ok();
 
 /* Return a greeting with the name */
 let greet_handler = (greeting, _request) => {
-  Morph.Response.text(greeting, Morph.Response.empty);
+  Morph.Response.text(greeting);
 };
 ```
 
 <!--OCaml-->
 
 ```ocaml
 (* Just respond with "ok" on every request *)
-let root_handler _request = Morph.Response.ok Morph.Response.empty
+let root_handler _request = Morph.Response.ok ()
 
 (* Return a greeting with the name *)
-let greet_handler greeting _request = Morph.Response.text greeting Morph.Response.empty
+let greet_handler greeting _request = Morph.Response.text greeting
 ```
 
 <!--END_DOCUSAURUS_CODE_TABS-->
@@ -42,12 +42,10 @@ Then you create a route definition. This definition will use the `root_handler`
 ```reason
 let routes =
   Routes.(
-    Routes.Infix.(
-      with_method([
-        (`GET, root_handler <$ s("")),
-        (`GET, greet_handler <$> s("greet") *> str),
-      ])
-    )
+    with_method([
+      root_handler / s(""),
+      greet_handler / s("greet") / str,
+    ])
   );
 ```
 
@@ -56,11 +54,10 @@ let routes =
 ```ocaml
 let routes =
   let open Routes in
-    let open Routes.Infix in
-      with_method [
-        (`GET, root_handler <$ s "");
-        (`GET, greet_handler <$> s "greet" *> str)
-      ]
+    one_of [
+      s "" /? trail @--> root_handler;
+      s "greet" / str /? trail @--> greet_handler;
+    ]
 ```
 
 <!--END_DOCUSAURUS_CODE_TABS-->
@@ -71,29 +68,29 @@ Lastly you create a routes callback and start the server. In this case we pass i
 <!--Reason-->
 
 ```reason
-let handler = request =>
-  Routes.match_with_method(~target=request.target, ~meth=request.meth, routes)
+let handler = {request, _} =>
+  Routes.match(~target=request.message.target, routes)
   |> (
     fun
     | Some(res) => res(request)
     | None => Morph.Response.not_found(Morph.Response.empty)
   );
 
-let server = Morph_server_http.make();
+let server = Morph.Server.make();
 Morph.start(~servers=[server], handler) |> Lwt_main.run;
 ```
 
 <!--OCaml-->
 
 ```ocaml
 let () =
-  let handler request =
-    let open Morph.Request in
-    (Routes.match_with_method ~target:request.target ~meth:request.meth routes)
+  let handler (req: Morph.Request.t) =
+    (Routes.match' ~target:req.request.message.target routes)
     |> (function
-      | Some res -> res request
-      | None  -> Morph.Response.not_found Morph.Response.empty) in
-  let server = Morph_server_http.make () in
+      | Some handler -> handler req
+      | None -> Morph.Response.not_found ())
+    |> Lwt.return in
+  let server = Morph.Server.make () in
   Morph.start ~servers:[server] handler
   |> Lwt_main.run
 ```