brighterscript 1.0.0-alpha.24 → 1.0.0-alpha.26

package/dist/parser/Expression.js

@@ -1,77 +1,82 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArrayTypeExpression = exports.TypeExpression = exports.RegexLiteralExpression = exports.NullCoalescingExpression = exports.TernaryExpression = exports.AnnotationExpression = exports.TaggedTemplateStringExpression = exports.TemplateStringExpression = exports.TemplateStringQuasiExpression = exports.CallfuncExpression = exports.NewExpression = exports.SourceLiteralExpression = exports.VariableExpression = exports.UnaryExpression = exports.AALiteralExpression = exports.AAMemberExpression = exports.ArrayLiteralExpression = exports.EscapedCharCodeLiteralExpression = exports.LiteralExpression = exports.GroupingExpression = exports.IndexedGetExpression = exports.XmlAttributeGetExpression = exports.DottedGetExpression = exports.NamespacedVariableNameExpression = exports.FunctionParameterExpression = exports.FunctionExpression = exports.CallExpression = exports.BinaryExpression = exports.Expression = void 0;
+exports.TypedArrayExpression = exports.TypeCastExpression = exports.TypeExpression = exports.RegexLiteralExpression = exports.NullCoalescingExpression = exports.TernaryExpression = exports.AnnotationExpression = exports.TaggedTemplateStringExpression = exports.TemplateStringExpression = exports.TemplateStringQuasiExpression = exports.CallfuncExpression = exports.NewExpression = exports.SourceLiteralExpression = exports.VariableExpression = exports.UnaryExpression = exports.AALiteralExpression = exports.AAMemberExpression = exports.ArrayLiteralExpression = exports.EscapedCharCodeLiteralExpression = exports.LiteralExpression = exports.GroupingExpression = exports.IndexedGetExpression = exports.XmlAttributeGetExpression = exports.DottedGetExpression = exports.FunctionParameterExpression = exports.FunctionExpression = exports.CallExpression = exports.BinaryExpression = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const util_1 = require("../util");
 const Parser_1 = require("./Parser");
 const fileUrl = require("file-url");
 const visitors_1 = require("../astUtils/visitors");
+const visitors_2 = require("../astUtils/visitors");
 const reflection_1 = require("../astUtils/reflection");
+const interfaces_1 = require("../interfaces");
 const VoidType_1 = require("../types/VoidType");
 const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
-const ArrayType_1 = require("../types/ArrayType");
-const ObjectType_1 = require("../types/ObjectType");
 const TypedFunctionType_1 = require("../types/TypedFunctionType");
-/** A BrightScript expression */
-class Expression {
-    constructor() {
-        /**
-         * When being considered by the walk visitor, this describes what type of element the current class is.
-         */
-        this.visitMode = visitors_1.InternalWalkMode.visitExpressions;
-    }
-    /**
-     * Get the closest symbol table for this node. Should be overridden in children that directly contain a symbol table
-     */
-    getSymbolTable() {
-        var _a;
-        return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable();
-    }
-}
-exports.Expression = Expression;
-class BinaryExpression extends Expression {
-    constructor(left, operator, right) {
+const AstNode_1 = require("./AstNode");
+const SymbolTable_2 = require("../SymbolTable");
+const source_map_1 = require("source-map");
+const StringType_1 = require("../types/StringType");
+const ReferenceType_1 = require("../types/ReferenceType");
+const UnionType_1 = require("../types/UnionType");
+const types_1 = require("../types");
+const AssociativeArrayType_1 = require("../types/AssociativeArrayType");
+const creators_1 = require("../astUtils/creators");
+class BinaryExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.left = left;
-        this.operator = operator;
-        this.right = right;
-        this.range = util_1.default.createBoundingRange(this.left, this.right);
+        this.kind = AstNode_1.AstNodeKind.BinaryExpression;
+        this.tokens = {
+            operator: options.operator
+        };
+        this.left = options.left;
+        this.right = options.right;
+        this.range = util_1.default.createBoundingRange(this.left, this.tokens.operator, this.right);
     }
     transpile(state) {
         return [
             state.sourceNode(this.left, this.left.transpile(state)),
             ' ',
-            state.transpileToken(this.operator),
+            state.transpileToken(this.tokens.operator),
             ' ',
             state.sourceNode(this.right, this.right.transpile(state))
         ];
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'left', visitor, options);
-            (0, visitors_1.walk)(this, 'right', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'left', visitor, options);
+            (0, visitors_2.walk)(this, 'right', visitor, options);
+        }
+    }
+    getType(options) {
+        const operatorKind = this.tokens.operator.kind;
+        if (options.flags & SymbolTable_1.SymbolTypeFlag.typetime) {
+            // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+            switch (operatorKind) {
+                case TokenKind_1.TokenKind.Or:
+                    return new UnionType_1.UnionType([this.left.getType(options), this.right.getType(options)]);
+                //TODO: Intersection Types?, eg. case TokenKind.And:
+            }
+        }
+        else if (options.flags & SymbolTable_1.SymbolTypeFlag.runtime) {
+            return util_1.default.binaryOperatorResultType(this.left.getType(options), this.tokens.operator, this.right.getType(options));
         }
+        return DynamicType_1.DynamicType.instance;
     }
 }
 exports.BinaryExpression = BinaryExpression;
-class CallExpression extends Expression {
-    constructor(callee, 
-    /**
-     * Can either be `(`, or `?(` for optional chaining
-     */
-    openingParen, closingParen, args, 
-    /**
-     * The namespace that currently wraps this call expression. This is NOT the namespace of the callee...that will be represented in the callee expression itself.
-     */
-    namespaceName) {
+class CallExpression extends AstNode_1.Expression {
+    constructor(options) {
+        var _a;
         super();
-        this.callee = callee;
-        this.openingParen = openingParen;
-        this.closingParen = closingParen;
-        this.args = args;
-        this.namespaceName = namespaceName;
-        this.range = util_1.default.createBoundingRange(this.callee, this.closingParen);
+        this.kind = AstNode_1.AstNodeKind.CallExpression;
+        this.tokens = {
+            openingParen: options.openingParen,
+            closingParen: options.closingParen
+        };
+        this.callee = options.callee;
+        this.args = (_a = options.args) !== null && _a !== void 0 ? _a : [];
+        this.range = util_1.default.createBoundingRange(this.callee, this.tokens.openingParen, ...this.args, this.tokens.closingParen);
     }
     transpile(state, nameOverride) {
         let result = [];
@@ -82,7 +87,7 @@ class CallExpression extends Expression {
         else {
             result.push(...this.callee.transpile(state));
         }
-        result.push(state.transpileToken(this.openingParen));
+        result.push(state.transpileToken(this.tokens.openingParen, '('));
         for (let i = 0; i < this.args.length; i++) {
             //add comma between args
             if (i > 0) {
@@ -91,100 +96,85 @@ class CallExpression extends Expression {
             let arg = this.args[i];
             result.push(...arg.transpile(state));
         }
-        result.push(state.transpileToken(this.closingParen));
+        if (this.tokens.closingParen) {
+            result.push(state.transpileToken(this.tokens.closingParen));
+        }
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'callee', visitor, options);
-            (0, visitors_1.walkArray)(this.args, visitor, options, this);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'callee', visitor, options);
+            (0, visitors_2.walkArray)(this.args, visitor, options, this);
         }
     }
+    getType(options) {
+        var _a, _b;
+        const calleeType = this.callee.getType(options);
+        if (options.ignoreCall) {
+            return calleeType;
+        }
+        if ((0, reflection_1.isNewExpression)(this.parent)) {
+            return calleeType;
+        }
+        if ((0, reflection_1.isCallableType)(calleeType) && (!(0, reflection_1.isReferenceType)(calleeType.returnType) || ((_a = calleeType.returnType) === null || _a === void 0 ? void 0 : _a.isResolvable()))) {
+            return calleeType.returnType;
+        }
+        if (!(0, reflection_1.isReferenceType)(calleeType) && ((_b = calleeType.returnType) === null || _b === void 0 ? void 0 : _b.isResolvable())) {
+            return calleeType.returnType;
+        }
+        return new ReferenceType_1.TypePropertyReferenceType(calleeType, 'returnType');
+    }
 }
 exports.CallExpression = CallExpression;
-CallExpression.MaximumArguments = util_1.MAX_PARAM_COUNT;
-class FunctionExpression extends Expression {
-    constructor(parameters, body, functionType, end, leftParen, rightParen, asToken, returnType, 
-    /**
-     * If this function is enclosed within another function, this will reference that parent function
-     */
-    parentFunction, namespaceName, parentSymbolTable) {
+CallExpression.MaximumArguments = 32;
+class FunctionExpression extends AstNode_1.Expression {
+    constructor(options) {
+        var _a;
         super();
-        this.parameters = parameters;
-        this.body = body;
-        this.functionType = functionType;
-        this.end = end;
-        this.leftParen = leftParen;
-        this.rightParen = rightParen;
-        this.asToken = asToken;
-        this.returnType = returnType;
-        this.parentFunction = parentFunction;
-        this.namespaceName = namespaceName;
-        this.parentSymbolTable = parentSymbolTable;
-        this.labelStatements = [];
+        this.kind = AstNode_1.AstNodeKind.FunctionExpression;
         /**
          * The list of function calls that are declared within this function scope. This excludes CallExpressions
          * declared in child functions
          */
         this.callExpressions = [];
-        /**
-         * A list of all child functions declared directly within this function
-         */
-        this.childFunctionExpressions = [];
-        if (this.returnType) {
-            this._returnType = this.returnType.type;
-        }
-        else if (this.functionType.text.toLowerCase() === 'sub') {
-            this._returnType = new VoidType_1.VoidType();
-        }
-        else {
-            this._returnType = new DynamicType_1.DynamicType();
-        }
-        this.symbolTable = new SymbolTable_1.SymbolTable(parentSymbolTable, `Function`);
-        for (let param of parameters) {
-            this.symbolTable.addSymbol(param.name.text, param.name.range, param.getType());
-        }
-    }
-    getSymbolTable() {
-        return this.symbolTable;
-    }
-    get range() {
-        return this.cacheRange();
-    }
-    /**
-     * The range of the function
-     */
-    cacheRange() {
-        var _a;
-        if (!this._range) {
-            this._range = util_1.default.createBoundingRange(this.functionType, this.leftParen, ...((_a = this.parameters) !== null && _a !== void 0 ? _a : []), this.rightParen, this.asToken, this.returnType, this.body, this.end);
-        }
-        return this._range;
+        this.tokens = {
+            functionType: options.functionType,
+            leftParen: options.leftParen,
+            rightParen: options.rightParen,
+            as: options.as,
+            endFunctionType: options.endFunctionType
+        };
+        this.parameters = (_a = options.parameters) !== null && _a !== void 0 ? _a : [];
+        this.body = options.body;
+        this.returnTypeExpression = options.returnTypeExpression;
+        //if there's a body, and it doesn't have a SymbolTable, assign one
+        if (this.body && !this.body.symbolTable) {
+            this.body.symbolTable = new SymbolTable_2.SymbolTable(`Function Body`);
+        }
+        this.symbolTable = new SymbolTable_2.SymbolTable('FunctionExpression', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+    }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.functionType) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
     /**
-     * The type this function returns
+     * The range of the function, starting at the 'f' in function or 's' in sub (or the open paren if the keyword is missing),
+     * and ending with the last n' in 'end function' or 'b' in 'end sub'
      */
-    getReturnType() {
-        return this._returnType;
-    }
-    /**
-    * The range of the function declaration, starting at the 'f' in function or 's' in sub (or the open paren if the keyword is missing),
-    * and ending with the last character in the returnTypeToken, or the 's' in 'as', or the rightParen
-    */
-    get functionDeclarationRange() {
-        var _a;
-        return util_1.default.createBoundingRange(this.functionType, this.leftParen, ...((_a = this.parameters) !== null && _a !== void 0 ? _a : []), this.rightParen, this.asToken, this.returnType);
+    get range() {
+        return util_1.default.createBoundingRange(this.tokens.functionType, this.tokens.leftParen, ...this.parameters, this.tokens.rightParen, this.tokens.as, this.returnTypeExpression, this.tokens.endFunctionType);
     }
     transpile(state, name, includeBody = true) {
+        var _a;
         let results = [];
         //'function'|'sub'
-        results.push(state.transpileToken(this.functionType));
+        results.push(state.transpileToken(this.tokens.functionType, 'function'));
         //functionName?
         if (name) {
             results.push(' ', state.transpileToken(name));
         }
         //leftParen
-        results.push(state.transpileToken(this.leftParen));
+        results.push(state.transpileToken(this.tokens.leftParen));
         //parameters
         for (let i = 0; i < this.parameters.length; i++) {
             let param = this.parameters[i];
@@ -196,14 +186,14 @@ class FunctionExpression extends Expression {
             results.push(param.transpile(state));
         }
         //right paren
-        results.push(state.transpileToken(this.rightParen));
+        results.push(state.transpileToken(this.tokens.rightParen));
         //as [Type]
-        if (this.asToken) {
+        if (!state.options.removeParameterTypes && this.returnTypeExpression) {
             results.push(' ', 
             //as
-            state.transpileToken(this.asToken), ' ', 
+            state.transpileToken(this.tokens.as, 'as'), ' ', 
             //return type
-            state.sourceNode(this.returnType, this.getReturnType().toTypeString(state.typeContext)));
+            ...this.returnTypeExpression.transpile(state));
         }
         if (includeBody) {
             state.lineage.unshift(this);
@@ -211,55 +201,114 @@ class FunctionExpression extends Expression {
             state.lineage.shift();
             results.push(...body);
         }
-        if (this.end) {
-            results.push('\n');
-            //'end sub'|'end function'
-            results.push(state.indent(), state.transpileToken(this.end));
-        }
+        results.push('\n');
+        //'end sub'|'end function'
+        results.push(state.indent(), state.transpileToken(this.tokens.endFunctionType, `end ${(_a = this.tokens.functionType) !== null && _a !== void 0 ? _a : 'function'}`));
         return results;
     }
-    getTypedef(state, name) {
-        return this.transpile(state, name, false);
+    getTypedef(state) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        let results = [
+            new source_map_1.SourceNode(1, 0, null, [
+                //'function'|'sub'
+                (_b = (_a = this.tokens.functionType) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'function',
+                //functionName?
+                ...((0, reflection_1.isFunctionStatement)(this.parent) || (0, reflection_1.isMethodStatement)(this.parent) ? [' ', (_d = (_c = this.parent.tokens.name) === null || _c === void 0 ? void 0 : _c.text) !== null && _d !== void 0 ? _d : ''] : []),
+                //leftParen
+                '(',
+                //parameters
+                ...((_f = (_e = this.parameters) === null || _e === void 0 ? void 0 : _e.map((param, i) => ([
+                    //separating comma
+                    i > 0 ? ', ' : '',
+                    ...param.getTypedef(state)
+                ]))) !== null && _f !== void 0 ? _f : []),
+                //right paren
+                ')',
+                //as <ReturnType>
+                ...(this.returnTypeExpression ? [
+                    ' ',
+                    (_h = (_g = this.tokens.as) === null || _g === void 0 ? void 0 : _g.text) !== null && _h !== void 0 ? _h : 'as',
+                    ' ',
+                    ...this.returnTypeExpression.getTypedef(state)
+                ] : []),
+                '\n',
+                state.indent(),
+                //'end sub'|'end function'
+                (_k = (_j = this.tokens.endFunctionType) === null || _j === void 0 ? void 0 : _j.text) !== null && _k !== void 0 ? _k : `end ${(_l = this.tokens.functionType) !== null && _l !== void 0 ? _l : 'function'}`
+            ])
+        ];
+        return results;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walkArray)(this.parameters, visitor, options, this);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walkArray)(this.parameters, visitor, options, this);
+            (0, visitors_2.walk)(this, 'returnTypeExpression', visitor, options);
             //This is the core of full-program walking...it allows us to step into sub functions
-            if (options.walkMode & visitors_1.InternalWalkMode.recurseChildFunctions) {
-                (0, visitors_1.walk)(this, 'returnType', visitor, options);
-                (0, visitors_1.walk)(this, 'body', visitor, options);
+            if (options.walkMode & visitors_2.InternalWalkMode.recurseChildFunctions) {
+                (0, visitors_2.walk)(this, 'body', visitor, options);
             }
         }
     }
-    getFunctionType() {
-        let functionType = new TypedFunctionType_1.TypedFunctionType(this.getReturnType());
-        functionType.isSub = this.functionType.text === 'sub';
+    getType(options) {
+        var _a, _b, _c, _d;
+        //if there's a defined return type, use that
+        let returnType = (_a = this.returnTypeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
+        const isSub = ((_b = this.tokens.functionType) === null || _b === void 0 ? void 0 : _b.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.parameters) {
-            functionType.addParameter(param.name.text, param.getType(), param.isOptional);
+            resultType.addParameter(param.tokens.name.text, param.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })), !!param.defaultValue);
+        }
+        // Figure out this function's name if we can
+        let funcName = '';
+        if ((0, reflection_1.isMethodStatement)(this.parent) || (0, reflection_1.isInterfaceMethodStatement)(this.parent)) {
+            funcName = this.parent.getName(Parser_1.ParseMode.BrighterScript);
+            if (options.typeChain) {
+                // Get the typechain info from the parent class
+                (_c = this.parent.parent) === null || _c === void 0 ? void 0 : _c.getType(options);
+            }
+        }
+        else if ((0, reflection_1.isFunctionStatement)(this.parent)) {
+            funcName = this.parent.getName(Parser_1.ParseMode.BrighterScript);
         }
-        return functionType;
+        if (funcName) {
+            resultType.setName(funcName);
+        }
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(funcName, resultType, options.data, this.range));
+        return resultType;
     }
 }
 exports.FunctionExpression = FunctionExpression;
-class FunctionParameterExpression extends Expression {
-    constructor(name, typeInContext, equalsToken, defaultValue, asToken, type, namespaceName) {
+class FunctionParameterExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.name = name;
-        this.typeInContext = typeInContext;
-        this.equalsToken = equalsToken;
-        this.defaultValue = defaultValue;
-        this.asToken = asToken;
-        this.type = type;
-        this.namespaceName = namespaceName;
-        this.range = util_1.default.createBoundingRange(this.name, this.equalsToken, this.defaultValue, this.asToken, this.type);
-    }
-    getType() {
-        return this.typeInContext;
+        this.kind = AstNode_1.AstNodeKind.FunctionParameterExpression;
+        this.tokens = {
+            name: options.name,
+            equals: options.equals,
+            as: options.as
+        };
+        this.defaultValue = options.defaultValue;
+        this.typeExpression = options.typeExpression;
+    }
+    getType(options) {
+        var _a, _b, _c, _d, _e;
+        const paramType = (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime, typeChain: undefined }))) !== null && _b !== void 0 ? _b : (_c = this.defaultValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime, typeChain: undefined }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
+        (_e = options.typeChain) === null || _e === void 0 ? void 0 : _e.push(new interfaces_1.TypeChainEntry(this.tokens.name.text, paramType, options.data, this.range));
+        return paramType;
+    }
+    get range() {
+        return util_1.default.createBoundingRange(this.tokens.name, this.tokens.as, this.typeExpression, this.tokens.equals, this.defaultValue);
     }
     transpile(state) {
+        var _a, _b;
         let result = [
             //name
-            state.transpileToken(this.name)
+            state.transpileToken(this.tokens.name)
         ];
         //default value
         if (this.defaultValue) {
@@ -267,202 +316,215 @@ class FunctionParameterExpression extends Expression {
             result.push(this.defaultValue.transpile(state));
         }
         //type declaration
-        if (this.asToken) {
+        if (this.typeExpression && !state.options.removeParameterTypes) {
             result.push(' ');
-            result.push(state.transpileToken(this.asToken));
+            result.push(state.transpileToken(this.tokens.as, 'as'));
             result.push(' ');
-            result.push(state.sourceNode(this.type, this.getType().toTypeString(state.typeContext)));
+            result.push(...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : []));
         }
         return result;
     }
-    walk(visitor, options) {
-        // eslint-disable-next-line no-bitwise
-        if (this.defaultValue && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'defaultValue', visitor, options);
-            (0, visitors_1.walk)(this, 'type', visitor, options);
-        }
-    }
-    get isOptional() {
-        return !!this.defaultValue;
-    }
-}
-exports.FunctionParameterExpression = FunctionParameterExpression;
-class NamespacedVariableNameExpression extends Expression {
-    constructor(
-    //if this is a `DottedGetExpression`, it must be comprised only of `VariableExpression`s
-    expression) {
-        super();
-        this.expression = expression;
-        this.range = expression.range;
-    }
-    transpile(state) {
+    getTypedef(state) {
+        var _a, _b;
         return [
-            state.sourceNode(this, this.getName(Parser_1.ParseMode.BrightScript))
+            //name
+            this.tokens.name.text,
+            //default value
+            ...(this.defaultValue ? [
+                ' = ',
+                ...this.defaultValue.transpile(state)
+            ] : []),
+            //type declaration
+            ...(this.typeExpression ? [
+                ' as ',
+                ...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getTypedef(state)) !== null && _b !== void 0 ? _b : [''])
+            ] : [])
         ];
     }
-    getNameParts() {
-        let parts = [];
-        if ((0, reflection_1.isVariableExpression)(this.expression)) {
-            parts.push(this.expression.name.text);
-        }
-        else {
-            let expr = this.expression;
-            parts.push(expr.name.text);
-            while ((0, reflection_1.isVariableExpression)(expr) === false) {
-                expr = expr.obj;
-                parts.unshift(expr.name.text);
-            }
-        }
-        return parts;
-    }
-    getName(parseMode = Parser_1.ParseMode.BrighterScript) {
-        if (parseMode === Parser_1.ParseMode.BrighterScript) {
-            return this.getNameParts().join('.');
-        }
-        else {
-            return this.getNameParts().join('_');
-        }
-    }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'expression', visitor, options);
+        // eslint-disable-next-line no-bitwise
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'defaultValue', visitor, options);
+            (0, visitors_2.walk)(this, 'typeExpression', visitor, options);
         }
     }
 }
-exports.NamespacedVariableNameExpression = NamespacedVariableNameExpression;
-class DottedGetExpression extends Expression {
-    constructor(obj, name, 
-    /**
-     * Can either be `.`, or `?.` for optional chaining
-     */
-    dot) {
+exports.FunctionParameterExpression = FunctionParameterExpression;
+class DottedGetExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.obj = obj;
-        this.name = name;
-        this.dot = dot;
-        this.range = util_1.default.createBoundingRange(this.obj, this.dot, this.name);
+        this.kind = AstNode_1.AstNodeKind.DottedGetExpression;
+        this.tokens = {
+            name: options.name,
+            dot: options.dot
+        };
+        this.obj = options.obj;
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.dot, this.tokens.name);
     }
     transpile(state) {
         //if the callee starts with a namespace name, transpile the name
         if (state.file.calleeStartsWithNamespace(this)) {
-            return new NamespacedVariableNameExpression(this).transpile(state);
+            return [
+                state.sourceNode(this, this.getName(Parser_1.ParseMode.BrightScript))
+            ];
         }
         else {
             return [
                 ...this.obj.transpile(state),
-                state.transpileToken(this.dot),
-                state.transpileToken(this.name)
+                state.transpileToken(this.tokens.dot, '.'),
+                state.transpileToken(this.tokens.name)
             ];
         }
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'obj', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'obj', visitor, options);
         }
     }
+    getType(options) {
+        var _a, _b, _c, _d, _e, _f;
+        const objType = (_a = this.obj) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const result = objType === null || objType === void 0 ? void 0 : objType.getMemberType((_b = this.tokens.name) === null || _b === void 0 ? void 0 : _b.text, options);
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry((_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.text, result, options.data, (_f = (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range));
+        if (result || options.flags & SymbolTable_1.SymbolTypeFlag.typetime) {
+            // All types should be known at typetime
+            return result;
+        }
+        // It is possible at runtime that a value has been added dynamically to an object, or something
+        // TODO: maybe have a strict flag on this?
+        return DynamicType_1.DynamicType.instance;
+    }
+    getName(parseMode) {
+        return util_1.default.getAllDottedGetPartsAsString(this, parseMode);
+    }
 }
 exports.DottedGetExpression = DottedGetExpression;
-class XmlAttributeGetExpression extends Expression {
-    constructor(obj, name, 
-    /**
-     * Can either be `@`, or `?@` for optional chaining
-     */
-    at) {
+class XmlAttributeGetExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.obj = obj;
-        this.name = name;
-        this.at = at;
-        this.range = util_1.default.createBoundingRange(this.obj, this.at, this.name);
+        this.kind = AstNode_1.AstNodeKind.XmlAttributeGetExpression;
+        this.obj = options.obj;
+        this.tokens = { at: options.at, name: options.name };
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.at, this.tokens.name);
     }
     transpile(state) {
         return [
             ...this.obj.transpile(state),
-            state.transpileToken(this.at),
-            state.transpileToken(this.name)
+            state.transpileToken(this.tokens.at, '@'),
+            state.transpileToken(this.tokens.name)
         ];
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'obj', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'obj', visitor, options);
         }
     }
 }
 exports.XmlAttributeGetExpression = XmlAttributeGetExpression;
-class IndexedGetExpression extends Expression {
-    constructor(obj, index, 
-    /**
-     * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.`
-     */
-    openingSquare, closingSquare, questionDotToken //  ? or ?.
-    ) {
+class IndexedGetExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.obj = obj;
-        this.index = index;
-        this.openingSquare = openingSquare;
-        this.closingSquare = closingSquare;
-        this.questionDotToken = questionDotToken;
-        this.range = util_1.default.createBoundingRange(this.obj, this.openingSquare, this.questionDotToken, this.openingSquare, this.index, this.closingSquare);
+        this.kind = AstNode_1.AstNodeKind.IndexedGetExpression;
+        this.tokens = {
+            openingSquare: options.openingSquare,
+            closingSquare: options.closingSquare,
+            questionDot: options.questionDot
+        };
+        this.obj = options.obj;
+        this.indexes = options.indexes;
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.openingSquare, this.tokens.questionDot, this.tokens.openingSquare, ...this.indexes, this.tokens.closingSquare);
     }
     transpile(state) {
-        return [
-            ...this.obj.transpile(state),
-            this.questionDotToken ? state.transpileToken(this.questionDotToken) : '',
-            state.transpileToken(this.openingSquare),
-            ...this.index.transpile(state),
-            state.transpileToken(this.closingSquare)
-        ];
+        var _a;
+        const result = [];
+        result.push(...this.obj.transpile(state), this.tokens.questionDot ? state.transpileToken(this.tokens.questionDot) : '', state.transpileToken(this.tokens.openingSquare, '['));
+        for (let i = 0; i < this.indexes.length; i++) {
+            //add comma between indexes
+            if (i > 0) {
+                result.push(', ');
+            }
+            let index = this.indexes[i];
+            result.push(...((_a = index === null || index === void 0 ? void 0 : index.transpile(state)) !== null && _a !== void 0 ? _a : []));
+        }
+        result.push(state.transpileToken(this.tokens.closingSquare, ']'));
+        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);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'obj', visitor, options);
+            (0, visitors_2.walkArray)(this.indexes, visitor, options, this);
+        }
+    }
+    getType(options) {
+        const objType = this.obj.getType(options);
+        if ((0, reflection_1.isArrayType)(objType)) {
+            // This is used on an array. What is the default type of that array?
+            return objType.defaultType;
         }
+        return super.getType(options);
     }
 }
 exports.IndexedGetExpression = IndexedGetExpression;
-class GroupingExpression extends Expression {
-    constructor(tokens, expression) {
+class GroupingExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.tokens = tokens;
-        this.expression = expression;
-        this.range = util_1.default.createBoundingRange(this.tokens.left, this.expression, this.tokens.right);
+        this.kind = AstNode_1.AstNodeKind.GroupingExpression;
+        this.tokens = {
+            rightParen: options.rightParen,
+            leftParen: options.leftParen
+        };
+        this.expression = options.expression;
+        this.range = util_1.default.createBoundingRange(this.tokens.leftParen, this.expression, this.tokens.rightParen);
     }
     transpile(state) {
+        if ((0, reflection_1.isTypeCastExpression)(this.expression)) {
+            return this.expression.transpile(state);
+        }
         return [
-            state.transpileToken(this.tokens.left),
+            state.transpileToken(this.tokens.leftParen),
             ...this.expression.transpile(state),
-            state.transpileToken(this.tokens.right)
+            state.transpileToken(this.tokens.rightParen)
         ];
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'expression', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'expression', visitor, options);
         }
     }
+    getType(options) {
+        return this.expression.getType(options);
+    }
 }
 exports.GroupingExpression = GroupingExpression;
-class LiteralExpression extends Expression {
-    constructor(token) {
+class LiteralExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.token = token;
-        this.range = this.token.range;
-        this.type = util_1.default.tokenToBscType(token);
+        this.kind = AstNode_1.AstNodeKind.LiteralExpression;
+        this.tokens = {
+            value: options.value
+        };
+    }
+    get range() {
+        return this.tokens.value.range;
+    }
+    getType(options) {
+        return util_1.default.tokenToBscType(this.tokens.value);
     }
     transpile(state) {
         let text;
-        if (this.token.kind === TokenKind_1.TokenKind.TemplateStringQuasi) {
+        if (this.tokens.value.kind === TokenKind_1.TokenKind.TemplateStringQuasi) {
             //wrap quasis with quotes (and escape inner quotemarks)
-            text = `"${this.token.text.replace(/"/g, '""')}"`;
+            text = `"${this.tokens.value.text.replace(/"/g, '""')}"`;
         }
-        else if ((0, reflection_1.isStringType)(this.type)) {
-            text = this.token.text;
+        else if (this.tokens.value.kind === TokenKind_1.TokenKind.StringLiteral) {
+            text = this.tokens.value.text;
             //add trailing quotemark if it's missing. We will have already generated a diagnostic for this.
             if (text.endsWith('"') === false) {
                 text += '"';
             }
         }
         else {
-            text = this.token.text;
+            text = this.tokens.value.text;
         }
         return [
             state.sourceNode(this, text)
@@ -477,15 +539,16 @@ exports.LiteralExpression = LiteralExpression;
  * This is a special expression only used within template strings. It exists so we can prevent producing lots of empty strings
  * during template string transpile by identifying these expressions explicitly and skipping the bslib_toString around them
  */
-class EscapedCharCodeLiteralExpression extends Expression {
-    constructor(token) {
+class EscapedCharCodeLiteralExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.token = token;
-        this.range = token.range;
+        this.kind = AstNode_1.AstNodeKind.EscapedCharCodeLiteralExpression;
+        this.tokens = { value: options.value };
+        this.range = this.tokens.value.range;
     }
     transpile(state) {
         return [
-            state.sourceNode(this, `chr(${this.token.charCode})`)
+            state.sourceNode(this, `chr(${this.tokens.value.charCode})`)
         ];
     }
     walk(visitor, options) {
@@ -493,19 +556,20 @@ class EscapedCharCodeLiteralExpression extends Expression {
     }
 }
 exports.EscapedCharCodeLiteralExpression = EscapedCharCodeLiteralExpression;
-class ArrayLiteralExpression extends Expression {
-    constructor(elements, open, close, hasSpread = false) {
-        var _a;
+class ArrayLiteralExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.elements = elements;
-        this.open = open;
-        this.close = close;
-        this.hasSpread = hasSpread;
-        this.range = util_1.default.createBoundingRange(this.open, ...((_a = this.elements) !== null && _a !== void 0 ? _a : []), this.close);
+        this.kind = AstNode_1.AstNodeKind.ArrayLiteralExpression;
+        this.tokens = {
+            open: options.open,
+            close: options.close
+        };
+        this.elements = options.elements;
+        this.range = util_1.default.createBoundingRange(this.tokens.open, ...this.elements, this.tokens.close);
     }
     transpile(state) {
         let result = [];
-        result.push(state.transpileToken(this.open));
+        result.push(state.transpileToken(this.tokens.open, '['));
         let hasChildren = this.elements.length > 0;
         state.blockDepth++;
         for (let i = 0; i < this.elements.length; i++) {
@@ -513,7 +577,7 @@ class ArrayLiteralExpression extends Expression {
             let element = this.elements[i];
             if ((0, reflection_1.isCommentStatement)(element)) {
                 //if the comment is on the same line as opening square or previous statement, don't add newline
-                if (util_1.default.linesTouch(this.open, element) || util_1.default.linesTouch(previousElement, element)) {
+                if (util_1.default.linesTouch(this.tokens.open, element) || util_1.default.linesTouch(previousElement, element)) {
                     result.push(' ');
                 }
                 else {
@@ -534,67 +598,64 @@ class ArrayLiteralExpression extends Expression {
             result.push('\n');
             result.push(state.indent());
         }
-        result.push(state.transpileToken(this.close));
+        if (this.tokens.close) {
+            result.push(state.transpileToken(this.tokens.close));
+        }
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walkArray)(this.elements, visitor, options, this);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walkArray)(this.elements, visitor, options, this);
         }
     }
+    getType(options) {
+        const innerTypes = this.elements.filter(x => !(0, reflection_1.isCommentStatement)(x)).map(expr => expr.getType(options));
+        return new types_1.ArrayType(...innerTypes);
+    }
 }
 exports.ArrayLiteralExpression = ArrayLiteralExpression;
-class AAMemberExpression extends Expression {
-    constructor(keyToken, colonToken, 
-    /** The expression evaluated to determine the member's initial value. */
-    value, type) {
+class AAMemberExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.keyToken = keyToken;
-        this.colonToken = colonToken;
-        this.value = value;
-        this.type = type;
-        this.range = util_1.default.createBoundingRange(this.keyToken, this.colonToken, this.value);
+        this.kind = AstNode_1.AstNodeKind.AAMemberExpression;
+        this.tokens = {
+            key: options.key,
+            colon: options.colon,
+            comma: options.comma
+        };
+        this.value = options.value;
+        this.range = util_1.default.createBoundingRange(this.tokens.key, this.tokens.colon, this.value);
     }
     transpile(state) {
         //TODO move the logic from AALiteralExpression loop into this function
         return [];
     }
     walk(visitor, options) {
-        (0, visitors_1.walk)(this, 'value', visitor, options);
+        (0, visitors_2.walk)(this, 'value', visitor, options);
+    }
+    getType(options) {
+        return this.value.getType(options);
     }
 }
 exports.AAMemberExpression = AAMemberExpression;
-class AALiteralExpression extends Expression {
-    constructor(elements, open, close, functionExpression) {
-        var _a;
+class AALiteralExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.elements = elements;
-        this.open = open;
-        this.close = close;
-        this.functionExpression = functionExpression;
-        this.symbolTable = new SymbolTable_1.SymbolTable();
-        this.memberTable = new SymbolTable_1.SymbolTable();
-        this.range = util_1.default.createBoundingRange(this.open, ...((_a = this.elements) !== null && _a !== void 0 ? _a : []), this.close);
-        this.buildSymbolTable();
-    }
-    buildSymbolTable() {
-        this.symbolTable.name = `AALiteral (symbols)`;
-        this.memberTable.name = `AALiteral (members)`;
-        this.symbolTable.clear();
-        this.symbolTable.addSymbol('m', { start: this.open.range.start, end: this.close.range.end }, new ObjectType_1.ObjectType('object', this.memberTable));
-        for (const element of this.elements) {
-            if ((0, reflection_1.isAAMemberExpression)(element)) {
-                this.memberTable.addSymbol(element.keyToken.text, element.keyToken.range, (0, Parser_1.getBscTypeFromExpression)(element.value, this.functionExpression));
-            }
-        }
+        this.kind = AstNode_1.AstNodeKind.AALiteralExpression;
+        this.tokens = {
+            open: options.open,
+            close: options.close
+        };
+        this.elements = options.elements;
+        this.range = util_1.default.createBoundingRange(this.tokens.open, ...this.elements, this.tokens.close);
     }
     transpile(state) {
         let result = [];
         //open curly
-        result.push(state.transpileToken(this.open));
+        result.push(state.transpileToken(this.tokens.open, '{'));
         let hasChildren = this.elements.length > 0;
         //add newline if the object has children and the first child isn't a comment starting on the same line as opening curly
-        if (hasChildren && ((0, reflection_1.isCommentStatement)(this.elements[0]) === false || !util_1.default.linesTouch(this.elements[0], this.open))) {
+        if (hasChildren && ((0, reflection_1.isCommentStatement)(this.elements[0]) === false || !util_1.default.linesTouch(this.elements[0], this.tokens.open))) {
             result.push('\n');
         }
         state.blockDepth++;
@@ -604,7 +665,7 @@ class AALiteralExpression extends Expression {
             let nextElement = this.elements[i + 1];
             //don't indent if comment is same-line
             if ((0, reflection_1.isCommentStatement)(element) &&
-                (util_1.default.linesTouch(this.open, element) || util_1.default.linesTouch(previousElement, element))) {
+                (util_1.default.linesTouch(this.tokens.open, element) || util_1.default.linesTouch(previousElement, element))) {
                 result.push(' ');
                 //indent line
             }
@@ -617,9 +678,9 @@ class AALiteralExpression extends Expression {
             }
             else {
                 //key
-                result.push(state.transpileToken(element.keyToken));
+                result.push(state.transpileToken(element.tokens.key));
                 //colon
-                result.push(state.transpileToken(element.colonToken), ' ');
+                result.push(state.transpileToken(element.tokens.colon, ':'), ' ');
                 //value
                 result.push(...element.value.transpile(state));
             }
@@ -637,96 +698,157 @@ class AALiteralExpression extends Expression {
             result.push(state.indent());
         }
         //close curly
-        result.push(state.transpileToken(this.close));
+        result.push(state.transpileToken(this.tokens.close, '}'));
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walkArray)(this.elements, visitor, options, this);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walkArray)(this.elements, visitor, options, this);
         }
     }
+    getType(options) {
+        const resultType = new AssociativeArrayType_1.AssociativeArrayType();
+        for (const element of this.elements) {
+            if ((0, reflection_1.isAAMemberExpression)(element)) {
+                resultType.addMember(element.tokens.key.text, { definingNode: element }, element.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+            }
+        }
+        return resultType;
+    }
 }
 exports.AALiteralExpression = AALiteralExpression;
-class UnaryExpression extends Expression {
-    constructor(operator, right) {
+class UnaryExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.operator = operator;
-        this.right = right;
-        this.range = util_1.default.createBoundingRange(this.operator, this.right);
+        this.kind = AstNode_1.AstNodeKind.UnaryExpression;
+        this.tokens = {
+            operator: options.operator
+        };
+        this.right = options.right;
+        this.range = util_1.default.createBoundingRange(this.tokens.operator, this.right);
     }
     transpile(state) {
+        let separatingWhitespace;
+        if ((0, reflection_1.isVariableExpression)(this.right)) {
+            separatingWhitespace = this.right.tokens.name.leadingWhitespace;
+        }
+        else if ((0, reflection_1.isLiteralExpression)(this.right)) {
+            separatingWhitespace = this.right.tokens.value.leadingWhitespace;
+        }
+        else {
+            separatingWhitespace = ' ';
+        }
         return [
-            state.transpileToken(this.operator),
-            ' ',
+            state.transpileToken(this.tokens.operator),
+            separatingWhitespace,
             ...this.right.transpile(state)
         ];
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'right', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'right', visitor, options);
         }
     }
+    getType(options) {
+        return util_1.default.unaryOperatorResultType(this.tokens.operator, this.right.getType(options));
+    }
 }
 exports.UnaryExpression = UnaryExpression;
-class VariableExpression extends Expression {
-    constructor(name, namespaceName) {
+class VariableExpression extends AstNode_1.Expression {
+    constructor(options) {
+        var _a;
         super();
-        this.name = name;
-        this.namespaceName = namespaceName;
-        this.range = this.name.range;
+        this.kind = AstNode_1.AstNodeKind.VariableExpression;
+        this.tokens = {
+            name: options.name
+        };
+        this.range = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.range;
     }
     getName(parseMode) {
-        return this.name.text;
+        return this.tokens.name.text;
     }
     transpile(state) {
-        var _a;
         let result = [];
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
         //if the callee is the name of a known namespace function
-        if (state.file.calleeIsKnownNamespaceFunction(this, (_a = this.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) {
+        if (state.file.calleeIsKnownNamespaceFunction(this, namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) {
             result.push(state.sourceNode(this, [
-                this.namespaceName.getName(Parser_1.ParseMode.BrightScript),
+                namespace.getName(Parser_1.ParseMode.BrightScript),
                 '_',
                 this.getName(Parser_1.ParseMode.BrightScript)
             ]));
             //transpile  normally
         }
         else {
-            result.push(state.transpileToken(this.name));
+            result.push(state.transpileToken(this.tokens.name));
         }
         return result;
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    getType(options) {
+        var _a;
+        let resultType = util_1.default.tokenToBscType(this.tokens.name);
+        const nameKey = this.getName();
+        if (!resultType) {
+            const symbolTable = this.getSymbolTable();
+            resultType = symbolTable === null || symbolTable === void 0 ? void 0 : symbolTable.getSymbolType(nameKey, Object.assign(Object.assign({}, options), { fullName: nameKey, tableProvider: () => this.getSymbolTable() }));
+        }
+        (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry(nameKey, resultType, options.data, this.range));
+        return resultType;
+    }
 }
 exports.VariableExpression = VariableExpression;
-class SourceLiteralExpression extends Expression {
-    constructor(token) {
+class SourceLiteralExpression extends AstNode_1.Expression {
+    constructor(options) {
+        var _a;
         super();
-        this.token = token;
-        this.range = token.range;
+        this.kind = AstNode_1.AstNodeKind.SourceLiteralExpression;
+        this.tokens = {
+            value: options.value
+        };
+        this.range = (_a = this.tokens.value) === null || _a === void 0 ? void 0 : _a.range;
+    }
+    /**
+     * Find the index of the function in its parent
+     */
+    findFunctionIndex(parentFunction, func) {
+        let index = -1;
+        parentFunction.findChild((node) => {
+            if ((0, reflection_1.isFunctionExpression)(node)) {
+                index++;
+                if (node === func) {
+                    return true;
+                }
+            }
+        }, {
+            walkMode: visitors_1.WalkMode.visitAllRecursive
+        });
+        return index;
     }
     getFunctionName(state, parseMode) {
-        let functionExpression = state.file.getFunctionExpressionAtPosition(this.token.range.start);
+        let func = state.file.getFunctionScopeAtPosition(this.tokens.value.range.start).func;
         let nameParts = [];
-        while (functionExpression.parentFunction) {
-            let index = functionExpression.parentFunction.childFunctionExpressions.indexOf(functionExpression);
+        let parentFunction;
+        while ((parentFunction = func.findAncestor(reflection_1.isFunctionExpression))) {
+            let index = this.findFunctionIndex(parentFunction, func);
             nameParts.unshift(`anon${index}`);
-            functionExpression = functionExpression.parentFunction;
+            func = parentFunction;
         }
         //get the index of this function in its parent
-        nameParts.unshift(functionExpression.functionStatement.getName(parseMode));
+        nameParts.unshift(func.functionStatement.getName(parseMode));
         return nameParts.join('$');
     }
     transpile(state) {
         let text;
-        switch (this.token.kind) {
+        switch (this.tokens.value.kind) {
             case TokenKind_1.TokenKind.SourceFilePathLiteral:
                 const pathUrl = fileUrl(state.srcPath);
                 text = `"${pathUrl.substring(0, 4)}" + "${pathUrl.substring(4)}"`;
                 break;
             case TokenKind_1.TokenKind.SourceLineNumLiteral:
-                text = `${this.token.range.start.line + 1}`;
+                text = `${this.tokens.value.range.start.line + 1}`;
                 break;
             case TokenKind_1.TokenKind.FunctionNameLiteral:
                 text = `"${this.getFunctionName(state, Parser_1.ParseMode.BrightScript)}"`;
@@ -736,18 +858,18 @@ class SourceLiteralExpression extends Expression {
                 break;
             case TokenKind_1.TokenKind.SourceLocationLiteral:
                 const locationUrl = fileUrl(state.srcPath);
-                text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.token.range.start.line + 1}"`;
+                text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.tokens.value.range.start.line + 1}"`;
                 break;
             case TokenKind_1.TokenKind.PkgPathLiteral:
-                text = `"${state.file.pkgPath.replace(/\.bs$/i, '.brs')}"`;
+                text = `"${util_1.default.sanitizePkgPath(state.file.pkgPath)}"`;
                 break;
             case TokenKind_1.TokenKind.PkgLocationLiteral:
-                text = `"${state.file.pkgPath.replace(/\.bs$/i, '.brs')}:" + str(LINE_NUM)`;
+                text = `"${util_1.default.sanitizePkgPath(state.file.pkgPath)}:" + str(LINE_NUM)`;
                 break;
             case TokenKind_1.TokenKind.LineNumLiteral:
             default:
                 //use the original text (because it looks like a variable)
-                text = this.token.text;
+                text = this.tokens.value.text;
                 break;
         }
         return [
@@ -764,61 +886,66 @@ exports.SourceLiteralExpression = SourceLiteralExpression;
  * except we need to uniquely identify these statements so we can
  * do more type checking.
  */
-class NewExpression extends Expression {
-    constructor(newKeyword, call) {
+class NewExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.newKeyword = newKeyword;
-        this.call = call;
-        this.range = util_1.default.createBoundingRange(this.newKeyword, this.call);
+        this.kind = AstNode_1.AstNodeKind.NewExpression;
+        this.tokens = {
+            new: options.new
+        };
+        this.call = options.call;
+        this.range = util_1.default.createBoundingRange(this.tokens.new, this.call);
     }
     /**
      * The name of the class to initialize (with optional namespace prefixed)
      */
     get className() {
         //the parser guarantees the callee of a new statement's call object will be
-        //a NamespacedVariableNameExpression
+        //either a VariableExpression or a DottedGet
         return this.call.callee;
     }
-    get namespaceName() {
-        return this.call.namespaceName;
-    }
     transpile(state) {
-        var _a, _b;
-        const cls = (_b = state.file.getClassFileLink(this.className.getName(Parser_1.ParseMode.BrighterScript), (_a = this.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) === null || _b === void 0 ? void 0 : _b.item;
+        var _a;
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        const cls = (_a = state.file.getClassFileLink(this.className.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;
         //new statements within a namespace block can omit the leading namespace if the class resides in that same namespace.
         //So we need to figure out if this is a namespace-omitted class, or if this class exists without a namespace.
         return this.call.transpile(state, cls === null || cls === void 0 ? void 0 : cls.getName(Parser_1.ParseMode.BrightScript));
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'call', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'call', visitor, options);
         }
     }
+    getType(options) {
+        return this.call.getType(options);
+    }
 }
 exports.NewExpression = NewExpression;
-class CallfuncExpression extends Expression {
-    constructor(callee, operator, methodName, openingParen, args, closingParen) {
+class CallfuncExpression extends AstNode_1.Expression {
+    constructor(options) {
         var _a;
         super();
-        this.callee = callee;
-        this.operator = operator;
-        this.methodName = methodName;
-        this.openingParen = openingParen;
-        this.args = args;
-        this.closingParen = closingParen;
-        this.range = util_1.default.createBoundingRange(this.callee, this.operator, this.methodName, this.openingParen, ...((_a = this.args) !== null && _a !== void 0 ? _a : []), this.closingParen);
+        this.kind = AstNode_1.AstNodeKind.CallfuncExpression;
+        this.tokens = {
+            operator: options.operator,
+            methodName: options.methodName,
+            openingParen: options.openingParen,
+            closingParen: options.closingParen
+        };
+        this.callee = options.callee;
+        this.args = (_a = options.args) !== null && _a !== void 0 ? _a : [];
+        this.range = util_1.default.createBoundingRange(this.callee, this.tokens.operator, this.tokens.methodName, this.tokens.openingParen, ...this.args, this.tokens.closingParen);
     }
     transpile(state) {
+        var _a;
         let result = [];
-        result.push(...this.callee.transpile(state), state.sourceNode(this.operator, '.callfunc'), state.transpileToken(this.openingParen), 
+        result.push(...this.callee.transpile(state), state.sourceNode(this.tokens.operator, '.callfunc'), state.transpileToken(this.tokens.openingParen, '('), 
         //the name of the function
-        state.sourceNode(this.methodName, ['"', this.methodName.text, '"']), ', ');
-        //transpile args
-        //callfunc with zero args never gets called, so pass invalid as the first parameter if there are no args
-        if (this.args.length === 0) {
-            result.push('invalid');
-        }
-        else {
+        state.sourceNode(this.tokens.methodName, ['"', this.tokens.methodName.text, '"']));
+        if (((_a = this.args) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            result.push(', ');
+            //transpile args
             for (let i = 0; i < this.args.length; i++) {
                 //add comma between args
                 if (i > 0) {
@@ -828,14 +955,44 @@ class CallfuncExpression extends Expression {
                 result.push(...arg.transpile(state));
             }
         }
-        result.push(state.transpileToken(this.closingParen));
+        else if (state.options.legacyCallfuncHandling) {
+            result.push(', ', 'invalid');
+        }
+        result.push(state.transpileToken(this.tokens.closingParen, ')'));
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'callee', visitor, options);
-            (0, visitors_1.walkArray)(this.args, visitor, options, this);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'callee', visitor, options);
+            (0, visitors_2.walkArray)(this.args, visitor, options, this);
+        }
+    }
+    getType(options) {
+        var _a, _b, _c;
+        let result = DynamicType_1.DynamicType.instance;
+        // a little hacky here with checking options.ignoreCall because callFuncExpression has the method name
+        // It's nicer for CallExpression, because it's a call on any expression.
+        const calleeType = this.callee.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime }));
+        if ((0, reflection_1.isComponentType)(calleeType) || (0, reflection_1.isReferenceType)(calleeType)) {
+            const funcType = (_b = (_a = calleeType).getCallFuncType) === null || _b === void 0 ? void 0 : _b.call(_a, this.tokens.methodName.text, options);
+            if (funcType) {
+                (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(this.tokens.methodName.text, funcType, options.data, this.tokens.methodName.range, (0, creators_1.createToken)(TokenKind_1.TokenKind.Callfunc)));
+                if (options.ignoreCall) {
+                    result = funcType;
+                }
+            }
+            /* TODO:
+                make callfunc return types work
+            else if (isCallableType(funcType) && (!isReferenceType(funcType.returnType) || funcType.returnType.isResolvable())) {
+                result = funcType.returnType;
+            } else if (!isReferenceType(funcType) && (funcType as any)?.returnType?.isResolvable()) {
+                result = (funcType as any).returnType;
+            } else {
+                return new TypePropertyReferenceType(funcType, 'returnType');
+            }
+            */
         }
+        return result;
     }
 }
 exports.CallfuncExpression = CallfuncExpression;
@@ -843,12 +1000,12 @@ exports.CallfuncExpression = CallfuncExpression;
  * Since template strings can contain newlines, we need to concatenate multiple strings together with chr() calls.
  * This is a single expression that represents the string contatenation of all parts of a single quasi.
  */
-class TemplateStringQuasiExpression extends Expression {
-    constructor(expressions) {
-        var _a;
+class TemplateStringQuasiExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.expressions = expressions;
-        this.range = util_1.default.createBoundingRange(...((_a = this.expressions) !== null && _a !== void 0 ? _a : []));
+        this.kind = AstNode_1.AstNodeKind.TemplateStringQuasiExpression;
+        this.expressions = options.expressions;
+        this.range = util_1.default.createBoundingRange(...this.expressions);
     }
     transpile(state, skipEmptyStrings = true) {
         let result = [];
@@ -856,7 +1013,7 @@ class TemplateStringQuasiExpression extends Expression {
         for (let expression of this.expressions) {
             //skip empty strings
             //TODO what does an empty string literal expression look like?
-            if (expression.token.text === '' && skipEmptyStrings === true) {
+            if (expression.tokens.value.text === '' && skipEmptyStrings === true) {
                 continue;
             }
             result.push(plus, ...expression.transpile(state));
@@ -865,28 +1022,32 @@ class TemplateStringQuasiExpression extends Expression {
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walkArray)(this.expressions, visitor, options, this);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walkArray)(this.expressions, visitor, options, this);
         }
     }
 }
 exports.TemplateStringQuasiExpression = TemplateStringQuasiExpression;
-class TemplateStringExpression extends Expression {
-    constructor(openingBacktick, quasis, expressions, closingBacktick) {
-        var _a;
+class TemplateStringExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.openingBacktick = openingBacktick;
-        this.quasis = quasis;
-        this.expressions = expressions;
-        this.closingBacktick = closingBacktick;
-        //the expression always starts and ends with a quasi, so we don't need to consider the expression locations
-        this.range = util_1.default.createBoundingRange(this.openingBacktick, ...((_a = this.quasis) !== null && _a !== void 0 ? _a : []), this.closingBacktick);
+        this.kind = AstNode_1.AstNodeKind.TemplateStringExpression;
+        this.tokens = {
+            openingBacktick: options.openingBacktick,
+            closingBacktick: options.closingBacktick
+        };
+        this.quasis = options.quasis;
+        this.expressions = options.expressions;
+        this.range = util_1.default.createBoundingRange(this.tokens.openingBacktick, this.quasis[0], this.quasis[this.quasis.length - 1], this.tokens.closingBacktick);
+    }
+    getType(options) {
+        return StringType_1.StringType.instance;
     }
     transpile(state) {
         if (this.quasis.length === 1 && this.expressions.length === 0) {
             return this.quasis[0].transpile(state);
         }
-        let result = [];
+        let result = ['('];
         let plus = '';
         //helper function to figure out when to include the plus
         function add(...items) {
@@ -905,7 +1066,7 @@ class TemplateStringExpression extends Expression {
             if (expression) {
                 //skip the toString wrapper around certain expressions
                 if ((0, reflection_1.isEscapedCharCodeLiteralExpression)(expression) ||
-                    ((0, reflection_1.isLiteralExpression)(expression) && (0, reflection_1.isStringType)(expression.type))) {
+                    ((0, reflection_1.isLiteralExpression)(expression) && (0, reflection_1.isStringType)(expression.getType()))) {
                     add(...expression.transpile(state));
                     //wrap all other expressions with a bslib_toString call to prevent runtime type mismatch errors
                 }
@@ -914,37 +1075,40 @@ class TemplateStringExpression extends Expression {
                 }
             }
         }
+        //the expression should be wrapped in parens so it can be used line a single expression at runtime
+        result.push(')');
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
             //walk the quasis and expressions in left-to-right order
             for (let i = 0; i < this.quasis.length; i++) {
-                (0, visitors_1.walk)(this.quasis, i, visitor, options, this);
+                (0, visitors_2.walk)(this.quasis, i, visitor, options, this);
                 //this skips the final loop iteration since we'll always have one more quasi than expression
                 if (this.expressions[i]) {
-                    (0, visitors_1.walk)(this.expressions, i, visitor, options, this);
+                    (0, visitors_2.walk)(this.expressions, i, visitor, options, this);
                 }
             }
         }
     }
 }
 exports.TemplateStringExpression = TemplateStringExpression;
-class TaggedTemplateStringExpression extends Expression {
-    constructor(tagName, openingBacktick, quasis, expressions, closingBacktick) {
-        var _a;
+class TaggedTemplateStringExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.tagName = tagName;
-        this.openingBacktick = openingBacktick;
-        this.quasis = quasis;
-        this.expressions = expressions;
-        this.closingBacktick = closingBacktick;
-        //the expression always starts and ends with a quasi, so we don't need to consider the expression locations
-        this.range = util_1.default.createBoundingRange(this.tagName, this.openingBacktick, ...((_a = this.quasis) !== null && _a !== void 0 ? _a : []), this.closingBacktick);
+        this.kind = AstNode_1.AstNodeKind.TaggedTemplateStringExpression;
+        this.tokens = {
+            tagName: options.tagName,
+            openingBacktick: options.openingBacktick,
+            closingBacktick: options.closingBacktick
+        };
+        this.quasis = options.quasis;
+        this.expressions = options.expressions;
+        this.range = util_1.default.createBoundingRange(this.tokens.tagName, this.tokens.openingBacktick, this.quasis[0], this.quasis[this.quasis.length - 1], this.tokens.closingBacktick);
     }
     transpile(state) {
         let result = [];
-        result.push(state.transpileToken(this.tagName), '([');
+        result.push(state.transpileToken(this.tokens.tagName), '([');
         //add quasis as the first array
         for (let i = 0; i < this.quasis.length; i++) {
             let quasi = this.quasis[i];
@@ -963,38 +1127,36 @@ class TaggedTemplateStringExpression extends Expression {
             }
             result.push(...expression.transpile(state));
         }
-        result.push(state.sourceNode(this.closingBacktick, '])'));
+        result.push(state.sourceNode(this.tokens.closingBacktick, '])'));
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
             //walk the quasis and expressions in left-to-right order
             for (let i = 0; i < this.quasis.length; i++) {
-                (0, visitors_1.walk)(this.quasis, i, visitor, options, this);
+                (0, visitors_2.walk)(this.quasis, i, visitor, options, this);
                 //this skips the final loop iteration since we'll always have one more quasi than expression
                 if (this.expressions[i]) {
-                    (0, visitors_1.walk)(this.expressions, i, visitor, options, this);
+                    (0, visitors_2.walk)(this.expressions, i, visitor, options, this);
                 }
             }
         }
     }
 }
 exports.TaggedTemplateStringExpression = TaggedTemplateStringExpression;
-class AnnotationExpression extends Expression {
-    constructor(atToken, nameToken) {
+class AnnotationExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.atToken = atToken;
-        this.nameToken = nameToken;
-        this.name = nameToken.text;
+        this.kind = AstNode_1.AstNodeKind.AnnotationExpression;
+        this.tokens = {
+            at: options.at,
+            name: options.name
+        };
+        this.call = options.call;
+        this.name = this.tokens.name.text;
     }
     get range() {
-        return this.cacheRange();
-    }
-    cacheRange() {
-        if (!this._range) {
-            this._range = util_1.default.createBoundingRange(this.atToken, this.nameToken, this.call);
-        }
-        return this._range;
+        return util_1.default.createBoundingRange(this.tokens.at, this.tokens.name, this.call);
     }
     /**
      * Convert annotation arguments to JavaScript types
@@ -1006,6 +1168,10 @@ class AnnotationExpression extends Expression {
         }
         return this.call.args.map(e => expressionToValue(e, strict));
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.at) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
     transpile(state) {
         return [];
     }
@@ -1022,15 +1188,18 @@ class AnnotationExpression extends Expression {
     }
 }
 exports.AnnotationExpression = AnnotationExpression;
-class TernaryExpression extends Expression {
-    constructor(test, questionMarkToken, consequent, colonToken, alternate) {
+class TernaryExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.test = test;
-        this.questionMarkToken = questionMarkToken;
-        this.consequent = consequent;
-        this.colonToken = colonToken;
-        this.alternate = alternate;
-        this.range = util_1.default.createBoundingRange(this.test, this.questionMarkToken, this.consequent, this.colonToken, this.alternate);
+        this.kind = AstNode_1.AstNodeKind.TernaryExpression;
+        this.tokens = {
+            questionMark: options.questionMark,
+            colon: options.colon
+        };
+        this.test = options.test;
+        this.consequent = options.consequent;
+        this.alternate = options.alternate;
+        this.range = util_1.default.createBoundingRange(this.test, this.tokens.questionMark, this.consequent, this.tokens.colon, this.alternate);
     }
     transpile(state) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
@@ -1044,12 +1213,12 @@ class TernaryExpression extends Expression {
             ...alternateInfo.expressions
         ].filter(e => e instanceof CallExpression || e instanceof CallfuncExpression || e instanceof DottedGetExpression);
         if (mutatingExpressions.length > 0) {
-            result.push(state.sourceNode(this.questionMarkToken, 
+            result.push(state.sourceNode(this.tokens.questionMark, 
             //write all the scope variables as parameters.
             //TODO handle when there are more than 31 parameters
             `(function(__bsCondition, ${allUniqueVarNames.join(', ')})`), state.newline, 
             //double indent so our `end function` line is still indented one at the end
-            state.indent(2), state.sourceNode(this.test, `if __bsCondition then`), state.newline, state.indent(1), state.sourceNode((_a = this.consequent) !== null && _a !== void 0 ? _a : this.questionMarkToken, 'return '), ...(_c = (_b = this.consequent) === null || _b === void 0 ? void 0 : _b.transpile(state)) !== null && _c !== void 0 ? _c : [state.sourceNode(this.questionMarkToken, 'invalid')], state.newline, state.indent(-1), state.sourceNode((_d = this.consequent) !== null && _d !== void 0 ? _d : this.questionMarkToken, 'else'), state.newline, state.indent(1), state.sourceNode((_e = this.consequent) !== null && _e !== void 0 ? _e : this.questionMarkToken, 'return '), ...(_g = (_f = this.alternate) === null || _f === void 0 ? void 0 : _f.transpile(state)) !== null && _g !== void 0 ? _g : [state.sourceNode((_h = this.consequent) !== null && _h !== void 0 ? _h : this.questionMarkToken, 'invalid')], state.newline, state.indent(-1), state.sourceNode(this.questionMarkToken, 'end if'), state.newline, state.indent(-1), state.sourceNode(this.questionMarkToken, 'end function)('), ...this.test.transpile(state), state.sourceNode(this.questionMarkToken, `, ${allUniqueVarNames.join(', ')})`));
+            state.indent(2), state.sourceNode(this.test, `if __bsCondition then`), state.newline, state.indent(1), state.sourceNode((_a = this.consequent) !== null && _a !== void 0 ? _a : this.tokens.questionMark, 'return '), ...(_c = (_b = this.consequent) === null || _b === void 0 ? void 0 : _b.transpile(state)) !== null && _c !== void 0 ? _c : [state.sourceNode(this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode((_d = this.consequent) !== null && _d !== void 0 ? _d : this.tokens.questionMark, 'else'), state.newline, state.indent(1), state.sourceNode((_e = this.consequent) !== null && _e !== void 0 ? _e : this.tokens.questionMark, 'return '), ...(_g = (_f = this.alternate) === null || _f === void 0 ? void 0 : _f.transpile(state)) !== null && _g !== void 0 ? _g : [state.sourceNode((_h = this.consequent) !== null && _h !== void 0 ? _h : this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end if'), state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end function)('), ...this.test.transpile(state), state.sourceNode(this.tokens.questionMark, `, ${allUniqueVarNames.join(', ')})`));
             state.blockDepth--;
         }
         else {
@@ -1058,21 +1227,24 @@ class TernaryExpression extends Expression {
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'test', visitor, options);
-            (0, visitors_1.walk)(this, 'consequent', visitor, options);
-            (0, visitors_1.walk)(this, 'alternate', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'test', visitor, options);
+            (0, visitors_2.walk)(this, 'consequent', visitor, options);
+            (0, visitors_2.walk)(this, 'alternate', visitor, options);
         }
     }
 }
 exports.TernaryExpression = TernaryExpression;
-class NullCoalescingExpression extends Expression {
-    constructor(consequent, questionQuestionToken, alternate) {
+class NullCoalescingExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.consequent = consequent;
-        this.questionQuestionToken = questionQuestionToken;
-        this.alternate = alternate;
-        this.range = util_1.default.createBoundingRange(this.consequent, this.questionQuestionToken, this.alternate);
+        this.kind = AstNode_1.AstNodeKind.NullCoalescingExpression;
+        this.tokens = {
+            questionQuestion: options.questionQuestion
+        };
+        this.consequent = options.consequent;
+        this.alternate = options.alternate;
+        this.range = util_1.default.createBoundingRange(this.consequent, this.tokens.questionQuestion, this.alternate);
     }
     transpile(state) {
         let result = [];
@@ -1101,18 +1273,24 @@ class NullCoalescingExpression extends Expression {
         return result;
     }
     walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'consequent', visitor, options);
-            (0, visitors_1.walk)(this, 'alternate', visitor, options);
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'consequent', visitor, options);
+            (0, visitors_2.walk)(this, 'alternate', visitor, options);
         }
     }
 }
 exports.NullCoalescingExpression = NullCoalescingExpression;
-class RegexLiteralExpression extends Expression {
-    constructor(tokens) {
+class RegexLiteralExpression extends AstNode_1.Expression {
+    constructor(options) {
         super();
-        this.tokens = tokens;
-        this.range = this.tokens.regexLiteral.range;
+        this.kind = AstNode_1.AstNodeKind.RegexLiteralExpression;
+        this.tokens = {
+            regexLiteral: options.regexLiteral
+        };
+    }
+    get range() {
+        var _a, _b;
+        return (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.regexLiteral) === null || _b === void 0 ? void 0 : _b.range;
     }
     transpile(state) {
         var _a, _b;
@@ -1143,125 +1321,22 @@ class RegexLiteralExpression extends Expression {
     }
 }
 exports.RegexLiteralExpression = RegexLiteralExpression;
-class TypeExpression extends Expression {
-    constructor(tokens, namespaceName) {
-        super();
-        this.tokens = tokens;
-        this.namespaceName = namespaceName;
-        this.range = util_1.default.createBoundingRange(this.tokens.type);
-    }
-    /**
-     * The this TypeExpression refers to
-     */
-    get type() {
-        if (this._type) {
-            return this._type;
-        }
-        this._type = this.getType(Parser_1.ParseMode.BrighterScript);
-        return this._type;
-    }
-    /**
-     * Derive a BscType from the type token
-     * Can deal with multiple brackets to make multidimensional arrays, eg. float[][]
-     * Defaults to `DynamicType`
-     */
-    getType(parseMode = Parser_1.ParseMode.BrighterScript) {
-        let exprType = this.tokens.type
-            ? util_1.default.tokenToBscType(this.tokens.type, parseMode === Parser_1.ParseMode.BrighterScript, this.namespaceName)
-            : new DynamicType_1.DynamicType();
-        return exprType;
-    }
-    /**
-     * Is this a valid, (eg. known) type?
-     */
-    isValidType(parseMode = Parser_1.ParseMode.BrighterScript) {
-        return !!util_1.default.tokenToBscType(this.tokens.type, parseMode === Parser_1.ParseMode.BrighterScript, this.namespaceName);
-    }
-    /**
-     * Gives a human readable string that says the type
-     * @returns text to display to show the type
-     */
-    getText() {
-        let result = this.tokens.type.text;
-        return result;
-    }
-    transpile(state) {
-        let result = [];
-        //type declaration
-        result.push(state.sourceNode({ range: this.range }, this.type.toTypeString(state.typeContext)));
-        return result;
-    }
-    walk(visitor, options) {
-        //nothing to walk
-    }
-}
-exports.TypeExpression = TypeExpression;
-class ArrayTypeExpression extends TypeExpression {
-    constructor(innerTypes, // this is an array so that in the future when we support union types
-    bracketTokens, namespaceName) {
-        super({}, namespaceName);
-        this.innerTypes = innerTypes;
-        this.bracketTokens = bracketTokens;
-        this.namespaceName = namespaceName;
-        this.range = util_1.default.createBoundingRange(this.bracketTokens.leftBracket, this.bracketTokens.rightBracket, ...this.innerTypes);
-    }
-    /*
-     * TODO - Support union types
-    */
-    get defaultTypeExpression() {
-        return this.innerTypes[0];
-    }
-    /**
-     * Derive a BscType from the type token
-     * Returns an array type with the inner types based on the inner type expressions
-     */
-    getType(parseMode = Parser_1.ParseMode.BrighterScript) {
-        const innerBscTypes = this.innerTypes.map(inner => inner.getType(parseMode));
-        return new ArrayType_1.ArrayType(...innerBscTypes);
-    }
-    /**
-     * Is this a valid, (eg. known) type?
-     */
-    isValidType(parseMode = Parser_1.ParseMode.BrighterScript) {
-        if (parseMode === Parser_1.ParseMode.BrighterScript) {
-            return this.innerTypes.reduce((validSoFar, innerType) => {
-                return validSoFar && innerType.isValidType(parseMode);
-            }, true);
-        }
-        return false;
-    }
-    /**
-     * Gives a human readable string that says the type
-     * @returns text to display to show the type
-     */
-    getText() {
-        return this.defaultTypeExpression.getText() + '[]';
-    }
-    walk(visitor, options) {
-        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            for (let i = 0; i < this.innerTypes.length; i++) {
-                (0, visitors_1.walk)(this.innerTypes, i, visitor, options, this);
-            }
-        }
-    }
-}
-exports.ArrayTypeExpression = ArrayTypeExpression;
 function expressionToValue(expr, strict) {
     if (!expr) {
         return null;
     }
     if ((0, reflection_1.isUnaryExpression)(expr) && (0, reflection_1.isLiteralNumber)(expr.right)) {
-        return numberExpressionToValue(expr.right, expr.operator.text);
+        return numberExpressionToValue(expr.right, expr.tokens.operator.text);
     }
     if ((0, reflection_1.isLiteralString)(expr)) {
         //remove leading and trailing quotes
-        return expr.token.text.replace(/^"/, '').replace(/"$/, '');
+        return expr.tokens.value.text.replace(/^"/, '').replace(/"$/, '');
     }
     if ((0, reflection_1.isLiteralNumber)(expr)) {
         return numberExpressionToValue(expr);
     }
     if ((0, reflection_1.isLiteralBoolean)(expr)) {
-        return expr.token.text.toLowerCase() === 'true';
+        return expr.tokens.value.text.toLowerCase() === 'true';
     }
     if ((0, reflection_1.isArrayLiteralExpression)(expr)) {
         return expr.elements
@@ -1271,7 +1346,7 @@ function expressionToValue(expr, strict) {
     if ((0, reflection_1.isAALiteralExpression)(expr)) {
         return expr.elements.reduce((acc, e) => {
             if (!(0, reflection_1.isCommentStatement)(e)) {
-                acc[e.keyToken.text] = expressionToValue(e.value, strict);
+                acc[e.tokens.key.text] = expressionToValue(e.value, strict);
             }
             return acc;
         }, {});
@@ -1279,11 +1354,93 @@ function expressionToValue(expr, strict) {
     return strict ? null : expr;
 }
 function numberExpressionToValue(expr, operator = '') {
-    if ((0, reflection_1.isIntegerType)(expr.type) || (0, reflection_1.isLongIntegerType)(expr.type)) {
-        return parseInt(operator + expr.token.text);
+    if ((0, reflection_1.isIntegerType)(expr.getType()) || (0, reflection_1.isLongIntegerType)(expr.getType())) {
+        return parseInt(operator + expr.tokens.value.text);
     }
     else {
-        return parseFloat(operator + expr.token.text);
+        return parseFloat(operator + expr.tokens.value.text);
+    }
+}
+class TypeExpression extends AstNode_1.Expression {
+    constructor(options) {
+        var _a;
+        super();
+        this.kind = AstNode_1.AstNodeKind.TypeExpression;
+        this.expression = options.expression;
+        this.range = (_a = this.expression) === null || _a === void 0 ? void 0 : _a.range;
+    }
+    transpile(state) {
+        return [this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }).toTypeString()];
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'expression', visitor, options);
+        }
+    }
+    getType(options) {
+        return this.expression.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime }));
+    }
+    getTypedef(state) {
+        // TypeDefs should pass through any valid type names
+        return this.expression.transpile(state);
+    }
+    getName(parseMode = Parser_1.ParseMode.BrighterScript) {
+        //TODO: this may not support Complex Types, eg. generics or Unions
+        return util_1.default.getAllDottedGetPartsAsString(this.expression, parseMode);
+    }
+    getNameParts() {
+        //TODO: really, this code is only used to get Namespaces. It could be more clear.
+        return util_1.default.getAllDottedGetParts(this.expression).map(x => x.text);
+    }
+}
+exports.TypeExpression = TypeExpression;
+class TypeCastExpression extends AstNode_1.Expression {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.TypeCastExpression;
+        this.tokens = {
+            as: options.as
+        };
+        this.obj = options.obj;
+        this.typeExpression = options.typeExpression;
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.as, this.typeExpression);
+    }
+    transpile(state) {
+        return this.obj.transpile(state);
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'obj', visitor, options);
+            (0, visitors_2.walk)(this, 'typeExpression', visitor, options);
+        }
+    }
+    getType(options) {
+        return this.typeExpression.getType(options);
+    }
+}
+exports.TypeCastExpression = TypeCastExpression;
+class TypedArrayExpression extends AstNode_1.Expression {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.TypedArrayExpression;
+        this.tokens = {
+            leftBracket: options.leftBracket,
+            rightBracket: options.rightBracket
+        };
+        this.innerType = options.innerType;
+        this.range = util_1.default.createBoundingRange(this.innerType, this.tokens.leftBracket, this.tokens.rightBracket);
+    }
+    transpile(state) {
+        return [this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }).toTypeString()];
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'innerType', visitor, options);
+        }
+    }
+    getType(options) {
+        return new types_1.ArrayType(this.innerType.getType(options));
     }
 }
+exports.TypedArrayExpression = TypedArrayExpression;
 //# sourceMappingURL=Expression.js.map