@zohodesk/react-cli 0.0.1-beta.16 → 0.0.1-beta.160

package/lib/servers/server.js

@@ -1,140 +1,132 @@
-'use strict';
+"use strict";
 
-var _fs = require('fs');
+var _path = _interopRequireDefault(require("path"));
 
-var _fs2 = _interopRequireDefault(_fs);
+var _https = _interopRequireDefault(require("https"));
 
-var _path = require('path');
+var _webpack = _interopRequireDefault(require("webpack"));
 
-var _path2 = _interopRequireDefault(_path);
+var _express = _interopRequireDefault(require("express"));
 
-var _https = require('https');
+var _ws = _interopRequireDefault(require("ws"));
 
-var _https2 = _interopRequireDefault(_https);
+var _compression = _interopRequireDefault(require("compression"));
 
-var _webpack = require('webpack');
+var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
 
-var _webpack2 = _interopRequireDefault(_webpack);
+var _httpProxyMiddleware = require("http-proxy-middleware");
 
-var _express = require('express');
+var _HMRMiddleware = _interopRequireDefault(require("../middlewares/HMRMiddleware"));
 
-var _express2 = _interopRequireDefault(_express);
+var _utils = require("../utils");
 
-var _ws = require('ws');
-
-var _ws2 = _interopRequireDefault(_ws);
-
-var _compression = require('compression');
-
-var _compression2 = _interopRequireDefault(_compression);
-
-var _webpackDevMiddleware = require('webpack-dev-middleware');
-
-var _webpackDevMiddleware2 = _interopRequireDefault(_webpackDevMiddleware);
-
-var _HMRMiddleware = require('../middlewares/HMRMiddleware');
-
-var _HMRMiddleware2 = _interopRequireDefault(_HMRMiddleware);
-
-var _utils = require('../utils');
+var _httpsOptions = require("./httpsOptions");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var options = (0, _utils.getOptions)();
-var _options$app = options.app,
-    context = _options$app.context,
-    server = _options$app.server;
-var host = server.host,
-    port = server.port,
-    domain = server.domain,
-    mode = server.mode,
-    disableContextURL = server.disableContextURL,
-    hasMock = server.hasMock;
-
-
-var isCompatableHttp2 = Number(process.version.substr(1).split('.')[0]) >= 8;
-
-var contextURL = disableContextURL ? '' : '/' + context;
-var serverUrl = (0, _utils.getServerURL)(server, 'htt' + 'ps');
+// import fs from 'fs';
+let options = (0, _utils.getOptions)();
+let {
+  app: {
+    context,
+    server
+  }
+} = options;
+let {
+  host,
+  port,
+  domain,
+  mode,
+  disableContextURL,
+  hasMock,
+  mockPort
+} = server;
+let isCompatableHttp2 = Number(process.version.substr(1).split('.')[0]) >= 8;
+let contextURL = disableContextURL ? '' : `/${context}`;
+let serverUrl = (0, _utils.getServerURL)(server, 'htt' + 'ps');
+const {
+  writeToDisk
+} = options.impactService;
+const app = (0, _express.default)();
 
-var app = (0, _express2.default)();
+if (hasMock) {
+  app.use(server.mockPrefix, (0, _httpProxyMiddleware.createProxyMiddleware)({
+    target: 'ht' + `tp://localhost:${mockPort}`,
+    changeOrigin: true
+  }));
+}
 
-app.use(_express2.default.json());
-app.use(_express2.default.urlencoded({
+app.use(_express.default.json());
+app.use(_express.default.urlencoded({
   extended: true
 }));
+let config;
 
-var config = void 0;
 if (mode === 'prod') {
   config = require('../configs/webpack.prod.config');
-  app.use((0, _compression2.default)());
-} else if (mode === 'dev') {
+  app.use((0, _compression.default)());
+} else if (mode === 'dev' || mode === 'dev-no-warn') {
   config = require('../configs/webpack.dev.config');
 } else {
   throw new Error('You must configure valid option in mode');
 }
 
-process.isDevelopment = true;
-
-var compiler = (0, _webpack2.default)(config);
-var appPath = process.cwd();
-
-app.use((0, _webpackDevMiddleware2.default)(compiler, {
+let compiler = (0, _webpack.default)(config);
+let webpackServerOptions = {
   logLevel: 'error',
-  publicPath: mode === 'prod' ? contextURL === '' ? serverUrl + '/' + contextURL : serverUrl + contextURL : config.output.publicPath,
-  headers: { 'Access-Control-Allow-Origin': '*' },
+  publicPath: mode === 'prod' ? contextURL === '' ? `${serverUrl}/${contextURL}` : serverUrl + contextURL : config.output.publicPath,
+  headers: options.app.enableDevCache ? {
+    'Cache-Control': 'public, max-age=604800',
+    'Access-Control-Allow-Origin': '*'
+  } : {
+    'Access-Control-Allow-Origin': '*'
+  },
   compress: mode === 'prod'
-}));
+};
 
-app.use((0, _HMRMiddleware2.default)(compiler, { path: '/sockjs-node/info' }));
+if (options.app.disableWatch) {
+  webpackServerOptions.watchOptions = {
+    ignored: /./
+  };
+}
 
-if (hasMock) {
-  var mockServerPath = _path2.default.join(appPath, 'mockapi', 'index.js');
-  if (_fs2.default.existsSync(mockServerPath)) {
-    var mockServer = require(mockServerPath);
-    mockServer(app);
-  } else {
-    (0, _utils.log)('You must export a function from mockapi folder by only we can provide mock api hook');
-  }
+if (writeToDisk) {
+  webpackServerOptions.writeToDisk = true;
 }
 
-app.use(function (req, res, next) {
+app.use((0, _webpackDevMiddleware.default)(compiler, webpackServerOptions));
+app.use((0, _HMRMiddleware.default)(compiler, {
+  path: '/sockjs-node/info'
+}));
+app.use((req, res, next) => {
   res.setHeader('Access-Control-Allow-Origin', '*');
   next();
-}).use(contextURL + '/fonts', _express2.default.static(context + '/fonts'));
-
-app.use('/wms/*', function (req, res) {
-  res.sendFile(_path2.default.join(__dirname, '..', '..', 'templates', 'wms', 'index.html'));
+}).use(`${contextURL}/fonts`, _express.default.static(`${context}/fonts`));
+app.use('/wms/*', (req, res) => {
+  res.sendFile(_path.default.join(__dirname, '..', '..', 'templates', 'wms', 'index.html'));
 });
 
-var httpsServer = _https2.default.createServer({
-  key: _fs2.default.readFileSync(_path2.default.join(__dirname, '../../cert/key.pem')),
-  cert: _fs2.default.readFileSync(_path2.default.join(__dirname, '../../cert/cert.pem')),
-  passphrase: 'zddqa1585f82'
-}, app);
-
-var wss = new _ws2.default.Server({ server: httpsServer });
-var wsPool = [];
+const httpsServer = _https.default.createServer(_httpsOptions.httpsOptions, app);
 
-wss.on('connection', function (ws) {
+const wss = new _ws.default.Server({
+  server: httpsServer
+});
+let wsPool = [];
+wss.on('connection', ws => {
   wsPool.push(ws);
-
-  ws.on('close', function () {
-    wsPool = wsPool.filter(function (ws1) {
-      return ws1 !== ws;
-    });
+  ws.on('close', () => {
+    wsPool = wsPool.filter(ws1 => ws1 !== ws);
   });
-
-  ws.on('message', function (message) {
+  ws.on('message', message => {
     (0, _utils.log)('received: %s', message);
   });
-
   ws.send('something');
 });
-
-app.post('/wmsmockapi', function (req, res) {
-  wsPool.forEach(function (ws) {
-    var body = req.body;
+app.post('/wmsmockapi', (req, res) => {
+  wsPool.forEach(ws => {
+    let {
+      body
+    } = req;
 
     try {
       ws.send(JSON.stringify(body));
@@ -142,67 +134,69 @@ app.post('/wmsmockapi', function (req, res) {
       (0, _utils.log)(e, body);
     }
   });
-
   res.send('success');
 });
+let webpackCompilation;
+compiler.hooks.afterCompile.tap('ReactCLI', compilation => {
+  webpackCompilation = compilation;
+});
 
 if (contextURL) {
-  app.use(contextURL, _express2.default.static(context));
-  app.use(contextURL + '/*', _express2.default.static(context));
+  app.use(contextURL, _express.default.static(context));
+  app.use(`${contextURL}/*`, (req, res) => {
+    let indexHtml = webpackCompilation.assets['index.html'];
+    res.send(indexHtml && indexHtml.source());
+  });
 } else {
-  app.use(_express2.default.static(context));
-  app.use('/*', _express2.default.static(context));
+  app.use(_express.default.static(context));
+  app.use('/*', _express.default.static(context));
 }
 
-httpsServer.listen(port, function (err) {
+httpsServer.listen(port, err => {
   if (err) {
     throw err;
   }
-  (0, _utils.log)('Listening at ' + serverUrl + contextURL + '/');
+
+  (0, _utils.log)(`Listening at ${serverUrl}${contextURL}/`);
 });
 
 if (isCompatableHttp2) {
-  var http2 = require('http2');
-  var http2Server = http2.createSecureServer({
-    key: _fs2.default.readFileSync(_path2.default.join(__dirname, '../../cert/key.pem')),
-    cert: _fs2.default.readFileSync(_path2.default.join(__dirname, '../../cert/cert.pem')),
-    passphrase: 'zddqa1585f82'
-  });
+  const http2 = require('http2');
+
+  const http2Server = http2.createSecureServer(_httpsOptions.httpsOptions); // eslint-disable-next-line no-unused-vars
 
-  //eslint-disable-next-line
-  http2Server.on('stream', function (stream, headers) {
+  http2Server.on('stream', (stream, headers) => {
     stream.respond({
       'content-type': 'text/html',
       ':status': 200
     });
     stream.end('<h1>Hello World! <br>Working with http2</h1>');
   });
-
-  var http2Port = Number(port) + 1;
-
-  http2Server.listen(http2Port, function (err) {
+  let http2Port = Number(port) + 1;
+  http2Server.listen(http2Port, err => {
     if (err) {
       throw err;
     }
-    (0, _utils.log)('Listening at ' + (0, _utils.getServerURL)({
-      host: host,
-      domain: domain,
+
+    (0, _utils.log)(`Listening at ${(0, _utils.getServerURL)({
+      host,
+      domain,
       port: http2Port
-    }, 'htt' + 'ps') + contextURL + '/', 'http2 server');
+    }, 'htt' + 'ps')}${contextURL}/`, 'http2 server');
   });
 } else {
   (0, _utils.log)('Your node version didn\'t adopted http2 support. Kindly update that to 8 LTS or above you can engage the http2');
 }
 
-var httpPort = Number(port) + (isCompatableHttp2 ? 2 : 1);
-
-app.listen(httpPort, function (err) {
+let httpPort = Number(port) + (isCompatableHttp2 ? 2 : 1);
+app.listen(httpPort, err => {
   if (err) {
     throw err;
   }
-  (0, _utils.log)('Listening at ' + (0, _utils.getServerURL)({
-    host: host,
-    domain: domain,
+
+  (0, _utils.log)(`Listening at ${(0, _utils.getServerURL)({
+    host,
+    domain,
     port: httpPort
-  }, 'ht' + 'tp') + contextURL + '/');
+  }, 'ht' + 'tp')}${contextURL}/`);
 });

package/lib/servers/ssServer.js

@@ -1,81 +1,123 @@
-'use strict';
+"use strict";
 
-var _child_process = require('child_process');
+var _screenshotTest = _interopRequireDefault(require("@zohodesk/screenshot-test"));
 
-var _screenshotTest = require('@zohodesk/screenshot-test');
+var _jsonHelper = require("../utils/jsonHelper");
 
-var _screenshotTest2 = _interopRequireDefault(_screenshotTest);
+var _utils = require("../utils");
 
-var _utils = require('../utils');
+var _docsServerCore = _interopRequireDefault(require("./docsServerCore"));
 
-var _docsServerCore = require('./docsServerCore');
-
-var _docsServerCore2 = _interopRequireDefault(_docsServerCore);
+var _SSTMiddleware = _interopRequireDefault(require("../middlewares/SSTMiddleware"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var options = (0, _utils.getOptions)();
-var _options$ssTest = options.ssTest,
-    seleniumHub = _options$ssTest.seleniumHub,
-    remoteBranch = _options$ssTest.remoteBranch,
-    referBranch = _options$ssTest.referBranch,
-    server = options.docs.server;
+let options = (0, _utils.getOptions)();
+let impactedComponentObject = null;
+let docsServerInstance;
+let {
+  ssTest: {
+    seleniumHub,
+    referBranch,
+    currentBranch,
+    enableImage,
+    pathToSubProjects
+  },
+  docs: {
+    server
+  }
+} = options;
+
+function closeServer(serverInstance) {
+  (0, _utils.log)('Docs service stopped!');
+  let {
+    http,
+    https,
+    wdm
+  } = serverInstance;
+  http.close();
+  https.close();
+  wdm.close();
+}
 
+(0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.compareBranch', referBranch);
+(0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.TestBranch', currentBranch);
+(0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.isExecuted', true);
+(0, _utils.log)('Test Branch Name :- ', currentBranch);
+
+let afterFirstScreenShotCollected = () => {
+  closeServer(docsServerInstance);
+  (0, _utils.switchBranch)('git', referBranch).then(() => {
+    (0, _utils.log)('Reference Branch Name :- ', (0, _utils.getCurrentBranch)());
+    (0, _utils.reinstallDependencies)(pathToSubProjects).then(() => {
+      (0, _utils.ssTestHack)();
+    });
+  });
+};
 
-var docsServerInstance = (0, _docsServerCore2.default)(true);
+let onSStestEnd = (status, resultObject, isLastRun, runSSTest) => {
+  if (status) {
+    if (!isLastRun) {
+      (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.result', resultObject);
+      runSSTest(afterFirstScreenShotCollected, true, 'reference', referBranch, impactedComponentObject);
+    } else {
+      (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.endTime', Date.now());
+      (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.isPassed', true);
+      (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.result', resultObject);
+      (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.message', 'Screenshot test succesfully completed.');
+      (0, _jsonHelper.setTestInfoStatus)(`${process.cwd()}/result.json`, true);
+      (0, _utils.log)('Screenshot test completed succesfully.');
+      closeServer(docsServerInstance);
+    }
+  } else {
+    (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.isPassed', false);
+    (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.message', 'Component list undefined! Please check component Docs');
+    (0, _jsonHelper.setTestInfoStatus)(`${process.cwd()}/result.json`, false);
+    (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'testInfo.failures', {
+      type: 'screenshotTest',
+      message: 'Component list undefined! Please check component Docs'
+    });
+    closeServer(docsServerInstance);
+    (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.endTime', Date.now());
+    throw new Error('Component list undefined! Please check component Docs');
+  }
+};
 
-(0, _utils.log)((0, _utils.getCurrentBranch)(), 'Test Branch');
+(0, _utils.ssTestHack)();
 
-if (remoteBranch) {
-  docsServerInstance.http.post('/repo/merge', function (req, res) {
-    var ref = req.body.ref;
+let getDocsServerInstance = beforeJobs => {
+  if (typeof beforeJobs === 'function') {
+    beforeJobs();
+  }
 
-    if (ref && ref.endsWith(remoteBranch)) {
-      (0, _child_process.spawnSync)('git', ['pull', 'origin', remoteBranch], {
-        stdio: 'inherit'
-      });
-    }
-    res.send('done');
-  });
-}
-
-var afterFirstScreenShotCollected = function afterFirstScreenShotCollected() {
-  (0, _child_process.spawnSync)('git', ['checkout', referBranch], { encoding: 'utf8' });
-  (0, _utils.log)((0, _utils.getCurrentBranch)(), 'Reference Branch');
+  return (0, _docsServerCore.default)(true);
 };
-var runSSTest = function runSSTest(onBefore, isLastRun, mode) {
-  typeof onBefore === 'function' && onBefore();
-  _screenshotTest2.default.run({
-    seleniumHub: seleniumHub,
-    url: (0, _utils.getServerURL)(server, 'ht' + 'tps') + '/docs/component.html',
-    browserList: ['chrome'],
-    mode: mode,
-    script: 'var Objlist={};for (i in Component){try{if(Component[i].prototype.isReactComponent){Objlist[i]=Component[i].docs.componentGroup;}}catch(err){console.log(i,err);}}; return Objlist'
-  }, function (status) {
-    if (status) {
-      if (!isLastRun) {
-        runSSTest(afterFirstScreenShotCollected, true, 'reference');
-      } else {
-        (0, _utils.log)('Screenshot test succesfully completed.');
-        var http = docsServerInstance.http,
-            https = docsServerInstance.https,
-            wdm = docsServerInstance.wdm;
-
-        http.close();
-        https.close();
-        wdm.close();
-      }
-    } else {
-      var _http = docsServerInstance.http,
-          _https = docsServerInstance.https,
-          _wdm = docsServerInstance.wdm;
-
-      _http.close();
-      _https.close();
-      _wdm.close();
-      throw new Error('Component list undefined! Please check component Docs');
-    }
-  });
+
+let runSSTest = (onBefore, isLastRun, mode, branch, listOfComponents) => {
+  let url = (0, _utils.getServerURL)(Object.assign(server, {
+    host: server.iphost
+  }), 'ht' + 'tp');
+  docsServerInstance = getDocsServerInstance(onBefore);
+  docsServerInstance.app.use((0, _SSTMiddleware.default)(docsServerInstance.compiler, mData => {
+    impactedComponentObject = (0, _utils.getComponents)(mData, listOfComponents);
+
+    _screenshotTest.default.run({
+      branch,
+      seleniumHub: seleniumHub,
+      url: `${url}/docs/components.html`,
+      browserList: ['chrome'],
+      mode,
+      enableImage,
+      impactedComponentObject,
+      script: 'var Objlist = {};for (i in Component) {try { if (Component[i].prototype.isReactComponent) Objlist[i] = Component[i].docs.componentGroup;}catch (err) {console.log(i, err);}};if (Object.keys(Objlist).length < 5) {Objlist = false;}return Objlist;'
+    }, (status, finalObj) => {
+      onSStestEnd(status, finalObj, isLastRun, runSSTest);
+    });
+  }));
 };
 
-runSSTest(null, null, 'test');
+(0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'tests.screenshotTest.startTime', Date.now());
+(0, _utils.getDependenciesImpactList)(currentBranch, referBranch).then(impactedList => {
+  (0, _utils.log)('from here ');
+  runSSTest(null, null, 'test', currentBranch, impactedList);
+});

package/lib/sh/reportPublish.sh

@@ -2,13 +2,12 @@
 branchName=$2
 url=$1
 zipUrl=$3
-commitMessage=$8
-
 unique=$(date +"%d_%m_%y_Time_%H_%M_%S")
 publishFolder=$branchName"_"$unique
 
 rm -rf ./reports
 rm -rf ./scrTemplate
+rm -rf ./errTemplate
 rm -rf ./css
 rm -rf ./js
 rm -rf ./index.html
@@ -18,13 +17,20 @@ curl $zipUrl | tar xz
 cp -rf ./reports/css ./css
 cp -rf ./reports/js ./js
 cp -rf ./reports/index.html ./index.html
+if [ -d "./screenShots" ] ; then
+  cp -rf ./scrTemplate/* ./screenShots/
+else
+  mkdir ./screenShots
+  cp -rf ./scrTemplate/* ./screenShots/
+fi
 
-cp -rf ./scrTemplate/css ./screenShots/css
-cp -rf ./scrTemplate/js ./screenShots/js
-cp -rf ./scrTemplate/images ./screenShots/images
-cp -rf ./scrTemplate/index.html ./screenShots/index.html
+[ ! -f "./result.json" ] && touch result.json && cp -rf ./errTemplate/* ./result.json
+[ ! -d "./commitCoverage" ] && mkdir commitCoverage && cp -rf ./errTemplate/* ./commitCoverage/
+[ ! -d "./unittest" ] && mkdir unittest && cp -rf ./errTemplate/* ./unittest/
+[ ! -d "./coverageTest" ] && mkdir coverageTest && cp -rf ./errTemplate/* ./coverageTest/
+[ ! -d "./coverage" ] && mkdir coverage && cp -rf ./errTemplate/* ./coverage/
 
-tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html
+tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html ./result.json
 
 curl -i -F name=file -F file=@$publishFolder.tar.gz $url"/cgi-bin/upload.py"
 replace=$publishFolder
@@ -33,7 +39,7 @@ subject="Client Report - React - $publishFolder"
 msg="<p><b>Report URL - <a href='$reportUrl'>Link</a></b></p>
 <p><b>Report Branchname - $branchName</b></p>
 <p><b>Report Unique ID - $unique</b></p>
-<p><b>Report Developer - $6</b></p>
-<p><b>Report commitMessage - $commitMessage</b></p>"
+<p><b>Report Developer - $6</b></p>"
 #node mailSender.js <from> <pass> <to> <subject> <text>
-node ./node_modules/@zohodesk/react-cli/lib/utils/mailSender $4 $5 $6 "$subject" "$msg" $7
+BASEDIR=$(dirname "$0")
+node $BASEDIR"/../utils/mailSender" $4 $5 $6 "$subject" "$msg" $7 $8 "$reportUrl"

package/lib/templates/CoverageScriptTemplate.js

@@ -1,44 +1,71 @@
-'use strict';
+"use strict";
 
 window.ClientCoverage = {
   LocalStorageWrapper: {
-    getLocalStorage: function getLocalStorage(property, defaultVal) {
+    getLocalStorage(property, defaultVal) {
       if (localStorage.hasOwnProperty(property)) {
         Object.assign(defaultVal, JSON.parse(localStorage.getItem(property)));
-        localStorage.setItem(property, JSON.stringify(defaultVal));return defaultVal;
+        localStorage.setItem(property, JSON.stringify(defaultVal));
+        return defaultVal;
       }
-      localStorage.setItem(property, JSON.stringify(defaultVal));return defaultVal || {};
+
+      localStorage.setItem(property, JSON.stringify(defaultVal));
+      return defaultVal || {};
     },
-    clearLocalStorage: function clearLocalStorage(property) {
+
+    clearLocalStorage(property) {
       localStorage.removeItem(property);
     }
-  }, JS: {
-    jsMethodInstrumentObject: {}, jsStorageKey: 'jsClientCoverageObject', init: function init() {
+
+  },
+  JS: {
+    jsMethodInstrumentObject: {},
+    jsStorageKey: 'jsClientCoverageObject',
+
+    init() {
       this.jsMethodInstrumentObject = ClientCoverage.LocalStorageWrapper.getLocalStorage(this.jsStorageKey, this.jsMethodInstrumentObject);
     },
-    visitMethod: function visitMethod(jsFileName, jsMethodName) {
-      this.init();if (this.jsMethodInstrumentObject.hasOwnProperty(jsFileName)) {
+
+    visitMethod(jsFileName, jsMethodName) {
+      this.init();
+
+      if (this.jsMethodInstrumentObject.hasOwnProperty(jsFileName)) {
         if (!this.jsMethodInstrumentObject[jsFileName].includes(jsMethodName)) {
           this.jsMethodInstrumentObject[jsFileName].push(jsMethodName);
         }
       } else {
-        this.jsMethodInstrumentObject[jsFileName] = [];this.jsMethodInstrumentObject[jsFileName].push(jsMethodName);
+        this.jsMethodInstrumentObject[jsFileName] = [];
+        this.jsMethodInstrumentObject[jsFileName].push(jsMethodName);
       }
+
       localStorage.setItem(this.jsStorageKey, JSON.stringify(this.jsMethodInstrumentObject));
     },
-    clear: function clear() {
-      this.jsMethodInstrumentObject = {};ClientCoverage.LocalStorageWrapper.clearLocalStorage(this.jsStorageKey);
+
+    clear() {
+      this.jsMethodInstrumentObject = {};
+      ClientCoverage.LocalStorageWrapper.clearLocalStorage(this.jsStorageKey);
     },
-    getData: function getData() {
-      return { methods: this.jsMethodInstrumentObject };
+
+    getData() {
+      return {
+        methods: this.jsMethodInstrumentObject
+      };
     }
-  }, getCoverageData: function getCoverageData() {
-    return { JS: this.JS.getData() };
+
+  },
+
+  getCoverageData() {
+    return {
+      JS: this.JS.getData()
+    };
   },
-  clear: function clear() {
+
+  clear() {
     this.JS.clear();
   },
-  init: function init() {
+
+  init() {
     this.JS.init();
   }
+
 };