Avoid Types module (#2)

Author: cknitt

src/AppContainer.re

@@ -1,6 +1,5 @@
-type persistNavigationState = Types.navigationState => Js.Promise.t(unit);
-type loadNavigationState =
-  unit => Js.Promise.t(option(Types.navigationState));
+type persistNavigationState = NavigationState.t => Js.Promise.t(unit);
+type loadNavigationState = unit => Js.Promise.t(option(NavigationState.t));
 
 type appContainerProps('screenProps) = {
   .
@@ -12,11 +11,11 @@ type appContainerProps('screenProps) = {
 
 module Make = (S: {
                  type screenProps;
-                 let navigator: Types.navigator;
+                 let navigator: Navigator.t;
                }) => {
   [@bs.module "react-navigation"]
   external make:
-    Types.navigator => React.component(appContainerProps(S.screenProps)) =
+    Navigator.t => React.component(appContainerProps(S.screenProps)) =
     "createAppContainer";
 
   [@bs.obj]

src/DrawerNavigator.re

@@ -53,8 +53,8 @@ external config:
   "";
 
 [@bs.module "react-navigation"]
-external make: Js.t('a) => Types.navigator = "createDrawerNavigator";
+external make: Js.t('a) => Navigator.t = "createDrawerNavigator";
 
 [@bs.module "react-navigation"]
-external makeWithConfig: (Js.t('a), config) => Types.navigator =
+external makeWithConfig: (Js.t('a), config) => Navigator.t =
   "createDrawerNavigator";

src/Navigation.re

@@ -5,7 +5,7 @@ external navigationContext: React.Context.t(t) = "NavigationContext";
 
 let useNavigation = () => React.useContext(navigationContext);
 
-[@bs.get] external state: t => Types.navigationState = "";
+[@bs.get] external state: t => NavigationState.t = "";
 
 [@bs.send] external navigate: (t, string) => unit = "";
 [@bs.send]

src/Types.bs.js renamed to src/NavigationState.bs.js

@@ -0,0 +1,10 @@
+type t = {
+  .
+  "index": int,
+  "routeName": string,
+  "routes": option(array(t)),
+  "isDrawerOpen": bool,
+};
+
+type persistNavigationState = t => Js.Promise.t(unit);
+type loadNavigationState = unit => Js.Promise.t(option(t));

src/NavigationState.re

@@ -0,0 +1 @@
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

src/Navigator.bs.js

@@ -0,0 +1,3 @@
+type props;
+
+type t = React.component(props);

src/Navigator.re

@@ -22,8 +22,8 @@ external config:
   "";
 
 [@bs.module "react-navigation"]
-external make: Js.t('a) => Types.navigator = "createStackNavigator";
+external make: Js.t('a) => Navigator.t = "createStackNavigator";
 
 [@bs.module "react-navigation"]
-external makeWithConfig: (Js.t('a), config) => Types.navigator =
+external makeWithConfig: (Js.t('a), config) => Navigator.t =
   "createStackNavigator";

src/StackNavigator.re

@@ -17,8 +17,8 @@ external config:
   "";
 
 [@bs.module "react-navigation"]
-external make: Js.t('a) => Types.navigator = "createSwitchNavigator";
+external make: Js.t('a) => Navigator.t = "createSwitchNavigator";
 
 [@bs.module "react-navigation"]
-external makeWithConfig: (Js.t('a), config) => Types.navigator =
+external makeWithConfig: (Js.t('a), config) => Navigator.t =
   "createSwitchNavigator";

src/SwitchNavigator.re

@@ -42,19 +42,18 @@ external config:
 
 module MaterialTop = {
   [@bs.module "react-navigation"]
-  external make: Js.t('a) => Types.navigator =
-    "createMaterialTopTabNavigator";
+  external make: Js.t('a) => Navigator.t = "createMaterialTopTabNavigator";
 
   [@bs.module "react-navigation"]
-  external makeWithConfig: (Js.t('a), config) => Types.navigator =
+  external makeWithConfig: (Js.t('a), config) => Navigator.t =
     "createMaterialTopTabNavigator";
 };
 
 module Bottom = {
   [@bs.module "react-navigation"]
-  external make: Js.t('a) => Types.navigator = "createBottomTabNavigator";
+  external make: Js.t('a) => Navigator.t = "createBottomTabNavigator";
 
   [@bs.module "react-navigation"]
-  external makeWithConfig: (Js.t('a), config) => Types.navigator =
+  external makeWithConfig: (Js.t('a), config) => Navigator.t =
     "createBottomTabNavigator";
 };