@tstdl/base 0.87.13 → 0.88.0-alpha1

package/browser/browser-context-controller.js

@@ -1,143 +1,116 @@
-"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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var browser_context_controller_exports = {};
-__export(browser_context_controller_exports, {
-  BrowserContextController: () => BrowserContextController
-});
-module.exports = __toCommonJS(browser_context_controller_exports);
-var import_disposable = require("../disposable/disposable.js");
-var import_decorators = require("../injector/decorators.js");
-var import_interfaces = require("../injector/interfaces.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");
-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;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = function(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
-    return Reflect.metadata(k, v);
-};
-let BrowserContextController = class BrowserContextController2 {
-  #pageControllers = /* @__PURE__ */ new WeakMap();
-  /** @deprecated should be avoided */
-  context;
-  options;
-  constructor(context, options = {}) {
-    this.context = context;
-    this.options = options;
-  }
-  [import_interfaces.afterResolve]() {
-    this.initialize();
-  }
-  initialize() {
-    this.context.on("page", (page) => {
-      page.once("close", () => this.#pageControllers.delete(page));
-    });
-  }
-  async [import_disposable.disposeAsync]() {
-    await this.close();
-  }
-  pages() {
-    const pages = this.context.pages();
-    return pages.map((page) => this.getControllerByPage(page));
-  }
-  /**
-   * Get a controller for the page.
-   * @param page page to get controller for
-   * @param options options to use for the page controller *if* it is new. Ignored if there is already a controller associated.
-   */
-  getControllerByPage(page, options) {
-    if (page.context() != this.context) {
-      throw new Error("Page is not from this context.");
+import { disposeAsync } from '../disposable/disposable.js';
+import { Injectable } from '../injector/decorators.js';
+import { afterResolve, resolveArgumentType } from '../injector/interfaces.js';
+import { filterUndefinedFromRecord } from '../utils/object/object.js';
+import { isDefined } from '../utils/type-guards.js';
+import { BrowserController } from './browser-controller.js';
+import { PageController } from './page-controller.js';
+import { attachLogger } from './utils.js';
+let BrowserContextController = class BrowserContextController {
+    #pageControllers = new WeakMap();
+    /** @deprecated should be avoided */
+    context;
+    options;
+    constructor(context, options = {}) {
+        this.context = context;
+        this.options = options;
+    }
+    [afterResolve]() {
+        this.initialize();
+    }
+    initialize() {
+        this.context.on('page', (page) => {
+            page.once('close', () => this.#pageControllers.delete(page));
+        });
+    }
+    async [disposeAsync]() {
+        await this.close();
+    }
+    pages() {
+        const pages = this.context.pages();
+        return pages.map((page) => this.getControllerByPage(page));
+    }
+    /**
+     * Get a controller for the page.
+     * @param page page to get controller for
+     * @param options options to use for the page controller *if* it is new. Ignored if there is already a controller associated.
+     */
+    getControllerByPage(page, options) {
+        if (page.context() != this.context) {
+            throw new Error('Page is not from this context.');
+        }
+        const existingController = this.#pageControllers.get(page);
+        if (isDefined(existingController)) {
+            return existingController;
+        }
+        const newController = new PageController(page, this, { ...this.options.defaultNewPageOptions?.controllerOptions, ...options });
+        this.#pageControllers.set(page, newController);
+        return newController;
+    }
+    async close() {
+        await this.context.close();
     }
-    const existingController = this.#pageControllers.get(page);
-    if ((0, import_type_guards.isDefined)(existingController)) {
-      return existingController;
+    async getState() {
+        const state = await this.context.storageState();
+        return state;
     }
-    const newController = new import_page_controller.PageController(page, this, { ...this.options.defaultNewPageOptions?.controllerOptions, ...options });
-    this.#pageControllers.set(page, newController);
-    return newController;
-  }
-  async close() {
-    await this.context.close();
-  }
-  async getState() {
-    const state = await this.context.storageState();
-    return state;
-  }
-  async setExtraHttpHeaders(headers) {
-    const filtered = (0, import_object.filterUndefinedFromRecord)(headers);
-    await this.context.setExtraHTTPHeaders(filtered);
-  }
-  async newPage(options) {
-    const page = await this.context.newPage();
-    const mergedOptions = { ...this.options.defaultNewPageOptions, ...options };
-    const controller = new import_page_controller.PageController(page, this, mergedOptions.controllerOptions);
-    this.#pageControllers.set(page, controller);
-    if ((0, import_type_guards.isDefined)(mergedOptions.extraHttpHeaders)) {
-      await controller.setExtraHttpHeaders(mergedOptions.extraHttpHeaders);
+    async setExtraHttpHeaders(headers) {
+        const filtered = filterUndefinedFromRecord(headers);
+        await this.context.setExtraHTTPHeaders(filtered);
+    }
+    async newPage(options) {
+        const page = await this.context.newPage();
+        const mergedOptions = { ...this.options.defaultNewPageOptions, ...options };
+        const controller = new PageController(page, this, mergedOptions.controllerOptions);
+        this.#pageControllers.set(page, controller);
+        if (isDefined(mergedOptions.extraHttpHeaders)) {
+            await controller.setExtraHttpHeaders(mergedOptions.extraHttpHeaders);
+        }
+        return controller;
     }
-    return controller;
-  }
-  async waitForNoPages() {
-    while (true) {
-      const pages = this.context.pages();
-      if (pages.length == 0) {
-        break;
-      }
-      for (const page of pages) {
-        if (!page.isClosed()) {
-          await new Promise((resolve) => page.once("close", () => resolve()));
+    async waitForNoPages() {
+        while (true) {
+            const pages = this.context.pages();
+            if (pages.length == 0) {
+                break;
+            }
+            for (const page of pages) {
+                if (!page.isClosed()) {
+                    await new Promise((resolve) => page.once('close', () => resolve()));
+                }
+            }
         }
-      }
     }
-  }
-  async waitForClose() {
-    return new Promise((resolve) => this.context.once("close", () => resolve()));
-  }
-  attachLogger(logger) {
-    (0, import_utils.attachLogger)(this.context, logger);
-  }
+    async waitForClose() {
+        return new Promise((resolve) => this.context.once('close', () => resolve()));
+    }
+    attachLogger(logger) {
+        attachLogger(this.context, logger);
+    }
 };
 BrowserContextController = __decorate([
-  (0, import_decorators.Injectable)({
-    provider: {
-      useFactory: (_, context) => {
-        context.data.browserController = context.resolve(import_browser_controller.BrowserController);
-        return new BrowserContextController(null);
-      },
-      async afterResolve(value, argument, { data: { browserController } }) {
-        const { context: browserContext, controllerOptions } = await browserController.newRawContext(argument);
-        value.context = browserContext;
-        value.options = controllerOptions;
-      }
-    }
-  }),
-  __metadata("design:paramtypes", [Object, Object])
+    Injectable({
+        provider: {
+            useFactory: (_, context) => {
+                context.data.browserController = context.resolve(BrowserController);
+                return new BrowserContextController(null);
+            },
+            async afterResolve(value, argument, { data: { browserController } }) {
+                const { context: browserContext, controllerOptions } = await browserController.newRawContext(argument);
+                value.context = browserContext;
+                value.options = controllerOptions;
+            }
+        }
+    }),
+    __metadata("design:paramtypes", [Object, Object])
 ], BrowserContextController);
+export { BrowserContextController };

package/browser/browser-controller.js

@@ -1,120 +1,94 @@
-"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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var browser_controller_exports = {};
-__export(browser_controller_exports, {
-  BrowserController: () => BrowserController
-});
-module.exports = __toCommonJS(browser_controller_exports);
-var import_disposable = require("../disposable/disposable.js");
-var import_decorators = require("../injector/decorators.js");
-var import_inject = require("../injector/inject.js");
-var import_interfaces = require("../injector/interfaces.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");
-var __decorate = function(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = function(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
-    return Reflect.metadata(k, v);
-};
-let BrowserController = class BrowserController2 {
-  /** @deprecated should be avoided */
-  browser;
-  options;
-  constructor(browser, options) {
-    this.browser = browser;
-    this.options = options;
-  }
-  async [import_disposable.disposeAsync]() {
-    await this.close();
-  }
-  /**
-   * @deprecated for internal use
-   */
-  async newRawContext(options) {
-    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: (0, import_type_guards.isDefined)(mergedOptions.extraHttpHeaders) ? (0, import_object.filterUndefinedFromRecord)(mergedOptions.extraHttpHeaders) : void 0
-    });
-    return { context, controllerOptions: mergedOptions };
-  }
-  async newContext(options) {
-    const { context, controllerOptions } = await this.newRawContext(options);
-    return new import_browser_context_controller.BrowserContextController(context, controllerOptions);
-  }
-  async close() {
-    if (this.browser.isConnected()) {
-      for (const context of this.browser.contexts()) {
-        await context.close();
-      }
-      await this.browser.close();
+import { disposeAsync } from '../disposable/disposable.js';
+import { Injectable } from '../injector/decorators.js';
+import { inject } from '../injector/inject.js';
+import { resolveArgumentType } from '../injector/interfaces.js';
+import { filterUndefinedFromRecord } from '../utils/object/object.js';
+import { isDefined } from '../utils/type-guards.js';
+import { BrowserContextController } from './browser-context-controller.js';
+import { BrowserService } from './browser.service.js';
+import { mergeNewBrowserContextOptions } from './utils.js';
+let BrowserController = class BrowserController {
+    /** @deprecated should be avoided */
+    browser;
+    options;
+    constructor(browser, options) {
+        this.browser = browser;
+        this.options = options;
+    }
+    async [disposeAsync]() {
+        await this.close();
+    }
+    /**
+     * @deprecated for internal use
+     */
+    async newRawContext(options) {
+        const mergedOptions = 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: isDefined(mergedOptions.extraHttpHeaders) ? filterUndefinedFromRecord(mergedOptions.extraHttpHeaders) : undefined
+        });
+        return { context, controllerOptions: mergedOptions };
     }
-  }
-  async waitForNoContexts() {
-    while (true) {
-      const contexts = this.browser.contexts();
-      if (contexts.length == 0) {
-        break;
-      }
-      await new Promise((resolve) => contexts[0].once("close", () => resolve()));
+    async newContext(options) {
+        const { context, controllerOptions } = await this.newRawContext(options);
+        return new BrowserContextController(context, controllerOptions);
+    }
+    async close() {
+        if (this.browser.isConnected()) {
+            for (const context of this.browser.contexts()) {
+                await context.close();
+            }
+            await this.browser.close();
+        }
+    }
+    async waitForNoContexts() {
+        while (true) {
+            const contexts = this.browser.contexts();
+            if (contexts.length == 0) {
+                break;
+            }
+            await new Promise((resolve) => contexts[0].once('close', () => resolve()));
+        }
+    }
+    async waitForClose() {
+        return new Promise((resolve) => {
+            if (!this.browser.isConnected()) {
+                resolve();
+            }
+            else {
+                this.browser.once('disconnected', () => resolve());
+            }
+        });
     }
-  }
-  async waitForClose() {
-    return new Promise((resolve) => {
-      if (!this.browser.isConnected()) {
-        resolve();
-      } else {
-        this.browser.once("disconnected", () => resolve());
-      }
-    });
-  }
 };
 BrowserController = __decorate([
-  (0, import_decorators.Injectable)({
-    provider: {
-      useFactory: (_argument, context) => {
-        context.data.browserService = (0, import_inject.inject)(import_browser_service.BrowserService);
-        return new BrowserController(null);
-      },
-      async afterResolve(value, argument, { data: { browserService } }) {
-        const { browser, controllerOptions } = await browserService.newRawBrowser(argument);
-        value.browser = browser;
-        value.options = controllerOptions;
-      }
-    }
-  }),
-  __metadata("design:paramtypes", [Object, Object])
+    Injectable({
+        provider: {
+            useFactory: (_argument, context) => {
+                context.data.browserService = inject(BrowserService);
+                return new BrowserController(null); // eslint-disable-line @typescript-eslint/no-unsafe-argument
+            },
+            async afterResolve(value, argument, { data: { browserService } }) {
+                const { browser, controllerOptions } = await browserService.newRawBrowser(argument);
+                value.browser = browser;
+                value.options = controllerOptions;
+            }
+        }
+    }),
+    __metadata("design:paramtypes", [Object, Object])
 ], BrowserController);
+export { BrowserController };