Merge branch 'master' into remove-bs-send-pipe

Author: cristianoc

CHANGELOG.md

@@ -18,6 +18,7 @@
 - Add `rewatch` to the npm package as an alternative build tool. https://github.com/rescript-lang/rescript-compiler/pull/6762
 - Throws an instance of JavaScript's `new Error()` and adds the extension payload for `cause` option. https://github.com/rescript-lang/rescript-compiler/pull/6611
 - Allow free vars in types for type coercion `e :> t`. https://github.com/rescript-lang/rescript-compiler/pull/6828
+- Allow `private` in with constraints. https://github.com/rescript-lang/rescript-compiler/pull/6843
 
 #### :boom: Breaking Change
 
@@ -30,6 +31,7 @@
 - Some global names and old keywords are no longer prefixed. https://github.com/rescript-lang/rescript-compiler/pull/6831
 - Remove ml parsing tests and conversion from `.ml` to `.res` via format. https://github.com/rescript-lang/rescript-compiler/pull/6848
 - Remove support for compiling `.ml` files, and general cleanup. https://github.com/rescript-lang/rescript-compiler/pull/6852
+- Remove `rescript convert` subcommand. https://github.com/rescript-lang/rescript-compiler/pull/6860
 - Remove support for `@bs.send.pipe`. https://github.com/rescript-lang/rescript-compiler/pull/6858
 
 #### :bug: Bug Fix

cli/rescript_bsb.js

@@ -322,10 +322,7 @@ Please pick a different one using the \`-ws [host:]port\` flag from bsb.`);
     if (!fileName) return true;
 
     return (
-      ((fileName.endsWith(".res") ||
-        fileName.endsWith(".resi") ||
-        fileName.endsWith(".ml") ||
-        fileName.endsWith(".mli")) &&
+      ((fileName.endsWith(".res") || fileName.endsWith(".resi")) &&
         !watchGenerated.includes(fileName)) ||
       fileName === resConfig
     );

cli/rescript_convert.js

@@ -16,7 +16,6 @@ const cliHelp =
   "  build\n" +
   "  clean\n" +
   "  format\n" +
-  "  convert\n" +
   "  dump\n" +
   "  help\n" +
   "\n" +
@@ -58,17 +57,6 @@ const formatHelp =
   "  -all    Format the whole project \n" +
   "  -check  Check formatting for file or the whole project. Use `-all` to check the whole project\n";
 
-const convertHelp =
-  "Usage: rescript convert <options> [files]\n" +
-  "\n" +
-  "`rescript convert` converts the current directory\n" +
-  "\n" +
-  "**This command removes old OCaml files and creates new ReScript \n" +
-  "files. Make sure your work is saved first!**\n" +
-  "\n" +
-  "Options:\n" +
-  "  -all  Convert the whole project\n";
-
 const dumpHelp =
   "Usage: rescript dump <options> [target]\n" +
   "`rescript dump` dumps the information for the target\n";
@@ -232,26 +220,6 @@ async function test() {
     assert.equal(out.status, 0);
   }
 
-  {
-    // Shows convert help with --help arg
-    const out = await exec(`../../../rescript`, ["convert", "--help"], {
-      cwd: __dirname,
-    });
-    assert.equal(out.stdout, convertHelp);
-    assert.equal(out.stderr, "");
-    assert.equal(out.status, 0);
-  }
-
-  {
-    // Shows convert help with -h arg
-    const out = await exec(`../../../rescript`, ["convert", "-h"], {
-      cwd: __dirname,
-    });
-    assert.equal(out.stdout, convertHelp);
-    assert.equal(out.stderr, "");
-    assert.equal(out.status, 0);
-  }
-
   {
     // Shows dump help with --help arg
     const out = await exec(`../../../rescript`, ["dump", "--help"], {

jscomp/build_tests/cli_help/input.js

@@ -22,9 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-(* Clflags.keep_docs := false; *)
-(* default to false -check later*)
-(* Clflags.keep_locs := false; *)
 let setup_env () =
   Env.Persistent_signature.load := Bs_cmi_load.load_cmi;    
   Matching.make_test_sequence_variant_constant := Polyvar_pattern_match.make_test_sequence_variant_constant;

jscomp/core/bs_conditional_initial.ml

@@ -36,10 +36,8 @@ let tag_is_one_of_the_gentype_annotations s =
 let tag_is_gentype_ignore_interface s =
   s = "genType.ignoreInterface" || s = "gentype.ignoreInterface"
 
-let tag_is_doc s =
-  match s with
-  | "ocaml.doc" | "res.doc" -> true
-  | _ -> false
+let tag_is_doc s = s = "res.doc"
+
 let tag_is_intern_local s = s = "internal.local"
 
 let rec get_attribute_payload check_text (attributes : Typedtree.attributes) =

jscomp/gentype/Annotation.ml

@@ -10,7 +10,11 @@ export type t = "A" | "B";
 /** hello */
 export const flat: number = DocstringsJS.flat as any;
 
-/** \n  * Sign a message with a key.\n  *\n  * @param message - A message to be signed\n  * @param key - The key with which to sign the message\n  * @returns A signed message\n */
+/** * Sign a message with a key.
+  *
+  * @param message - A message to be signed
+  * @param key - The key with which to sign the message
+  * @returns A signed message */
 export const signMessage: (message:string, key:number) => string = DocstringsJS.signMessage as any;
 
 export const one: (a:number) => number = DocstringsJS.one as any;

jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx

@@ -1,13 +1,14 @@
-@ocaml.doc(" hello ") @genType
+/** hello */
+@genType
 let flat = 34
 
-@ocaml.doc("
+/**
   * Sign a message with a key.
   *
   * @param message - A message to be signed
   * @param key - The key with which to sign the message
   * @returns A signed message
- ")
+  */
 @genType
 let signMessage = (. message, key) => message ++ string_of_int(key)