slnodejs 6.0.29 → 6.1.56

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.
Files changed (205) hide show
  1. package/browser-agent/dist/browser-agent-all.js +311 -110
  2. package/browser-agent/dist/browser-agent-all.min.js +28 -28
  3. package/browser-agent/package.json +2 -2
  4. package/package.json +7 -5
  5. package/tsOutputs/api.d.ts +2 -0
  6. package/tsOutputs/api.js +2 -1
  7. package/tsOutputs/build-scanner/ast-utils.js +39 -0
  8. package/tsOutputs/build-scanner/ast-utils.js.map +1 -0
  9. package/tsOutputs/build-scanner/build-diff-process.js +15 -9
  10. package/tsOutputs/build-scanner/build-diff-process.js.map +1 -1
  11. package/tsOutputs/build-scanner/file-system/actual-file.js +38 -18
  12. package/tsOutputs/build-scanner/file-system/actual-file.js.map +1 -1
  13. package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js +2 -2
  14. package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js.map +1 -1
  15. package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js +262 -171
  16. package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js.map +1 -1
  17. package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js +166 -116
  18. package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js.map +1 -1
  19. package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js +1 -1
  20. package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js.map +1 -1
  21. package/tsOutputs/build-scanner/js_diff/file-signature.js +9 -19
  22. package/tsOutputs/build-scanner/js_diff/file-signature.js.map +1 -1
  23. package/tsOutputs/build-scanner/js_diff/files-mapping.js +6 -23
  24. package/tsOutputs/build-scanner/js_diff/files-mapping.js.map +1 -1
  25. package/tsOutputs/build-scanner/js_diff/generated-file-signature.js.map +1 -1
  26. package/tsOutputs/build-scanner/js_diff/guess-method-location.js +3 -0
  27. package/tsOutputs/build-scanner/js_diff/guess-method-location.js.map +1 -1
  28. package/tsOutputs/build-scanner/js_diff/method-signature.js +3 -1
  29. package/tsOutputs/build-scanner/js_diff/method-signature.js.map +1 -1
  30. package/tsOutputs/build-scanner/js_diff/sl-mapper.js +61 -0
  31. package/tsOutputs/build-scanner/js_diff/sl-mapper.js.map +1 -1
  32. package/tsOutputs/build-scanner/js_diff/source-data-enricher.js +1 -1
  33. package/tsOutputs/build-scanner/js_diff/source-data-enricher.js.map +1 -1
  34. package/tsOutputs/build-scanner/mappings/contracts.js +3 -0
  35. package/tsOutputs/build-scanner/mappings/contracts.js.map +1 -0
  36. package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +214 -0
  37. package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -0
  38. package/tsOutputs/build-scanner/mappings/file-element-utils.js +47 -0
  39. package/tsOutputs/build-scanner/mappings/file-element-utils.js.map +1 -0
  40. package/tsOutputs/build-scanner/mappings/file-enricher.js +207 -0
  41. package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -0
  42. package/tsOutputs/build-scanner/mappings/files-data-container.js +52 -0
  43. package/tsOutputs/build-scanner/mappings/files-data-container.js.map +1 -0
  44. package/tsOutputs/build-scanner/mappings/scm-file-fixer.js +80 -0
  45. package/tsOutputs/build-scanner/mappings/scm-file-fixer.js.map +1 -0
  46. package/tsOutputs/cli-parse/child-process-wrapper.js +3 -3
  47. package/tsOutputs/cli-parse/child-process-wrapper.js.map +1 -1
  48. package/tsOutputs/cli-parse/cli.js +12 -9
  49. package/tsOutputs/cli-parse/cli.js.map +1 -1
  50. package/tsOutputs/cli-parse/constants/constants.js +9 -9
  51. package/tsOutputs/cli-parse/constants/constants.js.map +1 -1
  52. package/tsOutputs/cli-parse/custom-commander.js +13 -0
  53. package/tsOutputs/cli-parse/custom-commander.js.map +1 -1
  54. package/tsOutputs/cli-parse/executors/base-executor.js +35 -26
  55. package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
  56. package/tsOutputs/cli-parse/executors/build-end-executor.js +1 -1
  57. package/tsOutputs/cli-parse/executors/build-end-executor.js.map +1 -1
  58. package/tsOutputs/cli-parse/executors/build-executor.js +2 -2
  59. package/tsOutputs/cli-parse/executors/build-executor.js.map +1 -1
  60. package/tsOutputs/cli-parse/executors/config-executor.js +5 -2
  61. package/tsOutputs/cli-parse/executors/config-executor.js.map +1 -1
  62. package/tsOutputs/cli-parse/executors/dry-run/base-data.js +4 -4
  63. package/tsOutputs/cli-parse/executors/dry-run/base-data.js.map +1 -1
  64. package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js +21 -21
  65. package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js.map +1 -1
  66. package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js +25 -23
  67. package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js.map +1 -1
  68. package/tsOutputs/cli-parse/executors/dry-run/dry-run-validation.js +1 -1
  69. package/tsOutputs/cli-parse/executors/dry-run/dry-run-validation.js.map +1 -1
  70. package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js +79 -19
  71. package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js.map +1 -1
  72. package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js +15 -10
  73. package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js.map +1 -1
  74. package/tsOutputs/cli-parse/executors/end-execution-executor.js +1 -1
  75. package/tsOutputs/cli-parse/executors/end-execution-executor.js.map +1 -1
  76. package/tsOutputs/cli-parse/executors/integration-build-components-executor.js +1 -1
  77. package/tsOutputs/cli-parse/executors/integration-build-components-executor.js.map +1 -1
  78. package/tsOutputs/cli-parse/executors/mocha-executor.js +1 -1
  79. package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
  80. package/tsOutputs/cli-parse/executors/nyc-report-executor.js +3 -3
  81. package/tsOutputs/cli-parse/executors/nyc-report-executor.js.map +1 -1
  82. package/tsOutputs/cli-parse/executors/start-execution-executor.js +1 -1
  83. package/tsOutputs/cli-parse/executors/start-execution-executor.js.map +1 -1
  84. package/tsOutputs/cli-parse/executors/test-listener-executor.js +1 -1
  85. package/tsOutputs/cli-parse/executors/test-listener-executor.js.map +1 -1
  86. package/tsOutputs/cli-parse/executors/test-runner-build-session-data-builder.js +1 -1
  87. package/tsOutputs/cli-parse/executors/test-runner-build-session-data-builder.js.map +1 -1
  88. package/tsOutputs/cli-parse/executors/upload-report-executor.js +1 -1
  89. package/tsOutputs/cli-parse/executors/upload-report-executor.js.map +1 -1
  90. package/tsOutputs/cli-parse/utils.js +5 -5
  91. package/tsOutputs/cli-parse/utils.js.map +1 -1
  92. package/tsOutputs/common/agent-events/agent-events-controller.js +7 -7
  93. package/tsOutputs/common/agent-events/agent-events-controller.js.map +1 -1
  94. package/tsOutputs/common/agent-events/agent-instance-info-builder.js +1 -1
  95. package/tsOutputs/common/agent-events/agent-instance-info-builder.js.map +1 -1
  96. package/tsOutputs/common/agent-events/cockpit-notifier.js +1 -1
  97. package/tsOutputs/common/agent-events/machine-info-builder.js +1 -1
  98. package/tsOutputs/common/agent-events/machine-info-builder.js.map +1 -1
  99. package/tsOutputs/common/agent-events/sensitive-data-filter.js +1 -1
  100. package/tsOutputs/common/agent-events/sensitive-data-filter.js.map +1 -1
  101. package/tsOutputs/common/agent-instance-data.js +2 -2
  102. package/tsOutputs/common/agent-instance-data.js.map +1 -1
  103. package/tsOutputs/common/config-process/config.js +1 -1
  104. package/tsOutputs/common/config-process/config.js.map +1 -1
  105. package/tsOutputs/common/constants/constants.js +1 -1
  106. package/tsOutputs/common/constants/constants.js.map +1 -1
  107. package/tsOutputs/common/contracts.d.ts +1 -0
  108. package/tsOutputs/common/coverage-elements/new-id-resolver.js +7 -7
  109. package/tsOutputs/common/coverage-elements/new-id-resolver.js.map +1 -1
  110. package/tsOutputs/common/coverage-elements/unique-id-converter.js +4 -4
  111. package/tsOutputs/common/coverage-elements/unique-id-converter.js.map +1 -1
  112. package/tsOutputs/common/events-process/events-creator.js +2 -2
  113. package/tsOutputs/common/events-process/events-creator.js.map +1 -1
  114. package/tsOutputs/common/events-process/index.js +4 -4
  115. package/tsOutputs/common/events-process/index.js.map +1 -1
  116. package/tsOutputs/common/footprints-process/collection-interval.js +2 -2
  117. package/tsOutputs/common/footprints-process/collection-interval.js.map +1 -1
  118. package/tsOutputs/common/footprints-process/index.js +2 -2
  119. package/tsOutputs/common/footprints-process/index.js.map +1 -1
  120. package/tsOutputs/common/footprints-process/istanbul-to-footprints.js +5 -5
  121. package/tsOutputs/common/footprints-process/istanbul-to-footprints.js.map +1 -1
  122. package/tsOutputs/common/footprints-process/production-footprints-handler.js +4 -4
  123. package/tsOutputs/common/footprints-process/production-footprints-handler.js.map +1 -1
  124. package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js +1 -1
  125. package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js.map +1 -1
  126. package/tsOutputs/common/footprints-process-v6/hits-converter.js +12 -3
  127. package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
  128. package/tsOutputs/common/footprints-process-v6/index.js +6 -6
  129. package/tsOutputs/common/footprints-process-v6/index.js.map +1 -1
  130. package/tsOutputs/common/footprints-process-v6/location-formatter.js +2 -2
  131. package/tsOutputs/common/footprints-process-v6/location-formatter.js.map +1 -1
  132. package/tsOutputs/common/footprints-process-v6/source-map-data.js +1 -1
  133. package/tsOutputs/common/footprints-process-v6/source-map-data.js.map +1 -1
  134. package/tsOutputs/common/http/backend-proxy.d.ts +1 -0
  135. package/tsOutputs/common/http/backend-proxy.js +10 -0
  136. package/tsOutputs/common/http/backend-proxy.js.map +1 -1
  137. package/tsOutputs/common/http/contracts.d.ts +78 -1
  138. package/tsOutputs/common/http/contracts.js +1 -1
  139. package/tsOutputs/common/http/contracts.js.map +1 -1
  140. package/tsOutputs/common/http/http-client.js +15 -11
  141. package/tsOutputs/common/http/http-client.js.map +1 -1
  142. package/tsOutputs/common/http/sl-routes.js +1 -1
  143. package/tsOutputs/common/http/sl-routes.js.map +1 -1
  144. package/tsOutputs/common/ignored-files-handler.js +2 -2
  145. package/tsOutputs/common/ignored-files-handler.js.map +1 -1
  146. package/tsOutputs/common/logger.js +4 -4
  147. package/tsOutputs/common/logger.js.map +1 -1
  148. package/tsOutputs/common/scm/git-cloner.js +138 -0
  149. package/tsOutputs/common/scm/git-cloner.js.map +1 -0
  150. package/tsOutputs/common/scm/git-format-builder.js +1 -1
  151. package/tsOutputs/common/scm/git.js +1 -1
  152. package/tsOutputs/common/scm/git.js.map +1 -1
  153. package/tsOutputs/common/short-name-to-file-mapper.js +3 -3
  154. package/tsOutputs/common/short-name-to-file-mapper.js.map +1 -1
  155. package/tsOutputs/common/source-map-handler.js +7 -7
  156. package/tsOutputs/common/source-map-handler.js.map +1 -1
  157. package/tsOutputs/common/source-map-reader.js +7 -7
  158. package/tsOutputs/common/source-map-reader.js.map +1 -1
  159. package/tsOutputs/common/state-tracker-fpv6.js +1 -1
  160. package/tsOutputs/common/state-tracker-fpv6.js.map +1 -1
  161. package/tsOutputs/common/state-tracker.js +5 -8
  162. package/tsOutputs/common/state-tracker.js.map +1 -1
  163. package/tsOutputs/common/utils/abstract-data-builder.js +2 -2
  164. package/tsOutputs/common/utils/abstract-data-builder.js.map +1 -1
  165. package/tsOutputs/common/utils/build-session-data-builder.js +3 -3
  166. package/tsOutputs/common/utils/build-session-data-builder.js.map +1 -1
  167. package/tsOutputs/common/utils/files-utils.d.ts +1 -0
  168. package/tsOutputs/common/utils/files-utils.js +9 -0
  169. package/tsOutputs/common/utils/files-utils.js.map +1 -1
  170. package/tsOutputs/common/utils/test-utils/mock-server-utils/mock-server-proxy.js +3 -3
  171. package/tsOutputs/common/utils/test-utils/mock-server-utils/mock-server-proxy.js.map +1 -1
  172. package/tsOutputs/common/utils/token-data-builder.js +2 -2
  173. package/tsOutputs/common/utils/token-data-builder.js.map +1 -1
  174. package/tsOutputs/common/utils/validation-utils.js +2 -2
  175. package/tsOutputs/common/utils/validation-utils.js.map +1 -1
  176. package/tsOutputs/test-listener/agent.js +3 -3
  177. package/tsOutputs/test-listener/agent.js.map +1 -1
  178. package/tsOutputs/test-listener/child-process-patcher.js +1 -1
  179. package/tsOutputs/test-listener/child-process-patcher.js.map +1 -1
  180. package/tsOutputs/test-listener/execution-process/execution-service-proxy.js +1 -1
  181. package/tsOutputs/test-listener/execution-process/execution-service-proxy.js.map +1 -1
  182. package/tsOutputs/test-listener/footprints-process/index.js +2 -2
  183. package/tsOutputs/test-listener/footprints-process/index.js.map +1 -1
  184. package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-base.js +1 -1
  185. package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-base.js.map +1 -1
  186. package/tsOutputs/test-listener/logs-process/index.js +1 -1
  187. package/tsOutputs/test-listener/logs-process/index.js.map +1 -1
  188. package/tsOutputs/test-listener/nyc-report-executor-fpv6.js +10 -3
  189. package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
  190. package/tsOutputs/test-listener/nyc-report-executor.js +3 -3
  191. package/tsOutputs/test-listener/nyc-report-executor.js.map +1 -1
  192. package/tsOutputs/test-listener/remote-agent.js +1 -1
  193. package/tsOutputs/test-listener/remote-agent.js.map +1 -1
  194. package/tsOutputs/test-listener/resolvers/ArgumentResolver.js +2 -2
  195. package/tsOutputs/test-listener/resolvers/ArgumentResolver.js.map +1 -1
  196. package/tsOutputs/test-listener/state-tracker-process/index.js +2 -2
  197. package/tsOutputs/test-listener/state-tracker-process/index.js.map +1 -1
  198. package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js +1 -1
  199. package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js.map +1 -1
  200. package/tsOutputs/test-listener/test-recommendation-handler.js +4 -4
  201. package/tsOutputs/test-listener/test-recommendation-handler.js.map +1 -1
  202. package/tsOutputs/test-listener/upload-report-handler.js +1 -1
  203. package/tsOutputs/test-listener/upload-report-handler.js.map +1 -1
  204. package/tsOutputs/build-scanner/git-format-builder.js +0 -69
  205. package/tsOutputs/build-scanner/git-format-builder.js.map +0 -1
@@ -1,122 +1,172 @@
1
- var util = require('util');
2
- var fs = require('fs');
3
- var FileInstrumenter = require("./file-instrumenter");
4
- var MarkupFileParser = require("../markup-files-parser");
5
- var FILE_INSTRUMENTATION_ERROR_MESSAGE = "Failed during instrumentation file ";
6
- var FILE_WRITING_ERROR_MESSAGE = "Failed while writing instrumented file.";
7
- var FILE_READING_ERROR_MESSAGE = "Failed reading file contents.";
8
- function MarkupFileInstrumenter() {
9
- FileInstrumenter.apply(this, arguments);
10
- this.originalFile = "";
11
- this.instrumentedFile = "";
12
- this.scriptTags = [];
13
- this.errorLoggingMessage = "";
14
- this.fiileHandler = null;
15
- }
16
- util.inherits(MarkupFileInstrumenter, FileInstrumenter);
17
- module.exports = MarkupFileInstrumenter;
18
- /*
19
- This class used for instrumenting markup files (i.e: html, ftl).
20
- The instrumentation works by combine all the js code in the file, instrument it in one piece, then split it back to original script tags
21
- */
22
- MarkupFileInstrumenter.prototype._instrumentFile = function (inputFile, outputFile, name, preambleHeader, callback) {
23
- this.logger.debug("Instrumenting file '" + inputFile + "'.");
24
- try {
25
- this._extractScripts(inputFile);
26
- if (!this._hasJsInFile()) {
27
- return this._handleFileWithoutJS(outputFile, name, callback);
28
- }
29
- this._markScripts();
30
- return this._instrumentAndReplace(name, inputFile, outputFile, callback);
31
- }
32
- catch (err) {
33
- return this._handleInstrumentationError(this.errorLoggingMessage, err, name, callback);
34
- }
35
- };
36
- MarkupFileInstrumenter.prototype._extractScripts = function (inputFile) {
37
- this.errorLoggingMessage = FILE_READING_ERROR_MESSAGE;
38
- var fileContents = fs.readFileSync(inputFile, 'utf8');
39
- fileContents = this._onBeforeInstrumentation(fileContents);
40
- this.originalFile = fileContents;
41
- this.instrumentedFile = fileContents;
42
- this.fileParser = getFileParser(fileContents, inputFile, this.logger);
43
- this.scriptTags = cloneTagsArray(this.fileParser.scriptTags);
44
- };
45
- MarkupFileInstrumenter.prototype.instrumentationCallback = function (err, instrumentedContent, outputFile, name, callback) {
46
- if (err) {
47
- throw err;
48
- }
49
- this._replaceOldJsByInstrumented(instrumentedContent);
50
- this._insertCoverageCodeTag(instrumentedContent);
51
- this._insertPreambleTag();
52
- this.instrumentedFile = this._onAfterInstrumentation(this.instrumentedFile);
53
- return this._saveFileContent(outputFile, name, callback);
54
- };
55
- MarkupFileInstrumenter.prototype._instrumentAndReplace = function (name, inputFile, outputFile, callback) {
56
- var _this = this;
57
- var jsCode = this.fileParser.getAllJsInFile();
58
- this.errorLoggingMessage = FILE_INSTRUMENTATION_ERROR_MESSAGE + name;
59
- this.instrumenter.instrument(jsCode, inputFile, function (err, instrumentedContent) {
60
- return _this.instrumentationCallback(err, instrumentedContent, outputFile, name, callback);
61
- }, {
62
- filename: name,
63
- inputSourceMap: null
1
+ "use strict";
2
+ var __extends = (this && this.__extends) || (function () {
3
+ var extendStatics = function (d, b) {
4
+ extendStatics = Object.setPrototypeOf ||
5
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
+ return extendStatics(d, b);
8
+ };
9
+ return function (d, b) {
10
+ if (typeof b !== "function" && b !== null)
11
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
+ extendStatics(d, b);
13
+ function __() { this.constructor = d; }
14
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
+ };
16
+ })();
17
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
18
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
19
+ return new (P || (P = Promise))(function (resolve, reject) {
20
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
21
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
22
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
23
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
64
24
  });
65
25
  };
66
- MarkupFileInstrumenter.prototype._replaceOldJsByInstrumented = function (instrumentedContent) {
67
- for (var i = 0; i < this.scriptTags.length; i++) {
68
- var currentTag = this.scriptTags[i];
69
- var scriptMarker = createScriptMarker(i);
70
- var scriptStartIndex = instrumentedContent.indexOf(scriptMarker);
71
- scriptStartIndex += scriptMarker.length;
72
- var scriptEndIndex = instrumentedContent.lastIndexOf(scriptMarker);
73
- var instrumentedScript = instrumentedContent.substring(scriptStartIndex, scriptEndIndex);
74
- this.instrumentedFile = this.instrumentedFile.replace(currentTag.content, instrumentedScript);
75
- }
76
- };
77
- MarkupFileInstrumenter.prototype._saveFileContent = function (outputFile, name, callback) {
78
- if (this.opts.onFileInstrumented != null) {
79
- this.opts.onFileInstrumented(name);
80
- }
81
- this.errorLoggingMessage = FILE_WRITING_ERROR_MESSAGE;
82
- fs.writeFileSync(outputFile, this.instrumentedFile, 'utf8');
83
- return callback(null, name);
84
- };
85
- MarkupFileInstrumenter.prototype._handleFileWithoutJS = function (outputFile, name, callback) {
86
- if (this.opts.onFileCopied != null) {
87
- this.opts.onFileCopied(name);
26
+ var __generator = (this && this.__generator) || function (thisArg, body) {
27
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
28
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
29
+ function verb(n) { return function (v) { return step([n, v]); }; }
30
+ function step(op) {
31
+ if (f) throw new TypeError("Generator is already executing.");
32
+ while (_) try {
33
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
34
+ if (y = 0, t) op = [op[0] & 2, t.value];
35
+ switch (op[0]) {
36
+ case 0: case 1: t = op; break;
37
+ case 4: _.label++; return { value: op[1], done: false };
38
+ case 5: _.label++; y = op[1]; op = [0]; continue;
39
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
40
+ default:
41
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
42
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
43
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
44
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
45
+ if (t[2]) _.ops.pop();
46
+ _.trys.pop(); continue;
47
+ }
48
+ op = body.call(thisArg, _);
49
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
50
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
88
51
  }
89
- return this._saveFileContent(outputFile, name, callback);
90
- };
91
- MarkupFileInstrumenter.prototype._hasJsInFile = function () {
92
- return this.scriptTags.length !== 0 && isJSEmbeddedInFile(this.fileParser);
93
52
  };
94
- MarkupFileInstrumenter.prototype._insertCoverageCodeTag = function (instrumentedCode) {
95
- var firstTagMarker = createScriptMarker(0);
96
- var firstTagStart = instrumentedCode.indexOf(firstTagMarker);
97
- var istanbulCoverageCode = instrumentedCode.substring(0, firstTagStart);
98
- var coverageCodeTag = "<script>\n\t" + istanbulCoverageCode + "\n</script>\n";
99
- this.instrumentedFile = this._insertTagAtBeginning(coverageCodeTag);
100
- };
101
- MarkupFileInstrumenter.prototype._insertPreambleTag = function () {
102
- var preambleTag = "<script>\n\t" + this.preambleHeader.join("\n") + "\n</script>\n";
103
- this.instrumentedFile = this._insertTagAtBeginning(preambleTag);
104
- };
105
- MarkupFileInstrumenter.prototype._markScripts = function () {
106
- var marked = [];
107
- for (var i = 0; i < this.fileParser.scriptTags.length; i++) {
108
- var slComment = createScriptMarker(i);
109
- var currentTag = this.fileParser.scriptTags[i];
110
- currentTag.content = slComment + currentTag.content + slComment;
111
- marked.push(currentTag);
53
+ Object.defineProperty(exports, "__esModule", { value: true });
54
+ exports.MarkupFileInstrumenter = void 0;
55
+ var file_instrumenter_1 = require("./file-instrumenter");
56
+ var fs_1 = require("fs");
57
+ var MarkupFileParser = require("../markup-files-parser");
58
+ var MarkupFileInstrumenter = /** @class */ (function (_super) {
59
+ __extends(MarkupFileInstrumenter, _super);
60
+ function MarkupFileInstrumenter() {
61
+ var _this = _super !== null && _super.apply(this, arguments) || this;
62
+ _this.originalFile = '';
63
+ _this.instrumentedFile = '';
64
+ _this.scriptTags = [];
65
+ return _this;
112
66
  }
113
- this.fileParser.scriptTags = marked;
114
- };
115
- MarkupFileInstrumenter.prototype._insertTagAtBeginning = function (newTag) {
116
- var firstScriptTagIndex = this.instrumentedFile.search(/<script[\s\S]*?>/);
117
- return this.instrumentedFile.slice(0, firstScriptTagIndex) + newTag +
118
- this.instrumentedFile.slice(firstScriptTagIndex);
119
- };
67
+ /*
68
+ This class used for instrumenting markup files (i.e: html, ftl).
69
+ The instrumentation works by combine all the js code in the file, instrument it in one piece, then split it back to original script tags
70
+ */
71
+ MarkupFileInstrumenter.prototype.instrumentFile = function (inputFile, outputFile) {
72
+ return __awaiter(this, void 0, void 0, function () {
73
+ var err_1;
74
+ return __generator(this, function (_a) {
75
+ switch (_a.label) {
76
+ case 0:
77
+ this.logger.debug("Instrumenting file '".concat(inputFile, "'"));
78
+ _a.label = 1;
79
+ case 1:
80
+ _a.trys.push([1, 2, , 4]);
81
+ this.extractScripts(inputFile);
82
+ if (!this.hasJsInFile()) {
83
+ return [2 /*return*/, this.copyFileAsIs(inputFile, outputFile)];
84
+ }
85
+ this.markScripts();
86
+ return [2 /*return*/, this.instrumentAndReplace(inputFile, outputFile)];
87
+ case 2:
88
+ err_1 = _a.sent();
89
+ return [4 /*yield*/, this.handleInstrumentationError(err_1.message, inputFile, outputFile)];
90
+ case 3:
91
+ _a.sent();
92
+ throw err_1;
93
+ case 4: return [2 /*return*/];
94
+ }
95
+ });
96
+ });
97
+ };
98
+ MarkupFileInstrumenter.prototype.extractScripts = function (inputFile) {
99
+ var fileContents = (0, fs_1.readFileSync)(inputFile, 'utf8');
100
+ fileContents = this.onBeforeInstrumentation(fileContents);
101
+ this.originalFile = fileContents;
102
+ this.instrumentedFile = fileContents;
103
+ this.fileParser = getFileParser(fileContents, inputFile, this.logger);
104
+ this.scriptTags = cloneTagsArray(this.fileParser.scriptTags);
105
+ };
106
+ MarkupFileInstrumenter.prototype.postInstrumentation = function (instrumentedContent, inputFile, outputFile) {
107
+ this.replaceOldJsByInstrumented(instrumentedContent);
108
+ this.insertCoverageCodeTag(instrumentedContent);
109
+ return _super.prototype.postInstrumentation.call(this, this.instrumentedFile, inputFile, outputFile);
110
+ };
111
+ MarkupFileInstrumenter.prototype.instrumentAndReplace = function (inputFile, outputFile) {
112
+ return __awaiter(this, void 0, void 0, function () {
113
+ var jsCode, instrumentedContent;
114
+ return __generator(this, function (_a) {
115
+ switch (_a.label) {
116
+ case 0:
117
+ jsCode = this.fileParser.getAllJsInFile();
118
+ instrumentedContent = this.instrumenter.instrumentSync(jsCode, inputFile);
119
+ return [4 /*yield*/, this.postInstrumentation(instrumentedContent, inputFile, outputFile)];
120
+ case 1:
121
+ _a.sent();
122
+ return [2 /*return*/];
123
+ }
124
+ });
125
+ });
126
+ };
127
+ MarkupFileInstrumenter.prototype.replaceOldJsByInstrumented = function (instrumentedContent) {
128
+ for (var i = 0; i < this.scriptTags.length; i++) {
129
+ var currentTag = this.scriptTags[i];
130
+ var scriptMarker = createScriptMarker(i);
131
+ var scriptStartIndex = instrumentedContent.indexOf(scriptMarker);
132
+ scriptStartIndex += scriptMarker.length;
133
+ var scriptEndIndex = instrumentedContent.lastIndexOf(scriptMarker);
134
+ var instrumentedScript = instrumentedContent.substring(scriptStartIndex, scriptEndIndex);
135
+ this.instrumentedFile = this.instrumentedFile.replace(currentTag.content, instrumentedScript);
136
+ }
137
+ };
138
+ MarkupFileInstrumenter.prototype.hasJsInFile = function () {
139
+ return this.scriptTags.length !== 0 && isJSEmbeddedInFile(this.fileParser);
140
+ };
141
+ MarkupFileInstrumenter.prototype.insertCoverageCodeTag = function (instrumentedCode) {
142
+ var firstTagMarker = createScriptMarker(0);
143
+ var firstTagStart = instrumentedCode.indexOf(firstTagMarker);
144
+ var istanbulCoverageCode = instrumentedCode.substring(0, firstTagStart);
145
+ var coverageCodeTag = "<script>\n\t".concat(istanbulCoverageCode, "\n</script>\n");
146
+ this.instrumentedFile = this.insertTagAtBeginning(coverageCodeTag);
147
+ };
148
+ MarkupFileInstrumenter.prototype.addPreamble = function () {
149
+ var preambleTag = "<script>\n\t".concat(this.preambleHeader.join('\n'), "\n</script>\n");
150
+ return this.insertTagAtBeginning(preambleTag);
151
+ };
152
+ MarkupFileInstrumenter.prototype.markScripts = function () {
153
+ var marked = [];
154
+ for (var i = 0; i < this.fileParser.scriptTags.length; i++) {
155
+ var slComment = createScriptMarker(i);
156
+ var currentTag = this.fileParser.scriptTags[i];
157
+ currentTag.content = slComment + currentTag.content + slComment;
158
+ marked.push(currentTag);
159
+ }
160
+ this.fileParser.scriptTags = marked;
161
+ };
162
+ MarkupFileInstrumenter.prototype.insertTagAtBeginning = function (newTag) {
163
+ var firstScriptTagIndex = this.instrumentedFile.search(/<script[\s\S]*?>/);
164
+ return this.instrumentedFile.slice(0, firstScriptTagIndex) + newTag +
165
+ this.instrumentedFile.slice(firstScriptTagIndex);
166
+ };
167
+ return MarkupFileInstrumenter;
168
+ }(file_instrumenter_1.FileInstrumenter));
169
+ exports.MarkupFileInstrumenter = MarkupFileInstrumenter;
120
170
  function getFileParser(fileContents, inputFile, logger) {
121
171
  var handler = new MarkupFileParser(fileContents, inputFile, logger);
122
172
  handler.extractScriptTags();
@@ -124,10 +174,10 @@ function getFileParser(fileContents, inputFile, logger) {
124
174
  }
125
175
  // Checks if the js code is inside file or loaded from external js file (ie <script src="..."></script>).
126
176
  function isJSEmbeddedInFile(fileParser) {
127
- return fileParser.getAllJsInFile() !== "";
177
+ return fileParser.getAllJsInFile() !== '';
128
178
  }
129
179
  function createScriptMarker(index) {
130
- return "/********** SL tag no " + index + " **********/";
180
+ return "/********** SL tag no ".concat(index, " **********/");
131
181
  }
132
182
  /*
133
183
  Because we add mark comments to tag scripts we want to save the original without any changes so we implement deep copy.
@@ -1 +1 @@
1
- {"version":3,"file":"markup-file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/markup-file-instrumenter.js"],"names":[],"mappings":"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"}
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, slMapper, logger) {
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,EAAE,QAAQ,EAAG,MAAM;IACxD,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"}
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"}
@@ -1,13 +1,12 @@
1
1
  // @ts-ignore
2
2
  var traverse = require('ast-traverse');
3
3
  var astUtils = require('sl-esprima-ast-utils');
4
- var globalErrorHandler = require('../global-error-handler');
5
- var babelParser = require("@babel/parser");
6
4
  var createNodeKey = require('./create-node-key').createNodeKey;
7
5
  var AstNodeTypes = require("./ast-node-types");
8
6
  var MethodSignature = require("./method-signature");
9
7
  var BranchSignature = require("./branch-signature");
10
8
  var globalMethodIndexer = require("./globalMethodIndexer");
9
+ var parseContentToAST = require("../ast-utils").parseContentToAST;
11
10
  /**
12
11
  * Traverse the AST and handle specific node types.
13
12
  * Information about the Node Types can be found in: https://github.com/babel/babylon/blob/master/ast/spec.md
@@ -30,14 +29,15 @@ var FileSignature = function (absolutePtah, relativePath, content, sourceMaps, o
30
29
  this.scmFilesContainer = scmFilesContainer;
31
30
  this.hasSourceMaps = !!sourceMaps;
32
31
  this.logger = logger;
33
- this.positionToMethodMap = {};
32
+ this.positionToMethod = {};
33
+ this.endPositionToMethod = {};
34
34
  this.positionToBranchMap = {};
35
35
  this.methodIndex = 0;
36
36
  this.branchIndex = 0;
37
37
  };
38
38
  FileSignature.prototype._createSignature = function () {
39
39
  this.prepareContent();
40
- var ast = this.parseContentToAST();
40
+ var ast = parseContentToAST(this.content, this.opts, this.absolutePath);
41
41
  this.traverseAST(ast);
42
42
  };
43
43
  FileSignature.prototype.createDTO = function () {
@@ -48,18 +48,6 @@ FileSignature.prototype.createDTO = function () {
48
48
  hasSourceMaps: this.hasSourceMaps
49
49
  };
50
50
  };
51
- FileSignature.prototype.parseContentToAST = function () {
52
- var sourceType = (this.opts && this.opts.es6Modules) ? 'module' : 'script';
53
- var plugins = ["*", ["decorators", { decoratorsBeforeExport: true }]];
54
- if (this.opts && this.opts.babylonPlugins) {
55
- plugins = plugins.concat(this.opts.babylonPlugins);
56
- }
57
- return babelParser.parse(this.content, {
58
- // parse in strict mode and allow module declarations
59
- sourceType: sourceType,
60
- plugins: plugins
61
- });
62
- };
63
51
  FileSignature.prototype.traverseAST = function (ast) {
64
52
  var context = this;
65
53
  var nodeToParent = {};
@@ -107,9 +95,10 @@ FileSignature.prototype.addMethod = function (node, parentNode, nodeToParent) {
107
95
  var method = MethodSignature.create(node, parentNode, nodeToParent, this.absolutePath, this.relativePath, this.logger);
108
96
  method.srcData = method.generatedData;
109
97
  this.methods.push(method.createDTO());
110
- this.positionToMethodMap[method.generatedData.position] = this.methodIndex;
98
+ this.endPositionToMethod[method.generatedData.endPosition] = this.methodIndex;
99
+ this.positionToMethod[method.generatedData.position] = this.methodIndex;
111
100
  if (method.generatedData.identifierPosition) {
112
- this.positionToMethodMap[method.generatedData.identifierPosition] = this.methodIndex;
101
+ this.positionToMethod[method.generatedData.identifierPosition] = this.methodIndex;
113
102
  }
114
103
  this.methodIndex++;
115
104
  };
@@ -126,7 +115,8 @@ FileSignature.prototype.addBranch = function (node, parentNode, isGlobalBranch,
126
115
  branches.forEach(function (branch) {
127
116
  branch.srcData = branch.generatedData;
128
117
  context.branches.push(branch.createDTO());
129
- 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;
130
120
  context.branchIndex++;
131
121
  });
132
122
  };
@@ -1 +1 @@
1
- {"version":3,"file":"file-signature.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/file-signature.js"],"names":[],"mappings":"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"}
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, slMapper, logger) {
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
- if (sourceMaps) {
160
- var generatedFileSignature = GeneratedFileSignature.create(absolutePath, relativePath, fileContent, sourceMaps, opts, scmFilesContainer, this.logger);
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++) {