@colisweb/rescript-toolkit 2.48.2 → 2.50.1

package/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 include:
-  - "https://colisweb-idl.gitlab.io/colisweb-open-source/ci-common/v13.18.1/templates/colisweb.yml"
+  - "https://colisweb-idl.gitlab.io/colisweb-open-source/ci-common/v14.3.2/templates/colisweb.yml"
 
 # -----------------------------------------------
 # Test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.48.2",
+  "version": "2.50.1",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build -with-deps",
@@ -74,7 +74,7 @@
     "reason-promise": "1.1.5",
     "res-react-intl": "3.1.2",
     "reschema": "1.3.1",
-    "rescript": "9.1.4",
+    "rescript": "10.0.0",
     "rescript-classnames": "6.0.0",
     "rescript-react-update": "5.0.0",
     "sanitize-html": "1.27.4",

package/src/decoders/Toolkit__Decoders.res

@@ -415,3 +415,26 @@ module SortOrder = Enum({
   @deriving(jsConverter)
   type enum = [#asc | #desc]
 })
+
+module Coordinates = {
+  @decco
+  type t = {
+    latitude: float,
+    longitude: float,
+  }
+  let make = (~lat: float, ~lng: float): t => {latitude: lat, longitude: lng}
+  let areEquals = (a: t, b: t): bool => a.latitude === b.latitude && a.longitude === b.longitude
+  let fromJs = value => {
+    latitude: (value->Obj.magic)["lat"](),
+    longitude: (value->Obj.magic)["lng"](),
+  }
+  type gmaps = {
+    lat: float,
+    lng: float,
+  }
+  let toGmaps = (t: t): gmaps => {lat: t.latitude, lng: t.longitude}
+  let fromGmaps = (gmaps: gmaps) => {
+    latitude: gmaps.lat,
+    longitude: gmaps.lng,
+  }
+}

package/src/form/Reform.res

@@ -131,12 +131,12 @@ module Make = (Config: Config) => {
   }
 
   module Provider = {
-    let makeProps = (~value, ~children, ()) =>
-      {
-        "value": Some(value),
-        "children": children,
-      }
-    let make = React.Context.provider(formContext)
+    let provider = React.Context.provider(formContext)
+
+    @react.component
+    let make = (~value: api, ~children) => {
+      React.createElement(provider, {"value": Some(value), "children": children})
+    }
   }
 
   module Field = {
@@ -203,7 +203,7 @@ module Make = (Config: Config) => {
               None
             },
           )
-        | SetFieldsState(fieldsState) => Update({...state, fieldsState: fieldsState})
+        | SetFieldsState(fieldsState) => Update({...state, fieldsState})
         | ValidateField(field) =>
           SideEffects(
             self => {
@@ -320,7 +320,7 @@ module Make = (Config: Config) => {
             values: initialState,
             formState: Pristine,
           })
-        | SetValues(values) => Update({...state, values: values})
+        | SetValues(values) => Update({...state, values})
         | SetFieldValue(field, value) =>
           Update({...state, values: Config.set(state.values, field, value)})
         | RaiseSubmitFailed(err) => Update({...state, formState: SubmitFailed(err)})
@@ -405,14 +405,14 @@ module Make = (Config: Config) => {
     let raiseSubmitFailed = error => send(RaiseSubmitFailed(error))
 
     let interface: api = {
-      state: state,
+      state,
       submit: () => send(TrySubmit),
       resetForm: () => send(ResetForm),
       setValues: values => send(SetValues(values)),
       setFieldValue: (field, value, ~shouldValidate=true, ()) =>
         shouldValidate ? send(FieldChangeValue(field, value)) : send(SetFieldValue(field, value)),
-      getFieldState: getFieldState,
-      getFieldError: getFieldError,
+      getFieldState,
+      getFieldError,
       handleChange: (field, value) => send(FieldChangeValue(field, value)),
       arrayPush: (field, value) => send(FieldArrayAdd(field, value)),
       arrayUpdateByIndex: (~field, ~index, value) =>
@@ -421,8 +421,8 @@ module Make = (Config: Config) => {
       arrayRemoveByIndex: (field, index) => send(FieldArrayRemove(field, index)),
       validateField: field => send(ValidateField(field)),
       validateForm: () => send(ValidateForm(false)),
-      validateFields: validateFields,
-      raiseSubmitFailed: raiseSubmitFailed,
+      validateFields,
+      raiseSubmitFailed,
       isSubmitting: state.formState == Submitting,
       isErrored: state.formState == Errored,
       isDirty: state.formState == Dirty,

package/src/ui/Toolkit__Ui_RichText.res

@@ -1,6 +1,6 @@
 let transformUrl = text =>
-  text |> Js.String.unsafeReplaceBy0(%re("/(https?:\\/\\/[^\\s]+)/g"), (url, _, _) =>
-    j`<a target='_blank' class='text-info-500 underline' href="$url">$url</a>`
+  text->Js.String2.unsafeReplaceBy0(%re("/(https?:\/\/[^\s]+)/g"), (url, _, _) =>
+    `<a target='_blank' class='text-info-500 underline' href="${url}">${url}</a>`
   )
 
 @module("sanitize-html")

package/src/vendors/BsReactGoogleMaps.res

@@ -0,0 +1,180 @@
+// See https://react-google-maps-api-docs.netlify.com/
+type gmapInstance
+
+module LatLngBounds = {
+  type t
+  type paddingClass = {
+    left: int,
+    right: int,
+    top: int,
+    bottom: int,
+  }
+
+  @new external makeBounds: unit => t = "google.maps.LatLngBounds"
+
+  @send external extend: (t, Toolkit__Decoders.Coordinates.gmaps) => unit = "extend"
+
+  @send
+  external fitBounds: (gmapInstance, t, paddingClass) => unit = "fitBounds"
+}
+
+module LoadScript = {
+  type t
+
+  @obj
+  external options: (~googleMapsApiKey: string, ~libraries: array<string>=?) => t = ""
+
+  let commonOptions = options(~libraries=["places"])
+
+  type useLoadScriptReturn = {
+    isLoaded: bool,
+    loadError: bool,
+  }
+
+  @module("@react-google-maps/api")
+  external useLoadScript: t => useLoadScriptReturn = "useLoadScript"
+}
+
+module GoogleMap = {
+  type options
+  @obj
+  external makeOptions: (
+    ~backgroundColor: string=?,
+    ~disableDefaultUI: bool=?,
+    ~keyboardShortcuts: bool=?,
+    ~mapTypeControl: bool=?,
+    unit,
+  ) => options = ""
+
+  @module("@react-google-maps/api") @react.component
+  external make: (
+    ~id: string=?,
+    ~center: Toolkit__Decoders.Coordinates.gmaps=?,
+    ~zoom: int=?,
+    ~mapContainerClassName: string=?,
+    ~mapContainerStyle: ReactDOMStyle.t=?,
+    ~clickableIcons: bool=?,
+    ~options: options=?,
+    ~onLoad: gmapInstance => unit=?,
+    ~onTilesLoaded: unit => unit=?,
+    ~children: React.element=?,
+  ) => React.element = "GoogleMap"
+}
+
+module Marker = {
+  @module("@react-google-maps/api") @react.component
+  external make: (
+    ~position: Toolkit__Decoders.Coordinates.gmaps=?,
+    ~clickable: bool=?,
+    ~draggable: bool=?,
+    ~icon: string=?,
+    ~label: string=?,
+    ~options: string=?,
+    ~children: React.element=?,
+  ) => React.element = "Marker"
+}
+
+module InfoWindow = {
+  type options
+  @obj external options: (~pixelOffset: int=?) => options = ""
+
+  @module("@react-google-maps/api") @react.component
+  external make: (
+    ~position: Toolkit__Decoders.Coordinates.gmaps=?,
+    ~children: React.element=?,
+    ~options: options=?,
+  ) => React.element = "InfoWindow"
+}
+
+module Waypoint = {
+  type t = {
+    location: Toolkit__Decoders.Coordinates.gmaps,
+    stopover: bool,
+  }
+  let make = (~lat: float, ~lng: float, ~stopover=true, ()): t => {
+    location: Toolkit__Decoders.Coordinates.make(~lat, ~lng)->Toolkit__Decoders.Coordinates.toGmaps,
+    stopover,
+  }
+  let areEquals = (a: t, b: t): bool =>
+    a.location.lat === b.location.lat && a.location.lng === b.location.lng
+}
+
+module DirectionsService = {
+  module Options = {
+    type t
+
+    type travelMode = [#DRIVING | #BICYCLING | #TRANSIT | #WALKING]
+
+    @obj
+    external make: (
+      ~destination: Toolkit__Decoders.Coordinates.gmaps,
+      ~origin: Toolkit__Decoders.Coordinates.gmaps,
+      ~travelMode: travelMode,
+      ~waypoints: array<Waypoint.t>=?,
+      unit,
+    ) => t = ""
+  }
+
+  module Response = {
+    type t
+
+    @get external status: t => string = "status"
+
+    @get @scope(("request", "origin"))
+    external _origin: t => 'dest = "location"
+    let origin = (r: t): Toolkit__Decoders.Coordinates.gmaps => {
+      lat: (r->_origin)["lat"](),
+      lng: (r->_origin)["lng"](),
+    }
+
+    @get @scope(("request", "destination"))
+    external _destination: t => 'dest = "location"
+    let destination = (r: t): Toolkit__Decoders.Coordinates.gmaps => {
+      lat: (r->_destination)["lat"](),
+      lng: (r->_destination)["lng"](),
+    }
+
+    type rec routes = array<route>
+    and route = {legs: array<leg>}
+    and leg = {distance: distance}
+    and distance = {value: float}
+    @get external _routes: t => routes = "routes"
+    let route0totalDistance = (r: t) =>
+      r
+      ->_routes
+      ->Array.get(0)
+      ->Option.flatMap(route =>
+        route.legs
+        ->Array.reduce(None, (red, leg) =>
+          red->Option.mapWithDefault(
+            Some(leg.distance.value),
+            red => Some(red +. leg.distance.value),
+          )
+        )
+        ->Option.map(totalDist => #m(totalDist))
+      )
+  }
+
+  @module("@react-google-maps/api") @react.component
+  external make: (
+    ~options: Options.t=?,
+    ~callback: Js.Nullable.t<Response.t> => unit,
+  ) => React.element = "DirectionsService"
+}
+
+module DirectionsRenderer = {
+  module Options = {
+    type t
+
+    @obj
+    external make: (
+      ~directions: DirectionsService.Response.t,
+      ~suppressMarkers: bool=?,
+      ~preserveViewport: bool=?,
+      unit,
+    ) => t = ""
+  }
+
+  @module("@react-google-maps/api") @react.component
+  external make: (~options: Options.t) => React.element = "DirectionsRenderer"
+}