@colisweb/rescript-toolkit 2.11.2 → 2.12.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.2",
+  "version": "2.12.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,54 @@
+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 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__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/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