Fix: properly scope variables in TSModuleBlock

Co-authored-by: Nicolò Ribaudo <nicolo.ribaudo@gmail.com>
babel · Oct 6, 2022 · 346e812 · 346e812
1 parent 367d4ed
commit 346e812
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/...gin-transform-react-jsx-development/test/fixtures/linux/within-ts-module-block/output.mjs b/...gin-transform-react-jsx-development/test/fixtures/linux/within-ts-module-block/output.mjs
@@ -7,5 +7,5 @@ export namespace Namespaced {
     fileName: _jsxFileName,
     lineNumber: 3,
     columnNumber: 3
-  }, void 0);
+  }, this);
 }
diff --git a/...gin-transform-typescript/test/fixtures/namespace/declare-global-nested-namespace/input.ts b/...gin-transform-typescript/test/fixtures/namespace/declare-global-nested-namespace/input.ts
@@ -0,0 +1,5 @@
+declare global { namespace globalThis { var i18n: any; } }
+
+namespace X { var i18n: any; }
+
+export class i18n {}
diff --git a/...n-transform-typescript/test/fixtures/namespace/declare-global-nested-namespace/output.mjs b/...n-transform-typescript/test/fixtures/namespace/declare-global-nested-namespace/output.mjs
@@ -0,0 +1,7 @@
+let X;
+
+(function (_X) {
+  var i18n;
+})(X || (X = {}));
+
+export class i18n {}
diff --git a/packages/babel-types/src/ast-types/generated/index.ts b/packages/babel-types/src/ast-types/generated/index.ts
@@ -2336,7 +2336,8 @@ export type FunctionParent =
   | ArrowFunctionExpression
   | ClassMethod
   | ClassPrivateMethod
-  | StaticBlock;
+  | StaticBlock
+  | TSModuleBlock;
 export type Pureish =
   | FunctionDeclaration
   | FunctionExpression

diff --git a/packages/babel-types/src/definitions/typescript.ts b/packages/babel-types/src/definitions/typescript.ts
@@ -514,7 +514,7 @@ defineType("TSModuleDeclaration", {
 });
 
 defineType("TSModuleBlock", {
-  aliases: ["Scopable", "Block", "BlockParent"],
+  aliases: ["Scopable", "Block", "BlockParent", "FunctionParent"],
   visitor: ["body"],
   fields: {
     body: validateArrayOfType("Statement"),

diff --git a/packages/babel-types/src/validators/generated/index.ts b/packages/babel-types/src/validators/generated/index.ts
@@ -4788,7 +4788,8 @@ export function isFunctionParent(
     "ArrowFunctionExpression" === nodeType ||
     "ClassMethod" === nodeType ||
     "ClassPrivateMethod" === nodeType ||
-    "StaticBlock" === nodeType
+    "StaticBlock" === nodeType ||
+    "TSModuleBlock" === nodeType
   ) {
     if (typeof opts === "undefined") {
       return true;