Backport webrecorder/wabac.js@bc4efe3

Author: benoit74

src/zimscraperlib/rewriting/js.py

@@ -29,13 +29,13 @@
 from zimscraperlib.rewriting.url_rewriting import ArticleUrlRewriter, ZimPath
 
 # The regex used to rewrite `import ...` in module code.
-IMPORT_MATCH_RX = re.compile(
-    r"""^\s*?import(?:['"\s]*(?:[\w*${}\s,]+from\s*)?['"\s]?['"\s])(?:.*?)['"\s]""",
+IMPORT_EXPORT_MATCH_RX = re.compile(
+    r"""(^|;)\s*?(?:im|ex)port(?:['"\s]*(?:[\w*${}\s,]+from\s*)?['"\s]?['"\s])(?:.*?)['"\s]""",
 )
 
 # A sub regex used inside `import ...` rewrite to rewrite http url imported
-IMPORT_HTTP_RX = re.compile(
-    r"""(import(?:['"\s]*(?:[\w*${}\s,]+from\s*)?['"\s]?['"\s]))((?:https?|[./]).*?)(['"\s])""",
+IMPORT_EXPORT_HTTP_RX = re.compile(
+    r"""((?:im|ex)port(?:['"\s]*(?:[\w*${}\s,]+from\s*)?['"\s]?['"\s]))((?:https?|[./]).*?)(['"\s])""",
 )
 
 # This list of global variables we want to wrap.
@@ -312,8 +312,8 @@ def sub_funct(match: re.Match[str]) -> str:
                         f"{match.group(3)}"
                     )
 
-                return IMPORT_HTTP_RX.sub(sub_funct, m_object[0])
+                return IMPORT_EXPORT_HTTP_RX.sub(sub_funct, m_object[0])
 
             return func
 
-        return (IMPORT_MATCH_RX, rewrite_import())
+        return (IMPORT_EXPORT_MATCH_RX, rewrite_import())

tests/rewriting/test_js_rewriting.py

@@ -310,6 +310,20 @@ def wrap_import(text: str) -> str:
 export { a };
 """,
         ),
+        # rewrite import same line
+        ImportTestContent(
+            input_='import{A, B} from "https://example.com/";'
+            'import{C, D} from "https://example.org"',
+            expected='import{A, B} from "../../../example.com/";'
+            'import{C, D} from "../../../example.org/"',
+        ),
+        # rewrite import / export same line
+        ImportTestContent(
+            input_='import{A, B} from "https://example.com/";'
+            'export{C, D} from "/another/path/to/file"',
+            expected='import{A, B} from "../../../example.com/";'
+            'export{C, D} from "../../another/path/to/file"',
+        ),
         # rewrite ESM module import
         ImportTestContent(
             input_='import "https://example.com/file.js"',