@netlify/edge-bundler 14.9.12 → 14.9.13

package/dist/node/utils/import_attributes.js

@@ -1,7 +1,6 @@
 import { Parser } from 'acorn';
-import * as walk from 'acorn-walk';
 import { tsPlugin } from '@sveltejs/acorn-typescript';
-const acorn = Parser.extend(tsPlugin());
+const acorn = Parser.extend(tsPlugin({ jsx: true }));
 /**
  * Given source code rewrites import assert into import with
  */
@@ -14,32 +13,13 @@ export function rewriteSourceImportAssertions(source) {
         const parsedAST = acorn.parse(source, {
             ecmaVersion: 'latest',
             sourceType: 'module',
+            locations: true,
         });
-        walk.simple(parsedAST, {
-            ImportDeclaration(node) {
-                const statement = source.slice(node.source.end, node.end);
-                if (statement.includes('assert')) {
-                    const newStatement = statement.replace('assert', 'with');
-                    modified = modified.replace(statement, newStatement);
-                }
-            },
-            ImportExpression(node) {
-                const statement = source.slice(node.source.end, node.end);
-                if (statement.includes('assert')) {
-                    const newStatement = statement.replace('assert', 'with');
-                    modified = modified.replace(statement, newStatement);
-                }
-            },
-            ExportNamedDeclaration(node) {
-                if (!node.source)
-                    return;
-                const statement = source.slice(node.source.end, node.end);
-                if (statement.includes('assert')) {
-                    const newStatement = statement.replace('assert', 'with');
-                    modified = modified.replace(statement, newStatement);
-                }
-            },
-        });
+        const statements = collectImportAssertions(source, parsedAST.body);
+        // Bulk replacement of import assertions
+        for (const statement of statements.sort((a, b) => b.start - a.start)) {
+            modified = `${modified.slice(0, statement.start)}${statement.text}${modified.slice(statement.end)}`;
+        }
         return modified;
     }
     catch (error) {
@@ -49,3 +29,41 @@ export function rewriteSourceImportAssertions(source) {
         throw error;
     }
 }
+function collectImportAssertions(source, node) {
+    const collectedNodes = [];
+    if (Array.isArray(node)) {
+        return node.flatMap((n) => collectImportAssertions(source, n));
+    }
+    // Capture all import assertion statements
+    const assertionNodeTypes = ['ImportDeclaration', 'ImportExpression', 'ExportAllDeclaration', 'ExportNamedDeclaration'];
+    if (assertionNodeTypes.includes(node.type)) {
+        const parsedImportNode = parseImportAssertion(source, node);
+        if (parsedImportNode !== undefined) {
+            return [parsedImportNode];
+        }
+    }
+    // Fallthrough tree traversal + support for dynamic imports and JSX syntax
+    for (const [key, value] of Object.entries(node)) {
+        if (['loc', 'typeName'].includes(key))
+            continue;
+        if (value === null)
+            continue;
+        if (typeof value === 'object') {
+            const childNodes = collectImportAssertions(source, value);
+            collectedNodes.push(...childNodes);
+        }
+    }
+    return collectedNodes;
+}
+function parseImportAssertion(source, node) {
+    if (!node.source)
+        return undefined;
+    const statement = source.slice(node.source.end, node.end);
+    if (!statement.includes('assert'))
+        return undefined;
+    return {
+        start: node.source.end,
+        end: node.end,
+        text: statement.replace('assert', 'with'),
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "14.9.12",
+  "version": "14.9.13",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -61,7 +61,6 @@
     "@import-maps/resolve": "^2.0.0",
     "@sveltejs/acorn-typescript": "^1.0.9",
     "acorn": "^8.15.0",
-    "acorn-walk": "^8.3.4",
     "ajv": "^8.11.2",
     "ajv-errors": "^3.0.0",
     "better-ajv-errors": "^1.2.0",
@@ -82,5 +81,5 @@
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^11.0.0"
   },
-  "gitHead": "f0adac340a6e7a853d156b4685c66bb65d04bad5"
+  "gitHead": "11b6510b21a98c5948bd8b7360770a1a6855bc64"
 }