@maplibre/maplibre-react-native 9.1.0 → 10.0.0-alpha.10

package/javascript/utils/{Logger.js → Logger.ts}

@@ -1,20 +1,39 @@
-import {NativeEventEmitter, NativeModules} from 'react-native';
-const {MGLLogging} = NativeModules;
+import {
+  EmitterSubscription,
+  NativeEventEmitter,
+  NativeModules,
+} from "react-native";
+const { MLNLogging } = NativeModules;
+
+export type LogLevel = "error" | "warning" | "info" | "debug" | "verbose";
+interface Log {
+  message: string;
+  level: LogLevel;
+  tag?: string;
+}
+
+type LogCallback = (log: Log) => boolean;
 
 class Logger {
-  static instance = null;
+  static instance: Logger | null = null;
 
-  static sharedInstance() {
+  static sharedInstance(): Logger {
     if (this.instance === null) {
       this.instance = new Logger();
     }
     return this.instance;
   }
 
+  private loggerEmitter: NativeEventEmitter;
+  private startedCount: number;
+  private logCallback: LogCallback | null;
+  private subscription: EmitterSubscription | null;
+
   constructor() {
-    this.loggerEmitter = new NativeEventEmitter(MGLLogging);
+    this.loggerEmitter = new NativeEventEmitter(MLNLogging);
     this.startedCount = 0;
     this.logCallback = null;
+    this.subscription = null;
   }
 
   /**
@@ -22,7 +41,7 @@ class Logger {
    * @param {Logger~logCallback} logCallback - callback taking a log object as param. If callback return falsy value then
    * default logging will take place.
    */
-  static setLogCallback(logCallback) {
+  static setLogCallback(logCallback: LogCallback): void {
     this.sharedInstance().setLogCallback(logCallback);
   }
 
@@ -31,7 +50,7 @@ class Logger {
    * @param {Logger~logCallback} logCallback - callback taking a log object as param. If callback return falsy value then
    * default logging will take place.
    */
-  setLogCallback(logCallback) {
+  setLogCallback(logCallback: LogCallback): void {
     this.logCallback = logCallback;
   }
 
@@ -48,64 +67,64 @@ class Logger {
    * setLogLevel
    * @param {LogLevel} level
    */
-  static setLogLevel(level) {
-    MGLLogging.setLogLevel(level);
+  static setLogLevel(level: LogLevel): void {
+    MLNLogging.setLogLevel(level);
   }
 
   /**
    * @type {('error'|'warning'|'info'|'debug'|'verbose')} LogLevel - Supported log levels
    */
 
-  start() {
+  start(): void {
     if (this.startedCount === 0) {
       this.subscribe();
     }
     this.startedCount += 1;
   }
 
-  stop() {
+  stop(): void {
     this.startedCount -= 1;
     if (this.startedCount === 0) {
       this.unsubscribe();
     }
   }
 
-  subscribe() {
-    this.subscription = this.loggerEmitter.addListener('LogEvent', log => {
+  subscribe(): void {
+    this.subscription = this.loggerEmitter.addListener("LogEvent", (log) => {
       this.onLog(log);
     });
   }
 
-  unsubscribe() {
-    this.subscription.remove();
-    this.subscription = null;
+  unsubscribe(): void {
+    if (this.subscription) {
+      this.subscription.remove();
+      this.subscription = null;
+    }
   }
 
-  effectiveLevel(log) {
-    let {level, message, tag} = log;
-
-    if (level === 'warning') {
+  effectiveLevel({ level, message, tag }: Log): LogLevel {
+    if (level === "warning") {
       if (
-        tag === 'Mbgl-HttpRequest' &&
-        message.startsWith('Request failed due to a permanent error: Canceled')
+        tag === "Mbgl-HttpRequest" &&
+        message.startsWith("Request failed due to a permanent error: Canceled")
       ) {
         // this seems to happening too much to show a warning every time
-        return 'info';
+        return "info";
       }
     }
     return level;
   }
 
-  onLog(log) {
+  onLog(log: Log): void {
     if (!this.logCallback || !this.logCallback(log)) {
-      let {message} = log;
-      let level = this.effectiveLevel(log);
-      if (level === 'error') {
-        console.error('Mapbox error', message, log);
-      } else if (level === 'warning') {
-        console.warn('Mapbox warning', message, log);
+      const { message } = log;
+      const level = this.effectiveLevel(log);
+      if (level === "error") {
+        console.error("MapLibre error", message, log);
+      } else if (level === "warning") {
+        console.warn("MapLibre warning", message, log);
       } else {
-        console.log(`Mapbox [${level}]`, message, log);
+        console.log(`MapLibre [${level}]`, message, log);
       }
     }
   }