rescript-relay 0.0.0-cli-61b2cdf6 → 0.0.0-connection-id-maker-fix-b63bb519

package/compiler.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+"use strict";
+
+var spawn = require("child_process").spawn;
+var path = require("path");
+
+var input = process.argv.slice(2);
+
+spawn(path.join(__dirname, "rescript-relay-compiler.exe"), input, {
+  stdio: "inherit",
+}).on("exit", process.exit);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript-relay",
-  "version": "0.0.0-cli-61b2cdf6",
+  "version": "0.0.0-connection-id-maker-fix-b63bb519",
   "main": "src/RescriptRelay.res",
   "license": "MIT",
   "author": "Gabriel Nordeborn",
@@ -19,51 +19,51 @@
     "reasonml",
     "rescript"
   ],
+  "exports": {
+    "./src/utils": {
+      "require": "./src/utils.js",
+      "import": "./src/utils.mjs"
+    },
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
   "bin": {
-    "rescript-relay-compiler": "compiler/compiler-cli.js",
+    "rescript-relay-compiler": "compiler.js",
     "rescript-relay-cli": "cli/cli.js"
   },
   "scripts": {
     "build": "rescript build -with-deps",
-    "build:test": "compiler/compiler-cli.js",
+    "build:test": "./build-compiler-dev.sh && ./rescript-relay-compiler",
     "postinstall": "node postinstall.js",
     "test": "jest",
     "test:ci": "jest --ci --runInBand"
   },
   "devDependencies": {
+    "rescript": "^9.1.2",
     "@rescript/react": "0.10.3",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.4.0",
+    "@testing-library/jest-dom": "^5.16.3",
+    "@testing-library/react": "^13.0.0-alpha.6",
     "bs-fetch": "^0.5.0",
-    "graphql": "14.5.0",
     "graphql-query-test-mock": "^0.12.1",
-    "jest": "^24.9.0",
+    "jest": "^27.2.4",
     "nock": "^11.7.0",
     "node-fetch": "^2.6.0",
-    "react": "0.0.0-experimental-4e08fb10c",
-    "react-dom": "0.0.0-experimental-4e08fb10c",
-    "react-relay": "^11.0.0",
-    "reason-promise": "^1.0.2",
-    "relay-compiler": "^11.0.0",
-    "relay-config": "^11.0.0",
-    "relay-runtime": "^11.0.0"
+    "react": "18.0.0",
+    "react-dom": "18.0.0",
+    "react-relay": "14.1.0",
+    "relay-runtime": "14.1.0"
   },
   "peerDependencies": {
     "@rescript/react": "*",
-    "graphql": "*",
-    "react-relay": "*",
-    "rescript": "^9.1.2",
-    "reason-promise": "^1.0.2",
-    "relay-compiler": "*",
-    "relay-config": "*",
-    "relay-runtime": "*"
+    "react-relay": ">=11.0.0",
+    "relay-runtime": "*",
+    "rescript": "^9.1.2"
   },
   "dependencies": {
-    "mkdirp-sync": "^0.0.3",
-    "rescript": "^9.1.2"
+    "detect-libc": "^2.0.1"
   },
   "resolutions": {
-    "react": "0.0.0-experimental-4e08fb10c",
-    "react-dom": "0.0.0-experimental-4e08fb10c"
+    "react": "18.0.0",
+    "react-dom": "18.0.0"
   }
 }

package/postinstall.js

@@ -10,16 +10,32 @@
 var path = require("path");
 var cp = require("child_process");
 var fs = require("fs");
-var os = require("os");
+var { isNonGlibcLinux } = require("detect-libc");
 var platform = process.platform;
 
+function getRelayCompilerPlatformSuffix() {
+  if (process.platform === "win32") {
+    return "win-x64";
+  } else if (process.platform === "darwin" && process.arch === "x64") {
+    return "macos-x64";
+  } else if (process.platform === "darwin" && process.arch === "arm64") {
+    return "macos-arm64";
+  } else if (process.platform === "linux" && isNonGlibcLinux) {
+    return "linux-musl";
+  } else if (process.platform === "linux" && process.arch === "x64") {
+    return "linux-x64";
+  }
+
+  return "linux-x64";
+}
+
 /**
  * Since os.arch returns node binary's target arch, not
  * the system arch.
  * Credits: https://github.com/feross/arch/blob/af080ff61346315559451715c5393d8e86a6d33c/index.js#L10-L58
  */
 
-function arch() {
+function ppxArch() {
   /**
    * Use Rosetta for ARM on macOS
    */
@@ -80,44 +96,78 @@ function arch() {
 }
 
 function copyPlatformBinaries(platform) {
+  /**
+   * Copy the PPX
+   */
   fs.copyFileSync(
     path.join(__dirname, "ppx-" + platform),
     path.join(__dirname, "ppx")
   );
   fs.chmodSync(path.join(__dirname, "ppx"), 0777);
 
+  // Windows seems to need an .exe file as well.
+  if (platform === "windows-latest") {
+    fs.copyFileSync(
+      path.join(__dirname, "ppx-" + platform),
+      path.join(__dirname, "ppx.exe")
+    );
+    fs.chmodSync(path.join(__dirname, "ppx.exe"), 0777);
+  }
+
+  /**
+   * Copy the Relay compiler
+   */
+
+  var platformSuffix = getRelayCompilerPlatformSuffix();
+
   fs.copyFileSync(
-    path.join(__dirname, "bin-" + platform),
-    path.join(__dirname, "language-plugin", "RescriptRelayBin.exe")
-  );
-  fs.chmodSync(
-    path.join(__dirname, "language-plugin", "RescriptRelayBin.exe"),
-    0777
+    path.join(
+      __dirname,
+      "relay-compiler-" + platformSuffix,
+      platformSuffix === "win-x64" ? "relay.exe" : "relay"
+    ),
+    path.join(__dirname, "rescript-relay-compiler.exe")
   );
+  fs.chmodSync(path.join(__dirname, "rescript-relay-compiler.exe"), 0777);
 }
 
 function removeInitialBinaries() {
-  fs.unlinkSync(path.join(__dirname, "ppx-darwin"));
+  fs.unlinkSync(path.join(__dirname, "ppx-macos-latest"));
+  fs.unlinkSync(path.join(__dirname, "ppx-windows-latest"));
   fs.unlinkSync(path.join(__dirname, "ppx-linux"));
-  fs.unlinkSync(path.join(__dirname, "bin-darwin"));
-  fs.unlinkSync(path.join(__dirname, "bin-linux"));
+  fs.rmSync(path.join(__dirname, "relay-compiler-linux-x64"), {
+    recursive: true,
+    force: true,
+  });
+  fs.rmSync(path.join(__dirname, "relay-compiler-macos-x64"), {
+    recursive: true,
+    force: true,
+  });
+  fs.rmSync(path.join(__dirname, "relay-compiler-macos-arm64"), {
+    recursive: true,
+    force: true,
+  });
+  fs.rmSync(path.join(__dirname, "relay-compiler-linux-musl"), {
+    recursive: true,
+    force: true,
+  });
 }
 
 switch (platform) {
   case "win32": {
-    if (arch() !== "x64") {
+    if (ppxArch() !== "x64") {
       console.warn("error: x86 is currently not supported on Windows");
       process.exit(1);
     }
-
-    throw new Error("Windows currently not supported.");
-    copyPlatformBinaries("windows");
+    copyPlatformBinaries("windows-latest");
     break;
   }
   case "linux":
-  case "darwin":
     copyPlatformBinaries(platform);
     break;
+  case "darwin":
+    copyPlatformBinaries("macos-latest");
+    break;
   default:
     console.warn("error: no release built for the " + platform + " platform");
     process.exit(1);

package/src/ReactDOMExperimental.bs.js

@@ -1,2 +1,20 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+var Client = require("react-dom/client");
+
+function renderConcurrentRootAtElementWithId(content, id) {
+  var element = document.getElementById(id);
+  if (element == null) {
+    throw {
+          RE_EXN_ID: "Invalid_argument",
+          _1: "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " + id + " found in the HTML.",
+          Error: new Error()
+        };
+  }
+  Client.createRoot(element).render(content);
+  
+}
+
+exports.renderConcurrentRootAtElementWithId = renderConcurrentRootAtElementWithId;
+/* react-dom/client Not a pure module */

package/src/ReactDOMExperimental.res

@@ -1,7 +1,19 @@
 include ReactDOM.Experimental
 
-@module("react-dom")
-external unstable_createRoot: Dom.element => root = "unstable_createRoot"
+@module("react-dom/client")
+external createRoot: Dom.element => root = "createRoot"
 
-@module("react-dom")
-external unstable_createBlockingRoot: Dom.element => root = "unstable_createBlockingRoot"
+@val @return(nullable)
+external getElementById: string => option<Dom.element> = "document.getElementById"
+
+let renderConcurrentRootAtElementWithId: (React.element, string) => unit = (content, id) =>
+  switch getElementById(id) {
+  | None =>
+    raise(
+      Invalid_argument(
+        "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " ++
+        id ++ " found in the HTML.",
+      ),
+    )
+  | Some(element) => createRoot(element)->render(content)
+  }

package/src/ReactExperimental.bs.js

@@ -1,23 +1,21 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var ReactDom = require("react-dom");
+var React = require("react");
 
-var SuspenseList = {};
-
-function renderConcurrentRootAtElementWithId(content, id) {
-  var element = document.getElementById(id);
-  if (element == null) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " + id + " found in the HTML.",
-          Error: new Error()
-        };
-  }
-  ReactDom.unstable_createRoot(element).render(content);
-  
+function useTransition(param) {
+  var match = React.useTransition();
+  var startTransition = match[1];
+  return [
+          match[0],
+          React.useCallback((function (cb) {
+                  return startTransition(cb, undefined);
+                }), [startTransition])
+        ];
 }
 
+var SuspenseList = {};
+
+exports.useTransition = useTransition;
 exports.SuspenseList = SuspenseList;
-exports.renderConcurrentRootAtElementWithId = renderConcurrentRootAtElementWithId;
-/* react-dom Not a pure module */
+/* react Not a pure module */

package/src/ReactExperimental.res

@@ -1,32 +1,21 @@
-type callback<'input, 'output> = 'input => 'output
-
 @module("react")
-external unstable_useDeferredValue: 'value => 'value = "unstable_useDeferredValue"
+external useDeferredValue: 'value => 'value = "useDeferredValue"
 
 @module("react")
-external unstable_useTransition: unit => (callback<callback<unit, unit>, unit>, bool) =
-  "unstable_useTransition"
+external useTransitionWithOptions: unit => (
+  bool,
+  (. unit => unit, option<{"name": option<string>}>) => unit,
+) = "useTransition"
+
+let useTransition = () => {
+  let (isPending, startTransition) = useTransitionWithOptions()
+  (isPending, React.useCallback1(cb => startTransition(. cb, None), [startTransition]))
+}
 
 module SuspenseList = {
   @module("react") @react.component
   external make: (
     ~children: React.element,
     ~revealOrder: [#forwards | #backwards | #together]=?,
-  ) => React.element = "unstable_SuspenseList"
+  ) => React.element = "SuspenseList"
 }
-
-@val @return(nullable)
-external getElementById: string => option<Dom.element> = "document.getElementById"
-
-let renderConcurrentRootAtElementWithId: (React.element, string) => unit = (content, id) =>
-  switch getElementById(id) {
-  | None =>
-    raise(
-      Invalid_argument(
-        "ReactExperimental.renderConcurrentRootAtElementWithId : no element of id " ++
-        id ++ " found in the HTML.",
-      ),
-    )
-  | Some(element) =>
-    ReactDOMExperimental.unstable_createRoot(element)->ReactDOMExperimental.render(content)
-  }

package/src/ReactExperimental.resi

@@ -0,0 +1,18 @@
+@module("react")
+external useDeferredValue: 'value => 'value = "useDeferredValue"
+
+@module("react")
+external useTransitionWithOptions: unit => (
+  bool,
+  (. unit => unit, option<{"name": option<string>}>) => unit,
+) = "useTransition"
+
+let useTransition: unit => (bool, React.callback<unit => unit, unit>)
+
+module SuspenseList: {
+  @module("react") @react.component
+  external make: (
+    ~children: React.element,
+    ~revealOrder: [#forwards | #backwards | #together]=?,
+  ) => React.element = "SuspenseList"
+}

package/src/RescriptRelay.bs.js

@@ -4,13 +4,12 @@
 var Curry = require("rescript/lib/js/curry.js");
 var React = require("react");
 var Utils = require("./utils");
-var $$Promise = require("reason-promise/src/js/promise.bs.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
+var Belt_Option = require("rescript/lib/js/belt_Option.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var ReactRelay = require("react-relay");
 var RelayRuntime = require("relay-runtime");
 var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
-var Hooks = require("react-relay/hooks");
 
 function convertObj(prim0, prim1, prim2, prim3) {
   return Utils.traverser(prim0, prim1, prim2, prim3);
@@ -131,7 +130,11 @@ var Store = {
   make: make
 };
 
-function make$1(network, store, getDataID, treatMissingFieldsAsNull, missingFieldHandlers, param) {
+function toJs(f, arg) {
+  return Curry._3(f, arg.kind, arg.owner, arg.fieldPath);
+}
+
+function make$1(network, store, getDataID, treatMissingFieldsAsNull, missingFieldHandlers, requiredFieldLogger, isServer, param) {
   var tmp = {
     network: network,
     store: store,
@@ -143,6 +146,13 @@ function make$1(network, store, getDataID, treatMissingFieldsAsNull, missingFiel
   if (treatMissingFieldsAsNull !== undefined) {
     tmp.treatMissingFieldsAsNull = Caml_option.valFromOption(treatMissingFieldsAsNull);
   }
+  var tmp$1 = Belt_Option.map(requiredFieldLogger, toJs);
+  if (tmp$1 !== undefined) {
+    tmp.requiredFieldLogger = Caml_option.valFromOption(tmp$1);
+  }
+  if (isServer !== undefined) {
+    tmp.isServer = Caml_option.valFromOption(isServer);
+  }
   return new RelayRuntime.Environment(tmp);
 }
 
@@ -150,11 +160,10 @@ var Environment = {
   make: make$1
 };
 
-var provider = ReactRelay.ReactRelayContext.Provider;
-
 function RescriptRelay$Context$Provider(Props) {
   var environment = Props.environment;
   var children = Props.children;
+  var provider = ReactRelay.ReactRelayContext.Provider;
   return React.createElement(provider, {
               value: {
                 environment: environment
@@ -167,6 +176,10 @@ var Provider = {
   make: RescriptRelay$Context$Provider
 };
 
+var Context = {
+  Provider: Provider
+};
+
 var EnvironmentNotFoundInContext = /* @__PURE__ */Caml_exceptions.create("RescriptRelay.EnvironmentNotFoundInContext");
 
 function useEnvironmentFromContext(param) {
@@ -210,7 +223,7 @@ function mapFetchQueryFetchPolicy(x) {
 
 function MakeLoadQuery(C) {
   var load = function (environment, variables, fetchPolicy, fetchKey, networkCacheConfig, param) {
-    return Hooks.loadQuery(environment, C.query, Curry._1(C.convertVariables, variables), {
+    return ReactRelay.loadQuery(environment, C.query, Curry._1(C.convertVariables, variables), {
                 fetchKey: fetchKey,
                 fetchPolicy: mapFetchPolicy(fetchPolicy),
                 networkCacheConfig: networkCacheConfig
@@ -220,25 +233,25 @@ function MakeLoadQuery(C) {
     return Caml_option.nullable_to_opt(token.source);
   };
   var queryRefToPromise = function (token) {
-    var match = $$Promise.pending(undefined);
-    var resolve = match[1];
-    var o = queryRefToObservable(token);
-    if (o !== undefined) {
-      Caml_option.valFromOption(o).subscribe({
-            complete: (function (param) {
-                return Curry._1(resolve, {
-                            TAG: /* Ok */0,
-                            _0: undefined
-                          });
-              })
-          });
-    } else {
-      Curry._1(resolve, {
-            TAG: /* Error */1,
-            _0: undefined
-          });
-    }
-    return match[0];
+    return new Promise((function (resolve, param) {
+                  var o = queryRefToObservable(token);
+                  if (o !== undefined) {
+                    Caml_option.valFromOption(o).subscribe({
+                          complete: (function (param) {
+                              return resolve({
+                                          TAG: /* Ok */0,
+                                          _0: undefined
+                                        });
+                            })
+                        });
+                    return ;
+                  } else {
+                    return resolve({
+                                TAG: /* Error */1,
+                                _0: undefined
+                              });
+                  }
+                }));
   };
   return {
           load: load,
@@ -249,9 +262,7 @@ function MakeLoadQuery(C) {
 
 var Mutation_failed = /* @__PURE__ */Caml_exceptions.create("RescriptRelay.Mutation_failed");
 
-var Context = {
-  Provider: Provider
-};
+var RequiredFieldLogger = {};
 
 exports.convertObj = convertObj;
 exports.RecordProxy = RecordProxy;
@@ -264,6 +275,7 @@ exports.Network = Network;
 exports.RecordSource = RecordSource;
 exports.Store = Store;
 exports.Disposable = Disposable;
+exports.RequiredFieldLogger = RequiredFieldLogger;
 exports.Environment = Environment;
 exports.mapFetchPolicy = mapFetchPolicy;
 exports.mapFetchQueryFetchPolicy = mapFetchQueryFetchPolicy;