rescript-relay 0.21.1 → 1.0.0-beta.2

package/src/experimental-router/RescriptRelayRouter.res

@@ -233,7 +233,7 @@ module RouteRenderer = {
     let (initialized, setInitialized) = React.useState(() => false)
     let router = use()
 
-    let (startTransition, isPending) = ReactExperimental.unstable_useTransition()
+    let (isPending, startTransition) = ReactExperimental.useTransition()
 
     let (routeEntry, setRouteEntry) = React.useState(() => router.get())
 
@@ -306,10 +306,12 @@ module Link = {
     ~className=?,
     ~classNameDynamic=?,
     ~target as browserTarget=?,
+    ~tabIndex=?,
     ~mode=?,
     ~render=?,
     ~preloadOnHover=?,
     ~children,
+    ~onClick=?,
     (),
   ) => {
     let router = use()
@@ -350,12 +352,19 @@ module Link = {
         }}
         ?title
         ?id
+        ?tabIndex
         className={className->Belt.Option.getWithDefault("") ++
           switch classNameDynamic {
           | Some(f) => " " ++ f(url, to_->Url.make)
           | None => ""
           }}
-        onClick=changeRoute
+        onClick={e => {
+          changeRoute(e)
+          switch onClick {
+          | None => ()
+          | Some(onClick) => onClick()
+          }
+        }}
         onMouseDown={_ => preload()}
         onTouchStart={_ => preload()}
         onMouseEnter={_ =>

package/src/experimental-router/RescriptRelayRouter.resi

@@ -56,6 +56,7 @@ module Link: {
     ~className: string=?,
     ~classNameDynamic: (RescriptReactRouter.url, RescriptReactRouter.url) => string=?,
     ~target: [#self | #blank]=?,
+    ~tabIndex: int=?,
     ~mode: [#push | #replace]=?,
     ~render: (
       ~preload: unit => unit,
@@ -65,6 +66,7 @@ module Link: {
     ) => React.element=?,
     ~preloadOnHover: bool=?,
     ~children: React.element,
+    ~onClick: unit => unit=?,
     unit,
   ) => React.element
 }

package/src/utils.js

@@ -108,10 +108,7 @@ function traverse(
             ) {
               isUnion = true;
 
-              var newPath = makeNewPath(currentPath, [
-                key,
-                v.__typename.toLowerCase(),
-              ]);
+              var newPath = makeNewPath(currentPath, [key, v.__typename]);
 
               var unionRootHasFragment =
                 (instructionMap[getPathName(newPath)] || {}).f === "";
@@ -186,10 +183,7 @@ function traverse(
           ) {
             isUnion = true;
 
-            var newPath = makeNewPath(currentPath, [
-              key,
-              v.__typename.toLowerCase(),
-            ]);
+            var newPath = makeNewPath(currentPath, [key, v.__typename]);
 
             var unionRootHasFragment =
               (instructionMap[getPathName(newPath)] || {}).f === "";
@@ -276,7 +270,7 @@ function traverse(
  */
 function traverser(
   root,
-  _instructionMaps,
+  instructionMaps_,
   theConverters,
   nullableValue,
   rootObjectKey
@@ -285,7 +279,7 @@ function traverser(
     return nullableValue;
   }
 
-  var instructionMaps = _instructionMaps || {};
+  var instructionMaps = instructionMaps_ || {};
   var instructionMap = instructionMaps[rootObjectKey || "__root"];
 
   // No instructions
@@ -311,9 +305,19 @@ function traverser(
         return nullableValue;
       }
 
+      var n = [];
+
+      // Since a root level union is treated as a "new root level", we'll need
+      // to do a separate check here of whether there's a fragment on the root
+      // we need to account for, or not.
+      if (unionRootConverter != null) {
+        n = [v.__typename];
+        fragmentsOnRoot = (instructionMap[v.__typename] || {}).f === "";
+      }
+
       var traversedObj = traverse(
         instructionMaps,
-        [],
+        n,
         v,
         instructionMap,
         converters,
@@ -330,9 +334,18 @@ function traverser(
 
   var newObj = Object.assign({}, root);
 
+  var n = [];
+
+  // Same as in the union array check above - if there's a fragment in the new
+  // root created by the union, we need to account for that separately here.
+  if (unionRootConverter != null) {
+    n = [newObj.__typename];
+    fragmentsOnRoot = (instructionMap[newObj.__typename] || {}).f === "";
+  }
+
   var v = traverse(
     instructionMaps,
-    [],
+    n,
     newObj,
     instructionMap,
     converters,

package/compiler/compiler-cli.js

@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-const path = require("path");
-const { spawn } = require("child_process");
-
-let relayConfig = require("relay-config").loadConfig();
-
-if (!relayConfig) {
-  console.error(
-    "Could not find relay.config.js. You must configure Relay through relay.config.js for RescriptRelay to work."
-  );
-
-  process.exit(1);
-}
-
-if (!relayConfig.artifactDirectory) {
-  console.error(
-    "RescriptRelay requires you to define 'artifactDirectory' (for outputing generated files in a single directory) in your relay.config.js. Please define it and re-run this command."
-  );
-  process.exit(1);
-}
-
-function runRelayCompiler(args) {
-  const proc = spawn("relay-compiler", args, {
-    stdio: "inherit",
-  })
-    // Propagate the relay compiler's exit code.
-    .on("close", process.exit.bind(process));
-
-  process.on("SIGINT", () => {
-    proc.kill("SIGINT");
-  });
-}
-
-function findArg(name) {
-  return relayConfig[name];
-}
-
-async function runCompiler() {
-  const schemaPath = findArg("schema");
-
-  if (schemaPath) {
-    runRelayCompiler(
-      [
-        "--language",
-        path.resolve(__dirname + "/../language-plugin/dist/index.js"),
-        process.argv.find((a) => a === "--watch"),
-      ].filter(Boolean)
-    );
-  } else {
-    runRelayCompiler(["--help"]);
-  }
-}
-
-runCompiler();

package/language-plugin/dist/index.js

@@ -1 +0,0 @@
-module.exports=(()=>{"use strict";var e={338:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.find=void 0,t.find=function(e,t){return function(e,t){if(!e.includes("%relay"))return[];const n=e.match(/(?<=\[%relay)([\s\S]*?)(?=];)/g);if(n)return n.map((e=>({template:e.replace(/({\||\|})/g,""),keyName:null,sourceLocationOffset:{line:1,column:1}})));const r=e.match(/(?<=\%relay\([\s]*`)[\s\S.]+?(?=`[\s]*\))/g);return r?r.map((e=>({template:e,keyName:null,sourceLocationOffset:{line:1,column:1}}))):[]}(e)}},189:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.generateFromFlowTypes=void 0;const r=n(129),o=n(622);t.generateFromFlowTypes=e=>{var t;const n=r.spawnSync(o.resolve(o.join(__dirname,"../RescriptRelayBin.exe")),["generate-from-flow"],{cwd:__dirname,stdio:"pipe",encoding:"utf-8",input:JSON.stringify(e)});if(0!==n.status)throw null!==(t=n.error)&&void 0!==t?t:new Error("Error generating types");return n.output.filter(Boolean).join("")}},571:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.transforms=t.generate=void 0;const r=n(791),o=n(224),a=n(148),i=n(354),s=n(189),l=n(602);function c(e){const t=Object.assign({Int:"int",Float:"float"},e);return Object.keys(t).forEach((e=>{t[e]=l.maskDots(t[e])})),t}t.generate=function(e,t,n){var a;let i=r.generate(e,t,Object.assign(Object.assign({},n),{customScalars:c(n.customScalars)}));const l=o.makeOperationDescriptor(t),d=o.extractOperationInfo(t);return s.generateFromFlowTypes({content:i,operation_type:["Query","Mutation","Subscription"].includes(l.tag)?{operation:l.tag,operation_value:l.value}:{operation:"Fragment",fragment_value:l.value},print_config:{variables_holding_connection_ids:null!==(a=d.variablesHoldingConnectionIds)&&void 0!==a?a:null,connection:d.connection?{at_object_path:d.connection.atObjectPath,field_name:d.connection.fieldName,key:d.connection.key}:null}})},t.transforms=[i.transform,a.transform,...r.transforms]},942:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0});const r=n(366),o=n(622);e.exports=({moduleName:e,documentType:t,concreteText:n,typeText:a,definition:i})=>{let s=null;"Source"===i.loc.kind&&(s=o.basename(i.loc.source.name));const l="ConcreteRequest"===t&&e.toLowerCase().endsWith("query_graphql")?"include RescriptRelay.MakeLoadQuery({\n    type variables = Types.variables\n    type loadedQueryRef = queryRef\n    type response = Types.response\n    type node = relayOperationNode\n    let query = node\n    let convertVariables = Internal.convertVariables\n  });":"",{processedText:c,referencedNodes:d}=r.processConcreteText(n),u=`%raw(json\` ${c} \`)`;return[s?`/* @sourceLoc ${s} */`:null,a||"",...d.length>0?[`%%private(let makeNode = (${d.map((({identifier:e})=>e)).join(", ")}): operationType => {`,...d.map((({identifier:e})=>`  ignore(${e})`)),`  ${u}`,"})",`let node: operationType = makeNode(${d.map((({moduleName:e})=>`${e}_graphql.node`)).join(", ")})`]:[`let node: operationType = ${u}`],"",l,""].filter((e=>null!=e)).join("\n")}},602:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.unmaskDots=t.maskDots=void 0,t.maskDots=e=>e.split(".").join("__oo__"),t.unmaskDots=e=>e.split("__oo__").join(".")},607:(e,t,n)=>{const r=n(571),o=n(942),{find:a}=n(338),i=n(622),s=n(747);function l(e){return t=>{const n=i.join(e,t.relPath);let r="";try{r=s.readFileSync(n,"utf8")}catch(e){return console.warn(`RelaySourceModuleParser: Unable to read the file "${n}". Looks like it was removed.`),!1}return r.indexOf("%relay")>=0}}e.exports=()=>({inputExtensions:["re","res"],outputExtension:"res",schemaExtensions:[],typeGenerator:r,formatModule:o,findGraphQLTags:a,isGeneratedFile:e=>e.endsWith("_graphql.res")||e.endsWith(".js")||e.endsWith(".mjs"),keepExtraFile:e=>e.endsWith(".js")||e.endsWith(".mjs"),getFileFilter:l,getModuleName:e=>`${e}_graphql`})},224:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.makeOperationDescriptor=t.extractOperationInfo=void 0;const r=n(195);function o(e,t,n){if("Root"===e.kind&&["mutation","subscription"].includes(e.operation)){const e=t.directives.filter((e=>["appendNode","prependNode","appendEdge","prependEdge","deleteEdge"].includes(e.name)));e.length>0&&e.forEach((e=>{const t=e.args.find((e=>"connections"===e.name)),r=null==t?void 0:t.value;r&&"Variable"===r.kind&&(n.variablesHoldingConnectionIds?n.variablesHoldingConnectionIds.push(r.variableName):n.variablesHoldingConnectionIds=[r.variableName])}))}}t.extractOperationInfo=function(e){let t={};const n="Fragment"===e.kind?"fragment":"response";return n?(function e(n,a){r.IRVisitor.visit(a,{ScalarField(e){o(a,e,t)},LinkedField(e){const r=e.directives.find((e=>"connection"===e.name));if(r&&!t.connection){let o=null;r.args.forEach((e=>{"key"===e.name&&"Literal"===e.value.kind&&(o=e.value.value)})),o&&(t=Object.assign(Object.assign({},t),{connection:{key:o,atObjectPath:[...n],fieldName:e.alias}}))}o(a,e,t),n.push(e.alias)},InlineFragment(t){t.typeCondition.name&&t.selections.forEach((r=>{e([...n,t.typeCondition.name.toLowerCase()],r)}))}})}([n],e),t):t},t.makeOperationDescriptor=function(e){if("Root"===e.kind)switch(e.operation){case"mutation":return{tag:"Mutation",value:e.name};case"query":return{tag:"Query",value:e.name};case"subscription":return{tag:"Subscription",value:e.name}}else if("Fragment"==e.kind)return{tag:"Fragment",value:[e.name,Boolean(e.metadata&&e.metadata.plural)]};throw new Error("Could not map root node. This should not happen.")}},148:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.transform=void 0;const r=n(724),{createUserError:o}=n(182),a=["and","as","asr","assert","begin","class","constraint","do","while","for","done","while","for","downto","else","end","exception","external","false","for","fun","function","functor","if","in","include","inherit","initializer","land","lazy","let","lor","lsl","lsr","lxor","match","method","mod","module","open","mutable","new","nonrec","object","of","open","open!","or","private","rec","let","module","sig","struct","then","to","true","try","type","val","virtual","val","method","class","when","while","with","switch"];let i=["fragment","t_fragment","subscription","mutation","response","variables","refetchVariables","t","fragmentRef","fragmentRefs","fragmentRefSelector","operationType"];function s(e){if(e.alias){let{disallowed:t,message:n}=function(e){let t=e[0];return/[A-Z]/.test(t)?{disallowed:!0,message:`Field names may not start with an uppercase letter. Please alias the '${e}' field to something starting with a lowercase letter.`}:a.includes(e)?{disallowed:!0,message:`'${e}' is a reserved keyword in ReasonML and therefore cannot be used as a field name. Please alias your field to something else.`}:i.includes(e)?{disallowed:!0,message:`'${e}' is a reserved keyword in RescriptRelay and therefore cannot be used as a field name. Please alias your field to something else.`}:{disallowed:!1,message:""}}(e.alias);if(t)throw o("Found an invalid field name: "+n,[e.loc])}e.selections&&e.selections.forEach(s)}function l(e){return s(e),e}t.transform=function(e){return r.transform(e,{ScalarField:l,LinkedField:l})}},354:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.transform=void 0;const r=n(724),{createUserError:o}=n(182),{hasUnaliasedSelection:a}=n(124);function i(e){const t=this.getContext().getSchema();let n=this.traverse(e);if(t.isAbstractType(t.getRawType(n.type))&&!a(n,"__typename"))throw o('Unions and interfaces must have the field __typename explicitly selected. Please add __typename to the fields selected by "'+e.alias+'" in your operation.',[e.loc]);return n}t.transform=function(e){return r.transform(e,{LinkedField:i})}},366:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.processConcreteText=void 0,t.processConcreteText=function(e){let t=/(require\('.\/)([A-Za-z_.0-9/]+)(.graphql.\w*'\))/gm,n=e;const r=[];let o;for(;null!==(o=t.exec(e));){let[e,t,a]=o;const i=`node_${a}`;r.push({moduleName:a,identifier:i}),n=n.replace(e,`node_${a}`)}return{processedText:n,referencedNodes:r}}},129:e=>{e.exports=require("child_process")},747:e=>{e.exports=require("fs")},622:e=>{e.exports=require("path")},195:e=>{e.exports=require("relay-compiler")},182:e=>{e.exports=require("relay-compiler/lib/core/CompilerError")},724:e=>{e.exports=require("relay-compiler/lib/core/IRTransformer")},791:e=>{e.exports=require("relay-compiler/lib/language/javascript/RelayFlowGenerator")},124:e=>{e.exports=require("relay-compiler/lib/transforms/TransformUtils")}},t={};return function n(r){if(t[r])return t[r].exports;var o=t[r]={exports:{}};return e[r](o,o.exports,n),o.exports}(607)})();