brighterscript 0.66.0-alpha.9 → 0.67.0

package/dist/parser/Statement.js

@@ -1,34 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.FieldStatement = exports.MethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
+exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.FieldStatement = exports.ClassMethodStatement = exports.MethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
 const Parser_1 = require("./Parser");
 const visitors_1 = require("../astUtils/visitors");
 const reflection_1 = require("../astUtils/reflection");
-const interfaces_1 = require("../interfaces");
-const SymbolTable_1 = require("../SymbolTable");
 const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
-const SymbolTable_2 = require("../SymbolTable");
+const SymbolTable_1 = require("../SymbolTable");
 const AstNode_1 = require("./AstNode");
-const AstNode_2 = require("./AstNode");
-const ClassType_1 = require("../types/ClassType");
-const EnumType_1 = require("../types/EnumType");
-const NamespaceType_1 = require("../types/NamespaceType");
-const InterfaceType_1 = require("../types/InterfaceType");
-const VoidType_1 = require("../types/VoidType");
-const TypedFunctionType_1 = require("../types/TypedFunctionType");
-class EmptyStatement extends AstNode_2.Statement {
+class EmptyStatement extends AstNode_1.Statement {
     constructor(
     /**
      * Create a negative range to indicate this is an interpolated location
      */
-    range = creators_1.interpolatedRange) {
+    range = undefined) {
         super();
         this.range = range;
-        this.kind = AstNode_1.AstNodeKind.EmptyStatement;
     }
     transpile(state) {
         return [];
@@ -41,12 +31,11 @@ exports.EmptyStatement = EmptyStatement;
 /**
  * This is a top-level statement. Consider this the root of the AST
  */
-class Body extends AstNode_2.Statement {
+class Body extends AstNode_1.Statement {
     constructor(statements = []) {
         super();
         this.statements = statements;
-        this.kind = AstNode_1.AstNodeKind.Body;
-        this.symbolTable = new SymbolTable_2.SymbolTable('Body', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+        this.symbolTable = new SymbolTable_1.SymbolTable('Body', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
     get range() {
         var _a;
@@ -54,6 +43,7 @@ class Body extends AstNode_2.Statement {
         return util_1.util.createBoundingRange(...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
+        var _a, _b;
         let result = [];
         for (let i = 0; i < this.statements.length; i++) {
             let statement = this.statements[i];
@@ -63,20 +53,20 @@ class Body extends AstNode_2.Statement {
                 //this is the first statement. do nothing related to spacing and newlines
                 //if comment is on same line as prior sibling
             }
-            else if ((0, reflection_1.isCommentStatement)(statement) && previousStatement && statement.range.start.line === previousStatement.range.end.line) {
+            else if ((0, reflection_1.isCommentStatement)(statement) && previousStatement && ((_a = statement.range) === null || _a === void 0 ? void 0 : _a.start.line) === ((_b = previousStatement.range) === null || _b === void 0 ? void 0 : _b.end.line)) {
                 result.push(' ');
                 //add double newline if this is a comment, and next is a function
             }
             else if ((0, reflection_1.isCommentStatement)(statement) && nextStatement && (0, reflection_1.isFunctionStatement)(nextStatement)) {
-                result.push('\n\n');
+                result.push(state.newline, state.newline);
                 //add double newline if is function not preceeded by a comment
             }
             else if ((0, reflection_1.isFunctionStatement)(statement) && previousStatement && !((0, reflection_1.isCommentStatement)(previousStatement))) {
-                result.push('\n\n');
+                result.push(state.newline, state.newline);
             }
             else {
                 //separate statements by a single newline
-                result.push('\n');
+                result.push(state.newline);
             }
             result.push(...statement.transpile(state));
         }
@@ -99,17 +89,21 @@ class Body extends AstNode_2.Statement {
     }
 }
 exports.Body = Body;
-class AssignmentStatement extends AstNode_2.Statement {
-    constructor(equals, name, value, asToken, typeExpression) {
+class AssignmentStatement extends AstNode_1.Statement {
+    constructor(equals, name, value) {
         super();
         this.equals = equals;
         this.name = name;
         this.value = value;
-        this.asToken = asToken;
-        this.typeExpression = typeExpression;
-        this.kind = AstNode_1.AstNodeKind.AssignmentStatement;
         this.range = util_1.util.createBoundingRange(name, equals, value);
     }
+    /**
+     * Get the name of the wrapping namespace (if it exists)
+     * @deprecated use `.findAncestor(isFunctionExpression)` instead.
+     */
+    get containingFunction() {
+        return this.findAncestor(reflection_1.isFunctionExpression);
+    }
     transpile(state) {
         var _a, _b;
         //if the value is a compound assignment, just transpile the expression itself
@@ -128,27 +122,16 @@ class AssignmentStatement extends AstNode_2.Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            //TODO: Walk TypeExpression. We need to decide how to implement types on assignments
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getType(options) {
-        // TODO: Do we still need this.typeExpression?
-        var _a;
-        // Note: compound assignments (eg. +=) are internally dealt with via the RHS being a BinaryExpression
-        // so this.value will be a BinaryExpression, and BinaryExpressions can figure out their own types
-        const rhs = this.value.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
-        (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry(this.name.text, rhs, options.flags, this.name.range));
-        return rhs;
-    }
 }
 exports.AssignmentStatement = AssignmentStatement;
-class Block extends AstNode_2.Statement {
+class Block extends AstNode_1.Statement {
     constructor(statements, startingRange) {
         super();
         this.statements = statements;
         this.startingRange = startingRange;
-        this.kind = AstNode_1.AstNodeKind.Block;
         this.range = util_1.util.createBoundingRange({ range: this.startingRange }, ...(statements !== null && statements !== void 0 ? statements : []));
     }
     transpile(state) {
@@ -182,11 +165,10 @@ class Block extends AstNode_2.Statement {
     }
 }
 exports.Block = Block;
-class ExpressionStatement extends AstNode_2.Statement {
+class ExpressionStatement extends AstNode_1.Statement {
     constructor(expression) {
         super();
         this.expression = expression;
-        this.kind = AstNode_1.AstNodeKind.ExpressionStatement;
         this.range = this.expression.range;
     }
     transpile(state) {
@@ -199,12 +181,11 @@ class ExpressionStatement extends AstNode_2.Statement {
     }
 }
 exports.ExpressionStatement = ExpressionStatement;
-class CommentStatement extends AstNode_2.Statement {
+class CommentStatement extends AstNode_1.Statement {
     constructor(comments) {
         var _a;
         super();
         this.comments = comments;
-        this.kind = AstNode_1.AstNodeKind.CommentStatement;
         this.visitMode = visitors_1.InternalWalkMode.visitStatements | visitors_1.InternalWalkMode.visitExpressions;
         if (((_a = this.comments) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             this.range = util_1.util.createBoundingRange(...this.comments);
@@ -223,7 +204,7 @@ class CommentStatement extends AstNode_2.Statement {
             result.push(state.transpileToken(comment));
             //add newline for all except final comment
             if (i < this.comments.length - 1) {
-                result.push('\n');
+                result.push(state.newline);
             }
         }
         return result;
@@ -236,11 +217,10 @@ class CommentStatement extends AstNode_2.Statement {
     }
 }
 exports.CommentStatement = CommentStatement;
-class ExitForStatement extends AstNode_2.Statement {
+class ExitForStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.ExitForStatement;
         this.range = this.tokens.exitFor.range;
     }
     transpile(state) {
@@ -253,11 +233,10 @@ class ExitForStatement extends AstNode_2.Statement {
     }
 }
 exports.ExitForStatement = ExitForStatement;
-class ExitWhileStatement extends AstNode_2.Statement {
+class ExitWhileStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.ExitWhileStatement;
         this.range = this.tokens.exitWhile.range;
     }
     transpile(state) {
@@ -270,12 +249,11 @@ class ExitWhileStatement extends AstNode_2.Statement {
     }
 }
 exports.ExitWhileStatement = ExitWhileStatement;
-class FunctionStatement extends AstNode_2.Statement {
+class FunctionStatement extends AstNode_1.Statement {
     constructor(name, func) {
         super();
         this.name = name;
         this.func = func;
-        this.kind = AstNode_1.AstNodeKind.FunctionStatement;
         this.range = this.func.range;
     }
     /**
@@ -293,8 +271,13 @@ class FunctionStatement extends AstNode_2.Statement {
             return this.name.text;
         }
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
+    /**
+     * Get the name of the wrapping namespace (if it exists)
+     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
+     */
+    get namespaceName() {
+        var _a;
+        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
     }
     transpile(state) {
         //create a fake token using the full transpiled name
@@ -315,15 +298,9 @@ class FunctionStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'func', visitor, options);
         }
     }
-    getType(options) {
-        var _a;
-        const funcExprType = this.func.getType(options);
-        funcExprType.setName((_a = this.name) === null || _a === void 0 ? void 0 : _a.text);
-        return funcExprType;
-    }
 }
 exports.FunctionStatement = FunctionStatement;
-class IfStatement extends AstNode_2.Statement {
+class IfStatement extends AstNode_1.Statement {
     constructor(tokens, condition, thenBranch, elseBranch, isInline) {
         super();
         this.tokens = tokens;
@@ -331,7 +308,6 @@ class IfStatement extends AstNode_2.Statement {
         this.thenBranch = thenBranch;
         this.elseBranch = elseBranch;
         this.isInline = isInline;
-        this.kind = AstNode_1.AstNodeKind.IfStatement;
         this.range = util_1.util.createBoundingRange(tokens.if, condition, tokens.then, thenBranch, tokens.else, elseBranch, tokens.endIf);
     }
     transpile(state) {
@@ -410,12 +386,11 @@ class IfStatement extends AstNode_2.Statement {
     }
 }
 exports.IfStatement = IfStatement;
-class IncrementStatement extends AstNode_2.Statement {
+class IncrementStatement extends AstNode_1.Statement {
     constructor(value, operator) {
         super();
         this.value = value;
         this.operator = operator;
-        this.kind = AstNode_1.AstNodeKind.IncrementStatement;
         this.range = util_1.util.createBoundingRange(value, operator);
     }
     transpile(state) {
@@ -434,7 +409,7 @@ exports.IncrementStatement = IncrementStatement;
 /**
  * Represents a `print` statement within BrightScript.
  */
-class PrintStatement extends AstNode_2.Statement {
+class PrintStatement extends AstNode_1.Statement {
     /**
      * Creates a new internal representation of a BrightScript `print` statement.
      * @param tokens the tokens for this statement
@@ -445,7 +420,6 @@ class PrintStatement extends AstNode_2.Statement {
         super();
         this.tokens = tokens;
         this.expressions = expressions;
-        this.kind = AstNode_1.AstNodeKind.PrintStatement;
         this.range = util_1.util.createBoundingRange(tokens.print, ...(expressions !== null && expressions !== void 0 ? expressions : []));
     }
     transpile(state) {
@@ -477,7 +451,7 @@ class PrintStatement extends AstNode_2.Statement {
     }
 }
 exports.PrintStatement = PrintStatement;
-class DimStatement extends AstNode_2.Statement {
+class DimStatement extends AstNode_1.Statement {
     constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
         super();
         this.dimToken = dimToken;
@@ -485,7 +459,6 @@ class DimStatement extends AstNode_2.Statement {
         this.openingSquare = openingSquare;
         this.dimensions = dimensions;
         this.closingSquare = closingSquare;
-        this.kind = AstNode_1.AstNodeKind.DimStatement;
         this.range = util_1.util.createBoundingRange(dimToken, identifier, openingSquare, ...(dimensions !== null && dimensions !== void 0 ? dimensions : []), closingSquare);
     }
     transpile(state) {
@@ -505,18 +478,17 @@ class DimStatement extends AstNode_2.Statement {
         return result;
     }
     walk(visitor, options) {
-        var _a;
-        if (((_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) > 0 && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+        var _a, _b;
+        if (((_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) !== undefined && ((_b = this.dimensions) === null || _b === void 0 ? void 0 : _b.length) > 0 && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
             (0, visitors_1.walkArray)(this.dimensions, visitor, options, this);
         }
     }
 }
 exports.DimStatement = DimStatement;
-class GotoStatement extends AstNode_2.Statement {
+class GotoStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.GotoStatement;
         this.range = util_1.util.createBoundingRange(tokens.goto, tokens.label);
     }
     transpile(state) {
@@ -531,16 +503,12 @@ class GotoStatement extends AstNode_2.Statement {
     }
 }
 exports.GotoStatement = GotoStatement;
-class LabelStatement extends AstNode_2.Statement {
+class LabelStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.LabelStatement;
         this.range = util_1.util.createBoundingRange(tokens.identifier, tokens.colon);
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.identifier.leadingTrivia);
-    }
     transpile(state) {
         return [
             state.transpileToken(this.tokens.identifier),
@@ -552,12 +520,11 @@ class LabelStatement extends AstNode_2.Statement {
     }
 }
 exports.LabelStatement = LabelStatement;
-class ReturnStatement extends AstNode_2.Statement {
+class ReturnStatement extends AstNode_1.Statement {
     constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
-        this.kind = AstNode_1.AstNodeKind.ReturnStatement;
         this.range = util_1.util.createBoundingRange(tokens.return, value);
     }
     transpile(state) {
@@ -576,11 +543,10 @@ class ReturnStatement extends AstNode_2.Statement {
     }
 }
 exports.ReturnStatement = ReturnStatement;
-class EndStatement extends AstNode_2.Statement {
+class EndStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.EndStatement;
         this.range = tokens.end.range;
     }
     transpile(state) {
@@ -593,12 +559,11 @@ class EndStatement extends AstNode_2.Statement {
     }
 }
 exports.EndStatement = EndStatement;
-class StopStatement extends AstNode_2.Statement {
+class StopStatement extends AstNode_1.Statement {
     constructor(tokens) {
         var _a;
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.StopStatement;
         this.range = (_a = tokens === null || tokens === void 0 ? void 0 : tokens.stop) === null || _a === void 0 ? void 0 : _a.range;
     }
     transpile(state) {
@@ -611,7 +576,7 @@ class StopStatement extends AstNode_2.Statement {
     }
 }
 exports.StopStatement = StopStatement;
-class ForStatement extends AstNode_2.Statement {
+class ForStatement extends AstNode_1.Statement {
     constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
         super();
         this.forToken = forToken;
@@ -622,7 +587,6 @@ class ForStatement extends AstNode_2.Statement {
         this.endForToken = endForToken;
         this.stepToken = stepToken;
         this.increment = increment;
-        this.kind = AstNode_1.AstNodeKind.ForStatement;
         this.range = util_1.util.createBoundingRange(forToken, counterDeclaration, toToken, finalValue, stepToken, increment, body, endForToken);
     }
     transpile(state) {
@@ -663,14 +627,13 @@ class ForStatement extends AstNode_2.Statement {
     }
 }
 exports.ForStatement = ForStatement;
-class ForEachStatement extends AstNode_2.Statement {
+class ForEachStatement extends AstNode_1.Statement {
     constructor(tokens, item, target, body) {
         super();
         this.tokens = tokens;
         this.item = item;
         this.target = target;
         this.body = body;
-        this.kind = AstNode_1.AstNodeKind.ForEachStatement;
         this.range = util_1.util.createBoundingRange(tokens.forEach, item, tokens.in, target, body, tokens.endFor);
     }
     transpile(state) {
@@ -703,13 +666,12 @@ class ForEachStatement extends AstNode_2.Statement {
     }
 }
 exports.ForEachStatement = ForEachStatement;
-class WhileStatement extends AstNode_2.Statement {
+class WhileStatement extends AstNode_1.Statement {
     constructor(tokens, condition, body) {
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.body = body;
-        this.kind = AstNode_1.AstNodeKind.WhileStatement;
         this.range = util_1.util.createBoundingRange(tokens.while, condition, body, tokens.endWhile);
     }
     transpile(state) {
@@ -738,14 +700,13 @@ class WhileStatement extends AstNode_2.Statement {
     }
 }
 exports.WhileStatement = WhileStatement;
-class DottedSetStatement extends AstNode_2.Statement {
+class DottedSetStatement extends AstNode_1.Statement {
     constructor(obj, name, value, dot) {
         super();
         this.obj = obj;
         this.name = name;
         this.value = value;
         this.dot = dot;
-        this.kind = AstNode_1.AstNodeKind.DottedSetStatement;
         this.range = util_1.util.createBoundingRange(obj, dot, name, value);
     }
     transpile(state) {
@@ -775,54 +736,59 @@ class DottedSetStatement extends AstNode_2.Statement {
     }
 }
 exports.DottedSetStatement = DottedSetStatement;
-class IndexedSetStatement extends AstNode_2.Statement {
-    constructor(obj, index, value, openingSquare, closingSquare) {
+class IndexedSetStatement extends AstNode_1.Statement {
+    constructor(obj, index, value, openingSquare, closingSquare, additionalIndexes) {
+        var _a;
         super();
         this.obj = obj;
         this.index = index;
         this.value = value;
         this.openingSquare = openingSquare;
         this.closingSquare = closingSquare;
-        this.kind = AstNode_1.AstNodeKind.IndexedSetStatement;
+        this.additionalIndexes = additionalIndexes;
         this.range = util_1.util.createBoundingRange(obj, openingSquare, index, closingSquare, value);
+        (_a = this.additionalIndexes) !== null && _a !== void 0 ? _a : (this.additionalIndexes = []);
     }
     transpile(state) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         //if the value is a component assignment, don't add the obj, index or operator...the expression will handle that
         if (TokenKind_1.CompoundAssignmentOperators.includes((_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.operator) === null || _b === void 0 ? void 0 : _b.kind)) {
             return this.value.transpile(state);
         }
         else {
-            return [
-                //obj
-                ...this.obj.transpile(state),
-                //   [
-                state.transpileToken(this.openingSquare),
-                //    index
-                ...this.index.transpile(state),
-                //         ]
-                state.transpileToken(this.closingSquare),
-                //           =
-                ' = ',
-                //             value
-                ...this.value.transpile(state)
-            ];
+            const result = [];
+            result.push(
+            //obj
+            ...this.obj.transpile(state), 
+            //   [
+            state.transpileToken(this.openingSquare));
+            const indexes = [this.index, ...(_c = this.additionalIndexes) !== null && _c !== void 0 ? _c : []];
+            for (let i = 0; i < indexes.length; i++) {
+                //add comma between indexes
+                if (i > 0) {
+                    result.push(', ');
+                }
+                let index = indexes[i];
+                result.push(...((_d = index === null || index === void 0 ? void 0 : index.transpile(state)) !== null && _d !== void 0 ? _d : []));
+            }
+            result.push(state.transpileToken(this.closingSquare), ' = ', ...this.value.transpile(state));
+            return result;
         }
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
             (0, visitors_1.walk)(this, 'obj', visitor, options);
             (0, visitors_1.walk)(this, 'index', visitor, options);
+            (0, visitors_1.walkArray)(this.additionalIndexes, visitor, options, this);
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
-class LibraryStatement extends AstNode_2.Statement {
+class LibraryStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.LibraryStatement;
         this.range = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath);
     }
     transpile(state) {
@@ -842,47 +808,36 @@ class LibraryStatement extends AstNode_2.Statement {
     }
 }
 exports.LibraryStatement = LibraryStatement;
-class NamespaceStatement extends AstNode_2.Statement {
-    constructor(keyword, nameExpression, body, endKeyword) {
+class NamespaceStatement extends AstNode_1.Statement {
+    constructor(keyword, 
+    // this should technically only be a VariableExpression or DottedGetExpression, but that can be enforced elsewhere
+    nameExpression, body, endKeyword) {
         super();
         this.keyword = keyword;
         this.nameExpression = nameExpression;
         this.body = body;
         this.endKeyword = endKeyword;
-        this.kind = AstNode_1.AstNodeKind.NamespaceStatement;
         this.name = this.getName(Parser_1.ParseMode.BrighterScript);
-        this.symbolTable = new SymbolTable_2.SymbolTable(`NamespaceStatement: '${this.name}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+        this.symbolTable = new SymbolTable_1.SymbolTable(`NamespaceStatement: '${this.name}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
     get range() {
         return this.cacheRange();
     }
     cacheRange() {
-        var _a;
         if (!this._range) {
-            this._range = (_a = util_1.util.createBoundingRange(this.keyword, this.nameExpression, this.body, this.endKeyword)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+            this._range = util_1.util.createBoundingRange(this.keyword, this.nameExpression, this.body, this.endKeyword);
         }
         return this._range;
     }
     getName(parseMode) {
-        var _a, _b;
-        const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
-        let name = util_1.util.getAllDottedGetPartsAsString(this.nameExpression, parseMode);
-        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
-            name = this.parent.parent.getName(parseMode) + sep + name;
+        const parentNamespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        let name = this.nameExpression.getName(parseMode);
+        if (parentNamespace) {
+            const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
+            name = parentNamespace.getName(parseMode) + sep + name;
         }
         return name;
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.keyword.leadingTrivia);
-    }
-    getNameParts() {
-        var _a, _b;
-        let parts = util_1.util.getAllDottedGetParts(this.nameExpression);
-        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
-            parts = this.parent.parent.getNameParts().concat(parts);
-        }
-        return parts;
-    }
     transpile(state) {
         //namespaces don't actually have any real content, so just transpile their bodies
         return this.body.transpile(state);
@@ -907,24 +862,21 @@ class NamespaceStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
-    getType(options) {
-        const resultType = new NamespaceType_1.NamespaceType(this.name);
-        return resultType;
-    }
 }
 exports.NamespaceStatement = NamespaceStatement;
-class ImportStatement extends AstNode_2.Statement {
+class ImportStatement extends AstNode_1.Statement {
     constructor(importToken, filePathToken) {
         super();
         this.importToken = importToken;
         this.filePathToken = filePathToken;
-        this.kind = AstNode_1.AstNodeKind.ImportStatement;
         this.range = util_1.util.createBoundingRange(importToken, filePathToken);
         if (this.filePathToken) {
             //remove quotes
             this.filePath = this.filePathToken.text.replace(/"/g, '');
-            //adjust the range to exclude the quotes
-            this.filePathToken.range = util_1.util.createRange(this.filePathToken.range.start.line, this.filePathToken.range.start.character + 1, this.filePathToken.range.end.line, this.filePathToken.range.end.character - 1);
+            if (this.filePathToken.range) {
+                //adjust the range to exclude the quotes
+                this.filePathToken.range = util_1.util.createRange(this.filePathToken.range.start.line, this.filePathToken.range.start.character + 1, this.filePathToken.range.end.line, this.filePathToken.range.end.character - 1);
+            }
         }
     }
     transpile(state) {
@@ -953,12 +905,11 @@ class ImportStatement extends AstNode_2.Statement {
     }
 }
 exports.ImportStatement = ImportStatement;
-class InterfaceStatement extends AstNode_2.Statement {
+class InterfaceStatement extends AstNode_1.Statement {
     constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken) {
         super();
         this.parentInterfaceName = parentInterfaceName;
         this.body = body;
-        this.kind = AstNode_1.AstNodeKind.InterfaceStatement;
         this.tokens = {};
         this.tokens.interface = interfaceToken;
         this.tokens.name = name;
@@ -966,18 +917,20 @@ class InterfaceStatement extends AstNode_2.Statement {
         this.tokens.endInterface = endInterfaceToken;
         this.range = util_1.util.createBoundingRange(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface);
     }
+    /**
+     * Get the name of the wrapping namespace (if it exists)
+     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
+     */
+    get namespaceName() {
+        var _a;
+        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
+    }
     get fields() {
         return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
     }
     get methods() {
         return this.body.filter(x => (0, reflection_1.isInterfaceMethodStatement)(x));
     }
-    hasParentInterface() {
-        return !!this.parentInterfaceName;
-    }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.interface.leadingTrivia);
-    }
     /**
      * The name of the interface WITH its leading namespace (if applicable)
      */
@@ -1031,7 +984,7 @@ class InterfaceStatement extends AstNode_2.Statement {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
         result.push(this.tokens.interface.text, ' ', this.tokens.name.text);
-        const parentInterfaceName = (_b = this.parentInterfaceName) === null || _b === void 0 ? void 0 : _b.getName();
+        const parentInterfaceName = (_b = this.parentInterfaceName) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript);
         if (parentInterfaceName) {
             result.push(' extends ', parentInterfaceName);
         }
@@ -1060,43 +1013,22 @@ class InterfaceStatement extends AstNode_2.Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
-    getType(options) {
-        var _a, _b, _c, _d;
-        const superIface = (_a = this.parentInterfaceName) === null || _a === void 0 ? void 0 : _a.getType(options);
-        const resultType = new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), superIface);
-        for (const statement of this.methods) {
-            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
-            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
-            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _b === void 0 ? void 0 : _b.text, { definingNode: statement }, memberType, flag);
-        }
-        for (const statement of this.fields) {
-            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
-            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
-            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, memberType, flag);
-        }
-        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(this.getName(Parser_1.ParseMode.BrighterScript), resultType, options.flags, this.range));
-        return resultType;
-    }
 }
 exports.InterfaceStatement = InterfaceStatement;
-class InterfaceFieldStatement extends AstNode_2.Statement {
-    constructor(nameToken, asToken, typeExpression, optionalToken) {
+class InterfaceFieldStatement extends AstNode_1.Statement {
+    constructor(nameToken, asToken, typeToken, type, optionalToken) {
         super();
-        this.typeExpression = typeExpression;
-        this.kind = AstNode_1.AstNodeKind.InterfaceFieldStatement;
+        this.type = type;
         this.tokens = {};
         this.tokens.optional = optionalToken;
         this.tokens.name = nameToken;
         this.tokens.as = asToken;
-        this.range = util_1.util.createBoundingRange(this.tokens.optional, this.tokens.name, this.tokens.as, this.typeExpression);
+        this.tokens.type = typeToken;
+        this.range = util_1.util.createBoundingRange(optionalToken, nameToken, asToken, typeToken);
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
-    getLeadingTrivia() {
-        var _a, _b;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.name.leadingTrivia);
-    }
     get name() {
         return this.tokens.name.text;
     }
@@ -1104,12 +1036,10 @@ class InterfaceFieldStatement extends AstNode_2.Statement {
         return !!this.tokens.optional;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
-        }
+        //nothing to walk
     }
     getTypedef(state) {
-        var _a;
+        var _a, _b, _c;
         const result = [];
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
@@ -1118,25 +1048,18 @@ class InterfaceFieldStatement extends AstNode_2.Statement {
             result.push(this.tokens.optional.text, ' ');
         }
         result.push(this.tokens.name.text);
-        if (this.typeExpression) {
-            result.push(' as ', ...this.typeExpression.getTypedef(state));
+        if (((_c = (_b = this.tokens.type) === null || _b === void 0 ? void 0 : _b.text) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+            result.push(' as ', this.tokens.type.text);
         }
         return result;
     }
-    getType(options) {
-        var _a, _b;
-        return (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(options)) !== null && _b !== void 0 ? _b : DynamicType_1.DynamicType.instance;
-    }
 }
 exports.InterfaceFieldStatement = InterfaceFieldStatement;
-//TODO: there is much that is similar with this and FunctionExpression.
-//It would be nice to refactor this so there is less duplicated code
-class InterfaceMethodStatement extends AstNode_2.Statement {
-    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeExpression, optionalToken) {
+class InterfaceMethodStatement extends AstNode_1.Statement {
+    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeToken, returnType, optionalToken) {
         super();
         this.params = params;
-        this.returnTypeExpression = returnTypeExpression;
-        this.kind = AstNode_1.AstNodeKind.InterfaceMethodStatement;
+        this.returnType = returnType;
         this.tokens = {};
         this.tokens.optional = optionalToken;
         this.tokens.functionType = functionTypeToken;
@@ -1144,31 +1067,20 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
         this.tokens.leftParen = leftParen;
         this.tokens.rightParen = rightParen;
         this.tokens.as = asToken;
+        this.tokens.returnType = returnTypeToken;
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
     get range() {
         var _a;
-        return util_1.util.createBoundingRange(this.tokens.optional, this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.returnTypeExpression);
-    }
-    /**
-     * Get the name of this method.
-     */
-    getName(parseMode) {
-        return this.tokens.name.text;
+        return util_1.util.createBoundingRange(this.tokens.optional, this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.tokens.returnType);
     }
     get isOptional() {
         return !!this.tokens.optional;
     }
-    getLeadingTrivia() {
-        var _a, _b;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.functionType.leadingTrivia);
-    }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'returnTypeExpression', visitor, options);
-        }
+        //nothing to walk
     }
     getTypedef(state) {
         var _a, _b;
@@ -1187,48 +1099,27 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
             }
             const param = params[i];
             result.push(param.name.text);
-            if (param.typeExpression) {
-                result.push(' as ', ...param.typeExpression.getTypedef(state));
+            const typeToken = param.typeToken;
+            if (typeToken && typeToken.text.length > 0) {
+                result.push(' as ', typeToken.text);
             }
         }
         result.push(')');
-        if (this.returnTypeExpression) {
-            result.push(' as ', ...this.returnTypeExpression.getTypedef(state));
+        const returnTypeToken = this.tokens.returnType;
+        if (returnTypeToken && returnTypeToken.text.length > 0) {
+            result.push(' as ', returnTypeToken.text);
         }
         return result;
     }
-    getType(options) {
-        var _a, _b, _c;
-        //if there's a defined return type, use that
-        let returnType = (_a = this.returnTypeExpression) === null || _a === void 0 ? void 0 : _a.getType(options);
-        const isSub = this.tokens.functionType.kind === TokenKind_1.TokenKind.Sub;
-        //if we don't have a return type and this is a sub, set the return type to `void`. else use `dynamic`
-        if (!returnType) {
-            returnType = isSub ? VoidType_1.VoidType.instance : DynamicType_1.DynamicType.instance;
-        }
-        const resultType = new TypedFunctionType_1.TypedFunctionType(returnType);
-        resultType.isSub = isSub;
-        for (let param of this.params) {
-            resultType.addParameter(param.name.text, param.getType(options), !!param.defaultValue);
-        }
-        if (options.typeChain) {
-            // need Interface type for type chain
-            (_b = this.parent) === null || _b === void 0 ? void 0 : _b.getType(options);
-        }
-        let funcName = this.getName(Parser_1.ParseMode.BrighterScript);
-        resultType.setName(funcName);
-        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, options.flags, this.range));
-        return resultType;
-    }
 }
 exports.InterfaceMethodStatement = InterfaceMethodStatement;
-class ClassStatement extends AstNode_2.Statement {
+class ClassStatement extends AstNode_1.Statement {
     constructor(classKeyword, 
     /**
      * The name of the class (without namespace prefix)
      */
     name, body, end, extendsKeyword, parentClassName) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         super();
         this.classKeyword = classKeyword;
         this.name = name;
@@ -1236,24 +1127,30 @@ class ClassStatement extends AstNode_2.Statement {
         this.end = end;
         this.extendsKeyword = extendsKeyword;
         this.parentClassName = parentClassName;
-        this.kind = AstNode_1.AstNodeKind.ClassStatement;
         this.memberMap = {};
         this.methods = [];
         this.fields = [];
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
-        this.symbolTable = new SymbolTable_2.SymbolTable(`ClassStatement: '${(_b = this.name) === null || _b === void 0 ? void 0 : _b.text}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
         for (let statement of this.body) {
             if ((0, reflection_1.isMethodStatement)(statement)) {
                 this.methods.push(statement);
-                this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
+                this.memberMap[(_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text.toLowerCase()] = statement;
             }
             else if ((0, reflection_1.isFieldStatement)(statement)) {
                 this.fields.push(statement);
-                this.memberMap[(_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text.toLowerCase()] = statement;
+                this.memberMap[(_c = statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
         }
         this.range = util_1.util.createBoundingRange(classKeyword, name, extendsKeyword, parentClassName, ...(body !== null && body !== void 0 ? body : []), end);
     }
+    /**
+     * Get the name of the wrapping namespace (if it exists)
+     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
+     */
+    get namespaceName() {
+        var _a;
+        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
+    }
     getName(parseMode) {
         var _a;
         const name = (_a = this.name) === null || _a === void 0 ? void 0 : _a.text;
@@ -1273,9 +1170,6 @@ class ClassStatement extends AstNode_2.Statement {
             return undefined;
         }
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.classKeyword.leadingTrivia);
-    }
     transpile(state) {
         let result = [];
         //make the builder
@@ -1294,7 +1188,7 @@ class ClassStatement extends AstNode_2.Statement {
         result.push('class ', this.name.text);
         if (this.extendsKeyword && this.parentClassName) {
             const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
-            const fqName = util_1.util.getFullyQualifiedClassName(this.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript));
+            const fqName = util_1.util.getFullyQualifiedClassName(this.parentClassName.getName(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript));
             result.push(` extends ${fqName}`);
         }
         result.push(state.newline);
@@ -1331,9 +1225,9 @@ class ClassStatement extends AstNode_2.Statement {
         let stmt = this;
         while (stmt) {
             if (stmt.parentClassName) {
-                const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+                const namespace = stmt.findAncestor(reflection_1.isNamespaceStatement);
                 //find the parent class
-                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
+                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
                 myIndex++;
             }
             else {
@@ -1362,7 +1256,7 @@ class ClassStatement extends AstNode_2.Statement {
         while (stmt) {
             if (stmt.parentClassName) {
                 const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
-                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
+                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
                 ancestors.push(stmt);
             }
             else {
@@ -1513,23 +1407,6 @@ class ClassStatement extends AstNode_2.Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
-    getType(options) {
-        var _a, _b, _c, _d;
-        const superClass = (_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getType(options);
-        const resultType = new ClassType_1.ClassType(this.getName(Parser_1.ParseMode.BrighterScript), superClass);
-        for (const statement of this.methods) {
-            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
-            const flag = SymbolTable_1.SymbolTypeFlag.runtime;
-            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text, { definingNode: statement }, funcType, flag);
-        }
-        for (const statement of this.fields) {
-            const fieldType = statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
-            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
-            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, fieldType, flag);
-        }
-        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, options.flags, this.range));
-        return resultType;
-    }
 }
 exports.ClassStatement = ClassStatement;
 const accessModifiers = [
@@ -1541,7 +1418,6 @@ class MethodStatement extends FunctionStatement {
     constructor(modifiers, name, func, override) {
         super(name, func);
         this.override = override;
-        this.kind = AstNode_1.AstNodeKind.MethodStatement;
         this.modifiers = [];
         if (modifiers) {
             if (Array.isArray(modifiers)) {
@@ -1562,9 +1438,6 @@ class MethodStatement extends FunctionStatement {
     getName(parseMode) {
         return this.name.text;
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
-    }
     transpile(state) {
         if (this.name.text.toLowerCase() === 'new') {
             this.ensureSuperConstructorCall(state);
@@ -1622,10 +1495,11 @@ class MethodStatement extends FunctionStatement {
         }
         //check whether any calls to super exist
         let containsSuperCall = this.func.body.statements.findIndex((x) => {
+            var _a;
             //is a call statement
             return (0, reflection_1.isExpressionStatement)(x) && (0, reflection_1.isCallExpression)(x.expression) &&
                 //is a call to super
-                util_1.util.findBeginningVariableExpression(x.expression.callee).name.text.toLowerCase() === 'super';
+                ((_a = util_1.util.findBeginningVariableExpression(x.expression.callee)) === null || _a === void 0 ? void 0 : _a.name.text.toLowerCase()) === 'super';
         }) !== -1;
         //if a call to super exists, quit here
         if (containsSuperCall) {
@@ -1637,22 +1511,19 @@ class MethodStatement extends FunctionStatement {
             text: 'super',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: '',
-            leadingTrivia: []
+            leadingWhitespace: ''
         }), {
             kind: TokenKind_1.TokenKind.LeftParen,
             text: '(',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: '',
-            leadingTrivia: []
+            leadingWhitespace: ''
         }, {
             kind: TokenKind_1.TokenKind.RightParen,
             text: ')',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: '',
-            leadingTrivia: []
+            leadingWhitespace: ''
         }, []));
         state.editor.arrayUnshift(this.func.body.statements, superCall);
     }
@@ -1660,20 +1531,20 @@ class MethodStatement extends FunctionStatement {
      * Inject field initializers at the top of the `new` function (after any present `super()` call)
      */
     injectFieldInitializersForConstructor(state) {
+        var _a, _b, _c;
         let startingIndex = state.classStatement.hasParentClass() ? 1 : 0;
         let newStatements = [];
         //insert the field initializers in order
         for (let field of state.classStatement.fields) {
             let thisQualifiedName = Object.assign({}, field.name);
-            thisQualifiedName.text = 'm.' + field.name.text;
-            const fieldAssignment = field.initialValue
-                ? new AssignmentStatement(field.equal, thisQualifiedName, field.initialValue)
-                : new AssignmentStatement((0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.name.range), thisQualifiedName, 
+            thisQualifiedName.text = 'm.' + ((_a = field.name) === null || _a === void 0 ? void 0 : _a.text);
+            if (field.initialValue) {
+                newStatements.push(new AssignmentStatement(field.equal, thisQualifiedName, field.initialValue));
+            }
+            else {
                 //if there is no initial value, set the initial value to `invalid`
-                (0, creators_1.createInvalidLiteral)('invalid', field.name.range));
-            // Add parent so namespace lookups work
-            fieldAssignment.parent = state.classStatement;
-            newStatements.push(fieldAssignment);
+                newStatements.push(new AssignmentStatement((0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', (_b = field.name) === null || _b === void 0 ? void 0 : _b.range), thisQualifiedName, (0, creators_1.createInvalidLiteral)('invalid', (_c = field.name) === null || _c === void 0 ? void 0 : _c.range)));
+            }
         }
         state.editor.arraySplice(this.func.body.statements, startingIndex, 0, ...newStatements);
     }
@@ -1684,30 +1555,38 @@ class MethodStatement extends FunctionStatement {
     }
 }
 exports.MethodStatement = MethodStatement;
-class FieldStatement extends AstNode_2.Statement {
-    constructor(accessModifier, name, as, typeExpression, equal, initialValue, optional) {
+/**
+ * @deprecated use `MethodStatement`
+ */
+class ClassMethodStatement extends MethodStatement {
+}
+exports.ClassMethodStatement = ClassMethodStatement;
+class FieldStatement extends AstNode_1.Statement {
+    constructor(accessModifier, name, as, type, equal, initialValue, optional) {
         super();
         this.accessModifier = accessModifier;
         this.name = name;
         this.as = as;
-        this.typeExpression = typeExpression;
+        this.type = type;
         this.equal = equal;
         this.initialValue = initialValue;
         this.optional = optional;
-        this.kind = AstNode_1.AstNodeKind.FieldStatement;
-        this.range = util_1.util.createBoundingRange(accessModifier, optional, name, as, typeExpression, equal, initialValue);
+        this.range = util_1.util.createBoundingRange(accessModifier, name, as, type, equal, initialValue);
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
      * Defaults to `DynamicType`
      */
-    getType(options) {
-        var _a, _b, _c, _d;
-        return (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime }))) !== null && _b !== void 0 ? _b : (_c = this.initialValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
-    }
-    getLeadingTrivia() {
-        var _a, _b, _c, _d, _e, _f;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_f = (_d = (_b = (_a = this.accessModifier) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : (_c = this.optional) === null || _c === void 0 ? void 0 : _c.leadingTrivia) !== null && _d !== void 0 ? _d : (_e = this.name) === null || _e === void 0 ? void 0 : _e.leadingTrivia) !== null && _f !== void 0 ? _f : []);
+    getType() {
+        if (this.type) {
+            return util_1.util.tokenToBscType(this.type);
+        }
+        else if ((0, reflection_1.isLiteralExpression)(this.initialValue)) {
+            return this.initialValue.type;
+        }
+        else {
+            return new DynamicType_1.DynamicType();
+        }
     }
     get isOptional() {
         return !!this.optional;
@@ -1722,7 +1601,7 @@ class FieldStatement extends AstNode_2.Statement {
             for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
                 result.push(...annotation.getTypedef(state), state.newline, state.indent());
             }
-            let type = this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            let type = this.getType();
             if ((0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type)) {
                 type = new DynamicType_1.DynamicType();
             }
@@ -1735,20 +1614,24 @@ class FieldStatement extends AstNode_2.Statement {
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
+        if (this.initialValue && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
             (0, visitors_1.walk)(this, 'initialValue', visitor, options);
         }
     }
 }
 exports.FieldStatement = FieldStatement;
-class TryCatchStatement extends AstNode_2.Statement {
+/**
+ * @deprecated use `FieldStatement`
+ */
+class ClassFieldStatement extends FieldStatement {
+}
+exports.ClassFieldStatement = ClassFieldStatement;
+class TryCatchStatement extends AstNode_1.Statement {
     constructor(tokens, tryBranch, catchStatement) {
         super();
         this.tokens = tokens;
         this.tryBranch = tryBranch;
         this.catchStatement = catchStatement;
-        this.kind = AstNode_1.AstNodeKind.TryCatchStatement;
         this.range = util_1.util.createBoundingRange(tokens.try, tryBranch, catchStatement, tokens.endTry);
     }
     transpile(state) {
@@ -1772,13 +1655,12 @@ class TryCatchStatement extends AstNode_2.Statement {
     }
 }
 exports.TryCatchStatement = TryCatchStatement;
-class CatchStatement extends AstNode_2.Statement {
+class CatchStatement extends AstNode_1.Statement {
     constructor(tokens, exceptionVariable, catchBranch) {
         super();
         this.tokens = tokens;
         this.exceptionVariable = exceptionVariable;
         this.catchBranch = catchBranch;
-        this.kind = AstNode_1.AstNodeKind.CatchStatement;
         this.range = util_1.util.createBoundingRange(tokens.catch, exceptionVariable, catchBranch);
     }
     transpile(state) {
@@ -1797,12 +1679,11 @@ class CatchStatement extends AstNode_2.Statement {
     }
 }
 exports.CatchStatement = CatchStatement;
-class ThrowStatement extends AstNode_2.Statement {
+class ThrowStatement extends AstNode_1.Statement {
     constructor(throwToken, expression) {
         super();
         this.throwToken = throwToken;
         this.expression = expression;
-        this.kind = AstNode_1.AstNodeKind.ThrowStatement;
         this.range = util_1.util.createBoundingRange(throwToken, expression);
     }
     transpile(state) {
@@ -1827,19 +1708,25 @@ class ThrowStatement extends AstNode_2.Statement {
     }
 }
 exports.ThrowStatement = ThrowStatement;
-class EnumStatement extends AstNode_2.Statement {
+class EnumStatement extends AstNode_1.Statement {
     constructor(tokens, body) {
         var _a;
         super();
         this.tokens = tokens;
         this.body = body;
-        this.kind = AstNode_1.AstNodeKind.EnumStatement;
-        this.symbolTable = new SymbolTable_2.SymbolTable('Enum');
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
     }
     get range() {
         return util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum);
     }
+    /**
+     * Get the name of the wrapping namespace (if it exists)
+     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
+     */
+    get namespaceName() {
+        var _a;
+        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
+    }
     getMembers() {
         const result = [];
         for (const statement of this.body) {
@@ -1849,9 +1736,6 @@ class EnumStatement extends AstNode_2.Statement {
         }
         return result;
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.enum.leadingTrivia);
-    }
     /**
      * Get a map of member names and their values.
      * All values are stored as their AST LiteralExpression representation (i.e. string enum values include the wrapping quotes)
@@ -1946,27 +1830,13 @@ class EnumStatement extends AstNode_2.Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
-    getType(options) {
-        var _a, _b, _c;
-        const members = this.getMembers();
-        const resultType = new EnumType_1.EnumType(this.fullName, (_a = members[0]) === null || _a === void 0 ? void 0 : _a.getType(options).underlyingType);
-        resultType.pushMemberProvider(() => this.getSymbolTable());
-        for (const statement of members) {
-            resultType.addMember((_c = (_b = statement === null || statement === void 0 ? void 0 : statement.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
-        }
-        return resultType;
-    }
 }
 exports.EnumStatement = EnumStatement;
-class EnumMemberStatement extends AstNode_2.Statement {
+class EnumMemberStatement extends AstNode_1.Statement {
     constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
-        this.kind = AstNode_1.AstNodeKind.EnumMemberStatement;
-    }
-    get range() {
-        return util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value);
     }
     /**
      * The name of the member
@@ -1974,8 +1844,14 @@ class EnumMemberStatement extends AstNode_2.Statement {
     get name() {
         return this.tokens.name.text;
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.name.leadingTrivia);
+    get range() {
+        return util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value);
+    }
+    /**
+     * Get the value of this enum. Requires that `.parent` is set
+     */
+    getValue() {
+        return this.parent.getMemberValue(this.name);
     }
     transpile(state) {
         return [];
@@ -1997,26 +1873,18 @@ class EnumMemberStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getType(options) {
-        var _a, _b, _c, _d;
-        return new EnumType_1.EnumMemberType((_a = this.parent) === null || _a === void 0 ? void 0 : _a.fullName, (_c = (_b = this.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text, (_d = this.value) === null || _d === void 0 ? void 0 : _d.getType(options));
-    }
 }
 exports.EnumMemberStatement = EnumMemberStatement;
-class ConstStatement extends AstNode_2.Statement {
+class ConstStatement extends AstNode_1.Statement {
     constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
-        this.kind = AstNode_1.AstNodeKind.ConstStatement;
         this.range = util_1.util.createBoundingRange(this.tokens.const, this.tokens.name, this.tokens.equals, this.value);
     }
     get name() {
         return this.tokens.name.text;
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.const.leadingTrivia);
-    }
     /**
      * The name of the statement WITH its leading namespace (if applicable)
      */
@@ -2058,16 +1926,12 @@ class ConstStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getType(options) {
-        return this.value.getType(options);
-    }
 }
 exports.ConstStatement = ConstStatement;
-class ContinueStatement extends AstNode_2.Statement {
+class ContinueStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.ContinueStatement;
         this.range = util_1.util.createBoundingRange(tokens.continue, tokens.loopType);
     }
     transpile(state) {