@tstdl/base 0.84.7 → 0.84.9

package/browser/browser-context-controller.d.ts

@@ -26,7 +26,7 @@ export declare class BrowserContextController implements AsyncDisposable, Inject
     [disposeAsync](): Promise<void>;
     close(): Promise<void>;
     getState(): Promise<BrowserContextState>;
-    setExtraHttpHeaders(headers: Record<string, string>): Promise<void>;
+    setExtraHttpHeaders(headers: Record<string, string | undefined>): Promise<void>;
     newPage(options?: NewPageOptions): Promise<PageController>;
     waitForClose(): Promise<void>;
 }

package/browser/browser-context-controller.js

@@ -24,6 +24,7 @@ module.exports = __toCommonJS(browser_context_controller_exports);
 var import_decorators = require("../container/decorators.js");
 var import_interfaces = require("../container/interfaces.js");
 var import_disposable = require("../disposable/disposable.js");
+var import_object = require("../utils/object/object.js");
 var import_type_guards = require("../utils/type-guards.js");
 var import_browser_controller = require("./browser-controller.js");
 var import_page_controller = require("./page-controller.js");
@@ -60,7 +61,8 @@ let BrowserContextController = class BrowserContextController2 {
     return state;
   }
   async setExtraHttpHeaders(headers) {
-    await this.context.setExtraHTTPHeaders(headers);
+    const filtered = (0, import_object.filterUndefinedFromRecord)(headers);
+    await this.context.setExtraHTTPHeaders(filtered);
   }
   async newPage(options) {
     const page = await this.context.newPage();

package/browser/browser-controller.d.ts

@@ -3,6 +3,7 @@ import type { Injectable } from '../container/interfaces.js';
 import { resolveArgumentType } from '../container/interfaces.js';
 import type { AsyncDisposable } from '../disposable/disposable.js';
 import { disposeAsync } from '../disposable/disposable.js';
+import type { Record } from '../types.js';
 import type { BrowserContextState, NewPageOptions } from './browser-context-controller.js';
 import { BrowserContextController } from './browser-context-controller.js';
 import type { NewBrowserOptions } from './browser.service.js';
@@ -11,8 +12,10 @@ export type BrowserControllerOptions = {
 };
 export type NewBrowserContextOptions = {
     state?: BrowserContextState;
+    userAgent?: string;
+    colorScheme?: 'light' | 'dark' | 'no-preference';
     locale?: string;
-    extraHttpHeaders?: Record<string, string>;
+    extraHttpHeaders?: Record<string, string | undefined>;
     defaultNewPageOptions?: NewPageOptions;
     viewport?: {
         width: number;

package/browser/browser-controller.js

@@ -24,6 +24,8 @@ module.exports = __toCommonJS(browser_controller_exports);
 var import_decorators = require("../container/decorators.js");
 var import_interfaces = require("../container/interfaces.js");
 var import_disposable = require("../disposable/disposable.js");
+var import_object = require("../utils/object/object.js");
+var import_type_guards = require("../utils/type-guards.js");
 var import_browser_context_controller = require("./browser-context-controller.js");
 var import_browser_service = require("./browser.service.js");
 var import_utils = require("./utils.js");
@@ -56,10 +58,12 @@ let BrowserController = class BrowserController2 {
     const mergedOptions = (0, import_utils.mergeNewBrowserContextOptions)(this.options?.defaultNewContextOptions, options);
     const context = await this.browser.newContext({
       storageState: mergedOptions.state,
+      userAgent: mergedOptions.userAgent,
+      colorScheme: mergedOptions.colorScheme,
       locale: mergedOptions.locale,
       viewport: mergedOptions.viewport,
       proxy: mergedOptions.proxy,
-      extraHTTPHeaders: mergedOptions.extraHttpHeaders
+      extraHTTPHeaders: (0, import_type_guards.isDefined)(mergedOptions.extraHttpHeaders) ? (0, import_object.filterUndefinedFromRecord)(mergedOptions.extraHttpHeaders) : void 0
     });
     return new import_browser_context_controller.BrowserContextController(context, mergedOptions);
   }

package/browser/browser.service.js

@@ -26,8 +26,11 @@ var import_decorators = require("../container/decorators.js");
 var import_interfaces = require("../container/interfaces.js");
 var import_core = require("../core.js");
 var import_disposable = require("../disposable/disposable.js");
+var import_object = require("../utils/object/object.js");
+var import_type_guards = require("../utils/type-guards.js");
 var import_browser_context_controller = require("./browser-context-controller.js");
 var import_browser_controller = require("./browser-controller.js");
+var import_module = require("./module.js");
 var import_utils = require("./utils.js");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -69,7 +72,7 @@ let BrowserService = class BrowserService2 {
   async newBrowser(options = {}) {
     const mergedOptions = { ...this.options?.defaultNewBrowserOptions, ...options };
     const launchOptions = (0, import_utils.getLaunchOptions)(mergedOptions);
-    const browser = await (0, import_utils.getBrowserType)(mergedOptions.browser).launch(launchOptions);
+    const browser = await (0, import_module.getBrowserType)(mergedOptions.browser).launch(launchOptions);
     this.browsers.add(browser);
     browser.once("disconnected", () => this.browsers.delete(browser));
     return new import_browser_controller.BrowserController(browser, { defaultNewContextOptions: mergedOptions.defaultNewContextOptions });
@@ -78,12 +81,14 @@ let BrowserService = class BrowserService2 {
     const mergedBrowserOptions = { ...this.options?.defaultNewBrowserOptions, ...browserOptions };
     const mergedContextOptions = (0, import_utils.mergeNewBrowserContextOptions)(this.options?.defaultNewBrowserOptions?.defaultNewContextOptions, browserOptions.defaultNewContextOptions, contextOptions);
     const launchOptions = (0, import_utils.getLaunchOptions)(mergedBrowserOptions);
-    const context = await (0, import_utils.getBrowserType)(mergedBrowserOptions.browser).launchPersistentContext(dataDirectory, {
+    const context = await (0, import_module.getBrowserType)(mergedBrowserOptions.browser).launchPersistentContext(dataDirectory, {
       ...launchOptions,
       locale: mergedContextOptions.locale,
       viewport: mergedContextOptions.viewport,
       proxy: mergedContextOptions.proxy,
-      extraHTTPHeaders: mergedContextOptions.extraHttpHeaders
+      userAgent: mergedContextOptions.userAgent,
+      colorScheme: mergedContextOptions.colorScheme,
+      extraHTTPHeaders: (0, import_type_guards.isDefined)(mergedContextOptions.extraHttpHeaders) ? (0, import_object.filterUndefinedFromRecord)(mergedContextOptions.extraHttpHeaders) : void 0
     });
     this.persistentBrowserContexts.add(context);
     context.once("close", () => this.persistentBrowserContexts.delete(context));

package/browser/index.d.ts

@@ -5,5 +5,6 @@ export * from './document-controller.js';
 export * from './element-controller.js';
 export * from './frame-controller.js';
 export * from './locator-controller.js';
+export * from './module.js';
 export * from './page-controller.js';
 export * from './types.js';

package/browser/index.js

@@ -22,5 +22,6 @@ __reExport(browser_exports, require("./document-controller.js"), module.exports)
 __reExport(browser_exports, require("./element-controller.js"), module.exports);
 __reExport(browser_exports, require("./frame-controller.js"), module.exports);
 __reExport(browser_exports, require("./locator-controller.js"), module.exports);
+__reExport(browser_exports, require("./module.js"), module.exports);
 __reExport(browser_exports, require("./page-controller.js"), module.exports);
 __reExport(browser_exports, require("./types.js"), module.exports);

package/browser/module.d.ts

@@ -0,0 +1,18 @@
+import type { BrowserType } from 'playwright';
+import { BrowserServiceOptions } from './browser.service.js';
+export type BrowserModuleOptions = {
+    browsers?: {
+        chromium?: BrowserType;
+        firefox?: BrowserType;
+        webkit?: BrowserType;
+    };
+    options?: BrowserServiceOptions;
+};
+declare const browserTypes: {
+    chromium: BrowserType<{}>;
+    firefox: BrowserType<{}>;
+    webkit: BrowserType<{}>;
+};
+export declare function configureBrowser(options: BrowserModuleOptions): void;
+export declare function getBrowserType(type: keyof typeof browserTypes | undefined): BrowserType;
+export {};

package/browser/module.js

@@ -0,0 +1,51 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var module_exports = {};
+__export(module_exports, {
+  configureBrowser: () => configureBrowser,
+  getBrowserType: () => getBrowserType
+});
+module.exports = __toCommonJS(module_exports);
+var import_playwright = require("playwright");
+var import_container = require("../container/container.js");
+var import_not_supported_error = require("../error/not-supported.error.js");
+var import_object = require("../utils/object/object.js");
+var import_type_guards = require("../utils/type-guards.js");
+var import_browser_service = require("./browser.service.js");
+const browserTypes = {
+  chromium: import_playwright.chromium,
+  firefox: import_playwright.firefox,
+  webkit: import_playwright.webkit
+};
+function configureBrowser(options) {
+  if ((0, import_type_guards.isDefined)(options.browsers)) {
+    const filtered = (0, import_object.filterUndefinedObjectProperties)(options.browsers);
+    (0, import_object.copyObjectProperties)(filtered, browserTypes);
+  }
+  if ((0, import_type_guards.isDefined)(options.options)) {
+    import_container.container.register(import_browser_service.BrowserServiceOptions, { useValue: options.options });
+  }
+}
+function getBrowserType(type) {
+  const browserType = browserTypes[type ?? "chromium"];
+  if ((0, import_type_guards.isUndefined)(browserType)) {
+    throw new import_not_supported_error.NotSupportedError(`Browser type ${type} is not supported.`);
+  }
+  return browserType;
+}

package/browser/page-controller.js

@@ -22,6 +22,7 @@ __export(page_controller_exports, {
 });
 module.exports = __toCommonJS(page_controller_exports);
 var import_disposable = require("../disposable/disposable.js");
+var import_object = require("../utils/object/object.js");
 var import_readable_stream_from_promise = require("../utils/stream/readable-stream-from-promise.js");
 var import_timing = require("../utils/timing.js");
 var import_type_guards = require("../utils/type-guards.js");
@@ -44,7 +45,8 @@ class PageController extends import_document_controller.DocumentController {
     await this.page.close();
   }
   async setExtraHttpHeaders(headers) {
-    await this.page.setExtraHTTPHeaders(headers);
+    const filtered = (0, import_object.filterUndefinedFromRecord)(headers);
+    await this.page.setExtraHTTPHeaders(filtered);
   }
   async waitForClose() {
     return new Promise((resolve) => {

package/browser/utils.d.ts

@@ -1,16 +1,5 @@
-import type { SimplifyObject, Unoptionalize } from '../types.js';
-import type { BrowserType, ElementHandle, LaunchOptions, Locator } from 'playwright';
+import type { LaunchOptions } from 'playwright';
 import type { NewBrowserContextOptions } from './browser-controller.js';
 import type { NewBrowserOptions } from './browser.service.js';
-declare const browserTypes: {
-    chromium: BrowserType<{}>;
-    firefox: BrowserType<{}>;
-    webkit: BrowserType<{}>;
-};
-export declare function replaceBrowsers(browsers: SimplifyObject<Unoptionalize<Partial<typeof browserTypes>>>): void;
 export declare function getLaunchOptions(options: NewBrowserOptions): LaunchOptions;
 export declare function mergeNewBrowserContextOptions(a: NewBrowserContextOptions | undefined, b?: NewBrowserContextOptions, c?: NewBrowserContextOptions): NewBrowserContextOptions;
-export declare function getBrowserType(type: keyof typeof browserTypes | undefined): BrowserType;
-export declare function isLocator(value: Locator | ElementHandle): value is Locator;
-export declare function isElementHandle(value: Locator | ElementHandle): value is ElementHandle;
-export {};

package/browser/utils.js

@@ -18,27 +18,11 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  getBrowserType: () => getBrowserType,
   getLaunchOptions: () => getLaunchOptions,
-  isElementHandle: () => isElementHandle,
-  isLocator: () => isLocator,
-  mergeNewBrowserContextOptions: () => mergeNewBrowserContextOptions,
-  replaceBrowsers: () => replaceBrowsers
+  mergeNewBrowserContextOptions: () => mergeNewBrowserContextOptions
 });
 module.exports = __toCommonJS(utils_exports);
-var import_not_supported_error = require("../error/not-supported.error.js");
 var import_object = require("../utils/object/object.js");
-var import_type_guards = require("../utils/type-guards.js");
-var import_playwright = require("playwright");
-const browserTypes = {
-  chromium: import_playwright.chromium,
-  firefox: import_playwright.firefox,
-  webkit: import_playwright.webkit
-};
-function replaceBrowsers(browsers) {
-  const filtered = (0, import_object.filterUndefinedObjectProperties)(browsers);
-  (0, import_object.copyObjectProperties)(filtered, browserTypes);
-}
 function getLaunchOptions(options) {
   const { windowSize, browserArguments, headless } = options;
   const args = [`--window-size=${windowSize?.width ?? 1e3},${windowSize?.height ?? 1e3}`, ...browserArguments ?? []];
@@ -53,18 +37,3 @@ function mergeNewBrowserContextOptions(a, b, c) {
     extraHttpHeaders: (0, import_object.objectKeys)(mergedExtraHttpHeaders).length > 0 ? mergedExtraHttpHeaders : void 0
   };
 }
-function getBrowserType(type) {
-  const browserType = browserTypes[type ?? "chromium"];
-  if ((0, import_type_guards.isUndefined)(browserType)) {
-    throw new import_not_supported_error.NotSupportedError(`Browser type ${type} is not supported.`);
-  }
-  return browserType;
-}
-const exclusiveLocatorKey = "locator";
-function isLocator(value) {
-  return (0, import_type_guards.isFunction)(value[exclusiveLocatorKey]);
-}
-const exclusiveElementHandleKey = "$";
-function isElementHandle(value) {
-  return (0, import_type_guards.isFunction)(value[exclusiveElementHandleKey]);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.84.7",
+  "version": "0.84.9",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/utils/object/object.d.ts

@@ -19,6 +19,7 @@ export declare function mapObjectValuesAsync<T extends ObjectLiteral, V>(object:
 export declare function filterObject<T extends ObjectLiteral, U extends T[keyof T]>(object: T, predicate: (value: T[keyof T], key: keyof T) => value is U): PickBy<T, U>;
 export declare function filterObject<T extends ObjectLiteral>(object: T, predicate: (value: T[keyof T], key: keyof T) => boolean): Partial<T>;
 export declare function filterObjectAsync<T extends ObjectLiteral>(object: T, predicate: (value: T[keyof T], key: keyof T) => Promise<boolean>): Promise<Partial<T>>;
+export declare function filterUndefinedFromRecord<T extends Record>(record: T): T extends Record<infer K, infer V> ? Record<K, Exclude<V, undefined>> : never;
 export declare function filterUndefinedObjectProperties<T extends ObjectLiteral>(object: T): {
     [P in keyof T]?: IsEqual<T[P], undefined> extends true ? never : Exclude<T[P], undefined>;
 };

package/utils/object/object.js

@@ -22,6 +22,7 @@ __export(object_exports, {
   deepObjectEntries: () => deepObjectEntries,
   filterObject: () => filterObject,
   filterObjectAsync: () => filterObjectAsync,
+  filterUndefinedFromRecord: () => filterUndefinedFromRecord,
   filterUndefinedObjectProperties: () => filterUndefinedObjectProperties,
   fromEntries: () => fromEntries,
   getGetter: () => getGetter,
@@ -79,6 +80,9 @@ async function filterObjectAsync(object, predicate) {
   const mappedEntries = await (0, import_to_array.toArrayAsync)((0, import_filter.filterAsync)(entries, async ([key, value]) => predicate(value, key)));
   return Object.fromEntries(mappedEntries);
 }
+function filterUndefinedFromRecord(record) {
+  return filterObject(record, import_type_guards.isDefined);
+}
 function filterUndefinedObjectProperties(object) {
   return filterObject(object, import_type_guards.isDefined);
 }