In order to support ReScript 11, I had to drop bs-json. The atdgen generated code was effectively built around it, rescript-json-combinators can't be made compatible.

But we weren't leveraging many of bs-json's features anyway; the vast majority of calls to bs-json were replaced with direct Js.Json API.

Author: TheSpyder

README.md

@@ -14,7 +14,7 @@ yarn add rescript-atdgen-codec-runtime
 This package doesn't take care of running `atdgen` to derive code from type definitions. For that, you need to [`rescript-atdgen-generator`](https://github.com/TheSpyder/rescript-atdgen-generator) to generate the `.ml` and `.mli` files from `.atd` sources.
 
 ## A note about ReScript 11
-The `atd` code-generation project is an OCaml tool, and generates OCaml files. As such it does not support uncurried mode. The ahrefs team is open to a contribution that generates ReScript instead, but so long as this project only has one user that doesn't seem worth the effort. For more information and to add your voice to the discussion please follow the github issue (TODO).
+The `atd` code-generation project is an OCaml tool, and generates OCaml files. As such it does not support uncurried mode. The ahrefs team is open to a contribution that generates ReScript instead, but unless this project becomes popular that doesn't seem worth the effort. For more information and to add your voice to the discussion please follow the github issue (TODO).
 
 ## Usage
 

__tests__/decode_test.res

@@ -4,7 +4,7 @@ let run_decode_test = (~name, ~read, ~data, ~expected) => {
   open Expect
   let decode = Atdgen_codec_runtime.Decode.decode(read)
   let data' = decode(data)
-  test(name, () => expect(data') |> toEqual(expected))
+  test(name, () => expect(data')->toEqual(expected))
 }
 
 @ocaml.doc("

__tests__/errors_test.res

@@ -6,91 +6,91 @@ let wrap_exn = exp =>
     let _ = exp()
     "not called"
   } catch {
-  | Json_decode.DecodeError(str) => str
+  | Atdgen_codec_runtime.Decode.DecodeError(str) => str
   }
 
 let () = describe("exceptions", () => {
   test("unit", () => {
-    let j = Json.parseOrRaise(`{}`)
-    expect(wrap_exn(() => Atdgen_codec_runtime.Decode.unit(j))) |> toBe("Expected null, got {}")
+    let j = Js.Json.parseExn(`{}`)
+    expect(wrap_exn(() => Atdgen_codec_runtime.Decode.unit(j)))->toBe("Expected null, was {}")
   })
 
   test("option_as_constr", () => {
-    let j = Json.parseOrRaise(`{}`)
+    let j = Js.Json.parseExn(`{}`)
     expect(
-      wrap_exn(() =>
-        {
-          open Atdgen_codec_runtime.Decode
-          option_as_constr(int)
-        }(j)
+      wrap_exn(
+        () =>
+          {
+            open Atdgen_codec_runtime.Decode
+            option_as_constr(int)
+          }(j),
       ),
-    ) |> toBe("All decoders given to oneOf failed. Here are all the errors: 
-- Expected string, got {}
-- Expected array, got {}
-And the JSON being decoded: {}")
+    )->toBe(`Both attempts to parse the value "{}" failed. Errors:
+1) Expected string, was {}
+2) Expected array, was {}`)
   })
 
   test("enum", () => {
-    let j = Json.parseOrRaise(`{}`)
+    let j = Js.Json.parseExn(`{}`)
     expect(
-      wrap_exn(() =>
-        {
-          open Atdgen_codec_runtime.Decode
-          enum(list{})
-        }(j)
+      wrap_exn(
+        () =>
+          {
+            open Atdgen_codec_runtime.Decode
+            enum(list{})
+          }(j),
       ),
-    ) |> toBe("All decoders given to oneOf failed. Here are all the errors: 
-- Expected string, got {}
-- Expected array, got {}
-And the JSON being decoded: {}")
+    )->toBe(`Both attempts to parse the value "{}" failed. Errors:
+1) Expected string, was {}
+2) Expected array, was {}`)
   })
 
   test("missing field in record", () => {
-    let j = Json.parseOrRaise(`{"o": 44}`)
-    expect(wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_ro, j))) |> toBe(
+    let j = Js.Json.parseExn(`{"o": 44}`)
+    expect(wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_ro, j)))->toBe(
       "Expected field 'c'",
     )
   })
 
   test("optional field with default: wrong type throws exception", () => {
-    let j = Json.parseOrRaise(`{"with_default": "not right"}`)
+    let j = Js.Json.parseExn(`{"with_default": "not right"}`)
     expect(
       wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_optional_field, j)),
-    ) |> toBe(`with_default: Expected number, got "not right"`)
+    )->toBe(`with_default: Expected int, was "not right"`)
   })
 
   test("optional field: wrong type throws exception", () => {
-    let j = Json.parseOrRaise(`{"no_default": "not right"}`)
+    let j = Js.Json.parseExn(`{"no_default": "not right"}`)
     expect(
       wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_optional_field, j)),
-    ) |> toBe(`no_default: Expected number, got "not right"`)
+    )->toBe(`no_default: Expected int, was "not right"`)
   })
 
   test("error in variant", () => {
-    let j = Json.parseOrRaise(`["A", "not right"]`)
+    let j = Js.Json.parseExn(`["A", "not right"]`)
     expect(
       wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_v, j)),
-    ) |> toBe(`A: Expected number, got "not right"`)
+    )->toBe(`A: Expected int, was "not right"`)
   })
 
   test("deeply nested error (array element fails)", () => {
-    let j = Json.parseOrRaise(`["A", [[1, "not right"], "Bool"]]`)
+    let j = Js.Json.parseExn(`["A", [[1, "not right"], "Bool"]]`)
     expect(
       wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_deeply_nested, j)),
-    ) |> toBe(`A.0.1: Expected number, got "not right"`)
+    )->toBe(`A.0.1: Expected int, was "not right"`)
   })
 
   test("deeply nested error (tuple element fails)", () => {
-    let j = Json.parseOrRaise(`["A", [[1, 2], "Boolean"]]`)
+    let j = Js.Json.parseExn(`["A", [[1, 2], "Boolean"]]`)
     expect(
       wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_deeply_nested, j)),
-    ) |> toBe(`A.1.Boolean: unknown constructor "Boolean"`)
+    )->toBe(`A.1.Boolean: unknown constructor "Boolean"`)
   })
 
   test("deeply nested error (rec_list element fails deep enough)", () => {
-    let j = Json.parseOrRaise(`["A", [[1, 2], ["List", ["Bool", "Fail"]]]]`)
+    let j = Js.Json.parseExn(`["A", [[1, 2], ["List", ["Bool", "Fail"]]]]`)
     expect(
       wrap_exn(() => Atdgen_codec_runtime.Decode.decode(Test_bs.read_deeply_nested, j)),
-    ) |> toBe(`A.1.List.1.Fail: unknown constructor "Fail"`)
+    )->toBe(`A.1.List.1.Fail: unknown constructor "Fail"`)
   })
 })

__tests__/roundtrip_test.res

@@ -8,7 +8,7 @@ let run_test = (~name, ~write, ~read, ~data) => {
   let decode = Atdgen_codec_runtime.Decode.decode(read)
   let json = encode(data)
   let data' = decode(json)
-  test(name, () => expect(data) |> toEqual(data'))
+  test(name, () => expect(data)->toEqual(data'))
 }
 
 let () = describe("roundtrip tests", () => {

bsconfig.json

@@ -1,11 +1,7 @@
 {
   "name": "rescript-atdgen-codec-runtime",
   "namespace": false,
-  "version": "2.0.1",
-  "bsc-flags": [
-    "-bs-no-version-header",
-    "-bs-super-errors"
-  ],
+  "version": "0.1.0",
   "sources": [
     {
       "dir": "src"
@@ -20,13 +16,11 @@
     "in-source": false
   },
   "suffix": ".bs.js",
-  "bs-dependencies": [
-    "@glennsl/bs-json"
-  ],
   "bs-dev-dependencies": [
-    "@glennsl/bs-jest"
+    "@glennsl/rescript-jest"
   ],
   "warnings": {
-    "error": "+101"
-  }
-}
+    "number": "A-4-40-41-42-43+101-102"
+  },
+  "uncurried": false
+}

package.json

@@ -23,11 +23,11 @@
     "generate-tests": "cd __tests__ && npx atdgen -t test.atd && npx atdgen -bs test.atd"
   },
   "devDependencies": {
-    "@glennsl/bs-jest": "^0.7.0",
-    "rescript": "^9.1.4",
+    "@glennsl/rescript-jest": "^0.10.0",
+    "rescript": "^11.0.1",
     "rescript-atdgen-generator": "^0.1.1"
   },
-  "dependencies": {
-    "@glennsl/bs-json": "^5.0.0"
-  }
+  "contributors": [
+    "Ahrefs <[email protected]>"
+  ]
 }