@tstdl/base 0.84.7 → 0.84.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/browser/browser.service.js +3 -2
- package/browser/index.d.ts +1 -0
- package/browser/index.js +1 -0
- package/browser/module.d.ts +18 -0
- package/browser/module.js +49 -0
- package/browser/utils.d.ts +1 -12
- package/browser/utils.js +1 -32
- package/package.json +1 -1
|
@@ -28,6 +28,7 @@ var import_core = require("../core.js");
|
|
|
28
28
|
var import_disposable = require("../disposable/disposable.js");
|
|
29
29
|
var import_browser_context_controller = require("./browser-context-controller.js");
|
|
30
30
|
var import_browser_controller = require("./browser-controller.js");
|
|
31
|
+
var import_module = require("./module.js");
|
|
31
32
|
var import_utils = require("./utils.js");
|
|
32
33
|
var __decorate = function(decorators, target, key, desc) {
|
|
33
34
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
@@ -69,7 +70,7 @@ let BrowserService = class BrowserService2 {
|
|
|
69
70
|
async newBrowser(options = {}) {
|
|
70
71
|
const mergedOptions = { ...this.options?.defaultNewBrowserOptions, ...options };
|
|
71
72
|
const launchOptions = (0, import_utils.getLaunchOptions)(mergedOptions);
|
|
72
|
-
const browser = await (0,
|
|
73
|
+
const browser = await (0, import_module.getBrowserType)(mergedOptions.browser).launch(launchOptions);
|
|
73
74
|
this.browsers.add(browser);
|
|
74
75
|
browser.once("disconnected", () => this.browsers.delete(browser));
|
|
75
76
|
return new import_browser_controller.BrowserController(browser, { defaultNewContextOptions: mergedOptions.defaultNewContextOptions });
|
|
@@ -78,7 +79,7 @@ let BrowserService = class BrowserService2 {
|
|
|
78
79
|
const mergedBrowserOptions = { ...this.options?.defaultNewBrowserOptions, ...browserOptions };
|
|
79
80
|
const mergedContextOptions = (0, import_utils.mergeNewBrowserContextOptions)(this.options?.defaultNewBrowserOptions?.defaultNewContextOptions, browserOptions.defaultNewContextOptions, contextOptions);
|
|
80
81
|
const launchOptions = (0, import_utils.getLaunchOptions)(mergedBrowserOptions);
|
|
81
|
-
const context = await (0,
|
|
82
|
+
const context = await (0, import_module.getBrowserType)(mergedBrowserOptions.browser).launchPersistentContext(dataDirectory, {
|
|
82
83
|
...launchOptions,
|
|
83
84
|
locale: mergedContextOptions.locale,
|
|
84
85
|
viewport: mergedContextOptions.viewport,
|
package/browser/index.d.ts
CHANGED
package/browser/index.js
CHANGED
|
@@ -22,5 +22,6 @@ __reExport(browser_exports, require("./document-controller.js"), module.exports)
|
|
|
22
22
|
__reExport(browser_exports, require("./element-controller.js"), module.exports);
|
|
23
23
|
__reExport(browser_exports, require("./frame-controller.js"), module.exports);
|
|
24
24
|
__reExport(browser_exports, require("./locator-controller.js"), module.exports);
|
|
25
|
+
__reExport(browser_exports, require("./module.js"), module.exports);
|
|
25
26
|
__reExport(browser_exports, require("./page-controller.js"), module.exports);
|
|
26
27
|
__reExport(browser_exports, require("./types.js"), module.exports);
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { BrowserType } from 'playwright';
|
|
2
|
+
import { BrowserServiceOptions } from './browser.service.js';
|
|
3
|
+
export type BrowserModuleOptions = {
|
|
4
|
+
browsers: {
|
|
5
|
+
chromium?: BrowserType;
|
|
6
|
+
firefox?: BrowserType;
|
|
7
|
+
webkit?: BrowserType;
|
|
8
|
+
};
|
|
9
|
+
options?: BrowserServiceOptions;
|
|
10
|
+
};
|
|
11
|
+
declare const browserTypes: {
|
|
12
|
+
chromium: BrowserType<{}>;
|
|
13
|
+
firefox: BrowserType<{}>;
|
|
14
|
+
webkit: BrowserType<{}>;
|
|
15
|
+
};
|
|
16
|
+
export declare function configureBrowser(options: BrowserModuleOptions): void;
|
|
17
|
+
export declare function getBrowserType(type: keyof typeof browserTypes | undefined): BrowserType;
|
|
18
|
+
export {};
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var module_exports = {};
|
|
20
|
+
__export(module_exports, {
|
|
21
|
+
configureBrowser: () => configureBrowser,
|
|
22
|
+
getBrowserType: () => getBrowserType
|
|
23
|
+
});
|
|
24
|
+
module.exports = __toCommonJS(module_exports);
|
|
25
|
+
var import_playwright = require("playwright");
|
|
26
|
+
var import_container = require("../container/container.js");
|
|
27
|
+
var import_not_supported_error = require("../error/not-supported.error.js");
|
|
28
|
+
var import_object = require("../utils/object/object.js");
|
|
29
|
+
var import_type_guards = require("../utils/type-guards.js");
|
|
30
|
+
var import_browser_service = require("./browser.service.js");
|
|
31
|
+
const browserTypes = {
|
|
32
|
+
chromium: import_playwright.chromium,
|
|
33
|
+
firefox: import_playwright.firefox,
|
|
34
|
+
webkit: import_playwright.webkit
|
|
35
|
+
};
|
|
36
|
+
function configureBrowser(options) {
|
|
37
|
+
const filtered = (0, import_object.filterUndefinedObjectProperties)(options.browsers);
|
|
38
|
+
(0, import_object.copyObjectProperties)(filtered, browserTypes);
|
|
39
|
+
if ((0, import_type_guards.isDefined)(options.options)) {
|
|
40
|
+
import_container.container.register(import_browser_service.BrowserServiceOptions, { useValue: options.options });
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
function getBrowserType(type) {
|
|
44
|
+
const browserType = browserTypes[type ?? "chromium"];
|
|
45
|
+
if ((0, import_type_guards.isUndefined)(browserType)) {
|
|
46
|
+
throw new import_not_supported_error.NotSupportedError(`Browser type ${type} is not supported.`);
|
|
47
|
+
}
|
|
48
|
+
return browserType;
|
|
49
|
+
}
|
package/browser/utils.d.ts
CHANGED
|
@@ -1,16 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { BrowserType, ElementHandle, LaunchOptions, Locator } from 'playwright';
|
|
1
|
+
import type { LaunchOptions } from 'playwright';
|
|
3
2
|
import type { NewBrowserContextOptions } from './browser-controller.js';
|
|
4
3
|
import type { NewBrowserOptions } from './browser.service.js';
|
|
5
|
-
declare const browserTypes: {
|
|
6
|
-
chromium: BrowserType<{}>;
|
|
7
|
-
firefox: BrowserType<{}>;
|
|
8
|
-
webkit: BrowserType<{}>;
|
|
9
|
-
};
|
|
10
|
-
export declare function replaceBrowsers(browsers: SimplifyObject<Unoptionalize<Partial<typeof browserTypes>>>): void;
|
|
11
4
|
export declare function getLaunchOptions(options: NewBrowserOptions): LaunchOptions;
|
|
12
5
|
export declare function mergeNewBrowserContextOptions(a: NewBrowserContextOptions | undefined, b?: NewBrowserContextOptions, c?: NewBrowserContextOptions): NewBrowserContextOptions;
|
|
13
|
-
export declare function getBrowserType(type: keyof typeof browserTypes | undefined): BrowserType;
|
|
14
|
-
export declare function isLocator(value: Locator | ElementHandle): value is Locator;
|
|
15
|
-
export declare function isElementHandle(value: Locator | ElementHandle): value is ElementHandle;
|
|
16
|
-
export {};
|
package/browser/utils.js
CHANGED
|
@@ -18,27 +18,11 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var utils_exports = {};
|
|
20
20
|
__export(utils_exports, {
|
|
21
|
-
getBrowserType: () => getBrowserType,
|
|
22
21
|
getLaunchOptions: () => getLaunchOptions,
|
|
23
|
-
|
|
24
|
-
isLocator: () => isLocator,
|
|
25
|
-
mergeNewBrowserContextOptions: () => mergeNewBrowserContextOptions,
|
|
26
|
-
replaceBrowsers: () => replaceBrowsers
|
|
22
|
+
mergeNewBrowserContextOptions: () => mergeNewBrowserContextOptions
|
|
27
23
|
});
|
|
28
24
|
module.exports = __toCommonJS(utils_exports);
|
|
29
|
-
var import_not_supported_error = require("../error/not-supported.error.js");
|
|
30
25
|
var import_object = require("../utils/object/object.js");
|
|
31
|
-
var import_type_guards = require("../utils/type-guards.js");
|
|
32
|
-
var import_playwright = require("playwright");
|
|
33
|
-
const browserTypes = {
|
|
34
|
-
chromium: import_playwright.chromium,
|
|
35
|
-
firefox: import_playwright.firefox,
|
|
36
|
-
webkit: import_playwright.webkit
|
|
37
|
-
};
|
|
38
|
-
function replaceBrowsers(browsers) {
|
|
39
|
-
const filtered = (0, import_object.filterUndefinedObjectProperties)(browsers);
|
|
40
|
-
(0, import_object.copyObjectProperties)(filtered, browserTypes);
|
|
41
|
-
}
|
|
42
26
|
function getLaunchOptions(options) {
|
|
43
27
|
const { windowSize, browserArguments, headless } = options;
|
|
44
28
|
const args = [`--window-size=${windowSize?.width ?? 1e3},${windowSize?.height ?? 1e3}`, ...browserArguments ?? []];
|
|
@@ -53,18 +37,3 @@ function mergeNewBrowserContextOptions(a, b, c) {
|
|
|
53
37
|
extraHttpHeaders: (0, import_object.objectKeys)(mergedExtraHttpHeaders).length > 0 ? mergedExtraHttpHeaders : void 0
|
|
54
38
|
};
|
|
55
39
|
}
|
|
56
|
-
function getBrowserType(type) {
|
|
57
|
-
const browserType = browserTypes[type ?? "chromium"];
|
|
58
|
-
if ((0, import_type_guards.isUndefined)(browserType)) {
|
|
59
|
-
throw new import_not_supported_error.NotSupportedError(`Browser type ${type} is not supported.`);
|
|
60
|
-
}
|
|
61
|
-
return browserType;
|
|
62
|
-
}
|
|
63
|
-
const exclusiveLocatorKey = "locator";
|
|
64
|
-
function isLocator(value) {
|
|
65
|
-
return (0, import_type_guards.isFunction)(value[exclusiveLocatorKey]);
|
|
66
|
-
}
|
|
67
|
-
const exclusiveElementHandleKey = "$";
|
|
68
|
-
function isElementHandle(value) {
|
|
69
|
-
return (0, import_type_guards.isFunction)(value[exclusiveElementHandleKey]);
|
|
70
|
-
}
|