Adaptations for ReScript 10 / use records with optional fields & depr…

…ecated obj externals (#769)

Co-authored-by: Maxime Thirouin <git@moox.io>

package.json

@@ -5,7 +5,7 @@
   "peerDependencies": {
     "@rescript/react": ">=0.10.0",
     "react-native": ">=0.69.0",
-    "rescript": ">=9.1.4"
+    "rescript": ">=10.0.0"
   },
   "overrides": {
     "react": "17.0.2"

src/apis/ActionSheetIOS.res

@@ -1,5 +1,15 @@
-type options
-@obj
+type options = {
+  options: array<string>,
+  cancelButtonIndex?: int,
+  destructiveButtonIndex?: array<int>,
+  disabledButtonIndices?: int,
+  title?: string,
+  message?: string,
+  tintColor?: Color.t,
+  cancelButtonTintColor?: Color.t,
+}
+
+@obj @deprecated("Directly create record instead")
 external options: (
   ~options: array<string>,
   ~cancelButtonIndex: int=?,
@@ -15,8 +25,14 @@ external options: (
 @module("react-native") @scope("ActionSheetIOS")
 external showActionSheetWithOptions: (options, int => unit) => unit = "showActionSheetWithOptions"
 
-type shareOptions
-@obj
+type shareOptions = {
+  url?: string,
+  message?: string,
+  subject?: string,
+  excludedActivityTypes?: array<string>,
+}
+
+@obj @deprecated("Directly create record instead")
 external shareOptions: (
   ~url: string=?,
   ~message: string=?,

src/apis/Alert.res

@@ -1,13 +1,20 @@
-type options
+type options = {
+  cancelable?: bool,
+  onDismiss?: unit => unit,
+}
 
-@obj
+@obj @deprecated("Directly create record instead")
 external options: (~cancelable: bool=?, ~onDismiss: unit => unit=?, unit) => options = ""
 
-type button
-
 type style = [#default | #cancel | #destructive]
 
-@obj
+type button = {
+  text?: string,
+  onPress?: unit => unit,
+  style?: style,
+}
+
+@obj @deprecated("Directly create record instead")
 external button: (~text: string=?, ~onPress: unit => unit=?, ~style: style=?, unit) => button = ""
 
 @scope("Alert") @module("react-native")

src/apis/Animated.bs.js

@@ -116,7 +116,6 @@ var make$1 = ReactNative.Animated.createAnimatedComponent(ReactNative.Image);
 
 var $$Image = {
   Source: Image$ReactNative.Source,
-  DefaultSource: Image$ReactNative.DefaultSource,
   ImageLoadEvent: Image$ReactNative.ImageLoadEvent,
   $$ErrorEvent: Image$ReactNative.$$ErrorEvent,
   $$ProgressEvent: Image$ReactNative.$$ProgressEvent,

src/apis/Animated.res

@@ -23,9 +23,16 @@ type value<'a>
 
 module ValueAnimations = (Val: Value) => {
   module Decay = {
-    type config
-
-    @obj
+    type config = {
+      velocity: Val.rawValue,
+      useNativeDriver: bool,
+      deceleration?: float,
+      isInteraction?: bool,
+      onComplete?: Animation.endCallback,
+      iterations?: int,
+    }
+
+    @obj @deprecated("Directly create record instead")
     external config: (
       ~velocity: Val.rawValue,
       ~deceleration: float=?,
@@ -45,9 +52,27 @@ module ValueAnimations = (Val: Value) => {
     external fromRawValue: Val.rawValue => toValue = "%identity"
     external fromAnimatedValue: Val.t => toValue = "%identity"
 
-    type config
-
-    @obj
+    type config = {
+      toValue: toValue,
+      useNativeDriver: bool,
+      restDisplacementThreshold?: float,
+      overshootClamping?: bool,
+      restSpeedThreshold?: float,
+      velocity?: Val.rawValue,
+      bounciness?: float,
+      speed?: float,
+      tension?: float,
+      friction?: float,
+      stiffness?: float,
+      mass?: float,
+      damping?: float,
+      delay?: float,
+      isInteraction?: bool,
+      onComplete?: Animation.endCallback,
+      iterations?: int,
+    }
+
+    @obj @deprecated("Directly create record instead")
     external config: (
       ~toValue: toValue,
       ~restDisplacementThreshold: float=?,
@@ -79,9 +104,18 @@ module ValueAnimations = (Val: Value) => {
     external fromRawValue: Val.rawValue => toValue = "%identity"
     external fromAnimatedValue: Val.t => toValue = "%identity"
 
-    type config
-
-    @obj
+    type config = {
+      toValue: toValue,
+      useNativeDriver: bool,
+      easing?: Easing.t,
+      duration?: float,
+      delay?: float,
+      isInteraction?: bool,
+      onComplete?: Animation.endCallback,
+      iterations?: int,
+    }
+
+    @obj @deprecated("Directly create record instead")
     external config: (
       ~toValue: toValue,
       ~easing: Easing.t=?,
@@ -107,8 +141,16 @@ module Interpolation = {
 
   type extrapolate = [#extend | #clamp | #identity]
 
-  type config
-  @obj
+  type config = {
+    inputRange: array<float>,
+    outputRange: outputRange,
+    easing?: Easing.t,
+    extrapolate?: extrapolate,
+    extrapolateLeft?: extrapolate,
+    extrapolateRight?: extrapolate,
+  }
+
+  @obj @deprecated("Directly create record instead")
   external config: (
     ~inputRange: array<float>,
     ~outputRange: outputRange,

src/apis/DynamicColorIOS.res

@@ -1,11 +1,11 @@
 type t = {
   dark: Color.t,
   light: Color.t,
-  highContrastLight: option<Color.t>,
-  highContrastDark: option<Color.t>,
+  highContrastLight?: Color.t,
+  highContrastDark?: Color.t,
 }
 
-@obj
+@obj @deprecated("Directly create record instead")
 external dynamicColor: (
   ~dark: Color.t,
   ~light: Color.t,

src/apis/ImagePickerIOS.res

@@ -6,12 +6,17 @@ external canUseCamera: (bool => unit) => unit = "canUseCamera"
 @module("react-native") @scope("ImagePickerIOS")
 external canRecordVideos: (bool => unit) => unit = "canRecordVideos"
 
-type cameraDialogConfig
-@obj
+type cameraDialogConfig = {videoMode?: bool}
+
+@obj @deprecated("Directly create record instead")
 external cameraDialogConfig: (~videoMode: bool=?, unit) => cameraDialogConfig = ""
 
-type selectDialogConfig
-@obj
+type selectDialogConfig = {
+  showImages?: bool,
+  showVideos?: bool,
+}
+
+@obj @deprecated("Directly create record instead")
 external selectDialogConfig: (
   ~showImages: bool=?,
   ~showVideos: bool=?,

src/apis/LayoutAnimation.res

@@ -9,8 +9,16 @@ type animationType = [
 
 type property = [#opacity | #scaleX | #scaleY | #scaleXY]
 
-type animationConfig
-@obj
+type animationConfig = {
+  duration?: float,
+  delay?: float,
+  springDamping?: float,
+  initialVelocity?: float,
+  \"type"?: animationType,
+  property?: property,
+}
+
+@obj @deprecated("Directly create record instead")
 external animationConfig: (
   ~duration: float=?,
   ~delay: float=?,
@@ -21,8 +29,14 @@ external animationConfig: (
   unit,
 ) => animationConfig = ""
 
-type layoutAnimationConfig
-@obj
+type layoutAnimationConfig = {
+  duration: float,
+  create?: animationConfig,
+  update?: animationConfig,
+  delete?: animationConfig,
+}
+
+@obj @deprecated("Directly create record instead")
 external layoutAnimationConfig: (
   ~duration: float,
   ~create: animationConfig=?,

src/apis/Linking.bs.js

@@ -1 +1,7 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+
+var ExtraValue = {};
+
+exports.ExtraValue = ExtraValue;
+/* No side effect */

src/apis/Linking.res

@@ -1,5 +1,18 @@
-type extra
-@obj external extra: (~key: string, ~value: 'a) => extra = ""
+module ExtraValue = {
+  type t
+
+  external fromString: string => t = "%identity"
+  external fromInt: int => t = "%identity"
+  external fromFloat: float => t = "%identity"
+  external fromBool: bool => t = "%identity"
+}
+
+type extraValue = ExtraValue.t
+
+type extra = {key: string, value: extraValue}
+
+@obj @deprecated("Directly create record instead")
+external extra: (~key: string, ~value: extraValue) => extra = ""
 
 @scope("Linking") @module("react-native")
 external openURL: string => Js.Promise.t<unit> = "openURL"

src/apis/PanResponder.res

@@ -12,11 +12,26 @@ type gestureState = {
 }
 
 type t
-type config
 type panHandlers
 type callback<'a> = Event.pressEvent => 'a
 
-@obj
+type config = {
+  onMoveShouldSetPanResponder?: (Event.pressEvent, gestureState) => bool,
+  onMoveShouldSetPanResponderCapture?: (Event.pressEvent, gestureState) => bool,
+  onStartShouldSetPanResponder?: (Event.pressEvent, gestureState) => bool,
+  onStartShouldSetPanResponderCapture?: (Event.pressEvent, gestureState) => bool,
+  onPanResponderReject?: (Event.pressEvent, gestureState) => unit,
+  onPanResponderGrant?: (Event.pressEvent, gestureState) => unit,
+  onPanResponderStart?: (Event.pressEvent, gestureState) => unit,
+  onPanResponderEnd?: (Event.pressEvent, gestureState) => unit,
+  onPanResponderRelease?: (Event.pressEvent, gestureState) => unit,
+  onPanResponderMove?: (Event.pressEvent, gestureState) => unit,
+  onPanResponderTerminate?: (Event.pressEvent, gestureState) => unit,
+  onPanResponderTerminationRequest?: (Event.pressEvent, gestureState) => bool,
+  onShouldBlockNativeResponder?: (Event.pressEvent, gestureState) => bool,
+}
+
+@obj @deprecated("Directly create record instead")
 external config: (
   ~onMoveShouldSetPanResponder: (Event.pressEvent, gestureState) => bool=?,
   ~onMoveShouldSetPanResponderCapture: (Event.pressEvent, gestureState) => bool=?,

src/apis/PermissionsAndroid.res

@@ -96,8 +96,15 @@ module Result = {
   external neverAskAgain: t = "NEVER_ASK_AGAIN"
 }
 
-type rationale
-@obj
+type rationale = {
+  title: string,
+  message: string,
+  buttonPositive: string,
+  buttonNegative?: string,
+  buttonNeutral?: string,
+}
+
+@obj @deprecated("Directly create record instead")
 external rationale: (
   ~title: string,
   ~message: string,

src/apis/PermissionsAndroid.resi

@@ -96,8 +96,15 @@ module Result: {
   external neverAskAgain: t = "NEVER_ASK_AGAIN"
 }
 
-type rationale
-@obj
+type rationale = {
+  title: string,
+  message: string,
+  buttonPositive: string,
+  buttonNegative?: string,
+  buttonNeutral?: string,
+}
+
+@obj @deprecated("Directly create record instead")
 external rationale: (
   ~title: string,
   ~message: string,