Fix tools/generated.js script

Author: GuillaumeGomez

src/commands/network.js

@@ -17,37 +17,38 @@ function parseBlockNetworkRequest(parser) {
 
     return {
         'instructions': [
-            `await pages[0].setRequestInterception(true);
-            pages[0].on('request', interceptedRequest => {
-                if (interceptedRequest.isInterceptResolutionHandled()) return;
-                function matchesGlob(glob, text) {
-                    const wildcard = glob.indexOf("*");
-                    if (wildcard === -1) {
-                        return glob === text;
-                    }
-                    const prefixGlob = glob.substring(0, wildcard);
-                    const prefixText = text.substring(0, wildcard);
-                    if (prefixGlob !== prefixText) {
-                        return false;
-                    }
-                    const suffixGlob = glob.substring(wildcard + 1);
-                    let suffixText = text.substring(wildcard);
-                    if (suffixGlob.indexOf("*") === -1) {
-                        return suffixText.endsWith(suffixGlob);
-                    }
-                    let matched = matchesGlob(suffixGlob, suffixText);
-                    while (suffixText !== "" && !matched) {
-                        suffixText = suffixText.substring(1);
-                        matched = matchesGlob(suffixGlob, suffixText);
-                    }
-                    return matched;
-                }
-                if (matchesGlob("${glob}", interceptedRequest.url())) {
-                    interceptedRequest.abort();
-                } else {
-                    interceptedRequest.continue({}, 0);
-                }
-            });`,
+            `\
+await pages[0].setRequestInterception(true);
+pages[0].on('request', interceptedRequest => {
+    if (interceptedRequest.isInterceptResolutionHandled()) return;
+    function matchesGlob(glob, text) {
+        const wildcard = glob.indexOf("*");
+        if (wildcard === -1) {
+            return glob === text;
+        }
+        const prefixGlob = glob.substring(0, wildcard);
+        const prefixText = text.substring(0, wildcard);
+        if (prefixGlob !== prefixText) {
+            return false;
+        }
+        const suffixGlob = glob.substring(wildcard + 1);
+        let suffixText = text.substring(wildcard);
+        if (suffixGlob.indexOf("*") === -1) {
+            return suffixText.endsWith(suffixGlob);
+        }
+        let matched = matchesGlob(suffixGlob, suffixText);
+        while (suffixText !== "" && !matched) {
+            suffixText = suffixText.substring(1);
+            matched = matchesGlob(suffixGlob, suffixText);
+        }
+        return matched;
+    }
+    if (matchesGlob("${glob}", interceptedRequest.url())) {
+        interceptedRequest.abort();
+    } else {
+        interceptedRequest.continue({}, 0);
+    }
+});`,
         ],
     };
 }

src/index.js

@@ -21,6 +21,14 @@ const consts = require('./consts.js');
 const Module = require('module');
 const readline = require('readline-sync');
 
+const CODE_WRAPPER = `module.exports.f = async function(pages, arg){
+let page = pages[pages.length - 1];
+if (page.contentFrame) {
+    page = await page.contentFrame();
+} else {
+    page = page.mainFrame();
+}`;
+
 // TODO: Make it into a class to provide some utility methods like 'isFailure'.
 const Status = {
     'Ok': 0,
@@ -34,13 +42,7 @@ const Status = {
 function loadContent(content) {
     const m = new Module();
     m.paths = [__dirname];
-    m._compile(`module.exports.f = async function(pages, arg){
-let page = pages[pages.length - 1];
-if (page.contentFrame) {
-    page = await page.contentFrame();
-} else {
-    page = page.mainFrame();
-}
+    m._compile(`${CODE_WRAPPER}
 ${content}
 };`, __dirname);
     return m.exports.f;
@@ -830,4 +832,7 @@ if (require.main === module) {
         'Options': Options,
         'loadBrowser': loadPuppeteer,
     };
+    if (process.env.debug_tests === '1') {
+        module.exports['CODE_WRAPPER'] = CODE_WRAPPER;
+    }
 }

tests/api-output/parseBlockNetworkRequest/ok.toml

@@ -1,33 +1,33 @@
 instructions = [
   """await pages[0].setRequestInterception(true);
-            pages[0].on('request', interceptedRequest => {
-                if (interceptedRequest.isInterceptResolutionHandled()) return;
-                function matchesGlob(glob, text) {
-                    const wildcard = glob.indexOf(\"*\");
-                    if (wildcard === -1) {
-                        return glob === text;
-                    }
-                    const prefixGlob = glob.substring(0, wildcard);
-                    const prefixText = text.substring(0, wildcard);
-                    if (prefixGlob !== prefixText) {
-                        return false;
-                    }
-                    const suffixGlob = glob.substring(wildcard + 1);
-                    let suffixText = text.substring(wildcard);
-                    if (suffixGlob.indexOf(\"*\") === -1) {
-                        return suffixText.endsWith(suffixGlob);
-                    }
-                    let matched = matchesGlob(suffixGlob, suffixText);
-                    while (suffixText !== \"\" && !matched) {
-                        suffixText = suffixText.substring(1);
-                        matched = matchesGlob(suffixGlob, suffixText);
-                    }
-                    return matched;
-                }
-                if (matchesGlob(\"x\", interceptedRequest.url())) {
-                    interceptedRequest.abort();
-                } else {
-                    interceptedRequest.continue({}, 0);
-                }
-            });""",
+pages[0].on('request', interceptedRequest => {
+    if (interceptedRequest.isInterceptResolutionHandled()) return;
+    function matchesGlob(glob, text) {
+        const wildcard = glob.indexOf(\"*\");
+        if (wildcard === -1) {
+            return glob === text;
+        }
+        const prefixGlob = glob.substring(0, wildcard);
+        const prefixText = text.substring(0, wildcard);
+        if (prefixGlob !== prefixText) {
+            return false;
+        }
+        const suffixGlob = glob.substring(wildcard + 1);
+        let suffixText = text.substring(wildcard);
+        if (suffixGlob.indexOf(\"*\") === -1) {
+            return suffixText.endsWith(suffixGlob);
+        }
+        let matched = matchesGlob(suffixGlob, suffixText);
+        while (suffixText !== \"\" && !matched) {
+            suffixText = suffixText.substring(1);
+            matched = matchesGlob(suffixGlob, suffixText);
+        }
+        return matched;
+    }
+    if (matchesGlob(\"x\", interceptedRequest.url())) {
+        interceptedRequest.abort();
+    } else {
+        interceptedRequest.continue({}, 0);
+    }
+});""",
 ]

tools/generated.js

@@ -9,6 +9,8 @@ const path = require('path');
 const fs = require('fs');
 const toml = require('@iarna/toml');
 const {getCurrentDir, stripCommonPathsPrefix} = require('../src/utils.js');
+process.env.debug_tests = '1'; // We enable this to get CODE_WRAPPER from `src/index.js`.
+const { CODE_WRAPPER } = require('../src/index.js');
 
 async function checkGeneratedJs(x) {
     const { ESLint } = require('eslint');
@@ -38,7 +40,7 @@ async function checkGeneratedJs(x) {
         const full = `\
 ${script}
 
-module.exports.f = async function(page, arg){
+${CODE_WRAPPER}
 
 // Start of code.
 ${content['instructions'].join('\n// ----------\n')}