Merge pull request #135 from ocaml-wasm/jsoo-merge

Merge with js_of_ocaml master

Author: vouillon

Diff for: CHANGES.md

@@ -1,3 +1,15 @@
+# dev
+
+## Features/Changes
+* Lib: fix the type of some DOM properties and methods (#1747)
+* Test: use dune test stanzas (#1631)
+
+# 5.9.1 (02-12-2024) - Lille
+
+## Features/Changes
+* Compiler: add mechanism to deprecate runtime promitives
+* Runtime: re-introduce caml_new_string, marked as deprecated
+
 # 5.9.0 (2024-11-22) - Lille
 
 ## Features/Changes

Diff for: VERSION

@@ -1 +1 @@
-5.9.0
+5.9.1

Diff for: compiler/bin-js_of_ocaml/check_runtime.ml

@@ -101,11 +101,11 @@ let f (runtime_files, bytecode, target_env) =
     StringSet.of_list (Linker.all state), missing
   in
   assert (StringSet.equal missing missing');
+  let extra = StringSet.diff from_runtime1 all_used |> StringSet.elements in
   let extra =
-    StringSet.diff from_runtime1 all_used
-    |> StringSet.elements
+    extra
     |> List.map ~f:(fun name ->
-           ( name
+           ( (name ^ if Linker.deprecated ~name then " (deprecated)" else "")
            , match Linker.origin ~name with
              | None -> []
              | Some x -> [ x ] ))

Diff for: compiler/lib/annot_lexer.mll

@@ -28,6 +28,7 @@ rule main = parse
   | "Always" {TAlways}
   | "If" {TIf}
   | "Alias" {TAlias}
+  | "Deprecated: " ([^'\n']* as txt) {TDeprecated txt}
   | "pure" {TA_Pure }
   | "const" {TA_Const }
   | "mutable" {TA_Mutable }

Diff for: compiler/lib/annot_parser.mly

@@ -22,6 +22,7 @@
 %token<string> TIdent TVNum
 %token TComma TColon EOF EOL LE LT GE GT EQ LPARENT RPARENT
 %token<string> TOTHER
+%token<string> TDeprecated
 %token TBang
 
 %start annot
@@ -40,6 +41,7 @@ annot:
     { `Version (l) }
   | TWeakdef endline { `Weakdef   }
   | TAlways endline { `Always   }
+  | TDeprecated endline { `Deprecated $1 }
   | TAlias TColon name=TIdent endline { `Alias (name) }
   | TIf TColon name=TIdent endline { `If (name) }
   | TIf TColon TBang name=TIdent endline { `Ifnot (name) }

Diff for: compiler/lib/linker.ml

@@ -177,6 +177,7 @@ module Fragment = struct
     ; conditions : bool StringMap.t
     ; fragment_target : Target_env.t option
     ; aliases : StringSet.t
+    ; deprecated : string option
     }
 
   let allowed_flags =
@@ -259,6 +260,7 @@ module Fragment = struct
                 ; conditions = StringMap.empty
                 ; fragment_target = None
                 ; aliases = StringSet.empty
+                ; deprecated = None
                 }
               in
               let fragment =
@@ -289,6 +291,7 @@ module Fragment = struct
                     | `Always -> { fragment with always = true }
                     | `Alias name ->
                         { fragment with aliases = StringSet.add name fragment.aliases }
+                    | `Deprecated txt -> { fragment with deprecated = Some txt }
                     | `If name when Option.is_some (Target_env.of_string name) ->
                         if Option.is_some fragment.fragment_target
                         then Format.eprintf "Duplicated target_env in %s\n" (loc pi);
@@ -394,6 +397,7 @@ type state =
   { ids : IntSet.t
   ; always_required_codes : always_required list
   ; codes : (Javascript.program pack * bool) list
+  ; deprecation : (int list * string) list
   ; missing : StringSet.t
   ; include_ : string -> bool
   }
@@ -456,6 +460,7 @@ let load_fragment ~target_env ~filename (f : Fragment.t) =
       ; aliases
       ; has_macro
       ; conditions
+      ; deprecated
       } -> (
       let should_ignore =
         StringMap.exists
@@ -543,14 +548,14 @@ let load_fragment ~target_env ~filename (f : Fragment.t) =
                 name
                 { id; pi; filename; weakdef; target_env = fragment_target };
               Hashtbl.add provided_rev id (name, pi);
-              Hashtbl.add code_pieces id (code, has_macro, requires);
+              Hashtbl.add code_pieces id (code, has_macro, requires, deprecated);
               StringSet.iter (fun alias -> Primitive.alias alias name) aliases;
               `Ok)
 
 let check_deps () =
   let provided = list_all () in
   Hashtbl.iter
-    (fun id (code, _has_macro, requires) ->
+    (fun id (code, _has_macro, requires, _deprecated) ->
       match code with
       | Ok code -> (
           let traverse = new Js_traverse.free in
@@ -617,13 +622,18 @@ and resolve_dep_id_rev state path id =
     state)
   else
     let path = id :: path in
-    let code, has_macro, req = Hashtbl.find code_pieces id in
+    let code, has_macro, req, deprecated = Hashtbl.find code_pieces id in
     let state = { state with ids = IntSet.add id state.ids } in
     let state =
       List.fold_left req ~init:state ~f:(fun state nm ->
           resolve_dep_name_rev state path nm)
     in
-    let state = { state with codes = (code, has_macro) :: state.codes } in
+    let deprecation =
+      match deprecated with
+      | None -> state.deprecation
+      | Some txt -> (path, txt) :: state.deprecation
+    in
+    let state = { state with codes = (code, has_macro) :: state.codes; deprecation } in
     state
 
 let proj_always_required { ar_filename; ar_requires; ar_program } =
@@ -640,6 +650,7 @@ let init ?from () =
       List.rev
         (List.filter_map !always_included ~f:(fun x ->
              if include_ x.ar_filename then Some (proj_always_required x) else None))
+  ; deprecation = []
   ; codes = []
   ; include_
   ; missing = StringSet.empty
@@ -681,6 +692,29 @@ let link ?(check_missing = true) program (state : state) =
         { state with codes = (Ok always.program, false) :: state.codes })
   in
   if check_missing then do_check_missing state;
+  List.iter state.deprecation ~f:(fun (path, txt) ->
+      match path with
+      | [] -> assert false
+      | [ x ] ->
+          if false
+          then
+            let name = fst (Hashtbl.find provided_rev x) in
+            warn "The runtime primitive [%s] is deprecated. %s\n" name txt
+      | x :: path ->
+          let name = fst (Hashtbl.find provided_rev x) in
+          let path =
+            String.concat
+              ~sep:"\n"
+              (List.map path ~f:(fun id ->
+                   let nm, loc = Hashtbl.find provided_rev id in
+                   Printf.sprintf "-> %s:%s" nm (Parse_info.to_string loc)))
+          in
+          warn
+            "The runtime primitive [%s] is deprecated. %s.  Used by:\n%s\n"
+            name
+            txt
+            path);
+
   let codes =
     List.map state.codes ~f:(fun (x, has_macro) ->
         let c = unpack x in
@@ -710,3 +744,10 @@ let origin ~name =
     let x = Hashtbl.find provided name in
     x.pi.Parse_info.src
   with Not_found -> None
+
+let deprecated ~name =
+  try
+    let x = Hashtbl.find provided name in
+    let _, _, _, deprecated = Hashtbl.find code_pieces x.id in
+    Option.is_some deprecated
+  with Not_found -> false

Diff for: compiler/lib/linker.mli

@@ -68,3 +68,5 @@ val all : state -> string list
 val missing : state -> string list
 
 val origin : name:string -> string option
+
+val deprecated : name:string -> bool

Diff for: compiler/lib/primitive.ml

@@ -50,6 +50,7 @@ type t =
   | `Weakdef
   | `Always
   | `Alias of string
+  | `Deprecated of string
   | condition
   ]
 

Diff for: compiler/lib/primitive.mli

@@ -48,6 +48,7 @@ type t =
   | `Weakdef
   | `Always
   | `Alias of string
+  | `Deprecated of string
   | condition
   ]
 

Diff for: compiler/tests-check-prim/main.output

@@ -108,11 +108,12 @@ BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
-caml_array_of_bytes
-caml_array_of_string
+caml_array_of_bytes (deprecated)
+caml_array_of_string (deprecated)
 caml_bytes_of_utf16_jsstring
+caml_new_string (deprecated)
 caml_string_concat
-caml_to_js_string
+caml_to_js_string (deprecated)
 
 From +stdlib.js:
 caml_build_symbols

Diff for: compiler/tests-check-prim/main.output5

@@ -101,11 +101,12 @@ BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
-caml_array_of_bytes
-caml_array_of_string
+caml_array_of_bytes (deprecated)
+caml_array_of_string (deprecated)
 caml_bytes_of_utf16_jsstring
+caml_new_string (deprecated)
 caml_string_concat
-caml_to_js_string
+caml_to_js_string (deprecated)
 
 From +runtime_events.js:
 caml_runtime_events_create_cursor

Diff for: compiler/tests-check-prim/unix-unix.output

@@ -217,11 +217,12 @@ BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
-caml_array_of_bytes
-caml_array_of_string
+caml_array_of_bytes (deprecated)
+caml_array_of_string (deprecated)
 caml_bytes_of_utf16_jsstring
+caml_new_string (deprecated)
 caml_string_concat
-caml_to_js_string
+caml_to_js_string (deprecated)
 
 From +stdlib.js:
 caml_build_symbols

Diff for: compiler/tests-check-prim/unix-unix.output5

@@ -212,11 +212,12 @@ BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
-caml_array_of_bytes
-caml_array_of_string
+caml_array_of_bytes (deprecated)
+caml_array_of_string (deprecated)
 caml_bytes_of_utf16_jsstring
+caml_new_string (deprecated)
 caml_string_concat
-caml_to_js_string
+caml_to_js_string (deprecated)
 
 From +runtime_events.js:
 caml_runtime_events_create_cursor

Diff for: compiler/tests-check-prim/unix-win32.output

@@ -182,11 +182,12 @@ BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
-caml_array_of_bytes
-caml_array_of_string
+caml_array_of_bytes (deprecated)
+caml_array_of_string (deprecated)
 caml_bytes_of_utf16_jsstring
+caml_new_string (deprecated)
 caml_string_concat
-caml_to_js_string
+caml_to_js_string (deprecated)
 
 From +stdlib.js:
 caml_build_symbols

Diff for: compiler/tests-check-prim/unix-win32.output5

@@ -178,11 +178,12 @@ BigStringReader
 caml_marshal_constants
 
 From +mlBytes.js:
-caml_array_of_bytes
-caml_array_of_string
+caml_array_of_bytes (deprecated)
+caml_array_of_string (deprecated)
 caml_bytes_of_utf16_jsstring
+caml_new_string (deprecated)
 caml_string_concat
-caml_to_js_string
+caml_to_js_string (deprecated)
 
 From +runtime_events.js:
 caml_runtime_events_create_cursor

Diff for: compiler/tests-dynlink-js/dune

@@ -5,11 +5,9 @@
  (libraries js_of_ocaml)
  (link_flags
   (:standard -linkall))
- ;; Until dune is fixed https://github.com/ocaml/dune/pull/10935
  (js_of_ocaml
   (flags
    (:standard)
-   --linkall
    (:include effects_flags.sexp))
   (build_runtime_flags
    (:standard)

Diff for: compiler/tests-sourcemap/dune

@@ -6,6 +6,8 @@
 (executable
  (name test)
  (modules test)
+ (enabled_if
+  (<> %{profile} using-effects))
  (modes js)
  (js_of_ocaml
   (link_flags

Diff for: compiler/tests-toplevel/dune

@@ -16,7 +16,10 @@
 
 (rule
  (target test_toplevel.bc.js.actual)
- (enabled_if %{env:js-enabled=})
+ (enabled_if
+  (and
+   (>= %{ocaml_version} 5.2)
+   %{env:js-enabled=}))
  (action
   (with-stdout-to
    %{target}