Fix static block

babel · nicolo-ribaudo · May 24, 2023 · May 17, 2023 · May 17, 2023 · May 18, 2023
commit f558fe766330c713786ea6f0e4bc6c1583fb6e19
diff --git a/packages/babel-plugin-proposal-explicit-resource-management/src/index.ts b/packages/babel-plugin-proposal-explicit-resource-management/src/index.ts
@@ -37,7 +37,10 @@ export default declare(api => {
         ]),
       );
     },
-    BlockStatement(path, state) {
+    "BlockStatement|StaticBlock"(
+      path: NodePath<t.BlockStatement | t.StaticBlock>,
+      state,
+    ) {
       let stackId: t.Identifier | null = null;
       let needsAwait = false;
 
@@ -97,10 +100,11 @@ export default declare(api => {
       if (
         parentPath.isFunction() ||
         parentPath.isTryStatement() ||
-        parentPath.isCatchClause() ||
-        parentPath.isStaticBlock()
+        parentPath.isCatchClause()
       ) {
         path.replaceWith(t.blockStatement([replacement]));
+      } else if (path.isStaticBlock()) {
+        path.node.body = [replacement];
       } else {
         path.replaceWith(replacement);
       }

diff --git a/...proposal-explicit-resource-management/test/fixtures/transform-sync/function-body/input.js b/...proposal-explicit-resource-management/test/fixtures/transform-sync/function-body/input.js
@@ -1,4 +1,4 @@
-if (test) {
+function fn() {
   using x = obj;
-  doSomethingWith(x);
+  return doSomethingWith(x);
 }
diff --git a/...roposal-explicit-resource-management/test/fixtures/transform-sync/function-body/output.js b/...roposal-explicit-resource-management/test/fixtures/transform-sync/function-body/output.js
@@ -1,10 +1,12 @@
-if (test) try {
-  var _stack = [];
-  const x = babelHelpers.using(_stack, obj);
-  doSomethingWith(x);
-} catch (_) {
-  var _error = _;
-  var _hasError = true;
-} finally {
-  babelHelpers.dispose(_stack, _error, _hasError, typeof SuppressedError !== "undefined" && SuppressedError);
+function fn() {
+  try {
+    var _stack = [];
+    const x = babelHelpers.using(_stack, obj);
+    return doSomethingWith(x);
+  } catch (_) {
+    var _error = _;
+    var _hasError = true;
+  } finally {
+    babelHelpers.dispose(_stack, _error, _hasError, typeof SuppressedError !== "undefined" && SuppressedError);
+  }
 }
diff --git a/...lugin-proposal-explicit-resource-management/test/fixtures/transform-sync/if-body/input.js b/...lugin-proposal-explicit-resource-management/test/fixtures/transform-sync/if-body/input.js
@@ -1,4 +1,4 @@
-function fn() {
+if (test) {
   using x = obj;
-  return doSomethingWith(x);
+  doSomethingWith(x);
 }
diff --git a/...ugin-proposal-explicit-resource-management/test/fixtures/transform-sync/if-body/output.js b/...ugin-proposal-explicit-resource-management/test/fixtures/transform-sync/if-body/output.js
@@ -1,12 +1,10 @@
-function fn() {
-  try {
-    var _stack = [];
-    const x = babelHelpers.using(_stack, obj);
-    return doSomethingWith(x);
-  } catch (_) {
-    var _error = _;
-    var _hasError = true;
-  } finally {
-    babelHelpers.dispose(_stack, _error, _hasError, typeof SuppressedError !== "undefined" && SuppressedError);
-  }
+if (test) try {
+  var _stack = [];
+  const x = babelHelpers.using(_stack, obj);
+  doSomethingWith(x);
+} catch (_) {
+  var _error = _;
+  var _hasError = true;
+} finally {
+  babelHelpers.dispose(_stack, _error, _hasError, typeof SuppressedError !== "undefined" && SuppressedError);
 }
diff --git a/...-proposal-explicit-resource-management/test/fixtures/transform-sync/static-block/input.js b/...-proposal-explicit-resource-management/test/fixtures/transform-sync/static-block/input.js
@@ -0,0 +1,6 @@
+class A {
+  static {
+    using x = y;
+    doSomethingWith(x);
+  }
+}
diff --git a/...proposal-explicit-resource-management/test/fixtures/transform-sync/static-block/output.js b/...proposal-explicit-resource-management/test/fixtures/transform-sync/static-block/output.js
@@ -0,0 +1,14 @@
+class A {
+  static {
+    try {
+      var _stack = [];
+      const x = babelHelpers.using(_stack, y);
+      doSomethingWith(x);
+    } catch (_) {
+      var _error = _;
+      var _hasError = true;
+    } finally {
+      babelHelpers.dispose(_stack, _error, _hasError, typeof SuppressedError !== "undefined" && SuppressedError);
+    }
+  }
+}