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

package/lib/es6/belt_internalBuckets.js

@@ -4,6 +4,19 @@ import * as Curry from "./curry.js";
 import * as Belt_Array from "./belt_Array.js";
 import * as Caml_option from "./caml_option.js";
 
+function copyBucket(c) {
+  if (c === undefined) {
+    return c;
+  }
+  var head = {
+    key: c.key,
+    value: c.value,
+    next: undefined
+  };
+  copyAuxCont(c.next, head);
+  return head;
+}
+
 function copyAuxCont(_c, _prec) {
   while(true) {
     var prec = _prec;
@@ -23,19 +36,6 @@ function copyAuxCont(_c, _prec) {
   };
 }
 
-function copyBucket(c) {
-  if (c === undefined) {
-    return c;
-  }
-  var head = {
-    key: c.key,
-    value: c.value,
-    next: undefined
-  };
-  copyAuxCont(c.next, head);
-  return head;
-}
-
 function copyBuckets(buckets) {
   var len = buckets.length;
   var newBuckets = new Array(len);

package/lib/es6/caml_float.js

@@ -29,8 +29,8 @@ function modf_float(x) {
   var f = x$1 - i;
   if (neg) {
     return [
-            -f,
-            -i
+            - f,
+            - i
           ];
   } else {
     return [
@@ -68,13 +68,13 @@ function frexp_float(x) {
   var neg = x < 0;
   var x$p = Math.abs(x);
   var exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1;
-  x$p = x$p * Math.pow(2, -exp);
+  x$p = x$p * Math.pow(2, - exp);
   if (x$p < 0.5) {
     x$p = x$p * 2;
     exp = exp - 1;
   }
   if (neg) {
-    x$p = -x$p;
+    x$p = - x$p;
   }
   return [
           x$p,
@@ -86,7 +86,7 @@ function copysign_float(x, y) {
   var x$1 = Math.abs(x);
   var y$1 = y === 0 ? 1 / y : y;
   if (y$1 < 0) {
-    return -x$1;
+    return - x$1;
   } else {
     return x$1;
   }

package/lib/es6/caml_format.js

@@ -654,7 +654,7 @@ function int64_format(fmt, x) {
 function format_float(fmt, x) {
   var f = parse_format(fmt);
   var prec = f.prec < 0 ? 6 : f.prec;
-  var x$1 = x < 0 ? (f.sign = -1, -x) : x;
+  var x$1 = x < 0 ? (f.sign = -1, - x) : x;
   var s = "";
   if (isNaN(x$1)) {
     s = "nan";

package/lib/es6/caml_int64.js

@@ -320,7 +320,7 @@ function of_float(x) {
     return max_int;
   }
   if (x < 0) {
-    return neg(of_float(-x));
+    return neg(of_float(- x));
   }
   var hi = x / 4294967296 | 0;
   var lo = x % 4294967296 | 0;

package/lib/es6/caml_obj.js

@@ -59,7 +59,7 @@ function compare(a, b) {
         break;
     case "number" :
         if (b_type === "number") {
-          return Caml.int_compare(a, b);
+          return Caml.float_compare(a, b);
         }
         break;
     case "string" :
@@ -359,23 +359,43 @@ function equal_nullable(x, y) {
 }
 
 function notequal(a, b) {
-  return !equal(a, b);
+  if (typeof a === "number" && typeof b === "number") {
+    return a !== b;
+  } else {
+    return !equal(a, b);
+  }
 }
 
 function greaterequal(a, b) {
-  return compare(a, b) >= 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a >= b;
+  } else {
+    return compare(a, b) >= 0;
+  }
 }
 
 function greaterthan(a, b) {
-  return compare(a, b) > 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a > b;
+  } else {
+    return compare(a, b) > 0;
+  }
 }
 
 function lessequal(a, b) {
-  return compare(a, b) <= 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a <= b;
+  } else {
+    return compare(a, b) <= 0;
+  }
 }
 
 function lessthan(a, b) {
-  return compare(a, b) < 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a < b;
+  } else {
+    return compare(a, b) < 0;
+  }
 }
 
 function min(x, y) {

package/lib/es6/complex.js

@@ -22,15 +22,15 @@ function sub(x, y) {
 
 function neg(x) {
   return {
-          re: -x.re,
-          im: -x.im
+          re: - x.re,
+          im: - x.im
         };
 }
 
 function conj(x) {
   return {
           re: x.re,
-          im: -x.im
+          im: - x.im
         };
 }
 
@@ -119,7 +119,7 @@ function sqrt(x) {
   } else {
     return {
             re: 0.5 * i / w,
-            im: x.im >= 0.0 ? w : -w
+            im: x.im >= 0.0 ? w : - w
           };
   }
 }

package/lib/es6/js.js

@@ -29,6 +29,8 @@ var Re;
 
 var $$Promise;
 
+var Promise2;
+
 var $$Date;
 
 var Dict;
@@ -86,6 +88,7 @@ export {
   String2 ,
   Re ,
   $$Promise ,
+  Promise2 ,
   $$Date ,
   Dict ,
   Global ,

package/lib/es6/js_promise2.js

@@ -0,0 +1,16 @@
+
+
+
+var then = (function(p, cont) {
+    return Promise.resolve(p).then(cont)
+  });
+
+var $$catch = (function(p, cont) {
+      return Promise.resolve(p).catch(cont)
+    });
+
+export {
+  then ,
+  $$catch ,
+}
+/* No side effect */

package/lib/es6/jsxPPXReactSupport.js

@@ -0,0 +1,26 @@
+
+
+import * as React from "react";
+import * as Caml_splice_call from "./caml_splice_call.js";
+
+function createElementWithKey(key, component, props) {
+  return React.createElement(component, key !== undefined ? Object.assign({}, props, {
+                    key: key
+                  }) : props);
+}
+
+function createElementVariadicWithKey(key, component, props, elements) {
+  return Caml_splice_call.spliceApply(React.createElement, [
+              component,
+              key !== undefined ? Object.assign({}, props, {
+                      key: key
+                    }) : props,
+              elements
+            ]);
+}
+
+export {
+  createElementWithKey ,
+  createElementVariadicWithKey ,
+}
+/* react Not a pure module */

package/lib/js/belt_internalBuckets.js

@@ -4,6 +4,19 @@ var Curry = require("./curry.js");
 var Belt_Array = require("./belt_Array.js");
 var Caml_option = require("./caml_option.js");
 
+function copyBucket(c) {
+  if (c === undefined) {
+    return c;
+  }
+  var head = {
+    key: c.key,
+    value: c.value,
+    next: undefined
+  };
+  copyAuxCont(c.next, head);
+  return head;
+}
+
 function copyAuxCont(_c, _prec) {
   while(true) {
     var prec = _prec;
@@ -23,19 +36,6 @@ function copyAuxCont(_c, _prec) {
   };
 }
 
-function copyBucket(c) {
-  if (c === undefined) {
-    return c;
-  }
-  var head = {
-    key: c.key,
-    value: c.value,
-    next: undefined
-  };
-  copyAuxCont(c.next, head);
-  return head;
-}
-
 function copyBuckets(buckets) {
   var len = buckets.length;
   var newBuckets = new Array(len);

package/lib/js/caml_float.js

@@ -29,8 +29,8 @@ function modf_float(x) {
   var f = x$1 - i;
   if (neg) {
     return [
-            -f,
-            -i
+            - f,
+            - i
           ];
   } else {
     return [
@@ -68,13 +68,13 @@ function frexp_float(x) {
   var neg = x < 0;
   var x$p = Math.abs(x);
   var exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1;
-  x$p = x$p * Math.pow(2, -exp);
+  x$p = x$p * Math.pow(2, - exp);
   if (x$p < 0.5) {
     x$p = x$p * 2;
     exp = exp - 1;
   }
   if (neg) {
-    x$p = -x$p;
+    x$p = - x$p;
   }
   return [
           x$p,
@@ -86,7 +86,7 @@ function copysign_float(x, y) {
   var x$1 = Math.abs(x);
   var y$1 = y === 0 ? 1 / y : y;
   if (y$1 < 0) {
-    return -x$1;
+    return - x$1;
   } else {
     return x$1;
   }

package/lib/js/caml_format.js

@@ -654,7 +654,7 @@ function int64_format(fmt, x) {
 function format_float(fmt, x) {
   var f = parse_format(fmt);
   var prec = f.prec < 0 ? 6 : f.prec;
-  var x$1 = x < 0 ? (f.sign = -1, -x) : x;
+  var x$1 = x < 0 ? (f.sign = -1, - x) : x;
   var s = "";
   if (isNaN(x$1)) {
     s = "nan";

package/lib/js/caml_int64.js

@@ -320,7 +320,7 @@ function of_float(x) {
     return max_int;
   }
   if (x < 0) {
-    return neg(of_float(-x));
+    return neg(of_float(- x));
   }
   var hi = x / 4294967296 | 0;
   var lo = x % 4294967296 | 0;

package/lib/js/caml_obj.js

@@ -59,7 +59,7 @@ function compare(a, b) {
         break;
     case "number" :
         if (b_type === "number") {
-          return Caml.int_compare(a, b);
+          return Caml.float_compare(a, b);
         }
         break;
     case "string" :
@@ -359,23 +359,43 @@ function equal_nullable(x, y) {
 }
 
 function notequal(a, b) {
-  return !equal(a, b);
+  if (typeof a === "number" && typeof b === "number") {
+    return a !== b;
+  } else {
+    return !equal(a, b);
+  }
 }
 
 function greaterequal(a, b) {
-  return compare(a, b) >= 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a >= b;
+  } else {
+    return compare(a, b) >= 0;
+  }
 }
 
 function greaterthan(a, b) {
-  return compare(a, b) > 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a > b;
+  } else {
+    return compare(a, b) > 0;
+  }
 }
 
 function lessequal(a, b) {
-  return compare(a, b) <= 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a <= b;
+  } else {
+    return compare(a, b) <= 0;
+  }
 }
 
 function lessthan(a, b) {
-  return compare(a, b) < 0;
+  if (typeof a === "number" && typeof b === "number") {
+    return a < b;
+  } else {
+    return compare(a, b) < 0;
+  }
 }
 
 function min(x, y) {

package/lib/js/complex.js

@@ -22,15 +22,15 @@ function sub(x, y) {
 
 function neg(x) {
   return {
-          re: -x.re,
-          im: -x.im
+          re: - x.re,
+          im: - x.im
         };
 }
 
 function conj(x) {
   return {
           re: x.re,
-          im: -x.im
+          im: - x.im
         };
 }
 
@@ -119,7 +119,7 @@ function sqrt(x) {
   } else {
     return {
             re: 0.5 * i / w,
-            im: x.im >= 0.0 ? w : -w
+            im: x.im >= 0.0 ? w : - w
           };
   }
 }

package/lib/js/js.js

@@ -29,6 +29,8 @@ var Re;
 
 var $$Promise;
 
+var Promise2;
+
 var $$Date;
 
 var Dict;
@@ -85,6 +87,7 @@ exports.$$String = $$String;
 exports.String2 = String2;
 exports.Re = Re;
 exports.$$Promise = $$Promise;
+exports.Promise2 = Promise2;
 exports.$$Date = $$Date;
 exports.Dict = Dict;
 exports.Global = Global;

package/lib/js/js_promise2.js

@@ -0,0 +1,14 @@
+'use strict';
+
+
+var then = (function(p, cont) {
+    return Promise.resolve(p).then(cont)
+  });
+
+var $$catch = (function(p, cont) {
+      return Promise.resolve(p).catch(cont)
+    });
+
+exports.then = then;
+exports.$$catch = $$catch;
+/* No side effect */

package/lib/js/jsxPPXReactSupport.js

@@ -0,0 +1,24 @@
+'use strict';
+
+var React = require("react");
+var Caml_splice_call = require("./caml_splice_call.js");
+
+function createElementWithKey(key, component, props) {
+  return React.createElement(component, key !== undefined ? Object.assign({}, props, {
+                    key: key
+                  }) : props);
+}
+
+function createElementVariadicWithKey(key, component, props, elements) {
+  return Caml_splice_call.spliceApply(React.createElement, [
+              component,
+              key !== undefined ? Object.assign({}, props, {
+                      key: key
+                    }) : props,
+              elements
+            ]);
+}
+
+exports.createElementWithKey = createElementWithKey;
+exports.createElementVariadicWithKey = createElementVariadicWithKey;
+/* react Not a pure module */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellahq/rescript",
-  "version": "10.1.0-alpha.2",
+  "version": "10.1.4-republish-2",
   "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");
     }
   }
 }