Merge pull request #40 from sikanhe/release/13.0.0-beta.2

Release/13.0.0 beta.2

Author: austindd

.gitignore

@@ -8,7 +8,5 @@ bsb
 *.bs.js
 package-lock.json
 
-src/ScratchPadJs.js
-src/ScratchRE.re
-src/ScratchML.ml
-src/Events.re
+src/ScratchRe.re
+src/ScratchMl.ml

bsconfig.json

@@ -25,12 +25,11 @@
   ],
   "suffix": ".bs.js",
   "namespace": "node-js",
-  "bs-dependencies": [
-  ],
+  "bs-dependencies": [],
   "bs-dev-dependencies": [
     "@glennsl/bs-jest"
   ],
   "ppx-flags": [],
   "refmt": 3,
   "bsc-flags": []
-}
+}

examples/StreamTextToFile.re

@@ -1,27 +1,27 @@
-
-let data = "Sample text to write to a file!" -> Buffer.fromString;
+let data = "Sample text to write to a file!"->Buffer.fromString;
 let process = Process.process;
 
-let outputPath = Path.relative(
-  ~from= Process.cwd(process),
-  ~to_="example__output.txt"
-);
+let outputPath =
+  Path.relative(~from=Process.cwd(process), ~to_="example__output.txt");
 
 let writeStream = Fs.createWriteStream(outputPath);
 
-let logErrorIfExists = (maybeError) => {
-    switch (Js.Nullable.toOption(maybeError)) {
-      | Some(err) => Js.log2("An error occurred", err);
-      | None => ();
-    };
-  }
-
-writeStream -> Stream.writeWith(
-    data,
-    ~callback=(maybeError) => {
-      logErrorIfExists(maybeError);
-      Js.log("Finished");
-    },
-    ()
-  );
+let logErrorIfExists = maybeError => {
+  switch (Js.Nullable.toOption(maybeError)) {
+  | Some(err) => Js.log2("An error occurred", err)
+  | None => ()
+  };
+};
 
+let () =
+  writeStream
+  ->Stream.writeWith(
+      data,
+      ~callback=
+        maybeError => {
+          logErrorIfExists(maybeError);
+          Js.log("Finished");
+        },
+      (),
+    )
+  ->ignore;

package.json

@@ -1,20 +1,24 @@
 {
   "name": "reason-nodejs",
-  "version": "13.0.0-beta.0",
+  "version": "13.0.0-beta.2",
   "scripts": {
     "build": "bsb -make-world",
+    "clean-build": "bsb -clean-world && bsb -make-world",
     "start": "bsb -make-world -w",
-    "clean": "bsb -clean-world",
-    "test": "jest"
+    "clean-start": "bsb -clean-world && bsb -make-world -w",
+    "test": "jest",
+    "clean-test": "bsb -clean-world && bsb -make-world && jest",
+    "clean": "bsb -clean-world"
   },
   "keywords": [
     "BuckleScript"
   ],
-  "author": "Sikan He",
+  "author": "Sikan He & Austin Davis",
   "homepage": "https://github.com/sikanhe/reason-node",
   "license": "MIT",
+  "dependencies": {},
   "devDependencies": {
     "@glennsl/bs-jest": "^0.4.10",
-    "bs-platform": "7.3.2"
+    "bs-platform": "^8.3.0"
   }
 }

src/Assert.re

@@ -10,24 +10,28 @@ external notStrictEqual: ('a, 'a) => unit = "notStrictEqual";
 external deepStrictEqual: ('a, 'a) => unit = "deepStrictEqual";
 [@bs.module "assert"]
 external notDeepStrictEqual: ('a, 'a) => unit = "notDeepStrictEqual";
-
-[@bs.module "assert"] external throws: (unit => 'a) => unit = "throws";
 [@bs.module "assert"]
-external throwsError: (unit => 'a, 'e) => unit = "throws";
+external throws: ([@bs.uncurry] (unit => 'a)) => unit = "throws";
 [@bs.module "assert"]
-external doesNotThrow: (unit => 'a) => unit = "doesNotThrow";
+external throwsError: ([@bs.uncurry] (unit => 'a), 'e) => unit = "throws";
 [@bs.module "assert"]
-external doesNotThrowError: (unit => 'a, 'e) => unit = "doesNotThrow";
-
+external doesNotThrow: ([@bs.uncurry] (unit => 'a)) => unit = "doesNotThrow";
+[@bs.module "assert"]
+external doesNotThrowError: ([@bs.uncurry] (unit => 'a), 'e) => unit =
+  "doesNotThrow";
 [@bs.module "assert"] external ifError: 'a => unit = "ifError";
 [@bs.module "assert"]
-external rejects: (unit => Js.Promise.t('a)) => unit = "rejects";
+external rejects: ([@bs.uncurry] (unit => Js.Promise.t('a))) => unit =
+  "rejects";
 [@bs.module "assert"]
-external rejectsError: (unit => Js.Promise.t('a), 'e) => unit = "rejects";
+external rejectsError: ([@bs.uncurry] (unit => Js.Promise.t('a)), 'e) => unit =
+  "rejects";
 [@bs.module "assert"]
-external doesNotReject: (unit => Js.Promise.t('a)) => unit = "doesNotReject";
+external doesNotReject: ([@bs.uncurry] (unit => Js.Promise.t('a))) => unit =
+  "doesNotReject";
 [@bs.module "assert"]
-external doesNotRejectError: (unit => Js.Promise.t('a), 'e) => unit =
+external doesNotRejectError:
+  ([@bs.uncurry] (unit => Js.Promise.t('a)), 'e) => unit =
   "doesNotReject";
 
 module AssertionError = Errors.AssertionError;

src/BigInt.re

@@ -10,11 +10,25 @@ external (+): (t, t) => t = "%addfloat";
 external (-): (t, t) => t = "%subfloat";
 external ( * ): (t, t) => t = "%mulfloat";
 external (/): (t, t) => t = "%divfloat";
-external (%): (t, t) => t = "%modfloat";
+let (mod): (t, t) => t = Obj.magic(mod_float);
 let ( ** ): (t, t) => t = [%raw {|function (a, b) { return (a ** b); }|}];
 external (land): (t, t) => t = "%andint";
 external (lor): (t, t) => t = "%orint";
 external (lxor): (t, t) => t = "%xorint";
 let lnot: t => t = x => x lxor _NEGATIVE_ONE;
 external (lsl): (t, t) => t = "%lslint";
 external (asr): (t, t) => t = "%asrint";
+
+external negate: t => t = "%negfloat";
+external add: (t, t) => t = "%addfloat";
+external subtract: (t, t) => t = "%subfloat";
+external multiply: (t, t) => t = "%mulfloat";
+external divide: (t, t) => t = "%divfloat";
+let modulo: (t, t) => t = Obj.magic(mod_float);
+let power: (t, t) => t = ( ** );
+external logicalAnd: (t, t) => t = "%andint";
+external logicalOr: (t, t) => t = "%orint";
+external logicalXor: (t, t) => t = "%xorint";
+let logicalNot: t => t = x => x lxor _NEGATIVE_ONE;
+external logicalShiftLeft: (t, t) => t = "%lslint";
+external arithmeticShiftRight: (t, t) => t = "%asrint";

src/ChildProcess.re

@@ -93,7 +93,6 @@ external execOptions:
   (
     ~cwd: string=?,
     ~env: Js.Dict.t(string)=?,
-    ~encoding: string=?,
     ~shell: string=?,
     ~timeout: int=?,
     ~maxBuffer: int=?,
@@ -106,12 +105,12 @@ external execOptions:
   execOptions;
 
 [@bs.module "child_process"] [@bs.val]
-external exec: (string, (option(Js.Exn.t), string, string) => unit) => t =
+external exec: (string, (Js.nullable(Js.Exn.t), Buffer.t, Buffer.t) => unit) => t =
   "exec";
 
 [@bs.module "child_process"] [@bs.val]
 external execWith:
-  (string, execOptions, (option(Js.Exn.t), string, string) => unit) => t =
+  (string, execOptions, (Js.nullable(Js.Exn.t), Buffer.t, Buffer.t) => unit) => t =
   "exec";
 
 type execFileOptions;
@@ -121,7 +120,6 @@ external execFileOption:
   (
     ~cwd: string=?,
     ~env: Js.Dict.t(string)=?,
-    ~encoding: string=?,
     ~timeout: int=?,
     ~maxBuffer: int=?,
     ~killSignal: string=?,
@@ -135,7 +133,7 @@ external execFileOption:
 
 [@bs.module "child_process"] [@bs.val]
 external execFile:
-  (string, array(string), (option(Js.Exn.t), string, string) => unit) => t =
+  (string, array(string), (Js.nullable(Js.Exn.t), Buffer.t, Buffer.t) => unit) => t =
   "execFile";
 
 [@bs.module "child_process"] [@bs.val]
@@ -144,7 +142,7 @@ external execFileWith:
     string,
     array(string),
     execFileOptions,
-    (option(Js.Exn.t), string, string) => unit
+    (Js.nullable(Js.Exn.t), Buffer.t, Buffer.t) => unit
   ) =>
   t =
   "execFile";
@@ -202,11 +200,11 @@ external spawnWith: (string, array(string), spawnOptions) => t = "spawn";
 type spawnSyncResult('a) = {
   pid: int,
   output: array('a),
-  stdout: string,
-  stderr: string,
+  stdout: Buffer.t,
+  stderr: Buffer.t,
   status: int,
-  signal: Js.Nullable.t(string),
-  error: option(Js.Exn.t),
+  signal: Js.nullable(string),
+  error: Js.nullable(Js.Exn.t),
 };
 
 type spawnSyncOptions;
@@ -247,7 +245,6 @@ external execSyncOptions:
     ~cwd: string=?,
     ~env: Js.Dict.t(string)=?,
     ~input: Buffer.t=?,
-    ~encoding: string=?,
     ~shell: string=?,
     ~timeout: int=?,
     ~maxBuffer: int=?,
@@ -260,10 +257,10 @@ external execSyncOptions:
   execSyncOptions;
 
 [@bs.module "child_process"] [@bs.val]
-external execSync: string => string = "execSync";
+external execSync: string => Buffer.t = "execSync";
 
 [@bs.module "child_process"] [@bs.val]
-external execSyncWith: (string, execSyncOptions) => string = "execSync";
+external execSyncWith: (string, execSyncOptions) => Buffer.t = "execSync";
 
 type execFileSyncOptions;
 
@@ -273,7 +270,6 @@ external execFileSyncOptions:
     ~cwd: string=?,
     ~env: Js.Dict.t(string)=?,
     ~input: Buffer.t=?,
-    ~encoding: string=?,
     ~shell: string=?,
     ~timeout: int=?,
     ~maxBuffer: int=?,
@@ -286,9 +282,9 @@ external execFileSyncOptions:
   execFileSyncOptions;
 
 [@bs.module "child_process"] [@bs.val]
-external execFileSync: (string, array(string)) => string = "execFileSync";
+external execFileSync: (string, array(string)) => Buffer.t = "execFileSync";
 
 [@bs.module "child_process"] [@bs.val]
 external execFileSyncWith:
-  (string, array(string), execFileSyncOptions) => string =
+  (string, array(string), execFileSyncOptions) => Buffer.t =
   "execFileSync";

src/Console.re

@@ -8,8 +8,8 @@ type consoleOptions;
 [@bs.obj]
 external consoleOptions:
   (
-    ~stdout: Stream.Writable.subtype('w, 'r, 'a),
-    ~stderr: Stream.Writable.subtype('w, 'r, 'a)=?,
+    ~stdout: Stream.Writable.subtype('w, 'a),
+    ~stderr: Stream.Writable.subtype('w, 'a)=?,
     ~ignoreErrors: bool=?,
     ~colorMode: bool=?,
     ~inspectOptions: Util.inspectOptions=?,
@@ -20,21 +20,21 @@ external consoleOptions:
 [@bs.new] [@bs.module "console"]
 external make: consoleOptions => t = "Console";
 [@bs.new] [@bs.module "console"]
-external make2: {.. "stdout": Stream.Writable.subtype('w, 'r, 'a)} => t =
+external make2: {.. "stdout": Stream.Writable.subtype('w, 'a)} => t =
   "Console";
 
 [@bs.send] external assert_: (t, bool) => unit = "assert";
 // TODO: reconsider naming
 [@bs.send] external assertWithMessage: (t, bool, string) => unit = "assert";
-[@bs.send] external clear: (t, unit) => unit = "clear";
+[@bs.send] external clear: (t) => unit = "clear";
 [@bs.send] external count: (t, string) => unit = "count";
 [@bs.send] external countReset: (t, string) => unit = "countReset";
 
 [@bs.send] external debug: (t, string) => unit = "debug";
 [@bs.send] [@bs.variadic]
 external debugMany: (t, array('a)) => unit = "debug";
 
-[@bs.send] external dir: (t, string) => unit = "dir";
+[@bs.send] external dir: (t, 'a) => unit = "dir";
 [@bs.send] [@bs.variadic] external dirMany: (t, array('a)) => unit = "dir";
 
 [@bs.send] external dirxml: (t, string) => unit = "dirxml";