add melange support

bisect_ppx.opam

@@ -23,6 +23,7 @@ depends: [
   "dune" {>= "2.7.0"}
   "ocaml" {>= "4.03.0"}
   "ppxlib" {>= "0.28.0"}
+  "melange"
 
   "dune" {with-test & >= "3.0.0"}
   "ocamlformat" {with-test & = "0.16.0"}

dune-project

@@ -1,2 +1,5 @@
-(lang dune 2.7)
+(lang dune 3.8)
+
+(using melange 0.1)
+
 (cram enable)

src/common/dune

@@ -1,4 +1,5 @@
 (library
  (name bisect_common)
+ (modes :standard melange)
  (public_name bisect_ppx.common)
  (synopsis "Bisect_ppx internal functions (internal)"))

src/ppx/dune

@@ -7,7 +7,7 @@
  (kind ppx_rewriter)
  (instrumentation.backend (ppx bisect_ppx))
  (synopsis "Code coverage for OCaml")
- (ppx_runtime_libraries bisect_ppx.runtime)
+ (ppx_runtime_libraries bisect_ppx.runtime_melange)
  (preprocess (pps ppxlib.metaquot))
  (flags (:standard -open Ocaml_shadow))
  (libraries bisect_ppx.common ppxlib str))

src/runtime/js/dune

@@ -0,0 +1,7 @@
+(library
+ (name bisect)
+ (modes melange)
+ (public_name bisect_ppx.runtime_melange)
+ (synopsis "Bisect_ppx runtime library for Melange")
+ (libraries bisect_common melange)
+ (preprocess (pps melange.ppx)))

src/runtime/js/jest.ml

@@ -7,12 +7,11 @@
 
    this will cause timeout in Jest because Jest will wait until you manually
    invoke param.done() within afterAll. *)
-external afterAll : ((unit -> unit) [@bs]) -> unit = "afterAll"
-  [@@bs.val]
+external afterAll : ((unit -> unit) [@u]) -> unit = "afterAll"
 
 let () =
   afterAll
     ((fun ()  ->
       Runtime.write_coverage_data ();
       Runtime.reset_coverage_data ())
-    [@bs])
+    [@u])

src/runtime/js/runtime.ml

@@ -13,20 +13,20 @@ struct
   struct
     external openSync :
       string ->
-      ([ `Read [@as "r"]
-      | `Read_write [@as "r+"]
-      | `Read_write_sync [@as "rs+"]
-      | `Write [@as "w"]
-      | `Write_fail_if_exists [@as "wx"]
-      | `Write_read [@as "w+"]
-      | `Write_read_fail_if_exists [@as "wx+"]
-      | `Append [@as "a"]
-      | `Append_fail_if_exists [@as "ax"]
-      | `Append_read [@as "a+"]
-      | `Append_read_fail_if_exists [@as "ax+"] ]
-      [@string]) ->
+      ([ `Read [@mel.as "r"]
+      | `Read_write [@mel.as "r+"]
+      | `Read_write_sync [@mel.as "rs+"]
+      | `Write [@mel.as "w"]
+      | `Write_fail_if_exists [@mel.as "wx"]
+      | `Write_read [@mel.as "w+"]
+      | `Write_read_fail_if_exists [@mel.as "wx+"]
+      | `Append [@mel.as "a"]
+      | `Append_fail_if_exists [@mel.as "ax"]
+      | `Append_read [@mel.as "a+"]
+      | `Append_read_fail_if_exists [@mel.as "ax+"] ]
+      [@mel.string]) ->
       unit = "openSync"
-      [@@module "fs"]
+      [@@mel.module "fs"]
 
     type encoding = [
       | `hex
@@ -42,7 +42,7 @@ struct
 
     external writeFileSync : string -> string -> encoding -> unit =
       "writeFileSync"
-      [@@val] [@@module "fs"]
+      [@@mel.module "fs"]
   end
 end
 
@@ -70,7 +70,7 @@ let write_coverage_data () =
 let reset_coverage_data =
   Bisect_common.reset_counters
 
-let node_at_exit = [%bs.raw {|
+let node_at_exit: (unit -> unit) -> unit = [%mel.raw {|
   function (callback) {
     if (typeof process !== 'undefined' && typeof process.on !== 'undefined')
       process.on("exit", callback);

src/runtime/native/dune

@@ -1,5 +1,5 @@
 (library
- (name bisect)
+ (name bisect_native)
  (public_name bisect_ppx.runtime)
  (synopsis "Bisect_ppx runtime library (internal)")
  (libraries bisect_ppx.common unix))