chrome-devtools-frontend 1.0.1020771 → 1.0.1022059

package/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/common/DOMWorld.js

@@ -14,79 +14,173 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _a, _DOMWorld_frameManager, _DOMWorld_client, _DOMWorld_frame, _DOMWorld_timeoutSettings, _DOMWorld_documentPromise, _DOMWorld_contextPromise, _DOMWorld_contextResolveCallback, _DOMWorld_detached, _DOMWorld_ctxBindings, _DOMWorld_boundFunctions, _DOMWorld_waitTasks, _DOMWorld_bindingIdentifier, _DOMWorld_settingUpBinding, _DOMWorld_onBindingCalled, _WaitTask_instances, _WaitTask_domWorld, _WaitTask_polling, _WaitTask_timeout, _WaitTask_predicateBody, _WaitTask_predicateAcceptsContextElement, _WaitTask_args, _WaitTask_binding, _WaitTask_runCount, _WaitTask_resolve, _WaitTask_reject, _WaitTask_timeoutTimer, _WaitTask_terminated, _WaitTask_root, _WaitTask_cleanup;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaitTask = exports.DOMWorld = void 0;
 const assert_js_1 = require("./assert.js");
-const helper_js_1 = require("./helper.js");
-const LifecycleWatcher_js_1 = require("./LifecycleWatcher.js");
 const Errors_js_1 = require("./Errors.js");
+const LifecycleWatcher_js_1 = require("./LifecycleWatcher.js");
 const QueryHandler_js_1 = require("./QueryHandler.js");
-const environment_js_1 = require("../environment.js");
+const util_js_1 = require("./util.js");
 /**
  * @internal
  */
 class DOMWorld {
     constructor(client, frameManager, frame, timeoutSettings) {
-        this._documentPromise = null;
-        this._contextPromise = null;
-        this._contextResolveCallback = null;
-        this._detached = false;
-        /**
-         * @internal
-         */
-        this._waitTasks = new Set();
-        /**
-         * @internal
-         * Contains mapping from functions that should be bound to Puppeteer functions.
-         */
-        this._boundFunctions = new Map();
+        _DOMWorld_frameManager.set(this, void 0);
+        _DOMWorld_client.set(this, void 0);
+        _DOMWorld_frame.set(this, void 0);
+        _DOMWorld_timeoutSettings.set(this, void 0);
+        _DOMWorld_documentPromise.set(this, null);
+        _DOMWorld_contextPromise.set(this, null);
+        _DOMWorld_contextResolveCallback.set(this, null);
+        _DOMWorld_detached.set(this, false);
         // Set of bindings that have been registered in the current context.
-        this._ctxBindings = new Set();
+        _DOMWorld_ctxBindings.set(this, new Set());
+        // Contains mapping from functions that should be bound to Puppeteer functions.
+        _DOMWorld_boundFunctions.set(this, new Map());
+        _DOMWorld_waitTasks.set(this, new Set());
         // If multiple waitFor are set up asynchronously, we need to wait for the
         // first one to set up the binding in the page before running the others.
-        this._settingUpBinding = null;
+        _DOMWorld_settingUpBinding.set(this, null);
+        _DOMWorld_onBindingCalled.set(this, async (event) => {
+            let payload;
+            if (!this._hasContext()) {
+                return;
+            }
+            const context = await this.executionContext();
+            try {
+                payload = JSON.parse(event.payload);
+            }
+            catch {
+                // The binding was either called by something in the page or it was
+                // called before our wrapper was initialized.
+                return;
+            }
+            const { type, name, seq, args } = payload;
+            if (type !== 'internal' ||
+                !__classPrivateFieldGet(this, _DOMWorld_ctxBindings, "f").has(__classPrivateFieldGet(DOMWorld, _a, "f", _DOMWorld_bindingIdentifier).call(DOMWorld, name, context._contextId))) {
+                return;
+            }
+            if (context._contextId !== event.executionContextId) {
+                return;
+            }
+            try {
+                const fn = this._boundFunctions.get(name);
+                if (!fn) {
+                    throw new Error(`Bound function $name is not found`);
+                }
+                const result = await fn(...args);
+                await context.evaluate(deliverResult, name, seq, result);
+            }
+            catch (error) {
+                // The WaitTask may already have been resolved by timing out, or the
+                // exection context may have been destroyed.
+                // In both caes, the promises above are rejected with a protocol error.
+                // We can safely ignores these, as the WaitTask is re-installed in
+                // the next execution context if needed.
+                if (error.message.includes('Protocol error')) {
+                    return;
+                }
+                (0, util_js_1.debugError)(error);
+            }
+            function deliverResult(name, seq, result) {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore Code is evaluated in a different context.
+                globalThis[name].callbacks.get(seq).resolve(result);
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore Code is evaluated in a different context.
+                globalThis[name].callbacks.delete(seq);
+            }
+        });
         // Keep own reference to client because it might differ from the FrameManager's
         // client for OOP iframes.
-        this._client = client;
-        this._frameManager = frameManager;
-        this._frame = frame;
-        this._timeoutSettings = timeoutSettings;
+        __classPrivateFieldSet(this, _DOMWorld_client, client, "f");
+        __classPrivateFieldSet(this, _DOMWorld_frameManager, frameManager, "f");
+        __classPrivateFieldSet(this, _DOMWorld_frame, frame, "f");
+        __classPrivateFieldSet(this, _DOMWorld_timeoutSettings, timeoutSettings, "f");
         this._setContext(null);
-        this._onBindingCalled = this._onBindingCalled.bind(this);
-        this._client.on('Runtime.bindingCalled', this._onBindingCalled);
+        __classPrivateFieldGet(this, _DOMWorld_client, "f").on('Runtime.bindingCalled', __classPrivateFieldGet(this, _DOMWorld_onBindingCalled, "f"));
+    }
+    get _waitTasks() {
+        return __classPrivateFieldGet(this, _DOMWorld_waitTasks, "f");
+    }
+    get _boundFunctions() {
+        return __classPrivateFieldGet(this, _DOMWorld_boundFunctions, "f");
     }
     frame() {
-        return this._frame;
+        return __classPrivateFieldGet(this, _DOMWorld_frame, "f");
     }
     async _setContext(context) {
+        var _b;
         if (context) {
-            (0, assert_js_1.assert)(this._contextResolveCallback, 'Execution Context has already been set.');
-            this._ctxBindings.clear();
-            this._contextResolveCallback.call(null, context);
-            this._contextResolveCallback = null;
-            for (const waitTask of this._waitTasks)
+            (0, assert_js_1.assert)(__classPrivateFieldGet(this, _DOMWorld_contextResolveCallback, "f"), 'Execution Context has already been set.');
+            __classPrivateFieldGet(this, _DOMWorld_ctxBindings, "f").clear();
+            (_b = __classPrivateFieldGet(this, _DOMWorld_contextResolveCallback, "f")) === null || _b === void 0 ? void 0 : _b.call(null, context);
+            __classPrivateFieldSet(this, _DOMWorld_contextResolveCallback, null, "f");
+            for (const waitTask of this._waitTasks) {
                 waitTask.rerun();
+            }
         }
         else {
-            this._documentPromise = null;
-            this._contextPromise = new Promise((fulfill) => {
-                this._contextResolveCallback = fulfill;
-            });
+            __classPrivateFieldSet(this, _DOMWorld_documentPromise, null, "f");
+            __classPrivateFieldSet(this, _DOMWorld_contextPromise, new Promise(fulfill => {
+                __classPrivateFieldSet(this, _DOMWorld_contextResolveCallback, fulfill, "f");
+            }), "f");
         }
     }
     _hasContext() {
-        return !this._contextResolveCallback;
+        return !__classPrivateFieldGet(this, _DOMWorld_contextResolveCallback, "f");
     }
     _detach() {
-        this._detached = true;
-        this._client.off('Runtime.bindingCalled', this._onBindingCalled);
-        for (const waitTask of this._waitTasks)
+        __classPrivateFieldSet(this, _DOMWorld_detached, true, "f");
+        __classPrivateFieldGet(this, _DOMWorld_client, "f").off('Runtime.bindingCalled', __classPrivateFieldGet(this, _DOMWorld_onBindingCalled, "f"));
+        for (const waitTask of this._waitTasks) {
             waitTask.terminate(new Error('waitForFunction failed: frame got detached.'));
+        }
     }
     executionContext() {
-        if (this._detached)
-            throw new Error(`Execution context is not available in detached frame "${this._frame.url()}" (are you trying to evaluate?)`);
-        return this._contextPromise;
+        if (__classPrivateFieldGet(this, _DOMWorld_detached, "f")) {
+            throw new Error(`Execution context is not available in detached frame "${__classPrivateFieldGet(this, _DOMWorld_frame, "f").url()}" (are you trying to evaluate?)`);
+        }
+        if (__classPrivateFieldGet(this, _DOMWorld_contextPromise, "f") === null) {
+            throw new Error(`Execution content promise is missing`);
+        }
+        return __classPrivateFieldGet(this, _DOMWorld_contextPromise, "f");
     }
     async evaluateHandle(pageFunction, ...args) {
         const context = await this.executionContext();
@@ -101,14 +195,20 @@ class DOMWorld {
         const value = await document.$(selector);
         return value;
     }
+    async $$(selector) {
+        const document = await this._document();
+        return document.$$(selector);
+    }
     async _document() {
-        if (this._documentPromise)
-            return this._documentPromise;
-        this._documentPromise = this.executionContext().then(async (context) => {
-            const document = await context.evaluateHandle('document');
-            return document.asElement();
-        });
-        return this._documentPromise;
+        if (__classPrivateFieldGet(this, _DOMWorld_documentPromise, "f")) {
+            return __classPrivateFieldGet(this, _DOMWorld_documentPromise, "f");
+        }
+        __classPrivateFieldSet(this, _DOMWorld_documentPromise, this.executionContext().then(async (context) => {
+            return await context.evaluateHandle(() => {
+                return document;
+            });
+        }), "f");
+        return __classPrivateFieldGet(this, _DOMWorld_documentPromise, "f");
     }
     async $x(expression) {
         const document = await this._document();
@@ -124,38 +224,36 @@ class DOMWorld {
         const value = await document.$$eval(selector, pageFunction, ...args);
         return value;
     }
-    async $$(selector) {
-        const document = await this._document();
-        const value = await document.$$(selector);
-        return value;
-    }
     async content() {
         return await this.evaluate(() => {
             let retVal = '';
-            if (document.doctype)
+            if (document.doctype) {
                 retVal = new XMLSerializer().serializeToString(document.doctype);
-            if (document.documentElement)
+            }
+            if (document.documentElement) {
                 retVal += document.documentElement.outerHTML;
+            }
             return retVal;
         });
     }
     async setContent(html, options = {}) {
-        const { waitUntil = ['load'], timeout = this._timeoutSettings.navigationTimeout(), } = options;
+        const { waitUntil = ['load'], timeout = __classPrivateFieldGet(this, _DOMWorld_timeoutSettings, "f").navigationTimeout(), } = options;
         // We rely upon the fact that document.open() will reset frame lifecycle with "init"
         // lifecycle event. @see https://crrev.com/608658
-        await this.evaluate((html) => {
+        await this.evaluate(html => {
             document.open();
             document.write(html);
             document.close();
         }, html);
-        const watcher = new LifecycleWatcher_js_1.LifecycleWatcher(this._frameManager, this._frame, waitUntil, timeout);
+        const watcher = new LifecycleWatcher_js_1.LifecycleWatcher(__classPrivateFieldGet(this, _DOMWorld_frameManager, "f"), __classPrivateFieldGet(this, _DOMWorld_frame, "f"), waitUntil, timeout);
         const error = await Promise.race([
             watcher.timeoutOrTerminationPromise(),
             watcher.lifecyclePromise(),
         ]);
         watcher.dispose();
-        if (error)
+        if (error) {
             throw error;
+        }
     }
     /**
      * Adds a script tag into the current context.
@@ -171,34 +269,42 @@ class DOMWorld {
         if (url !== null) {
             try {
                 const context = await this.executionContext();
-                return (await context.evaluateHandle(addScriptUrl, url, id, type)).asElement();
+                return await context.evaluateHandle(addScriptUrl, url, id, type);
             }
             catch (error) {
                 throw new Error(`Loading script from ${url} failed`);
             }
         }
         if (path !== null) {
-            if (!environment_js_1.isNode) {
-                throw new Error('Cannot pass a filepath to addScriptTag in the browser environment.');
+            let fs;
+            try {
+                fs = (await Promise.resolve().then(() => __importStar(require('fs')))).promises;
             }
-            const fs = await helper_js_1.helper.importFSModule();
-            let contents = await fs.promises.readFile(path, 'utf8');
+            catch (error) {
+                if (error instanceof TypeError) {
+                    throw new Error('Can only pass a filepath to addScriptTag in a Node-like environment.');
+                }
+                throw error;
+            }
+            let contents = await fs.readFile(path, 'utf8');
             contents += '//# sourceURL=' + path.replace(/\n/g, '');
             const context = await this.executionContext();
-            return (await context.evaluateHandle(addScriptContent, contents, id, type)).asElement();
+            return await context.evaluateHandle(addScriptContent, contents, id, type);
         }
         if (content !== null) {
             const context = await this.executionContext();
-            return (await context.evaluateHandle(addScriptContent, content, id, type)).asElement();
+            return await context.evaluateHandle(addScriptContent, content, id, type);
         }
         throw new Error('Provide an object with a `url`, `path` or `content` property');
         async function addScriptUrl(url, id, type) {
             const script = document.createElement('script');
             script.src = url;
-            if (id)
+            if (id) {
                 script.id = id;
-            if (type)
+            }
+            if (type) {
                 script.type = type;
+            }
             const promise = new Promise((res, rej) => {
                 script.onload = res;
                 script.onerror = rej;
@@ -211,13 +317,17 @@ class DOMWorld {
             const script = document.createElement('script');
             script.type = type;
             script.text = content;
-            if (id)
+            if (id) {
                 script.id = id;
+            }
             let error = null;
-            script.onerror = (e) => (error = e);
+            script.onerror = e => {
+                return (error = e);
+            };
             document.head.appendChild(script);
-            if (error)
+            if (error) {
                 throw error;
+            }
             return script;
         }
     }
@@ -236,25 +346,46 @@ class DOMWorld {
         if (url !== null) {
             try {
                 const context = await this.executionContext();
-                return (await context.evaluateHandle(addStyleUrl, url)).asElement();
+                const handle = await context.evaluateHandle(addStyleUrl, url);
+                const elementHandle = handle.asElement();
+                if (elementHandle === null) {
+                    throw new Error('Style element is not found');
+                }
+                return elementHandle;
             }
             catch (error) {
                 throw new Error(`Loading style from ${url} failed`);
             }
         }
         if (path !== null) {
-            if (!environment_js_1.isNode) {
-                throw new Error('Cannot pass a filepath to addStyleTag in the browser environment.');
+            let fs;
+            try {
+                fs = (await Promise.resolve().then(() => __importStar(require('fs')))).promises;
             }
-            const fs = await helper_js_1.helper.importFSModule();
-            let contents = await fs.promises.readFile(path, 'utf8');
+            catch (error) {
+                if (error instanceof TypeError) {
+                    throw new Error('Cannot pass a filepath to addStyleTag in the browser environment.');
+                }
+                throw error;
+            }
+            let contents = await fs.readFile(path, 'utf8');
             contents += '/*# sourceURL=' + path.replace(/\n/g, '') + '*/';
             const context = await this.executionContext();
-            return (await context.evaluateHandle(addStyleContent, contents)).asElement();
+            const handle = await context.evaluateHandle(addStyleContent, contents);
+            const elementHandle = handle.asElement();
+            if (elementHandle === null) {
+                throw new Error('Style element is not found');
+            }
+            return elementHandle;
         }
         if (content !== null) {
             const context = await this.executionContext();
-            return (await context.evaluateHandle(addStyleContent, content)).asElement();
+            const handle = await context.evaluateHandle(addStyleContent, content);
+            const elementHandle = handle.asElement();
+            if (elementHandle === null) {
+                throw new Error('Style element is not found');
+            }
+            return elementHandle;
         }
         throw new Error('Provide an object with a `url`, `path` or `content` property');
         async function addStyleUrl(url) {
@@ -271,7 +402,6 @@ class DOMWorld {
         }
         async function addStyleContent(content) {
             const style = document.createElement('style');
-            style.type = 'text/css';
             style.appendChild(document.createTextNode(content));
             const promise = new Promise((res, rej) => {
                 style.onload = res;
@@ -284,59 +414,58 @@ class DOMWorld {
     }
     async click(selector, options) {
         const handle = await this.$(selector);
-        (0, assert_js_1.assert)(handle, 'No node found for selector: ' + selector);
+        (0, assert_js_1.assert)(handle, `No element found for selector: ${selector}`);
         await handle.click(options);
         await handle.dispose();
     }
     async focus(selector) {
         const handle = await this.$(selector);
-        (0, assert_js_1.assert)(handle, 'No node found for selector: ' + selector);
+        (0, assert_js_1.assert)(handle, `No element found for selector: ${selector}`);
         await handle.focus();
         await handle.dispose();
     }
     async hover(selector) {
         const handle = await this.$(selector);
-        (0, assert_js_1.assert)(handle, 'No node found for selector: ' + selector);
+        (0, assert_js_1.assert)(handle, `No element found for selector: ${selector}`);
         await handle.hover();
         await handle.dispose();
     }
     async select(selector, ...values) {
         const handle = await this.$(selector);
-        (0, assert_js_1.assert)(handle, 'No node found for selector: ' + selector);
+        (0, assert_js_1.assert)(handle, `No element found for selector: ${selector}`);
         const result = await handle.select(...values);
         await handle.dispose();
         return result;
     }
     async tap(selector) {
         const handle = await this.$(selector);
+        (0, assert_js_1.assert)(handle, `No element found for selector: ${selector}`);
         await handle.tap();
         await handle.dispose();
     }
     async type(selector, text, options) {
         const handle = await this.$(selector);
-        (0, assert_js_1.assert)(handle, 'No node found for selector: ' + selector);
+        (0, assert_js_1.assert)(handle, `No element found for selector: ${selector}`);
         await handle.type(text, options);
         await handle.dispose();
     }
     async waitForSelector(selector, options) {
         const { updatedSelector, queryHandler } = (0, QueryHandler_js_1.getQueryHandlerAndSelector)(selector);
-        return queryHandler.waitFor(this, updatedSelector, options);
+        (0, assert_js_1.assert)(queryHandler.waitFor, 'Query handler does not support waiting');
+        return (await queryHandler.waitFor(this, updatedSelector, options));
     }
-    /**
-     * @internal
-     */
-    async addBindingToContext(context, name) {
+    async _addBindingToContext(context, name) {
         // Previous operation added the binding so we are done.
-        if (this._ctxBindings.has(DOMWorld.bindingIdentifier(name, context._contextId))) {
+        if (__classPrivateFieldGet(this, _DOMWorld_ctxBindings, "f").has(__classPrivateFieldGet(DOMWorld, _a, "f", _DOMWorld_bindingIdentifier).call(DOMWorld, name, context._contextId))) {
             return;
         }
         // Wait for other operation to finish
-        if (this._settingUpBinding) {
-            await this._settingUpBinding;
-            return this.addBindingToContext(context, name);
+        if (__classPrivateFieldGet(this, _DOMWorld_settingUpBinding, "f")) {
+            await __classPrivateFieldGet(this, _DOMWorld_settingUpBinding, "f");
+            return this._addBindingToContext(context, name);
         }
         const bind = async (name) => {
-            const expression = helper_js_1.helper.pageBindingInitString('internal', name);
+            const expression = (0, util_js_1.pageBindingInitString)('internal', name);
             try {
                 // TODO: In theory, it would be enough to call this just once
                 await context._client.send('Runtime.addBinding', {
@@ -357,59 +486,18 @@ class DOMWorld {
                     return;
                 }
                 else {
-                    (0, helper_js_1.debugError)(error);
+                    (0, util_js_1.debugError)(error);
                     return;
                 }
             }
-            this._ctxBindings.add(DOMWorld.bindingIdentifier(name, context._contextId));
+            __classPrivateFieldGet(this, _DOMWorld_ctxBindings, "f").add(__classPrivateFieldGet(DOMWorld, _a, "f", _DOMWorld_bindingIdentifier).call(DOMWorld, name, context._contextId));
         };
-        this._settingUpBinding = bind(name);
-        await this._settingUpBinding;
-        this._settingUpBinding = null;
+        __classPrivateFieldSet(this, _DOMWorld_settingUpBinding, bind(name), "f");
+        await __classPrivateFieldGet(this, _DOMWorld_settingUpBinding, "f");
+        __classPrivateFieldSet(this, _DOMWorld_settingUpBinding, null, "f");
     }
-    async _onBindingCalled(event) {
-        let payload;
-        if (!this._hasContext())
-            return;
-        const context = await this.executionContext();
-        try {
-            payload = JSON.parse(event.payload);
-        }
-        catch {
-            // The binding was either called by something in the page or it was
-            // called before our wrapper was initialized.
-            return;
-        }
-        const { type, name, seq, args } = payload;
-        if (type !== 'internal' ||
-            !this._ctxBindings.has(DOMWorld.bindingIdentifier(name, context._contextId)))
-            return;
-        if (context._contextId !== event.executionContextId)
-            return;
-        try {
-            const result = await this._boundFunctions.get(name)(...args);
-            await context.evaluate(deliverResult, name, seq, result);
-        }
-        catch (error) {
-            // The WaitTask may already have been resolved by timing out, or the
-            // exection context may have been destroyed.
-            // In both caes, the promises above are rejected with a protocol error.
-            // We can safely ignores these, as the WaitTask is re-installed in
-            // the next execution context if needed.
-            if (error.message.includes('Protocol error'))
-                return;
-            (0, helper_js_1.debugError)(error);
-        }
-        function deliverResult(name, seq, result) {
-            globalThis[name].callbacks.get(seq).resolve(result);
-            globalThis[name].callbacks.delete(seq);
-        }
-    }
-    /**
-     * @internal
-     */
-    async waitForSelectorInPage(queryOne, selector, options, binding) {
-        const { visible: waitForVisible = false, hidden: waitForHidden = false, timeout = this._timeoutSettings.timeout(), } = options;
+    async _waitForSelectorInPage(queryOne, selector, options, binding) {
+        const { visible: waitForVisible = false, hidden: waitForHidden = false, timeout = __classPrivateFieldGet(this, _DOMWorld_timeoutSettings, "f").timeout(), } = options;
         const polling = waitForVisible || waitForHidden ? 'raf' : 'mutation';
         const title = `selector \`${selector}\`${waitForHidden ? ' to be hidden' : ''}`;
         async function predicate(root, selector, waitForVisible, waitForHidden) {
@@ -420,7 +508,7 @@ class DOMWorld {
         }
         const waitTaskOptions = {
             domWorld: this,
-            predicateBody: helper_js_1.helper.makePredicateString(predicate, queryOne),
+            predicateBody: (0, util_js_1.makePredicateString)(predicate, queryOne),
             predicateAcceptsContextElement: true,
             title,
             polling,
@@ -439,7 +527,7 @@ class DOMWorld {
         return elementHandle;
     }
     async waitForXPath(xpath, options) {
-        const { visible: waitForVisible = false, hidden: waitForHidden = false, timeout = this._timeoutSettings.timeout(), } = options;
+        const { visible: waitForVisible = false, hidden: waitForHidden = false, timeout = __classPrivateFieldGet(this, _DOMWorld_timeoutSettings, "f").timeout(), } = options;
         const polling = waitForVisible || waitForHidden ? 'raf' : 'mutation';
         const title = `XPath \`${xpath}\`${waitForHidden ? ' to be hidden' : ''}`;
         function predicate(root, xpath, waitForVisible, waitForHidden) {
@@ -448,7 +536,7 @@ class DOMWorld {
         }
         const waitTaskOptions = {
             domWorld: this,
-            predicateBody: helper_js_1.helper.makePredicateString(predicate),
+            predicateBody: (0, util_js_1.makePredicateString)(predicate),
             predicateAcceptsContextElement: true,
             title,
             polling,
@@ -466,7 +554,7 @@ class DOMWorld {
         return elementHandle;
     }
     waitForFunction(pageFunction, options = {}, ...args) {
-        const { polling = 'raf', timeout = this._timeoutSettings.timeout() } = options;
+        const { polling = 'raf', timeout = __classPrivateFieldGet(this, _DOMWorld_timeoutSettings, "f").timeout() } = options;
         const waitTaskOptions = {
             domWorld: this,
             predicateBody: pageFunction,
@@ -480,89 +568,124 @@ class DOMWorld {
         return waitTask.promise;
     }
     async title() {
-        return this.evaluate(() => document.title);
+        return this.evaluate(() => {
+            return document.title;
+        });
     }
 }
 exports.DOMWorld = DOMWorld;
-DOMWorld.bindingIdentifier = (name, contextId) => `${name}_${contextId}`;
+_a = DOMWorld, _DOMWorld_frameManager = new WeakMap(), _DOMWorld_client = new WeakMap(), _DOMWorld_frame = new WeakMap(), _DOMWorld_timeoutSettings = new WeakMap(), _DOMWorld_documentPromise = new WeakMap(), _DOMWorld_contextPromise = new WeakMap(), _DOMWorld_contextResolveCallback = new WeakMap(), _DOMWorld_detached = new WeakMap(), _DOMWorld_ctxBindings = new WeakMap(), _DOMWorld_boundFunctions = new WeakMap(), _DOMWorld_waitTasks = new WeakMap(), _DOMWorld_settingUpBinding = new WeakMap(), _DOMWorld_onBindingCalled = new WeakMap();
+_DOMWorld_bindingIdentifier = { value: (name, contextId) => {
+        return `${name}_${contextId}`;
+    } };
+const noop = () => { };
 /**
  * @internal
  */
 class WaitTask {
     constructor(options) {
-        this._runCount = 0;
-        this._terminated = false;
-        this._root = null;
-        if (helper_js_1.helper.isString(options.polling))
+        _WaitTask_instances.add(this);
+        _WaitTask_domWorld.set(this, void 0);
+        _WaitTask_polling.set(this, void 0);
+        _WaitTask_timeout.set(this, void 0);
+        _WaitTask_predicateBody.set(this, void 0);
+        _WaitTask_predicateAcceptsContextElement.set(this, void 0);
+        _WaitTask_args.set(this, void 0);
+        _WaitTask_binding.set(this, void 0);
+        _WaitTask_runCount.set(this, 0);
+        _WaitTask_resolve.set(this, noop);
+        _WaitTask_reject.set(this, noop);
+        _WaitTask_timeoutTimer.set(this, void 0);
+        _WaitTask_terminated.set(this, false);
+        _WaitTask_root.set(this, null);
+        if ((0, util_js_1.isString)(options.polling)) {
             (0, assert_js_1.assert)(options.polling === 'raf' || options.polling === 'mutation', 'Unknown polling option: ' + options.polling);
-        else if (helper_js_1.helper.isNumber(options.polling))
+        }
+        else if ((0, util_js_1.isNumber)(options.polling)) {
             (0, assert_js_1.assert)(options.polling > 0, 'Cannot poll with non-positive interval: ' + options.polling);
-        else
+        }
+        else {
             throw new Error('Unknown polling options: ' + options.polling);
+        }
         function getPredicateBody(predicateBody) {
-            if (helper_js_1.helper.isString(predicateBody))
+            if ((0, util_js_1.isString)(predicateBody)) {
                 return `return (${predicateBody});`;
+            }
             return `return (${predicateBody})(...args);`;
         }
-        this._domWorld = options.domWorld;
-        this._polling = options.polling;
-        this._timeout = options.timeout;
-        this._root = options.root;
-        this._predicateBody = getPredicateBody(options.predicateBody);
-        this._predicateAcceptsContextElement =
-            options.predicateAcceptsContextElement;
-        this._args = options.args;
-        this._binding = options.binding;
-        this._runCount = 0;
-        this._domWorld._waitTasks.add(this);
-        if (this._binding) {
-            this._domWorld._boundFunctions.set(this._binding.name, this._binding.pptrFunction);
+        __classPrivateFieldSet(this, _WaitTask_domWorld, options.domWorld, "f");
+        __classPrivateFieldSet(this, _WaitTask_polling, options.polling, "f");
+        __classPrivateFieldSet(this, _WaitTask_timeout, options.timeout, "f");
+        __classPrivateFieldSet(this, _WaitTask_root, options.root || null, "f");
+        __classPrivateFieldSet(this, _WaitTask_predicateBody, getPredicateBody(options.predicateBody), "f");
+        __classPrivateFieldSet(this, _WaitTask_predicateAcceptsContextElement, options.predicateAcceptsContextElement, "f");
+        __classPrivateFieldSet(this, _WaitTask_args, options.args, "f");
+        __classPrivateFieldSet(this, _WaitTask_binding, options.binding, "f");
+        __classPrivateFieldSet(this, _WaitTask_runCount, 0, "f");
+        __classPrivateFieldGet(this, _WaitTask_domWorld, "f")._waitTasks.add(this);
+        if (__classPrivateFieldGet(this, _WaitTask_binding, "f")) {
+            __classPrivateFieldGet(this, _WaitTask_domWorld, "f")._boundFunctions.set(__classPrivateFieldGet(this, _WaitTask_binding, "f").name, __classPrivateFieldGet(this, _WaitTask_binding, "f").pptrFunction);
         }
         this.promise = new Promise((resolve, reject) => {
-            this._resolve = resolve;
-            this._reject = reject;
+            __classPrivateFieldSet(this, _WaitTask_resolve, resolve, "f");
+            __classPrivateFieldSet(this, _WaitTask_reject, reject, "f");
         });
         // Since page navigation requires us to re-install the pageScript, we should track
         // timeout on our end.
         if (options.timeout) {
             const timeoutError = new Errors_js_1.TimeoutError(`waiting for ${options.title} failed: timeout ${options.timeout}ms exceeded`);
-            this._timeoutTimer = setTimeout(() => this.terminate(timeoutError), options.timeout);
+            __classPrivateFieldSet(this, _WaitTask_timeoutTimer, setTimeout(() => {
+                return this.terminate(timeoutError);
+            }, options.timeout), "f");
         }
         this.rerun();
     }
     terminate(error) {
-        this._terminated = true;
-        this._reject(error);
-        this._cleanup();
+        __classPrivateFieldSet(this, _WaitTask_terminated, true, "f");
+        __classPrivateFieldGet(this, _WaitTask_reject, "f").call(this, error);
+        __classPrivateFieldGet(this, _WaitTask_instances, "m", _WaitTask_cleanup).call(this);
     }
     async rerun() {
-        const runCount = ++this._runCount;
+        var _b;
+        const runCount = __classPrivateFieldSet(this, _WaitTask_runCount, (_b = __classPrivateFieldGet(this, _WaitTask_runCount, "f"), ++_b), "f");
         let success = null;
         let error = null;
-        const context = await this._domWorld.executionContext();
-        if (this._terminated || runCount !== this._runCount)
+        const context = await __classPrivateFieldGet(this, _WaitTask_domWorld, "f").executionContext();
+        if (__classPrivateFieldGet(this, _WaitTask_terminated, "f") || runCount !== __classPrivateFieldGet(this, _WaitTask_runCount, "f")) {
             return;
-        if (this._binding) {
-            await this._domWorld.addBindingToContext(context, this._binding.name);
         }
-        if (this._terminated || runCount !== this._runCount)
+        if (__classPrivateFieldGet(this, _WaitTask_binding, "f")) {
+            await __classPrivateFieldGet(this, _WaitTask_domWorld, "f")._addBindingToContext(context, __classPrivateFieldGet(this, _WaitTask_binding, "f").name);
+        }
+        if (__classPrivateFieldGet(this, _WaitTask_terminated, "f") || runCount !== __classPrivateFieldGet(this, _WaitTask_runCount, "f")) {
             return;
+        }
         try {
-            success = await context.evaluateHandle(waitForPredicatePageFunction, this._root || null, this._predicateBody, this._predicateAcceptsContextElement, this._polling, this._timeout, ...this._args);
+            success = await context.evaluateHandle(waitForPredicatePageFunction, __classPrivateFieldGet(this, _WaitTask_root, "f") || null, __classPrivateFieldGet(this, _WaitTask_predicateBody, "f"), __classPrivateFieldGet(this, _WaitTask_predicateAcceptsContextElement, "f"), __classPrivateFieldGet(this, _WaitTask_polling, "f"), __classPrivateFieldGet(this, _WaitTask_timeout, "f"), ...__classPrivateFieldGet(this, _WaitTask_args, "f"));
         }
         catch (error_) {
             error = error_;
         }
-        if (this._terminated || runCount !== this._runCount) {
-            if (success)
+        if (__classPrivateFieldGet(this, _WaitTask_terminated, "f") || runCount !== __classPrivateFieldGet(this, _WaitTask_runCount, "f")) {
+            if (success) {
                 await success.dispose();
+            }
             return;
         }
         // Ignore timeouts in pageScript - we track timeouts ourselves.
         // If the frame's execution context has already changed, `frame.evaluate` will
         // throw an error - ignore this predicate run altogether.
         if (!error &&
-            (await this._domWorld.evaluate((s) => !s, success).catch(() => true))) {
+            (await __classPrivateFieldGet(this, _WaitTask_domWorld, "f")
+                .evaluate(s => {
+                return !s;
+            }, success)
+                .catch(() => {
+                return true;
+            }))) {
+            if (!success) {
+                throw new Error('Assertion: result handle is not available');
+            }
             await success.dispose();
             return;
         }
@@ -579,48 +702,58 @@ class WaitTask {
             }
             // When the page is navigated, the promise is rejected.
             // We will try again in the new execution context.
-            if (error.message.includes('Execution context was destroyed'))
+            if (error.message.includes('Execution context was destroyed')) {
                 return;
+            }
             // We could have tried to evaluate in a context which was already
             // destroyed.
-            if (error.message.includes('Cannot find context with specified id'))
+            if (error.message.includes('Cannot find context with specified id')) {
                 return;
-            this._reject(error);
+            }
+            __classPrivateFieldGet(this, _WaitTask_reject, "f").call(this, error);
         }
         else {
-            this._resolve(success);
+            if (!success) {
+                throw new Error('Assertion: result handle is not available');
+            }
+            __classPrivateFieldGet(this, _WaitTask_resolve, "f").call(this, success);
         }
-        this._cleanup();
-    }
-    _cleanup() {
-        clearTimeout(this._timeoutTimer);
-        this._domWorld._waitTasks.delete(this);
+        __classPrivateFieldGet(this, _WaitTask_instances, "m", _WaitTask_cleanup).call(this);
     }
 }
 exports.WaitTask = WaitTask;
+_WaitTask_domWorld = new WeakMap(), _WaitTask_polling = new WeakMap(), _WaitTask_timeout = new WeakMap(), _WaitTask_predicateBody = new WeakMap(), _WaitTask_predicateAcceptsContextElement = new WeakMap(), _WaitTask_args = new WeakMap(), _WaitTask_binding = new WeakMap(), _WaitTask_runCount = new WeakMap(), _WaitTask_resolve = new WeakMap(), _WaitTask_reject = new WeakMap(), _WaitTask_timeoutTimer = new WeakMap(), _WaitTask_terminated = new WeakMap(), _WaitTask_root = new WeakMap(), _WaitTask_instances = new WeakSet(), _WaitTask_cleanup = function _WaitTask_cleanup() {
+    __classPrivateFieldGet(this, _WaitTask_timeoutTimer, "f") !== undefined && clearTimeout(__classPrivateFieldGet(this, _WaitTask_timeoutTimer, "f"));
+    __classPrivateFieldGet(this, _WaitTask_domWorld, "f")._waitTasks.delete(this);
+};
 async function waitForPredicatePageFunction(root, predicateBody, predicateAcceptsContextElement, polling, timeout, ...args) {
     root = root || document;
     const predicate = new Function('...args', predicateBody);
     let timedOut = false;
-    if (timeout)
-        setTimeout(() => (timedOut = true), timeout);
-    if (polling === 'raf')
-        return await pollRaf();
-    if (polling === 'mutation')
-        return await pollMutation();
-    if (typeof polling === 'number')
-        return await pollInterval(polling);
-    /**
-     * @returns {!Promise<*>}
-     */
+    if (timeout) {
+        setTimeout(() => {
+            return (timedOut = true);
+        }, timeout);
+    }
+    switch (polling) {
+        case 'raf':
+            return await pollRaf();
+        case 'mutation':
+            return await pollMutation();
+        default:
+            return await pollInterval(polling);
+    }
     async function pollMutation() {
         const success = predicateAcceptsContextElement
             ? await predicate(root, ...args)
             : await predicate(...args);
-        if (success)
+        if (success) {
             return Promise.resolve(success);
-        let fulfill;
-        const result = new Promise((x) => (fulfill = x));
+        }
+        let fulfill = (_) => { };
+        const result = new Promise(x => {
+            return (fulfill = x);
+        });
         const observer = new MutationObserver(async () => {
             if (timedOut) {
                 observer.disconnect();
@@ -634,6 +767,9 @@ async function waitForPredicatePageFunction(root, predicateBody, predicateAccept
                 fulfill(success);
             }
         });
+        if (!root) {
+            throw new Error('Root element is not found.');
+        }
         observer.observe(root, {
             childList: true,
             subtree: true,
@@ -642,8 +778,10 @@ async function waitForPredicatePageFunction(root, predicateBody, predicateAccept
         return result;
     }
     async function pollRaf() {
-        let fulfill;
-        const result = new Promise((x) => (fulfill = x));
+        let fulfill = (_) => { };
+        const result = new Promise(x => {
+            return (fulfill = x);
+        });
         await onRaf();
         return result;
         async function onRaf() {
@@ -654,15 +792,19 @@ async function waitForPredicatePageFunction(root, predicateBody, predicateAccept
             const success = predicateAcceptsContextElement
                 ? await predicate(root, ...args)
                 : await predicate(...args);
-            if (success)
+            if (success) {
                 fulfill(success);
-            else
+            }
+            else {
                 requestAnimationFrame(onRaf);
+            }
         }
     }
     async function pollInterval(pollInterval) {
-        let fulfill;
-        const result = new Promise((x) => (fulfill = x));
+        let fulfill = (_) => { };
+        const result = new Promise(x => {
+            return (fulfill = x);
+        });
         await onTimeout();
         return result;
         async function onTimeout() {
@@ -673,10 +815,12 @@ async function waitForPredicatePageFunction(root, predicateBody, predicateAccept
             const success = predicateAcceptsContextElement
                 ? await predicate(root, ...args)
                 : await predicate(...args);
-            if (success)
+            if (success) {
                 fulfill(success);
-            else
+            }
+            else {
                 setTimeout(onTimeout, pollInterval);
+            }
         }
     }
 }