Add support for exporting uncurried function types.

Fixes #103.

Author: cristianoc

Changes.md

@@ -1,6 +1,7 @@
 # master
 - [Fix issue with access to the .bs.js file when exporting nested component](https://github.com/cristianoc/genType/issues/104).
 - Fix: [Emit enum conversion tables early, to avoid the case where they’re used before being defined](https://github.com/cristianoc/genType/issues/102).
+- Add support for exporting uncurried function types.
 
 # 1.5.0
 - Hygiene: avoid variable capture for generated variable names (function arguments, return value, array items).

examples/flow-react-example/src/Uncurried.bs.js

@@ -0,0 +1,18 @@
+/** 
+ * @flow strict
+ * @generated
+ * @nolint
+ */
+
+// $FlowExpectedError: Reason checked type sufficiently
+import * as UncurriedBS from './Uncurried.bs';
+
+export const uncurried0: () => string = UncurriedBS.uncurried0;
+
+export const uncurried1: (number) => string = UncurriedBS.uncurried1;
+
+export const uncurried2: (number, string) => string = UncurriedBS.uncurried2;
+
+export const uncurried3: (number, string, number) => string = UncurriedBS.uncurried3;
+
+export const curried3: (number, string, number) => string = UncurriedBS.curried3;

examples/flow-react-example/src/Uncurried.gen.js

@@ -0,0 +1,15 @@
+[@genType]
+let uncurried0 = (.) => "";
+
+[@genType]
+let uncurried1 = (. x) => x |> string_of_int;
+
+[@genType]
+let uncurried2 = (. x, y) => (x |> string_of_int) ++ y;
+
+[@genType]
+let uncurried3 =
+  (. x, y, z) => (x |> string_of_int) ++ y ++ (z |> string_of_int);
+
+[@genType]
+let curried3 = (x, y, z) => (x |> string_of_int) ++ y ++ (z |> string_of_int);

examples/flow-react-example/src/Uncurried.re

@@ -0,0 +1,14 @@
+/* TypeScript file generated by genType. */
+
+// tslint:disable-next-line:no-var-requires
+const UncurriedBS = require('./Uncurried.bs');
+
+export const uncurried0: () => string = UncurriedBS.uncurried0;
+
+export const uncurried1: (_1:number) => string = UncurriedBS.uncurried1;
+
+export const uncurried2: (_1:number, _2:string) => string = UncurriedBS.uncurried2;
+
+export const uncurried3: (_1:number, _2:string, _3:number) => string = UncurriedBS.uncurried3;
+
+export const curried3: (_1:number, _2:string, _3:number) => string = UncurriedBS.curried3;

examples/typescript-react-example/src/Uncurried.bs.js

@@ -0,0 +1,15 @@
+[@genType]
+let uncurried0 = (.) => "";
+
+[@genType]
+let uncurried1 = (. x) => x |> string_of_int;
+
+[@genType]
+let uncurried2 = (. x, y) => (x |> string_of_int) ++ y;
+
+[@genType]
+let uncurried3 =
+  (. x, y, z) => (x |> string_of_int) ++ y ++ (z |> string_of_int);
+
+[@genType]
+let curried3 = (x, y, z) => (x |> string_of_int) ++ y ++ (z |> string_of_int);

examples/typescript-react-example/src/Uncurried.gen.tsx

@@ -197,7 +197,33 @@ let translateConstr =
       ...paramTranslation,
       typ: Nullable(paramTranslation.typ),
     }
-
+  | (
+      Pdot(Pdot(Pident({name: "Js", _}), "Internal", _), "fn", _),
+      [{dependencies: argsDependencies, typ: Tuple(ts)}, ret],
+    ) => {
+      dependencies: argsDependencies @ ret.dependencies,
+      typ: Function({typeVars: [], argTypes: ts, retType: ret.typ}),
+    }
+  | (
+      Pdot(Pdot(Pident({name: "Js", _}), "Internal", _), "fn", _),
+      [
+        {
+          dependencies: argsDependencies,
+          typ: Enum({cases: [{label: "Arity_0", _}]}),
+        },
+        ret,
+      ],
+    ) => {
+      dependencies: argsDependencies @ ret.dependencies,
+      typ: Function({typeVars: [], argTypes: [], retType: ret.typ}),
+    }
+  | (
+      Pdot(Pdot(Pident({name: "Js", _}), "Internal", _), "fn", _),
+      [{dependencies: argsDependencies, typ: singleT}, ret],
+    ) => {
+      dependencies: argsDependencies @ ret.dependencies,
+      typ: Function({typeVars: [], argTypes: [singleT], retType: ret.typ}),
+    }
   | (Pdot(Pident({name: "Js", _}), "t", _), _) =>
     let dependencies =
       fieldsTranslations
@@ -493,6 +519,17 @@ and translateTypeExprFromTypes_ =
     | None => {dependencies: [], typ: mixedOrUnknown(~config)}
     };
 
+  /* Handle bucklescript's "Arity_" encoding in first argument of Js.Internal.fn(_,_) for uncurried functions.
+     Return the argument tuple. */
+  | Tvariant({row_fields: [(_, Rpresent(Some(t)))], _}) =>
+    t
+    |> translateTypeExprFromTypes_(
+         ~config,
+         ~typeVarsGen,
+         ~noFunctionReturnDependencies,
+         ~typeEnv,
+       )
+
   | Tfield(_)
   | Tnil
   | Tobject(_)