refactor: Change JS to be a library and be exposed to website

davesnx · Feb 8, 2022 · e6557a6 · e6557a6
1 parent ff3ffae
commit e6557a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 28 deletions.
diff --git a/js/Js.re → js/QueryJsonJs.re b/js/Js.re → js/QueryJsonJs.re
@@ -1,25 +1,6 @@
-open Js_of_ocaml;
 open Source;
 
-let to_bs_result = (res: result(string, string)) => {
-  switch (res) {
-  | Ok(str) =>
-    Js.Unsafe.obj([|
-      ("TAG", Js.Unsafe.inject(0)),
-      ("_0", Js.Unsafe.inject(Js.string(str))),
-    |])
-  | Error(str) =>
-    Js.Unsafe.obj([|
-      ("TAG", Js.Unsafe.inject(1)),
-      ("_0", Js.Unsafe.inject(Js.string(str))),
-    |])
-  };
-};
-
-let run = (rawQuery, rawJson) => {
-  let query = Js.to_string(rawQuery);
-  let json = Js.to_string(rawJson);
-
+let run = (query, json) => {
   let result =
     Main.parse(~debug=false, query)
     |> Result.map(Compiler.compile)
@@ -45,7 +26,4 @@ let run = (rawQuery, rawJson) => {
     | Error(err) => Error(err)
     }
   )
-  |> to_bs_result;
 };
-
-Js.export("run", run);
diff --git a/js/QueryJsonJs.rei b/js/QueryJsonJs.rei
@@ -0,0 +1 @@
+let run: (string, string) => result(string, string);
diff --git a/js/dune b/js/dune
@@ -1,5 +1,4 @@
-(executable
- (name Js)
- (modes js)
- (libraries console.lib source yojson cmdliner js_of_ocaml)
-)
+(library
+ (name QueryJsonJs)
+ (public_name query-json-js)
+ (libraries console.lib source yojson cmdliner js_of_ocaml))
diff --git a/query-json-js.opam b/query-json-js.opam
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		let run: (string, string) => result(string, string);