Use ts.getParseTreeNode before getSourceFile to handle transformer output (#1010)

Perryvw · web-flow · commit f3dea4271a4d · 2021-04-02T18:41:08.000+02:00
* Use getParseTreeNode before getSourceFile

* npm audit fix
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/LuaAST.ts b/src/LuaAST.ts
@@ -174,10 +174,12 @@ export function setNodeOriginal<T extends Node>(node: T | undefined, tsOriginal:
 }
 
 function getSourcePosition(sourceNode: ts.Node): TextRange | undefined {
-    if (sourceNode.getSourceFile() !== undefined && sourceNode.pos >= 0) {
+    const parseTreeNode = ts.getParseTreeNode(sourceNode) ?? sourceNode;
+    const sourceFile = parseTreeNode.getSourceFile();
+    if (sourceFile !== undefined && parseTreeNode.pos >= 0) {
         const { line, character } = ts.getLineAndCharacterOfPosition(
-            sourceNode.getSourceFile(),
-            sourceNode.pos + sourceNode.getLeadingTriviaWidth()
+            sourceFile,
+            parseTreeNode.pos + parseTreeNode.getLeadingTriviaWidth()
         );
 
         return { line, column: character };
diff --git a/src/transformation/utils/typescript/index.ts b/src/transformation/utils/typescript/index.ts
@@ -32,7 +32,8 @@ export function getFirstDeclarationInFile(symbol: ts.Symbol, sourceFile: ts.Sour
 }
 
 function isStandardLibraryDeclaration(context: TransformationContext, declaration: ts.Declaration): boolean {
-    const sourceFile = declaration.getSourceFile();
+    const parseTreeNode = ts.getParseTreeNode(declaration) ?? declaration;
+    const sourceFile = parseTreeNode.getSourceFile();
     if (!sourceFile) {
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ export function getFirstDeclarationInFile(symbol: ts.Symbol, sourceFile: ts.Sour`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`function isStandardLibraryDeclaration(context: TransformationContext, declaration: ts.Declaration): boolean {`
`35`		`- const sourceFile = declaration.getSourceFile();`
	`35`	`+ const parseTreeNode = ts.getParseTreeNode(declaration) ?? declaration;`
	`36`	`+ const sourceFile = parseTreeNode.getSourceFile();`
`36`	`37`	`if (!sourceFile) {`
`37`	`38`	`return false;`
`38`	`39`	`}`