improve SourceLocation typing (#15776)

babel · Jul 13, 2023 · 52244bf · 52244bf
1 parent 900f6de
commit 52244bf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 25 deletions.
diff --git a/packages/babel-generator/src/generators/methods.ts b/packages/babel-generator/src/generators/methods.ts
@@ -282,9 +282,7 @@ function _getFuncIdName(
   if (id.type === "Identifier") {
     nameInfo = {
       pos: id.loc?.start,
-      name:
-        // @ts-expect-error Undocumented property identifierName
-        id.loc?.identifierName || id.name,
+      name: id.loc?.identifierName || id.name,
     };
   } else if (id.type === "PrivateName") {
     nameInfo = {

diff --git a/packages/babel-generator/src/generators/types.ts b/packages/babel-generator/src/generators/types.ts
@@ -4,10 +4,7 @@ import type * as t from "@babel/types";
 import jsesc from "jsesc";
 
 export function Identifier(this: Printer, node: t.Identifier) {
-  this.sourceIdentifierName(
-    // @ts-expect-error Undocumented property identifierName
-    node.loc?.identifierName || node.name,
-  );
+  this.sourceIdentifierName(node.loc?.identifierName || node.name);
   this.word(node.name);
 }
 

diff --git a/packages/babel-types/scripts/generators/ast-types.js b/packages/babel-types/scripts/generators/ast-types.js
@@ -48,6 +48,12 @@ interface BaseComment {
   type: "CommentBlock" | "CommentLine";
 }
 
+interface Position {
+  line: number;
+  column: number;
+  index: number;
+}
+
 export interface CommentBlock extends BaseComment {
   type: "CommentBlock";
 }
@@ -59,15 +65,10 @@ export interface CommentLine extends BaseComment {
 export type Comment = CommentBlock | CommentLine;
 
 export interface SourceLocation {
-  start: {
-    line: number;
-    column: number;
-  };
-
-  end: {
-    line: number;
-    column: number;
-  };
+  start: Position;
+  end: Position;
+  filename: string;
+  identifierName: string | undefined | null;
 }
 
 interface BaseNode {

diff --git a/packages/babel-types/src/ast-types/generated/index.ts b/packages/babel-types/src/ast-types/generated/index.ts
@@ -11,6 +11,12 @@ interface BaseComment {
   type: "CommentBlock" | "CommentLine";
 }
 
+interface Position {
+  line: number;
+  column: number;
+  index: number;
+}
+
 export interface CommentBlock extends BaseComment {
   type: "CommentBlock";
 }
@@ -22,15 +28,10 @@ export interface CommentLine extends BaseComment {
 export type Comment = CommentBlock | CommentLine;
 
 export interface SourceLocation {
-  start: {
-    line: number;
-    column: number;
-  };
-
-  end: {
-    line: number;
-    column: number;
-  };
+  start: Position;
+  end: Position;
+  filename: string;
+  identifierName: string | undefined | null;
 }
 
 interface BaseNode {