slnodejs 6.1.1087 → 6.1.1091
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/README.md +10 -9
- package/lib/cli.js +1 -1
- package/lib/preload.js +171 -171
- package/package.json +13 -3
- package/tsOutputs/api.js +8 -8
- package/tsOutputs/build-scanner/ast-utils.js +3 -3
- package/tsOutputs/build-scanner/ast-utils.js.map +1 -1
- package/tsOutputs/build-scanner/build-diff-process.js +99 -47
- package/tsOutputs/build-scanner/build-diff-process.js.map +1 -1
- package/tsOutputs/build-scanner/cia.js +17 -9
- package/tsOutputs/build-scanner/cia.js.map +1 -1
- package/tsOutputs/build-scanner/current-agent-instance.js +3 -3
- package/tsOutputs/build-scanner/current-agent-instance.js.map +1 -1
- package/tsOutputs/build-scanner/default-values-resolver.js +6 -7
- package/tsOutputs/build-scanner/default-values-resolver.js.map +1 -1
- package/tsOutputs/build-scanner/diagnostic/build-scan-diagnosis.js +9 -7
- package/tsOutputs/build-scanner/diagnostic/build-scan-diagnosis.js.map +1 -1
- package/tsOutputs/build-scanner/diagnostic/contracts.js.map +1 -1
- package/tsOutputs/build-scanner/diagnostic/none-diagnosis.js.map +1 -1
- package/tsOutputs/build-scanner/entities-mapper.js +5 -4
- package/tsOutputs/build-scanner/entities-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/file-and-folder-utils.js +23 -11
- package/tsOutputs/build-scanner/file-and-folder-utils.js.map +1 -1
- package/tsOutputs/build-scanner/file-system/actual-file.js +9 -9
- package/tsOutputs/build-scanner/file-system/actual-file.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js +135 -91
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/content-instrumenter.js +5 -4
- package/tsOutputs/build-scanner/instrumentation/content-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/files-instrumenter.js +13 -6
- package/tsOutputs/build-scanner/instrumentation/files-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js +6 -4
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/instrumented-file-size-reducer.js +68 -43
- package/tsOutputs/build-scanner/instrumentation/instrumented-file-size-reducer.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/contracts.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/instrumenter-spawn.js +4 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/instrumenter-spawn.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/process-pool.js +10 -5
- 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 +1 -1
- 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.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/copy-as-is-strategy.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/js-instrumnetation-strategy.js +8 -3
- package/tsOutputs/build-scanner/instrumentation/strategies/js-instrumnetation-strategy.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/markup-instrumnetation-strategy.js +5 -3
- package/tsOutputs/build-scanner/instrumentation/strategies/markup-instrumnetation-strategy.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/strategy-utils.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/toggle-based-js-instrumentation-strategy.d.ts +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/toggle-based-js-instrumentation-strategy.js +3 -3
- package/tsOutputs/build-scanner/instrumentation/strategies/toggle-based-markup-instrumentation-strategy.d.ts +1 -1
- package/tsOutputs/build-scanner/instrumentation/strategies/toggle-based-markup-instrumentation-strategy.js +6 -6
- package/tsOutputs/build-scanner/instrumentation/strategies/toggle-based-markup-instrumentation-strategy.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/ast-node-types.js +11 -11
- package/tsOutputs/build-scanner/js_diff/ast-node-types.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/branch-key.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/branch-signature.js +22 -15
- package/tsOutputs/build-scanner/js_diff/branch-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/create-node-key.js +1 -1
- package/tsOutputs/build-scanner/js_diff/create-node-key.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js +1 -1
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/file-signature.js +31 -26
- package/tsOutputs/build-scanner/js_diff/file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/files-mapping.js +83 -62
- package/tsOutputs/build-scanner/js_diff/files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/generated-file-signature.js +24 -16
- package/tsOutputs/build-scanner/js_diff/generated-file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/globalMethodIndexer.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js +39 -25
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-name.js +23 -20
- package/tsOutputs/build-scanner/js_diff/guess-method-name.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/method-id-by-position-resolver.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js +19 -9
- package/tsOutputs/build-scanner/js_diff/method-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js +13 -8
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js +13 -9
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/source-files-notifier.js +13 -8
- package/tsOutputs/build-scanner/js_diff/source-files-notifier.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/source-position-mapper.js +6 -2
- package/tsOutputs/build-scanner/js_diff/source-position-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +26 -19
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-element-utils.js +8 -3
- package/tsOutputs/build-scanner/mappings/file-element-utils.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-enricher.js +47 -17
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-path-fixer.js +15 -7
- package/tsOutputs/build-scanner/mappings/file-path-fixer.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/files-container.js +5 -5
- package/tsOutputs/build-scanner/mappings/files-data-container.js +6 -4
- package/tsOutputs/build-scanner/mappings/files-data-container.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/source-path-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/markup-files-parser.js +10 -10
- package/tsOutputs/build-scanner/markup-files-parser.js.map +1 -1
- package/tsOutputs/build-scanner/scm/parse-log.js +3 -1
- package/tsOutputs/build-scanner/scm/parse-log.js.map +1 -1
- package/tsOutputs/build-scanner/scm/scm-file-fixer.js.map +1 -1
- package/tsOutputs/build-scanner/scm/scm-files-container.js.map +1 -1
- package/tsOutputs/build-scanner/source-map-eraser/factory.js.map +1 -1
- package/tsOutputs/build-scanner/source-map-eraser/interface.js.map +1 -1
- package/tsOutputs/build-scanner/source-map-eraser/none-source-maps-eraser.js.map +1 -1
- package/tsOutputs/build-scanner/source-map-eraser/skip-copy-source-maps.js.map +1 -1
- package/tsOutputs/build-scanner/source-map-eraser/source-maps-eraser.d.ts +2 -2
- package/tsOutputs/build-scanner/source-map-eraser/source-maps-eraser.js +1 -1
- package/tsOutputs/build-scanner/utils.js +21 -15
- package/tsOutputs/build-scanner/utils.js.map +1 -1
- package/tsOutputs/cli-parse/agent-instance-data.js.map +1 -1
- package/tsOutputs/cli-parse/agent-time-synchronizer.js.map +1 -1
- package/tsOutputs/cli-parse/child-process-wrapper.js +4 -2
- package/tsOutputs/cli-parse/child-process-wrapper.js.map +1 -1
- package/tsOutputs/cli-parse/cli.js +130 -129
- package/tsOutputs/cli-parse/cli.js.map +1 -1
- package/tsOutputs/cli-parse/constants/constants.js +1 -1
- package/tsOutputs/cli-parse/constants/constants.js.map +1 -1
- package/tsOutputs/cli-parse/constants/third-parties.js +1 -1
- package/tsOutputs/cli-parse/constants/third-parties.js.map +1 -1
- package/tsOutputs/cli-parse/contracts.js.map +1 -1
- package/tsOutputs/cli-parse/custom-commander.js +7 -3
- package/tsOutputs/cli-parse/custom-commander.js.map +1 -1
- package/tsOutputs/cli-parse/executors/base-executor.js +18 -11
- package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-args-dto.js +1 -1
- package/tsOutputs/cli-parse/executors/build-args-dto.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-end-executor.js +4 -4
- package/tsOutputs/cli-parse/executors/build-end-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-executor.js +117 -51
- package/tsOutputs/cli-parse/executors/build-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/config-executor.js +1 -1
- package/tsOutputs/cli-parse/executors/config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/base-data.js +2 -2
- package/tsOutputs/cli-parse/executors/dry-run/base-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js +9 -8
- 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 +31 -15
- 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.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js +3 -3
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js +8 -6
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js.map +1 -1
- package/tsOutputs/cli-parse/executors/end-execution-executor.js +2 -2
- package/tsOutputs/cli-parse/executors/end-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/instrument-args-dto.js +1 -1
- package/tsOutputs/cli-parse/executors/instrument-args-dto.js.map +1 -1
- package/tsOutputs/cli-parse/executors/instrument-executor.js +43 -19
- package/tsOutputs/cli-parse/executors/instrument-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-components-executor.js +3 -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.map +1 -1
- package/tsOutputs/cli-parse/executors/integration-build-update-components-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/mocha-executor.js +1 -1
- package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/pr-config-executor.js +1 -1
- package/tsOutputs/cli-parse/executors/pr-config-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/start-execution-executor.js +2 -2
- package/tsOutputs/cli-parse/executors/start-execution-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-executions-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-listener-executor.js +3 -1
- package/tsOutputs/cli-parse/executors/test-listener-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/upload-report-executor.js +4 -4
- package/tsOutputs/cli-parse/executors/upload-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/preloader.js +10 -5
- package/tsOutputs/cli-parse/preloader.js.map +1 -1
- package/tsOutputs/cli-parse/utils.js +3 -3
- package/tsOutputs/cli-parse/utils.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-contracts.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-controller.js +28 -10
- package/tsOutputs/common/agent-events/agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-guard.js +2 -1
- package/tsOutputs/common/agent-events/agent-events-guard.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-instance-info-builder.js +13 -7
- package/tsOutputs/common/agent-events/agent-instance-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-start-info-builder.js +2 -3
- package/tsOutputs/common/agent-events/agent-start-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/browser-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/ci-info-builder.js +2 -2
- package/tsOutputs/common/agent-events/ci-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/cockpit-notifier.js +1 -1
- package/tsOutputs/common/agent-events/cockpit-notifier.js.map +1 -1
- package/tsOutputs/common/agent-events/dry-run-agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/machine-info-builder.js +5 -3
- package/tsOutputs/common/agent-events/machine-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/no-op-agent-events-controller.js +9 -18
- package/tsOutputs/common/agent-events/no-op-agent-events-controller.js.map +1 -1
- package/tsOutputs/common/agent-events/nodejs-env-info-builder.js +2 -1
- package/tsOutputs/common/agent-events/nodejs-env-info-builder.js.map +1 -1
- package/tsOutputs/common/agent-events/sensitive-data-filter.js +2 -2
- package/tsOutputs/common/agent-events/sensitive-data-filter.js.map +1 -1
- package/tsOutputs/common/agent-instance-data.js +5 -1
- package/tsOutputs/common/agent-instance-data.js.map +1 -1
- package/tsOutputs/common/cli-progress.js.map +1 -1
- package/tsOutputs/common/config-process/config-loader.js +13 -6
- package/tsOutputs/common/config-process/config-loader.js.map +1 -1
- package/tsOutputs/common/config-process/config-system.js +19 -6
- package/tsOutputs/common/config-process/config-system.js.map +1 -1
- package/tsOutputs/common/config-process/config.d.ts +2 -2
- package/tsOutputs/common/config-process/config.js +2 -2
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/config-process/index.js +6 -4
- package/tsOutputs/common/config-process/index.js.map +1 -1
- package/tsOutputs/common/config-process/no-op-config-process.js.map +1 -1
- package/tsOutputs/common/constants/constants.js.map +1 -1
- package/tsOutputs/common/constants/sl-env-vars.js +93 -31
- package/tsOutputs/common/constants/sl-env-vars.js.map +1 -1
- package/tsOutputs/common/contracts.d.ts +1 -1
- package/tsOutputs/common/contracts.js.map +1 -1
- package/tsOutputs/common/coverage-elements/contracts.js.map +1 -1
- package/tsOutputs/common/coverage-elements/file-element.js +24 -12
- package/tsOutputs/common/coverage-elements/file-element.js.map +1 -1
- package/tsOutputs/common/coverage-elements/istanbul-unique-id-converter.js +19 -17
- package/tsOutputs/common/coverage-elements/istanbul-unique-id-converter.js.map +1 -1
- package/tsOutputs/common/coverage-elements/new-id-resolver.js.map +1 -1
- package/tsOutputs/common/coverage-elements/original-module-loader.js +24 -13
- package/tsOutputs/common/coverage-elements/original-module-loader.js.map +1 -1
- package/tsOutputs/common/coverage-elements/unique-id-converter.js +19 -15
- package/tsOutputs/common/coverage-elements/unique-id-converter.js.map +1 -1
- package/tsOutputs/common/environment-data-service.js.map +1 -1
- package/tsOutputs/common/events-process/events-contracts.js.map +1 -1
- package/tsOutputs/common/events-process/events-creator.js +1 -1
- package/tsOutputs/common/events-process/events-creator.js.map +1 -1
- package/tsOutputs/common/events-process/index.js +10 -4
- package/tsOutputs/common/events-process/index.js.map +1 -1
- package/tsOutputs/common/footprints-process/collection-interval.js +1 -1
- package/tsOutputs/common/footprints-process/collection-interval.js.map +1 -1
- package/tsOutputs/common/footprints-process/footprints-service-proxy.js +4 -1
- package/tsOutputs/common/footprints-process/footprints-service-proxy.js.map +1 -1
- package/tsOutputs/common/footprints-process/index.js +35 -20
- package/tsOutputs/common/footprints-process/index.js.map +1 -1
- package/tsOutputs/common/footprints-process/istanbul-to-footprints.js +26 -20
- package/tsOutputs/common/footprints-process/istanbul-to-footprints.js.map +1 -1
- package/tsOutputs/common/footprints-process/production-footprints-handler.js +30 -17
- package/tsOutputs/common/footprints-process/production-footprints-handler.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js +5 -1
- package/tsOutputs/common/footprints-process-v6/base-browser-hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/buffer-size-helper.js +12 -10
- package/tsOutputs/common/footprints-process-v6/buffer-size-helper.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-footprints-buffer.js +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-footprints-buffer.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-footprints-process.js +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-footprints-process.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/collector-remote-footprints-process.js +1 -2
- package/tsOutputs/common/footprints-process-v6/collector-remote-footprints-process.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/footprints-buffer.js +12 -7
- package/tsOutputs/common/footprints-process-v6/footprints-buffer.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/footprints-data-utils.d.ts +1 -1
- package/tsOutputs/common/footprints-process-v6/footprints-data-utils.spec.js +38 -38
- package/tsOutputs/common/footprints-process-v6/hits-collector.d.ts +1 -0
- package/tsOutputs/common/footprints-process-v6/hits-collector.js +42 -19
- package/tsOutputs/common/footprints-process-v6/hits-collector.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +47 -22
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/index.js +12 -7
- package/tsOutputs/common/footprints-process-v6/index.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/location-formatter.js +4 -2
- package/tsOutputs/common/footprints-process-v6/location-formatter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/relative-path-resolver.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-browser-hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-footprints-process.js +1 -2
- package/tsOutputs/common/footprints-process-v6/remote-footprints-process.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/remote-hits-collector.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/source-map-data.js +1 -1
- package/tsOutputs/common/footprints-process-v6/source-map-data.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy-with-default-client.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy.js +26 -10
- package/tsOutputs/common/http/backend-proxy.js.map +1 -1
- package/tsOutputs/common/http/contracts.js.map +1 -1
- package/tsOutputs/common/http/dry-run-proxy.js +8 -16
- package/tsOutputs/common/http/dry-run-proxy.js.map +1 -1
- package/tsOutputs/common/http/entities-mapper.js.map +1 -1
- package/tsOutputs/common/http/http-client.js +25 -12
- package/tsOutputs/common/http/http-client.js.map +1 -1
- package/tsOutputs/common/http/http-verb.js.map +1 -1
- package/tsOutputs/common/http/sl-routes.js +111 -33
- package/tsOutputs/common/http/sl-routes.js.map +1 -1
- package/tsOutputs/common/ignored-files-handler.js +13 -5
- package/tsOutputs/common/ignored-files-handler.js.map +1 -1
- package/tsOutputs/common/index.d.ts +1 -1
- package/tsOutputs/common/logger.js +21 -14
- package/tsOutputs/common/logger.js.map +1 -1
- package/tsOutputs/common/messages-formatter.js.map +1 -1
- package/tsOutputs/common/metrics-process/index.js.map +1 -1
- package/tsOutputs/common/metrics-process/metrics-store-factory.js.map +1 -1
- package/tsOutputs/common/metrics-process/metrics-store.js +3 -3
- package/tsOutputs/common/metrics-process/metrics-store.js.map +1 -1
- package/tsOutputs/common/no-op-state-tracker.js.map +1 -1
- package/tsOutputs/common/queue.js.map +1 -1
- package/tsOutputs/common/scm/git-cloner.js +1 -1
- package/tsOutputs/common/scm/git-cloner.js.map +1 -1
- package/tsOutputs/common/scm/git-format-builder.js +2 -2
- package/tsOutputs/common/scm/git-format-builder.js.map +1 -1
- package/tsOutputs/common/scm/git-log-parser.js +2 -2
- package/tsOutputs/common/scm/git-log-parser.js.map +1 -1
- package/tsOutputs/common/scm/git.js +43 -15
- package/tsOutputs/common/scm/git.js.map +1 -1
- package/tsOutputs/common/scm/none.js +3 -4
- package/tsOutputs/common/scm/none.js.map +1 -1
- package/tsOutputs/common/scm/scm-factory.js.map +1 -1
- package/tsOutputs/common/short-name-to-file-mapper.js.map +1 -1
- package/tsOutputs/common/sl-mapper-tokenizer.js +12 -8
- package/tsOutputs/common/sl-mapper-tokenizer.js.map +1 -1
- package/tsOutputs/common/source-map-config-dto.js +1 -1
- package/tsOutputs/common/source-map-config-dto.js.map +1 -1
- package/tsOutputs/common/source-map-handler.js +7 -4
- package/tsOutputs/common/source-map-handler.js.map +1 -1
- package/tsOutputs/common/source-map-reader.js +14 -14
- package/tsOutputs/common/source-map-reader.js.map +1 -1
- package/tsOutputs/common/source-maps-utils.js +2 -1
- package/tsOutputs/common/source-maps-utils.js.map +1 -1
- package/tsOutputs/common/state-tracker-fpv6.js +5 -4
- package/tsOutputs/common/state-tracker-fpv6.js.map +1 -1
- package/tsOutputs/common/state-tracker.js +18 -7
- package/tsOutputs/common/state-tracker.js.map +1 -1
- package/tsOutputs/common/system-date.js.map +1 -1
- package/tsOutputs/common/utils/abstract-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/build-session-data-builder.js +5 -5
- package/tsOutputs/common/utils/build-session-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/cookie.js +7 -4
- package/tsOutputs/common/utils/cookie.js.map +1 -1
- package/tsOutputs/common/utils/data-cleansing-utils.js +4 -3
- package/tsOutputs/common/utils/data-cleansing-utils.js.map +1 -1
- package/tsOutputs/common/utils/dependency-utils.js +1 -1
- package/tsOutputs/common/utils/dependency-utils.js.map +1 -1
- package/tsOutputs/common/utils/env-var-parsing.js.map +1 -1
- package/tsOutputs/common/utils/files-utils.js.map +1 -1
- package/tsOutputs/common/utils/process-utils.js +3 -2
- package/tsOutputs/common/utils/process-utils.js.map +1 -1
- package/tsOutputs/common/utils/tail-file-reader.js +5 -2
- package/tsOutputs/common/utils/tail-file-reader.js.map +1 -1
- package/tsOutputs/common/utils/test-runner-build-session-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/test-utils/mock-server-utils/contracts.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/timer-utils.js +3 -1
- package/tsOutputs/common/utils/timer-utils.js.map +1 -1
- package/tsOutputs/common/utils/token-data-builder.js +4 -4
- package/tsOutputs/common/utils/token-data-builder.js.map +1 -1
- package/tsOutputs/common/utils/token-utils.js +2 -2
- package/tsOutputs/common/utils/validation-utils.js +1 -1
- package/tsOutputs/common/utils/validation-utils.js.map +1 -1
- package/tsOutputs/common/v8-utils.js +2 -1
- package/tsOutputs/common/v8-utils.js.map +1 -1
- package/tsOutputs/common/watchdog.js.map +1 -1
- package/tsOutputs/mocha-reporter/constants.js +7 -7
- package/tsOutputs/mocha-reporter/constants.js.map +1 -1
- package/tsOutputs/mocha-reporter/end-execution.js +3 -3
- package/tsOutputs/mocha-reporter/end-execution.js.map +1 -1
- package/tsOutputs/mocha-reporter/index.js +39 -22
- package/tsOutputs/mocha-reporter/index.js.map +1 -1
- package/tsOutputs/mocha-reporter/otel-agent.js.map +1 -1
- package/tsOutputs/test-listener/SlNodeJsProxy.js +14 -9
- package/tsOutputs/test-listener/SlNodeJsProxy.js.map +1 -1
- package/tsOutputs/test-listener/UserMessageHelper.js.map +1 -1
- package/tsOutputs/test-listener/agent-loader.js +15 -8
- package/tsOutputs/test-listener/agent-loader.js.map +1 -1
- package/tsOutputs/test-listener/agent.js +16 -11
- package/tsOutputs/test-listener/agent.js.map +1 -1
- package/tsOutputs/test-listener/api.js +1 -2
- package/tsOutputs/test-listener/api.js.map +1 -1
- package/tsOutputs/test-listener/base-proxy.js +14 -10
- package/tsOutputs/test-listener/base-proxy.js.map +1 -1
- package/tsOutputs/test-listener/bootstrap.js.map +1 -1
- package/tsOutputs/test-listener/child-process-patcher.js +6 -6
- package/tsOutputs/test-listener/child-process-patcher.js.map +1 -1
- package/tsOutputs/test-listener/coloring/http-coloring.js +38 -27
- package/tsOutputs/test-listener/coloring/http-coloring.js.map +1 -1
- package/tsOutputs/test-listener/coloring/listening-port.js +4 -3
- package/tsOutputs/test-listener/coloring/listening-port.js.map +1 -1
- package/tsOutputs/test-listener/config-process/config-loader.js +5 -3
- package/tsOutputs/test-listener/config-process/config-loader.js.map +1 -1
- package/tsOutputs/test-listener/entities/BasicConfigurationData.js.map +1 -1
- package/tsOutputs/test-listener/entities/build-scanner/ConfigModeData.js.map +1 -1
- package/tsOutputs/test-listener/entities/build-scanner/ScanModeData.js.map +1 -1
- package/tsOutputs/test-listener/execution-process/entities-mapper.js +7 -5
- package/tsOutputs/test-listener/execution-process/entities-mapper.js.map +1 -1
- package/tsOutputs/test-listener/execution-process/execution-service-proxy.js +30 -17
- package/tsOutputs/test-listener/execution-process/execution-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/execution-process/index.js +2 -2
- package/tsOutputs/test-listener/execution-process/index.js.map +1 -1
- package/tsOutputs/test-listener/factory.js +180 -50
- package/tsOutputs/test-listener/factory.js.map +1 -1
- package/tsOutputs/test-listener/footprints-process/ts-node-hits-collector.js +18 -15
- package/tsOutputs/test-listener/footprints-process/ts-node-hits-collector.js.map +1 -1
- package/tsOutputs/test-listener/integrations/SlGulp.js +7 -6
- package/tsOutputs/test-listener/integrations/SlGulp.js.map +1 -1
- package/tsOutputs/test-listener/logs-process/index.js +5 -3
- package/tsOutputs/test-listener/logs-process/index.js.map +1 -1
- package/tsOutputs/test-listener/logs-process/log-service-proxy.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js +1 -1
- 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/otel-agent-loader.js +13 -10
- package/tsOutputs/test-listener/otel-agent-loader.js.map +1 -1
- package/tsOutputs/test-listener/remote-agent.js +37 -9
- package/tsOutputs/test-listener/remote-agent.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/AppNameResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/ArgumentResolver.js +23 -6
- package/tsOutputs/test-listener/resolvers/ArgumentResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildSessionIdFileResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/BuildSessionIdResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/ProxyResolver.js.map +1 -1
- package/tsOutputs/test-listener/resolvers/TokenResolver.js.map +1 -1
- package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js +12 -4
- package/tsOutputs/test-listener/state-tracker-process/state-tracker-proxy.js.map +1 -1
- package/tsOutputs/test-listener/test-recommendation-handler.js +20 -11
- package/tsOutputs/test-listener/test-recommendation-handler.js.map +1 -1
- package/tsOutputs/test-listener/upload-report-handler.js +14 -5
- package/tsOutputs/test-listener/upload-report-handler.js.map +1 -1
- package/tsOutputs/test-listener/uuid.js +2 -2
- package/tsOutputs/test-listener/uuid.js.map +1 -1
- package/tsOutputs/test-listener/wait-for-multiple-callbacks.js.map +1 -1
|
@@ -2,20 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const chai_1 = require("chai");
|
|
4
4
|
const footprints_data_utils_1 = require("./footprints-data-utils");
|
|
5
|
-
describe(
|
|
6
|
-
describe(
|
|
7
|
-
it(
|
|
5
|
+
describe('footprints-data-utils', () => {
|
|
6
|
+
describe('hasFootprintsData', () => {
|
|
7
|
+
it('should return false for null packet', () => {
|
|
8
8
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(null)).to.be.false;
|
|
9
9
|
});
|
|
10
|
-
it(
|
|
10
|
+
it('should return false for undefined packet', () => {
|
|
11
11
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(undefined)).to.be.false;
|
|
12
12
|
});
|
|
13
|
-
it(
|
|
13
|
+
it('should return false for packet with undefined methods and branches', () => {
|
|
14
14
|
const packet = {
|
|
15
|
-
formatVersion:
|
|
15
|
+
formatVersion: '6.0',
|
|
16
16
|
meta: {
|
|
17
|
-
agentId:
|
|
18
|
-
labId:
|
|
17
|
+
agentId: 'test',
|
|
18
|
+
labId: 'test',
|
|
19
19
|
intervals: {
|
|
20
20
|
timedFootprintsCollectionIntervalSeconds: 10,
|
|
21
21
|
},
|
|
@@ -24,12 +24,12 @@ describe("footprints-data-utils", () => {
|
|
|
24
24
|
};
|
|
25
25
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(packet)).to.be.false;
|
|
26
26
|
});
|
|
27
|
-
it(
|
|
27
|
+
it('should return false for packet with empty methods and branches arrays', () => {
|
|
28
28
|
const packet = {
|
|
29
|
-
formatVersion:
|
|
29
|
+
formatVersion: '6.0',
|
|
30
30
|
meta: {
|
|
31
|
-
agentId:
|
|
32
|
-
labId:
|
|
31
|
+
agentId: 'test',
|
|
32
|
+
labId: 'test',
|
|
33
33
|
intervals: {
|
|
34
34
|
timedFootprintsCollectionIntervalSeconds: 10,
|
|
35
35
|
},
|
|
@@ -40,81 +40,81 @@ describe("footprints-data-utils", () => {
|
|
|
40
40
|
};
|
|
41
41
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(packet)).to.be.false;
|
|
42
42
|
});
|
|
43
|
-
it(
|
|
43
|
+
it('should return true for packet with non-empty methods array', () => {
|
|
44
44
|
const packet = {
|
|
45
|
-
formatVersion:
|
|
45
|
+
formatVersion: '6.0',
|
|
46
46
|
meta: {
|
|
47
|
-
agentId:
|
|
48
|
-
labId:
|
|
47
|
+
agentId: 'test',
|
|
48
|
+
labId: 'test',
|
|
49
49
|
intervals: {
|
|
50
50
|
timedFootprintsCollectionIntervalSeconds: 10,
|
|
51
51
|
},
|
|
52
52
|
},
|
|
53
|
-
methods: [
|
|
53
|
+
methods: ['method1'],
|
|
54
54
|
branches: [],
|
|
55
55
|
executions: [],
|
|
56
56
|
};
|
|
57
57
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(packet)).to.be.true;
|
|
58
58
|
});
|
|
59
|
-
it(
|
|
59
|
+
it('should return true for packet with non-empty branches array', () => {
|
|
60
60
|
const packet = {
|
|
61
|
-
formatVersion:
|
|
61
|
+
formatVersion: '6.0',
|
|
62
62
|
meta: {
|
|
63
|
-
agentId:
|
|
64
|
-
labId:
|
|
63
|
+
agentId: 'test',
|
|
64
|
+
labId: 'test',
|
|
65
65
|
intervals: {
|
|
66
66
|
timedFootprintsCollectionIntervalSeconds: 10,
|
|
67
67
|
},
|
|
68
68
|
},
|
|
69
69
|
methods: [],
|
|
70
|
-
branches: [
|
|
70
|
+
branches: ['branch1'],
|
|
71
71
|
executions: [],
|
|
72
72
|
};
|
|
73
73
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(packet)).to.be.true;
|
|
74
74
|
});
|
|
75
|
-
it(
|
|
75
|
+
it('should return true for packet with both non-empty methods and branches arrays', () => {
|
|
76
76
|
const packet = {
|
|
77
|
-
formatVersion:
|
|
77
|
+
formatVersion: '6.0',
|
|
78
78
|
meta: {
|
|
79
|
-
agentId:
|
|
80
|
-
labId:
|
|
79
|
+
agentId: 'test',
|
|
80
|
+
labId: 'test',
|
|
81
81
|
intervals: {
|
|
82
82
|
timedFootprintsCollectionIntervalSeconds: 10,
|
|
83
83
|
},
|
|
84
84
|
},
|
|
85
|
-
methods: [
|
|
86
|
-
branches: [
|
|
85
|
+
methods: ['method1'],
|
|
86
|
+
branches: ['branch1'],
|
|
87
87
|
executions: [],
|
|
88
88
|
};
|
|
89
89
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(packet)).to.be.true;
|
|
90
90
|
});
|
|
91
|
-
it(
|
|
91
|
+
it('should handle packet with null methods array', () => {
|
|
92
92
|
const packet = {
|
|
93
|
-
formatVersion:
|
|
93
|
+
formatVersion: '6.0',
|
|
94
94
|
meta: {
|
|
95
|
-
agentId:
|
|
96
|
-
labId:
|
|
95
|
+
agentId: 'test',
|
|
96
|
+
labId: 'test',
|
|
97
97
|
intervals: {
|
|
98
98
|
timedFootprintsCollectionIntervalSeconds: 10,
|
|
99
99
|
},
|
|
100
100
|
},
|
|
101
101
|
methods: null,
|
|
102
|
-
branches: [
|
|
102
|
+
branches: ['branch1'],
|
|
103
103
|
executions: [],
|
|
104
104
|
};
|
|
105
105
|
(0, chai_1.expect)((0, footprints_data_utils_1.hasFootprintsData)(packet)).to.be.true;
|
|
106
106
|
});
|
|
107
|
-
it(
|
|
107
|
+
it('should handle packet with null branches array', () => {
|
|
108
108
|
const packet = {
|
|
109
|
-
formatVersion:
|
|
109
|
+
formatVersion: '6.0',
|
|
110
110
|
meta: {
|
|
111
|
-
agentId:
|
|
112
|
-
labId:
|
|
111
|
+
agentId: 'test',
|
|
112
|
+
labId: 'test',
|
|
113
113
|
intervals: {
|
|
114
114
|
timedFootprintsCollectionIntervalSeconds: 10,
|
|
115
115
|
},
|
|
116
116
|
},
|
|
117
|
-
methods: [
|
|
117
|
+
methods: ['method1'],
|
|
118
118
|
branches: null,
|
|
119
119
|
executions: [],
|
|
120
120
|
};
|
|
@@ -11,6 +11,7 @@ export declare class HitsCollector {
|
|
|
11
11
|
protected errors: Array<Record<string, unknown>>;
|
|
12
12
|
constructor(logger: Logger, globalCoverageObject?: IIstanbulProcessMetrics, enableLineCoverage?: boolean);
|
|
13
13
|
getHitElements(): Promise<IHitFileData[]>;
|
|
14
|
+
protected transformCoverageToHitElements(globalCoverage: IIstanbulProcessMetrics): Promise<IHitFileData[]>;
|
|
14
15
|
protected extractUniqueIdsFromFileOnce(filename: string): Promise<void>;
|
|
15
16
|
get latestCoverageSnapshot(): IIstanbulProcessMetrics;
|
|
16
17
|
set latestCoverageSnapshot(value: IIstanbulProcessMetrics);
|
|
@@ -28,19 +28,28 @@ class HitsCollector {
|
|
|
28
28
|
this.latestCoverageSnapshot = {};
|
|
29
29
|
}
|
|
30
30
|
getHitElements() {
|
|
31
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
+
return this.transformCoverageToHitElements(this.getGlobalCoverageObject());
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
transformCoverageToHitElements(globalCoverage) {
|
|
31
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
37
|
const hitFilesData = [];
|
|
33
|
-
const globalCoverage = this.getGlobalCoverageObject();
|
|
34
38
|
if (sl_env_vars_1.SlEnvVars.isUseNewUniqueId()) {
|
|
35
39
|
new original_module_loader_1.OriginalModuleLoader(globalCoverage, this.logger).load();
|
|
36
40
|
}
|
|
37
41
|
for (const filename in globalCoverage) {
|
|
38
|
-
const { fileCoverageSnapshot, currentFileCoverage, shouldResolveRelativePath } = this.getFileCoverageObjects(filename);
|
|
42
|
+
const { fileCoverageSnapshot, currentFileCoverage, shouldResolveRelativePath, } = this.getFileCoverageObjects(filename);
|
|
39
43
|
const hitMethods = this.getHitMethods(currentFileCoverage, fileCoverageSnapshot);
|
|
40
44
|
const hitBranches = this.getHitBranches(currentFileCoverage, fileCoverageSnapshot);
|
|
41
|
-
const hitStatements = this.enableLineCoverage
|
|
45
|
+
const hitStatements = this.enableLineCoverage
|
|
46
|
+
? this.getHitStatements(currentFileCoverage, fileCoverageSnapshot)
|
|
47
|
+
: [];
|
|
42
48
|
if (hitMethods.length || hitBranches.length || hitStatements.length) {
|
|
43
|
-
hitFilesData.push(Object.assign({ filename,
|
|
49
|
+
hitFilesData.push(Object.assign({ filename,
|
|
50
|
+
hitMethods,
|
|
51
|
+
hitBranches,
|
|
52
|
+
shouldResolveRelativePath }, (this.enableLineCoverage && { hitStatements })));
|
|
44
53
|
}
|
|
45
54
|
}
|
|
46
55
|
this.updateCoverageSnapshot(globalCoverage);
|
|
@@ -88,25 +97,26 @@ class HitsCollector {
|
|
|
88
97
|
this.enableLineCoverage = enableLineCoverage;
|
|
89
98
|
}
|
|
90
99
|
getHitStatements(currentHits, snapshotHits) {
|
|
91
|
-
const hitStatementsIndices = Object.keys(currentHits.s).filter(id => {
|
|
100
|
+
const hitStatementsIndices = Object.keys(currentHits.s).filter((id) => {
|
|
92
101
|
snapshotHits.s[id] = snapshotHits.s[id] || 0;
|
|
93
102
|
return currentHits.s[id] > snapshotHits.s[id];
|
|
94
103
|
});
|
|
95
|
-
return hitStatementsIndices.map(id => currentHits.statementMap[id]);
|
|
104
|
+
return hitStatementsIndices.map((id) => currentHits.statementMap[id]);
|
|
96
105
|
}
|
|
97
106
|
getHitMethods(currentHits, snapshotHits) {
|
|
98
|
-
const hitMethodsIndices = Object.keys(currentHits.f).filter(id => {
|
|
107
|
+
const hitMethodsIndices = Object.keys(currentHits.f).filter((id) => {
|
|
99
108
|
snapshotHits.f[id] = snapshotHits.f[id] || 0;
|
|
100
109
|
return currentHits.f[id] > snapshotHits.f[id];
|
|
101
110
|
});
|
|
102
|
-
return hitMethodsIndices.map(id => currentHits.fnMap[id]);
|
|
111
|
+
return hitMethodsIndices.map((id) => currentHits.fnMap[id]);
|
|
103
112
|
}
|
|
104
113
|
dropHits() {
|
|
105
114
|
this.updateCoverageSnapshot(this.getGlobalCoverageObject());
|
|
106
115
|
}
|
|
107
116
|
getHitLeaves(currentLeaveHits, snapshotLeaveHits) {
|
|
108
117
|
const hitLeavesIndices = [];
|
|
109
|
-
snapshotLeaveHits =
|
|
118
|
+
snapshotLeaveHits =
|
|
119
|
+
snapshotLeaveHits || Array(currentLeaveHits.length).fill(0);
|
|
110
120
|
currentLeaveHits.forEach((leaveHit, leaveIdx) => {
|
|
111
121
|
if (currentLeaveHits[leaveIdx] > snapshotLeaveHits[leaveIdx]) {
|
|
112
122
|
hitLeavesIndices.push(leaveIdx);
|
|
@@ -132,7 +142,7 @@ class HitsCollector {
|
|
|
132
142
|
b: {},
|
|
133
143
|
branchMap: {},
|
|
134
144
|
path,
|
|
135
|
-
s: {}
|
|
145
|
+
s: {},
|
|
136
146
|
};
|
|
137
147
|
if (useDataKey) {
|
|
138
148
|
return { data: emptyModule };
|
|
@@ -140,7 +150,8 @@ class HitsCollector {
|
|
|
140
150
|
return emptyModule;
|
|
141
151
|
}
|
|
142
152
|
getFileCoverageObjects(filename) {
|
|
143
|
-
let fileCoverageSnapshot = this._latestCoverageSnapshot[filename] ||
|
|
153
|
+
let fileCoverageSnapshot = this._latestCoverageSnapshot[filename] ||
|
|
154
|
+
this.createEmptyIstanbulModule(filename);
|
|
144
155
|
let currentFileCoverage = this._globalCoverageObject[filename];
|
|
145
156
|
let shouldResolveRelativePath = true;
|
|
146
157
|
// Istanbul may holds the coverage data under 'data' key see (https://sealights.atlassian.net/browse/SLDEV-4421)
|
|
@@ -151,7 +162,11 @@ class HitsCollector {
|
|
|
151
162
|
if (!currentFileCoverage.f && currentFileCoverage.data) {
|
|
152
163
|
currentFileCoverage = currentFileCoverage.data;
|
|
153
164
|
}
|
|
154
|
-
return {
|
|
165
|
+
return {
|
|
166
|
+
fileCoverageSnapshot,
|
|
167
|
+
currentFileCoverage,
|
|
168
|
+
shouldResolveRelativePath,
|
|
169
|
+
};
|
|
155
170
|
}
|
|
156
171
|
getGlobalCoverageObject() {
|
|
157
172
|
if (this._globalCoverageObject)
|
|
@@ -168,7 +183,8 @@ class HitsCollector {
|
|
|
168
183
|
const keys = Object.keys(global);
|
|
169
184
|
for (let i = 0; i < keys.length; i++) {
|
|
170
185
|
const k = keys[i];
|
|
171
|
-
if (
|
|
186
|
+
if (re.exec(k) !== null ||
|
|
187
|
+
GLOBAL_ISTANBUL_CONTAINER_NAMES.indexOf(k) >= 0) {
|
|
172
188
|
return global[k];
|
|
173
189
|
}
|
|
174
190
|
}
|
|
@@ -176,9 +192,13 @@ class HitsCollector {
|
|
|
176
192
|
updateCoverageSnapshot(currentCounters) {
|
|
177
193
|
for (const istanbulModule in currentCounters) {
|
|
178
194
|
const useDataKey = currentCounters[istanbulModule].data !== undefined;
|
|
179
|
-
this._latestCoverageSnapshot[istanbulModule] =
|
|
180
|
-
|
|
181
|
-
|
|
195
|
+
this._latestCoverageSnapshot[istanbulModule] =
|
|
196
|
+
this._latestCoverageSnapshot[istanbulModule] ||
|
|
197
|
+
this.createEmptyIstanbulModule(istanbulModule, useDataKey);
|
|
198
|
+
const f = currentCounters[istanbulModule].f ||
|
|
199
|
+
currentCounters[istanbulModule].data.f;
|
|
200
|
+
const b = currentCounters[istanbulModule].b ||
|
|
201
|
+
currentCounters[istanbulModule].data.b;
|
|
182
202
|
for (const funcId in f) {
|
|
183
203
|
this.setFunctionHit(istanbulModule, funcId, f, useDataKey);
|
|
184
204
|
}
|
|
@@ -189,13 +209,16 @@ class HitsCollector {
|
|
|
189
209
|
}
|
|
190
210
|
setBranchHit(b, branchId, istanbulModule, useDataKey) {
|
|
191
211
|
const currentBranchesHits = b[branchId];
|
|
192
|
-
this._latestCoverageSnapshot[istanbulModule].b[branchId] =
|
|
212
|
+
this._latestCoverageSnapshot[istanbulModule].b[branchId] =
|
|
213
|
+
this._latestCoverageSnapshot[istanbulModule].b[branchId] || [];
|
|
193
214
|
for (let i = 0; i < currentBranchesHits.length; i++) {
|
|
194
215
|
if (useDataKey) {
|
|
195
|
-
this._latestCoverageSnapshot[istanbulModule].data.b[branchId][i] =
|
|
216
|
+
this._latestCoverageSnapshot[istanbulModule].data.b[branchId][i] =
|
|
217
|
+
currentBranchesHits[i];
|
|
196
218
|
}
|
|
197
219
|
else {
|
|
198
|
-
this._latestCoverageSnapshot[istanbulModule].b[branchId][i] =
|
|
220
|
+
this._latestCoverageSnapshot[istanbulModule].b[branchId][i] =
|
|
221
|
+
currentBranchesHits[i];
|
|
199
222
|
}
|
|
200
223
|
}
|
|
201
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hits-collector.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-collector.ts"],"names":[],"mappings":";;;;;;;;;;;;AAQA,
|
|
1
|
+
{"version":3,"file":"hits-collector.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,13 +24,13 @@ class HitsConverter {
|
|
|
24
24
|
if (sl_env_vars_1.SlEnvVars.isUseNewUniqueId()) {
|
|
25
25
|
new original_module_loader_1.OriginalModuleLoader(hits_collector_1.HitsCollector.resolveGlobalCoverageObject(), this.logger).load();
|
|
26
26
|
}
|
|
27
|
-
hitFilesData.forEach(fileHit => {
|
|
27
|
+
hitFilesData.forEach((fileHit) => {
|
|
28
28
|
let relativePath = fileHit.filename;
|
|
29
29
|
if (fileHit.shouldResolveRelativePath) {
|
|
30
30
|
relativePath = this.relativePathResolver.getRelativePath(fileHit.filename);
|
|
31
31
|
}
|
|
32
32
|
const methodUniqueIdsWithPosition = this.createMethodIdsWithPosition(fileHit.hitMethods, relativePath, fileHit.filename, fileHit.uniqueIdKeysFromFile);
|
|
33
|
-
methodUniqueIds = methodUniqueIds.concat(methodUniqueIdsWithPosition.map(method => method.uniqueId));
|
|
33
|
+
methodUniqueIds = methodUniqueIds.concat(methodUniqueIdsWithPosition.map((method) => method.uniqueId));
|
|
34
34
|
branchUniqueIds = branchUniqueIds.concat(this.createBranchIds(fileHit.hitBranches, relativePath, fileHit.filename));
|
|
35
35
|
if (this.enableLineCoverage) {
|
|
36
36
|
methodLineHits = Object.assign(Object.assign({}, methodLineHits), this.convertMethodLineHits(methodUniqueIdsWithPosition, this.getUniqueHitLines(fileHit.hitStatements)));
|
|
@@ -51,9 +51,9 @@ class HitsConverter {
|
|
|
51
51
|
convertMethodLineHits(methodUniqueIdsWithPosition, hitLines) {
|
|
52
52
|
const methodLineHits = {};
|
|
53
53
|
const methodLinesToUniqueIdsMap = this.combineMethodStartAndEndByLine(methodUniqueIdsWithPosition);
|
|
54
|
-
hitLines.forEach(lineNumber => {
|
|
54
|
+
hitLines.forEach((lineNumber) => {
|
|
55
55
|
const matchedMethods = methodLinesToUniqueIdsMap[lineNumber];
|
|
56
|
-
matchedMethods === null || matchedMethods === void 0 ? void 0 : matchedMethods.forEach(matchedMethod => {
|
|
56
|
+
matchedMethods === null || matchedMethods === void 0 ? void 0 : matchedMethods.forEach((matchedMethod) => {
|
|
57
57
|
methodLineHits[matchedMethod] = (methodLineHits[matchedMethod] || []).concat(lineNumber);
|
|
58
58
|
});
|
|
59
59
|
});
|
|
@@ -63,7 +63,7 @@ class HitsConverter {
|
|
|
63
63
|
// Returns a map of line number and the matching method unique ids that were hit
|
|
64
64
|
combineMethodStartAndEndByLine(methodUniqueIdsWithPosition) {
|
|
65
65
|
const methodStartAndEndByLine = {};
|
|
66
|
-
methodUniqueIdsWithPosition.forEach(methodData => {
|
|
66
|
+
methodUniqueIdsWithPosition.forEach((methodData) => {
|
|
67
67
|
const startLine = methodData.start.line;
|
|
68
68
|
const endLine = methodData.end.line;
|
|
69
69
|
// Create a range from the start until the end and assign the method id to the array
|
|
@@ -78,24 +78,24 @@ class HitsConverter {
|
|
|
78
78
|
}
|
|
79
79
|
getUniqueHitLines(hitStatements) {
|
|
80
80
|
const uniqueLinesMap = new Set();
|
|
81
|
-
hitStatements.forEach(statementData => {
|
|
81
|
+
hitStatements.forEach((statementData) => {
|
|
82
82
|
uniqueLinesMap.add(statementData.start.line);
|
|
83
83
|
});
|
|
84
84
|
return Array.from(uniqueLinesMap);
|
|
85
85
|
}
|
|
86
86
|
createMethodIdsWithPosition(hitFunctions, relativePath, absolutePath, uniqueIdKeysFromFile) {
|
|
87
87
|
const methodsIdsWithPosition = [];
|
|
88
|
-
hitFunctions.forEach(hit => {
|
|
88
|
+
hitFunctions.forEach((hit) => {
|
|
89
89
|
methodsIdsWithPosition.push({
|
|
90
90
|
uniqueId: this.getMethodUniqueId(this.getStartLoc(hit), relativePath, absolutePath, uniqueIdKeysFromFile),
|
|
91
91
|
start: hit.loc.start,
|
|
92
|
-
end: hit.loc.end
|
|
92
|
+
end: hit.loc.end,
|
|
93
93
|
});
|
|
94
94
|
if (this.getDecl(hit) && this.getDeclStart(hit)) {
|
|
95
95
|
methodsIdsWithPosition.push({
|
|
96
96
|
uniqueId: this.getMethodUniqueId(this.getDeclStart(hit), relativePath, absolutePath, uniqueIdKeysFromFile),
|
|
97
97
|
start: hit.decl.start,
|
|
98
|
-
end: hit.decl.end
|
|
98
|
+
end: hit.decl.end,
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
});
|
|
@@ -121,14 +121,16 @@ class HitsConverter {
|
|
|
121
121
|
this.conversionErrors.push(message);
|
|
122
122
|
}
|
|
123
123
|
else {
|
|
124
|
-
this.logger.debug(
|
|
124
|
+
this.logger.debug("Using branch position from 'locations' object due to 'SL_useIstanbul' set to 'true'");
|
|
125
125
|
}
|
|
126
126
|
return position;
|
|
127
127
|
}
|
|
128
|
-
const newInstrumentation =
|
|
128
|
+
const newInstrumentation = parentPosition.line != position.line ||
|
|
129
|
+
parentPosition.column != position.column;
|
|
129
130
|
if (hit.branchData.type === 'if') {
|
|
130
|
-
const message = newInstrumentation
|
|
131
|
-
'Instrumented done by istanbul-lib-instrumenter
|
|
131
|
+
const message = newInstrumentation
|
|
132
|
+
? 'Instrumented done by istanbul-lib-instrumenter greater or equal than 5.1.0 enforcing parent positions for the else leave'
|
|
133
|
+
: 'Instrumented done by istanbul-lib-instrumenter lower than 5.1.0 using parent positions for the else leave';
|
|
132
134
|
this.logger.debug(message);
|
|
133
135
|
return parentPosition;
|
|
134
136
|
}
|
|
@@ -136,8 +138,8 @@ class HitsConverter {
|
|
|
136
138
|
}
|
|
137
139
|
createBranchIds(hitFunctions, relativePath, absolutePath) {
|
|
138
140
|
const branchIds = [];
|
|
139
|
-
hitFunctions.forEach(hit => {
|
|
140
|
-
hit.hitLeaves.forEach(leaveIdx => {
|
|
141
|
+
hitFunctions.forEach((hit) => {
|
|
142
|
+
hit.hitLeaves.forEach((leaveIdx) => {
|
|
141
143
|
branchIds.push(this.getBranchUniqueId(this.getLeaveStartLoc(hit, leaveIdx, absolutePath), relativePath, absolutePath, leaveIdx));
|
|
142
144
|
});
|
|
143
145
|
});
|
|
@@ -155,11 +157,15 @@ class HitsConverter {
|
|
|
155
157
|
}
|
|
156
158
|
}
|
|
157
159
|
if (sl_env_vars_1.SlEnvVars.isUseNewUniqueId()) {
|
|
158
|
-
const uniqueIdKey = idParts.relativePath +
|
|
160
|
+
const uniqueIdKey = idParts.relativePath +
|
|
161
|
+
'@' +
|
|
162
|
+
this.formatLoc(idParts.start);
|
|
159
163
|
const uniqueId = (0, new_id_resolver_1.resolveNewId)(uniqueIdKey, idParts.absolutePath, idParts.relativePath, hits_collector_1.HitsCollector.resolveGlobalCoverageObject(), this.logger);
|
|
160
164
|
if (uniqueId) {
|
|
161
165
|
// Remove starting slash if the flag was enabled
|
|
162
|
-
return this.omitFootprintsLeadingSlash
|
|
166
|
+
return this.omitFootprintsLeadingSlash
|
|
167
|
+
? this.removeLeadingSlashes(uniqueId)
|
|
168
|
+
: uniqueId;
|
|
163
169
|
}
|
|
164
170
|
}
|
|
165
171
|
return this.buildMethodUniqueId(idParts);
|
|
@@ -198,22 +204,41 @@ class HitsConverter {
|
|
|
198
204
|
let uniqueId;
|
|
199
205
|
const parts = this.resolveIdParts(startLoc, relativePath, absolutePath);
|
|
200
206
|
if (sl_env_vars_1.SlEnvVars.isUseNewUniqueId()) {
|
|
201
|
-
const uniqueIdKey = parts.relativePath +
|
|
207
|
+
const uniqueIdKey = parts.relativePath +
|
|
208
|
+
'|' +
|
|
209
|
+
this.formatLoc(parts.start) +
|
|
210
|
+
'|' +
|
|
211
|
+
leaveIndex;
|
|
202
212
|
uniqueId = (0, new_id_resolver_1.resolveNewId)(uniqueIdKey, parts.absolutePath, parts.relativePath, hits_collector_1.HitsCollector.resolveGlobalCoverageObject(), this.logger);
|
|
203
213
|
}
|
|
204
214
|
if (!uniqueId) {
|
|
205
|
-
uniqueId =
|
|
215
|
+
uniqueId =
|
|
216
|
+
parts.relativePath +
|
|
217
|
+
HitsConverter.BRANCH_ID_DEL +
|
|
218
|
+
this.formatLoc(parts.start) +
|
|
219
|
+
HitsConverter.BRANCH_ID_DEL +
|
|
220
|
+
leaveIndex;
|
|
206
221
|
}
|
|
207
222
|
return uniqueId;
|
|
208
223
|
}
|
|
209
224
|
resolveIdParts(startLoc, relativePath, absolutePath) {
|
|
210
225
|
const sourcePosition = this.sourceMapData.getSourcePosition(relativePath, absolutePath, startLoc, this.projectRoot, this.slMapping);
|
|
211
|
-
return sourcePosition
|
|
226
|
+
return sourcePosition
|
|
227
|
+
? sourcePosition
|
|
228
|
+
: {
|
|
229
|
+
relativePath: relativePath,
|
|
230
|
+
start: startLoc,
|
|
231
|
+
absolutePath: absolutePath,
|
|
232
|
+
};
|
|
212
233
|
}
|
|
213
234
|
buildMethodUniqueId(parts) {
|
|
214
|
-
const path = parts.relativePath +
|
|
235
|
+
const path = parts.relativePath +
|
|
236
|
+
HitsConverter.METHOD_ID_DEL +
|
|
237
|
+
this.formatLoc(parts.start);
|
|
215
238
|
// Remove starting slash if the flag was enabled
|
|
216
|
-
return this.omitFootprintsLeadingSlash
|
|
239
|
+
return this.omitFootprintsLeadingSlash
|
|
240
|
+
? this.removeLeadingSlashes(path)
|
|
241
|
+
: path;
|
|
217
242
|
}
|
|
218
243
|
removeLeadingSlashes(path) {
|
|
219
244
|
// Use a regular expression to remove leading forward and backslashes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hits-converter.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-converter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"hits-converter.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-converter.ts"],"names":[],"mappings":"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"}
|