@colisweb/rescript-toolkit 1.31.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "1.31.0",
+  "version": "2.2.0",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",

package/src/decoders/Toolkit__Decoders.res

@@ -1,4 +1,4 @@
-module Date = {
+module Datetime = {
   type date = Js.Date.t
 
   let encoder: Decco.encoder<date> = value => value->Js.Date.toISOString->Decco.stringToJson
@@ -15,6 +15,24 @@ module Date = {
   type t = @decco.codec(codec) date
 }
 
+module Date = {
+  type date = Js.Date.t
+
+  let encoder: Decco.encoder<date> = date =>
+    date->BsDateFns.formatWithPattern("yyyy-MM-dd")->Decco.stringToJson
+
+  let decoder: Decco.decoder<date> = json =>
+    switch Decco.stringFromJson(json) {
+    | Ok(v) => Js.Date.fromString(v)->Ok
+    | Error(_) as err => err
+    }
+
+  let codec: Decco.codec<date> = (encoder, decoder)
+
+  @decco
+  type t = @decco.codec(codec) date
+}
+
 module Int = {
   let encoder = value => value->Decco.intToJson
 

package/src/router/Toolkit__Router.res

@@ -5,16 +5,21 @@ module type RouterConfig = {
 }
 
 module Make = (Config: RouterConfig) => {
+  type contextState = {
+    currentRoute: Config.t,
+    previousRoute: option<Config.t>,
+  }
   let navigate = (route: Config.t) => RescriptReactRouter.push(route->Config.toString)
 
   let replace = (route: Config.t) => RescriptReactRouter.replace(route->Config.toString)
 
-  let routerContext = React.createContext(
-    RescriptReactRouter.dangerouslyGetInitialUrl()->Config.make,
-  )
+  let routerContext = React.createContext({
+    currentRoute: RescriptReactRouter.dangerouslyGetInitialUrl()->Config.make,
+    previousRoute: None,
+  })
 
   module RouterContextProvider = {
-    let makeProps = (~value: Config.t, ~children, ()) =>
+    let makeProps = (~value: contextState, ~children, ()) =>
       {
         "value": value,
         "children": children,
@@ -30,6 +35,8 @@ module Make = (Config: RouterConfig) => {
         RescriptReactRouter.dangerouslyGetInitialUrl()->Config.make
       )
 
+      let previousRoute = Toolkit__Hooks.usePrevious(currentRoute)
+
       React.useLayoutEffect1(() => {
         let watcherID = RescriptReactRouter.watchUrl(url =>
           setCurrentRoute(_ => url |> Config.make)
@@ -37,7 +44,14 @@ module Make = (Config: RouterConfig) => {
         Some(() => RescriptReactRouter.unwatchUrl(watcherID))
       }, [setCurrentRoute])
 
-      <RouterContextProvider value=currentRoute> {children(~currentRoute)} </RouterContextProvider>
+      let contextValue: contextState = {
+        previousRoute: previousRoute,
+        currentRoute: currentRoute,
+      }
+
+      <RouterContextProvider value={contextValue}>
+        {children(~currentRoute)}
+      </RouterContextProvider>
     }
   }
 
@@ -47,7 +61,7 @@ module Make = (Config: RouterConfig) => {
     routeA->Config.toString === routeB->Config.toString
 
   let useIsCurrentRoute = (route: Config.t): bool => {
-    let currentRoute = React.useContext(routerContext)
+    let {currentRoute} = React.useContext(routerContext)
     isRouteEqual(currentRoute, route)
   }
 

package/src/sentry/SentryReactNativeLogger.res

@@ -0,0 +1,114 @@
+open BsSentryReactNative
+
+let error = (loc: ReScriptLogger.Location.t, event) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    captureMessage(event)
+  })
+}
+
+let error1 = (loc: ReScriptLogger.Location.t, event, (label, data)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label, data)
+    captureMessage(event)
+  })
+}
+
+let error2 = (loc: ReScriptLogger.Location.t, event, (label1, data1), (label2, data2)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    captureMessage(event)
+  })
+}
+
+let error3 = (
+  loc: ReScriptLogger.Location.t,
+  event,
+  (label1, data1),
+  (label2, data2),
+  (label3, data3),
+) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    scope->Scope.setExtra(label3, data3)
+    captureMessage(event)
+  })
+}
+let error4 = (
+  loc: ReScriptLogger.Location.t,
+  event,
+  (label1, data1),
+  (label2, data2),
+  (label3, data3),
+  (label4, data4),
+) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    scope->Scope.setExtra(label3, data3)
+    scope->Scope.setExtra(label4, data4)
+    captureMessage(event)
+  })
+}
+let error5 = (
+  loc: ReScriptLogger.Location.t,
+  event,
+  (label1, data1),
+  (label2, data2),
+  (label3, data3),
+  (label4, data4),
+  (label5, data5),
+) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra("fullPath", loc.fullPath)
+    scope->Scope.setExtra("function", loc.value)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    scope->Scope.setExtra(label3, data3)
+    scope->Scope.setExtra(label4, data4)
+    scope->Scope.setExtra(label5, data5)
+    captureMessage(event)
+  })
+}
+
+let errorWithData = (loc: ReScriptLogger.Location.t, event, (label, data)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra(label, data)
+    captureMessage(event)
+  })
+}
+
+let errorWithData2 = (loc: ReScriptLogger.Location.t, event, (label1, data1), (label2, data2)) => {
+  open Sentry
+  withScope(scope => {
+    scope->Scope.setExtra("module", loc.subModulePath->List.toArray)
+    scope->Scope.setExtra(label1, data1)
+    scope->Scope.setExtra(label2, data2)
+    captureMessage(event)
+  })
+}

package/src/vendors/BsSentryReactNative.res

@@ -2,21 +2,23 @@ module Sentry = {
   module Scope = {
     type t
 
-    @bs.send external setExtra: (t, string, 'a) => unit = "setExtra"
+    @send external setExtra: (t, string, 'a) => unit = "setExtra"
   }
 
-  @module("@sentry/react-native")
-  external init: Js.t<'a> => unit = "init"
+  @module("sentry-expo") external init: 'a => unit = "init"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
   external setTag: (string, string) => unit = "setTag"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
+  external setUser: 'a => unit = "setUser"
+
+  @module("sentry-expo") @scope("Native")
   external captureException: Js.Promise.error => unit = "captureException"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
   external captureMessage: string => unit = "captureMessage"
 
-  @module("@sentry/react-native")
+  @module("sentry-expo") @scope("Native")
   external withScope: (Scope.t => unit) => unit = "withScope"
 }

package/src/vendors/ReactErrorBoundary.res

@@ -0,0 +1,13 @@
+type fallbackProps = {
+  error: Js.Exn.t,
+  resetErrorBoundary: unit => unit,
+}
+
+@module("react-error-boundary") @react.component
+external make: (
+  ~fallback: React.element=?,
+  ~fallbackComponent: fallbackProps => React.element=?,
+  ~fallbackRender: fallbackProps => React.element=?,
+  ~children: React.element,
+  ~resetKeys: array<'a>=?,
+) => React.element = "ErrorBoundary"