slnodejs 6.1.70 → 6.1.129
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 +1640 -1827
- package/browser-agent/dist/browser-agent-all.min.js +59 -57
- package/browser-agent/package.json +8 -8
- package/package.json +73 -74
- package/tsOutputs/build-scanner/ast-utils.js +3 -3
- package/tsOutputs/build-scanner/ast-utils.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js +6 -6
- package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js +5 -7
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +12 -12
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-element-utils.js +1 -1
- package/tsOutputs/build-scanner/mappings/file-element-utils.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-enricher.js +15 -17
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/files-data-container.js +1 -1
- package/tsOutputs/build-scanner/mappings/files-data-container.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js +13 -15
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js.map +1 -1
- package/tsOutputs/cli-parse/child-process-wrapper.js +3 -3
- package/tsOutputs/cli-parse/child-process-wrapper.js.map +1 -1
- package/tsOutputs/cli-parse/cli.js +7 -7
- package/tsOutputs/cli-parse/cli.js.map +1 -1
- package/tsOutputs/cli-parse/constants/constants.js +10 -11
- package/tsOutputs/cli-parse/constants/constants.js.map +1 -1
- package/tsOutputs/cli-parse/custom-commander.js +2 -2
- package/tsOutputs/cli-parse/custom-commander.js.map +1 -1
- package/tsOutputs/cli-parse/executors/base-executor.js +7 -7
- package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-end-executor.js +1 -3
- package/tsOutputs/cli-parse/executors/build-end-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-executor.js +2 -4
- package/tsOutputs/cli-parse/executors/build-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/config-executor.js +2 -4
- package/tsOutputs/cli-parse/executors/config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/base-data.js +4 -4
- package/tsOutputs/cli-parse/executors/dry-run/base-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js +21 -23
- 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 +17 -19
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-validation.js +1 -3
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-validation.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js +4 -6
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js +7 -7
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js.map +1 -1
- package/tsOutputs/cli-parse/executors/end-execution-executor.js +1 -3
- package/tsOutputs/cli-parse/executors/end-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js +1 -3
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-delete-components-executor.js +0 -2
- package/tsOutputs/cli-parse/executors/integration-build-delete-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-update-components-executor.js +0 -2
- package/tsOutputs/cli-parse/executors/integration-build-update-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/mocha-executor.js +1 -3
- package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js +3 -5
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/pr-config-executor.js +0 -2
- package/tsOutputs/cli-parse/executors/pr-config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/run-executor.js +0 -2
- package/tsOutputs/cli-parse/executors/run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/start-execution-executor.js +1 -3
- package/tsOutputs/cli-parse/executors/start-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-executions-executor.js +0 -2
- package/tsOutputs/cli-parse/executors/test-executions-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-listener-executor.js +1 -3
- package/tsOutputs/cli-parse/executors/test-listener-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-runner-build-session-data-builder.js +1 -3
- package/tsOutputs/cli-parse/executors/test-runner-build-session-data-builder.js.map +1 -1
- package/tsOutputs/cli-parse/executors/upload-report-executor.js +1 -3
- package/tsOutputs/cli-parse/executors/upload-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/utils.js +5 -5
- package/tsOutputs/cli-parse/utils.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-controller.js +7 -7
- package/tsOutputs/common/agent-events/agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-instance-info-builder.js +1 -1
- package/tsOutputs/common/agent-events/agent-instance-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/dry-run-agent-events-controller.js +0 -2
- package/tsOutputs/common/agent-events/dry-run-agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/machine-info-builder.js +1 -1
- package/tsOutputs/common/agent-events/machine-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/sensitive-data-filter.js +1 -1
- package/tsOutputs/common/agent-events/sensitive-data-filter.js.map +1 -1
- package/tsOutputs/common/agent-instance-data.js +2 -2
- package/tsOutputs/common/agent-instance-data.js.map +1 -1
- package/tsOutputs/common/config-process/config.js +0 -2
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/config-process/index.js +0 -2
- package/tsOutputs/common/config-process/index.js.map +1 -1
- package/tsOutputs/common/constants/constants.js +1 -1
- package/tsOutputs/common/constants/constants.js.map +1 -1
- package/tsOutputs/common/coverage-elements/istanbul-unique-id-converter.js +0 -2
- package/tsOutputs/common/coverage-elements/istanbul-unique-id-converter.js.map +1 -1
- package/tsOutputs/common/coverage-elements/new-id-resolver.js +7 -7
- package/tsOutputs/common/coverage-elements/new-id-resolver.js.map +1 -1
- package/tsOutputs/common/coverage-elements/unique-id-converter.js +4 -4
- package/tsOutputs/common/coverage-elements/unique-id-converter.js.map +1 -1
- package/tsOutputs/common/events-process/events-creator.js +5 -3
- package/tsOutputs/common/events-process/events-creator.js.map +1 -1
- package/tsOutputs/common/events-process/index.js +5 -6
- package/tsOutputs/common/events-process/index.js.map +1 -1
- package/tsOutputs/common/footprints-process/collection-interval.js +2 -2
- package/tsOutputs/common/footprints-process/collection-interval.js.map +1 -1
- package/tsOutputs/common/footprints-process/index.js +2 -2
- package/tsOutputs/common/footprints-process/index.js.map +1 -1
- package/tsOutputs/common/footprints-process/istanbul-to-footprints.js +5 -5
- package/tsOutputs/common/footprints-process/istanbul-to-footprints.js.map +1 -1
- package/tsOutputs/common/footprints-process/production-footprints-handler.js +4 -4
- package/tsOutputs/common/footprints-process/production-footprints-handler.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js +1 -3
- package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/contracts.d.ts +1 -1
- package/tsOutputs/common/footprints-process-v6/footprints-buffer.js +0 -2
- package/tsOutputs/common/footprints-process-v6/footprints-buffer.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.d.ts +3 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +26 -5
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/index.js +6 -6
- package/tsOutputs/common/footprints-process-v6/index.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/location-formatter.js +2 -2
- package/tsOutputs/common/footprints-process-v6/location-formatter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-browser-hits-converter.js +0 -2
- package/tsOutputs/common/footprints-process-v6/remote-browser-hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-footprints-process.js +0 -2
- package/tsOutputs/common/footprints-process-v6/remote-footprints-process.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-hits-collector.js +0 -2
- package/tsOutputs/common/footprints-process-v6/remote-hits-collector.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/source-map-data.js +6 -6
- package/tsOutputs/common/footprints-process-v6/source-map-data.js.map +1 -1
- package/tsOutputs/common/http/contracts.js +1 -3
- package/tsOutputs/common/http/contracts.js.map +1 -1
- package/tsOutputs/common/http/http-client.js +11 -11
- package/tsOutputs/common/http/http-client.js.map +1 -1
- package/tsOutputs/common/http/sl-routes.js +1 -1
- package/tsOutputs/common/http/sl-routes.js.map +1 -1
- package/tsOutputs/common/ignored-files-handler.js +2 -2
- package/tsOutputs/common/ignored-files-handler.js.map +1 -1
- package/tsOutputs/common/logger.js +4 -6
- package/tsOutputs/common/logger.js.map +1 -1
- package/tsOutputs/common/queue.js +0 -2
- package/tsOutputs/common/queue.js.map +1 -1
- package/tsOutputs/common/scm/git-cloner.js +3 -3
- package/tsOutputs/common/scm/git-cloner.js.map +1 -1
- package/tsOutputs/common/scm/git.js +1 -1
- package/tsOutputs/common/scm/git.js.map +1 -1
- package/tsOutputs/common/short-name-to-file-mapper.js +3 -3
- package/tsOutputs/common/short-name-to-file-mapper.js.map +1 -1
- package/tsOutputs/common/source-map-handler.js +7 -7
- package/tsOutputs/common/source-map-handler.js.map +1 -1
- package/tsOutputs/common/source-map-reader.js +7 -7
- package/tsOutputs/common/source-map-reader.js.map +1 -1
- package/tsOutputs/common/state-tracker-fpv6.js +1 -3
- package/tsOutputs/common/state-tracker-fpv6.js.map +1 -1
- package/tsOutputs/common/state-tracker.js +3 -5
- package/tsOutputs/common/state-tracker.js.map +1 -1
- package/tsOutputs/common/utils/abstract-data-builder.js +2 -2
- package/tsOutputs/common/utils/abstract-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/build-session-data-builder.js +0 -2
- package/tsOutputs/common/utils/build-session-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/test-utils/mock-server-utils/mock-server-proxy.js +3 -3
- package/tsOutputs/common/utils/test-utils/mock-server-utils/mock-server-proxy.js.map +1 -1
- package/tsOutputs/common/utils/token-data-builder.js +2 -4
- package/tsOutputs/common/utils/token-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/validation-utils.js +2 -2
- package/tsOutputs/common/utils/validation-utils.js.map +1 -1
- package/tsOutputs/common/watchdog.js +0 -2
- package/tsOutputs/common/watchdog.js.map +1 -1
- package/tsOutputs/test-listener/agent.js +3 -3
- package/tsOutputs/test-listener/agent.js.map +1 -1
- package/tsOutputs/test-listener/child-process-patcher.js +1 -1
- package/tsOutputs/test-listener/child-process-patcher.js.map +1 -1
- package/tsOutputs/test-listener/config-process/index.js +0 -2
- package/tsOutputs/test-listener/config-process/index.js.map +1 -1
- package/tsOutputs/test-listener/config.js +0 -2
- package/tsOutputs/test-listener/config.js.map +1 -1
- package/tsOutputs/test-listener/entities/build-scanner/ConfigModeData.js +0 -2
- package/tsOutputs/test-listener/entities/build-scanner/ConfigModeData.js.map +1 -1
- package/tsOutputs/test-listener/entities/build-scanner/ScanModeData.js +0 -2
- package/tsOutputs/test-listener/entities/build-scanner/ScanModeData.js.map +1 -1
- package/tsOutputs/test-listener/execution-process/execution-service-proxy.js +1 -3
- package/tsOutputs/test-listener/execution-process/execution-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/footprints-service-proxy.js +0 -2
- package/tsOutputs/test-listener/footprints-process/footprints-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/index.js +2 -2
- package/tsOutputs/test-listener/footprints-process/index.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-base.js +1 -1
- package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-base.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-v3.js +0 -2
- package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-v3.js.map +1 -1
- package/tsOutputs/test-listener/integrations/SlGulp.js +3 -3
- package/tsOutputs/test-listener/integrations/SlGulp.js.map +1 -1
- package/tsOutputs/test-listener/logs-process/index.js +1 -1
- package/tsOutputs/test-listener/logs-process/index.js.map +1 -1
- package/tsOutputs/test-listener/logs-process/log-service-proxy.js +0 -2
- package/tsOutputs/test-listener/logs-process/log-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js +3 -3
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor.js +3 -3
- package/tsOutputs/test-listener/nyc-report-executor.js.map +1 -1
- package/tsOutputs/test-listener/queue.js +0 -2
- package/tsOutputs/test-listener/queue.js.map +1 -1
- package/tsOutputs/test-listener/remote-agent.js +1 -1
- package/tsOutputs/test-listener/remote-agent.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/AppNameResolver.js +0 -2
- package/tsOutputs/test-listener/resolvers/AppNameResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/ArgumentResolver.js +2 -2
- package/tsOutputs/test-listener/resolvers/ArgumentResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildResolver.js +0 -2
- package/tsOutputs/test-listener/resolvers/BuildResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildSessionIdFileResolver.js +0 -2
- package/tsOutputs/test-listener/resolvers/BuildSessionIdFileResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildSessionIdResolver.js +0 -2
- package/tsOutputs/test-listener/resolvers/BuildSessionIdResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/ProxyResolver.js +0 -2
- package/tsOutputs/test-listener/resolvers/ProxyResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/TokenResolver.js +0 -2
- package/tsOutputs/test-listener/resolvers/TokenResolver.js.map +1 -1
- package/tsOutputs/test-listener/state-tracker-process/index.js +2 -4
- package/tsOutputs/test-listener/state-tracker-process/index.js.map +1 -1
- package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js +1 -3
- package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js.map +1 -1
- package/tsOutputs/test-listener/test-recommendation-handler.js +4 -4
- package/tsOutputs/test-listener/test-recommendation-handler.js.map +1 -1
- package/tsOutputs/test-listener/upload-report-handler.js +1 -1
- package/tsOutputs/test-listener/upload-report-handler.js.map +1 -1
- package/tsOutputs/test-listener/watchdog.js +0 -2
- package/tsOutputs/test-listener/watchdog.js.map +1 -1
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sl-browser-agent",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.129",
|
|
4
4
|
"description": "le Browser Agent!",
|
|
5
5
|
"main": "dist/browser-agent-all.js",
|
|
6
6
|
"devDependencies": {
|
|
7
|
-
"@types/request": "
|
|
8
|
-
"browserify": "
|
|
7
|
+
"@types/request": "2.48.2",
|
|
8
|
+
"browserify": "14.4.0",
|
|
9
9
|
"parse-asn1": "5.1.5",
|
|
10
|
-
"systemjs-builder": "
|
|
11
|
-
"uglifyjs": "
|
|
12
|
-
"globify": "
|
|
13
|
-
"tsify": "
|
|
10
|
+
"systemjs-builder": "0.15.34",
|
|
11
|
+
"uglifyjs": "2.4.11",
|
|
12
|
+
"globify": "3.0.3",
|
|
13
|
+
"tsify": "5.0.2"
|
|
14
14
|
},
|
|
15
15
|
"scripts": {
|
|
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": "tsc -p ./tsconfig.browserfiy.json && mkdir
|
|
19
|
+
"prebrowserify": "tsc -p ./tsconfig.browserfiy.json && mkdir -p 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.1.
|
|
3
|
+
"version": "6.1.129",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "tsOutputs/api.js",
|
|
6
6
|
"scripts": {
|
|
@@ -16,7 +16,7 @@
|
|
|
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\" && npm run ut:browser-agent",
|
|
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",
|
|
@@ -24,89 +24,88 @@
|
|
|
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
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"
|
|
27
|
+
"lintfix": "eslint --fix build-scanner/ cli-parse/ common/ test-listener/ test/ --ext .ts && npm run lintfix:browser-agent"
|
|
29
28
|
},
|
|
30
29
|
"keywords": [],
|
|
31
30
|
"author": "",
|
|
32
31
|
"license": "ISC",
|
|
33
32
|
"dependencies": {
|
|
34
|
-
"@babel/generator": "
|
|
35
|
-
"@babel/parser": "
|
|
36
|
-
"@types/rimraf": "
|
|
37
|
-
"ast-traverse": "
|
|
38
|
-
"ast-types": "
|
|
39
|
-
"async": "
|
|
40
|
-
"bunyan-format": "
|
|
41
|
-
"chai-string": "
|
|
42
|
-
"chalk": "
|
|
43
|
-
"commander": "
|
|
44
|
-
"convert-source-map": "
|
|
45
|
-
"fileset": "
|
|
46
|
-
"glob": "
|
|
33
|
+
"@babel/generator": "7.3.2",
|
|
34
|
+
"@babel/parser": "7.16.4",
|
|
35
|
+
"@types/rimraf": "3.0.0",
|
|
36
|
+
"ast-traverse": "0.1.1",
|
|
37
|
+
"ast-types": "0.13.3",
|
|
38
|
+
"async": "2.6.0",
|
|
39
|
+
"bunyan-format": "0.2.1",
|
|
40
|
+
"chai-string": "1.5.0",
|
|
41
|
+
"chalk": "2.4.1",
|
|
42
|
+
"commander": "4.1.0",
|
|
43
|
+
"convert-source-map": "1.6.0",
|
|
44
|
+
"fileset": "2.0.3",
|
|
45
|
+
"glob": "5.0.15",
|
|
47
46
|
"ignore": "5.1.1",
|
|
48
47
|
"istanbul-lib-instrument": "3.0.0",
|
|
49
|
-
"jwt-decode": "
|
|
50
|
-
"lightcookie": "
|
|
51
|
-
"lodash": "
|
|
52
|
-
"md5": "
|
|
53
|
-
"micromatch": "
|
|
54
|
-
"mkdirp": "
|
|
55
|
-
"nopt": "
|
|
56
|
-
"nopt-usage": "
|
|
57
|
-
"nyc": "
|
|
58
|
-
"object-assign": "
|
|
59
|
-
"once": "
|
|
60
|
-
"promise": "
|
|
61
|
-
"read-json-sync": "
|
|
62
|
-
"request": "
|
|
63
|
-
"rimraf": "
|
|
64
|
-
"shell-quote": "
|
|
65
|
-
"sl-esprima-ast-utils": "
|
|
48
|
+
"jwt-decode": "2.2.0",
|
|
49
|
+
"lightcookie": "1.0.24",
|
|
50
|
+
"lodash": "4.17.21",
|
|
51
|
+
"md5": "2.0.0",
|
|
52
|
+
"micromatch": "3.1.10",
|
|
53
|
+
"mkdirp": "0.5.5",
|
|
54
|
+
"nopt": "3.0.4",
|
|
55
|
+
"nopt-usage": "0.1.0",
|
|
56
|
+
"nyc": "14.1.1",
|
|
57
|
+
"object-assign": "4.1.1",
|
|
58
|
+
"once": "1.4.0",
|
|
59
|
+
"promise": "7.0.4",
|
|
60
|
+
"read-json-sync": "1.1.1",
|
|
61
|
+
"request": "2.88.2",
|
|
62
|
+
"rimraf": "3.0.2",
|
|
63
|
+
"shell-quote": "1.6.1",
|
|
64
|
+
"sl-esprima-ast-utils": "0.0.7",
|
|
66
65
|
"source-map": "0.6.1",
|
|
67
|
-
"table": "
|
|
68
|
-
"util": "
|
|
69
|
-
"uuid": "
|
|
70
|
-
"winston": "
|
|
66
|
+
"table": "6.7.1",
|
|
67
|
+
"util": "0.10.3",
|
|
68
|
+
"uuid": "3.1.0",
|
|
69
|
+
"winston": "3.3.3"
|
|
71
70
|
},
|
|
72
71
|
"devDependencies": {
|
|
73
|
-
"@miovision/eslint-plugin-disallow-date": "
|
|
74
|
-
"@sealights/server-mock": "
|
|
75
|
-
"@types/chai": "
|
|
76
|
-
"@types/chai-as-promised": "
|
|
77
|
-
"@types/chai-json-schema": "
|
|
78
|
-
"@types/istanbul-lib-instrument": "
|
|
79
|
-
"@types/mocha": "
|
|
80
|
-
"@types/node": "
|
|
81
|
-
"@types/object-assign": "
|
|
82
|
-
"@types/request": "
|
|
83
|
-
"@types/sinon": "
|
|
84
|
-
"@types/sinon-chai": "
|
|
85
|
-
"@types/uuid": "
|
|
86
|
-
"@typescript-eslint/eslint-plugin": "
|
|
87
|
-
"@typescript-eslint/parser": "
|
|
88
|
-
"assert": "
|
|
89
|
-
"body-parser": "
|
|
90
|
-
"chai": "
|
|
91
|
-
"chai-as-promised": "
|
|
92
|
-
"chai-files": "
|
|
93
|
-
"chai-json-schema": "
|
|
94
|
-
"cpy": "
|
|
95
|
-
"deep-diff": "
|
|
96
|
-
"eslint": "
|
|
97
|
-
"express": "
|
|
98
|
-
"fs-extra": "
|
|
99
|
-
"
|
|
100
|
-
"
|
|
101
|
-
"mocha": "^6.1.4",
|
|
72
|
+
"@miovision/eslint-plugin-disallow-date": "2.0.0",
|
|
73
|
+
"@sealights/server-mock": "1.0.63",
|
|
74
|
+
"@types/chai": "4.0.4",
|
|
75
|
+
"@types/chai-as-promised": "7.1.0",
|
|
76
|
+
"@types/chai-json-schema": "1.4.6",
|
|
77
|
+
"@types/istanbul-lib-instrument": "1.7.4",
|
|
78
|
+
"@types/mocha": "2.2.42",
|
|
79
|
+
"@types/node": "12.19.3",
|
|
80
|
+
"@types/object-assign": "4.0.30",
|
|
81
|
+
"@types/request": "0.0.45",
|
|
82
|
+
"@types/sinon": "7.5.2",
|
|
83
|
+
"@types/sinon-chai": "3.2.5",
|
|
84
|
+
"@types/uuid": "3.4.3",
|
|
85
|
+
"@typescript-eslint/eslint-plugin": "4.12.0",
|
|
86
|
+
"@typescript-eslint/parser": "4.12.0",
|
|
87
|
+
"assert": "1.3.0",
|
|
88
|
+
"body-parser": "1.19.1",
|
|
89
|
+
"chai": "4.1.2",
|
|
90
|
+
"chai-as-promised": "7.1.1",
|
|
91
|
+
"chai-files": "1.4.0",
|
|
92
|
+
"chai-json-schema": "1.5.0",
|
|
93
|
+
"cpy": "8.1.2",
|
|
94
|
+
"deep-diff": "1.0.2",
|
|
95
|
+
"eslint": "7.17.0",
|
|
96
|
+
"express": "4.17.1",
|
|
97
|
+
"fs-extra": "7.0.1",
|
|
98
|
+
"istanbul": "0.4.5",
|
|
99
|
+
"mocha": "6.2.3",
|
|
102
100
|
"mockdate": "2.0.2",
|
|
103
|
-
"mute": "
|
|
104
|
-
"
|
|
105
|
-
"
|
|
106
|
-
"sinon
|
|
107
|
-
"
|
|
108
|
-
"
|
|
109
|
-
"
|
|
101
|
+
"mute": "2.0.6",
|
|
102
|
+
"plugin-error": "1.0.1",
|
|
103
|
+
"recursive-readdir": "2.1.1",
|
|
104
|
+
"sinon": "7.5.0",
|
|
105
|
+
"sinon-chai": "3.5.0",
|
|
106
|
+
"temp": "0.8.3",
|
|
107
|
+
"ts-node": "7.0.1",
|
|
108
|
+
"typescript": "4.0.5"
|
|
110
109
|
},
|
|
111
110
|
"bin": {
|
|
112
111
|
"slnodejs": "lib/cli.js"
|
|
@@ -8,7 +8,7 @@ var logger = logger_1.LoggerFactory.getCreateApplicationLogger();
|
|
|
8
8
|
function getDecoratorsPlugin(babylonPlugins, filename) {
|
|
9
9
|
var decoratorsLegacy = 'decorators-legacy';
|
|
10
10
|
if (babylonPlugins.indexOf(decoratorsLegacy) > -1) {
|
|
11
|
-
logger.info("Using '"
|
|
11
|
+
logger.info("Using '" + decoratorsLegacy + "' plugin to parse ast for '" + filename + "'");
|
|
12
12
|
return;
|
|
13
13
|
}
|
|
14
14
|
return ['decorators', { decoratorsBeforeExport: true }];
|
|
@@ -25,13 +25,13 @@ function parseContentToAST(content, opts, filename) {
|
|
|
25
25
|
var _a;
|
|
26
26
|
var sourceType = (opts && opts.es6Modules) ? 'module' : 'script';
|
|
27
27
|
var plugins = getParserPlugins(opts && opts.babylonPlugins, filename);
|
|
28
|
-
var file =
|
|
28
|
+
var file = parser_1.parse(content, {
|
|
29
29
|
sourceType: sourceType,
|
|
30
30
|
plugins: plugins,
|
|
31
31
|
errorRecovery: true
|
|
32
32
|
});
|
|
33
33
|
if ((_a = file === null || file === void 0 ? void 0 : file.errors) === null || _a === void 0 ? void 0 : _a.length) {
|
|
34
|
-
cockpit_notifier_1.CockpitNotifier.sendWarning("File '"
|
|
34
|
+
cockpit_notifier_1.CockpitNotifier.sendWarning("File '" + filename + "' parsed to AST with the following error(s): " + file.errors.map(function (e) { return e.message; }));
|
|
35
35
|
}
|
|
36
36
|
return file;
|
|
37
37
|
}
|
|
@@ -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,
|
|
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,cAAK,CAAC,OAAO,EAAE;QACxB,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE,OAAO;QAChB,aAAa,EAAE,IAAI;KACtB,CAA8B,CAAC;IAEhC,UAAI,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"}
|
|
@@ -69,7 +69,7 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
69
69
|
return __generator(this, function (_a) {
|
|
70
70
|
switch (_a.label) {
|
|
71
71
|
case 0:
|
|
72
|
-
this.logger.debug("Processing single file. File: '"
|
|
72
|
+
this.logger.debug("Processing single file. File: '" + this.name);
|
|
73
73
|
inputFile = this.getInputFile();
|
|
74
74
|
outputFile = this.getOutputFile();
|
|
75
75
|
inputFileExtension = path.extname(inputFile);
|
|
@@ -124,7 +124,7 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
124
124
|
return __generator(this, function (_c) {
|
|
125
125
|
switch (_c.label) {
|
|
126
126
|
case 0:
|
|
127
|
-
errMessage =
|
|
127
|
+
errMessage = err.message + " File: '" + this.name + ". Error: " + err;
|
|
128
128
|
this.logger.error(errMessage);
|
|
129
129
|
cockpit_notifier_1.CockpitNotifier.sendError(errMessage);
|
|
130
130
|
return [4 /*yield*/, this.copyFileAsIs(inputFile, outputFile)];
|
|
@@ -173,7 +173,7 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
173
173
|
});
|
|
174
174
|
};
|
|
175
175
|
FileInstrumenter.prototype.instrumentFileNoSpawn = function (inputFile) {
|
|
176
|
-
this.logger.debug("Instrumenting file '"
|
|
176
|
+
this.logger.debug("Instrumenting file '" + inputFile + "'");
|
|
177
177
|
var fileContents = fs.readFileSync(inputFile, 'utf8');
|
|
178
178
|
fileContents = this.onBeforeInstrumentation(fileContents);
|
|
179
179
|
return this.instrumenter.instrumentSync(fileContents, inputFile);
|
|
@@ -182,7 +182,7 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
182
182
|
return __awaiter(this, void 0, void 0, function () {
|
|
183
183
|
var syncInstrumenterFile, syncInstrumenterPath, config, defaultMaxBuffer, maxBuffer, instrumentationProcessResult, stdout, stderr;
|
|
184
184
|
return __generator(this, function (_a) {
|
|
185
|
-
this.logger.debug("Instrumenting file '"
|
|
185
|
+
this.logger.debug("Instrumenting file '" + inputFile + "'. in a child process");
|
|
186
186
|
syncInstrumenterFile = 'sync-instrumenter.js';
|
|
187
187
|
syncInstrumenterPath = path.resolve(__dirname, syncInstrumenterFile);
|
|
188
188
|
config = {
|
|
@@ -207,7 +207,7 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
207
207
|
};
|
|
208
208
|
FileInstrumenter.prototype.resolveStderr = function (stderr, inputFile) {
|
|
209
209
|
if (this.isGotOutOfMemoryError(stderr)) {
|
|
210
|
-
throw new Error("Got out of memory while instrumenting file '"
|
|
210
|
+
throw new Error("Got out of memory while instrumenting file '" + inputFile + "'. \n More memory can by provided by using '--max_old_space_size'. for more information please see " + FileInstrumenter.outOfMemoryDocumentationUrl);
|
|
211
211
|
}
|
|
212
212
|
else {
|
|
213
213
|
throw new Error(stderr);
|
|
@@ -252,7 +252,7 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
252
252
|
};
|
|
253
253
|
FileInstrumenter.prototype.isFileAcceptedBySlIgnore = function () {
|
|
254
254
|
if (this.IgnoredFilesHandler.denies(this.name)) {
|
|
255
|
-
this.logger.info("File '"
|
|
255
|
+
this.logger.info("File '" + this.name + "' ignored by .slignore, will be copied as is");
|
|
256
256
|
return false;
|
|
257
257
|
}
|
|
258
258
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/file-instrumenter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wEAAoE;AACpE,2BAA6B;AAC7B,2BAA8B;AAC9B,iCAA8B;AAC9B,uBAAyB;AACzB,4CAA8C;AAC9C,iEAAoE;AACpE,6DAAgE;AAChE,8DAAiE;AACjE,+EAA2E;AAC3E,kEAA6D;AAK7D;IAGI,0BAAsB,IAAS,EAAY,cAAwB,EAAY,YAA0B,EACnF,IAAY,EAAU,mBAAwC,EAAY,MAAc;QADxF,SAAI,GAAJ,IAAI,CAAK;QAAY,mBAAc,GAAd,cAAc,CAAU;QAAY,iBAAY,GAAZ,YAAY,CAAc;QACnF,SAAI,GAAJ,IAAI,CAAQ;QAAU,wBAAmB,GAAnB,mBAAmB,CAAqB;QAAY,WAAM,GAAN,MAAM,CAAQ;QAC1G,kCAAe,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnD,kCAAe,CAAC,oBAAoB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACvE,kCAAe,CAAC,oBAAoB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACnE,kCAAe,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnD,kCAAe,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,CAAC;QACjF,kCAAe,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAEY,iDAAsB,GAAnC;;;;;;wBACI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/file-instrumenter.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
7
7
|
return extendStatics(d, b);
|
|
8
8
|
};
|
|
9
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
10
|
extendStatics(d, b);
|
|
13
11
|
function __() { this.constructor = d; }
|
|
14
12
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
@@ -74,7 +72,7 @@ var MarkupFileInstrumenter = /** @class */ (function (_super) {
|
|
|
74
72
|
return __generator(this, function (_a) {
|
|
75
73
|
switch (_a.label) {
|
|
76
74
|
case 0:
|
|
77
|
-
this.logger.debug("Instrumenting file '"
|
|
75
|
+
this.logger.debug("Instrumenting file '" + inputFile + "'");
|
|
78
76
|
_a.label = 1;
|
|
79
77
|
case 1:
|
|
80
78
|
_a.trys.push([1, 2, , 4]);
|
|
@@ -96,7 +94,7 @@ var MarkupFileInstrumenter = /** @class */ (function (_super) {
|
|
|
96
94
|
});
|
|
97
95
|
};
|
|
98
96
|
MarkupFileInstrumenter.prototype.extractScripts = function (inputFile) {
|
|
99
|
-
var fileContents =
|
|
97
|
+
var fileContents = fs_1.readFileSync(inputFile, 'utf8');
|
|
100
98
|
fileContents = this.onBeforeInstrumentation(fileContents);
|
|
101
99
|
this.originalFile = fileContents;
|
|
102
100
|
this.instrumentedFile = fileContents;
|
|
@@ -142,11 +140,11 @@ var MarkupFileInstrumenter = /** @class */ (function (_super) {
|
|
|
142
140
|
var firstTagMarker = createScriptMarker(0);
|
|
143
141
|
var firstTagStart = instrumentedCode.indexOf(firstTagMarker);
|
|
144
142
|
var istanbulCoverageCode = instrumentedCode.substring(0, firstTagStart);
|
|
145
|
-
var coverageCodeTag = "<script>\n\t"
|
|
143
|
+
var coverageCodeTag = "<script>\n\t" + istanbulCoverageCode + "\n</script>\n";
|
|
146
144
|
this.instrumentedFile = this.insertTagAtBeginning(coverageCodeTag);
|
|
147
145
|
};
|
|
148
146
|
MarkupFileInstrumenter.prototype.addPreamble = function () {
|
|
149
|
-
var preambleTag = "<script>\n\t"
|
|
147
|
+
var preambleTag = "<script>\n\t" + this.preambleHeader.join('\n') + "\n</script>\n";
|
|
150
148
|
return this.insertTagAtBeginning(preambleTag);
|
|
151
149
|
};
|
|
152
150
|
MarkupFileInstrumenter.prototype.markScripts = function () {
|
|
@@ -177,7 +175,7 @@ function isJSEmbeddedInFile(fileParser) {
|
|
|
177
175
|
return fileParser.getAllJsInFile() !== '';
|
|
178
176
|
}
|
|
179
177
|
function createScriptMarker(index) {
|
|
180
|
-
return "/********** SL tag no "
|
|
178
|
+
return "/********** SL tag no " + index + " **********/";
|
|
181
179
|
}
|
|
182
180
|
/*
|
|
183
181
|
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.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"markup-file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/markup-file-instrumenter.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ var EnsureFilesHandlerService = /** @class */ (function () {
|
|
|
60
60
|
if (root === '.') {
|
|
61
61
|
root = process.cwd();
|
|
62
62
|
}
|
|
63
|
-
root =
|
|
63
|
+
root = path_1.normalize(root);
|
|
64
64
|
result.files = this.fixFilesPathByPath(result.files, root);
|
|
65
65
|
}
|
|
66
66
|
else if (this.scmFilesContainer) {
|
|
@@ -81,23 +81,23 @@ var EnsureFilesHandlerService = /** @class */ (function () {
|
|
|
81
81
|
};
|
|
82
82
|
EnsureFilesHandlerService.prototype.fixFilesPathByPath = function (uniqueFiles, projectRoot) {
|
|
83
83
|
var _this = this;
|
|
84
|
-
var fixedProjectRoot =
|
|
84
|
+
var fixedProjectRoot = path_1.normalize(projectRoot);
|
|
85
85
|
var _loop_1 = function (file) {
|
|
86
|
-
var fileFixedPath = files_utils_1.FilesUtils.adjustPathSlashes(
|
|
86
|
+
var fileFixedPath = files_utils_1.FilesUtils.adjustPathSlashes(path_1.normalize(file.logicalPath).replace(fixedProjectRoot, ''));
|
|
87
87
|
if (fileFixedPath.indexOf('/') === 0) {
|
|
88
88
|
fileFixedPath = fileFixedPath.substring(1);
|
|
89
89
|
}
|
|
90
90
|
file.logicalPath = fileFixedPath;
|
|
91
91
|
file.physicalPath = fileFixedPath;
|
|
92
|
-
file.absolutePath = files_utils_1.FilesUtils.adjustPathSlashes(
|
|
92
|
+
file.absolutePath = files_utils_1.FilesUtils.adjustPathSlashes(path_1.join(fixedProjectRoot, file.physicalPath));
|
|
93
93
|
file.methods.forEach(function (method) {
|
|
94
|
-
method.uniqueId =
|
|
94
|
+
method.uniqueId = file.logicalPath + "@" + method.position.join(',');
|
|
95
95
|
_this.slMapper.addUniqueId(method.uniqueIdKey, method.uniqueId);
|
|
96
96
|
delete method.uniqueIdKey;
|
|
97
97
|
});
|
|
98
98
|
file.branches.forEach(function (branch) {
|
|
99
|
-
var position =
|
|
100
|
-
branch.uniqueId =
|
|
99
|
+
var position = file_element_utils_1.getBranchPosition(branch);
|
|
100
|
+
branch.uniqueId = file.logicalPath + "|" + position.join(',') + "|" + branch.index;
|
|
101
101
|
_this.slMapper.addUniqueId(branch.uniqueIdKey, branch.uniqueId);
|
|
102
102
|
delete branch.uniqueIdKey;
|
|
103
103
|
});
|
|
@@ -132,7 +132,7 @@ var EnsureFilesHandlerService = /** @class */ (function () {
|
|
|
132
132
|
if (source.indexOf('/') === 0) {
|
|
133
133
|
source = source.substring(1);
|
|
134
134
|
}
|
|
135
|
-
return
|
|
135
|
+
return path_1.normalize(source);
|
|
136
136
|
};
|
|
137
137
|
EnsureFilesHandlerService.prototype.getMappingPositionForMethod = function (sourceMaps, method) {
|
|
138
138
|
var _a, _b;
|
|
@@ -177,8 +177,8 @@ var EnsureFilesHandlerService = /** @class */ (function () {
|
|
|
177
177
|
codeElementMetrics.hasColumnInfo = true;
|
|
178
178
|
}
|
|
179
179
|
var cleanPath = this.cleanPath(startMap.source);
|
|
180
|
-
var generatedFileMethodKey =
|
|
181
|
-
this.filesDataContainer.addMethod(cleanPath,
|
|
180
|
+
var generatedFileMethodKey = generatedFile.absolutePath + "@" + method.position.join(',');
|
|
181
|
+
this.filesDataContainer.addMethod(cleanPath, file_element_utils_1.createMethod(startMap, endMap, method, generatedFileMethodKey));
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
};
|
|
@@ -192,8 +192,8 @@ var EnsureFilesHandlerService = /** @class */ (function () {
|
|
|
192
192
|
codeElementMetrics.hasColumnInfo = true;
|
|
193
193
|
}
|
|
194
194
|
var cleanPath = this.cleanPath(startMap.source);
|
|
195
|
-
var generatedFileBranchKey =
|
|
196
|
-
this.filesDataContainer.addBranch(cleanPath,
|
|
195
|
+
var generatedFileBranchKey = generatedFile.absolutePath + "|" + branchInfo.parentPosition.join(',') + "|" + branchInfo.index;
|
|
196
|
+
this.filesDataContainer.addBranch(cleanPath, file_element_utils_1.createBranch(startMap, endMap, parentStartMap, branchInfo, cleanPath, generatedFileBranchKey));
|
|
197
197
|
}
|
|
198
198
|
}
|
|
199
199
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-files-handler.service.js","sourceRoot":"","sources":["../../../build-scanner/mappings/ensure-files-handler.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA4D;AAE5D,6BAAuC;AAEvC,uDAA0D;AAC1D,2DAAkF;AAClF,iDAA+C;AAC/C,mDAAgD;AAChD,8DAA4D;AAC5D,qEAAwE;AACxE;IAuBI,mCACqB,MAAM,EACf,IAAS,EACT,iBAAoC,EACpC,UAAkB,EAClB,MAAsC,EACtC,QAAQ;QALC,WAAM,GAAN,MAAM,CAAA;QACf,SAAI,GAAJ,IAAI,CAAK;QACT,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,eAAU,GAAV,UAAU,CAAQ;QAClB,WAAM,GAAN,MAAM,CAAgC;QACtC,aAAQ,GAAR,QAAQ,CAAA;QA3BH,mBAAc,GAAG,aAAa,CAAC;QAC/B,2BAAsB,GAAG,mBAAmB,CAAC;QAC7C,sBAAiB,GAAG,QAAQ,CAAC;QAC7B,sBAAiB,GAAG,WAAW,CAAC;QAChC,qBAAgB,GAAG,UAAU,CAAC;QAC9B,0BAAqB,GAAG,GAAG,CAAC,CAAC,0CAA0C;QACvE,iBAAY,GAAG,cAAc,CAAC;QAC9B,0BAAqB,GAAG;YACrC,IAAI,CAAC,sBAAsB;YAC3B,IAAI,CAAC,iBAAiB;YACtB,IAAI,CAAC,qBAAqB;YAC1B,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,iBAAiB;YACtB,IAAI,CAAC,gBAAgB;SAExB,CAAC;QAGM,uBAAkB,GAAG,IAAI,yCAAkB,EAAE,CAAC;QAUlD,IAAI,CAAC,YAAY,GAAG,IAAI,6BAAY,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5E,IAAI,CAAC,mBAAmB,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,iDAAa,GAAb,UAAc,GAAwB;QAClC,IAAM,MAAM,yBAA6B,GAAG,KAAE,KAAK,EAAE,EAAE,GAAE,CAAA;QAEzD,KAAqB,UAAS,EAAT,KAAA,GAAG,CAAC,KAAK,EAAT,cAAS,EAAT,IAAS,EAAE;YAA3B,IAAM,MAAM,SAAA;YACb,IAAM,gBAAgB,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;YACjF,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;SACvD;QAED,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAC7C,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;YACpC,IAAI,IAAI,KAAK,GAAG,EAAE;gBACd,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;aACxB;YACD,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"ensure-files-handler.service.js","sourceRoot":"","sources":["../../../build-scanner/mappings/ensure-files-handler.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ function getBranchPosition(branch) {
|
|
|
40
40
|
if (!isNaN(branch.parentPosition[0]) && !isNaN(branch.parentPosition[1])) {
|
|
41
41
|
return branch.parentPosition;
|
|
42
42
|
}
|
|
43
|
-
logger.info("Branch at position '"
|
|
43
|
+
logger.info("Branch at position '" + branch.position + "' in file '" + branch.filename + "' is an if statement inside async methods using branch position instead of parent");
|
|
44
44
|
return branch.position;
|
|
45
45
|
}
|
|
46
46
|
exports.getBranchPosition = getBranchPosition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-element-utils.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-element-utils.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAGlD,IAAM,MAAM,GAAG,sBAAa,CAAC,0BAA0B,EAAE,CAAC;AAC1D,SAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;;IAC9D,OAAO;QACH,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QACzC,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QAC1C,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,WAAW,
|
|
1
|
+
{"version":3,"file":"file-element-utils.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-element-utils.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAGlD,IAAM,MAAM,GAAG,sBAAa,CAAC,0BAA0B,EAAE,CAAC;AAC1D,SAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;;IAC9D,OAAO;QACH,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QACzC,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QAC1C,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,WAAW,cAAE,QAAQ,CAAC,IAAI,mCAAI,MAAM,CAAC,WAAW,mCAAI,aAAa;QACjE,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,WAAW,EAAE,WAAW;KAC3B,CAAA;AACL,CAAC;AAZD,oCAYC;AAID,SAAgB,YAAY,CAAC,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW;IACzG,OAAO;QACH,QAAQ,EAAE,WAAW;QACrB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,WAAW,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC;QACnD,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;QACpD,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,cAAc,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;QAC5D,kBAAkB,EAAE,UAAU,CAAC,kBAAkB;QACjD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,IAAI,EAAE;QACnD,WAAW,EAAE,WAAW;KAE3B,CAAC;AACN,CAAC;AAdD,oCAcC;AAED,SAAgB,iBAAiB,CAAC,MAAkB;IAChD,IAAG,MAAM,CAAC,IAAI,KAAK,aAAa,EAAC;QAC7B,OAAO,MAAM,CAAC,QAAQ,CAAC;KAC1B;IAED,IAAG,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAC;QACpE,OAAO,MAAM,CAAC,cAAc,CAAA;KAC/B;IAED,MAAM,CAAC,IAAI,CAAC,yBAAuB,MAAM,CAAC,QAAQ,mBAAc,MAAM,CAAC,QAAQ,sFAAmF,CAAC,CAAC;IACpK,OAAO,MAAM,CAAC,QAAQ,CAAC;AAC3B,CAAC;AAXD,8CAWC"}
|