slnodejs 6.1.900 → 6.1.906

package/browser-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sl-browser-agent",
-  "version": "6.1.900",
+  "version": "6.1.906",
   "description": "le Browser Agent!",
   "main": "dist/browser-agent-all.js",
   "browser": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slnodejs",
-  "version": "6.1.900",
+  "version": "6.1.906",
   "description": "",
   "main": "tsOutputs/api.js",
   "workspaces": [

package/tsOutputs/build-scanner/build-diff-process.js

@@ -1,26 +1,42 @@
-var Promise = require('promise');
-var FilesMapping = require("./js_diff/files-mapping");
-var EnsureFilesHandlerService = require("./mappings/ensure-files-handler.service").EnsureFilesHandlerService;
-var DryRunFilesMapping = require("./js_diff/dry-run-files-mapping");
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BuildDiffProcess = void 0;
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const scm_files_container_1 = require("./scm/scm-files-container");
+const files_container_1 = require("./mappings/files-container");
+const sl_mapper_1 = require("./js_diff/sl-mapper");
+const file_path_fixer_1 = require("./mappings/file-path-fixer");
+const scm_file_fixer_1 = require("./scm/scm-file-fixer");
+const cockpit_notifier_1 = require("../common/agent-events/cockpit-notifier");
+const factory_1 = require("./source-map-eraser/factory");
+// not updated cjs modules
+const FilesMapping = require("./js_diff/files-mapping");
+const EnsureFilesHandlerServiceModule = require("./mappings/ensure-files-handler.service");
+const DryRunFilesMapping = require("./js_diff/dry-run-files-mapping");
+const utils = require("./utils.js");
+const DefaultValuesResolver = require("./default-values-resolver");
+const fileAndFolderUtils = require("./file-and-folder-utils");
+const BrowserInstrumenter = require("./instrumentation/browser-instrumenter");
+const SlEnvModule = require("../common/constants/sl-env-vars");
+const contracts_1 = require("./diagnostic/contracts");
+const system_date_1 = require("../common/system-date");
 // TODO: Find a way to get version number without relative path
 // var version = require("../package.json").version;
-var version = "1.0.0";
-var utils = require('./utils.js');
-var os = require("os");
-var path = require("path");
-var DefaultValuesResolver = require('./default-values-resolver');
-var fileAndFolderUtils = require("./file-and-folder-utils");
-var BrowserInstrumenter = require('./instrumentation/browser-instrumenter');
-var dvr = new DefaultValuesResolver();
-var { ScmFilesContainer } = require("./scm/scm-files-container");
-var { FilesContainer } = require("./mappings/files-container");
-var CiaEnvVars = require("../common/constants/sl-env-vars").SlEnvVars.CIA;
-const { BrowserSlMapper, SlMapper, NodeV8RawCoverageSlMapper } = require('./js_diff/sl-mapper');
-const { FilePathFixer } = require('./mappings/file-path-fixer');
-const { ScmFileFixer } = require('./scm/scm-file-fixer');
-const { CockpitNotifier } = require('../common/agent-events/cockpit-notifier');
-const { SourceMapEraserFactory } = require('./source-map-eraser/factory');
-const fs = require('fs');
+const version = '1.0.0';
+const { EnsureFilesHandlerService } = EnsureFilesHandlerServiceModule;
+const CiaEnvVars = SlEnvModule.SlEnvVars.CIA;
+const dvr = new DefaultValuesResolver();
 function shouldSubmitSlMapping(buildArguments) {
     if (!buildArguments.instrumentationOnly) {
         return true;
@@ -30,18 +46,18 @@ function shouldSubmitSlMapping(buildArguments) {
 function shouldSubmitNodeV8RawCoverageSlMapper(buildArguments) {
     return buildArguments.v8Coverage;
 }
-function getSlMapperInstance(buildArguments) {
+function resolveSlMapperInstance(buildArguments, outputPath, backendProxy, logger) {
     if (buildArguments.useRelativeSlMapping || buildArguments.instrumentForBrowsers) {
-        return BrowserSlMapper;
+        return new sl_mapper_1.BrowserSlMapper(outputPath, backendProxy, buildArguments.buildSessionId, logger);
     }
-    return SlMapper;
+    return new sl_mapper_1.SlMapper(outputPath, backendProxy, buildArguments.buildSessionId, logger);
 }
 function resolveFilePathFixer(handlerParams, buildArguments, slMapper, nodeV8RawCoverageSlMapper, logger) {
     if (buildArguments.scm === 'git') {
-        return new ScmFileFixer(handlerParams.filesContainer, slMapper, nodeV8RawCoverageSlMapper, logger, handlerParams.projectRoot, handlerParams.scmRootDir, buildArguments.useModulePrefix, buildArguments.uniqueModuleId, buildArguments.v8Coverage);
+        return new scm_file_fixer_1.ScmFileFixer(handlerParams.filesContainer, slMapper, nodeV8RawCoverageSlMapper, logger, handlerParams.projectRoot, handlerParams.scmRootDir, buildArguments.useModulePrefix, buildArguments.uniqueModuleId, buildArguments.v8Coverage);
     }
     else {
-        return new FilePathFixer(handlerParams.filesContainer, slMapper, nodeV8RawCoverageSlMapper, logger, handlerParams.projectRoot, buildArguments.useModulePrefix, buildArguments.uniqueModuleId, buildArguments.v8Coverage);
+        return new file_path_fixer_1.FilePathFixer(handlerParams.filesContainer, slMapper, nodeV8RawCoverageSlMapper, logger, handlerParams.projectRoot, buildArguments.useModulePrefix, buildArguments.uniqueModuleId, buildArguments.v8Coverage);
     }
 }
 // TODO: should be moved to ConfigLoader when it will exist in context of scan
@@ -63,63 +79,76 @@ function checkDeprecatedEnvVar(logger) {
     for (const deprecatedEnvVar of deprecatedEnvVars) {
         if (process.env[deprecatedEnvVar.key]) {
             logger.warn(`Deprecated env_var \`${deprecatedEnvVar.key}\` was provided. ${deprecatedEnvVar.message}`);
-            CockpitNotifier.sendWarning(`Deprecated env_var \`${deprecatedEnvVar.key}\` was provided with value - '${process.env[deprecatedEnvVar.key]}'. ${deprecatedEnvVar.message}`);
+            cockpit_notifier_1.CockpitNotifier.sendWarning(`Deprecated env_var \`${deprecatedEnvVar.key}\` was provided with value - '${process.env[deprecatedEnvVar.key]}'. ${deprecatedEnvVar.message}`);
         }
     }
 }
+// TODO: buildArgs not in use
 function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencies, logger, diagnostic) {
-    var log = logger.child({
-        className: "BuildDiffProcess"
+    const childLogger = logger.child({
+        className: 'BuildDiffProcess'
     });
     function createBuildDiffPromiseChain(buildArguments) {
         parsedDependencies = parsedDependencies || [];
-        var handlerParams = {
+        const handlerParams = {
             buildArguments: buildArguments,
             cfg: buildArguments,
             finalOutput: {
                 meta: createMetaTag(buildArguments),
-                version: "2.0",
+                version: '2.0',
                 files: [],
-                dependencies: parsedDependencies
-            }
+                dependencies: parsedDependencies,
+                includedFiles: [],
+                counters: {
+                    methods: 0,
+                    branches: 0,
+                }
+            },
+            processedFiles: null,
+            fileToCommitsMap: null,
+            scmRootDir: null,
+            filesContainer: null,
+            projectRoot: null,
+            filePathFixer: null,
+            commitToIndexMap: {},
+            emailToIndexMap: {},
         };
-        var promiseChain = Promise.resolve();
+        let promiseChain = Promise.resolve();
         // TODO: should be moved to ConfigLoader when it will exist
-        checkDeprecatedEnvVar(log);
+        checkDeprecatedEnvVar(childLogger);
         if (parsedDependencies.length == 0) { //If there are dependencies, no need to require workspacepath, scm, commit, and no need to perform actual scanning
-            var scmInstance;
+            let scmInstance;
             if (buildArguments.workspacepath) {
-                scmInstance = scmFactory.createScmByType(buildArguments.scm, buildArguments, buildArguments.workspacepath);
+                scmInstance = scmFactory.createScmByType(buildArguments.scm, buildArguments);
                 if (scmInstance) {
                     handlerParams.finalOutput.meta.scm = buildArguments.scm;
-                    log.info("Created an scmInstance of type '" + buildArguments.scm + "'. Searching for a local repository at '" + buildArguments.workspacepath + "'.");
+                    childLogger.info(`Created an scmInstance of type '${buildArguments.scm}'. Searching for a local repository at '${buildArguments.workspacepath}'.`);
                     if (!buildArguments.commit && !scmInstance.detectCommitVersion) {
-                        return Promise.reject("'commit' command-line argument is required, since automatic detection by the " + buildArguments.scm + " SCM is not supported");
+                        return Promise.reject(`'commit' command-line argument is required, since automatic detection by the '${buildArguments.scm}' SCM is not supported`);
                     }
                 }
                 else {
-                    log.warn("Unsupported scm type: '" + buildArguments.scm + "'.");
+                    childLogger.warn(`Unsupported scm type: '${buildArguments.scm}'.`);
                 }
                 //2. If there is a mapping, get the diffs
                 if (scmInstance) {
                     promiseChain = promiseChain.then(() => collectScmData(buildArguments, handlerParams, scmInstance));
                 }
                 promiseChain = promiseChain.then(function () {
-                    var fileMappingInstance = buildArguments.isDryRunMode ? DryRunFilesMapping : FilesMapping;
-                    var filesMapping = new fileMappingInstance(handlerParams, diagnostic, log, handlerParams.projectRoot);
+                    const FileMappingInstance = buildArguments.isDryRunMode ? DryRunFilesMapping : FilesMapping;
+                    const filesMapping = new FileMappingInstance(handlerParams, diagnostic, childLogger, handlerParams.projectRoot);
                     return filesMapping.process();
                 });
             }
         }
         //4. Submit the final output to the server
-        const slMapperInstance = getSlMapperInstance(buildArguments);
         let slMapper = null;
         let nodeV8RawCoverageSlMapper = null;
         promiseChain = promiseChain.then(function () {
-            slMapper = new slMapperInstance(CiaEnvVars.getSlMappingPath(), backendProxy, buildArguments.buildSessionId, logger);
-            nodeV8RawCoverageSlMapper = new NodeV8RawCoverageSlMapper(CiaEnvVars.getSlMappingPath(), backendProxy, buildArguments.buildSessionId, logger);
-            handlerParams.filePathFixer = resolveFilePathFixer(handlerParams, buildArguments, slMapper, nodeV8RawCoverageSlMapper, logger);
-            var fixer = new EnsureFilesHandlerService(logger, handlerParams.buildArguments, handlerParams.filesContainer, handlerParams.filePathFixer, handlerParams.scmRootDir, handlerParams.cfg, handlerParams.fileToCommitsMap, diagnostic);
+            slMapper = resolveSlMapperInstance(buildArguments, CiaEnvVars.getSlMappingPath(), backendProxy, childLogger);
+            nodeV8RawCoverageSlMapper = new sl_mapper_1.NodeV8RawCoverageSlMapper(CiaEnvVars.getSlMappingPath(), backendProxy, buildArguments.buildSessionId, childLogger);
+            handlerParams.filePathFixer = resolveFilePathFixer(handlerParams, buildArguments, slMapper, nodeV8RawCoverageSlMapper, childLogger);
+            const fixer = new EnsureFilesHandlerService(childLogger, handlerParams.buildArguments, handlerParams.filesContainer, handlerParams.filePathFixer, handlerParams.scmRootDir, handlerParams.cfg, handlerParams.fileToCommitsMap, diagnostic);
             const result = fixer.ensureProcess(handlerParams.finalOutput);
             handlerParams.finalOutput = result.output;
             if (buildArguments.awsConfigure) {
@@ -131,26 +160,21 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
                     slMapping: slMapping
                 }, null, 2));
             }
-            // if (buildArguments.instrumentForBrowsers) {
-            //     promiseChain = promiseChain.then(function () {
-            //         return submitSlMapping(promiseChain, slMapper, buildArguments.uniqueModuleId, logger)
-            //     })
-            // }
             if (buildArguments.instrumentationOnly) {
-                log.info("No need to submit the files to server as the 'instrumentationOnly' flag is on.");
+                childLogger.info('No need to submit the files to server as the \'instrumentationOnly\' flag is on.');
                 return Promise.resolve();
             }
             else {
                 //TODO: [SLDEV-4708] When the call to the server fails, the agent is "silent" and not showing any error message.
-                return backendProxy.submitBuildMapping(handlerParams.finalOutput);
+                return submitBuildMapping(buildArguments, handlerParams.finalOutput);
             }
         });
         //5. Print the counters
         promiseChain = promiseChain.then(function () {
-            var mapping = handlerParams.finalOutput;
+            const mapping = handlerParams.finalOutput;
             const counters = countElements(mapping.files);
             if (!buildArguments.isDryRunMode) {
-                log.lifecycle("Scanned " + counters.methods + " methods and " + counters.branches + " branches in " + counters.files + " files.");
+                childLogger.lifecycle(`Scanned ${counters.methods} methods and ${counters.branches} branches in ${counters.files} files.`);
             }
         });
         if (shouldSubmitSlMapping(buildArguments)) {
@@ -168,7 +192,7 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
         });
         // delete source maps if required
         if (buildArguments.excludeSourceMapFiles) {
-            const sourceMapsEraser = SourceMapEraserFactory.createSourceMapEraserByMode(buildArguments.excludeSourceMapFiles, logger, buildArguments.workspacepath);
+            const sourceMapsEraser = factory_1.SourceMapEraserFactory.createSourceMapEraserByMode(buildArguments.excludeSourceMapFiles, childLogger, buildArguments.workspacepath);
             promiseChain = promiseChain.then(function () {
                 return sourceMapsEraser.remove();
             });
@@ -179,25 +203,25 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
                 if (handlerParams.finalOutput && handlerParams.finalOutput.files && !buildArguments.isDryRunMode) {
                     delete handlerParams.finalOutput.files;
                 }
-                var promise = new Promise(function (resolve, reject) {
-                    var resolveWithoutHash = true;
-                    var delayShutdownInSeconds = buildArguments.delayShutdownInSeconds || 30;
-                    var downloadAgent = buildArguments.downloadAgent != null ? buildArguments.downloadAgent : true;
+                const promise = new Promise(function (resolve, reject) {
+                    const resolveWithoutHash = true;
+                    const delayShutdownInSeconds = buildArguments.delayShutdownInSeconds || 30;
+                    const downloadAgent = buildArguments.downloadAgent != null ? buildArguments.downloadAgent : true;
                     // TODO - is there any reason not to copy buildArguments as is an override specific fields which require logic?
-                    var instrumentationConfig = {
+                    const instrumentationConfig = {
                         appName: buildArguments.appname,
                         build: buildArguments.build,
                         customerId: buildArguments.customerId,
                         branch: buildArguments.branch,
                         sourceRoot: buildArguments.workspacepath,
-                        files: getProcessedFiles(buildArguments, handlerParams.processedFiles, logger),
+                        files: getProcessedFiles(buildArguments, childLogger),
                         outputPath: buildArguments.outputpath,
                         copyAllFilesToOutput: buildArguments.copyAllFilesToOutput !== false,
                         buildSessionId: buildArguments.buildSessionId,
-                        esModules: buildArguments["es6Modules"],
+                        esModules: buildArguments['es6Modules'],
                         server: buildArguments.server,
                         token: buildArguments.token,
-                        instrumentationType: "browser",
+                        instrumentationType: 'browser',
                         resolveWithoutHash: resolveWithoutHash,
                         delayShutdownInSeconds: delayShutdownInSeconds,
                         downloadAgent: downloadAgent,
@@ -217,21 +241,21 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
                         experimentalSizeReduction: buildArguments.experimentalSizeReduction,
                         newInstrumenter: buildArguments.newInstrumenter,
                     };
-                    log.info(`'instrumentForBrowsers' flag is on. Starting instrumentation. Instrumentation config: ${instrumentationConfig}`);
-                    var callback = function (err, processedFiles) {
+                    childLogger.info(`'instrumentForBrowsers' flag is on. Starting instrumentation. Instrumentation config: ${instrumentationConfig}`);
+                    const callback = function (err, processedFiles) {
                         if (buildArguments.isDryRunMode) {
                             return resolve({ err: err, processedFiles: processedFiles });
                         }
                         else if (err) {
-                            log.info(`Finished the instrumentation with an error. Error: ${err}`);
+                            childLogger.info(`Finished the instrumentation with an error. Error: ${err}`);
                             reject(err);
                         }
                         else {
-                            log.info("Finished the instrumentation successfully");
-                            return resolve();
+                            childLogger.info('Finished the instrumentation successfully');
+                            return resolve(null);
                         }
                     };
-                    runBrowserInstrumentation(log, instrumentationConfig, callback, slMapper);
+                    runBrowserInstrumentation(childLogger, instrumentationConfig, callback, slMapper);
                 });
                 return promise;
             });
@@ -239,36 +263,36 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
         return promiseChain;
     }
     function collectScmData(buildArguments, handlerParams, scmInstance) {
-        var promiseChain = Promise.resolve();
+        let promiseChain = Promise.resolve();
         //2.1 Get repository url from the SCM
         promiseChain = promiseChain.then(function () {
-            log.info("Getting repository URL.");
+            childLogger.info('Getting repository URL.');
             return getRepositoryUrl(handlerParams, scmInstance);
         });
         //2.2 Get all contributors from the scm
         if (buildArguments.sendContributors) {
             promiseChain = promiseChain.then(function () {
-                log.info("Getting contributors.");
+                childLogger.info('Getting contributors.');
                 return getContributors(handlerParams, scmInstance);
             });
         }
         //2.3 Get branch history from the SCM
         promiseChain = promiseChain.then(function () {
-            log.info("Loading branch history.");
+            childLogger.info('Loading branch history.');
             return loadBranchHistory(handlerParams, scmInstance);
         });
         //2.4 Get all commits effected each file
         if (buildArguments.sendContributors) {
             promiseChain = promiseChain.then(function (mapping) {
-                log.info("Getting commits per file.");
+                childLogger.info('Getting commits per file.');
                 return getCommitsPerFile(handlerParams, scmInstance);
             });
         }
         //2.5 if commit was not specified, automatically detect it
         if (!buildArguments.commit) {
             promiseChain = promiseChain.then(function () {
-                log.info("Couldn't find a 'commit' on the 'buildArguments'. Trying to detect the commit version.");
-                return scmInstance.detectCommitVersion(handlerParams, log).then(function (commit) {
+                childLogger.info(`Couldn't find a 'commit' on the 'buildArguments'. Trying to detect the commit version.`);
+                return scmInstance.detectCommitVersion(handlerParams, childLogger).then(function (commit) {
                     if (commit) {
                         handlerParams.finalOutput.meta.commit = commit;
                     }
@@ -277,19 +301,19 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
         }
         //2.6 Find repository root directory
         promiseChain = promiseChain.then(function () {
-            return scmInstance.getRootDirectory(handlerParams, log).then(function (rootDir) {
+            return scmInstance.getRootDirectory(handlerParams, childLogger).then(function (rootDir) {
                 handlerParams.scmRootDir = rootDir;
-                handlerParams.projectRoot = resolveProjectRoot(logger, diagnostic, buildArguments.projectRoot, handlerParams.scmRootDir);
+                handlerParams.projectRoot = resolveProjectRoot(childLogger, diagnostic, buildArguments.projectRoot, handlerParams.scmRootDir);
             });
         });
         //2.6 Get list of all files in git or fs
         promiseChain = promiseChain.then(function () {
-            return scmInstance.getFiles(handlerParams, log).then(function (scmFiles) {
+            return scmInstance.getFiles(handlerParams, childLogger).then(function (scmFiles) {
                 if (scmFiles && Array.isArray(scmFiles)) {
-                    return ScmFilesContainer.createWithFiles(logger, scmFiles);
+                    return scm_files_container_1.ScmFilesContainer.createWithFiles(childLogger, scmFiles);
                 }
                 else {
-                    return FilesContainer.create(logger, handlerParams.projectRoot, buildArguments.excludedFiles);
+                    return files_container_1.FilesContainer.create(childLogger, handlerParams.projectRoot, buildArguments.excludedFiles);
                 }
             })
                 .then(filesContainer => {
@@ -298,112 +322,146 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
         });
         // Get additional git details, like current branch and open branches if additionalGitDetails is enabled
         if (buildArguments.additionalGitDetails) {
-            handlerParams.finalOutput.meta.additionalGitDetails = {};
+            handlerParams.finalOutput.meta.additionalGitDetails = {
+                currentBranch: null,
+                openBranches: null,
+                submodules: null,
+            };
             promiseChain = promiseChain.then(function () {
-                return scmInstance.getCurrentGitBranch(handlerParams, log).then(function (currentBranch) {
+                return scmInstance.getCurrentGitBranch(handlerParams, childLogger).then(function (currentBranch) {
                     handlerParams.finalOutput.meta.additionalGitDetails.currentBranch = currentBranch;
                 });
             });
             promiseChain = promiseChain.then(function () {
-                return scmInstance.getOpenGitBranches(handlerParams, log).then(function (openBranches) {
+                return scmInstance.getOpenGitBranches(handlerParams, childLogger).then(function (openBranches) {
                     handlerParams.finalOutput.meta.additionalGitDetails.openBranches = openBranches;
                 });
             });
             // Check if workflow includes git submodules
             promiseChain = promiseChain.then(function () {
-                return scmInstance.getGitSubmodules(handlerParams, log).then(function (submodules) {
+                return scmInstance.getGitSubmodules(handlerParams, childLogger).then(function (submodules) {
                     handlerParams.finalOutput.meta.additionalGitDetails.submodules = submodules;
                 });
             });
         }
         return promiseChain;
     }
+    function submitBuildMapping(buildArguments, finalOutput) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!buildArguments.partialBuildMapping || buildArguments.partialBuildMapping === 0) {
+                return backendProxy.submitBuildMapping(finalOutput);
+            }
+            const startTime = (0, system_date_1.getSystemDate)();
+            const chunkSize = buildArguments.partialBuildMapping;
+            const files = clone(finalOutput.files);
+            const staticPart = clone(finalOutput);
+            staticPart.files = [];
+            let partNumber = 1;
+            for (let i = 0; i < files.length; i += chunkSize, partNumber += 1) {
+                const filesToSend = files.slice(i, i + chunkSize);
+                const chunk = Object.assign(Object.assign({}, staticPart), { files: filesToSend });
+                chunk.meta.partId = partNumber;
+                yield backendProxy.submitPartialBuildMapping(chunk, buildArguments.agentId, buildArguments.buildSessionId, partNumber.toString());
+            }
+            const endTime = (0, system_date_1.getSystemDate)();
+            return backendProxy.submitBuildMappingEnd({
+                agentId: buildArguments.agentId,
+                status: {
+                    success: true,
+                    message: 'success',
+                    duration: endTime.getTime() - startTime.getTime(),
+                },
+                labId: buildArguments.labId,
+                partsCount: partNumber - 1,
+            }, buildArguments.buildSessionId);
+        });
+    }
     this.run = function run(buildArguments) {
         return createBuildDiffPromiseChain(buildArguments);
     };
-    function runBrowserInstrumentation(log, instrumentationConfig, callback, slMapper) {
-        log.info("Running browser instrumentation.");
+    function runBrowserInstrumentation(logger, instrumentationConfig, callback, slMapper) {
+        logger.info('Running browser instrumentation.');
         instrumentationConfig.extensionsToInstrument = dvr.getFileExtensions();
-        var bi = new BrowserInstrumenter(instrumentationConfig, log, slMapper);
+        const bi = new BrowserInstrumenter(instrumentationConfig, logger, slMapper);
         bi.instrument(callback);
     }
     function loadBranchHistory(handlerParams, scmInstance) {
-        return scmInstance.getBranchHistory(handlerParams, log).then(function (gitLog) {
+        return scmInstance.getBranchHistory(handlerParams, childLogger).then(function (gitLog) {
             if (gitLog && gitLog.commitHistory && gitLog.commitHistory.length && gitLog.commitLog && gitLog.commitLog.length) {
-                log.info('Branch history loaded (' + gitLog.commitHistory.length + ' commits)');
+                childLogger.info('Branch history loaded (' + gitLog.commitHistory.length + ' commits)');
                 handlerParams.finalOutput.meta.history = gitLog.commitHistory;
                 handlerParams.finalOutput.meta.commitLog = gitLog.commitLog;
             }
             else {
-                logBranchHistoryNotFound(gitLog, log);
+                logBranchHistoryNotFound(gitLog, childLogger);
             }
-            return loadCommitIndexMap(gitLog, handlerParams, log);
+            return loadCommitIndexMap(gitLog, handlerParams, childLogger);
         });
     }
     function getRepositoryUrl(handlerParams, scmInstance) {
-        return scmInstance.getRepositoryUrl(handlerParams, log).then(function (repositoryUrl) {
+        return scmInstance.getRepositoryUrl(handlerParams, childLogger).then(function (repositoryUrl) {
             if (repositoryUrl) {
-                log.info('Repository Url loaded (' + repositoryUrl + ')');
+                childLogger.info('Repository Url loaded (' + repositoryUrl + ')');
                 handlerParams.finalOutput.meta.repositoryUrl = repositoryUrl;
             }
             return repositoryUrl;
         });
     }
     function getContributors(handlerParams, scmInstance) {
-        return scmInstance.getContributors(handlerParams, log).then(function (contributorsLog) {
+        return scmInstance.getContributors(handlerParams, childLogger).then(function (contributorsLog) {
             if (contributorsLog && contributorsLog.contributors && contributorsLog.emailToIndexMap) {
-                log.info('Contributors list loaded (' + contributorsLog.contributors.length + ' contributors)');
+                childLogger.info('Contributors list loaded (' + contributorsLog.contributors.length + ' contributors)');
                 handlerParams.finalOutput.meta.contributors = contributorsLog.contributors;
                 handlerParams.emailToIndexMap = contributorsLog.emailToIndexMap;
             }
             else {
-                logContributorsNotFound(contributorsLog, log);
+                logContributorsNotFound(contributorsLog, childLogger);
             }
             return contributorsLog;
         });
     }
     function getCommitsPerFile(handlerParams, scmInstance) {
-        return scmInstance.getCommitsPerFile(handlerParams, log).then(function (fileToCommitsMap) {
+        return scmInstance.getCommitsPerFile(handlerParams, childLogger).then(function (fileToCommitsMap) {
             if (fileToCommitsMap != null) {
-                log.info('File commit map loaded (' + Object.keys(fileToCommitsMap).length + ' records)');
+                childLogger.info('File commit map loaded (' + Object.keys(fileToCommitsMap).length + ' records)');
                 handlerParams.fileToCommitsMap = fileToCommitsMap;
             }
             else {
-                log.error("Commits map is null or undefined.");
+                childLogger.error('Commits map is null or undefined.');
             }
             return fileToCommitsMap;
         });
     }
 }
-function logContributorsNotFound(contributorsLog, log) {
-    var fieldsMap = {
+exports.BuildDiffProcess = BuildDiffProcess;
+function logContributorsNotFound(contributorsLog, logger) {
+    const fieldsMap = {
         contributorsLog: !contributorsLog,
         contributors: contributorsLog && !contributorsLog.contributors,
         emailToIndexMap: contributorsLog && !contributorsLog.emailToIndexMap
     };
-    var missing = utils.getMissingProperties(fieldsMap);
-    log.error("Contributors list not loaded, missing fields: " + missing);
+    const missing = utils.getMissingProperties(fieldsMap);
+    logger.error(`Contributors list not loaded, missing fields: ${missing}`);
 }
-function logBranchHistoryNotFound(gitLog, log) {
-    var fieldsMap = {
+function logBranchHistoryNotFound(gitLog, logger) {
+    const fieldsMap = {
         gitLog: !gitLog,
         commitHistory: gitLog && !gitLog.commitHistory,
         commitHistoryLength: gitLog && gitLog.commitHistory && !gitLog.commitHistory.length,
         commitLog: gitLog && !gitLog.commitLog,
         commitLogLength: gitLog && gitLog.commitLog && !gitLog.commitLog.length
     };
-    var missing = utils.getMissingProperties(fieldsMap);
-    log.error("Branch history not loaded, missing fields: " + missing);
+    const missing = utils.getMissingProperties(fieldsMap);
+    logger.error(`Branch history not loaded, missing fields: ${missing}`);
 }
 function clone(o) {
-    //if (!o) return o; //Unreachable
     return JSON.parse(JSON.stringify(o));
 }
-var getProcessedFiles = function (buildArguments, processedFiles, logger) {
-    var folderToScan = buildArguments.workspacepath;
+function getProcessedFiles(buildArguments, logger) {
+    const folderToScan = buildArguments.workspacepath;
     return fileAndFolderUtils.scanDirRecursively(folderToScan, logger);
-};
-var loadCommitIndexMap = function (gitLog, handlerParams, log) {
+}
+function loadCommitIndexMap(gitLog, handlerParams, logger) {
     if (!handlerParams.buildArguments.sendContributors) {
         return gitLog;
     }
@@ -411,23 +469,22 @@ var loadCommitIndexMap = function (gitLog, handlerParams, log) {
         handlerParams.commitToIndexMap = gitLog.commitToIndexMap;
     }
     else {
-        log.error("Commit log index map not loaded");
+        logger.error('Commit log index map not loaded');
     }
     return gitLog;
-};
+}
 function createMetaTag(buildArguments) {
     return {
-        "generated": new Date().valueOf(),
-        "build": buildArguments.build,
-        "commit": buildArguments.commit,
-        "customerId": buildArguments.customerId,
-        "appName": buildArguments.appname,
-        //"technologies": "nodejs",
-        "technology": "nodejs",
-        "branch": buildArguments.branch,
-        "environment": {
+        generated: (0, system_date_1.getSystemDate)().valueOf(),
+        build: buildArguments.build,
+        commit: buildArguments.commit,
+        customerId: buildArguments.customerId,
+        appName: buildArguments.appname,
+        technology: 'nodejs',
+        branch: buildArguments.branch,
+        environment: {
             agentVersion: version,
-            agentType: "nodeJsBuildScanner",
+            agentType: 'nodeJsBuildScanner',
             processArgv: process.argv,
             machineName: os.hostname(),
             platform: os.platform(),
@@ -439,16 +496,17 @@ function createMetaTag(buildArguments) {
             dependencies: clone(process.versions),
             runtime: process.version
         },
-        "authors": buildArguments.author,
-        "logsUrl": buildArguments.logsUrl,
-        "jobName": buildArguments.jobName,
-        "moduleName": buildArguments.uniqueModuleId,
-        "uniqueModuleId": buildArguments.uniqueModuleId,
-        "configurationData": buildArguments,
-        "scmProvider": buildArguments.scmProvider,
-        "scmVersion": buildArguments.scmVersion,
-        "scmBaseUrl": buildArguments.scmBaseUrl,
-        "buildSessionId": buildArguments.buildSessionId
+        authors: buildArguments.author,
+        logsUrl: buildArguments.logsUrl,
+        jobName: buildArguments.jobName,
+        moduleName: buildArguments.uniqueModuleId,
+        uniqueModuleId: buildArguments.uniqueModuleId,
+        configurationData: buildArguments,
+        scmProvider: buildArguments.scmProvider,
+        scmVersion: buildArguments.scmVersion,
+        scmBaseUrl: buildArguments.scmBaseUrl,
+        buildSessionId: buildArguments.buildSessionId,
+        agentId: buildArguments.agentId,
     };
 }
 function countElements(files) {
@@ -476,20 +534,19 @@ function resolveProjectRoot(logger, diagnosticCollector, cliOption, scmRootDir)
             // relative path should be resolved first
             projectRoot = path.resolve(process.cwd(), normalizedRoot);
         }
-        diagnosticCollector.projectRootResolved(projectRoot, 'command-argument');
+        diagnosticCollector.projectRootResolved(projectRoot, contracts_1.ProjectRootSource.COMMAND_ARG);
         logger.info(`Project root set to '${projectRoot}' from 'sourceRoot'`);
     }
     else if (scmRootDir) {
         projectRoot = scmRootDir;
-        diagnosticCollector.projectRootResolved(projectRoot, 'scm');
+        diagnosticCollector.projectRootResolved(projectRoot, contracts_1.ProjectRootSource.SCM);
         logger.info(`Project root set to '${projectRoot}' same as git root`);
     }
     else {
         projectRoot = process.cwd();
-        diagnosticCollector.projectRootResolved(projectRoot, 'cwd');
+        diagnosticCollector.projectRootResolved(projectRoot, contracts_1.ProjectRootSource.CWD);
         logger.info(`Project root set to '${projectRoot}' same as CWD`);
     }
     return utils.adjustPathSlashes(projectRoot);
 }
-module.exports.BuildDiffProcess = BuildDiffProcess;
 //# sourceMappingURL=build-diff-process.js.map