slnodejs 6.1.410 → 6.1.429
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 +33 -28
- package/browser-agent/dist/browser-agent-all.min.js +2 -2
- package/browser-agent/package.json +1 -1
- package/package.json +2 -2
- package/tsOutputs/api.js +32 -86
- package/tsOutputs/build-scanner/ast-utils.js +11 -11
- package/tsOutputs/build-scanner/ast-utils.js.map +1 -1
- package/tsOutputs/build-scanner/build-diff-process.js +36 -16
- package/tsOutputs/build-scanner/build-diff-process.js.map +1 -1
- package/tsOutputs/build-scanner/cia.js +2 -2
- package/tsOutputs/build-scanner/cia.js.map +1 -1
- package/tsOutputs/build-scanner/default-values-resolver.js +5 -7
- package/tsOutputs/build-scanner/default-values-resolver.js.map +1 -1
- package/tsOutputs/build-scanner/diagnostic/build-scan-diagnosis.js +101 -159
- package/tsOutputs/build-scanner/diagnostic/build-scan-diagnosis.js.map +1 -1
- package/tsOutputs/build-scanner/diagnostic/none-diagnosis.js +23 -55
- package/tsOutputs/build-scanner/diagnostic/none-diagnosis.js.map +1 -1
- package/tsOutputs/build-scanner/file-and-folder-utils.js +3 -3
- package/tsOutputs/build-scanner/file-and-folder-utils.js.map +1 -1
- package/tsOutputs/build-scanner/file-system/actual-file.js +3 -3
- package/tsOutputs/build-scanner/file-system/actual-file.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js +57 -60
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/content-instrumenter.js +9 -10
- package/tsOutputs/build-scanner/instrumentation/content-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/files-instrumenter.js +80 -124
- package/tsOutputs/build-scanner/instrumentation/files-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js +3 -3
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/instrumented-file-size-reducer.js +4 -4
- package/tsOutputs/build-scanner/instrumentation/instrumented-file-size-reducer.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/instrumenter-spawn.js +15 -50
- package/tsOutputs/build-scanner/instrumentation/process-pool/instrumenter-spawn.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/process-pool.js +84 -141
- package/tsOutputs/build-scanner/instrumentation/process-pool/process-pool.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/split-by-transform-stream.js +15 -34
- package/tsOutputs/build-scanner/instrumentation/process-pool/split-by-transform-stream.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/stop-by-condition-transform-stream.js +9 -27
- package/tsOutputs/build-scanner/instrumentation/process-pool/stop-by-condition-transform-stream.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/copy-as-is-strategy.js +8 -10
- package/tsOutputs/build-scanner/instrumentation/strategies/copy-as-is-strategy.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/js-instrumnetation-strategy.js +22 -54
- package/tsOutputs/build-scanner/instrumentation/strategies/js-instrumnetation-strategy.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/markup-instrumnetation-strategy.js +55 -107
- package/tsOutputs/build-scanner/instrumentation/strategies/markup-instrumnetation-strategy.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/file-signature.js +5 -6
- package/tsOutputs/build-scanner/js_diff/file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/files-mapping.js +6 -6
- package/tsOutputs/build-scanner/js_diff/files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/generated-file-signature.js +3 -3
- package/tsOutputs/build-scanner/js_diff/generated-file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js +26 -27
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js +1 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js +28 -79
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js +3 -2
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/source-files-notifier.js +1 -1
- package/tsOutputs/build-scanner/js_diff/source-files-notifier.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +76 -149
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-element-utils.js +9 -9
- package/tsOutputs/build-scanner/mappings/file-element-utils.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-enricher.js +71 -100
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-path-fixer.js +106 -0
- package/tsOutputs/build-scanner/mappings/file-path-fixer.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/files-container.js +89 -0
- package/tsOutputs/build-scanner/mappings/files-container.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/files-data-container.js +18 -23
- package/tsOutputs/build-scanner/mappings/files-data-container.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/source-path-mapper.js +15 -45
- package/tsOutputs/build-scanner/mappings/source-path-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/markup-files-parser.js +1 -1
- package/tsOutputs/build-scanner/markup-files-parser.js.map +1 -1
- package/tsOutputs/build-scanner/scm/scm-file-fixer.js +27 -0
- package/tsOutputs/build-scanner/scm/scm-file-fixer.js.map +1 -0
- package/tsOutputs/build-scanner/scm/scm-files-container.js +9 -45
- package/tsOutputs/build-scanner/scm/scm-files-container.js.map +1 -1
- package/tsOutputs/build-scanner/sl-config-cia-cli.js +1 -1
- package/tsOutputs/build-scanner/sl-config-cia-cli.js.map +1 -1
- package/tsOutputs/build-scanner/utils.js +5 -5
- package/tsOutputs/build-scanner/utils.js.map +1 -1
- package/tsOutputs/cli-parse/agent-instance-data.js +2 -2
- package/tsOutputs/cli-parse/agent-instance-data.js.map +1 -1
- package/tsOutputs/cli-parse/child-process-wrapper.js +26 -60
- package/tsOutputs/cli-parse/child-process-wrapper.js.map +1 -1
- package/tsOutputs/cli-parse/cli.js +74 -191
- package/tsOutputs/cli-parse/cli.js.map +1 -1
- package/tsOutputs/cli-parse/constants/constants.js +9 -9
- package/tsOutputs/cli-parse/constants/constants.js.map +1 -1
- package/tsOutputs/cli-parse/contracts.d.ts +2 -0
- package/tsOutputs/cli-parse/contracts.js.map +1 -1
- package/tsOutputs/cli-parse/custom-commander.js +17 -18
- package/tsOutputs/cli-parse/custom-commander.js.map +1 -1
- package/tsOutputs/cli-parse/executors/base-executor.js +121 -236
- package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-args-dto.js +11 -11
- package/tsOutputs/cli-parse/executors/build-args-dto.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-end-executor.js +34 -92
- package/tsOutputs/cli-parse/executors/build-end-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-executor.js +68 -132
- package/tsOutputs/cli-parse/executors/build-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/config-executor.js +35 -92
- package/tsOutputs/cli-parse/executors/config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/base-data.js +29 -39
- package/tsOutputs/cli-parse/executors/dry-run/base-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js +92 -177
- 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 +110 -194
- 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 +49 -83
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-validation.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js +55 -113
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js +24 -25
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js.map +1 -1
- package/tsOutputs/cli-parse/executors/end-execution-executor.js +16 -64
- package/tsOutputs/cli-parse/executors/end-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js +29 -82
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-delete-components-executor.js +12 -59
- 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 +9 -58
- package/tsOutputs/cli-parse/executors/integration-build-update-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/mocha-executor.js +41 -101
- package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js +24 -83
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/pr-config-executor.js +15 -63
- package/tsOutputs/cli-parse/executors/pr-config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/run-executor.js +23 -75
- package/tsOutputs/cli-parse/executors/run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/start-execution-executor.js +16 -64
- package/tsOutputs/cli-parse/executors/start-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-executions-executor.js +9 -63
- package/tsOutputs/cli-parse/executors/test-executions-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-listener-executor.js +47 -117
- package/tsOutputs/cli-parse/executors/test-listener-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/upload-report-executor.js +23 -71
- package/tsOutputs/cli-parse/executors/upload-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/utils.js +10 -10
- package/tsOutputs/cli-parse/utils.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-controller.js +146 -251
- package/tsOutputs/common/agent-events/agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-guard.js +12 -15
- package/tsOutputs/common/agent-events/agent-events-guard.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-instance-info-builder.js +22 -24
- package/tsOutputs/common/agent-events/agent-instance-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-start-info-builder.js +7 -8
- package/tsOutputs/common/agent-events/agent-start-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/browser-info-builder.js +9 -10
- package/tsOutputs/common/agent-events/browser-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/ci-info-builder.js +12 -13
- package/tsOutputs/common/agent-events/ci-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/cockpit-notifier.js +38 -87
- package/tsOutputs/common/agent-events/cockpit-notifier.js.map +1 -1
- package/tsOutputs/common/agent-events/dry-run-agent-events-controller.js +10 -27
- package/tsOutputs/common/agent-events/dry-run-agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/machine-info-builder.js +21 -22
- package/tsOutputs/common/agent-events/machine-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/no-op-agent-events-controller.js +30 -84
- package/tsOutputs/common/agent-events/no-op-agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/nodejs-env-info-builder.js +7 -8
- package/tsOutputs/common/agent-events/nodejs-env-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/sensitive-data-filter.js +3 -4
- package/tsOutputs/common/agent-events/sensitive-data-filter.js.map +1 -1
- package/tsOutputs/common/agent-instance-data.js +23 -28
- package/tsOutputs/common/agent-instance-data.js.map +1 -1
- package/tsOutputs/common/cli-progress.js +16 -19
- package/tsOutputs/common/cli-progress.js.map +1 -1
- package/tsOutputs/common/config-process/config-loader.js +23 -24
- package/tsOutputs/common/config-process/config-loader.js.map +1 -1
- package/tsOutputs/common/config-process/config-system.js +104 -131
- package/tsOutputs/common/config-process/config-system.js.map +1 -1
- package/tsOutputs/common/config-process/config.js +52 -73
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/config-process/index.js +38 -57
- package/tsOutputs/common/config-process/index.js.map +1 -1
- package/tsOutputs/common/config-process/no-op-config-process.js +9 -29
- package/tsOutputs/common/config-process/no-op-config-process.js.map +1 -1
- package/tsOutputs/common/constants/constants.js +19 -25
- package/tsOutputs/common/constants/constants.js.map +1 -1
- package/tsOutputs/common/constants/sl-env-vars.js +125 -131
- package/tsOutputs/common/constants/sl-env-vars.js.map +1 -1
- package/tsOutputs/common/coverage-elements/file-element.js +66 -103
- package/tsOutputs/common/coverage-elements/file-element.js.map +1 -1
- package/tsOutputs/common/coverage-elements/istanbul-unique-id-converter.js +28 -47
- package/tsOutputs/common/coverage-elements/istanbul-unique-id-converter.js.map +1 -1
- package/tsOutputs/common/coverage-elements/new-id-resolver.js +17 -17
- package/tsOutputs/common/coverage-elements/new-id-resolver.js.map +1 -1
- package/tsOutputs/common/coverage-elements/original-module-loader.js +71 -79
- package/tsOutputs/common/coverage-elements/original-module-loader.js.map +1 -1
- package/tsOutputs/common/coverage-elements/unique-id-converter.js +90 -110
- package/tsOutputs/common/coverage-elements/unique-id-converter.js.map +1 -1
- package/tsOutputs/common/environment-data-service.js +10 -11
- package/tsOutputs/common/environment-data-service.js.map +1 -1
- package/tsOutputs/common/events-process/events-creator.js +20 -32
- package/tsOutputs/common/events-process/events-creator.js.map +1 -1
- package/tsOutputs/common/events-process/index.js +97 -186
- package/tsOutputs/common/events-process/index.js.map +1 -1
- package/tsOutputs/common/footprints-process/collection-interval.js +10 -11
- package/tsOutputs/common/footprints-process/collection-interval.js.map +1 -1
- package/tsOutputs/common/footprints-process/footprints-service-proxy.js +21 -22
- package/tsOutputs/common/footprints-process/footprints-service-proxy.js.map +1 -1
- package/tsOutputs/common/footprints-process/index.js +68 -102
- package/tsOutputs/common/footprints-process/index.js.map +1 -1
- package/tsOutputs/common/footprints-process/istanbul-to-footprints-contract.js +2 -5
- package/tsOutputs/common/footprints-process/istanbul-to-footprints-contract.js.map +1 -1
- package/tsOutputs/common/footprints-process/istanbul-to-footprints.js +160 -162
- package/tsOutputs/common/footprints-process/istanbul-to-footprints.js.map +1 -1
- package/tsOutputs/common/footprints-process/production-footprints-handler.js +103 -156
- package/tsOutputs/common/footprints-process/production-footprints-handler.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js +30 -48
- package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/browser-footprints-buffer.js +7 -25
- package/tsOutputs/common/footprints-process-v6/browser-footprints-buffer.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/buffer-size-helper.js +13 -14
- package/tsOutputs/common/footprints-process-v6/buffer-size-helper.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-footprints-buffer.js +14 -32
- package/tsOutputs/common/footprints-process-v6/collector-footprints-buffer.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-footprints-process.js +43 -109
- package/tsOutputs/common/footprints-process-v6/collector-footprints-process.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/contracts.js +2 -5
- package/tsOutputs/common/footprints-process-v6/contracts.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/footprints-buffer.js +55 -78
- package/tsOutputs/common/footprints-process-v6/footprints-buffer.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-collector.js +89 -129
- package/tsOutputs/common/footprints-process-v6/hits-collector.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +70 -78
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/index.js +204 -347
- 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/relative-path-resolver.js +10 -11
- package/tsOutputs/common/footprints-process-v6/relative-path-resolver.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-browser-hits-converter.js +5 -25
- package/tsOutputs/common/footprints-process-v6/remote-browser-hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-footprints-process.js +6 -57
- package/tsOutputs/common/footprints-process-v6/remote-footprints-process.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-hits-collector.js +7 -27
- package/tsOutputs/common/footprints-process-v6/remote-hits-collector.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/source-map-data.js +14 -15
- package/tsOutputs/common/footprints-process-v6/source-map-data.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy.js +222 -321
- package/tsOutputs/common/http/backend-proxy.js.map +1 -1
- package/tsOutputs/common/http/contracts.js +40 -116
- package/tsOutputs/common/http/contracts.js.map +1 -1
- package/tsOutputs/common/http/dry-run-proxy.js +68 -111
- package/tsOutputs/common/http/dry-run-proxy.js.map +1 -1
- package/tsOutputs/common/http/entities-mapper.js +6 -9
- package/tsOutputs/common/http/entities-mapper.js.map +1 -1
- package/tsOutputs/common/http/http-client.js +76 -86
- package/tsOutputs/common/http/http-client.js.map +1 -1
- package/tsOutputs/common/http/sl-routes.js +119 -122
- package/tsOutputs/common/http/sl-routes.js.map +1 -1
- package/tsOutputs/common/ignored-files-handler.js +48 -49
- package/tsOutputs/common/ignored-files-handler.js.map +1 -1
- package/tsOutputs/common/logger.js +66 -88
- package/tsOutputs/common/logger.js.map +1 -1
- package/tsOutputs/common/messages-formatter.js +9 -14
- package/tsOutputs/common/messages-formatter.js.map +1 -1
- package/tsOutputs/common/no-op-state-tracker.js +14 -37
- package/tsOutputs/common/no-op-state-tracker.js.map +1 -1
- package/tsOutputs/common/queue.js +18 -36
- package/tsOutputs/common/queue.js.map +1 -1
- package/tsOutputs/common/scm/git-cloner.js +30 -94
- package/tsOutputs/common/scm/git-cloner.js.map +1 -1
- package/tsOutputs/common/scm/git-format-builder.js +24 -25
- package/tsOutputs/common/scm/git-format-builder.js.map +1 -1
- package/tsOutputs/common/scm/git.js +192 -327
- package/tsOutputs/common/scm/git.js.map +1 -1
- package/tsOutputs/common/scm/none.js +58 -110
- package/tsOutputs/common/scm/none.js.map +1 -1
- package/tsOutputs/common/scm/scm-factory.js +6 -9
- package/tsOutputs/common/scm/scm-factory.js.map +1 -1
- package/tsOutputs/common/short-name-to-file-mapper.js +30 -33
- package/tsOutputs/common/short-name-to-file-mapper.js.map +1 -1
- package/tsOutputs/common/source-map-handler.js +76 -98
- package/tsOutputs/common/source-map-handler.js.map +1 -1
- package/tsOutputs/common/source-map-reader.js +35 -36
- package/tsOutputs/common/source-map-reader.js.map +1 -1
- package/tsOutputs/common/source-maps-utils.js +8 -11
- package/tsOutputs/common/source-maps-utils.js.map +1 -1
- package/tsOutputs/common/state-tracker-fpv6.js +15 -37
- package/tsOutputs/common/state-tracker-fpv6.js.map +1 -1
- package/tsOutputs/common/state-tracker.js +124 -212
- package/tsOutputs/common/state-tracker.js.map +1 -1
- package/tsOutputs/common/system-date.js +3 -3
- package/tsOutputs/common/system-date.js.map +1 -1
- package/tsOutputs/common/utils/abstract-data-builder.js +8 -9
- package/tsOutputs/common/utils/abstract-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/build-session-data-builder.js +25 -79
- package/tsOutputs/common/utils/build-session-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/dependency-utils.js +13 -16
- package/tsOutputs/common/utils/dependency-utils.js.map +1 -1
- package/tsOutputs/common/utils/env-var-parsing.js +10 -14
- package/tsOutputs/common/utils/env-var-parsing.js.map +1 -1
- package/tsOutputs/common/utils/files-utils.js +16 -19
- package/tsOutputs/common/utils/files-utils.js.map +1 -1
- package/tsOutputs/common/utils/process-utils.js +12 -25
- package/tsOutputs/common/utils/process-utils.js.map +1 -1
- package/tsOutputs/common/utils/test-runner-build-session-data-builder.js +16 -62
- package/tsOutputs/common/utils/test-runner-build-session-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/test-utils/mock-server-utils/mock-server-proxy.js +120 -192
- package/tsOutputs/common/utils/test-utils/mock-server-utils/mock-server-proxy.js.map +1 -1
- package/tsOutputs/common/utils/timer-utils.js +4 -7
- package/tsOutputs/common/utils/timer-utils.js.map +1 -1
- package/tsOutputs/common/utils/token-data-builder.js +30 -50
- package/tsOutputs/common/utils/token-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/validation-utils.js +7 -10
- package/tsOutputs/common/utils/validation-utils.js.map +1 -1
- package/tsOutputs/common/uuid.js +7 -10
- package/tsOutputs/common/uuid.js.map +1 -1
- package/tsOutputs/common/v8-utils.js +12 -50
- package/tsOutputs/common/v8-utils.js.map +1 -1
- package/tsOutputs/common/watchdog.js +35 -56
- package/tsOutputs/common/watchdog.js.map +1 -1
- package/tsOutputs/mocha-reporter/index.js +12 -12
- package/tsOutputs/mocha-reporter/index.js.map +1 -1
- package/tsOutputs/mocha-reporter/otel-agent.js +47 -118
- package/tsOutputs/mocha-reporter/otel-agent.js.map +1 -1
- package/tsOutputs/test-listener/SlNodeJsProxy.js +34 -35
- package/tsOutputs/test-listener/SlNodeJsProxy.js.map +1 -1
- package/tsOutputs/test-listener/UserMessageHelper.js +14 -19
- package/tsOutputs/test-listener/UserMessageHelper.js.map +1 -1
- package/tsOutputs/test-listener/agent-loader.js +42 -59
- package/tsOutputs/test-listener/agent-loader.js.map +1 -1
- package/tsOutputs/test-listener/agent.js +93 -150
- package/tsOutputs/test-listener/agent.js.map +1 -1
- package/tsOutputs/test-listener/api.js +36 -70
- package/tsOutputs/test-listener/api.js.map +1 -1
- package/tsOutputs/test-listener/base-proxy.js +25 -27
- package/tsOutputs/test-listener/base-proxy.js.map +1 -1
- package/tsOutputs/test-listener/bootstrap.js +6 -6
- package/tsOutputs/test-listener/bootstrap.js.map +1 -1
- package/tsOutputs/test-listener/child-process-patcher.js +10 -10
- package/tsOutputs/test-listener/child-process-patcher.js.map +1 -1
- package/tsOutputs/test-listener/cli.js +27 -30
- package/tsOutputs/test-listener/cli.js.map +1 -1
- package/tsOutputs/test-listener/coloring/http-coloring.js +30 -33
- package/tsOutputs/test-listener/coloring/http-coloring.js.map +1 -1
- package/tsOutputs/test-listener/coloring/listening-port.js +14 -17
- package/tsOutputs/test-listener/coloring/listening-port.js.map +1 -1
- package/tsOutputs/test-listener/command-line-arg-parser.js +12 -15
- package/tsOutputs/test-listener/command-line-arg-parser.js.map +1 -1
- package/tsOutputs/test-listener/config-process/config-loader.js +21 -22
- package/tsOutputs/test-listener/config-process/config-loader.js.map +1 -1
- package/tsOutputs/test-listener/config-process/config-system.js +100 -127
- package/tsOutputs/test-listener/config-process/config-system.js.map +1 -1
- package/tsOutputs/test-listener/config-process/index.js +38 -57
- package/tsOutputs/test-listener/config-process/index.js.map +1 -1
- package/tsOutputs/test-listener/config.js +38 -59
- package/tsOutputs/test-listener/config.js.map +1 -1
- package/tsOutputs/test-listener/entities/BasicConfigurationData.js +37 -64
- package/tsOutputs/test-listener/entities/BasicConfigurationData.js.map +1 -1
- package/tsOutputs/test-listener/entities/build-scanner/ConfigModeData.js +17 -42
- package/tsOutputs/test-listener/entities/build-scanner/ConfigModeData.js.map +1 -1
- package/tsOutputs/test-listener/entities/build-scanner/ScanModeData.js +19 -45
- package/tsOutputs/test-listener/entities/build-scanner/ScanModeData.js.map +1 -1
- package/tsOutputs/test-listener/environment-data-service.js +10 -11
- package/tsOutputs/test-listener/environment-data-service.js.map +1 -1
- package/tsOutputs/test-listener/execution-process/entities-mapper.js +11 -14
- package/tsOutputs/test-listener/execution-process/entities-mapper.js.map +1 -1
- package/tsOutputs/test-listener/execution-process/execution-service-proxy.js +54 -72
- package/tsOutputs/test-listener/execution-process/execution-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/execution-process/index.js +26 -26
- package/tsOutputs/test-listener/execution-process/index.js.map +1 -1
- package/tsOutputs/test-listener/factory.js +140 -175
- package/tsOutputs/test-listener/factory.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/footprints-service-proxy.js +17 -34
- package/tsOutputs/test-listener/footprints-process/footprints-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/index.js +53 -58
- package/tsOutputs/test-listener/footprints-process/index.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-base.js +49 -50
- 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 +98 -117
- package/tsOutputs/test-listener/footprints-process/istanbul-to-footprints-v3.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/ts-node-hits-collector.js +57 -141
- package/tsOutputs/test-listener/footprints-process/ts-node-hits-collector.js.map +1 -1
- package/tsOutputs/test-listener/integrations/SlGulp.js +25 -26
- package/tsOutputs/test-listener/integrations/SlGulp.js.map +1 -1
- package/tsOutputs/test-listener/logs-process/index.js +30 -35
- package/tsOutputs/test-listener/logs-process/index.js.map +1 -1
- package/tsOutputs/test-listener/logs-process/log-service-proxy.js +8 -25
- package/tsOutputs/test-listener/logs-process/log-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js +53 -110
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor.js +48 -85
- package/tsOutputs/test-listener/nyc-report-executor.js.map +1 -1
- package/tsOutputs/test-listener/otel-agent-loader.js +30 -33
- package/tsOutputs/test-listener/otel-agent-loader.js.map +1 -1
- package/tsOutputs/test-listener/queue.js +18 -36
- package/tsOutputs/test-listener/queue.js.map +1 -1
- package/tsOutputs/test-listener/remote-agent.js +97 -223
- package/tsOutputs/test-listener/remote-agent.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/AppNameResolver.js +8 -25
- package/tsOutputs/test-listener/resolvers/AppNameResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/ArgumentResolver.js +11 -12
- package/tsOutputs/test-listener/resolvers/ArgumentResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildResolver.js +8 -25
- package/tsOutputs/test-listener/resolvers/BuildResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildSessionIdFileResolver.js +8 -25
- package/tsOutputs/test-listener/resolvers/BuildSessionIdFileResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildSessionIdResolver.js +8 -25
- package/tsOutputs/test-listener/resolvers/BuildSessionIdResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/ProxyResolver.js +8 -25
- package/tsOutputs/test-listener/resolvers/ProxyResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/TokenResolver.js +8 -25
- package/tsOutputs/test-listener/resolvers/TokenResolver.js.map +1 -1
- package/tsOutputs/test-listener/state-tracker-process/index.js +54 -74
- package/tsOutputs/test-listener/state-tracker-process/index.js.map +1 -1
- package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js +18 -37
- package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js.map +1 -1
- package/tsOutputs/test-listener/test-recommendation-handler.js +66 -109
- package/tsOutputs/test-listener/test-recommendation-handler.js.map +1 -1
- package/tsOutputs/test-listener/upload-report-handler.js +33 -35
- package/tsOutputs/test-listener/upload-report-handler.js.map +1 -1
- package/tsOutputs/test-listener/utils.js +13 -14
- package/tsOutputs/test-listener/utils.js.map +1 -1
- package/tsOutputs/test-listener/uuid.js +7 -10
- package/tsOutputs/test-listener/uuid.js.map +1 -1
- package/tsOutputs/test-listener/wait-for-multiple-callbacks.js +17 -19
- package/tsOutputs/test-listener/wait-for-multiple-callbacks.js.map +1 -1
- package/tsOutputs/test-listener/watchdog.js +32 -51
- package/tsOutputs/test-listener/watchdog.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js +0 -96
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js.map +0 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OriginalModuleLoader = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
const validation_utils_1 = require("../utils/validation-utils");
|
|
5
|
+
const files_utils_1 = require("../utils/files-utils");
|
|
6
|
+
const source_maps_utils_1 = require("../source-maps-utils");
|
|
7
7
|
/*
|
|
8
8
|
This class iterate over all elements in istanbul coverage data and checks if they are generated from other files.
|
|
9
9
|
if so we read source maps data and load the original module into istanbul modules.
|
|
@@ -11,71 +11,68 @@ var source_maps_utils_1 = require("../source-maps-utils");
|
|
|
11
11
|
1. retrieve '.ts' files from generated '.js' files.
|
|
12
12
|
2. retrieve '.js' files from 'bundle.js' that generated using webpack.
|
|
13
13
|
*/
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
const BRANCHES_MAP_KEY = 'branchMap';
|
|
15
|
+
const METHODS_MAP_KEY = 'fnMap';
|
|
16
|
+
class OriginalModuleLoader {
|
|
17
|
+
constructor(coverageObject, logger) {
|
|
18
18
|
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(coverageObject, 'coverageObject');
|
|
19
19
|
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(logger, 'logger');
|
|
20
20
|
this.coverageObject = coverageObject;
|
|
21
21
|
this.logger = logger;
|
|
22
22
|
this._fileToSourceMapConsumer = {};
|
|
23
23
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
OriginalModuleLoader.prototype.tryLoadOriginalModule = function (istanbulModule) {
|
|
24
|
+
load() {
|
|
25
|
+
const modules = Object.keys(this.coverageObject);
|
|
26
|
+
modules.map(moduleName => this.tryLoadOriginalModule(moduleName));
|
|
27
|
+
}
|
|
28
|
+
tryLoadOriginalModule(istanbulModule) {
|
|
30
29
|
if (!this.getSourceMapForFile(istanbulModule)) {
|
|
31
30
|
// No source maps for file, nothing to load.
|
|
32
31
|
return;
|
|
33
32
|
}
|
|
34
33
|
this.readOriginalModule(istanbulModule);
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
Object.keys(module.
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
var originalMethod = this.createEmptyMethodObject();
|
|
34
|
+
}
|
|
35
|
+
readOriginalModule(moduleName) {
|
|
36
|
+
const sourceMapsReader = this.getSourceMapForFile(moduleName);
|
|
37
|
+
const module = this.coverageObject[moduleName];
|
|
38
|
+
Object.keys(module.branchMap).forEach(key => this.resolveAndAddBranch(module.branchMap[key], sourceMapsReader, moduleName));
|
|
39
|
+
Object.keys(module.fnMap).map(key => this.resolveAndAddMethod(module.fnMap[key], sourceMapsReader, moduleName));
|
|
40
|
+
}
|
|
41
|
+
resolveAndAddMethod(method, sourceMapsReader, moduleName) {
|
|
42
|
+
const originalMethod = this.createEmptyMethodObject();
|
|
45
43
|
originalMethod.name = method.name;
|
|
46
|
-
|
|
44
|
+
const originalModuleName = this.loadOriginalDataForElement(sourceMapsReader, method, moduleName, originalMethod);
|
|
47
45
|
if (originalModuleName) {
|
|
48
46
|
this.addElementToModule(originalModuleName, originalMethod, METHODS_MAP_KEY);
|
|
49
47
|
}
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
var originalBranch = this.createEmptyBranchObject();
|
|
48
|
+
}
|
|
49
|
+
resolveAndAddBranch(branch, sourceMapsReader, moduleName) {
|
|
50
|
+
const originalBranch = this.createEmptyBranchObject();
|
|
54
51
|
originalBranch.type = branch.type;
|
|
55
|
-
|
|
52
|
+
const originalModuleName = this.loadOriginalDataForElement(sourceMapsReader, branch, moduleName, originalBranch);
|
|
56
53
|
if (originalModuleName) {
|
|
57
|
-
|
|
54
|
+
const originalLocations = branch.locations.map(locationElement => this.createElementSourceData(locationElement, sourceMapsReader, moduleName));
|
|
58
55
|
originalBranch.locations = originalLocations;
|
|
59
56
|
this.addElementToModule(originalModuleName, originalBranch, BRANCHES_MAP_KEY);
|
|
60
57
|
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
58
|
+
}
|
|
59
|
+
loadOriginalDataForElement(sourceMapsReader, element, moduleName, originalElement) {
|
|
60
|
+
const sourceMapDataForStart = this.readSourceMapData(sourceMapsReader, element.loc.start, moduleName);
|
|
61
|
+
const sourceMapDataForEnd = this.readSourceMapData(sourceMapsReader, element.loc.end, moduleName);
|
|
65
62
|
if (!sourceMapDataForStart) {
|
|
66
63
|
// current method has no source data
|
|
67
64
|
return;
|
|
68
65
|
}
|
|
69
66
|
originalElement.loc.start = sourceMapDataForStart.originalPosition;
|
|
70
67
|
originalElement.line = sourceMapDataForStart.originalPosition.line;
|
|
71
|
-
|
|
68
|
+
const originalModuleName = sourceMapDataForStart.originalFilename;
|
|
72
69
|
if (sourceMapDataForEnd) {
|
|
73
70
|
originalElement.loc.end = sourceMapDataForEnd.originalPosition;
|
|
74
71
|
}
|
|
75
72
|
if (element.decl) {
|
|
76
73
|
originalElement.decl = {};
|
|
77
|
-
|
|
78
|
-
|
|
74
|
+
const sourceMapDataForDeclStart = this.readSourceMapData(sourceMapsReader, element.decl.start, moduleName);
|
|
75
|
+
const sourceMapDataForDeclEnd = this.readSourceMapData(sourceMapsReader, element.decl.end, moduleName);
|
|
79
76
|
if (sourceMapDataForDeclStart) {
|
|
80
77
|
originalElement.decl.start = sourceMapDataForDeclStart.originalPosition;
|
|
81
78
|
}
|
|
@@ -84,57 +81,57 @@ var OriginalModuleLoader = /** @class */ (function () {
|
|
|
84
81
|
}
|
|
85
82
|
}
|
|
86
83
|
return originalModuleName;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
84
|
+
}
|
|
85
|
+
addElementToModule(moduleName, element, mapObjectKey) {
|
|
86
|
+
const module = this.getOrCreateIstanbulModule(moduleName);
|
|
87
|
+
const key = this.createElementKey(element);
|
|
91
88
|
if (!module[mapObjectKey][key]) {
|
|
92
89
|
module[mapObjectKey][key] = element;
|
|
93
90
|
}
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
91
|
+
}
|
|
92
|
+
createElementSourceData(locationElement, sourceMapsReader, moduleName) {
|
|
93
|
+
const sourceMapDataForStart = this.readSourceMapData(sourceMapsReader, locationElement.start, moduleName);
|
|
94
|
+
const sourceMapDataForEnd = this.readSourceMapData(sourceMapsReader, locationElement.end, moduleName);
|
|
98
95
|
if (!sourceMapDataForStart && !sourceMapDataForEnd) {
|
|
99
96
|
return {};
|
|
100
97
|
}
|
|
101
|
-
|
|
98
|
+
const sourceLocationElement = {
|
|
102
99
|
start: sourceMapDataForStart.originalPosition,
|
|
103
100
|
end: sourceMapDataForEnd.originalPosition,
|
|
104
101
|
};
|
|
105
102
|
return sourceLocationElement;
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
|
|
103
|
+
}
|
|
104
|
+
getOrCreateIstanbulModule(moduleName) {
|
|
105
|
+
let module = this.coverageObject[moduleName];
|
|
109
106
|
if (!module) {
|
|
110
107
|
module = this.createIstanbulModule(moduleName);
|
|
111
108
|
this.coverageObject[moduleName] = module;
|
|
112
109
|
}
|
|
113
110
|
return module;
|
|
114
|
-
}
|
|
115
|
-
|
|
111
|
+
}
|
|
112
|
+
getSourceMapForFile(fullPath) {
|
|
116
113
|
if (!this._fileToSourceMapConsumer[fullPath]) {
|
|
117
114
|
this._fileToSourceMapConsumer[fullPath] = source_maps_utils_1.SourceMapsUtils.readSourceMaps(fullPath);
|
|
118
115
|
this.logger.debug('Read source maps for file\':' + fullPath + '\'');
|
|
119
116
|
}
|
|
120
|
-
|
|
117
|
+
const sourceMap = this._fileToSourceMapConsumer[fullPath];
|
|
121
118
|
return sourceMap;
|
|
122
|
-
}
|
|
123
|
-
|
|
119
|
+
}
|
|
120
|
+
readSourceMapData(sourceMaps, start, fullPath) {
|
|
124
121
|
if (!sourceMaps)
|
|
125
122
|
return null;
|
|
126
123
|
try {
|
|
127
|
-
|
|
124
|
+
const originalPosition = sourceMaps.originalPositionFor(start); //{ line: start.line, column: start[1] });
|
|
128
125
|
if (originalPosition && originalPosition.source && originalPosition.line !== null && originalPosition.column !== null) {
|
|
129
|
-
|
|
126
|
+
let originalFilename = originalPosition.source;
|
|
130
127
|
if (originalFilename.indexOf('webpack:///webpack/') === -1 &&
|
|
131
128
|
originalFilename.indexOf('webpack:///external') === -1) { //Ignore embedded and external module
|
|
132
129
|
if (originalFilename.indexOf('webpack:///') === 0) {
|
|
133
130
|
originalFilename = originalFilename.substring(11); //'webpack:///'.length
|
|
134
131
|
}
|
|
135
132
|
originalFilename = files_utils_1.FilesUtils.resolveOriginalFullFileName(fullPath, originalFilename);
|
|
136
|
-
|
|
137
|
-
|
|
133
|
+
const originalPositionObj = { line: originalPosition.line, column: originalPosition.column };
|
|
134
|
+
const result = { originalFilename: originalFilename, originalPosition: originalPositionObj };
|
|
138
135
|
return result;
|
|
139
136
|
}
|
|
140
137
|
}
|
|
@@ -143,26 +140,26 @@ var OriginalModuleLoader = /** @class */ (function () {
|
|
|
143
140
|
console.log(e);
|
|
144
141
|
}
|
|
145
142
|
return null;
|
|
146
|
-
}
|
|
147
|
-
|
|
143
|
+
}
|
|
144
|
+
createElementKey(element) {
|
|
148
145
|
return element.loc.start.line + ':' + element.loc.start.column;
|
|
149
|
-
}
|
|
150
|
-
|
|
146
|
+
}
|
|
147
|
+
createEmptyBranchObject() {
|
|
151
148
|
return {
|
|
152
149
|
loc: {},
|
|
153
150
|
locations: [],
|
|
154
151
|
type: '',
|
|
155
152
|
line: null
|
|
156
153
|
};
|
|
157
|
-
}
|
|
158
|
-
|
|
154
|
+
}
|
|
155
|
+
createEmptyMethodObject() {
|
|
159
156
|
return {
|
|
160
157
|
loc: {},
|
|
161
158
|
name: '',
|
|
162
159
|
line: null
|
|
163
160
|
};
|
|
164
|
-
}
|
|
165
|
-
|
|
161
|
+
}
|
|
162
|
+
createIstanbulModule(path) {
|
|
166
163
|
return {
|
|
167
164
|
s: {},
|
|
168
165
|
f: {},
|
|
@@ -173,18 +170,13 @@ var OriginalModuleLoader = /** @class */ (function () {
|
|
|
173
170
|
path: path,
|
|
174
171
|
uniqueIdsMap: null
|
|
175
172
|
};
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
enumerable: false,
|
|
185
|
-
configurable: true
|
|
186
|
-
});
|
|
187
|
-
return OriginalModuleLoader;
|
|
188
|
-
}());
|
|
173
|
+
}
|
|
174
|
+
get fileToSourceMapConsumer() {
|
|
175
|
+
return this._fileToSourceMapConsumer;
|
|
176
|
+
}
|
|
177
|
+
set fileToSourceMapConsumer(value) {
|
|
178
|
+
this._fileToSourceMapConsumer = value;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
189
181
|
exports.OriginalModuleLoader = OriginalModuleLoader;
|
|
190
182
|
//# sourceMappingURL=original-module-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"original-module-loader.js","sourceRoot":"","sources":["../../../common/coverage-elements/original-module-loader.ts"],"names":[],"mappings":";;;AAKA,
|
|
1
|
+
{"version":3,"file":"original-module-loader.js","sourceRoot":"","sources":["../../../common/coverage-elements/original-module-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UniqueIdConverter = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
const contracts_1 = require("./contracts");
|
|
5
|
+
const file_element_1 = require("./file-element");
|
|
6
|
+
const METHOD_DELIMITER = '@';
|
|
7
|
+
const BRANCH_DELIMITER = '|';
|
|
8
|
+
const NULL_PARAM_MESSAGE = 'cannot be null or undefined';
|
|
9
9
|
/*
|
|
10
10
|
this class create uniqueId's in new format for build mapping input.
|
|
11
11
|
*/
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
class UniqueIdConverter {
|
|
13
|
+
constructor(filename, logger) {
|
|
14
14
|
if (!filename) {
|
|
15
15
|
throw new Error('\'filename\' ' + NULL_PARAM_MESSAGE);
|
|
16
16
|
}
|
|
@@ -23,20 +23,20 @@ var UniqueIdConverter = /** @class */ (function () {
|
|
|
23
23
|
this._methodsArray = [];
|
|
24
24
|
this._branchesArray = [];
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
sortElements() {
|
|
27
27
|
this._methodsArray = this._methodsArray.sort(this.comparePosition);
|
|
28
28
|
this._branchesArray = this._branchesArray.sort(this.comparePosition);
|
|
29
|
-
}
|
|
30
|
-
|
|
29
|
+
}
|
|
30
|
+
createElementsArray(file) {
|
|
31
31
|
file.methods = file.methods || [];
|
|
32
32
|
file.branches = file.branches || [];
|
|
33
33
|
this.fillFileElementsArray(file.methods, this._methodsArray, contracts_1.ElementType.METHOD);
|
|
34
34
|
this.fillFileElementsArray(file.branches, this._branchesArray, contracts_1.ElementType.BRANCH);
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
}
|
|
36
|
+
createFileElement(element, filename, type) {
|
|
37
|
+
const startPosition = this.createElementPosition(element.position);
|
|
38
|
+
const endPosition = this.createElementPosition(element.endPosition);
|
|
39
|
+
const fileElement = new file_element_1.FileElement(type, startPosition, endPosition, element.uniqueId, filename);
|
|
40
40
|
if (element.uniqueId_decl) {
|
|
41
41
|
fileElement.uniqueIdKey_decl = element.uniqueId_decl;
|
|
42
42
|
}
|
|
@@ -46,26 +46,26 @@ var UniqueIdConverter = /** @class */ (function () {
|
|
|
46
46
|
'index' value to column.
|
|
47
47
|
*/
|
|
48
48
|
if (element.parentPosition) {
|
|
49
|
-
|
|
49
|
+
const index = element.index || 0;
|
|
50
50
|
fileElement.startPosition = this.createElementPosition(element.parentPosition);
|
|
51
51
|
fileElement.index = index;
|
|
52
52
|
}
|
|
53
53
|
return fileElement;
|
|
54
|
-
}
|
|
55
|
-
|
|
54
|
+
}
|
|
55
|
+
process() {
|
|
56
56
|
this.removeDuplicateElements(this._methodsArray);
|
|
57
57
|
this.removeDuplicateElements(this._branchesArray);
|
|
58
58
|
this.sortElements();
|
|
59
|
-
this.logger.debug(
|
|
60
|
-
this.logger.debug(
|
|
59
|
+
this.logger.debug(`sorted ${this._branchesArray.length} branches`);
|
|
60
|
+
this.logger.debug(`sorted ${this._methodsArray.length} methods`);
|
|
61
61
|
this.fillUniqueIdsMap();
|
|
62
|
-
}
|
|
63
|
-
|
|
62
|
+
}
|
|
63
|
+
setAndInitFile(file) {
|
|
64
64
|
this.createElementsArray(file);
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
65
|
+
}
|
|
66
|
+
createElementPosition(position) {
|
|
67
|
+
let line;
|
|
68
|
+
let column;
|
|
69
69
|
if (Array.isArray(position) && position.length === 2) {
|
|
70
70
|
line = parseInt(position[0]);
|
|
71
71
|
column = parseInt(position[1]);
|
|
@@ -74,39 +74,38 @@ var UniqueIdConverter = /** @class */ (function () {
|
|
|
74
74
|
throw new Error('element has no correct startPosition array, cannot resolve startPosition');
|
|
75
75
|
}
|
|
76
76
|
return {
|
|
77
|
-
column
|
|
78
|
-
line
|
|
77
|
+
column,
|
|
78
|
+
line,
|
|
79
79
|
};
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
for (
|
|
83
|
-
var element = elements_1[_i];
|
|
80
|
+
}
|
|
81
|
+
fillFileElementsArray(elements, array, type) {
|
|
82
|
+
for (const element of elements) {
|
|
84
83
|
array.push(this.createFileElement(element, this._filename, type));
|
|
85
84
|
}
|
|
86
|
-
}
|
|
87
|
-
|
|
85
|
+
}
|
|
86
|
+
fillUniqueIdsMap() {
|
|
88
87
|
this.createNewUniqueIds(this._methodsArray, METHOD_DELIMITER);
|
|
89
88
|
this.createNewUniqueIds(this._branchesArray, BRANCH_DELIMITER);
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
for (
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
var currentElement = array[currentIndex];
|
|
89
|
+
}
|
|
90
|
+
createNewUniqueIds(array, delimiter) {
|
|
91
|
+
const aggregatedByLine = this.aggregateElementsByLine(array);
|
|
92
|
+
const lines = Object.keys(aggregatedByLine);
|
|
93
|
+
for (const line of lines) {
|
|
94
|
+
const indexesArray = aggregatedByLine[line];
|
|
95
|
+
for (let i = 0; i < indexesArray.length; i++) {
|
|
96
|
+
const currentIndex = indexesArray[i];
|
|
97
|
+
const currentElement = array[currentIndex];
|
|
100
98
|
currentElement.uniqueId = currentElement.filename + delimiter + line + ',' + i;
|
|
101
|
-
this.logger.debug(
|
|
99
|
+
this.logger.debug(`[UniqueIdConverter] uniqueId ${currentElement.uniqueIdKey} converted to
|
|
100
|
+
${currentElement.uniqueId}`);
|
|
102
101
|
this._uniqueIdsMap[currentElement.uniqueIdKey] = currentElement.uniqueId;
|
|
103
102
|
if (currentElement.uniqueIdKey_decl) {
|
|
104
103
|
this._uniqueIdsMap[currentElement.uniqueIdKey_decl] = currentElement.uniqueId;
|
|
105
104
|
}
|
|
106
105
|
}
|
|
107
106
|
}
|
|
108
|
-
}
|
|
109
|
-
|
|
107
|
+
}
|
|
108
|
+
comparePosition(elm1, elm2) {
|
|
110
109
|
if (elm1.startPosition.line < elm2.startPosition.line) {
|
|
111
110
|
return -1;
|
|
112
111
|
}
|
|
@@ -126,49 +125,32 @@ var UniqueIdConverter = /** @class */ (function () {
|
|
|
126
125
|
return 1;
|
|
127
126
|
}
|
|
128
127
|
return 0;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
this._branchesArray = value;
|
|
153
|
-
},
|
|
154
|
-
enumerable: false,
|
|
155
|
-
configurable: true
|
|
156
|
-
});
|
|
157
|
-
Object.defineProperty(UniqueIdConverter.prototype, "filename", {
|
|
158
|
-
get: function () {
|
|
159
|
-
return this._filename;
|
|
160
|
-
},
|
|
161
|
-
enumerable: false,
|
|
162
|
-
configurable: true
|
|
163
|
-
});
|
|
164
|
-
UniqueIdConverter.prototype.removeDuplicateElements = function (elementsArray) {
|
|
165
|
-
var _this = this;
|
|
166
|
-
var existedKeys = {};
|
|
167
|
-
elementsArray = elementsArray.filter(function (element) {
|
|
168
|
-
return _this.filterDuplicates(element, existedKeys);
|
|
128
|
+
}
|
|
129
|
+
get uniqueIdsMap() {
|
|
130
|
+
return this._uniqueIdsMap;
|
|
131
|
+
}
|
|
132
|
+
get methodsArray() {
|
|
133
|
+
return this._methodsArray;
|
|
134
|
+
}
|
|
135
|
+
set methodsArray(value) {
|
|
136
|
+
this._methodsArray = value;
|
|
137
|
+
}
|
|
138
|
+
get branchesArray() {
|
|
139
|
+
return this._branchesArray;
|
|
140
|
+
}
|
|
141
|
+
set branchesArray(value) {
|
|
142
|
+
this._branchesArray = value;
|
|
143
|
+
}
|
|
144
|
+
get filename() {
|
|
145
|
+
return this._filename;
|
|
146
|
+
}
|
|
147
|
+
removeDuplicateElements(elementsArray) {
|
|
148
|
+
const existedKeys = {};
|
|
149
|
+
elementsArray = elementsArray.filter((element) => {
|
|
150
|
+
return this.filterDuplicates(element, existedKeys);
|
|
169
151
|
});
|
|
170
|
-
}
|
|
171
|
-
|
|
152
|
+
}
|
|
153
|
+
filterDuplicates(element, existedKeys) {
|
|
172
154
|
if (existedKeys[element.uniqueIdKey] ||
|
|
173
155
|
(element.uniqueIdKey_decl && existedKeys[element.uniqueIdKey_decl])) {
|
|
174
156
|
return false;
|
|
@@ -178,15 +160,14 @@ var UniqueIdConverter = /** @class */ (function () {
|
|
|
178
160
|
existedKeys[element.uniqueIdKey_decl] = true;
|
|
179
161
|
}
|
|
180
162
|
return true;
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
for (
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
var branchPosition = this.checkBranchPosition(branch, currentMethod);
|
|
163
|
+
}
|
|
164
|
+
removeBranchesOutOfMethods() {
|
|
165
|
+
const validBranches = [];
|
|
166
|
+
let methodsIndex = 0;
|
|
167
|
+
for (const branch of this._branchesArray) {
|
|
168
|
+
for (let i = methodsIndex; i < this._methodsArray.length; i++) {
|
|
169
|
+
const currentMethod = this._methodsArray[i];
|
|
170
|
+
const branchPosition = this.checkBranchPosition(branch, currentMethod);
|
|
190
171
|
if (branchPosition === 0) {
|
|
191
172
|
validBranches.push(branch);
|
|
192
173
|
break;
|
|
@@ -197,14 +178,14 @@ var UniqueIdConverter = /** @class */ (function () {
|
|
|
197
178
|
}
|
|
198
179
|
}
|
|
199
180
|
this._branchesArray = validBranches.sort(this.comparePosition);
|
|
200
|
-
}
|
|
181
|
+
}
|
|
201
182
|
/*
|
|
202
183
|
this method checks if specific branch is inside specific method
|
|
203
184
|
if inside method returns: 0
|
|
204
185
|
if after method returns: 1
|
|
205
186
|
if before method returns: -1
|
|
206
187
|
*/
|
|
207
|
-
|
|
188
|
+
checkBranchPosition(branch, method) {
|
|
208
189
|
if (branch.isStartsAfter(method) && branch.isEndsBefore(method)) {
|
|
209
190
|
return 0;
|
|
210
191
|
}
|
|
@@ -214,22 +195,21 @@ var UniqueIdConverter = /** @class */ (function () {
|
|
|
214
195
|
if (branch.isStartsAfter(method) && branch.isEndsAfter(method)) {
|
|
215
196
|
return 1;
|
|
216
197
|
}
|
|
217
|
-
this.logger.warn(
|
|
198
|
+
this.logger.warn(`branch started at '${branch.startPosition.line},${branch.startPosition.column}' in file '${this._filename}' located across methods, probably some error`);
|
|
218
199
|
return 0;
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
for (
|
|
223
|
-
|
|
224
|
-
|
|
200
|
+
}
|
|
201
|
+
aggregateElementsByLine(elements) {
|
|
202
|
+
const aggregated = {};
|
|
203
|
+
for (let i = 0; i < elements.length; i++) {
|
|
204
|
+
const element = elements[i];
|
|
205
|
+
const lineNumber = element.startPosition.line;
|
|
225
206
|
if (!aggregated[lineNumber]) {
|
|
226
207
|
aggregated[lineNumber] = [];
|
|
227
208
|
}
|
|
228
209
|
aggregated[lineNumber].push(i);
|
|
229
210
|
}
|
|
230
211
|
return aggregated;
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
}());
|
|
212
|
+
}
|
|
213
|
+
}
|
|
234
214
|
exports.UniqueIdConverter = UniqueIdConverter;
|
|
235
215
|
//# sourceMappingURL=unique-id-converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unique-id-converter.js","sourceRoot":"","sources":["../../../common/coverage-elements/unique-id-converter.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"unique-id-converter.js","sourceRoot":"","sources":["../../../common/coverage-elements/unique-id-converter.ts"],"names":[],"mappings":"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"}
|