@percy/sdk-utils 1.1.2 → 1.2.0

package/dist/bundle.js

@@ -74,7 +74,13 @@
 
     function logger(namespace) {
       return Object.keys(LOG_LEVELS).reduce((ns, lvl) => Object.assign(ns, {
-        [lvl]: log.bind(null, namespace, lvl)
+        [lvl]: function () {
+          for (var _len = arguments.length, a = new Array(_len), _key = 0; _key < _len; _key++) {
+            a[_key] = arguments[_key];
+          }
+
+          return logger.log(namespace, lvl, ...a);
+        }
       }), {});
     } // Set and/or return the local loglevel
 
@@ -181,8 +187,8 @@
         }));
       } catch (err) {
         // there was an error connecting, will fallback to minimal logging
-        log('utils', 'debug', 'Unable to connect to remote logger');
-        log('utils', 'debug', err);
+        logger.log('utils', 'debug', 'Unable to connect to remote logger');
+        logger.log('utils', 'debug', err);
       }
     };
 

package/dist/logger.js

@@ -24,7 +24,7 @@ const LOG_LEVELS = {
 
 function logger(namespace) {
   return Object.keys(LOG_LEVELS).reduce((ns, lvl) => Object.assign(ns, {
-    [lvl]: log.bind(null, namespace, lvl)
+    [lvl]: (...a) => logger.log(namespace, lvl, ...a)
   }), {});
 } // Set and/or return the local loglevel
 
@@ -131,8 +131,8 @@ const remote = logger.remote = async timeout => {
     }));
   } catch (err) {
     // there was an error connecting, will fallback to minimal logging
-    log('utils', 'debug', 'Unable to connect to remote logger');
-    log('utils', 'debug', err);
+    logger.log('utils', 'debug', 'Unable to connect to remote logger');
+    logger.log('utils', 'debug', err);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/sdk-utils",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -50,5 +50,5 @@
       ]
     }
   },
-  "gitHead": "1232b3fe054c7bd73879fd85ca109a723dbfb5b6"
+  "gitHead": "ab7652e08dab49b3efbe2968339c5a70391ed4ff"
 }

package/test/client.js

@@ -52,6 +52,10 @@
       },
 
       async teardown() {
+        var _utils$logger$log$res, _utils$logger$log;
+
+        (_utils$logger$log$res = (_utils$logger$log = utils.logger.log).restore) === null || _utils$logger$log$res === void 0 ? void 0 : _utils$logger$log$res.call(_utils$logger$log);
+
         if (process.env.__PERCY_BROWSERIFIED__) {
           for (let m of ['warn', 'error', 'log']) {
             var _console$m$restore, _console$m;
@@ -91,32 +95,33 @@
 
         async mock() {
           helpers.logger.reset();
+          let shouldCaptureLogs = false;
+          stub(utils.logger, 'log', function () {
+            shouldCaptureLogs = true;
+            utils.logger.log.originalValue(...arguments);
+            shouldCaptureLogs = false;
+          });
 
-          let capture = err => msg => {
-            helpers.logger[err ? 'stderr' : 'stdout'].push(sanitizeLog(msg));
-          };
+          let stubLogs = (ctx, method, err) => stub(ctx, method, msg => {
+            if (!shouldCaptureLogs) return ctx[method].originalValue.call(ctx, msg);else helpers.logger[err ? 'stderr' : 'stdout'].push(sanitizeLog(msg));
+          });
 
           if (process.env.__PERCY_BROWSERIFIED__) {
-            // use console[warn|error|log] in browsers
-            for (let m of ['warn', 'error', 'log']) {
-              stub(console, m, capture(m !== 'log'));
-            }
+            for (let m of ['warn', 'error', 'log']) stubLogs(console, m, m !== 'log');
           } else {
-            // use process[stdout|stderr].write in node
-            for (let io of ['stdout', 'stderr']) {
-              stub(process[io], 'write', capture(io === 'stderr'));
-            }
+            for (let io of ['stdout', 'stderr']) stubLogs(process[io], 'write', io === 'stderr');
           }
         },
 
         reset() {
-          var _utils$logger$remote$;
+          var _utils$logger$remote$, _utils$logger$log$res2, _utils$logger$log2;
 
           (_utils$logger$remote$ = utils.logger.remote.socket) === null || _utils$logger$remote$ === void 0 ? void 0 : _utils$logger$remote$.close();
           delete utils.logger.loglevel.lvl;
           delete utils.logger.log.history;
           helpers.logger.stdout.length = 0;
           helpers.logger.stderr.length = 0;
+          (_utils$logger$log$res2 = (_utils$logger$log2 = utils.logger.log).reset) === null || _utils$logger$log$res2 === void 0 ? void 0 : _utils$logger$log$res2.call(_utils$logger$log2);
 
           if (process.env.__PERCY_BROWSERIFIED__) {
             for (let m of ['warn', 'error', 'log']) {

package/test/helpers.js

@@ -41,6 +41,8 @@ const helpers = {
   },
 
   async teardown() {
+    utils.logger.log.restore?.();
+
     if (process.env.__PERCY_BROWSERIFIED__) {
       for (let m of ['warn', 'error', 'log']) console[m].restore?.();
     } else {
@@ -68,21 +70,23 @@ const helpers = {
     async mock() {
       helpers.logger.reset();
 
-      let capture = err => msg => {
-        helpers.logger[err ? 'stderr' : 'stdout']
-          .push(sanitizeLog(msg));
-      };
+      let shouldCaptureLogs = false;
+
+      stub(utils.logger, 'log', (...args) => {
+        shouldCaptureLogs = true;
+        utils.logger.log.originalValue(...args);
+        shouldCaptureLogs = false;
+      });
+
+      let stubLogs = (ctx, method, err) => stub(ctx, method, msg => {
+        if (!shouldCaptureLogs) return ctx[method].originalValue.call(ctx, msg);
+        else helpers.logger[err ? 'stderr' : 'stdout'].push(sanitizeLog(msg));
+      });
 
       if (process.env.__PERCY_BROWSERIFIED__) {
-        // use console[warn|error|log] in browsers
-        for (let m of ['warn', 'error', 'log']) {
-          stub(console, m, capture(m !== 'log'));
-        }
+        for (let m of ['warn', 'error', 'log']) stubLogs(console, m, m !== 'log');
       } else {
-        // use process[stdout|stderr].write in node
-        for (let io of ['stdout', 'stderr']) {
-          stub(process[io], 'write', capture(io === 'stderr'));
-        }
+        for (let io of ['stdout', 'stderr']) stubLogs(process[io], 'write', io === 'stderr');
       }
     },
 
@@ -93,6 +97,7 @@ const helpers = {
 
       helpers.logger.stdout.length = 0;
       helpers.logger.stderr.length = 0;
+      utils.logger.log.reset?.();
 
       if (process.env.__PERCY_BROWSERIFIED__) {
         for (let m of ['warn', 'error', 'log']) console[m].reset?.();