@tellahq/rescript 10.1.0-alpha.2 → 10.1.4-republish-1

package/{scripts/LICENSE.ml → lib/ocaml/jsxPPXReactSupport.res}

@@ -1,5 +1,5 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * 
+/* Copyright (C) 2022- Authors of ReScript
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -17,11 +17,32 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+%%private(
+  @val
+  external propsWithKey: (@as(json`{}`) _, 'props, {"key": string}) => 'props = "Object.assign"
+
+  @inline
+  let addKeyProp = (~key: option<string>=?, p: 'props): 'props =>
+    switch key {
+    | Some(key) => propsWithKey(p, {"key": key})
+    | None => p
+    }
+)
 
+@module("react")
+external createElement: (Jsx.component<'props>, 'props) => Jsx.element = "createElement"
 
+@variadic @module("react")
+external createElementVariadic: (Jsx.component<'props>, 'props, array<Jsx.element>) => Jsx.element =
+  "createElement"
 
+let createElementWithKey = (~key=?, component, props) =>
+  createElement(component, addKeyProp(~key?, props))
 
+let createElementVariadicWithKey = (~key=?, component, props, elements) =>
+  createElementVariadic(component, addKeyProp(~key?, props), elements)

package/lib/ocaml/printexc.ml

@@ -12,16 +12,21 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-[@@@bs.config { flags = [|"-bs-no-cross-module-opt" |]}]
-
+[@@@bs.config { flags = [| "-bs-no-cross-module-opt" |] }]
 
 let printers = ref []
 
-let locfmt s (linum : int) (start : int) (finish : int) msg = 
-   {j|File "$(s)", line $(linum), characters $(start)-$(finish): $(msg)|j}
-
+let locfmt s (linum : int) (start : int) (finish : int) msg =
+  (((((((("File \"" ^ s) ^ "\", line ") ^ __unsafe_cast linum) ^ ", characters ")
+     ^ __unsafe_cast start)
+    ^ "-")
+   ^ __unsafe_cast finish)
+  ^ ": ")
+  ^ msg
 
-let fields : exn -> string = [%raw{|function(x){
+let fields : exn -> string =
+  [%raw
+    {|function(x){
   var s = "" 
   var index = 1
   while ("_"+index in x){
@@ -33,47 +38,38 @@ let fields : exn -> string = [%raw{|function(x){
   }
   return "(" + s + ")"
 }
-|}]  
-
-
-
-
+|}]
 
 external exn_slot_name : exn -> string = "?exn_slot_name"
 
-let to_string x = 
+let to_string x =
   let rec conv = function
-    | hd :: tl ->
-        (match try hd x with _ -> None with
-        | Some s -> s
-        | None -> conv tl)
-    | [] ->
+    | hd :: tl -> (
+        match try hd x with _ -> None with Some s -> s | None -> conv tl)
+    | [] -> (
         match x with
-        | Match_failure(file, line, char) ->
-            locfmt file line char (char+5) "Pattern matching failed"
-        | Assert_failure(file, line, char) ->
-            locfmt file line char (char+6) "Assertion failed"
-        | Undefined_recursive_module(file, line, char) ->
-            locfmt file line char (char+6) "Undefined recursive module"
+        | Match_failure (file, line, char) ->
+            locfmt file line char (char + 5) "Pattern matching failed"
+        | Assert_failure (file, line, char) ->
+            locfmt file line char (char + 6) "Assertion failed"
+        | Undefined_recursive_module (file, line, char) ->
+            locfmt file line char (char + 6) "Undefined recursive module"
         | _ ->
-          let constructor =
-            exn_slot_name x in 
-          constructor ^ fields  x in
+            let constructor = exn_slot_name x in
+            constructor ^ fields x)
+  in
   conv !printers
 
 let print fct arg =
-  try
-    fct arg
+  try fct arg
   with x ->
     Js.log ("Uncaught exception: " ^ to_string x);
     raise x
 
 let catch fct arg =
-  try
-    fct arg
+  try fct arg
   with x ->
     Js.log ("Uncaught exception: " ^ to_string x);
     exit 2
 
-let register_printer fn =
-  printers := fn :: !printers
+let register_printer fn = printers := fn :: !printers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellahq/rescript",
-  "version": "10.1.0-alpha.2",
+  "version": "10.1.4-republish-1",
   "devDependencies": {
     "mocha": "^7.2.0",
     "nyc": "^15.0.0",
@@ -27,6 +27,7 @@
   "files": [
     "CHANGELOG.md",
     "CREDITS.md",
+    "ninja.COPYING",
     "bsc",
     "bsrefmt",
     "rescript",

package/scripts/buildNinjaBinary.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+const child_process = require("child_process");
+const fs = require("fs");
+const path = require("path");
+
+const platform = process.platform;
+const ninjaDir = path.join(__dirname, "..", "ninja");
+const buildCommand = "python3 configure.py --bootstrap --verbose";
+
+if (platform === "win32") {
+  // On Windows, the build uses the MSVC compiler which needs to be on the path.
+  child_process.execSync(buildCommand, { cwd: ninjaDir });
+} else {
+  if (process.platform === "darwin") {
+    process.env["CXXFLAGS"] = "-flto";
+  }
+  child_process.execSync(buildCommand, { stdio: [0, 1, 2], cwd: ninjaDir });
+  child_process.execSync(`strip ninja`, { stdio: [0, 1, 2], cwd: ninjaDir });
+}
+
+const { absolutePath, ninja_exe } = require("./bin_path");
+const src = path.join(ninjaDir, `ninja${platform === "win32" ? ".exe" : ""}`);
+
+if (!fs.existsSync(absolutePath)) {
+  fs.mkdirSync(absolutePath);
+}
+
+fs.copyFileSync(src, ninja_exe);

package/scripts/install.js

@@ -39,17 +39,21 @@ var force_lib_rebuild = process.argv.includes("-force-lib-rebuild");
 function provideNinja() {
   var vendor_ninja_version = "1.9.0.git";
   var ninja_source_dir = path.join(root_dir, "vendor", "ninja");
+
   function build_ninja() {
     console.log(`building ninja`);
     ensureExists(ninja_source_dir);
+
     if (fs.existsSync(path.join(root_dir, "vendor", "ninja.tar.gz"))) {
+      // Build from source on installation of the npm package
+      // for platforms where we don't provide a pre-built binary.
       console.log("Extracting ninja sources...");
       child_process.execSync(`tar xzf ../ninja.tar.gz`, {
         cwd: ninja_source_dir,
         stdio: [0, 1, 2],
       });
       console.log("No prebuilt Ninja, building Ninja now");
-      var build_ninja_command = "./configure.py --bootstrap";
+      var build_ninja_command = "python3 ./configure.py --bootstrap";
       child_process.execSync(build_ninja_command, {
         cwd: ninja_source_dir,
         stdio: [0, 1, 2],
@@ -59,8 +63,8 @@ function provideNinja() {
         ninja_bin_output
       );
     } else {
-      console.log(`ninja.tar.gz not availble in CI mode`);
-      require("../ninja/snapshot").build();
+      // Build from source for "npm install" in local dev.
+      require("../scripts/buildNinjaBinary");
       fs.copyFileSync(
         path.join(root_dir, "ninja", ninja_bin_filename),
         ninja_bin_output

package/scripts/installUtils.js

@@ -45,7 +45,15 @@ function install() {
   });
 
   // for merlin or other IDE
-  var installed_suffixes = [".ml", ".mli", ".cmi", ".cmt", ".cmti"];
+  var installed_suffixes = [
+    ".ml",
+    ".mli",
+    ".res",
+    ".resi",
+    ".cmi",
+    ".cmt",
+    ".cmti",
+  ];
   installDirBy(others_dir, ocaml_dir, function (file) {
     var y = path.parse(file);
     if (y.ext === ".cmi") {

package/scripts/rescript_arg.js

@@ -26,7 +26,7 @@ function bad_arg(s) {
 /**
  * @typedef {{val : string}} stringref
  * @typedef {{val : boolean}} boolref
- * @typedef {{kind:"Unit_call",data : ()=>void } | {kind : "Unit_set", data : boolref}}unit_action
+ * @typedef {{kind:"Unit_call",data : ()=>void } | {kind : "Unit_set", data : boolref}} unit_action
  * @typedef {{kind:"String_call",data:(s : string)=>void} | {kind : "String_set",data: stringref}} string_action
  * @typedef {{kind:"Unit",data : unit_action } | {kind:"String", data: string_action}} action
  * @typedef {Array<[string,action,string]>} specs
@@ -67,9 +67,7 @@ function usage_b(b, usage, specs) {
           cur = i + 1;
         }
       }
-      if (i < specs.length - 1) {
-        b.add("\n");
-      }
+      b.add("\n");
     }
   }
 }

package/scripts/rescript_format.js

@@ -5,8 +5,11 @@ var format_usage = `Usage: rescript format <options> [files]
 \`rescript format\` formats the current directory
 `;
 var child_process = require("child_process");
+var util = require("node:util");
+var asyncExecFile = util.promisify(child_process.execFile);
 var path = require("path");
 var fs = require("fs");
+var asyncFs = fs.promises;
 /**
  * @type {arg.stringref}
  */
@@ -17,6 +20,11 @@ var stdin = { val: undefined };
  */
 var format = { val: undefined };
 
+/**
+ * @type {arg.boolref}
+ */
+var check = { val: undefined };
+
 /**
  * @type{arg.specs}
  */
@@ -27,12 +35,16 @@ var specs = [
     `[.res|.resi|.ml|.mli] Read the code from stdin and print
 the formatted code to stdout in ReScript syntax`,
   ],
-  //  ml|mli
   [
     "-all",
     { kind: "Unit", data: { kind: "Unit_set", data: format } },
     "Format the whole project ",
   ],
+  [
+    "-check",
+    { kind: "Unit", data: { kind: "Unit_set", data: check } },
+    "Check formatting for file or the whole project. Use `-all` to check the whole project",
+  ],
 ];
 var formattedStdExtensions = [".res", ".resi", ".ml", ".mli"];
 var formattedFileExtensions = [".res", ".resi"];
@@ -55,12 +67,55 @@ async function readStdin() {
   return Buffer.concat(chunks).toString("utf8");
 }
 
+/**
+ * @param {string[]} files
+ * @param {string} bsc_exe
+ * @param {(x: string) => boolean} isSupportedFile
+ * @param {boolean} checkFormatting
+ */
+async function formatFiles(files, bsc_exe, isSupportedFile, checkFormatting) {
+  var incorrectlyFormattedFiles = 0;
+  try {
+    const _promises = await Promise.all(
+      files.map(async file => {
+        if (isSupportedFile(file)) {
+          const flags = checkFormatting
+            ? ["-format", file]
+            : ["-o", file, "-format", file];
+          const { stdout } = await asyncExecFile(bsc_exe, flags);
+          if (check.val) {
+            const original = await asyncFs.readFile(file, "utf-8");
+            if (original != stdout) {
+              console.error("[format check]", file);
+              incorrectlyFormattedFiles++;
+            }
+          }
+        }
+        return null;
+      })
+    );
+  } catch (err) {
+    console.error(err);
+    process.exit(2);
+  }
+  if (incorrectlyFormattedFiles > 0) {
+    if (incorrectlyFormattedFiles == 1) {
+      console.error("The file listed above needs formatting");
+    } else {
+      console.error(
+        `The ${incorrectlyFormattedFiles} files listed above need formatting`
+      );
+    }
+    process.exit(3);
+  }
+}
+
 /**
  * @param {string[]} argv
  * @param {string} rescript_exe
  * @param {string} bsc_exe
  */
-function main(argv, rescript_exe, bsc_exe) {
+async function main(argv, rescript_exe, bsc_exe) {
   var isSupportedFile = hasExtension(formattedFileExtensions);
   var isSupportedStd = hasExtension(formattedStdExtensions);
 
@@ -75,6 +130,16 @@ function main(argv, rescript_exe, bsc_exe) {
 
     var format_project = format.val;
     var use_stdin = stdin.val;
+
+    // Only -check arg
+    // Require: -all or path to a file
+    if (check.val && !format_project && files.length == 0) {
+      console.error(
+        "format check require path to a file or use `-all` to check the whole project"
+      );
+      process.exit(2);
+    }
+
     if (format_project) {
       if (use_stdin || files.length !== 0) {
         console.error("format -all can not be in use with other flags");
@@ -95,26 +160,12 @@ function main(argv, rescript_exe, bsc_exe) {
         process.exit(2);
       }
       files = output.stdout.split("\n").map(x => x.trim());
-      var hasError = false;
-      for (let arg of files) {
-        if (isSupportedFile(arg)) {
-          // console.log(`processing ${arg}`);
-          child_process.execFile(
-            bsc_exe,
-            ["-o", arg, "-format", arg],
-            (error, _stdout, stderr) => {
-              if (error !== null) {
-                console.error(stderr);
-                hasError = true;
-              }
-            }
-          );
-        }
-      }
-      if (hasError) {
+      await formatFiles(files, bsc_exe, isSupportedFile, check.val);
+    } else if (use_stdin) {
+      if (check.val) {
+        console.error("format -stdin cannot be used with -check flag");
         process.exit(2);
       }
-    } else if (use_stdin) {
       if (isSupportedStd(use_stdin)) {
         var crypto = require("crypto");
         var os = require("os");
@@ -144,7 +195,7 @@ function main(argv, rescript_exe, bsc_exe) {
           );
         })();
       } else {
-        console.error(`Unsupported exetnsion ${use_stdin}`);
+        console.error(`Unsupported extension ${use_stdin}`);
         console.error(`Supported extensions: ${formattedStdExtensions} `);
         process.exit(2);
       }
@@ -163,24 +214,7 @@ function main(argv, rescript_exe, bsc_exe) {
           process.exit(2);
         }
       }
-      var hasError = false;
-      files.forEach(file => {
-        var write = isSupportedFile(file);
-        var flags = write ? ["-o", file, "-format", file] : ["-format", file];
-        child_process.execFile(bsc_exe, flags, (error, stdout, stderr) => {
-          if (error === null) {
-            if (!write) {
-              process.stdout.write(stdout);
-            }
-          } else {
-            console.error(stderr);
-            hasError = true;
-          }
-        });
-      });
-      if (hasError) {
-        process.exit(2);
-      }
+      await formatFiles(files, bsc_exe, isSupportedFile, check.val);
     }
   } catch (e) {
     if (e instanceof arg.ArgError) {