slnodejs 6.0.42 → 6.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/browser-agent/dist/browser-agent-all.js +70 -21
- package/browser-agent/dist/browser-agent-all.min.js +16 -16
- package/browser-agent/package.json +2 -2
- package/package.json +6 -5
- package/tsOutputs/api.d.ts +0 -2
- package/tsOutputs/api.js +1 -2
- package/tsOutputs/build-scanner/ast-utils.js +1 -1
- package/tsOutputs/build-scanner/ast-utils.js.map +1 -1
- package/tsOutputs/build-scanner/build-diff-process.js +15 -9
- package/tsOutputs/build-scanner/build-diff-process.js.map +1 -1
- package/tsOutputs/build-scanner/file-system/actual-file.js +38 -18
- package/tsOutputs/build-scanner/file-system/actual-file.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js +0 -3
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js +1 -1
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/file-signature.js +7 -4
- package/tsOutputs/build-scanner/js_diff/file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/files-mapping.js +6 -23
- package/tsOutputs/build-scanner/js_diff/files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/generated-file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js +3 -0
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js +3 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js +61 -0
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js +1 -1
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +214 -0
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/file-element-utils.js +47 -0
- package/tsOutputs/build-scanner/mappings/file-element-utils.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/file-enricher.js +210 -0
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/files-data-container.js +52 -0
- package/tsOutputs/build-scanner/mappings/files-data-container.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js +80 -0
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js.map +1 -0
- package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js +8 -6
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js +77 -17
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js +8 -3
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js.map +1 -1
- package/tsOutputs/common/config-process/config.js +1 -1
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +10 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy.d.ts +1 -0
- package/tsOutputs/common/http/backend-proxy.js +10 -0
- package/tsOutputs/common/http/backend-proxy.js.map +1 -1
- package/tsOutputs/common/http/contracts.d.ts +78 -1
- package/tsOutputs/common/http/contracts.js.map +1 -1
- package/tsOutputs/common/scm/git-cloner.js +138 -0
- package/tsOutputs/common/scm/git-cloner.js.map +1 -0
- package/tsOutputs/common/state-tracker.js +2 -5
- package/tsOutputs/common/state-tracker.js.map +1 -1
- package/tsOutputs/common/utils/files-utils.d.ts +1 -0
- package/tsOutputs/common/utils/files-utils.js +9 -0
- package/tsOutputs/common/utils/files-utils.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js +7 -0
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sl-browser-agent",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.1.10",
|
|
4
4
|
"description": "le Browser Agent!",
|
|
5
5
|
"main": "dist/browser-agent-all.js",
|
|
6
6
|
"devDependencies": {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"build": "npm run browserify",
|
|
17
17
|
"build-tests": "tsc -p ./tsconfig.tests.json",
|
|
18
18
|
"test": "../node_modules/.bin/tsc -p ./tsconfig.tests.json && ../node_modules/.bin/mocha build-test/browser-agent/test/unitTest/**/*.js",
|
|
19
|
-
"prebrowserify": "
|
|
19
|
+
"prebrowserify": "tsc -p ./tsconfig.browserfiy.json && mkdir dist",
|
|
20
20
|
"browserify": "node_modules/.bin/browserify tsOutputs/browser-agent/index.js -o ./dist/browser-agent-all.js",
|
|
21
21
|
"postbrowserify": "node_modules/.bin/uglifyjs -o ./dist/browser-agent-all.min.js dist/browser-agent-all.js",
|
|
22
22
|
"tsify": "globify index.ts lib/**/*.ts typings/**/*.ts --debug --standalone agnt -p [ tsify -p ./tsconfig.browserfiy.json ] -o ./dist-debug/browser-agent-all.js"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "slnodejs",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.1.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "tsOutputs/api.js",
|
|
6
6
|
"scripts": {
|
|
@@ -16,15 +16,16 @@
|
|
|
16
16
|
"ut:browser-agent": "cd browser-agent && npm test",
|
|
17
17
|
"ct:common": "mocha \"tsOutputs/test/common/componentTest/**/*-spec.js\"",
|
|
18
18
|
"ct:build-scanner": "mocha \"tsOutputs/test/build-scanner/componentTest/**/*-spec.js\"",
|
|
19
|
-
"unit-tests": "mocha \"tsOutputs/test/*/unitTest/**/*-spec.js\"
|
|
19
|
+
"unit-tests": "mocha \"tsOutputs/test/*/unitTest/**/*-spec.js\"",
|
|
20
20
|
"build:node-agent": "tsc -p tsconfig.json && node ./copy-test-resources && npm run typings",
|
|
21
21
|
"typings": "tsc -p tsconfig-typings.json",
|
|
22
22
|
"build:browser-agent": "cd browser-agent && npm run build",
|
|
23
23
|
"build": "npm run lint && npm run build:node-agent && npm run build:browser-agent",
|
|
24
24
|
"lint:browser-agent": "eslint browser-agent/index.ts browser-agent/lib/ browser-agent/test/unitTest/ --ext .ts",
|
|
25
25
|
"lintfix:browser-agent": "eslint --fix browser-agent/index.ts browser-agent/lib/ browser-agent/test/unitTest/ --ext .ts",
|
|
26
|
-
"lint": "eslint cli-parse/ common/ test-listener/ test/ --ext .ts && npm run lint:browser-agent",
|
|
27
|
-
"lintfix": "eslint --fix cli-parse/ common/ test-listener/ test/ --ext .ts && npm run lintfix:browser-agent"
|
|
26
|
+
"lint": "eslint build-scanner/ cli-parse/ common/ test-listener/ test/ --ext .ts && npm run lint:browser-agent",
|
|
27
|
+
"lintfix": "eslint --fix build-scanner/ cli-parse/ common/ test-listener/ test/ --ext .ts && npm run lintfix:browser-agent",
|
|
28
|
+
"rep:nyc:html": "npm run build:node-agent && nyc --reporter=html npm run unit-tests"
|
|
28
29
|
},
|
|
29
30
|
"keywords": [],
|
|
30
31
|
"author": "",
|
|
@@ -53,7 +54,7 @@
|
|
|
53
54
|
"mkdirp": "^0.5.1",
|
|
54
55
|
"nopt": "^3.0.4",
|
|
55
56
|
"nopt-usage": "^0.1.0",
|
|
56
|
-
"nyc": "14.1.1",
|
|
57
|
+
"nyc": "^14.1.1",
|
|
57
58
|
"object-assign": "^4.1.1",
|
|
58
59
|
"once": "^1.4.0",
|
|
59
60
|
"promise": "^7.0.4",
|
package/tsOutputs/api.d.ts
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { ITestRunnerArgs } from './common/contracts';
|
|
2
|
-
import { LoggerFactory } from './common/logger';
|
|
3
2
|
import { RemoteAgent } from './test-listener/remote-agent';
|
|
4
3
|
export { getSystemDateValueOf } from './common/system-date';
|
|
5
4
|
export { RemoteAgent } from './test-listener/remote-agent';
|
|
6
5
|
export { ITestRunnerArgs } from './common/contracts';
|
|
7
6
|
export declare const skipBrowserAgentKey: string;
|
|
8
7
|
export declare const slWindowObject: string;
|
|
9
|
-
export { LoggerFactory };
|
|
10
8
|
export declare function createTiaAgent(cliArgs: ITestRunnerArgs): Promise<RemoteAgent>;
|
|
11
9
|
export declare function cliArgsToAgentConfig(cliArgs: ITestRunnerArgs): Promise<import("./common/config-process/config").AgentConfig>;
|
|
12
10
|
export declare function createAgentConfig(configJson: object): import("./common/config-process/config").AgentConfig;
|
package/tsOutputs/api.js
CHANGED
|
@@ -47,14 +47,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
|
-
exports.createAgentConfig = exports.cliArgsToAgentConfig = exports.createTiaAgent = exports.
|
|
50
|
+
exports.createAgentConfig = exports.cliArgsToAgentConfig = exports.createTiaAgent = exports.slWindowObject = exports.skipBrowserAgentKey = exports.RemoteAgent = exports.getSystemDateValueOf = void 0;
|
|
51
51
|
var token_data_builder_1 = require("./common/utils/token-data-builder");
|
|
52
52
|
var build_session_data_builder_1 = require("./common/utils/build-session-data-builder");
|
|
53
53
|
var backend_proxy_1 = require("./common/http/backend-proxy");
|
|
54
54
|
var agent_instance_data_1 = require("./cli-parse/agent-instance-data");
|
|
55
55
|
var config_loader_1 = require("./common/config-process/config-loader");
|
|
56
56
|
var logger_1 = require("./common/logger");
|
|
57
|
-
Object.defineProperty(exports, "LoggerFactory", { enumerable: true, get: function () { return logger_1.LoggerFactory; } });
|
|
58
57
|
var factory_1 = require("./test-listener/factory");
|
|
59
58
|
var constants_1 = require("./common/constants/constants");
|
|
60
59
|
var system_date_1 = require("./common/system-date");
|
|
@@ -11,7 +11,7 @@ function getDecoratorsPlugin(babylonPlugins, filename) {
|
|
|
11
11
|
logger.info("Using '" + decoratorsLegacy + "' plugin to parse ast for '" + filename + "'");
|
|
12
12
|
return;
|
|
13
13
|
}
|
|
14
|
-
return [
|
|
14
|
+
return ['decorators', { decoratorsBeforeExport: true }];
|
|
15
15
|
}
|
|
16
16
|
function getParserPlugins(babylonPlugins, filename) {
|
|
17
17
|
babylonPlugins = babylonPlugins || [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../build-scanner/ast-utils.ts"],"names":[],"mappings":";;;AAAA,wCAAkD;AAElD,4EAAwE;AACxE,2CAA+C;AAE/C,IAAM,MAAM,GAAG,sBAAa,CAAC,0BAA0B,EAAE,CAAC;AAE1D,SAAS,mBAAmB,CAAC,cAA8B,EAAE,QAAgB;IACzE,IAAM,gBAAgB,GAAG,mBAAmB,CAAC;IAC7C,IAAI,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE;QAC/C,MAAM,CAAC,IAAI,CAAC,YAAU,gBAAgB,mCAA8B,QAAQ,MAAG,CAAC,CAAA;QAChF,OAAO;KACV;IACD,OAAO,CAAC,YAAY,EAAE,EAAC,sBAAsB,EAAE,IAAI,EAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,gBAAgB,CAAC,cAA8B,EAAE,QAAgB;IACtE,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACtC,IAAM,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAEvE,IAAI,gBAAgB,EAAE;QAClB,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;KACxC;IACD,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAe,EAAE,IAAS,EAAE,QAAgB;;IAC1E,IAAM,UAAU,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IACnE,
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../build-scanner/ast-utils.ts"],"names":[],"mappings":";;;AAAA,wCAAkD;AAElD,4EAAwE;AACxE,2CAA+C;AAE/C,IAAM,MAAM,GAAG,sBAAa,CAAC,0BAA0B,EAAE,CAAC;AAE1D,SAAS,mBAAmB,CAAC,cAA8B,EAAE,QAAgB;IACzE,IAAM,gBAAgB,GAAG,mBAAmB,CAAC;IAC7C,IAAI,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE;QAC/C,MAAM,CAAC,IAAI,CAAC,YAAU,gBAAgB,mCAA8B,QAAQ,MAAG,CAAC,CAAA;QAChF,OAAO;KACV;IACD,OAAO,CAAC,YAAY,EAAE,EAAC,sBAAsB,EAAE,IAAI,EAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,gBAAgB,CAAC,cAA8B,EAAE,QAAgB;IACtE,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACtC,IAAM,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAEvE,IAAI,gBAAgB,EAAE;QAClB,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;KACxC;IACD,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAe,EAAE,IAAS,EAAE,QAAgB;;IAC1E,IAAM,UAAU,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IACnE,IAAM,OAAO,GAAmB,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IACxF,IAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE;QACxB,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE,OAAO;QAChB,aAAa,EAAE,IAAI;KACtB,CAA8B,CAAC;IAEhC,IAAI,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,MAAM,EAAE;QACtB,kCAAe,CAAC,WAAW,CAAC,WAAS,QAAQ,qDAAgD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,EAAT,CAAS,CAAG,CAAC,CAAA;KAClI;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAbD,8CAaC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
var Promise = require('promise');
|
|
2
2
|
var FilesMapping = require("./js_diff/files-mapping");
|
|
3
|
+
var EnsureFilesHandlerService = require("./mappings/ensure-files-handler.service").EnsureFilesHandlerService;
|
|
3
4
|
var DryRunFilesMapping = require("./js_diff/dry-run-files-mapping");
|
|
4
5
|
// TODO: Find a way to get version number without relative path
|
|
5
6
|
// var version = require("../package.json").version;
|
|
@@ -49,21 +50,26 @@ function BuildDiffProcess(buildArgs, backendProxy, scmFactory, parsedDependencie
|
|
|
49
50
|
if (scmInstance) {
|
|
50
51
|
promiseChain = promiseChain.then(function () { return collectScmData(buildArguments, handlerParams, scmInstance); });
|
|
51
52
|
}
|
|
52
|
-
//3. Call JS mapping handler
|
|
53
|
-
var slMapper = null;
|
|
54
|
-
if (buildArguments.instrumentForBrowsers) {
|
|
55
|
-
slMapper = new SlMapper(CiaEnvVars.getSlMappingPath(), backendProxy, buildArguments.buildSessionId, logger);
|
|
56
|
-
}
|
|
57
53
|
promiseChain = promiseChain.then(function () {
|
|
58
54
|
log.info("Handling files and sending information in the new Build Scanner Format (with UniqueID).");
|
|
59
55
|
var fileMappingInstance = buildArguments.isDryRunMode ? DryRunFilesMapping : FilesMapping;
|
|
60
|
-
var filesMapping = new fileMappingInstance(handlerParams,
|
|
56
|
+
var filesMapping = new fileMappingInstance(handlerParams, log);
|
|
61
57
|
return filesMapping.process();
|
|
62
58
|
});
|
|
63
59
|
}
|
|
64
60
|
}
|
|
65
61
|
//4. Submit the final output to the server
|
|
62
|
+
var slMapper;
|
|
66
63
|
promiseChain = promiseChain.then(function () {
|
|
64
|
+
slMapper = new SlMapper(CiaEnvVars.getSlMappingPath(), backendProxy, buildArguments.buildSessionId, logger);
|
|
65
|
+
var fixer = new EnsureFilesHandlerService(logger, handlerParams.buildArguments, handlerParams.scmFilesContainer, handlerParams.scmRootDir, handlerParams.cfg, slMapper);
|
|
66
|
+
var result = fixer.ensureProcess(handlerParams.finalOutput);
|
|
67
|
+
handlerParams.finalOutput = result.output;
|
|
68
|
+
// if (buildArguments.instrumentForBrowsers) {
|
|
69
|
+
// promiseChain = promiseChain.then(function () {
|
|
70
|
+
// return submitSlMapping(promiseChain, slMapper, buildArguments.uniqueModuleId, logger)
|
|
71
|
+
// })
|
|
72
|
+
// }
|
|
67
73
|
if (buildArguments.instrumentationOnly) {
|
|
68
74
|
log.info("No need to submit the files to server as the 'instrumentationOnly' flag is on.");
|
|
69
75
|
return Promise.resolve();
|
|
@@ -332,14 +338,14 @@ function submitSlMapping(promiseChain, slMapper, uniqueModuleId, logger) {
|
|
|
332
338
|
return new Promise(function (resolve, reject) {
|
|
333
339
|
if (!CiaEnvVars.getSlMappingPath()) {
|
|
334
340
|
slMapper.postToServer(uniqueModuleId).then(function () {
|
|
335
|
-
resolve();
|
|
341
|
+
return resolve();
|
|
336
342
|
}, function (err) {
|
|
337
|
-
reject(err);
|
|
343
|
+
return reject(err);
|
|
338
344
|
});
|
|
339
345
|
}
|
|
340
346
|
else {
|
|
341
347
|
logger.info("Sl mapping path was set to '%s', skipping post to server");
|
|
342
|
-
resolve();
|
|
348
|
+
return resolve();
|
|
343
349
|
}
|
|
344
350
|
});
|
|
345
351
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-diff-process.js","sourceRoot":"","sources":["../../build-scanner/build-diff-process.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build-diff-process.js","sourceRoot":"","sources":["../../build-scanner/build-diff-process.js"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,21 @@ var fileAndFolderUtils = require('../file-and-folder-utils');
|
|
|
6
6
|
var utils = require('../utils');
|
|
7
7
|
var SourceMapReader = require("../../common/source-map-reader").SourceMapReader;
|
|
8
8
|
// TODO: refactor to normal module
|
|
9
|
-
function readSourceMaps(
|
|
9
|
+
function readSourceMaps(sourceMapData, fullFilename, logger) {
|
|
10
|
+
try {
|
|
11
|
+
if (!sourceMapData) {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
var consumer = new sourceMap.SourceMapConsumer(sourceMapData);
|
|
15
|
+
return consumer;
|
|
16
|
+
}
|
|
17
|
+
catch (e) {
|
|
18
|
+
logger.warn("Failed while reading source map for '%s'", fullFilename);
|
|
19
|
+
logger.warn(e);
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
function readRawSourceMaps(fullFilename, fileContent, logger) {
|
|
10
24
|
var log = logger.child({
|
|
11
25
|
methodName: "readSourceMaps"
|
|
12
26
|
});
|
|
@@ -15,15 +29,9 @@ function readSourceMaps(fullFilename, fileContent, logger) {
|
|
|
15
29
|
log.debug("fullFilename: '%s'", fullFilename);
|
|
16
30
|
return null;
|
|
17
31
|
}
|
|
18
|
-
;
|
|
19
32
|
try {
|
|
20
33
|
var reader = new SourceMapReader(fullFilename, logger);
|
|
21
|
-
|
|
22
|
-
if (!sourceMapData) {
|
|
23
|
-
return null;
|
|
24
|
-
}
|
|
25
|
-
var consumer = new sourceMap.SourceMapConsumer(sourceMapData);
|
|
26
|
-
return consumer;
|
|
34
|
+
return reader.readSourceMapData(fileContent);
|
|
27
35
|
}
|
|
28
36
|
catch (e) {
|
|
29
37
|
logger.warn("Failed while reading source map for '%s'", fullFilename);
|
|
@@ -31,17 +39,29 @@ function readSourceMaps(fullFilename, fileContent, logger) {
|
|
|
31
39
|
return null;
|
|
32
40
|
}
|
|
33
41
|
}
|
|
34
|
-
function
|
|
35
|
-
var
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return content;
|
|
41
|
-
};
|
|
42
|
-
this.readSourceMaps = function ActualFile$readSourceMaps(logger) {
|
|
43
|
-
return readSourceMaps(fullFilename, this.getContent(), logger);
|
|
42
|
+
function readSourceMapsWithRaw(fullFilename, fileContent, logger) {
|
|
43
|
+
var rawSourceMaps = readRawSourceMaps(fullFilename, fileContent, logger);
|
|
44
|
+
var sourceMapConsumer = readSourceMaps(rawSourceMaps, fullFilename, logger);
|
|
45
|
+
return {
|
|
46
|
+
rawSourceMaps: rawSourceMaps,
|
|
47
|
+
consumer: sourceMapConsumer
|
|
44
48
|
};
|
|
45
49
|
}
|
|
50
|
+
function ActualFile(relativeFileName, fullFilename) {
|
|
51
|
+
this.fullFilename = fullFilename;
|
|
52
|
+
}
|
|
53
|
+
ActualFile.prototype.getContent = function ActualFile$getContent() {
|
|
54
|
+
if (!this.content) {
|
|
55
|
+
this.content = fs.readFileSync(this.fullFilename, 'utf-8');
|
|
56
|
+
}
|
|
57
|
+
return this.content;
|
|
58
|
+
};
|
|
59
|
+
ActualFile.prototype.readSourceMaps = function ActualFile$readSourceMaps(logger) {
|
|
60
|
+
var rawSourceMaps = readRawSourceMaps(this.getContent(), this.fullFilename, logger);
|
|
61
|
+
return readSourceMaps(rawSourceMaps, logger);
|
|
62
|
+
};
|
|
63
|
+
ActualFile.prototype.readSourceMapsWithRaw = function ActualFile$readSourceMaps(logger) {
|
|
64
|
+
return readSourceMapsWithRaw(this.fullFilename, this.getContent(), logger);
|
|
65
|
+
};
|
|
46
66
|
module.exports = ActualFile;
|
|
47
67
|
//# sourceMappingURL=actual-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actual-file.js","sourceRoot":"","sources":["../../../build-scanner/file-system/actual-file.js"],"names":[],"mappings":"AAAA,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACtC,IAAI,kBAAkB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC5D,IAAI,kBAAkB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC7D,IAAI,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAChC,IAAI,eAAe,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC,eAAe,CAAC;AAGhF,kCAAkC;AAClC,SAAS,cAAc,CAAC,YAAY,EAAE,WAAW,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"actual-file.js","sourceRoot":"","sources":["../../../build-scanner/file-system/actual-file.js"],"names":[],"mappings":"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"}
|
|
@@ -95,7 +95,6 @@ var MarkupFileInstrumenter = /** @class */ (function (_super) {
|
|
|
95
95
|
});
|
|
96
96
|
});
|
|
97
97
|
};
|
|
98
|
-
;
|
|
99
98
|
MarkupFileInstrumenter.prototype.extractScripts = function (inputFile) {
|
|
100
99
|
var fileContents = (0, fs_1.readFileSync)(inputFile, 'utf8');
|
|
101
100
|
fileContents = this.onBeforeInstrumentation(fileContents);
|
|
@@ -150,7 +149,6 @@ var MarkupFileInstrumenter = /** @class */ (function (_super) {
|
|
|
150
149
|
var preambleTag = "<script>\n\t" + this.preambleHeader.join('\n') + "\n</script>\n";
|
|
151
150
|
return this.insertTagAtBeginning(preambleTag);
|
|
152
151
|
};
|
|
153
|
-
;
|
|
154
152
|
MarkupFileInstrumenter.prototype.markScripts = function () {
|
|
155
153
|
var marked = [];
|
|
156
154
|
for (var i = 0; i < this.fileParser.scriptTags.length; i++) {
|
|
@@ -166,7 +164,6 @@ var MarkupFileInstrumenter = /** @class */ (function (_super) {
|
|
|
166
164
|
return this.instrumentedFile.slice(0, firstScriptTagIndex) + newTag +
|
|
167
165
|
this.instrumentedFile.slice(firstScriptTagIndex);
|
|
168
166
|
};
|
|
169
|
-
;
|
|
170
167
|
return MarkupFileInstrumenter;
|
|
171
168
|
}(file_instrumenter_1.FileInstrumenter));
|
|
172
169
|
exports.MarkupFileInstrumenter = MarkupFileInstrumenter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markup-file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/markup-file-instrumenter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAqD;AACrD,yBAAgC;AAChC,yDAA4D;AAG5D;IAA4C,0CAAgB;IAA5D;QAAA,qEA4FC;QA3FW,kBAAY,GAAG,EAAE,CAAC;QAClB,sBAAgB,GAAG,EAAE,CAAC;QACtB,gBAAU,GAAG,EAAE,CAAC;;IAyF5B,CAAC;IArFG;;;EAGF;IACQ,+CAAc,GAApB,UAAqB,SAAiB,EAAE,UAAkB;;;;;;wBACtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAuB,SAAS,MAAG,CAAC,CAAC;;;;wBAEnD,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;wBAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;4BACrB,sBAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,EAAC;yBACnD;wBACD,IAAI,CAAC,WAAW,EAAE,CAAC;wBACnB,sBAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,UAAU,CAAC,EAAC;;;wBAExD,qBAAM,IAAI,CAAC,0BAA0B,CAAC,KAAG,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,EAAA;;wBAAzE,SAAyE,CAAC;wBAC1E,MAAM,KAAG,CAAC;;;;;KAEjB;
|
|
1
|
+
{"version":3,"file":"markup-file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/markup-file-instrumenter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
var util = require('util');
|
|
3
3
|
var fs = require('fs');
|
|
4
4
|
var FilesMapping = require("./files-mapping");
|
|
5
|
-
function DryRunFilesMapping(handlerParams,
|
|
5
|
+
function DryRunFilesMapping(handlerParams, logger) {
|
|
6
6
|
FilesMapping.apply(this, arguments);
|
|
7
7
|
}
|
|
8
8
|
DryRunFilesMapping.prototype._shouldSkipFile = function (fullFilename, relativeFileName, fileIdx) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dry-run-files-mapping.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/dry-run-files-mapping.js"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,IAAI,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE9C,SAAS,kBAAkB,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"dry-run-files-mapping.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/dry-run-files-mapping.js"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,IAAI,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE9C,SAAS,kBAAkB,CAAC,aAAa,EAAG,MAAM;IAC9C,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACxC,CAAC;AAED,kBAAkB,CAAC,SAAS,CAAC,eAAe,GAAG,UAAU,YAAY,EAAE,gBAAgB,EAAE,OAAO;IAC5F,IAAI,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;QACpB,OAAO,IAAI,CAAC;KACf;IAED,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QAC5C,IAAI,CAAC,WAAW,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,EAAE,CAAC;QACtE,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;KACf;IACD,IAAI,CAAC,WAAW,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,EAAE,CAAC;IACtE,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AACD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;AAChD,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAAC"}
|
|
@@ -29,7 +29,8 @@ var FileSignature = function (absolutePtah, relativePath, content, sourceMaps, o
|
|
|
29
29
|
this.scmFilesContainer = scmFilesContainer;
|
|
30
30
|
this.hasSourceMaps = !!sourceMaps;
|
|
31
31
|
this.logger = logger;
|
|
32
|
-
this.
|
|
32
|
+
this.positionToMethod = {};
|
|
33
|
+
this.endPositionToMethod = {};
|
|
33
34
|
this.positionToBranchMap = {};
|
|
34
35
|
this.methodIndex = 0;
|
|
35
36
|
this.branchIndex = 0;
|
|
@@ -94,9 +95,10 @@ FileSignature.prototype.addMethod = function (node, parentNode, nodeToParent) {
|
|
|
94
95
|
var method = MethodSignature.create(node, parentNode, nodeToParent, this.absolutePath, this.relativePath, this.logger);
|
|
95
96
|
method.srcData = method.generatedData;
|
|
96
97
|
this.methods.push(method.createDTO());
|
|
97
|
-
this.
|
|
98
|
+
this.endPositionToMethod[method.generatedData.endPosition] = this.methodIndex;
|
|
99
|
+
this.positionToMethod[method.generatedData.position] = this.methodIndex;
|
|
98
100
|
if (method.generatedData.identifierPosition) {
|
|
99
|
-
this.
|
|
101
|
+
this.positionToMethod[method.generatedData.identifierPosition] = this.methodIndex;
|
|
100
102
|
}
|
|
101
103
|
this.methodIndex++;
|
|
102
104
|
};
|
|
@@ -113,7 +115,8 @@ FileSignature.prototype.addBranch = function (node, parentNode, isGlobalBranch,
|
|
|
113
115
|
branches.forEach(function (branch) {
|
|
114
116
|
branch.srcData = branch.generatedData;
|
|
115
117
|
context.branches.push(branch.createDTO());
|
|
116
|
-
context.positionToBranchMap[branch.generatedData.position] = context.branchIndex;
|
|
118
|
+
context.positionToBranchMap[branch.generatedData.position + '|' + branch.index] = context.branchIndex;
|
|
119
|
+
context.positionToBranchMap[branch.generatedData.parentPosition + '|' + branch.index] = context.branchIndex;
|
|
117
120
|
context.branchIndex++;
|
|
118
121
|
});
|
|
119
122
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-signature.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/file-signature.js"],"names":[],"mappings":"AAAA,aAAa;AACb,IAAI,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACvC,IAAI,QAAQ,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAC/C,IAAI,aAAa,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,aAAa,CAAC;AAC/D,IAAI,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC/C,IAAI,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACpD,IAAI,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACpD,IAAI,mBAAmB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC3D,IAAI,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC;AAElE;;;;;;;;;;GAUG;AACH,IAAI,aAAa,GAAG,UAAU,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM;IAC1G,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IAClB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACjB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC3C,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,UAAU,CAAC;IAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;IAC9B,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;IAC9B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACrB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AAEF,aAAa,CAAC,SAAS,CAAC,gBAAgB,GAAG;IACvC,IAAI,CAAC,cAAc,EAAE,CAAC;IACtB,IAAI,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACxE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF,aAAa,CAAC,SAAS,CAAC,SAAS,GAAG;IAChC,OAAO;QACH,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,IAAI,CAAC,YAAY;QAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;KACpC,CAAA;AACL,CAAC,CAAC;AAEF,aAAa,CAAC,SAAS,CAAC,WAAW,GAAG,UAAU,GAAG;IAC/C,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,eAAe,GAAG,IAAI,CAAC;IAC3B,IAAI,iBAAiB,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,GAAG,EAAE;QACV,GAAG,EAAE,UAAU,IAAI,EAAE,UAAU;YAC3B,IAAI,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9B,YAAY,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;YAC/B,IAAI,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBACjC,kEAAkE;gBAClE,IAAG,eAAe,IAAI,IAAI,EAAE;oBACxB,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;iBACzC;gBACD,mBAAmB,CAAC,cAAc,EAAE,CAAC;gBACrC;;;mBAGG;gBACH,iBAAiB,GAAG,mBAAmB,CAAC,eAAe,EAAE,CAAC;gBAC1D,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;gBAClD,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAA;aAChF;iBAAM,IAAI,OAAO,CAAC,IAAI,CAAC,gBAAgB,IAAI,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBACzE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,IAAI,IAAI,EAAE,iBAAiB,CAAC,CAAA;aAClF;QACL,CAAC;QACD,IAAI,EAAE,UAAU,IAAI;YAChB,IAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAC;gBAC/B,+EAA+E;gBAC/E,IAAG,eAAe,KAAK,aAAa,CAAC,IAAI,CAAC,EAAE;oBACxC,eAAe,GAAG,IAAI,CAAC;iBAC1B;gBACD;;;;mBAIG;gBACH,iBAAiB,EAAG,CAAC;aACxB;QACL,CAAC;KACJ,CAAC,CAAC;AACP,CAAC,CAAC;AACF,aAAa,CAAC,SAAS,CAAC,SAAS,GAAG,UAAU,IAAI,EAAE,UAAU,EAAE,YAAY;IACxE,IAAI,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EACjF,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC;IACtC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IACtC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"file-signature.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/file-signature.js"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ var METHODS_KEY = "methods";
|
|
|
25
25
|
var METHOD_ELEMENT_TYPE = "method";
|
|
26
26
|
var METHOD_INDEX_FOR_GLOBAL_BRANCHES = -1;
|
|
27
27
|
// TODO: refactor this class and difine the exec responsibility.
|
|
28
|
-
function FilesMapping(handlerParams,
|
|
28
|
+
function FilesMapping(handlerParams, logger) {
|
|
29
29
|
this.handlerParams = handlerParams || {};
|
|
30
30
|
this.options = this.handlerParams.buildArguments;
|
|
31
31
|
this.finalOutput = this.handlerParams.finalOutput;
|
|
@@ -41,7 +41,6 @@ function FilesMapping(handlerParams, slMapper, logger) {
|
|
|
41
41
|
this.slIgnoreGenerated = this._createSlIgnore(IgnoredFilesHandler.GENERATED_IGNORE_FILE_NAME);
|
|
42
42
|
this.projectRoot = this._resolveProjectRoot();
|
|
43
43
|
this.shortNameToFileMapper = null;
|
|
44
|
-
this.slMapper = slMapper;
|
|
45
44
|
this.signaturesParsingErrors = [];
|
|
46
45
|
this.sourceFilesNotifier = new SourceFilesNotifier(logger);
|
|
47
46
|
this.counters = {
|
|
@@ -78,7 +77,6 @@ FilesMapping.prototype.process = function () {
|
|
|
78
77
|
if (SlEnvVars.isUseNewUniqueId()) {
|
|
79
78
|
context._convertUniqueIds();
|
|
80
79
|
}
|
|
81
|
-
context._mapElementsForSlMapping();
|
|
82
80
|
context.finalOutput.files = context.finalFilesData;
|
|
83
81
|
context.finalOutput.counters = context.counters;
|
|
84
82
|
CockpitNotifier.sendErrorsBatch(context.signaturesParsingErrors);
|
|
@@ -135,6 +133,7 @@ FilesMapping.prototype._fillFilesData = function (matchedFile, fileIdx, isLastFi
|
|
|
135
133
|
if (!fileSig.hasError) {
|
|
136
134
|
fileSig.methods = this._getIncludedMethods(fileSig);
|
|
137
135
|
fileSig.branches = this._getIncludedBranches(fileSig);
|
|
136
|
+
fileSig.absolutePath = absolutePath;
|
|
138
137
|
this.fileSignatures.push(fileSig);
|
|
139
138
|
}
|
|
140
139
|
else {
|
|
@@ -156,14 +155,8 @@ FilesMapping.prototype._shouldSkipFile = function (fullFilename, relativeFileNam
|
|
|
156
155
|
return false;
|
|
157
156
|
};
|
|
158
157
|
FilesMapping.prototype.createFileSignature = function (absolutePath, relativePath, fileContent, sourceMaps, opts, scmFilesContainer) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
this.sourceFilesNotifier.notifySources(sourceMaps.sources, absolutePath, generatedFileSignature.hasColumnInfo);
|
|
162
|
-
return generatedFileSignature;
|
|
163
|
-
}
|
|
164
|
-
else {
|
|
165
|
-
return FileSignature.create(absolutePath, relativePath, fileContent, sourceMaps, opts, scmFilesContainer, this.logger);
|
|
166
|
-
}
|
|
158
|
+
var result = FileSignature.create(absolutePath, relativePath, fileContent, sourceMaps, opts, scmFilesContainer, this.logger);
|
|
159
|
+
return result;
|
|
167
160
|
};
|
|
168
161
|
FilesMapping.prototype._generateFileSignature = function (absolutePath) {
|
|
169
162
|
var relativePath = absolutePath.replace(this.projectRoot, "");
|
|
@@ -262,7 +255,8 @@ FilesMapping.prototype._createNewFileData = function (filename, absoluteFileName
|
|
|
262
255
|
physicalPath: gitPath,
|
|
263
256
|
methods: [],
|
|
264
257
|
lines: [],
|
|
265
|
-
branches: []
|
|
258
|
+
branches: [],
|
|
259
|
+
absolutePath: absoluteFileName
|
|
266
260
|
};
|
|
267
261
|
if (this._shouldAddCommitsArray()) {
|
|
268
262
|
newFile.commitIndexes = this.handlerParams.fileToCommitsMap[gitPath] || [];
|
|
@@ -337,17 +331,6 @@ FilesMapping.prototype._convertUniqueIds = function () {
|
|
|
337
331
|
}
|
|
338
332
|
});
|
|
339
333
|
};
|
|
340
|
-
FilesMapping.prototype._mapElementsForSlMapping = function () {
|
|
341
|
-
var context = this;
|
|
342
|
-
this.finalFilesData.forEach(function (file) {
|
|
343
|
-
file.methods.concat(file.branches).forEach(function (element) {
|
|
344
|
-
if (context.slMapper) {
|
|
345
|
-
context.slMapper.addUniqueId(element.uniqueIdKey, element.uniqueId);
|
|
346
|
-
}
|
|
347
|
-
delete element.uniqueIdKey;
|
|
348
|
-
});
|
|
349
|
-
});
|
|
350
|
-
};
|
|
351
334
|
FilesMapping.prototype._updateUniqueIds = function (arr, uniqueIdMap) {
|
|
352
335
|
var newArr = [];
|
|
353
336
|
for (var i = 0; i < arr.length; i++) {
|