fixes after latest melange

melange-re · Dec 9, 2023 · 82f0751 · 82f0751
1 parent 46f30da
commit 82f0751
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/docs/communicate-with-javascript.md b/docs/communicate-with-javascript.md
@@ -1658,7 +1658,7 @@ clear:
 
 ```ocaml
 external draw : x:int -> y:int -> ?border:bool -> unit -> unit = "draw"
-  [@@module "MyGame"]
+  [@@mel.module "MyGame"]
 
 let () = draw ~x:10 ~y:20 ~border:true ()
 let () = draw ~x:10 ~y:20 ()
@@ -1695,7 +1695,7 @@ order that was used when declaring the function:
 
 ```ocaml
 external draw : x:int -> y:int -> ?border:bool -> unit -> unit = "draw"
-  [@@module "MyGame"]
+  [@@mel.module "MyGame"]
 let () = draw ~x:10 ~y:20 ()
 let () = draw ~y:20 ~x:10 ()
 ```
@@ -2763,7 +2763,7 @@ type pet = { name : string } [@@deriving accessors]
 
 let pets = [| { name = "Brutus" }; { name = "Mochi" } |]
 
-let () = pets |. Belt.Array.map name |. Js.Array2.joinWith "&" |. Js.log
+let () = pets |. Belt.Array.map name |. Js.Array.join ~sep:"&" |. Js.log
 ```
 ```reasonml
 [@deriving accessors]
@@ -2850,15 +2850,15 @@ Let’s see an example. Considering this Melange code:
 ```ocaml
 type person = {
   name : string;
-  age : int option; [@optional]
+  age : int option; [@mel.optional]
 }
 [@@deriving abstract]
 ```
 ```reasonml
 [@deriving abstract]
 type person = {
   name: string,
-  [@optional]
+  [@mel.optional]
   age: option(int),
 };
 ```
@@ -2896,7 +2896,7 @@ Here is an example of how we can use it:
 <!--#prelude#
 type person = {
   name : string;
-  age : int option; [@optional]
+  age : int option; [@mel.optional]
 }
 [@@deriving abstract]
 -->
@@ -2935,7 +2935,7 @@ The functions `nameGet` and `ageGet` are accessors for each record field:
 <!--#prelude#
 type person = {
   name : string;
-  age : int option; [@optional]
+  age : int option; [@mel.optional]
 }
 [@@deriving abstract]
 let alice = person ~name:"Alice" ~age:20 ()

diff --git a/scripts/communicate-with-javascript.t b/scripts/communicate-with-javascript.t
@@ -67,7 +67,7 @@ file. To update the tests, run `dune build @extract-code-blocks`.
   > 
   > type person = {
   >   name : string;
-  >   age : int option; [@optional]
+  >   age : int option; [@mel.optional]
   > }
   > [@@deriving abstract]
   > let alice = person ~name:"Alice" ~age:20 ()
@@ -84,7 +84,7 @@ file. To update the tests, run `dune build @extract-code-blocks`.
   > 
   > type person = {
   >   name : string;
-  >   age : int option; [@optional]
+  >   age : int option; [@mel.optional]
   > }
   > [@@deriving abstract]
   > 
@@ -114,7 +114,7 @@ file. To update the tests, run `dune build @extract-code-blocks`.
   $ cat > input.ml <<\EOF
   > type person = {
   >   name : string;
-  >   age : int option; [@optional]
+  >   age : int option; [@mel.optional]
   > }
   > [@@deriving abstract]
   > EOF
@@ -142,7 +142,7 @@ file. To update the tests, run `dune build @extract-code-blocks`.
   > 
   > let pets = [| { name = "Brutus" }; { name = "Mochi" } |]
   > 
-  > let () = pets |. Belt.Array.map name |. Js.Array2.joinWith "&" |. Js.log
+  > let () = pets |. Belt.Array.map name |. Js.Array.join ~sep:"&" |. Js.log
   > EOF
 
   $ dune build @melange
@@ -518,7 +518,7 @@ file. To update the tests, run `dune build @extract-code-blocks`.
 
   $ cat > input.ml <<\EOF
   > external draw : x:int -> y:int -> ?border:bool -> unit -> unit = "draw"
-  >   [@@module "MyGame"]
+  >   [@@mel.module "MyGame"]
   > let () = draw ~x:10 ~y:20 ()
   > let () = draw ~y:20 ~x:10 ()
   > EOF
@@ -527,7 +527,7 @@ file. To update the tests, run `dune build @extract-code-blocks`.
 
   $ cat > input.ml <<\EOF
   > external draw : x:int -> y:int -> ?border:bool -> unit -> unit = "draw"
-  >   [@@module "MyGame"]
+  >   [@@mel.module "MyGame"]
   > 
   > let () = draw ~x:10 ~y:20 ~border:true ()
   > let () = draw ~x:10 ~y:20 ()