Change location fields to non optional in type checker

Author: bryanlohxz

src/types/ast/astExtractor/ast-extractor.ts

@@ -1,7 +1,7 @@
 import { BaseJavaCstVisitorWithDefaults, CstNode, TypeDeclarationCtx } from 'java-parser'
 
 import { NormalClassDeclaration } from '../types/classes'
-import { AST } from '../types'
+import { AST, Location } from '../types'
 import { ClassExtractor } from './class-extractor'
 
 export class ASTExtractor extends BaseJavaCstVisitorWithDefaults {
@@ -13,7 +13,7 @@ export class ASTExtractor extends BaseJavaCstVisitorWithDefaults {
       kind: 'CompilationUnit',
       importDeclarations: [],
       topLevelClassOrInterfaceDeclarations: this.topLevelClassOrInterfaceDeclarations,
-      location: cst.location
+      location: cst.location as Location
     }
   }
 

src/types/ast/astExtractor/constructor-extractor.ts

@@ -33,7 +33,7 @@ export class ConstructorExtractor extends BaseJavaCstVisitorWithDefaults {
   private location: Location
 
   extract(cst: ConstructorDeclarationCstNode): ConstructorDeclaration {
-    this.location = cst.location
+    this.location = cst.location as Location
     this.visit(cst)
     return {
       kind: 'ConstructorDeclaration',

src/types/ast/astExtractor/expression-extractor.ts

@@ -56,7 +56,7 @@ export class ExpressionExtractor extends BaseJavaCstVisitorWithDefaults {
   private location: Location
 
   extract(cst: ExpressionCstNode): Expression {
-    this.location = cst.location
+    this.location = cst.location as Location
     return this.visit(cst)
   }
 

src/types/ast/astExtractor/field-extractor.ts

@@ -10,6 +10,7 @@ import { Expression } from '../types/blocks-and-statements'
 import { Identifier, FieldDeclaration, FieldModifier } from '../types/classes'
 import { ExpressionExtractor } from './expression-extractor'
 import { TypeExtractor } from './type-extractor'
+import { Location } from '../types'
 
 export class FieldExtractor extends BaseJavaCstVisitorWithDefaults {
   private modifier: Array<FieldModifier> = []
@@ -30,7 +31,7 @@ export class FieldExtractor extends BaseJavaCstVisitorWithDefaults {
           variableInitializer: this.value
         }
       ],
-      location: cst.location
+      location: cst.location as Location
     }
   }
 

src/types/ast/astExtractor/method-extractor.ts

@@ -21,6 +21,7 @@ import {
 import { BlockStatement } from '../types/blocks-and-statements'
 import { BlockStatementExtractor } from './block-statement-extractor'
 import { TypeExtractor } from './type-extractor'
+import { Location } from '../types'
 
 export class MethodExtractor extends BaseJavaCstVisitorWithDefaults {
   private modifier: Array<MethodModifier> = []
@@ -42,9 +43,9 @@ export class MethodExtractor extends BaseJavaCstVisitorWithDefaults {
       methodBody: {
         kind: 'Block',
         blockStatements: this.body,
-        location: cst.location
+        location: cst.location as Location
       },
-      location: cst.location
+      location: cst.location as Location
     }
   }
 

src/types/ast/types/index.ts

@@ -9,10 +9,10 @@ export type AST = CompilationUnit
 export interface Location {
   startOffset: number
   startLine: number
-  startColumn?: number
-  endOffset?: number
-  endLine?: number
-  endColumn?: number
+  startColumn: number
+  endOffset: number
+  endLine: number
+  endColumn: number
 }
 
 export interface BaseNode {