analogger 1.17.2 → 1.18.2

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "analogger",
-  "version": "1.17.2",
+  "version": "1.18.2",
   "description": "Js Logger",
   "main": "./src/ana-logger.cjs",
-  "module": "./esm/ana-logger.mjs",
-  "type": "module",
+  "module": "./esm/src/ana-logger.mjs",
+  "type": "commonjs",
   "imports": {
     "flatted": "./node_modules/flatted/esm/index.js",
     "to-ansi": "./node_modules/to-ansi/index.mjs"
@@ -12,45 +12,43 @@
   "exports": {
     ".": {
       "require": "./src/ana-logger.cjs",
-      "import": "./esm/ana-logger.mjs"
+      "import": "./esm/src/ana-logger.mjs"
     }
   },
   "browser": "./dist/analogger-browser.min.mjs",
   "scripts": {
     "lint": "eslint.cmd \"src/**/*.{cjs,js}\"",
     "test": "npm run build:demo && nyc --reporter=lcov --reporter=text-summary mocha --exit --sort",
-    "manual:check": "genserve.cmd start --port 9877 --dir ./ --open example/index.html",
-    "demo:terminal:cjs": "node example/more/demo.cjs",
+    "manual:check": "genserve.cmd start --port 9877 --dir ./ --open models/example-1/index.html",
+    "demo:terminal:cjs": "node models/jscode/demo.cjs",
     "*** Pre-Cleaning-1 ****": "# ----------------------------------------------------------------------------------------------------------",
     "*** Pre-Cleaning-2 ****": "# Clean directory",
     "*** Pre-Cleaning-3 ****": "# ----------------------------------------------------------------------------------------------------------",
-    "clean:all": "rimraf ./generated && rimraf ./dist",
-    "clean:terminal": "rimraf ./esm/",
-    "clean:browser": "rimraf ./generated/browser",
-    "clean:browser:importmaps": "rimraf ./generated/browser-import-maps && rimraf ./example-2/index-with-import-maps.html && clonefile example-2/index-maps.html example-2/index-with-import-maps.html",
-    "clean:browser:minified": "rimraf ./generated/browser-minified",
-    "clean:browser3": "rimraf ./generated/browser-minified-js",
+    "clean:browser:importmaps": "rimraf ./demo/browser-import-maps",
     "clean:demo": "rimraf ./generated/demo/",
+    "*** On the Theme-1 ****": "# ----------------------------------------------------------------------------------------------------------",
+    "*** On the Theme-2 ****": "# CSS",
+    "*** On the Theme-3 ****": "# ----------------------------------------------------------------------------------------------------------",
+    "copy:css": "clonefile --force src/ana-logger.css dist/analogger.min.css",
     "*** On the Terminal-1 ****": "# ----------------------------------------------------------------------------------------------------------",
-    "*** On the Terminal-2 ****": "# Generate library code",
+    "*** On the Terminal-2 ****": "# Generate library code in esm/ (esm version), browser (browser version) and dist (browser minified version)",
     "*** On the Terminal-3 ****": "# ----------------------------------------------------------------------------------------------------------",
-    "build:esm:terminal": "            npm run clean:terminal           && to-esm.cmd src/ana-logger.cjs        --output esm/                                --config .toesm.cjs --target esm                                               --update-all",
-    "build:esm:browser": "             npm run clean:browser            && to-esm src/ana-logger.cjs            --output generated/browser/                  --config .toesm.cjs --target package",
-    "build:esm:browser:importmaps": "  npm run clean:browser:importmaps && to-esm src/ana-logger.cjs            --output generated/browser-importmaps/       --config .toesm.cjs --target browser                                                             --useImportMaps",
-    "build:esm:browser:minified": "    npm run clean:browser:minified   && to-esm src/ana-logger.cjs            --output generated/browser-minified/         --config .toesm.cjs --target browser --bundle-browser ./dist/analogger-browser.min.mjs --update-all",
-    "build:esm": "npm run clean:all && npm run build:esm:terminal && npm run build:esm:browser && npm run build:esm:browser:importmaps && npm run build:esm:browser:minified && clonefile src/ana-logger.css dist/analogger.min.css && npm pack",
+    "build:esm:terminal": "           rimraf ./esm/                             && to-esm src/ana-logger.cjs            --output esm/                           --config .toesm.cjs --target esm                 --update-all",
+    "build:esm:browser": "            rimraf ./browser                          && to-esm src/ana-logger.cjs            --output browser/                       --config .toesm.cjs --target browser             --update-all",
+    "build:esm:browser:minified": "   rimraf ./dist/analogger-browser.min.mjs   && to-esm src/ana-logger.cjs            --bundle dist/analogger-browser.min.mjs --config .toesm.cjs --target browser             --update-all      --bundle-browser ./dist/analogger-browser.min.mjs ",
+    "build:esm": "npm run build:esm:terminal && npm run build:esm:browser && npm run build:esm:browser:minified && npm run copy:css",
     "*** In the Browser-1 ****": "# ----------------------------------------------------------------------------------------------------------",
-    "*** In the Browser-2 ****": "# Generate Demo code",
+    "*** In the Browser-2 ****": "# Generate Demo code - They don't need to have the AnaLogger library built to work!!!",
     "*** In the Browser-3 ****": "# ----------------------------------------------------------------------------------------------------------",
-    "build:demo:terminal": "           to-esm.cmd example/more/demo.cjs      --output=generated/demo/terminal/             --config .toesm.cjs  --target=esm",
-    "build:demo:browser": "            to-esm.cmd example/more/demo.cjs      --output generated/demo/browser/              --config .toesm.cjs  --target browser",
-    "build:demo:browser:importmaps": " to-esm.cmd example/more/demo.cjs      --output generated/demo/browser-import-maps/  --config .toesm.cjs  --target browser  --html=example-2/index-with-import-maps.html --useImportMaps",
-    "build:demo:minified": "           to-esm.cmd example/more/demo.cjs      --output generated/demo/browser-minified/     --config .toesm.cjs  --target browser  --bundle ./dist/analogger-browser-demo.min.mjs",
+    "build:demo:terminal": "                                                                                                                                               to-esm.cmd models/jscode/demo.cjs      --output demo/terminal/             --config .toesm.cjs  --target=esm",
+    "build:demo:browser": "            rimraf ./demo/browser-minified         && clonefile --force models/example-1/index.html          demo/browser/                  &&  to-esm.cmd models/jscode/demo.cjs      --output demo/browser/              --config .toesm.cjs  --target browser",
+    "build:demo:browser:importmaps": " rimraf ./demo/browser-import-maps/     && clonefile --force models/example-2/index-maps.html     demo/browser-import-maps/      &&  to-esm.cmd models/jscode/demo.cjs      --output demo/browser-import-maps/  --config .toesm.cjs  --target browser  --html demo/browser-import-maps/*.html                  --useImportMaps      ",
+    "build:demo:minified": "           rimraf ./demo/browser-minified         && clonefile --force models/example-3/index-bundle.html   demo/browser-minified/         &&  to-esm.cmd models/jscode/demo.cjs                                          --config .toesm.cjs  --target browser  --bundle ./demo/browser-minified/analogger-browser-demo.min.mjs",
     "*** In the Browser with importmap-1 ****": "# ----------------------------------------------------------------------------------------------------------",
-    "*** In the Browser with importmap-2 ****": "# Generate demo code with import map",
+    "*** In the Browser with importmap-2 ****": "# Generate models code with import map",
     "*** In the Browser with importmap-3 ****": "# ----------------------------------------------------------------------------------------------------------",
-    "build:demo": "npm run build:esm --recursive && npm run build:demo:terminal && npm run build:demo:browser && npm run build:demo:browser:importmaps && npm run build:demo:minified",
-    "quick:run": "node example/more/demo.cjs"
+    "build:demo": "npm run build:demo:terminal && npm run build:demo:browser && npm run build:demo:browser:importmaps && npm run build:demo:minified",
+    "quick:run": "node models/jscode/demo.cjs"
   },
   "author": "Patrice Thimothee",
   "license": "MIT",
@@ -79,9 +77,10 @@
     "chai-spies": "^1.0.0",
     "chromedriver": "^2.33.0",
     "chromium": "^3.0.3",
-    "clonefile": "^1.0.1",
+    "clonefile": "^1.1.3",
     "eslint": "^8.8.0",
-    "genserve": "^1.18.1",
+    "genserve": "^2.9.0",
+    "glob": "^8.0.3",
     "jsdom": "19.0.0",
     "jsdom-global": "3.0.2",
     "mocha": "^9.2.0",
@@ -90,9 +89,10 @@
     "selenium-webdriver": "^4.1.1",
     "semantic-release": "^19.0.2",
     "sinon": "^13.0.1",
-    "to-esm": "^2.13.1"
+    "to-esm": "^2.19.0"
   },
   "dependencies": {
+    "@thimpat/libutils": "^1.5.0",
     "flatted": "^3.2.5",
     "to-ansi": "^1.4.3",
     "window-size": "^1.1.1"

package/src/ana-logger.cjs

@@ -119,6 +119,9 @@ class ____AnaLogger
 {
     system = "";
 
+    instanceId = "";
+    instanceName = "";
+
     logIndex = 0;
     logCounter = 0;
     contexts = [];
@@ -156,14 +159,21 @@ class ____AnaLogger
         NODE   : "NODE",
         OTHER  : "OTHER"
     };
+
+    static instanceCount = 0;
+
     originalFormatFunction;
 
-    constructor()
+    constructor({name = "default"} = {})
     {
         this.system = (typeof process === "object") ? SYSTEM.NODE : SYSTEM.BROWSER;
         this.format = this.onBuildLog.bind(this);
         this.originalFormatFunction = this.format;
 
+        this.instanceName = name;
+        ++____AnaLogger.instanceCount;
+        this.instanceId = ____AnaLogger.instanceCount + "-" + Date.now();
+
         this.errorTargetHandler = this.onError.bind(this);
         this.errorUserTargetHandler = this.onErrorForUserTarget.bind(this);
 
@@ -175,10 +185,15 @@ class ____AnaLogger
         this.rawError = this.#realConsoleError;
 
         console.rawLog = this.#realConsoleLog;
+        console.raw = this.#realConsoleLog;
+
         console.rawInfo = this.#realConsoleInfo;
         console.rawWarn = this.#realConsoleWarn;
         console.rawError = this.#realConsoleError;
 
+        console.keepLogHistory = this.keepLogHistory;
+        console.getLogHistory = this.getLogHistory;
+
         console.table = this.table;
         console.buildTable = this.buildTable;
         console.isNode = this.isNode;
@@ -192,6 +207,18 @@ class ____AnaLogger
 
         this.ALIGN = ____AnaLogger.ALIGN;
         this.ENVIRONMENT_TYPE = ____AnaLogger.ENVIRONMENT_TYPE;
+
+        this.resetLogHistory();
+    }
+
+    getName()
+    {
+        return this.instanceName;
+    }
+
+    getId()
+    {
+        return this.instanceId;
     }
 
     keepLogHistory()
@@ -211,7 +238,13 @@ class ____AnaLogger
 
     getLogHistory(join = true, symbol = EOL)
     {
-        const history = JSON.parse(JSON.stringify(this.logHistory.slice(0)));
+        const historyLog = this.logHistory;
+        if (!historyLog)
+        {
+            return "";
+        }
+        const logs = this.logHistory.slice(0);
+        const history = JSON.parse(JSON.stringify(logs));
         if (!join)
         {
             return history;
@@ -254,8 +287,6 @@ class ____AnaLogger
         this.options.logToDom = undefined;
         this.options.logToFile = undefined;
         this.options.logToDomlogToFile = undefined;
-        this.options.silent = false;
-
     }
 
     resetOptions()
@@ -295,9 +326,20 @@ class ____AnaLogger
             this.options.hideHookMessage = !!hideHookMessage;
         }
 
-        if (hideLog !== undefined)
+        // TODO: Make one of silent or hideToLog options obsolete
+        let solveSilent = undefined;
+        if (silent !== undefined)
+        {
+            solveSilent = !!silent;
+        }
+        else if (hideLog !== undefined)
+        {
+            solveSilent = !!hideLog;
+        }
+
+        if (solveSilent)
         {
-            this.options.hideLog = !!hideLog;
+            this.options.hideLog = !!solveSilent;
         }
 
         if (hideError !== undefined)
@@ -337,12 +379,6 @@ class ____AnaLogger
              **/
         }
 
-        if (silent !== undefined)
-        {
-            this.options.silent = !!silent;
-            this.options.hideLog = this.options.silent;
-        }
-
     }
 
     getOptions()
@@ -593,13 +629,71 @@ class ____AnaLogger
         this.log(...args);
     }
 
+    assistStask(error)
+    {
+        try
+        {
+            const lines = error.stack.split("\n");
+            const stack = [];
+
+            for (let i = 0; i < lines.length; ++i)
+            {
+                const line = lines[i];
+                stack.push(line);
+            }
+
+            return stack;
+        }
+        catch (e)
+        {
+            console.rawError(e.message);
+        }
+
+        return error.message;
+    }
+
     /**
      * Forward input to real console log
      * @param args
      */
     onDisplayError(...args)
     {
-        this.error(...args);
+        try
+        {
+            let mainIndex = -1
+            let extracted = null;
+            for (let i = 0; i < args.length; ++i)
+            {
+                const arg = args[i];
+                if (arg instanceof Error)
+                {
+                    if (arg.stack)
+                    {
+                        mainIndex = i;
+                        extracted = this.assistStask(arg) || []
+                        break;
+                    }
+                }
+            }
+
+            if (!extracted)
+            {
+                this.error(...args);
+                return
+            }
+
+            for (let i = 0; i < extracted.length; ++i)
+            {
+                args[mainIndex] = extracted[i];
+                this.error(...args);
+            }
+
+        }
+        catch (e)
+        {
+            console.rawError(e);
+        }
+
     }
 
     /**
@@ -1060,12 +1154,14 @@ class ____AnaLogger
         catch (e)
         {
             /* istanbul ignore next */
-            console.error("AnaLogger:", e.message);
+            console.rawError("AnaLogger:", e.message);
         }
     }
 
     /**
-     * Check that a parameter (should be the first) uses the expected format.
+     * Check that a parameter uses the expected AnaLogger format.
+     * For this, the first parameter should be an object that contains at least
+     * a logging id (lid), a target, a contextName, etc
      * @param options
      * @returns {boolean}
      */
@@ -1314,7 +1410,7 @@ class ____AnaLogger
     {
         try
         {
-            const silent = false, lidLenMax = 4;
+            const lidLenMax = 4;
 
             const LOG_CONTEXTS = {
                 STANDARD: null,
@@ -1341,7 +1437,7 @@ class ____AnaLogger
 
             activeTarget && this.setActiveTarget(activeTarget);
 
-            this.setOptions({silent, hideError: false, hideHookMessage: true, lidLenMax});
+            this.setOptions({silent: false, hideError: false, hideHookMessage: true, lidLenMax});
             if (override)
             {
                 this.overrideConsole();