[add] ppx for virtual DOM

Author: little-arhat

.gitignore

@@ -17,3 +17,4 @@ log
 resources/js/core.js
 setup.data
 setup.log
+ppx_react_html.byte

_oasis

@@ -6,15 +6,28 @@ Authors:     Roma Sokolov
 License:     MIT
 Plugins:     DevFiles (0.2)
 BuildTools:  ocamlbuild
+OCamlVersion: >= 4.02
+
+PreInstallCommand:   $ocamlfind install ppx_react_html src/syntax/META
+PreUninstallCommand: $ocamlfind remove ppx_react_html
+
+Executable ppx_react_html
+  Path:           src/syntax
+  BuildDepends:   compiler-libs.common
+  MainIs:         ppx_react_html.ml
+  CompiledObject: byte
+
 
 Executable example
   Path:           src
   MainIs:         core.ml
   Install:        false
   CompiledObject: byte
-  BuildTools:     camlp4o
-  BuildDepends:   js_of_ocaml, js_of_ocaml.syntax
-  ByteOpt:        -g -syntax camlp4o -package js_of_ocaml -package js_of_ocaml.syntax
+  BuildTools:     ocamlbuild
+  BuildDepends:   js_of_ocaml
+  ByteOpt+:        -g
+  ByteOpt+:        -ppx src/syntax/ppx_react_html.byte
+
 
 PostBuildCommand:
   js_of_ocaml --pretty --noinline --sourcemap core.byte -o core.js

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 719254c77e8c9114157239c7801cc2fa)
+# DO NOT EDIT (digest: d58e588b87547ac9fcb27ee96463b4b0)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -14,11 +14,12 @@ true: annot, bin_annot
 ".git": not_hygienic
 "_darcs": -traverse
 "_darcs": not_hygienic
+# Executable ppx_react_html
+"src/syntax/ppx_react_html.byte": package(compiler-libs.common)
+<src/syntax/*.ml{,i,y}>: package(compiler-libs.common)
 # Executable example
 "src/core.byte": oasis_executable_example_byte
 <src/*.ml{,i,y}>: oasis_executable_example_byte
-"src/core.byte": pkg_js_of_ocaml
-"src/core.byte": pkg_js_of_ocaml.syntax
-<src/*.ml{,i,y}>: pkg_js_of_ocaml
-<src/*.ml{,i,y}>: pkg_js_of_ocaml.syntax
+"src/core.byte": package(js_of_ocaml)
+<src/*.ml{,i,y}>: package(js_of_ocaml)
 # OASIS_STOP

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 0902c890be3194e6dbc8220bb9e646a9) *)
+(* DO NOT EDIT (digest: 2911513bc8e663925b076264b436b9dd) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -614,44 +614,17 @@ let package_default =
           (["oasis_executable_example_byte"; "ocaml"; "link"; "byte"],
             [
                (OASISExpr.EBool true,
-                 S
-                   [
-                      A "-g";
-                      A "-syntax";
-                      A "camlp4o";
-                      A "-package";
-                      A "js_of_ocaml";
-                      A "-package";
-                      A "js_of_ocaml.syntax"
-                   ])
+                 S [A "-g"; A "-ppx"; A "src/syntax/ppx_react_html.byte"])
             ]);
           (["oasis_executable_example_byte"; "ocaml"; "ocamldep"; "byte"],
             [
                (OASISExpr.EBool true,
-                 S
-                   [
-                      A "-g";
-                      A "-syntax";
-                      A "camlp4o";
-                      A "-package";
-                      A "js_of_ocaml";
-                      A "-package";
-                      A "js_of_ocaml.syntax"
-                   ])
+                 S [A "-g"; A "-ppx"; A "src/syntax/ppx_react_html.byte"])
             ]);
           (["oasis_executable_example_byte"; "ocaml"; "compile"; "byte"],
             [
                (OASISExpr.EBool true,
-                 S
-                   [
-                      A "-g";
-                      A "-syntax";
-                      A "camlp4o";
-                      A "-package";
-                      A "js_of_ocaml";
-                      A "-package";
-                      A "js_of_ocaml.syntax"
-                   ])
+                 S [A "-g"; A "-ppx"; A "src/syntax/ppx_react_html.byte"])
             ])
        ];
      includes = []
@@ -662,6 +635,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 666 "myocamlbuild.ml"
+# 639 "myocamlbuild.ml"
 (* OASIS_STOP *)
 Ocamlbuild_plugin.dispatch dispatch_default;;

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 3863c173cefd5fad2b8a58b26d472844) *)
+(* DO NOT EDIT (digest: 38cd7826289685f14fb36e6692ea81da) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6654,7 +6654,7 @@ open OASISTypes;;
 let setup_t =
   {
      BaseSetup.configure = InternalConfigurePlugin.configure;
-     build = OCamlbuildPlugin.build [];
+     build = OCamlbuildPlugin.build ["-use-ocamlfind"];
      test = [];
      doc = [];
      install = InternalInstallPlugin.install;
@@ -6668,7 +6668,7 @@ let setup_t =
      package =
        {
           oasis_version = "0.4";
-          ocaml_version = None;
+          ocaml_version = Some (OASISVersion.VGreaterEqual "4.02");
           findlib_version = None;
           alpha_features = [];
           beta_features = [];
@@ -6724,12 +6724,22 @@ let setup_t =
           install_type = (`Install, "internal", Some "0.4");
           install_custom =
             {
-               pre_command = [(OASISExpr.EBool true, None)];
+               pre_command =
+                 [
+                    (OASISExpr.EBool true,
+                      Some
+                        (("$ocamlfind",
+                           ["install"; "ppx_react_html"; "src/syntax/META"])))
+                 ];
                post_command = [(OASISExpr.EBool true, None)]
             };
           uninstall_custom =
             {
-               pre_command = [(OASISExpr.EBool true, None)];
+               pre_command =
+                 [
+                    (OASISExpr.EBool true,
+                      Some (("$ocamlfind", ["remove"; "ppx_react_html"])))
+                 ];
                post_command = [(OASISExpr.EBool true, None)]
             };
           clean_custom =
@@ -6749,6 +6759,30 @@ let setup_t =
           files_ab = [];
           sections =
             [
+               Executable
+                 ({
+                     cs_name = "ppx_react_html";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = []
+                  },
+                   {
+                      bs_build = [(OASISExpr.EBool true, true)];
+                      bs_install = [(OASISExpr.EBool true, true)];
+                      bs_path = "src/syntax";
+                      bs_compiled_object = Byte;
+                      bs_build_depends =
+                        [FindlibPackage ("compiler-libs.common", None)];
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
+                      bs_c_sources = [];
+                      bs_data_files = [];
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
+                      bs_cclib = [(OASISExpr.EBool true, [])];
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
+                      bs_nativeopt = [(OASISExpr.EBool true, [])]
+                   },
+                   {exec_custom = false; exec_main_is = "ppx_react_html.ml"});
                Executable
                  ({
                      cs_name = "example";
@@ -6761,12 +6795,10 @@ let setup_t =
                       bs_path = "src";
                       bs_compiled_object = Byte;
                       bs_build_depends =
-                        [
-                           FindlibPackage ("js_of_ocaml", None);
-                           FindlibPackage ("js_of_ocaml.syntax", None)
-                        ];
+                        [FindlibPackage ("js_of_ocaml", None)];
                       bs_build_tools =
-                        [ExternalTool "ocamlbuild"; ExternalTool "camlp4o"];
+                        [ExternalTool "ocamlbuild"; ExternalTool "ocamlbuild"
+                        ];
                       bs_c_sources = [];
                       bs_data_files = [];
                       bs_ccopt = [(OASISExpr.EBool true, [])];
@@ -6776,15 +6808,7 @@ let setup_t =
                       bs_byteopt =
                         [
                            (OASISExpr.EBool true,
-                             [
-                                "-g";
-                                "-syntax";
-                                "camlp4o";
-                                "-package";
-                                "js_of_ocaml";
-                                "-package";
-                                "js_of_ocaml.syntax"
-                             ])
+                             ["-g"; "-ppx"; "src/syntax/ppx_react_html.byte"])
                         ];
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
@@ -6797,14 +6821,14 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "ܤ\031Íb\135ßc\156å}y\011)ª\147";
+     oasis_digest = Some "zÇ\153[³ ;Õþïl6\156\\nÖ";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 6809 "setup.ml"
+# 6833 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;

src/core.ml

@@ -124,6 +124,7 @@ module React:REACT = struct
     Js.Unsafe.meth_call react "render" [| inj comp; inj node |]
 end
 
+
 module StringComponent = struct
   type arg = string
   type jsval = Js.js_string Js.t
@@ -134,27 +135,40 @@ end
 module CommentList = struct
   include StringComponent
   let render st =
-    React.tag "div" O.(empty <| el_of_string "className" "commentList")
-              [React.text st]
+    [%html
+        [%div [%opts className="commentList"]
+              [
+                React.text st
+              ]
+        ]
+    ]
 end
 let comment_list = React.defcomponent (module CommentList)
 
 module CommentForm = struct
   include StringComponent
   let render st =
-    React.tag "div" O.(empty <| el_of_string "className" "commentForm")
-              [React.text st]
+    [%html
+        [%div [%opts className="commentForm"]
+              [
+                React.text st
+              ]
+        ]
+    ]
 end
 let comment_form = React.defcomponent (module CommentForm)
 
 module CommentBox = struct
   include StringComponent
   let render st =
-    let header = React.tag "h1" O.empty [React.text "Comment: "] in
-    React.tag "div" O.(empty <| el_of_string "className" "commentBox")
-              [React.component header;
+    [%html
+        [%div [%opts className="commentBox"]
+              [[%h1 [%opts] ["Comment:"]];
                React.component @@ comment_list "This is comment list";
-               React.component @@ comment_form "This is comment form"]
+               React.component @@ comment_form "This is comment form"
+              ]
+        ]
+    ]
 end
 
 let comment_box = React.defcomponent (module CommentBox)
@@ -164,5 +178,21 @@ let start _:(bool Js.t) =
   let () = React.render (comment_box "This is a comment box") div in
   Js._false
 
+
+(* let () = *)
+(*   Html.window##onload <- Dom.handler start *)
+
+(* XXX: Use hand-written expansion of above expr in the absence of camlp4 *)
 let () =
-  Html.window##onload <- Dom.handler start
+  let _ =
+    let module M =
+      struct
+        let res =
+          let _ = (Html.window : 'B Js.t) in
+          let _ =
+            fun (x : 'B) -> (x#onload : < set : 'A -> unit; .. > Js.gen_prop)
+          in (Dom.handler start : 'A)
+
+      end
+    in M.res
+  in Js.Unsafe.set Html.window "onload" (Dom.handler start)

src/syntax/#META#

@@ -0,0 +1 @@
+

src/syntax/META.ab

@@ -0,0 +1,2 @@
+version = "0.0.1"
+ppx = "ppx_react_html"