fix: merge transform visitors

j4k0xb · Dec 25, 2023 · 38f0910 · 38f0910
1 parent 0aff344
commit 38f0910
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/webcrack/src/ast-utils/transform.ts b/packages/webcrack/src/ast-utils/transform.ts
@@ -80,12 +80,12 @@ export function mergeTransforms(options: {
   return {
     name: options.name,
     tags: options.tags,
-    run(ast, state) {
-      state.changes += applyTransforms(ast, options.transforms, {
-        name: options.name,
-        log: false,
-      }).changes;
-    },
+    scope: options.transforms.some((t) => t.scope),
+    visitor() {
+      return visitors.merge(
+        options.transforms.flatMap((t) => t.visitor?.() ?? []),
+      );
+    }
   };
 }
 

diff --git a/packages/webcrack/src/transpile/test/optional-chaining.test.ts b/packages/webcrack/src/transpile/test/optional-chaining.test.ts
@@ -23,16 +23,16 @@ test('member expression (Babel)', () =>
 test.skip('computed member expression (Babel)', () =>
   expectJS(`
     var _a;
-    (_a = a) === null || _a === void 0 ? void 0 : _a[0];
+    (_a = a) === null || _a === undefined ? undefined : _a[0];
   `).toMatchInlineSnapshot(`a?.[0];`));
 
 test.skip('call expression (Babel)', () =>
   expectJS(`
     var _a;
-    (_a = a) === null || _a === void 0 ? void 0 : _a();
+    (_a = a) === null || _a === undefined ? undefined : _a();
   `).toMatchInlineSnapshot(`a?.();`));
 
 test.skip('call expression (TS)', () =>
   expectJS(`
-    a === null || a === void 0 ? void 0 : a();
+    a === null || a === undefined ? undefined : a();
   `).toMatchInlineSnapshot(`a?.();`));
diff --git a/packages/webcrack/src/transpile/transforms/optional-chaining.ts b/packages/webcrack/src/transpile/transforms/optional-chaining.ts
@@ -26,7 +26,7 @@ export default {
 
     const tmpVar = m.capture(m.identifier());
     const tmpMember = m.capture(m.memberExpression(m.fromCapture(tmpVar)));
-    // Example (Babel): var _tmp; (_tmp = object) === null || _tmp === void 0 ? void 0 : _tmp.property;
+    // Example (Babel): var _tmp; (_tmp = object) === null || _tmp === undefined ? undefined : _tmp.property;
     const tmpMatcher = m.conditionalExpression(
       m.logicalExpression(
         '||',