Support rescript v11

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: yarn
+      - run: yarn install
+      - run: yarn test

bsconfig.json

@@ -25,12 +25,10 @@
   ],
   "suffix": ".bs.js",
   "bs-dependencies": [],
-  "bs-dev-dependencies": [
-    "@dusty-phillips/rescript-zora",
-    "@ryyppy/rescript-promise"
-  ],
+  "bs-dev-dependencies": ["@dusty-phillips/rescript-zora"],
   "warnings": {
     "number": "A-4-40-41-42-43-44+101-102-103",
     "error": "false"
-  }
-}
+  },
+  "uncurried": false
+}

package.json

@@ -26,10 +26,10 @@
   "description": "Node bindings for ReScript",
   "license": "MIT",
   "devDependencies": {
-    "@dusty-phillips/rescript-zora": "^3.0.0",
+    "@dusty-phillips/rescript-zora": "^4.0.0",
     "onchange": "^7.1.0",
-    "pta": "^1.0.0",
-    "rescript": "^10.0.1",
-    "zora": "^5.0.0"
+    "pta": "^1.2.0",
+    "rescript": "^11.0.0-beta.3",
+    "zora": "^5.2.0"
   }
 }

src/Buffer.res

@@ -1,4 +1,4 @@
-type t = Node.buffer
+type t
 open Js.TypedArray2
 
 module Constants = {

src/Exports.res

@@ -0,0 +1 @@
+type t

src/Module.res

@@ -1 +1,13 @@
-include Node_module
+type rec t = {
+  id: string,
+  exports: Exports.t,
+  // in REPL V4 it is `undefined` in CLI it can be `null`
+  parrent: Js.Nullable.t<t>,
+  filename: string,
+  loaded: bool,
+  children: array<t>,
+  paths: array<string>,
+}
+
+@val
+external module_: {"__cache": Js.Dict.t<t>} = "module"

test/atomic/Fs.test.res

@@ -1,35 +1,22 @@
 open Fs
 open Zora
 
-zora("Fs", t => {
-  t->test("readFile should read entire file", t => {
-    open_(Global.filename, Flag.read)
-    ->then(fh =>
-      FileHandle.readFile(fh)->then(buffer => FileHandle.close(fh)->then(_ => done(buffer)))
-    )
-    ->then(buffer => {
-      let needle = "Random string: Gh2e71pdHhPxU"
-      t->ok(buffer->Buffer.indexOfString(needle) > 1, "buffer index was not greater than zero")
-      done()
-    })
+zora("Fs", async t => {
+  t->test("readFile should read entire file", async t => {
+    let fh = await open_(Global.filename, Flag.read)
+    let buffer = await FileHandle.readFile(fh)
+    let _ = await FileHandle.close(fh)
+
+    let needle = "Random string: Gh2e71pdHhPxU"
+    t->ok(buffer->Buffer.indexOfString(needle) > 1, "buffer index was not greater than zero")
   })
 
-  t->test("readFileWith should read entire file as a string", t => {
-    open_(Global.filename, Flag.read)
-    ->then(fh =>
-      FileHandle.readFileWith(fh, readFileOptions(~encoding="UTF-8", ()))->then(buffer =>
-        FileHandle.close(fh)->then(_ => done(buffer))
-      )
-    )
-    ->then(content => {
-      let needle = "Random string: uCF6c5f3Arrq"
+  t->test("readFileWith should read entire file as a string", async t => {
+    let fh = await open_(Global.filename, Flag.read)
+    let buffer = await FileHandle.readFileWith(fh, readFileOptions(~encoding="UTF-8", ()))
+    let _ = await FileHandle.close(fh)
+    let needle = "Random string: uCF6c5f3Arrq"
 
-      t->ok(
-        Js.String.indexOf(needle, content) > 0,
-        "buffer string indexOf was not greater than zero",
-      )
-      done()
-    })
+    t->ok(Js.String.indexOf(needle, buffer) > 0, "buffer string indexOf was not greater than zero")
   })
-  done()
 })

test/atomic/Stream.test.res

@@ -1,6 +1,6 @@
 open Zora
 open StreamTestLib
-ti
+
 zoraBlock("Stream.Readable", t => {
   t->block("'Stream.Readable.make' should return a defined value", t => {
     let readable = makeReadableEmpty()
@@ -21,15 +21,15 @@ zoraBlock("Stream.Readable", t => {
   t->test("'Stream.Readable.destroyWithError' should emit 'error' event", t => {
     open! Errors
     let dummyError = Error.make("Expected error: Stream destroyed")->Error.toJsExn
-    Promise.make(
-      (resolve, _reject) => {
+    Js.Promise2.make(
+      (~resolve, ~reject as _) => {
         let stream = StreamTestLib.makeReadableEmpty()->Stream.onError(
           err => {
             t->equal(err, dummyError, "")
 
             // oh these bindings are wonderful aren't they
             let a = ()
-            resolve(. a)
+            resolve(a)
           },
         )
 
@@ -71,8 +71,8 @@ zoraBlock("Stream.Writable", t => {
         (),
       )
 
-      Promise.make(
-        (resolve, _reject) => {
+      Js.Promise2.make(
+        (~resolve, ~reject as _) => {
           let writeStream = Writable.makeObjMode(options)
 
           Writable.writeWith(
@@ -93,7 +93,7 @@ zoraBlock("Stream.Writable", t => {
 
               // oh these bindings are wonderful aren't they
               let a = ()
-              resolve(. a)
+              resolve(a)
             },
             (),
           )->ignore