fix(logging): fixed problems connected to loglevel type definition changes

@types/loglevel introduced a namespace so that LogLevel isn't accessible globally anymore

package.json

@@ -50,7 +50,7 @@
   "dependencies": {
     "es6-promise": "^4.0.5",
     "jszip": "^3.0.0",
-    "loglevel": "^1.4.1",
+    "loglevel": "^1.5.0",
     "shortid": "^2.2.6",
     "typescript-collections": "^1.1.2",
     "vexflow": "^1.2.53"

src/MusicalScore/ScoreIO/MusicSymbolModules/ChordSymbolReader.ts

@@ -1,10 +1,11 @@
-import {IXmlElement} from "../../../Common/FileIO/Xml";
+import {IXmlElement} from "../../../Common/FileIO/Xml";
 import {MusicSheet} from "../../MusicSheet";
 import {ChordDegreeText, ChordSymbolContainer, ChordSymbolEnum, Degree} from "../../VoiceData/ChordSymbolContainer";
 import {AccidentalEnum, NoteEnum, Pitch} from "../../../Common/DataObjects/Pitch";
 import {KeyInstruction} from "../../VoiceData/Instructions/KeyInstruction";
 import {ITextTranslation} from "../../Interfaces/ITextTranslation";
-import {Logging} from "../../../Common/Logging";
+import * as log from "loglevel";
+
 export class ChordSymbolReader {
     public static readChordSymbol(xmlNode: IXmlElement, musicSheet: MusicSheet, activeKey: KeyInstruction): ChordSymbolContainer {
         let root: IXmlElement = xmlNode.element("root");
@@ -29,7 +30,7 @@ export class ChordSymbolReader {
             let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                   "Invalid chord symbol");
             musicSheet.SheetErrors.pushMeasureError(errorMsg);
-            Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+            log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
             return undefined;
         }
 
@@ -42,7 +43,7 @@ export class ChordSymbolReader {
                 let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                       "Invalid chord symbol");
                 musicSheet.SheetErrors.pushMeasureError(errorMsg);
-                Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+                log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
             }
 
         }
@@ -56,7 +57,7 @@ export class ChordSymbolReader {
             let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                   "Invalid chord symbol");
             musicSheet.SheetErrors.pushMeasureError(errorMsg);
-            Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+            log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
             return undefined;
         }
 
@@ -74,10 +75,9 @@ export class ChordSymbolReader {
                     let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                           "Invalid chord symbol");
                     musicSheet.SheetErrors.pushMeasureError(errorMsg);
-                    Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+                    log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
                     return undefined;
                 }
-
             }
             let bassAlteration: AccidentalEnum = AccidentalEnum.NONE;
             if (bassAlter !== undefined) {
@@ -87,9 +87,8 @@ export class ChordSymbolReader {
                     let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                           "Invalid chord symbol");
                     musicSheet.SheetErrors.pushMeasureError(errorMsg);
-                    Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+                    log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
                 }
-
             }
             bassPitch = new Pitch(bassNote, 1, bassAlteration);
         }
@@ -112,7 +111,7 @@ export class ChordSymbolReader {
                 let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                       "Invalid chord symbol");
                 musicSheet.SheetErrors.pushMeasureError(errorMsg);
-                Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+                log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
                 return undefined;
             }
 
@@ -123,7 +122,7 @@ export class ChordSymbolReader {
                 let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                       "Invalid chord symbol");
                 musicSheet.SheetErrors.pushMeasureError(errorMsg);
-                Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+                log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
                 return undefined;
             }
 
@@ -134,7 +133,7 @@ export class ChordSymbolReader {
                 let errorMsg: string = ITextTranslation.translateText("ReaderErrorMessages/ChordSymbolError",
                                                                       "Invalid chord symbol");
                 musicSheet.SheetErrors.pushMeasureError(errorMsg);
-                Logging.error(LogLevel.DEBUG, "InstrumentReader.readChordSymbol", errorMsg, ex);
+                log.debug("InstrumentReader.readChordSymbol", errorMsg, ex);
                 return undefined;
             }
 

src/OSMD/OSMD.ts

@@ -12,7 +12,6 @@ import {Cursor} from "./Cursor";
 import {MXLHelper} from "../Common/FileIO/Mxl";
 import {Promise} from "es6-promise";
 import {AJAX} from "./AJAX";
-import {Logging} from "../Common/Logging";
 import * as log from "loglevel";
 
 export class OSMD {
@@ -81,7 +80,7 @@ export class OSMD {
                         return self.load(x);
                     },
                     (err: any) => {
-                        Logging.debug(err);
+                        log.debug(err);
                         throw new Error("OSMD: Invalid MXL file");
                     }
                 );
@@ -171,23 +170,23 @@ export class OSMD {
     public setLogLevel(level: string): void {
         switch (level) {
             case "trace":
-                log.setDefaultLevel(LogLevel.TRACE);
+                log.setLevel(log.levels.WARN);
                 break;
             case "debug":
-                log.setDefaultLevel(LogLevel.DEBUG);
+                log.setLevel(log.levels.DEBUG);
                 break;
             case "info":
-                log.setDefaultLevel(LogLevel.INFO);
+                log.setLevel(log.levels.INFO);
                 break;
             case "warn":
-                log.setDefaultLevel(LogLevel.WARN);
+                log.setLevel(log.levels.WARN);
                 break;
             case "error":
-                log.setDefaultLevel(LogLevel.ERROR);
+                log.setLevel(log.levels.ERROR);
                 break;
             default:
                 log.warn(`Could not set log level to ${level}. Using warn instead.`);
-                log.setDefaultLevel(LogLevel.WARN);
+                log.setLevel(log.levels.WARN);
                 break;
         }
     }