@testomatio/reporter 1.0.0-beta.4 → 1.1.0-beta

package/lib/logger.js

@@ -0,0 +1,221 @@
+const debug = require('debug')('@testomatio/reporter:logger');
+const { DataStorage } = require('./dataStorage');
+
+const LOG_METHODS = ['assert', 'debug', 'error', 'info', 'log', 'trace', 'warn'];
+
+/**
+ * Logger allows to:
+ * 1. Intercept logs from user logger (console.log, etc) and store them.
+ * 2. Output logs to console (actually, logger functionality).
+ * 3. Varied syntax.
+ */
+class Logger {
+  // _originalUserLogger used to output logs to console by the user logger
+  // _loggerToIntercept intercepted and reassigned immediately when added
+
+  constructor(params = {}) {
+    this.dataStorage = new DataStorage('log', params);
+
+    // commented because prefer to use "intercept" method
+    // if (params?.logger) this._loggerToIntercept = params.logger;
+
+    this.intercept(this._loggerToIntercept);
+
+    // singleton
+    if (!Logger.instance) {
+      Logger.instance = this;
+    }
+  }
+
+  /**
+   * Returns the string (logs) and the context
+   * This is required because loggers take multiple arguments
+   * @param  {...any} args
+   */
+  /*
+    TODO: its difficult to distinguish context from log artument if its not a string,
+    e.g. user can use something like console.log('some log', { key: 'value' });
+    consider not to use this method at all and don't expect context from user inside default log methods;
+    instead, use custom method like $`some log` and parse it
+  */
+  // _getLogStringAndContextFromArgs(...args) {
+  //   let context = '';
+  //   if (args.length > 1 && typeof args[args.length - 1] !== 'string') {
+  //     context = args.pop();
+  //   }
+  //   const logs = args.join(' ');
+  //   return { logs, context };
+  // }
+
+  /**
+   * Tagget template literal. Allows to use different syntaxes:
+   * 1. Tagget template: $`text ${someVar}`
+   * 2. Standard: $(`text ${someVar}`)
+   * 3. Standard with multiple arguments: $('text', someVar)
+   */
+  _log(strings, ...args) {
+    let logs;
+    // this block means tagged template is used (syntax like $`text ${someVar}`)
+    if (Array.isArray(strings) && strings.length === args.length + 1) {
+      logs = strings.reduce(
+        (result, current, index) =>
+          result +
+          current +
+          // strings are splitted by args when use tagged template, thus we add arg after each string
+          // it looks like: `string1 arg1 string2 arg2 string3`
+          (args[index] !== undefined // eslint-disable-line no-nested-ternary
+            ? typeof args[index] === 'string'
+              ? // add arg as it is
+                args[index]
+              : // stringify arg
+                this._strinfifyLogs(args[index])
+            : // add space if no arg after string
+              ' '),
+        // initial accumulator value
+        '',
+      );
+    } else {
+      // this block means arguments syntax is used (syntax like $('text', someVar))
+      logs = this._strinfifyLogs(strings, ...args);
+    }
+    this.dataStorage.putData(logs);
+  }
+
+  /**
+   *
+   * @param {*} context testId or test context from test runner
+   * @returns
+   */
+  getLogs(context) {
+    return this.dataStorage.getData(context);
+  }
+
+  _strinfifyLogs(...args) {
+    const logs = [];
+    // stringify everything except strings
+    for (const arg of args) {
+      if (typeof arg === 'string') {
+        logs.push(arg);
+      } else {
+        logs.push(JSON.stringify(arg));
+      }
+    }
+    return logs.join(' ');
+  }
+
+  assert(...args) {
+    const logs = this._strinfifyLogs(...args);
+    this.dataStorage.putData(logs);
+    try {
+      this._originalUserLogger.log(`Assertion result: `, ...args);
+    } catch (e) {
+      // method could be unexisting, ignore error
+    }
+  }
+
+  debug(...args) {
+    const logs = this._strinfifyLogs(...args);
+    this.dataStorage.putData(logs);
+    try {
+      this._originalUserLogger.debug(...args);
+    } catch (e) {
+      // method could be unexisting, ignore error
+    }
+  }
+
+  error(...args) {
+    const logs = this._strinfifyLogs(...args);
+    this.dataStorage.putData(logs);
+    try {
+      this._originalUserLogger.error(...args);
+    } catch (e) {
+      // method could be unexisting, ignore error
+    }
+  }
+
+  info(...args) {
+    const logs = this._strinfifyLogs(...args);
+    this.dataStorage.putData(logs);
+    try {
+      this._originalUserLogger.info(...args);
+    } catch (e) {
+      // method could be unexisting, ignore error
+    }
+  }
+
+  log(...args) {
+    const logs = this._strinfifyLogs(...args);
+    this.dataStorage.putData(logs);
+    try {
+      this._originalUserLogger.log(...args);
+    } catch (e) {
+      // method could be unexisting, ignore error
+    }
+  }
+
+  trace(...args) {
+    const logs = this._strinfifyLogs(...args);
+    this.dataStorage.putData(logs);
+    try {
+      this._originalUserLogger.trace(...args);
+    } catch (e) {
+      // method could be unexisting, ignore error
+    }
+  }
+
+  warn(...args) {
+    const logs = this._strinfifyLogs(...args);
+    this.dataStorage.putData(logs);
+    try {
+      this._originalUserLogger.warn(...args);
+    } catch (e) {
+      // method could be unexisting, ignore error
+    }
+  }
+
+  /**
+   * Intercepts user logger messages.
+   * When call this method, Logger start to control the user logger,
+   * but almost nothing is changed for user ragarding the console output (like log level set by user)
+   * (until multiple loggers are intercepted,
+   * in this case only the last intercepted logger will be used as user console output).
+   * @param {*} userLogger
+   */
+  intercept(userLogger) {
+    if (!userLogger) return;
+    debug(`Intercepting user logger`);
+
+    // save original user logger to use it for logging (last intercepted will be used for console output)
+    this._originalUserLogger = { ...userLogger };
+    this._loggerToIntercept = userLogger;
+
+    /* 
+    override user logger (any, e.g. console) methods to intercept log messages
+    this._loggerToIntercept = this; could be used, but decided to override only output methods
+    */
+    for (const method of LOG_METHODS) {
+      /*
+      decided to comment next code line because its better to create method even if it does not exist in user logger;
+      on method invocation, we will store the data anyway and catch block will prevent potential errors
+      */
+      // if (!this._loggerToIntercept[method]) continue;
+      this._loggerToIntercept[method] = (...args) => this[method](...args);
+    }
+  }
+}
+
+Logger.instance = null;
+
+// module.exports.Logger = Logger;
+module.exports = new Logger();
+
+// TODO: consider using fs promises instead of writeSync/appendFileSync to prevent blocking and improve performance
+// TODO: try to use method generator *
+// TODO: understand captureStackTrace in output (check on .error) (NOT SUCH IMPORTANT)
+// TODO: handle log levels to colorize logs later on UI
+// TODO: parse passed arguments as {level: 'str', message: 'str'} because some loggers use such syntax
+// TODO: add setLevel method - allows skip messages with the lower level
+// TODO: in case of unset _originalUserLogger, logger.{method} will not provide console output,
+// need to add some logger by default
+
+// TODO step method (blue color)

package/lib/pipe/github.js

@@ -39,8 +39,8 @@ class GitHubPipe {
   async createRun() {}
 
   addTest(test) {
-    debug('Adding test:', test);
     if (!this.isEnabled) return;
+    debug('Adding test:', test);
 
     const index = this.tests.findIndex(t => isSameTest(t, test));
     // update if they were already added
@@ -200,7 +200,7 @@ function fullName(t) {
 }
 
 async function deletePreviousReport(octokit, owner, repo, issue, hiddenCommentData) {
-  if (process.env.GITHUB_KEEP_OUTDATED_REPORTS) return;
+  if (process.env.GH_KEEP_OUTDATED_REPORTS) return;
 
   // get comments
   let comments = [];

package/lib/pipe/testomatio.js

@@ -169,6 +169,7 @@ class TestomatioPipe {
 
 module.exports = TestomatioPipe;
 
+
 function setS3Credentials(artifacts) {  
   if (!Object.keys(artifacts).length) return;
 
@@ -181,4 +182,4 @@ function setS3Credentials(artifacts) {
   if (artifacts.ENDPOINT) process.env.S3_ENDPOINT = artifacts.ENDPOINT; 
   if (artifacts.presign) process.env.TESTOMATIO_PRIVATE_ARTIFACTS = '1'; 
   resetConfig();
-}
+}

package/lib/reporter.js

@@ -1,9 +1,15 @@
+const logger = require('./logger');
 const TestomatClient = require('./client');
 const TRConstants = require('./constants');
-const TRArtifacts = require('./ArtifactStorage');
+const TRArtifacts = require('./_ArtifactStorageOld');
+
+const log = logger._log.bind(logger);
 
 module.exports = {
+  logger,
+  log,
   TestomatClient,
   TRConstants,
-  TRArtifacts
+  TRArtifacts,
+  addArtifact: TRArtifacts.artifact,
 };

package/lib/util.js

@@ -3,6 +3,7 @@ const { sep, basename } = require('path');
 const chalk = require('chalk');
 const fs = require('fs');
 const isValid = require('is-valid-path');
+const debug = require('debug')('@testomatio/reporter:util');
 
 /**
  * @param {String} testTitle - Test title
@@ -32,7 +33,6 @@ const parseSuite = suiteTitle => {
   return null;
 };
 
-
 const ansiRegExp = () => {
   const pattern = [
     '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
@@ -54,11 +54,14 @@ const isValidUrl = s => {
 
 const fetchFilesFromStackTrace = (stack = '') => {
   const files = stack.matchAll(/file:?\/(\/.*?\.(png|avi|webm|jpg|html|txt))/g);
-  return Array.from(files).map(f => f[1]).filter(f => fs.existsSync(f));
-}
+  return Array.from(files)
+    .map(f => f[1])
+    .filter(f => fs.existsSync(f));
+};
 
 const fetchSourceCodeFromStackTrace = (stack = '') => {
-  const stackLines = stack.split('\n')
+  const stackLines = stack
+    .split('\n')
     .filter(l => l.includes(':'))
     // .map(l => l.match(/\[(.*?)\]/)?.[1] || l) // minitest format
     // .map(l => l.split(':')[0])
@@ -67,17 +70,17 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
     .filter(l => isValid(l?.split(':')[0]))
 
     // // filter out 3rd party libs
-    .filter(l => !l?.includes(`vendor${  sep}`))
-    .filter(l => !l?.includes(`node_modules${  sep}`))
+    .filter(l => !l?.includes(`vendor${sep}`))
+    .filter(l => !l?.includes(`node_modules${sep}`))
     .filter(l => fs.existsSync(l.split(':')[0]))
-    .filter(l => fs.lstatSync(l.split(':')[0]).isFile())
+    .filter(l => fs.lstatSync(l.split(':')[0]).isFile());
 
   if (!stackLines.length) return '';
 
   const [file, line] = stackLines[0].split(':');
 
   const prepend = 3;
-  const source = fetchSourceCode(fs.readFileSync(file).toString(), { line, prepend, limit: 7 })
+  const source = fetchSourceCode(fs.readFileSync(file).toString(), { line, prepend, limit: 7 });
 
   if (!source) return '';
 
@@ -85,22 +88,22 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
     .map((l, i) => {
       if (i === prepend) return `${line} > ${chalk.bold(l)}`;
       return `${line - prepend + i} | ${l}`
-    }).join('\n')
-}
+    }).join('\n');
+};
 
 const fetchSourceCode = (contents, opts = {}) => {
   if (!opts.title && !opts.line) return '';
 
-    // code fragment is 20 lines
+  // code fragment is 20 lines
   const limit = opts.limit || 50;
   let lineIndex;
   if (opts.line) lineIndex = opts.line - 1;
-  const lines = contents.split('\n')
+  const lines = contents.split('\n');
 
   // remove special chars from title
   if (!lineIndex && opts.title) {
-    const title = opts.title.replace(/[([@].*/g, '')
-    lineIndex = lines.findIndex(l => l.includes(title))
+    const title = opts.title.replace(/[([@].*/g, '');
+    lineIndex = lines.findIndex(l => l.includes(title));
   }
 
   if (opts.prepend) {
@@ -133,52 +136,69 @@ const fetchSourceCode = (contents, opts = {}) => {
         if (opts.lang === 'java' && lines[i].includes(' public void ')) break;
         if (opts.lang === 'java' && lines[i].includes(' class ')) break;
       }
-      result.push(lines[i])
+      result.push(lines[i]);
     }
     return result.join('\n');
   }
-}
+};
 
-const isSameTest = (test, t) => (typeof t === 'object') 
-    && (typeof test === 'object') 
-    && t.title === test.title 
-    && t.suite_title === test.suite_title 
-    && Object.values(t.example || {}) === Object.values(test.example || {})
-    && t.test_id === test.test_id;
+const isSameTest = (test, t) =>
+  typeof t === 'object' &&
+  typeof test === 'object' &&
+  t.title === test.title &&
+  t.suite_title === test.suite_title &&
+  Object.values(t.example || {}) === Object.values(test.example || {}) &&
+  t.test_id === test.test_id;
 
 const getCurrentDateTime = () => {
   const today = new Date();
-  
-  return `${today.getFullYear()  }_${  today.getMonth() + 1  }_${  today.getDate()  }_${ 
-         today.getHours()  }_${  today.getMinutes()  }_${  today.getSeconds()}`;
-}
+
+  return `${today.getFullYear()}_${
+    today.getMonth() + 1
+  }_${today.getDate()}_${today.getHours()}_${today.getMinutes()}_${today.getSeconds()}`;
+};
 
 /**
  * @param {Object} test - Test adapter object
  *
- * @returns {String|null} testInfo as one string 
+ * @returns {String|null} testInfo as one string
  */
 const specificTestInfo = test => {
   // TODO: afterEach has another context.... need to add specific handler, maybe...
   if (test?.title && test?.file) {
-
-    return `${basename(test.file).split(".").join("#")
-              }#${ 
-              test.title.split(" ").join("#")}`;
+    return `${basename(test.file).split('.').join('#')}#${test.title.split(' ').join('#')}`;
   }
 
   return null;
 };
 
+const fileSystem = {
+  createDir(dirPath) {
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+      debug('Created dir: ', dirPath);
+    }
+  },
+  clearDir(dirPath) {
+    if (fs.existsSync(dirPath)) {
+      fs.rmSync(dirPath, { recursive: true });
+      debug(`Dir ${dirPath} was deleted`);
+    } else {
+      debug(`Trying to delete ${dirPath} but it doesn't exist`);
+    }
+  }
+};
+
 module.exports = {
   isSameTest,
   fetchSourceCode,
   fetchSourceCodeFromStackTrace,
   fetchFilesFromStackTrace,
+  fileSystem,
   getCurrentDateTime,
   specificTestInfo,
   isValidUrl,
   ansiRegExp,
   parseTest,
-  parseSuite 
-}
+  parseSuite,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.0.0-beta.4",
+  "version": "1.1.0-beta",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",