testcafe 1.13.0 → 1.14.2
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/CHANGELOG.md +88 -10
- package/LICENSE +21 -21
- package/README.md +52 -48
- package/bin/testcafe-with-v8-flag-filter.js +0 -0
- package/lib/api/exportable-lib/index.js +50 -50
- package/lib/api/request-hooks/assert-type.js +7 -7
- package/lib/api/request-hooks/hook-method-names.js +11 -0
- package/lib/api/request-hooks/hook.js +33 -39
- package/lib/api/request-hooks/interfaces.js +3 -3
- package/lib/api/request-hooks/request-logger.js +113 -111
- package/lib/api/request-hooks/request-mock/create-request-mock.js +12 -0
- package/lib/api/request-hooks/request-mock/index.js +46 -0
- package/lib/api/request-hooks/request-mock.js +47 -48
- package/lib/api/structure/base-unit.js +11 -11
- package/lib/api/structure/fixture.js +75 -75
- package/lib/api/structure/interfaces.js +2 -2
- package/lib/api/structure/test-file.js +31 -31
- package/lib/api/structure/test-timeout.js +9 -9
- package/lib/api/structure/test.js +85 -85
- package/lib/api/structure/testing-unit.js +89 -89
- package/lib/api/structure/unit-type.js +9 -9
- package/lib/api/test-controller/assertion.js +88 -88
- package/lib/api/test-controller/execution-context.js +82 -82
- package/lib/api/test-controller/index.js +359 -319
- package/lib/api/test-controller/proxy.js +28 -28
- package/lib/api/test-page-url.js +60 -60
- package/lib/api/test-run-tracker.js +68 -68
- package/lib/api/wrap-test-function.js +49 -49
- package/lib/assertions/executor.js +74 -74
- package/lib/assertions/get-fn.js +46 -46
- package/lib/assertions/type.js +20 -20
- package/lib/assets/content-types.js +9 -9
- package/lib/assets/injectables.js +18 -18
- package/lib/browser/connection/command.js +10 -10
- package/lib/browser/connection/error-hints.js +9 -9
- package/lib/browser/connection/gateway.js +159 -159
- package/lib/browser/connection/get-hints.js +33 -33
- package/lib/browser/connection/heartbeat-status.js +8 -8
- package/lib/browser/connection/index.js +328 -328
- package/lib/browser/connection/remotes-queue.js +46 -46
- package/lib/browser/connection/service-routes.js +12 -12
- package/lib/browser/connection/status.js +12 -12
- package/lib/browser/interfaces.js +2 -2
- package/lib/browser/provider/built-in/dedicated/base.js +80 -80
- package/lib/browser/provider/built-in/dedicated/chrome/browser-client.js +204 -204
- package/lib/browser/provider/built-in/dedicated/chrome/build-chrome-args.js +17 -17
- package/lib/browser/provider/built-in/dedicated/chrome/config.js +110 -110
- package/lib/browser/provider/built-in/dedicated/chrome/create-temp-profile.js +45 -45
- package/lib/browser/provider/built-in/dedicated/chrome/elapsed-upperbounds.js +15 -15
- package/lib/browser/provider/built-in/dedicated/chrome/index.js +102 -102
- package/lib/browser/provider/built-in/dedicated/chrome/interfaces.js +2 -2
- package/lib/browser/provider/built-in/dedicated/chrome/local-chrome.js +24 -24
- package/lib/browser/provider/built-in/dedicated/chrome/runtime-info.js +29 -29
- package/lib/browser/provider/built-in/dedicated/edge/index.js +10 -10
- package/lib/browser/provider/built-in/dedicated/edge/runtime-info.js +29 -29
- package/lib/browser/provider/built-in/dedicated/firefox/config.js +33 -33
- package/lib/browser/provider/built-in/dedicated/firefox/create-temp-profile.js +78 -78
- package/lib/browser/provider/built-in/dedicated/firefox/index.js +73 -73
- package/lib/browser/provider/built-in/dedicated/firefox/local-firefox.js +36 -36
- package/lib/browser/provider/built-in/dedicated/firefox/marionette-client/commands.js +13 -13
- package/lib/browser/provider/built-in/dedicated/firefox/marionette-client/index.js +200 -200
- package/lib/browser/provider/built-in/dedicated/firefox/runtime-info.js +17 -17
- package/lib/browser/provider/built-in/index.js +21 -21
- package/lib/browser/provider/built-in/locally-installed.js +30 -30
- package/lib/browser/provider/built-in/path.js +47 -47
- package/lib/browser/provider/built-in/remote.js +58 -58
- package/lib/browser/provider/index.js +303 -303
- package/lib/browser/provider/parse-provider-name.js +16 -16
- package/lib/browser/provider/plugin-host.js +121 -121
- package/lib/browser/provider/pool.js +115 -115
- package/lib/browser/provider/utils/argument-parsing.js +74 -74
- package/lib/browser/provider/utils/browser-starter.js +34 -34
- package/lib/browser/provider/utils/client-functions.js +24 -24
- package/lib/browser/provider/utils/get-maximized-headless-window-size.js +9 -9
- package/lib/cli/argument-parser.js +284 -279
- package/lib/cli/authentication-helper.js +35 -35
- package/lib/cli/cli.js +134 -134
- package/lib/cli/correct-browsers-and-sources.js +40 -40
- package/lib/cli/index.js +19 -19
- package/lib/cli/log.js +43 -43
- package/lib/cli/remotes-wizard.js +36 -36
- package/lib/cli/termination-handler.js +38 -38
- package/lib/client/automation/index.js +144 -46
- package/lib/client/automation/index.min.js +1 -1
- package/lib/client/browser/idle-page/index.html.mustache +35 -35
- package/lib/client/browser/idle-page/logo.svg +86 -86
- package/lib/client/browser/service-worker.js +4 -6
- package/lib/client/core/index.js +19 -13
- package/lib/client/core/index.min.js +1 -1
- package/lib/client/driver/index.js +1807 -451
- package/lib/client/driver/index.min.js +1 -1
- package/lib/client/driver/internal-properties.js +9 -9
- package/lib/client/test-run/iframe.js.mustache +17 -17
- package/lib/client/test-run/index.js.mustache +51 -51
- package/lib/client/ui/index.js +14 -12
- package/lib/client/ui/index.min.js +1 -1
- package/lib/client/ui/sprite.svg +42 -42
- package/lib/client-functions/builder-symbol.js +4 -4
- package/lib/client-functions/client-function-builder.js +156 -135
- package/lib/client-functions/replicator.js +61 -61
- package/lib/client-functions/return-single-prop-mode.js +8 -8
- package/lib/client-functions/selector-api-execution-mode.js +22 -0
- package/lib/client-functions/selectors/add-api.js +646 -588
- package/lib/client-functions/selectors/create-snapshot-methods.js +13 -13
- package/lib/client-functions/selectors/prepare-api-args.js +20 -20
- package/lib/client-functions/selectors/selector-attribute-filter.js +22 -22
- package/lib/client-functions/selectors/selector-builder.js +154 -150
- package/lib/client-functions/selectors/selector-text-filter.js +43 -43
- package/lib/client-functions/selectors/snapshot-properties.js +48 -48
- package/lib/client-functions/types.js +18 -18
- package/lib/compiler/babel/format-babel-produced-code.js +10 -10
- package/lib/compiler/babel/get-base-babel-options.js +11 -11
- package/lib/compiler/babel/load-libs.js +64 -62
- package/lib/compiler/babel/preset-stage-2.js +19 -19
- package/lib/compiler/compile-client-function.js +73 -73
- package/lib/compiler/compilers.js +33 -33
- package/lib/compiler/index.js +92 -92
- package/lib/compiler/interfaces.js +2 -2
- package/lib/compiler/test-file/api-based.js +146 -146
- package/lib/compiler/test-file/base.js +36 -36
- package/lib/compiler/test-file/exportble-lib-path.js +5 -5
- package/lib/compiler/test-file/formats/coffeescript/compiler.js +38 -38
- package/lib/compiler/test-file/formats/coffeescript/get-test-list.js +29 -29
- package/lib/compiler/test-file/formats/es-next/compiler.js +43 -43
- package/lib/compiler/test-file/formats/es-next/get-test-list.js +166 -166
- package/lib/compiler/test-file/formats/es-next/is-flow-code.js +7 -7
- package/lib/compiler/test-file/formats/raw.js +85 -85
- package/lib/compiler/test-file/formats/typescript/compiler.js +135 -135
- package/lib/compiler/test-file/formats/typescript/get-test-list.js +185 -185
- package/lib/compiler/test-file/test-file-parser-base.js +214 -214
- package/lib/configuration/configuration-base.js +165 -165
- package/lib/configuration/constants.js +9 -9
- package/lib/configuration/customizable-compilers.js +7 -7
- package/lib/configuration/default-values.js +51 -51
- package/lib/configuration/interfaces.js +3 -3
- package/lib/configuration/option-names.js +53 -53
- package/lib/configuration/option-source.js +9 -9
- package/lib/configuration/option.js +14 -14
- package/lib/configuration/quarantine-option-names.js +10 -0
- package/lib/configuration/run-option-names.js +26 -26
- package/lib/configuration/screenshot-option-names.js +10 -10
- package/lib/configuration/testcafe-configuration.js +164 -165
- package/lib/configuration/types.js +2 -2
- package/lib/configuration/typescript-configuration.js +62 -62
- package/lib/custom-client-scripts/assert-type.js +7 -7
- package/lib/custom-client-scripts/client-script-init.js +3 -3
- package/lib/custom-client-scripts/client-script.js +107 -108
- package/lib/custom-client-scripts/get-code.js +11 -11
- package/lib/custom-client-scripts/get-url.js +6 -6
- package/lib/custom-client-scripts/load.js +15 -15
- package/lib/custom-client-scripts/problematic-scripts.js +2 -2
- package/lib/custom-client-scripts/routing.js +36 -36
- package/lib/custom-client-scripts/utils.js +60 -60
- package/lib/embedding-utils.js +83 -83
- package/lib/errors/create-stack-filter.js +18 -18
- package/lib/errors/error-list.js +26 -26
- package/lib/errors/get-callsite.js +31 -31
- package/lib/errors/internal-modules-prefix.js +8 -8
- package/lib/errors/is-internal-stack-frame.js +46 -46
- package/lib/errors/process-test-fn-error.js +37 -37
- package/lib/errors/runtime/index.js +123 -123
- package/lib/errors/runtime/templates.js +116 -114
- package/lib/errors/runtime/type-assertions.js +112 -112
- package/lib/errors/stack-cleaning-hook.js +64 -64
- package/lib/errors/test-run/formattable-adapter.js +59 -59
- package/lib/errors/test-run/index.js +302 -302
- package/lib/errors/test-run/render-error-template.js +31 -31
- package/lib/errors/test-run/templates.js +93 -95
- package/lib/errors/test-run/utils.js +90 -85
- package/lib/errors/types.js +157 -155
- package/lib/index.js +81 -81
- package/lib/live/bootstrapper.js +44 -44
- package/lib/live/controller.js +107 -107
- package/lib/live/file-watcher/index.js +67 -67
- package/lib/live/file-watcher/modules-graph.js +58 -58
- package/lib/live/keyboard-observer.js +76 -76
- package/lib/live/logger/index.js +64 -64
- package/lib/live/test-run-controller.js +96 -96
- package/lib/live/test-run-state.js +6 -6
- package/lib/live/test-run.js +56 -56
- package/lib/live/test-runner.js +168 -168
- package/lib/load-assets.js +29 -29
- package/lib/notifications/add-rendered-warning.js +16 -16
- package/lib/notifications/debug-logger.js +78 -78
- package/lib/notifications/deprecated.js +24 -24
- package/lib/notifications/information-message.js +12 -12
- package/lib/notifications/warning-log.js +32 -31
- package/lib/notifications/warning-message.js +48 -48
- package/lib/reporter/command/command-formatter.js +120 -109
- package/lib/reporter/command/format-command.js +8 -8
- package/lib/reporter/command/interfaces.js +2 -2
- package/lib/reporter/index.js +319 -314
- package/lib/reporter/interfaces.js +2 -2
- package/lib/reporter/plugin-host.js +136 -137
- package/lib/reporter/plugin-methods.js +12 -12
- package/lib/role/index.js +74 -74
- package/lib/role/marker-symbol.js +7 -7
- package/lib/role/phase.js +9 -9
- package/lib/runner/bootstrapper.js +272 -272
- package/lib/runner/browser-job-result.js +9 -9
- package/lib/runner/browser-job.js +153 -123
- package/lib/runner/browser-set.js +114 -114
- package/lib/runner/fixture-hook-controller.js +85 -85
- package/lib/runner/index.js +450 -442
- package/lib/runner/interfaces.js +3 -3
- package/lib/runner/reporter-stream-controller.js +28 -28
- package/lib/runner/task/index.js +152 -133
- package/lib/runner/task/phase.js +9 -9
- package/lib/runner/test-run-controller.js +166 -185
- package/lib/runner/tested-app.js +73 -72
- package/lib/screenshots/capturer.js +141 -141
- package/lib/screenshots/constants.js +11 -11
- package/lib/screenshots/crop.js +111 -111
- package/lib/screenshots/default-extension.js +4 -4
- package/lib/screenshots/index.js +67 -67
- package/lib/screenshots/utils.js +39 -39
- package/lib/services/compiler/host.js +190 -106
- package/lib/services/compiler/io.js +9 -9
- package/lib/services/compiler/protocol.js +17 -16
- package/lib/services/compiler/service.js +225 -106
- package/lib/services/compiler/test-run-proxy.js +111 -73
- package/lib/services/interfaces.js +3 -0
- package/lib/services/process-title.js +8 -8
- package/lib/services/serialization/prepare-options.js +17 -17
- package/lib/services/serialization/replicator/create-replicator.js +27 -0
- package/lib/services/serialization/replicator/custom-error-transform.js +28 -0
- package/lib/services/serialization/test-structure.js +93 -77
- package/lib/services/utils/ipc/interfaces.js +30 -30
- package/lib/services/utils/ipc/io.js +108 -108
- package/lib/services/utils/ipc/message.js +76 -73
- package/lib/services/utils/ipc/packet.js +55 -55
- package/lib/services/utils/ipc/proxy.js +110 -118
- package/lib/services/utils/ipc/transport.js +64 -64
- package/lib/shared/errors/index.js +382 -382
- package/lib/shared/node-modules-folder-name.js +4 -4
- package/lib/test-run/bookmark.js +90 -90
- package/lib/test-run/browser-console-messages.js +73 -73
- package/lib/test-run/browser-manipulation-queue.js +92 -92
- package/lib/test-run/client-messages.js +9 -9
- package/lib/test-run/commands/actions.js +486 -425
- package/lib/test-run/commands/assertion.js +45 -45
- package/lib/test-run/commands/base.js +14 -14
- package/lib/test-run/commands/browser-manipulation.js +95 -95
- package/lib/test-run/commands/from-object.js +82 -82
- package/lib/test-run/commands/observation.js +61 -61
- package/lib/test-run/commands/options.js +231 -215
- package/lib/test-run/commands/service.js +54 -48
- package/lib/test-run/commands/type.js +65 -60
- package/lib/test-run/commands/utils.js +87 -87
- package/lib/test-run/commands/validations/argument.js +90 -90
- package/lib/test-run/commands/validations/factories.js +47 -47
- package/lib/test-run/commands/validations/initializers.js +44 -44
- package/lib/test-run/debug-log.js +32 -32
- package/lib/test-run/execute-js-expression.js +74 -74
- package/lib/test-run/index.js +823 -752
- package/lib/test-run/marker-symbol.js +7 -7
- package/lib/test-run/observed-callsites-storage.js +17 -17
- package/lib/test-run/phase.js +16 -16
- package/lib/test-run/session-controller.js +104 -104
- package/lib/testcafe.js +119 -114
- package/lib/utils/assignable.js +39 -39
- package/lib/utils/async-event-emitter.js +28 -28
- package/lib/utils/async-queue.js +14 -14
- package/lib/utils/browser-connection-timeouts.js +19 -19
- package/lib/utils/callsite.js +17 -17
- package/lib/utils/check-file-path.js +31 -31
- package/lib/utils/check-url.js +51 -51
- package/lib/utils/convert-to-best-fit-type.js +16 -16
- package/lib/utils/correct-file-path.js +21 -21
- package/lib/utils/define-lazy-property.js +13 -13
- package/lib/utils/delay.js +6 -6
- package/lib/utils/delegated-api.js +44 -44
- package/lib/utils/detect-display.js +6 -6
- package/lib/utils/detect-ffmpeg.js +44 -44
- package/lib/utils/diff/colors.js +29 -29
- package/lib/utils/diff/index.js +53 -53
- package/lib/utils/diff/util.js +24 -22
- package/lib/utils/diff.js +29 -29
- package/lib/utils/escape-user-agent.js +10 -10
- package/lib/utils/flag-list.js +17 -17
- package/lib/utils/get-any-key.js +8 -8
- package/lib/utils/get-browser.js +8 -8
- package/lib/utils/get-common-path.js +34 -34
- package/lib/utils/get-filter-fn.js +40 -40
- package/lib/utils/get-options/base.js +36 -36
- package/lib/utils/get-options/compiler.js +33 -33
- package/lib/utils/get-options/grep.js +15 -15
- package/lib/utils/get-options/index.js +21 -19
- package/lib/utils/get-options/meta.js +22 -22
- package/lib/utils/get-options/quarantine.js +92 -0
- package/lib/utils/get-options/screenshot.js +17 -17
- package/lib/utils/get-options/ssl.js +45 -45
- package/lib/utils/get-options/video.js +10 -10
- package/lib/utils/get-viewport-width.js +18 -18
- package/lib/utils/guard-time-execution.js +10 -10
- package/lib/utils/handle-errors.js +74 -74
- package/lib/utils/handle-tag-args.js +8 -8
- package/lib/utils/http.js +30 -30
- package/lib/utils/is-localhost.js +11 -11
- package/lib/utils/is-password-input.js +11 -0
- package/lib/utils/is-repl.js +12 -0
- package/lib/utils/is-window-in-iframe.js +6 -6
- package/lib/utils/limit-number.js +10 -10
- package/lib/utils/make-reg-exp.js +7 -7
- package/lib/utils/moment-loader.js +20 -20
- package/lib/utils/parse-file-list.js +71 -71
- package/lib/utils/parse-user-agent.js +55 -55
- package/lib/utils/path-pattern.js +114 -114
- package/lib/utils/prepare-reporters.js +30 -30
- package/lib/utils/prerender-callsite.js +18 -18
- package/lib/utils/process.js +119 -119
- package/lib/utils/promisified-functions.js +46 -46
- package/lib/utils/re-executable-promise.js +39 -39
- package/lib/utils/render-callsite-sync.js +29 -29
- package/lib/utils/render-template.js +10 -10
- package/lib/utils/reporter.js +30 -30
- package/lib/utils/resolve-path-relatively-cwd.js +7 -7
- package/lib/utils/string.js +105 -105
- package/lib/utils/temp-directory/cleanup-process/commands.js +7 -7
- package/lib/utils/temp-directory/cleanup-process/index.js +143 -143
- package/lib/utils/temp-directory/cleanup-process/worker.js +58 -58
- package/lib/utils/temp-directory/index.js +87 -87
- package/lib/utils/temp-directory/lockfile.js +56 -56
- package/lib/utils/thennable.js +7 -7
- package/lib/utils/timer.js +15 -15
- package/lib/utils/to-posix-path.js +8 -8
- package/lib/utils/types.js +2 -2
- package/lib/video-recorder/interfaces.js +2 -2
- package/lib/video-recorder/process.js +126 -126
- package/lib/video-recorder/recorder.js +136 -136
- package/lib/video-recorder/test-run-video-recorder.js +69 -69
- package/lib/video-recorder/videos.js +37 -37
- package/package.json +7 -7
- package/ts-defs/index.d.ts +109 -17
- package/ts-defs/selectors.d.ts +95 -7
- package/ts-defs/testcafe-scripts.d.ts +96 -8
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const callsite_record_1 = require("callsite-record");
|
|
7
|
-
const render_callsite_sync_1 = __importDefault(require("./render-callsite-sync"));
|
|
8
|
-
const create_stack_filter_1 = __importDefault(require("../errors/create-stack-filter"));
|
|
9
|
-
function prerenderCallsite(callsite) {
|
|
10
|
-
const stackFilter = create_stack_filter_1.default(Error.stackTraceLimit);
|
|
11
|
-
return {
|
|
12
|
-
prerendered: true,
|
|
13
|
-
default: render_callsite_sync_1.default(callsite, { renderer: callsite_record_1.renderers.default, stackFilter }),
|
|
14
|
-
html: render_callsite_sync_1.default(callsite, { renderer: callsite_record_1.renderers.html, stackFilter }),
|
|
15
|
-
noColor: render_callsite_sync_1.default(callsite, { renderer: callsite_record_1.renderers.noColor, stackFilter })
|
|
16
|
-
};
|
|
17
|
-
}
|
|
18
|
-
exports.default = prerenderCallsite;
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const callsite_record_1 = require("callsite-record");
|
|
7
|
+
const render_callsite_sync_1 = __importDefault(require("./render-callsite-sync"));
|
|
8
|
+
const create_stack_filter_1 = __importDefault(require("../errors/create-stack-filter"));
|
|
9
|
+
function prerenderCallsite(callsite) {
|
|
10
|
+
const stackFilter = create_stack_filter_1.default(Error.stackTraceLimit);
|
|
11
|
+
return {
|
|
12
|
+
prerendered: true,
|
|
13
|
+
default: render_callsite_sync_1.default(callsite, { renderer: callsite_record_1.renderers.default, stackFilter }),
|
|
14
|
+
html: render_callsite_sync_1.default(callsite, { renderer: callsite_record_1.renderers.html, stackFilter }),
|
|
15
|
+
noColor: render_callsite_sync_1.default(callsite, { renderer: callsite_record_1.renderers.noColor, stackFilter })
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
exports.default = prerenderCallsite;
|
|
19
19
|
module.exports = exports.default;
|
|
20
20
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcmVuZGVyLWNhbGxzaXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3ByZXJlbmRlci1jYWxsc2l0ZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFEQUE0QztBQUM1QyxrRkFBd0Q7QUFDeEQsd0ZBQThEO0FBRzlELFNBQXdCLGlCQUFpQixDQUFFLFFBQVE7SUFDL0MsTUFBTSxXQUFXLEdBQUcsNkJBQWlCLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBRTdELE9BQU87UUFDSCxXQUFXLEVBQUUsSUFBSTtRQUVqQixPQUFPLEVBQUUsOEJBQWtCLENBQUMsUUFBUSxFQUFFLEVBQUUsUUFBUSxFQUFFLDJCQUFTLENBQUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxDQUFDO1FBQ25GLElBQUksRUFBSyw4QkFBa0IsQ0FBQyxRQUFRLEVBQUUsRUFBRSxRQUFRLEVBQUUsMkJBQVMsQ0FBQyxJQUFJLEVBQUUsV0FBVyxFQUFFLENBQUM7UUFDaEYsT0FBTyxFQUFFLDhCQUFrQixDQUFDLFFBQVEsRUFBRSxFQUFFLFFBQVEsRUFBRSwyQkFBUyxDQUFDLE9BQU8sRUFBRSxXQUFXLEVBQUUsQ0FBQztLQUN0RixDQUFDO0FBQ04sQ0FBQztBQVZELG9DQVVDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVuZGVyZXJzIH0gZnJvbSAnY2FsbHNpdGUtcmVjb3JkJztcbmltcG9ydCByZW5kZXJDYWxsc2l0ZVN5bmMgZnJvbSAnLi9yZW5kZXItY2FsbHNpdGUtc3luYyc7XG5pbXBvcnQgY3JlYXRlU3RhY2tGaWx0ZXIgZnJvbSAnLi4vZXJyb3JzL2NyZWF0ZS1zdGFjay1maWx0ZXInO1xuXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHByZXJlbmRlckNhbGxzaXRlIChjYWxsc2l0ZSkge1xuICAgIGNvbnN0IHN0YWNrRmlsdGVyID0gY3JlYXRlU3RhY2tGaWx0ZXIoRXJyb3Iuc3RhY2tUcmFjZUxpbWl0KTtcblxuICAgIHJldHVybiB7XG4gICAgICAgIHByZXJlbmRlcmVkOiB0cnVlLFxuXG4gICAgICAgIGRlZmF1bHQ6IHJlbmRlckNhbGxzaXRlU3luYyhjYWxsc2l0ZSwgeyByZW5kZXJlcjogcmVuZGVyZXJzLmRlZmF1bHQsIHN0YWNrRmlsdGVyIH0pLFxuICAgICAgICBodG1sOiAgICByZW5kZXJDYWxsc2l0ZVN5bmMoY2FsbHNpdGUsIHsgcmVuZGVyZXI6IHJlbmRlcmVycy5odG1sLCBzdGFja0ZpbHRlciB9KSxcbiAgICAgICAgbm9Db2xvcjogcmVuZGVyQ2FsbHNpdGVTeW5jKGNhbGxzaXRlLCB7IHJlbmRlcmVyOiByZW5kZXJlcnMubm9Db2xvciwgc3RhY2tGaWx0ZXIgfSlcbiAgICB9O1xufVxuIl19
|
package/lib/utils/process.js
CHANGED
|
@@ -1,120 +1,120 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.killBrowserProcess = void 0;
|
|
7
|
-
const child_process_1 = require("child_process");
|
|
8
|
-
const os_family_1 = __importDefault(require("os-family"));
|
|
9
|
-
const promisify_event_1 = __importDefault(require("promisify-event"));
|
|
10
|
-
const delay_1 = __importDefault(require("../utils/delay"));
|
|
11
|
-
const CHECK_PROCESS_IS_KILLED_TIMEOUT = 5000;
|
|
12
|
-
const CHECK_KILLED_DELAY = 1000;
|
|
13
|
-
const NEW_LINE_SEPERATOR_RE = /(\r\n)|(\n\r)|\n|\r/g;
|
|
14
|
-
const cannotGetListOfProcessError = 'Cannot get list of processes';
|
|
15
|
-
const killProcessTimeoutError = 'Kill process timeout';
|
|
16
|
-
function getProcessOutputUnix() {
|
|
17
|
-
const error = new Error(cannotGetListOfProcessError);
|
|
18
|
-
return new Promise((resolve, reject) => {
|
|
19
|
-
const child = child_process_1.spawn('ps', ['-eo', 'pid,command']);
|
|
20
|
-
let stdout = '';
|
|
21
|
-
let stderr = '';
|
|
22
|
-
child.stdout.on('data', data => {
|
|
23
|
-
stdout += data.toString();
|
|
24
|
-
});
|
|
25
|
-
child.stderr.on('data', data => {
|
|
26
|
-
stderr += data.toString();
|
|
27
|
-
});
|
|
28
|
-
child.on('exit', () => {
|
|
29
|
-
if (stderr)
|
|
30
|
-
reject(error);
|
|
31
|
-
else
|
|
32
|
-
resolve(stdout);
|
|
33
|
-
});
|
|
34
|
-
child.on('error', () => {
|
|
35
|
-
reject(error);
|
|
36
|
-
});
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
function findProcessIdUnix(browserId, psOutput) {
|
|
40
|
-
const processIdRegex = new RegExp('^\\s*(\\d+)\\s+.*' + browserId);
|
|
41
|
-
const lines = psOutput.split(NEW_LINE_SEPERATOR_RE);
|
|
42
|
-
for (let i = 0; i < lines.length; i++) {
|
|
43
|
-
const match = processIdRegex.exec(lines[i]);
|
|
44
|
-
if (match)
|
|
45
|
-
return parseInt(match[1], 10);
|
|
46
|
-
}
|
|
47
|
-
return null;
|
|
48
|
-
}
|
|
49
|
-
function isProcessExistUnix(processId, psOutput) {
|
|
50
|
-
const processIdRegex = new RegExp('^\\s*' + processId + '\\s+.*');
|
|
51
|
-
const lines = psOutput.split(NEW_LINE_SEPERATOR_RE);
|
|
52
|
-
return lines.some(line => processIdRegex.test(line));
|
|
53
|
-
}
|
|
54
|
-
async function findProcessUnix(browserId) {
|
|
55
|
-
const output = await getProcessOutputUnix();
|
|
56
|
-
return findProcessIdUnix(browserId, output);
|
|
57
|
-
}
|
|
58
|
-
async function checkUnixProcessIsKilled(processId) {
|
|
59
|
-
const output = await getProcessOutputUnix();
|
|
60
|
-
if (isProcessExistUnix(processId, output)) {
|
|
61
|
-
await delay_1.default(CHECK_KILLED_DELAY);
|
|
62
|
-
await checkUnixProcessIsKilled();
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
async function killProcessUnix(processId) {
|
|
66
|
-
let timeoutError = false;
|
|
67
|
-
process.kill(processId);
|
|
68
|
-
const killTimeoutTimer = delay_1.default(CHECK_PROCESS_IS_KILLED_TIMEOUT)
|
|
69
|
-
.then(() => {
|
|
70
|
-
timeoutError = true;
|
|
71
|
-
});
|
|
72
|
-
return Promise.race([killTimeoutTimer, checkUnixProcessIsKilled(processId)]).then(() => {
|
|
73
|
-
if (timeoutError)
|
|
74
|
-
throw new Error(killProcessTimeoutError);
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
async function runWMIC(args) {
|
|
78
|
-
const wmicProcess = child_process_1.spawn('wmic.exe', args, { detached: true });
|
|
79
|
-
let wmicOutput = '';
|
|
80
|
-
wmicProcess.stdout.on('data', data => {
|
|
81
|
-
wmicOutput += data.toString();
|
|
82
|
-
});
|
|
83
|
-
try {
|
|
84
|
-
await Promise.race([
|
|
85
|
-
promisify_event_1.default(wmicProcess.stdout, 'end'),
|
|
86
|
-
promisify_event_1.default(wmicProcess, 'error')
|
|
87
|
-
]);
|
|
88
|
-
return wmicOutput;
|
|
89
|
-
}
|
|
90
|
-
catch (e) {
|
|
91
|
-
return '';
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
async function findProcessWin(browserId) {
|
|
95
|
-
const wmicArgs = ['process', 'where', `commandline like '%${browserId}%' and name <> 'cmd.exe' and name <> 'wmic.exe'`, 'get', 'processid'];
|
|
96
|
-
const wmicOutput = await runWMIC(wmicArgs);
|
|
97
|
-
let processList = wmicOutput.split(/\s*\n/);
|
|
98
|
-
processList = processList
|
|
99
|
-
// NOTE: remove list's header and empty last element, caused by trailing newline
|
|
100
|
-
.slice(1, -1)
|
|
101
|
-
.map(pid => ({ pid: Number(pid) }));
|
|
102
|
-
return processList[0] ? processList[0].pid : null;
|
|
103
|
-
}
|
|
104
|
-
async function killBrowserProcess(browserId) {
|
|
105
|
-
const processId = os_family_1.default.win ? await findProcessWin(browserId) : await findProcessUnix(browserId);
|
|
106
|
-
if (!processId)
|
|
107
|
-
return true;
|
|
108
|
-
try {
|
|
109
|
-
if (os_family_1.default.win)
|
|
110
|
-
process.kill(processId);
|
|
111
|
-
else
|
|
112
|
-
await killProcessUnix(processId);
|
|
113
|
-
return true;
|
|
114
|
-
}
|
|
115
|
-
catch (e) {
|
|
116
|
-
return false;
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
|
-
exports.killBrowserProcess = killBrowserProcess;
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.killBrowserProcess = void 0;
|
|
7
|
+
const child_process_1 = require("child_process");
|
|
8
|
+
const os_family_1 = __importDefault(require("os-family"));
|
|
9
|
+
const promisify_event_1 = __importDefault(require("promisify-event"));
|
|
10
|
+
const delay_1 = __importDefault(require("../utils/delay"));
|
|
11
|
+
const CHECK_PROCESS_IS_KILLED_TIMEOUT = 5000;
|
|
12
|
+
const CHECK_KILLED_DELAY = 1000;
|
|
13
|
+
const NEW_LINE_SEPERATOR_RE = /(\r\n)|(\n\r)|\n|\r/g;
|
|
14
|
+
const cannotGetListOfProcessError = 'Cannot get list of processes';
|
|
15
|
+
const killProcessTimeoutError = 'Kill process timeout';
|
|
16
|
+
function getProcessOutputUnix() {
|
|
17
|
+
const error = new Error(cannotGetListOfProcessError);
|
|
18
|
+
return new Promise((resolve, reject) => {
|
|
19
|
+
const child = child_process_1.spawn('ps', ['-eo', 'pid,command']);
|
|
20
|
+
let stdout = '';
|
|
21
|
+
let stderr = '';
|
|
22
|
+
child.stdout.on('data', data => {
|
|
23
|
+
stdout += data.toString();
|
|
24
|
+
});
|
|
25
|
+
child.stderr.on('data', data => {
|
|
26
|
+
stderr += data.toString();
|
|
27
|
+
});
|
|
28
|
+
child.on('exit', () => {
|
|
29
|
+
if (stderr)
|
|
30
|
+
reject(error);
|
|
31
|
+
else
|
|
32
|
+
resolve(stdout);
|
|
33
|
+
});
|
|
34
|
+
child.on('error', () => {
|
|
35
|
+
reject(error);
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
function findProcessIdUnix(browserId, psOutput) {
|
|
40
|
+
const processIdRegex = new RegExp('^\\s*(\\d+)\\s+.*' + browserId);
|
|
41
|
+
const lines = psOutput.split(NEW_LINE_SEPERATOR_RE);
|
|
42
|
+
for (let i = 0; i < lines.length; i++) {
|
|
43
|
+
const match = processIdRegex.exec(lines[i]);
|
|
44
|
+
if (match)
|
|
45
|
+
return parseInt(match[1], 10);
|
|
46
|
+
}
|
|
47
|
+
return null;
|
|
48
|
+
}
|
|
49
|
+
function isProcessExistUnix(processId, psOutput) {
|
|
50
|
+
const processIdRegex = new RegExp('^\\s*' + processId + '\\s+.*');
|
|
51
|
+
const lines = psOutput.split(NEW_LINE_SEPERATOR_RE);
|
|
52
|
+
return lines.some(line => processIdRegex.test(line));
|
|
53
|
+
}
|
|
54
|
+
async function findProcessUnix(browserId) {
|
|
55
|
+
const output = await getProcessOutputUnix();
|
|
56
|
+
return findProcessIdUnix(browserId, output);
|
|
57
|
+
}
|
|
58
|
+
async function checkUnixProcessIsKilled(processId) {
|
|
59
|
+
const output = await getProcessOutputUnix();
|
|
60
|
+
if (isProcessExistUnix(processId, output)) {
|
|
61
|
+
await delay_1.default(CHECK_KILLED_DELAY);
|
|
62
|
+
await checkUnixProcessIsKilled();
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
async function killProcessUnix(processId) {
|
|
66
|
+
let timeoutError = false;
|
|
67
|
+
process.kill(processId);
|
|
68
|
+
const killTimeoutTimer = delay_1.default(CHECK_PROCESS_IS_KILLED_TIMEOUT)
|
|
69
|
+
.then(() => {
|
|
70
|
+
timeoutError = true;
|
|
71
|
+
});
|
|
72
|
+
return Promise.race([killTimeoutTimer, checkUnixProcessIsKilled(processId)]).then(() => {
|
|
73
|
+
if (timeoutError)
|
|
74
|
+
throw new Error(killProcessTimeoutError);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
async function runWMIC(args) {
|
|
78
|
+
const wmicProcess = child_process_1.spawn('wmic.exe', args, { detached: true });
|
|
79
|
+
let wmicOutput = '';
|
|
80
|
+
wmicProcess.stdout.on('data', data => {
|
|
81
|
+
wmicOutput += data.toString();
|
|
82
|
+
});
|
|
83
|
+
try {
|
|
84
|
+
await Promise.race([
|
|
85
|
+
promisify_event_1.default(wmicProcess.stdout, 'end'),
|
|
86
|
+
promisify_event_1.default(wmicProcess, 'error')
|
|
87
|
+
]);
|
|
88
|
+
return wmicOutput;
|
|
89
|
+
}
|
|
90
|
+
catch (e) {
|
|
91
|
+
return '';
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
async function findProcessWin(browserId) {
|
|
95
|
+
const wmicArgs = ['process', 'where', `commandline like '%${browserId}%' and name <> 'cmd.exe' and name <> 'wmic.exe'`, 'get', 'processid'];
|
|
96
|
+
const wmicOutput = await runWMIC(wmicArgs);
|
|
97
|
+
let processList = wmicOutput.split(/\s*\n/);
|
|
98
|
+
processList = processList
|
|
99
|
+
// NOTE: remove list's header and empty last element, caused by trailing newline
|
|
100
|
+
.slice(1, -1)
|
|
101
|
+
.map(pid => ({ pid: Number(pid) }));
|
|
102
|
+
return processList[0] ? processList[0].pid : null;
|
|
103
|
+
}
|
|
104
|
+
async function killBrowserProcess(browserId) {
|
|
105
|
+
const processId = os_family_1.default.win ? await findProcessWin(browserId) : await findProcessUnix(browserId);
|
|
106
|
+
if (!processId)
|
|
107
|
+
return true;
|
|
108
|
+
try {
|
|
109
|
+
if (os_family_1.default.win)
|
|
110
|
+
process.kill(processId);
|
|
111
|
+
else
|
|
112
|
+
await killProcessUnix(processId);
|
|
113
|
+
return true;
|
|
114
|
+
}
|
|
115
|
+
catch (e) {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
exports.killBrowserProcess = killBrowserProcess;
|
|
120
120
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"process.js","sourceRoot":"","sources":["../../src/utils/process.js"],"names":[],"mappings":"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","sourcesContent":["import { spawn } from 'child_process';\nimport OS from 'os-family';\nimport promisifyEvent from 'promisify-event';\nimport delay from '../utils/delay';\n\nconst CHECK_PROCESS_IS_KILLED_TIMEOUT = 5000;\nconst CHECK_KILLED_DELAY              = 1000;\nconst NEW_LINE_SEPERATOR_RE           = /(\\r\\n)|(\\n\\r)|\\n|\\r/g;\nconst cannotGetListOfProcessError     = 'Cannot get list of processes';\nconst killProcessTimeoutError         = 'Kill process timeout';\n\nfunction getProcessOutputUnix () {\n    const error = new Error(cannotGetListOfProcessError);\n\n    return new Promise((resolve, reject) => {\n        const child = spawn('ps', ['-eo', 'pid,command']);\n        let stdout  = '';\n        let stderr  = '';\n\n        child.stdout.on('data', data => {\n            stdout += data.toString();\n        });\n\n        child.stderr.on('data', data => {\n            stderr += data.toString();\n        });\n\n        child.on('exit', () => {\n            if (stderr)\n                reject(error);\n            else\n                resolve(stdout);\n        });\n\n        child.on('error', () => {\n            reject(error);\n        });\n    });\n}\n\nfunction findProcessIdUnix (browserId, psOutput) {\n    const processIdRegex   = new RegExp('^\\\\s*(\\\\d+)\\\\s+.*' + browserId);\n    const lines            = psOutput.split(NEW_LINE_SEPERATOR_RE);\n\n    for (let i = 0; i < lines.length; i++) {\n        const match = processIdRegex.exec(lines[i]);\n\n        if (match)\n            return parseInt(match[1], 10);\n    }\n\n    return null;\n}\n\nfunction isProcessExistUnix (processId, psOutput) {\n    const processIdRegex   = new RegExp('^\\\\s*' + processId + '\\\\s+.*');\n    const lines            = psOutput.split(NEW_LINE_SEPERATOR_RE);\n\n    return lines.some(line => processIdRegex.test(line));\n}\n\nasync function findProcessUnix (browserId) {\n    const output = await getProcessOutputUnix();\n\n    return findProcessIdUnix(browserId, output);\n}\n\nasync function checkUnixProcessIsKilled (processId) {\n    const output = await getProcessOutputUnix();\n\n    if (isProcessExistUnix(processId, output)) {\n        await delay(CHECK_KILLED_DELAY);\n\n        await checkUnixProcessIsKilled();\n    }\n}\n\nasync function killProcessUnix (processId) {\n    let timeoutError = false;\n\n    process.kill(processId);\n\n    const killTimeoutTimer = delay(CHECK_PROCESS_IS_KILLED_TIMEOUT)\n        .then(() => {\n            timeoutError = true;\n        });\n\n    return Promise.race([killTimeoutTimer, checkUnixProcessIsKilled(processId)]).then(() => {\n        if (timeoutError)\n            throw new Error(killProcessTimeoutError);\n    });\n}\n\nasync function runWMIC (args) {\n    const wmicProcess = spawn('wmic.exe', args, { detached: true });\n\n    let wmicOutput  = '';\n\n    wmicProcess.stdout.on('data', data => {\n        wmicOutput += data.toString();\n    });\n\n    try {\n        await Promise.race([\n            promisifyEvent(wmicProcess.stdout, 'end'),\n            promisifyEvent(wmicProcess, 'error')\n        ]);\n\n        return wmicOutput;\n    }\n    catch (e) {\n        return '';\n    }\n}\n\nasync function findProcessWin (browserId) {\n    const wmicArgs    = ['process', 'where', `commandline like '%${browserId}%' and name <> 'cmd.exe' and name <> 'wmic.exe'`, 'get', 'processid'];\n    const wmicOutput  = await runWMIC(wmicArgs);\n    let processList = wmicOutput.split(/\\s*\\n/);\n\n    processList = processList\n    // NOTE: remove list's header and empty last element, caused by trailing newline\n        .slice(1, -1)\n        .map(pid => ({ pid: Number(pid) }));\n\n    return processList[0] ? processList[0].pid : null;\n}\n\nexport async function killBrowserProcess (browserId) {\n    const processId = OS.win ? await findProcessWin(browserId) : await findProcessUnix(browserId);\n\n    if (!processId)\n        return true;\n\n    try {\n        if (OS.win)\n            process.kill(processId);\n        else\n            await killProcessUnix(processId);\n\n        return true;\n    }\n    catch (e) {\n        return false;\n    }\n}\n"]}
|
|
@@ -1,47 +1,47 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.writePng = exports.readPngFile = exports.readPng = exports.sendMessageToChildProcess = exports.exec = exports.deleteFile = exports.readFile = exports.writeFile = exports.stat = exports.readDir = void 0;
|
|
7
|
-
const child_process_1 = __importDefault(require("child_process"));
|
|
8
|
-
const graceful_fs_1 = __importDefault(require("graceful-fs"));
|
|
9
|
-
const pngjs_1 = require("pngjs");
|
|
10
|
-
const promisify_event_1 = __importDefault(require("promisify-event"));
|
|
11
|
-
const util_1 = require("util");
|
|
12
|
-
exports.readDir = util_1.promisify(graceful_fs_1.default.readdir);
|
|
13
|
-
exports.stat = util_1.promisify(graceful_fs_1.default.stat);
|
|
14
|
-
exports.writeFile = util_1.promisify(graceful_fs_1.default.writeFile);
|
|
15
|
-
exports.readFile = util_1.promisify(graceful_fs_1.default.readFile);
|
|
16
|
-
exports.deleteFile = util_1.promisify(graceful_fs_1.default.unlink);
|
|
17
|
-
exports.exec = util_1.promisify(child_process_1.default.exec);
|
|
18
|
-
exports.sendMessageToChildProcess = util_1.promisify((process, ...args) => process.send(...args));
|
|
19
|
-
function readPng(buffer) {
|
|
20
|
-
const png = new pngjs_1.PNG();
|
|
21
|
-
const parsedPromise = Promise.race([
|
|
22
|
-
promisify_event_1.default(png, 'parsed'),
|
|
23
|
-
promisify_event_1.default(png, 'error')
|
|
24
|
-
]);
|
|
25
|
-
png.parse(buffer);
|
|
26
|
-
return parsedPromise
|
|
27
|
-
.then(() => png);
|
|
28
|
-
}
|
|
29
|
-
exports.readPng = readPng;
|
|
30
|
-
async function readPngFile(filePath) {
|
|
31
|
-
const buffer = await exports.readFile(filePath);
|
|
32
|
-
return await readPng(buffer);
|
|
33
|
-
}
|
|
34
|
-
exports.readPngFile = readPngFile;
|
|
35
|
-
function writePng(filePath, png) {
|
|
36
|
-
const outStream = graceful_fs_1.default.createWriteStream(filePath);
|
|
37
|
-
const pngStream = png.pack();
|
|
38
|
-
const finishPromise = Promise.race([
|
|
39
|
-
promisify_event_1.default(outStream, 'finish'),
|
|
40
|
-
promisify_event_1.default(outStream, 'error'),
|
|
41
|
-
promisify_event_1.default(pngStream, 'error')
|
|
42
|
-
]);
|
|
43
|
-
pngStream.pipe(outStream);
|
|
44
|
-
return finishPromise;
|
|
45
|
-
}
|
|
46
|
-
exports.writePng = writePng;
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.writePng = exports.readPngFile = exports.readPng = exports.sendMessageToChildProcess = exports.exec = exports.deleteFile = exports.readFile = exports.writeFile = exports.stat = exports.readDir = void 0;
|
|
7
|
+
const child_process_1 = __importDefault(require("child_process"));
|
|
8
|
+
const graceful_fs_1 = __importDefault(require("graceful-fs"));
|
|
9
|
+
const pngjs_1 = require("pngjs");
|
|
10
|
+
const promisify_event_1 = __importDefault(require("promisify-event"));
|
|
11
|
+
const util_1 = require("util");
|
|
12
|
+
exports.readDir = util_1.promisify(graceful_fs_1.default.readdir);
|
|
13
|
+
exports.stat = util_1.promisify(graceful_fs_1.default.stat);
|
|
14
|
+
exports.writeFile = util_1.promisify(graceful_fs_1.default.writeFile);
|
|
15
|
+
exports.readFile = util_1.promisify(graceful_fs_1.default.readFile);
|
|
16
|
+
exports.deleteFile = util_1.promisify(graceful_fs_1.default.unlink);
|
|
17
|
+
exports.exec = util_1.promisify(child_process_1.default.exec);
|
|
18
|
+
exports.sendMessageToChildProcess = util_1.promisify((process, ...args) => process.send(...args));
|
|
19
|
+
function readPng(buffer) {
|
|
20
|
+
const png = new pngjs_1.PNG();
|
|
21
|
+
const parsedPromise = Promise.race([
|
|
22
|
+
promisify_event_1.default(png, 'parsed'),
|
|
23
|
+
promisify_event_1.default(png, 'error')
|
|
24
|
+
]);
|
|
25
|
+
png.parse(buffer);
|
|
26
|
+
return parsedPromise
|
|
27
|
+
.then(() => png);
|
|
28
|
+
}
|
|
29
|
+
exports.readPng = readPng;
|
|
30
|
+
async function readPngFile(filePath) {
|
|
31
|
+
const buffer = await exports.readFile(filePath);
|
|
32
|
+
return await readPng(buffer);
|
|
33
|
+
}
|
|
34
|
+
exports.readPngFile = readPngFile;
|
|
35
|
+
function writePng(filePath, png) {
|
|
36
|
+
const outStream = graceful_fs_1.default.createWriteStream(filePath);
|
|
37
|
+
const pngStream = png.pack();
|
|
38
|
+
const finishPromise = Promise.race([
|
|
39
|
+
promisify_event_1.default(outStream, 'finish'),
|
|
40
|
+
promisify_event_1.default(outStream, 'error'),
|
|
41
|
+
promisify_event_1.default(pngStream, 'error')
|
|
42
|
+
]);
|
|
43
|
+
pngStream.pipe(outStream);
|
|
44
|
+
return finishPromise;
|
|
45
|
+
}
|
|
46
|
+
exports.writePng = writePng;
|
|
47
47
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvbWlzaWZpZWQtZnVuY3Rpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3Byb21pc2lmaWVkLWZ1bmN0aW9ucy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrRUFBeUM7QUFDekMsOERBQTZCO0FBQzdCLGlDQUE0QjtBQUM1QixzRUFBNkM7QUFDN0MsK0JBQWlDO0FBRXBCLFFBQUEsT0FBTyxHQUFNLGdCQUFTLENBQUMscUJBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUNuQyxRQUFBLElBQUksR0FBUyxnQkFBUyxDQUFDLHFCQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDaEMsUUFBQSxTQUFTLEdBQUksZ0JBQVMsQ0FBQyxxQkFBRSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQ3JDLFFBQUEsUUFBUSxHQUFLLGdCQUFTLENBQUMscUJBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUNwQyxRQUFBLFVBQVUsR0FBRyxnQkFBUyxDQUFDLHFCQUFFLENBQUMsTUFBTSxDQUFDLENBQUM7QUFFbEMsUUFBQSxJQUFJLEdBQUcsZ0JBQVMsQ0FBQyx1QkFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBRXBDLFFBQUEseUJBQXlCLEdBQUcsZ0JBQVMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxHQUFHLElBQUksRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUM7QUFFaEcsU0FBZ0IsT0FBTyxDQUFFLE1BQU07SUFDM0IsTUFBTSxHQUFHLEdBQUcsSUFBSSxXQUFHLEVBQUUsQ0FBQztJQUV0QixNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBQy9CLHlCQUFjLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQztRQUM3Qix5QkFBYyxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUM7S0FDL0IsQ0FBQyxDQUFDO0lBRUgsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUVsQixPQUFPLGFBQWE7U0FDZixJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDekIsQ0FBQztBQVpELDBCQVlDO0FBRU0sS0FBSyxVQUFVLFdBQVcsQ0FBRSxRQUFRO0lBQ3ZDLE1BQU0sTUFBTSxHQUFHLE1BQU0sZ0JBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUV4QyxPQUFPLE1BQU0sT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQ2pDLENBQUM7QUFKRCxrQ0FJQztBQUVELFNBQWdCLFFBQVEsQ0FBRSxRQUFRLEVBQUUsR0FBRztJQUNuQyxNQUFNLFNBQVMsR0FBRyxxQkFBRSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pELE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUU3QixNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBQy9CLHlCQUFjLENBQUMsU0FBUyxFQUFFLFFBQVEsQ0FBQztRQUNuQyx5QkFBYyxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUM7UUFDbEMseUJBQWMsQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDO0tBQ3JDLENBQUMsQ0FBQztJQUVILFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFFMUIsT0FBTyxhQUFhLENBQUM7QUFDekIsQ0FBQztBQWJELDRCQWFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGNoaWxkUHJvY2VzcyBmcm9tICdjaGlsZF9wcm9jZXNzJztcbmltcG9ydCBmcyBmcm9tICdncmFjZWZ1bC1mcyc7XG5pbXBvcnQgeyBQTkcgfSBmcm9tICdwbmdqcyc7XG5pbXBvcnQgcHJvbWlzaWZ5RXZlbnQgZnJvbSAncHJvbWlzaWZ5LWV2ZW50JztcbmltcG9ydCB7IHByb21pc2lmeSB9IGZyb20gJ3V0aWwnO1xuXG5leHBvcnQgY29uc3QgcmVhZERpciAgICA9IHByb21pc2lmeShmcy5yZWFkZGlyKTtcbmV4cG9ydCBjb25zdCBzdGF0ICAgICAgID0gcHJvbWlzaWZ5KGZzLnN0YXQpO1xuZXhwb3J0IGNvbnN0IHdyaXRlRmlsZSAgPSBwcm9taXNpZnkoZnMud3JpdGVGaWxlKTtcbmV4cG9ydCBjb25zdCByZWFkRmlsZSAgID0gcHJvbWlzaWZ5KGZzLnJlYWRGaWxlKTtcbmV4cG9ydCBjb25zdCBkZWxldGVGaWxlID0gcHJvbWlzaWZ5KGZzLnVubGluayk7XG5cbmV4cG9ydCBjb25zdCBleGVjID0gcHJvbWlzaWZ5KGNoaWxkUHJvY2Vzcy5leGVjKTtcblxuZXhwb3J0IGNvbnN0IHNlbmRNZXNzYWdlVG9DaGlsZFByb2Nlc3MgPSBwcm9taXNpZnkoKHByb2Nlc3MsIC4uLmFyZ3MpID0+IHByb2Nlc3Muc2VuZCguLi5hcmdzKSk7XG5cbmV4cG9ydCBmdW5jdGlvbiByZWFkUG5nIChidWZmZXIpIHtcbiAgICBjb25zdCBwbmcgPSBuZXcgUE5HKCk7XG5cbiAgICBjb25zdCBwYXJzZWRQcm9taXNlID0gUHJvbWlzZS5yYWNlKFtcbiAgICAgICAgcHJvbWlzaWZ5RXZlbnQocG5nLCAncGFyc2VkJyksXG4gICAgICAgIHByb21pc2lmeUV2ZW50KHBuZywgJ2Vycm9yJylcbiAgICBdKTtcblxuICAgIHBuZy5wYXJzZShidWZmZXIpO1xuXG4gICAgcmV0dXJuIHBhcnNlZFByb21pc2VcbiAgICAgICAgLnRoZW4oKCkgPT4gcG5nKTtcbn1cblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHJlYWRQbmdGaWxlIChmaWxlUGF0aCkge1xuICAgIGNvbnN0IGJ1ZmZlciA9IGF3YWl0IHJlYWRGaWxlKGZpbGVQYXRoKTtcblxuICAgIHJldHVybiBhd2FpdCByZWFkUG5nKGJ1ZmZlcik7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB3cml0ZVBuZyAoZmlsZVBhdGgsIHBuZykge1xuICAgIGNvbnN0IG91dFN0cmVhbSA9IGZzLmNyZWF0ZVdyaXRlU3RyZWFtKGZpbGVQYXRoKTtcbiAgICBjb25zdCBwbmdTdHJlYW0gPSBwbmcucGFjaygpO1xuXG4gICAgY29uc3QgZmluaXNoUHJvbWlzZSA9IFByb21pc2UucmFjZShbXG4gICAgICAgIHByb21pc2lmeUV2ZW50KG91dFN0cmVhbSwgJ2ZpbmlzaCcpLFxuICAgICAgICBwcm9taXNpZnlFdmVudChvdXRTdHJlYW0sICdlcnJvcicpLFxuICAgICAgICBwcm9taXNpZnlFdmVudChwbmdTdHJlYW0sICdlcnJvcicpXG4gICAgXSk7XG5cbiAgICBwbmdTdHJlYW0ucGlwZShvdXRTdHJlYW0pO1xuXG4gICAgcmV0dXJuIGZpbmlzaFByb21pc2U7XG59XG4iXX0=
|
|
@@ -1,41 +1,41 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
// TODO: Fix https://github.com/DevExpress/testcafe/issues/4139 to get rid of Pinkie
|
|
7
|
-
const pinkie_1 = __importDefault(require("pinkie"));
|
|
8
|
-
const lodash_1 = require("lodash");
|
|
9
|
-
const test_run_tracker_1 = __importDefault(require("../api/test-run-tracker"));
|
|
10
|
-
class ReExecutablePromise extends pinkie_1.default {
|
|
11
|
-
constructor(executorFn) {
|
|
12
|
-
super(lodash_1.noop);
|
|
13
|
-
this._fn = executorFn;
|
|
14
|
-
this._taskPromise = null;
|
|
15
|
-
}
|
|
16
|
-
_ensureExecuting() {
|
|
17
|
-
if (!this._taskPromise)
|
|
18
|
-
this._taskPromise = new pinkie_1.default(this._fn);
|
|
19
|
-
}
|
|
20
|
-
_reExecute() {
|
|
21
|
-
this._taskPromise = null;
|
|
22
|
-
return this;
|
|
23
|
-
}
|
|
24
|
-
then(onFulfilled, onRejected) {
|
|
25
|
-
this._ensureExecuting();
|
|
26
|
-
return this._taskPromise.then(onFulfilled, onRejected);
|
|
27
|
-
}
|
|
28
|
-
catch(onRejected) {
|
|
29
|
-
this._ensureExecuting();
|
|
30
|
-
return this._taskPromise.catch(onRejected);
|
|
31
|
-
}
|
|
32
|
-
static fromFn(asyncExecutorFn) {
|
|
33
|
-
const testRunId = test_run_tracker_1.default.getContextTestRunId();
|
|
34
|
-
if (testRunId)
|
|
35
|
-
asyncExecutorFn = test_run_tracker_1.default.addTrackingMarkerToFunction(testRunId, asyncExecutorFn);
|
|
36
|
-
return new ReExecutablePromise(resolve => resolve(asyncExecutorFn()));
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
exports.default = ReExecutablePromise;
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
// TODO: Fix https://github.com/DevExpress/testcafe/issues/4139 to get rid of Pinkie
|
|
7
|
+
const pinkie_1 = __importDefault(require("pinkie"));
|
|
8
|
+
const lodash_1 = require("lodash");
|
|
9
|
+
const test_run_tracker_1 = __importDefault(require("../api/test-run-tracker"));
|
|
10
|
+
class ReExecutablePromise extends pinkie_1.default {
|
|
11
|
+
constructor(executorFn) {
|
|
12
|
+
super(lodash_1.noop);
|
|
13
|
+
this._fn = executorFn;
|
|
14
|
+
this._taskPromise = null;
|
|
15
|
+
}
|
|
16
|
+
_ensureExecuting() {
|
|
17
|
+
if (!this._taskPromise)
|
|
18
|
+
this._taskPromise = new pinkie_1.default(this._fn);
|
|
19
|
+
}
|
|
20
|
+
_reExecute() {
|
|
21
|
+
this._taskPromise = null;
|
|
22
|
+
return this;
|
|
23
|
+
}
|
|
24
|
+
then(onFulfilled, onRejected) {
|
|
25
|
+
this._ensureExecuting();
|
|
26
|
+
return this._taskPromise.then(onFulfilled, onRejected);
|
|
27
|
+
}
|
|
28
|
+
catch(onRejected) {
|
|
29
|
+
this._ensureExecuting();
|
|
30
|
+
return this._taskPromise.catch(onRejected);
|
|
31
|
+
}
|
|
32
|
+
static fromFn(asyncExecutorFn) {
|
|
33
|
+
const testRunId = test_run_tracker_1.default.getContextTestRunId();
|
|
34
|
+
if (testRunId)
|
|
35
|
+
asyncExecutorFn = test_run_tracker_1.default.addTrackingMarkerToFunction(testRunId, asyncExecutorFn);
|
|
36
|
+
return new ReExecutablePromise(resolve => resolve(asyncExecutorFn()));
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
exports.default = ReExecutablePromise;
|
|
40
40
|
module.exports = exports.default;
|
|
41
41
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmUtZXhlY3V0YWJsZS1wcm9taXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3JlLWV4ZWN1dGFibGUtcHJvbWlzZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG9GQUFvRjtBQUNwRixvREFBNkI7QUFDN0IsbUNBQThCO0FBQzlCLCtFQUFxRDtBQUVyRCxNQUFxQixtQkFBb0IsU0FBUSxnQkFBTztJQUNwRCxZQUFhLFVBQVU7UUFDbkIsS0FBSyxDQUFDLGFBQUksQ0FBQyxDQUFDO1FBRVosSUFBSSxDQUFDLEdBQUcsR0FBWSxVQUFVLENBQUM7UUFDL0IsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUM7SUFDN0IsQ0FBQztJQUVELGdCQUFnQjtRQUNaLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWTtZQUNsQixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksZ0JBQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbEQsQ0FBQztJQUVELFVBQVU7UUFDTixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQztRQUV6QixPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBRUQsSUFBSSxDQUFFLFdBQVcsRUFBRSxVQUFVO1FBQ3pCLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBRXhCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQzNELENBQUM7SUFFRCxLQUFLLENBQUUsVUFBVTtRQUNiLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBRXhCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUUsZUFBZTtRQUMxQixNQUFNLFNBQVMsR0FBRywwQkFBYyxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFFdkQsSUFBSSxTQUFTO1lBQ1QsZUFBZSxHQUFHLDBCQUFjLENBQUMsMkJBQTJCLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBRTdGLE9BQU8sSUFBSSxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDMUUsQ0FBQztDQUNKO0FBdkNELHNDQXVDQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIFRPRE86IEZpeCBodHRwczovL2dpdGh1Yi5jb20vRGV2RXhwcmVzcy90ZXN0Y2FmZS9pc3N1ZXMvNDEzOSB0byBnZXQgcmlkIG9mIFBpbmtpZVxuaW1wb3J0IFByb21pc2UgZnJvbSAncGlua2llJztcbmltcG9ydCB7IG5vb3AgfSBmcm9tICdsb2Rhc2gnO1xuaW1wb3J0IHRlc3RSdW5UcmFja2VyIGZyb20gJy4uL2FwaS90ZXN0LXJ1bi10cmFja2VyJztcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgUmVFeGVjdXRhYmxlUHJvbWlzZSBleHRlbmRzIFByb21pc2Uge1xuICAgIGNvbnN0cnVjdG9yIChleGVjdXRvckZuKSB7XG4gICAgICAgIHN1cGVyKG5vb3ApO1xuXG4gICAgICAgIHRoaXMuX2ZuICAgICAgICAgID0gZXhlY3V0b3JGbjtcbiAgICAgICAgdGhpcy5fdGFza1Byb21pc2UgPSBudWxsO1xuICAgIH1cblxuICAgIF9lbnN1cmVFeGVjdXRpbmcgKCkge1xuICAgICAgICBpZiAoIXRoaXMuX3Rhc2tQcm9taXNlKVxuICAgICAgICAgICAgdGhpcy5fdGFza1Byb21pc2UgPSBuZXcgUHJvbWlzZSh0aGlzLl9mbik7XG4gICAgfVxuXG4gICAgX3JlRXhlY3V0ZSAoKSB7XG4gICAgICAgIHRoaXMuX3Rhc2tQcm9taXNlID0gbnVsbDtcblxuICAgICAgICByZXR1cm4gdGhpcztcbiAgICB9XG5cbiAgICB0aGVuIChvbkZ1bGZpbGxlZCwgb25SZWplY3RlZCkge1xuICAgICAgICB0aGlzLl9lbnN1cmVFeGVjdXRpbmcoKTtcblxuICAgICAgICByZXR1cm4gdGhpcy5fdGFza1Byb21pc2UudGhlbihvbkZ1bGZpbGxlZCwgb25SZWplY3RlZCk7XG4gICAgfVxuXG4gICAgY2F0Y2ggKG9uUmVqZWN0ZWQpIHtcbiAgICAgICAgdGhpcy5fZW5zdXJlRXhlY3V0aW5nKCk7XG5cbiAgICAgICAgcmV0dXJuIHRoaXMuX3Rhc2tQcm9taXNlLmNhdGNoKG9uUmVqZWN0ZWQpO1xuICAgIH1cblxuICAgIHN0YXRpYyBmcm9tRm4gKGFzeW5jRXhlY3V0b3JGbikge1xuICAgICAgICBjb25zdCB0ZXN0UnVuSWQgPSB0ZXN0UnVuVHJhY2tlci5nZXRDb250ZXh0VGVzdFJ1bklkKCk7XG5cbiAgICAgICAgaWYgKHRlc3RSdW5JZClcbiAgICAgICAgICAgIGFzeW5jRXhlY3V0b3JGbiA9IHRlc3RSdW5UcmFja2VyLmFkZFRyYWNraW5nTWFya2VyVG9GdW5jdGlvbih0ZXN0UnVuSWQsIGFzeW5jRXhlY3V0b3JGbik7XG5cbiAgICAgICAgcmV0dXJuIG5ldyBSZUV4ZWN1dGFibGVQcm9taXNlKHJlc29sdmUgPT4gcmVzb2x2ZShhc3luY0V4ZWN1dG9yRm4oKSkpO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const callsite_record_1 = require("callsite-record");
|
|
4
|
-
function renderCallsiteSync(callsite, options) {
|
|
5
|
-
if (!callsite)
|
|
6
|
-
return '';
|
|
7
|
-
// NOTE: for raw API callsites
|
|
8
|
-
if (typeof callsite === 'string')
|
|
9
|
-
return callsite;
|
|
10
|
-
if (callsite.prerendered) {
|
|
11
|
-
const renderer = options && options.renderer;
|
|
12
|
-
if (renderer === callsite_record_1.renderers.html)
|
|
13
|
-
return callsite.html;
|
|
14
|
-
if (renderer === callsite_record_1.renderers.noColor)
|
|
15
|
-
return callsite.noColor;
|
|
16
|
-
return callsite.default || '';
|
|
17
|
-
}
|
|
18
|
-
if (!callsite.renderSync)
|
|
19
|
-
return '';
|
|
20
|
-
try {
|
|
21
|
-
// NOTE: Callsite will throw during rendering if it can't find a target file for the specified function or method:
|
|
22
|
-
// https://github.com/inikulin/callsite-record/issues/2#issuecomment-223263941
|
|
23
|
-
return callsite.renderSync(options);
|
|
24
|
-
}
|
|
25
|
-
catch (err) {
|
|
26
|
-
return '';
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
exports.default = renderCallsiteSync;
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const callsite_record_1 = require("callsite-record");
|
|
4
|
+
function renderCallsiteSync(callsite, options) {
|
|
5
|
+
if (!callsite)
|
|
6
|
+
return '';
|
|
7
|
+
// NOTE: for raw API callsites
|
|
8
|
+
if (typeof callsite === 'string')
|
|
9
|
+
return callsite;
|
|
10
|
+
if (callsite.prerendered) {
|
|
11
|
+
const renderer = options && options.renderer;
|
|
12
|
+
if (renderer === callsite_record_1.renderers.html)
|
|
13
|
+
return callsite.html;
|
|
14
|
+
if (renderer === callsite_record_1.renderers.noColor)
|
|
15
|
+
return callsite.noColor;
|
|
16
|
+
return callsite.default || '';
|
|
17
|
+
}
|
|
18
|
+
if (!callsite.renderSync)
|
|
19
|
+
return '';
|
|
20
|
+
try {
|
|
21
|
+
// NOTE: Callsite will throw during rendering if it can't find a target file for the specified function or method:
|
|
22
|
+
// https://github.com/inikulin/callsite-record/issues/2#issuecomment-223263941
|
|
23
|
+
return callsite.renderSync(options);
|
|
24
|
+
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
return '';
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
exports.default = renderCallsiteSync;
|
|
30
30
|
module.exports = exports.default;
|
|
31
31
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuZGVyLWNhbGxzaXRlLXN5bmMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvcmVuZGVyLWNhbGxzaXRlLXN5bmMuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxxREFBNEM7QUFHNUMsU0FBd0Isa0JBQWtCLENBQUUsUUFBUSxFQUFFLE9BQU87SUFDekQsSUFBSSxDQUFDLFFBQVE7UUFDVCxPQUFPLEVBQUUsQ0FBQztJQUVkLDhCQUE4QjtJQUM5QixJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVE7UUFDNUIsT0FBTyxRQUFRLENBQUM7SUFFcEIsSUFBSSxRQUFRLENBQUMsV0FBVyxFQUFFO1FBQ3RCLE1BQU0sUUFBUSxHQUFHLE9BQU8sSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDO1FBRTdDLElBQUksUUFBUSxLQUFLLDJCQUFTLENBQUMsSUFBSTtZQUMzQixPQUFPLFFBQVEsQ0FBQyxJQUFJLENBQUM7UUFFekIsSUFBSSxRQUFRLEtBQUssMkJBQVMsQ0FBQyxPQUFPO1lBQzlCLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQztRQUU1QixPQUFPLFFBQVEsQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDO0tBQ2pDO0lBRUQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVO1FBQ3BCLE9BQU8sRUFBRSxDQUFDO0lBRWQsSUFBSTtRQUNBLGtIQUFrSDtRQUNsSCw4RUFBOEU7UUFDOUUsT0FBTyxRQUFRLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0tBQ3ZDO0lBQ0QsT0FBTyxHQUFHLEVBQUU7UUFDUixPQUFPLEVBQUUsQ0FBQztLQUNiO0FBQ0wsQ0FBQztBQS9CRCxxQ0ErQkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyByZW5kZXJlcnMgfSBmcm9tICdjYWxsc2l0ZS1yZWNvcmQnO1xuXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHJlbmRlckNhbGxzaXRlU3luYyAoY2FsbHNpdGUsIG9wdGlvbnMpIHtcbiAgICBpZiAoIWNhbGxzaXRlKVxuICAgICAgICByZXR1cm4gJyc7XG5cbiAgICAvLyBOT1RFOiBmb3IgcmF3IEFQSSBjYWxsc2l0ZXNcbiAgICBpZiAodHlwZW9mIGNhbGxzaXRlID09PSAnc3RyaW5nJylcbiAgICAgICAgcmV0dXJuIGNhbGxzaXRlO1xuXG4gICAgaWYgKGNhbGxzaXRlLnByZXJlbmRlcmVkKSB7XG4gICAgICAgIGNvbnN0IHJlbmRlcmVyID0gb3B0aW9ucyAmJiBvcHRpb25zLnJlbmRlcmVyO1xuXG4gICAgICAgIGlmIChyZW5kZXJlciA9PT0gcmVuZGVyZXJzLmh0bWwpXG4gICAgICAgICAgICByZXR1cm4gY2FsbHNpdGUuaHRtbDtcblxuICAgICAgICBpZiAocmVuZGVyZXIgPT09IHJlbmRlcmVycy5ub0NvbG9yKVxuICAgICAgICAgICAgcmV0dXJuIGNhbGxzaXRlLm5vQ29sb3I7XG5cbiAgICAgICAgcmV0dXJuIGNhbGxzaXRlLmRlZmF1bHQgfHwgJyc7XG4gICAgfVxuXG4gICAgaWYgKCFjYWxsc2l0ZS5yZW5kZXJTeW5jKVxuICAgICAgICByZXR1cm4gJyc7XG5cbiAgICB0cnkge1xuICAgICAgICAvLyBOT1RFOiBDYWxsc2l0ZSB3aWxsIHRocm93IGR1cmluZyByZW5kZXJpbmcgaWYgaXQgY2FuJ3QgZmluZCBhIHRhcmdldCBmaWxlIGZvciB0aGUgc3BlY2lmaWVkIGZ1bmN0aW9uIG9yIG1ldGhvZDpcbiAgICAgICAgLy8gaHR0cHM6Ly9naXRodWIuY29tL2luaWt1bGluL2NhbGxzaXRlLXJlY29yZC9pc3N1ZXMvMiNpc3N1ZWNvbW1lbnQtMjIzMjYzOTQxXG4gICAgICAgIHJldHVybiBjYWxsc2l0ZS5yZW5kZXJTeW5jKG9wdGlvbnMpO1xuICAgIH1cbiAgICBjYXRjaCAoZXJyKSB7XG4gICAgICAgIHJldHVybiAnJztcbiAgICB9XG59XG4iXX0=
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
function renderTemplate(template, ...args) {
|
|
4
|
-
if (!args.length)
|
|
5
|
-
return template;
|
|
6
|
-
let counter = 0;
|
|
7
|
-
return template.replace(/{.+?}/g, match => counter < args.length ? args[counter++] : match);
|
|
8
|
-
}
|
|
9
|
-
exports.default = renderTemplate;
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
function renderTemplate(template, ...args) {
|
|
4
|
+
if (!args.length)
|
|
5
|
+
return template;
|
|
6
|
+
let counter = 0;
|
|
7
|
+
return template.replace(/{.+?}/g, match => counter < args.length ? args[counter++] : match);
|
|
8
|
+
}
|
|
9
|
+
exports.default = renderTemplate;
|
|
10
10
|
module.exports = exports.default;
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuZGVyLXRlbXBsYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3JlbmRlci10ZW1wbGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLFNBQXdCLGNBQWMsQ0FBRSxRQUFnQixFQUFFLEdBQUcsSUFBVztJQUNwRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU07UUFDWixPQUFPLFFBQVEsQ0FBQztJQUVwQixJQUFJLE9BQU8sR0FBRyxDQUFDLENBQUM7SUFFaEIsT0FBTyxRQUFRLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDaEcsQ0FBQztBQVBELGlDQU9DIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVuZGVyVGVtcGxhdGUgKHRlbXBsYXRlOiBzdHJpbmcsIC4uLmFyZ3M6IGFueVtdKTogc3RyaW5nIHtcbiAgICBpZiAoIWFyZ3MubGVuZ3RoKVxuICAgICAgICByZXR1cm4gdGVtcGxhdGU7XG5cbiAgICBsZXQgY291bnRlciA9IDA7XG5cbiAgICByZXR1cm4gdGVtcGxhdGUucmVwbGFjZSgvey4rP30vZywgbWF0Y2ggPT4gY291bnRlciA8IGFyZ3MubGVuZ3RoID8gYXJnc1tjb3VudGVyKytdIDogbWF0Y2gpO1xufVxuIl19
|