@colisweb/rescript-toolkit 2.38.2 → 2.40.0

package/package.json

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

package/src/logger/Toolkit__BrowserLogger.res

@@ -1,5 +1,3 @@
-open BsSentry
-
 type t
 @val external windowInstance: option<t> = "window"
 @val external window: t = "window"
@@ -7,6 +5,8 @@ type t
 let get = () => Js.typeof(windowInstance) !== "undefined" ? window : process
 let instance = get()
 
+@new
+external makeError: string => Js.Exn.t = "Error"
 @get external _nodeEnv: t => string = "NODE_ENV"
 
 let nodeEnv = instance->_nodeEnv
@@ -50,14 +50,11 @@ let warning3 = (str, str2, str3) => {
   }
 }
 
-let error = str => {
+let error = (str: string) => {
   if nodeEnv !== "production" {
     Js.Console.log3("%cERROR", errorStyle, str)
   } else {
-    open Sentry
-    withScope(_scope => {
-      captureMessage(Obj.magic(str))
-    })
+    DatadogRum.Browser.addError(makeError(str))
   }
 }
 
@@ -65,10 +62,11 @@ let error2 = (str, str2) => {
   if nodeEnv !== "production" {
     Js.Console.log4("%cERROR", errorStyle, str, str2)
   } else {
-    open Sentry
-    withScope(scope => {
-      scope->Scope.setExtra("data", str2)
-      captureMessage(Obj.magic(str))
-    })
+    DatadogRum.Browser.addErrorWithContext(
+      makeError(str),
+      {
+        "cause": str2,
+      },
+    )
   }
 }

package/src/logger/Toolkit__BrowserLogger.resi

@@ -4,5 +4,5 @@ let debug2: ('a, 'b) => unit
 let warning: 'a => unit
 let warning2: ('a, 'b) => unit
 
-let error: 'a => unit
-let error2: ('a, 'b) => unit
+let error: string => unit
+let error2: (string, 'b) => unit

package/src/vendors/Axios.res

@@ -111,15 +111,15 @@ module Interceptors = {
 module WithResult = {
   type customError<'apiError, 'response> = [
     | #default(error<'response>)
-    | #decodeError(Decco.decodeError)
+    | #decodeError(config, Decco.decodeError)
     | #custom('apiError)
   ]
 
-  type decodeData<'newData, 'err> = Js.Json.t => result<'newData, 'err>
+  type decodeData<'newData> = Js.Json.t => result<'newData, Decco.decodeError>
 
   type mapError<'a, 'response, 'headers, 'request> = error<'response> => customError<'a, 'response>
 
-  let toResult = (promise, ~mapError, ~decodeData) =>
+  let toResult = (promise, ~mapError, ~decodeData: decodeData<'a>) =>
     promise
     ->Promise.Js.toResult
     ->Promise.mapError(err => mapError->Option.mapWithDefault(#default(err), fn => fn(err)))
@@ -127,14 +127,14 @@ module WithResult = {
       Promise.resolved(
         switch decodeData(response.data) {
         | Ok(_) as ok => ok
-        | Error(decodeError) => Error(#decodeError(decodeError))
+        | Error(decodeError) => Error(#decodeError(response.config, decodeError))
         },
       )
     })
 
   let get = (
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => get(string, ~config?, ())->toResult(~decodeData, ~mapError)
@@ -142,7 +142,7 @@ module WithResult = {
   let post = (
     ~data,
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => post(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
@@ -150,7 +150,7 @@ module WithResult = {
   let put = (
     ~data,
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => put(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
@@ -158,21 +158,21 @@ module WithResult = {
   let patch = (
     ~data,
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => patch(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let delete = (
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => delete(string, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let options = (
     ~config=?,
-    ~decodeData: decodeData<'newData, 'err>,
+    ~decodeData: decodeData<'newData>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
     string,
   ) => options(string, ~config?, ())->toResult(~decodeData, ~mapError)

package/src/vendors/DatadogRum.res

@@ -13,4 +13,13 @@ module Browser = {
 
   @module("@datadog/browser-rum") @scope("datadogRum")
   external setUser: 'a => unit = "setUser"
+
+  @module("@datadog/browser-rum") @scope("datadogRum")
+  external addAction: (string, 'a) => unit = "addAction"
+
+  @module("@datadog/browser-rum") @scope("datadogRum")
+  external addError: Js.Exn.t => unit = "addError"
+
+  @module("@datadog/browser-rum") @scope("datadogRum")
+  external addErrorWithContext: (Js.Exn.t, 'context) => unit = "addError"
 }

package/src/vendors/ReactErrorBoundary.res

@@ -10,4 +10,5 @@ external make: (
   ~fallbackRender: fallbackProps => React.element=?,
   ~children: React.element,
   ~resetKeys: array<'a>=?,
+  ~onError: 'error => unit=?,
 ) => React.element = "ErrorBoundary"