@colisweb/rescript-toolkit 2.11.0 → 2.13.0

package/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 include:
-  - "https://colisweb-open-source.gitlab.io/ci-common/v13.8.3/templates/colisweb.yml"
+  - "https://colisweb-open-source.gitlab.io/ci-common/v13.11.1/templates/colisweb.yml"
 
 # -----------------------------------------------
 # Test
@@ -16,7 +16,6 @@ rescript compilation:
       - .yarn/
   script:
     - export NPM_TOKEN=${NPM_TOKEN:-undefined}
-    - echo $NPM_TOKEN
     - yarn install --cache-folder .yarn --pure-lockfile
     - yarn test
 

package/bsconfig.json

@@ -31,12 +31,11 @@
     "reason-react",
     "decco",
     "rescript-classnames",
-    "rescript-logger",
     "reschema",
     "rescript-react-update",
     "restorative"
   ],
-  "ppx-flags": ["decco/ppx", "lenses-ppx/ppx", "rescript-logger/ppx"],
+  "ppx-flags": ["decco/ppx", "lenses-ppx/ppx"],
   "refmt": 3,
   "warnings": {
     "number": "-44-30-32",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",
@@ -65,7 +65,6 @@
     "reschema": "1.3.1",
     "rescript": "9.1.4",
     "rescript-classnames": "6.0.0",
-    "rescript-logger": "2.0.2",
     "rescript-react-update": "5.0.0",
     "restorative": "0.4.0-beta.1",
     "sanitize-html": "2.6.1",
@@ -74,6 +73,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.5",
+    "@sentry/browser": "6.17.6",
     "@storybook/addon-actions": "6.1.21",
     "@storybook/addon-essentials": "6.1.21",
     "@storybook/addon-knobs": "6.1.21",

package/src/Toolkit.res

@@ -9,3 +9,5 @@ module Router = Toolkit__Router
 module Ui = Toolkit__Ui
 module Utils = Toolkit__Utils
 module Form = Toolkit__Form
+module BrowserLogger = Toolkit__BrowserLogger
+module NativeLogger = Toolkit__NativeLogger

package/src/logger/Toolkit__BrowserLogger.res

@@ -0,0 +1,92 @@
+open BsSentry
+
+@val @scope("process.env") external nodeEnv: string = "NODE_ENV"
+
+let debugStyle = "background-color: #208E9C; color: white; padding: 5px; font-size: 10px;"
+let warningStyle = "background-color: #FFAD2D; color: white; padding: 5px; font-size: 10px;"
+let errorStyle = "background-color: #FF4714; color: white; padding: 5px; font-size: 10px;"
+
+let debug = str => {
+  if nodeEnv !== "production" {
+    Js.Console.log3("%cDEBUG", debugStyle, str)
+  }
+}
+
+let debug2 = (str, str2) => {
+  if nodeEnv !== "production" {
+    Js.Console.log4("%cDEBUG", debugStyle, str, str2)
+  }
+}
+let debug3 = (str, str2, str3) => {
+  if nodeEnv !== "production" {
+    Js.Console.logMany(["%cDEBUG", debugStyle, str, str2, str3])
+  }
+}
+
+let warning = str => {
+  if nodeEnv !== "production" {
+    Js.Console.log3("%cWARN", warningStyle, str)
+  }
+}
+
+let warning2 = (str, str2) => {
+  if nodeEnv !== "production" {
+    Js.Console.log4("%cWARN", warningStyle, str, str2)
+  }
+}
+
+let warning3 = (str, str2, str3) => {
+  if nodeEnv !== "production" {
+    Js.Console.logMany(["%cWARN", warningStyle, str, str2, str3])
+  }
+}
+
+let error = str => {
+  if nodeEnv !== "production" {
+    Js.Console.log3("%cERROR", errorStyle, str)
+  } else {
+    open Sentry
+    withScope(_scope => {
+      captureMessage(Obj.magic(str))
+    })
+  }
+}
+
+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))
+    })
+  }
+}
+
+let error3 = (str, str2, str3) => {
+  if nodeEnv !== "production" {
+    Js.Console.logMany(["%cERROR", errorStyle, str, str2, str3])
+  } else {
+    open Sentry
+    withScope(scope => {
+      scope->Scope.setExtra("1-data", str2)
+      scope->Scope.setExtra("2-data", str3)
+      captureMessage(Obj.magic(str))
+    })
+  }
+}
+
+let error4 = (str, str2, str3, str4) => {
+  if nodeEnv !== "production" {
+    Js.Console.logMany(["%cERROR", errorStyle, str, str2, str3, str4])
+  } else {
+    open Sentry
+    withScope(scope => {
+      scope->Scope.setExtra("1-data", str2)
+      scope->Scope.setExtra("2-data", str3)
+      scope->Scope.setExtra("3-data", str4)
+      captureMessage(Obj.magic(str))
+    })
+  }
+}

package/src/logger/Toolkit__BrowserLogger.resi

@@ -0,0 +1,8 @@
+let debug: 'a => unit
+let debug2: ('a, 'b) => unit
+
+let warning: 'a => unit
+let warning2: ('a, 'b) => unit
+
+let error: 'a => unit
+let error2: ('a, 'b) => unit

package/src/logger/Toolkit__NativeLogger.res

@@ -0,0 +1,54 @@
+open BsSentryReactNative
+
+@val @scope("process.env") external nodeEnv: string = "NODE_ENV"
+
+let debugStyle = "background-color: #208E9C; color: white; padding: 5px; font-size: 10px;"
+let warningStyle = "background-color: #FFAD2D; color: white; padding: 5px; font-size: 10px;"
+let errorStyle = "background-color: #FF4714; color: white; padding: 5px; font-size: 10px;"
+
+let debug = str => {
+  if nodeEnv !== "production" {
+    Js.Console.log3("%cDEBUG", debugStyle, str)
+  }
+}
+
+let debug2 = (str, str2) => {
+  if nodeEnv !== "production" {
+    Js.Console.log4("%cDEBUG", debugStyle, str, str2)
+  }
+}
+
+let warning = str => {
+  if nodeEnv !== "production" {
+    Js.Console.log3("%cWARN", warningStyle, str)
+  }
+}
+
+let warning2 = (str, str2) => {
+  if nodeEnv !== "production" {
+    Js.Console.log4("%cWARN", warningStyle, str, str2)
+  }
+}
+
+let error = str => {
+  if nodeEnv !== "production" {
+    Js.Console.log3("%cERROR", errorStyle, str)
+  } else {
+    open Sentry
+    withScope(_scope => {
+      captureMessage(Obj.magic(str))
+    })
+  }
+}
+
+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))
+    })
+  }
+}

package/src/logger/Toolkit__NativeLogger.resi

@@ -0,0 +1,8 @@
+let debug: 'a => unit
+let debug2: ('a, 'b) => unit
+
+let warning: 'a => unit
+let warning2: ('a, 'b) => unit
+
+let error: 'a => unit
+let error2: ('a, 'b) => unit

package/src/logger/index.md

@@ -0,0 +1,16 @@
+# Logger
+
+Display log only at development and trigger Sentry on error on production.
+
+## Usage
+
+```reason
+let obj = {
+  "test": 1,
+  "z": "ee"
+}
+
+Toolkit.BrowserLogger.debug("test")
+
+Toolkit.BrowserLogger.error2("Error", obj)
+```

package/src/request/Toolkit__Request.res

@@ -55,10 +55,7 @@ let toResult = (
       switch response["data"]->mapData {
       | Ok(_) as ok => ok
       | Error(error) => {
-          %log.error(
-            "Decoder failure"
-            ("err", error)
-          )
+          Toolkit__BrowserLogger.error2("Decoder failure", error)
           Error(
             #invalidResponseData(
               response->castToUndecodedResponse,
@@ -76,10 +73,8 @@ let toResult = (
           switch error {
           | Ok(err) => Error(#custom(err))
           | Error(_err) =>
-            %log.error(
-              "errorDecoder"
-              ("err", _err)
-            )
+            Toolkit__BrowserLogger.error2("errorDecoder", _err)
+
             Error(#invalidErrorData)
           }
 

package/src/request/Toolkit__Request2.res

@@ -3,7 +3,7 @@ module type Config = {
   type response
   type error
   let exec: argument => Promise.promise<
-    result<response, Axios2.WithResult.customError<error, Js.Json.t, 'header, 'req>>,
+    result<response, Axios2.WithResult.customError<error, Js.Json.t>>,
   >
 }
 

package/src/vendors/Axios2.res

@@ -23,24 +23,24 @@ type auth = {
 }
 type proxy = {host: int, port: int, auth: auth}
 
-type response<'data, 'header> = {
+type response<'data> = {
   data: 'data,
   status: int,
   statusText: string,
-  headers: Js.t<'header>,
+  headers: Js.Dict.t<string>,
   config: config,
 }
 
-type error<'responseData, 'responseHeader, 'request> = {
-  request: option<'request>,
-  response: option<response<'responseData, 'responseHeader>>,
+type error<'responseData> = {
+  request: option<Js.Json.t>,
+  response: option<response<'responseData>>,
   message: string,
 }
 
-type adapter<'a, 'b, 'err> = config => Promise.Js.t<response<'a, 'b>, 'err>
+type adapter<'a, 'b, 'err> = config => Promise.Js.t<response<'a>, 'err>
 
 @module("axios")
-external isAxiosError: error<'a, 'b, 'c> => bool = "isAxiosError"
+external isAxiosError: error<'a> => bool = "isAxiosError"
 
 @obj
 external makeConfig: (
@@ -72,24 +72,15 @@ external makeConfig: (
 ) => config = ""
 
 @module("axios")
-external get: (string, ~config: config=?, unit) => Promise.Js.t<response<'data, 'headers>, 'err> =
-  "get"
+external get: (string, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> = "get"
 
 @module("axios")
-external post: (
-  string,
-  ~data: 'a,
-  ~config: config=?,
-  unit,
-) => Promise.Js.t<response<'data, 'headers>, 'err> = "post"
+external post: (string, ~data: 'a, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "post"
 
 @module("axios")
-external put: (
-  string,
-  ~data: 'a,
-  ~config: config=?,
-  unit,
-) => Promise.Js.t<response<'data, 'headers>, 'err> = "put"
+external put: (string, ~data: 'a, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "put"
 
 @module("axios")
 external patch: (
@@ -97,21 +88,14 @@ external patch: (
   ~data: 'a,
   ~config: config=?,
   unit,
-) => Promise.Js.t<response<'data, 'headers>, 'err> = "patch"
+) => Promise.Js.t<response<'data>, 'err> = "patch"
 
 @module("axios")
-external delete: (
-  string,
-  ~config: config=?,
-  unit,
-) => Promise.Js.t<response<'data, 'headers>, 'err> = "delete"
+external delete: (string, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> = "delete"
 
 @module("axios")
-external options: (
-  string,
-  ~config: config=?,
-  unit,
-) => Promise.Js.t<response<'data, 'headers>, 'err> = "options"
+external options: (string, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "options"
 
 module Interceptors = {
   @module("axios") @scope(("default", "interceptors", "request"))
@@ -123,19 +107,15 @@ module Interceptors = {
 }
 
 module WithResult = {
-  type customError<'apiError, 'response, 'headers, 'request> = [
-    | #default(error<'response, 'headers, 'request>)
+  type customError<'apiError, 'response> = [
+    | #default(error<'response>)
     | #decodeError(Decco.decodeError)
     | #custom('apiError)
   ]
 
   type decodeData<'newData, 'err> = Js.Json.t => result<'newData, 'err>
 
-  type mapError<'a, 'response, 'headers, 'request> = error<
-    'response,
-    'headers,
-    'request,
-  > => customError<'a, 'response, 'headers, 'request>
+  type mapError<'a, 'response, 'headers, 'request> = error<'response> => customError<'a, 'response>
 
   let toResult = (promise, ~mapError, ~decodeData) =>
     promise
@@ -151,53 +131,47 @@ module WithResult = {
     })
 
   let get = (
-    string,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => get(string, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => get(string, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let post = (
-    string,
     ~data,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => post(string, ~data, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => post(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let put = (
-    string,
     ~data,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => put(string, ~data, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => put(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let patch = (
-    string,
     ~data,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => patch(string, ~data, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => patch(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let delete = (
-    string,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => delete(string, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => delete(string, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let options = (
-    string,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => options(string, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => options(string, ~config?, ())->toResult(~decodeData, ~mapError)
 }

package/src/vendors/BsDateFns.res

@@ -53,6 +53,11 @@ external parseISO: string => Js.Date.t = "parseISO"
 
 @module("date-fns") external formatWithPattern: (Js.Date.t, string) => string = "format"
 
+type formatWithPatternOptions = {locale: dateFnsLocale}
+@module("date-fns")
+external formatWithPatternWithOptions: (Js.Date.t, string, formatWithPatternOptions) => string =
+  "format"
+
 // set
 
 @module("date-fns")

package/src/sentry/SentryLogger.res

@@ -1,114 +0,0 @@
-open BsSentry
-
-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/sentry/SentryReactNativeLogger.res

@@ -1,114 +0,0 @@
-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/sentry/index.md

@@ -1,3 +0,0 @@
-# Sentry
-
-Bug tracker