test attempt

packages/rescript-relay/__tests__/TestObjectScalar.res

@@ -0,0 +1,5 @@
+module Mutation = %relay(`
+  mutation TestObjectScalarMutation($input: SerializeMultipleCustomScalars!) {
+    serializeMultipleCustomScalars(input: $input)
+  }
+`)

packages/rescript-relay/__tests__/TestsUtils.res

@@ -40,3 +40,19 @@ module Number = {
     | Some(_) => []
     }
 }
+
+type s = {
+  a: string,
+  b?: string,
+  c?: string
+}
+module ObjectScalar1 = {
+  type t = s
+  let serialize = _ => JSON.Encode.string("serialized1")
+  let parse = _ => {a: "a"}
+}
+module ObjectScalar2 = {
+  type t = s
+  let serialize = _ => JSON.Encode.string("serialized2")
+  let parse = _ => {a: "a"}
+}

packages/rescript-relay/__tests__/schema.graphql

@@ -255,6 +255,9 @@ type Mutation {
   serializeCustomScalarArray(
     input: [IntString!]!
   ): SerializeCustomScalarArrayPayload
+  serializeMultipleCustomScalars(
+    input: SerializeMultipleCustomScalars!
+  ): Boolean
 }
 
 type Subscription {
@@ -274,3 +277,11 @@ input Location @oneOf {
   byLoc: ByLoc
   byId: ID
 }
+
+scalar ObjectScalar1
+scalar ObjectScalar2
+
+input SerializeMultipleCustomScalars {
+  os1s: [ObjectScalar1!]!
+  os2: ObjectScalar2
+}

packages/rescript-relay/__tests__/utils-tests.js

@@ -878,4 +878,37 @@ describe("conversion", () => {
       });
     });
   });
+
+  describe("multi scalar encoding", () => {
+    expect(
+      traverser(
+        {
+          os1s: [
+            {
+              a: "a",
+              b: "b",
+            }
+          ],
+          os2: {
+            a: "a",
+            c: "c",
+          }
+        },
+          {
+            __root: {
+              os2:{c:"TestsUtils.ObjectScalar2"},
+              os1s:{ca:"TestsUtils.ObjectScalar1"}
+            },
+          },
+        {
+          "TestsUtils.ObjectScalar1": _ => "serialized1",
+          "TestsUtils.ObjectScalar2": _ => "serialized2",
+        },
+        undefined
+      )
+    ).toEqual({
+      os1s: ["serialized1"],
+      os2: "serialized2",
+    });
+  });
 });

packages/rescript-relay/flake.nix

@@ -0,0 +1,30 @@
+{
+  description = "UI shell env";
+
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { flake-utils, self, nixpkgs, ... }: 
+  let
+    system = flake-utils.lib.system.x86_64-linux;
+    pkgs = nixpkgs.legacyPackages.${system};
+  in
+  {
+    devShells.${system}.default = (pkgs.buildFHSEnv {
+        name = "rescript-env";
+        targetPkgs = pkgs: [
+          pkgs.busybox
+          pkgs.yarn
+          pkgs.nodejs
+          pkgs.gnat
+          pkgs.gnumake
+          pkgs.watchman
+          pkgs.zsh
+          pkgs.opam
+        ];
+        runScript = "zsh";
+    }).env;
+  };
+}

packages/rescript-relay/package.json

@@ -33,23 +33,24 @@
   },
   "scripts": {
     "build": "rescript",
+    "relay-compile": "rescript-relay-compiler && ENABLE_PERSISTING=true rescript-relay-compiler && rm ./__tests_preloaded__/__generated__/RelaySchemaAssets_graphql.res",
     "build:test": "./build-compiler-dev.sh && ./rescript-relay-compiler && ENABLE_PERSISTING=true ./rescript-relay-compiler && rm ./__tests_preloaded__/__generated__/RelaySchemaAssets_graphql.res",
     "postinstall": "node postinstall.js",
     "test": "jest",
     "test:ci": "jest --ci --runInBand"
   },
   "devDependencies": {
+    "@babel/core": "^7.24.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/preset-env": "^7.24.0",
     "@glennsl/rescript-fetch": "^0.2.0",
     "@rescript/react": "0.14.0",
     "@testing-library/jest-dom": "^5.16.3",
     "@testing-library/react": "^13.0.0-alpha.6",
-    "graphql-query-test-mock": "^0.12.1",
-    "jest": "^27.2.4",
-    "@babel/core": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "babel-jest": "^27.2.4",
     "babel-plugin-dynamic-import-node": "^2.3.3",
+    "graphql-query-test-mock": "^0.12.1",
+    "jest": "^27.2.4",
     "nock": "^11.7.0",
     "node-fetch": "^2.6.0",
     "react": "18.2.0",
@@ -65,6 +66,7 @@
     "rescript": "^12.0.0-0"
   },
   "dependencies": {
-    "detect-libc": "^2.0.1"
+    "detect-libc": "^2.0.1",
+    "rescript-relay": "^4.0.0"
   }
 }

packages/rescript-relay/relay.config.js

@@ -10,6 +10,8 @@ module.exports = {
   customScalarTypes: {
     Datetime: "TestsUtils.Datetime",
     IntString: "TestsUtils.IntString",
+    ObjectScalar1: "TestsUtils.ObjectScalar1",
+    ObjectScalar2: "TestsUtils.ObjectScalar2",
     JSON: "JSON.t",
     Number: "TestsUtils.Number",
   },

packages/rescript-relay/rescript.json

@@ -26,10 +26,8 @@
     "module": "commonjs",
     "in-source": true
   },
-  "compiler-flags": [
-    "-ppx ../../rescript-relay-ppx/_build/default/bin/RescriptRelayPpxApp.exe"
-  ],
   "dependencies": ["@rescript/react"],
   "dev-dependencies": ["@glennsl/rescript-fetch"],
+  "ppx-flags": [["rescript-relay/ppx", "-uncurried"]],
   "suffix": ".bs.js"
 }

packages/rescript-relay/yarn.lock

@@ -3775,6 +3775,13 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+rescript-relay@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rescript-relay/-/rescript-relay-4.0.0.tgz#bce190a7917c705de2e0837a8daa558931828380"
+  integrity sha512-neNFCSK/+oGJ9EKDkpWNZZNYFENC2rptAjQHpU+QC0pDhlMo7eBWiPTEFwGt4S9xuGCSclx70QNKtETYGJQywQ==
+  dependencies:
+    detect-libc "^2.0.1"
+
 rescript@12.0.0-rc.3:
   version "12.0.0-rc.3"
   resolved "https://registry.yarnpkg.com/rescript/-/rescript-12.0.0-rc.3.tgz#69eff1a8ac02445169737d3c83d6a8e03def1bf5"