Merge pull request #17596 from nicolo-ribaudo/fix-babel-plugin

Fix transform of unary expression in Babel plugin
mozilla · Jan 29, 2024 · 56dabe9 · 56dabe9
2 parents 802f702 + a352f28
commit 56dabe9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/external/builder/babel-plugin-pdfjs-preprocessor.mjs b/external/builder/babel-plugin-pdfjs-preprocessor.mjs
@@ -92,17 +92,22 @@ function babelPluginPDFJSPreprocessor(babel, ctx) {
           }
         },
       },
-      UnaryExpression(path) {
-        const { node } = path;
-        if (node.operator === "typeof" && isPDFJSPreprocessor(node.argument)) {
-          // typeof PDFJSDev => 'object'
-          path.replaceWith(t.stringLiteral("object"));
-          return;
-        }
-        if (node.operator === "!" && t.isBooleanLiteral(node.argument)) {
-          // !true => false,  !false => true
-          path.replaceWith(t.booleanLiteral(!node.argument.value));
-        }
+      UnaryExpression: {
+        exit(path) {
+          const { node } = path;
+          if (
+            node.operator === "typeof" &&
+            isPDFJSPreprocessor(node.argument)
+          ) {
+            // typeof PDFJSDev => 'object'
+            path.replaceWith(t.stringLiteral("object"));
+            return;
+          }
+          if (node.operator === "!" && t.isBooleanLiteral(node.argument)) {
+            // !true => false,  !false => true
+            path.replaceWith(t.booleanLiteral(!node.argument.value));
+          }
+        },
       },
       LogicalExpression: {
         exit(path) {

diff --git a/external/builder/fixtures_esprima/evals-expected.js b/external/builder/fixtures_esprima/evals-expected.js
@@ -17,3 +17,5 @@ var i = '0';
 var j = {
   i: 1
 };
+var k = false;
+var l = true;
diff --git a/external/builder/fixtures_esprima/evals.js b/external/builder/fixtures_esprima/evals.js
@@ -8,3 +8,5 @@ var g = PDFJSDev.eval('OBJ');
 var h = PDFJSDev.json('$ROOT/external/builder/fixtures_esprima/evals.json');
 var i = typeof PDFJSDev === 'undefined' ? PDFJSDev.eval('FALSE') : '0';
 var j = typeof PDFJSDev !== 'undefined' ? PDFJSDev.eval('OBJ.obj') : '0';
+var k = !PDFJSDev.test('TRUE');
+var l = !PDFJSDev.test('FALSE');
diff --git a/web/firefoxcom.js b/web/firefoxcom.js
@@ -400,7 +400,7 @@ class ExternalServices extends BaseExternalServices {
   }
 
   async getNimbusExperimentData() {
-    if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("GECKOVIEW")) {
+    if (!PDFJSDev.test("GECKOVIEW")) {
       return null;
     }
     const nimbusData = await FirefoxCom.requestAsync(