brighterscript 0.66.0-alpha.9 → 0.67.1

package/dist/parser/Expression.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.TypeCastExpression = 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 = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const util_1 = require("../util");
 const Parser_1 = require("./Parser");
@@ -8,28 +8,19 @@ 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 SymbolTable_1 = require("../SymbolTable");
-const TypedFunctionType_1 = require("../types/TypedFunctionType");
+const VoidType_1 = require("../types/VoidType");
+const DynamicType_1 = require("../types/DynamicType");
+const FunctionType_1 = require("../types/FunctionType");
 const AstNode_1 = require("./AstNode");
-const SymbolTable_2 = require("../SymbolTable");
+const SymbolTable_1 = require("../SymbolTable");
 const source_map_1 = require("source-map");
-const StringType_1 = require("../types/StringType");
-const DynamicType_1 = require("../types/DynamicType");
-const VoidType_1 = require("../types/VoidType");
-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(left, operator, right) {
         super();
         this.left = left;
         this.operator = operator;
         this.right = right;
-        this.kind = AstNode_1.AstNodeKind.BinaryExpression;
-        this.range = util_1.default.createRangeFromPositions(this.left.range.start, this.right.range.end);
+        this.range = util_1.default.createBoundingRange(this.left, this.operator, this.right);
     }
     transpile(state) {
         return [
@@ -46,21 +37,6 @@ class BinaryExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'right', visitor, options);
         }
     }
-    getType(options) {
-        const operatorKind = this.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.operator, this.right.getType(options));
-        }
-        return DynamicType_1.DynamicType.instance;
-    }
 }
 exports.BinaryExpression = BinaryExpression;
 class CallExpression extends AstNode_1.Expression {
@@ -74,9 +50,16 @@ class CallExpression extends AstNode_1.Expression {
         this.openingParen = openingParen;
         this.closingParen = closingParen;
         this.args = args;
-        this.kind = AstNode_1.AstNodeKind.CallExpression;
         this.range = util_1.default.createBoundingRange(this.callee, this.openingParen, ...args, this.closingParen);
     }
+    /**
+     * 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, nameOverride) {
         let result = [];
         //transpile the name
@@ -106,28 +89,18 @@ class CallExpression extends AstNode_1.Expression {
             (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 = 32;
+/**
+ * Number of parameters that can be defined on a function
+ *
+ * Prior to Roku OS 11.5, this was 32
+ * As of Roku OS 11.5, this is 63
+ */
+CallExpression.MaximumArguments = 63;
 class FunctionExpression extends AstNode_1.Expression {
-    constructor(parameters, body, functionType, end, leftParen, rightParen, asToken, returnTypeExpression) {
+    constructor(parameters, body, functionType, end, leftParen, rightParen, asToken, returnTypeToken) {
+        var _a;
         super();
         this.parameters = parameters;
         this.body = body;
@@ -136,29 +109,63 @@ class FunctionExpression extends AstNode_1.Expression {
         this.leftParen = leftParen;
         this.rightParen = rightParen;
         this.asToken = asToken;
-        this.returnTypeExpression = returnTypeExpression;
-        this.kind = AstNode_1.AstNodeKind.FunctionExpression;
+        this.returnTypeToken = returnTypeToken;
         /**
          * The list of function calls that are declared within this function scope. This excludes CallExpressions
          * declared in child functions
          */
         this.callExpressions = [];
+        if (this.returnTypeToken) {
+            this.returnType = util_1.default.tokenToBscType(this.returnTypeToken);
+        }
+        else if (((_a = this.functionType) === null || _a === void 0 ? void 0 : _a.text.toLowerCase()) === 'sub') {
+            this.returnType = new VoidType_1.VoidType();
+        }
+        else {
+            this.returnType = DynamicType_1.DynamicType.instance;
+        }
         //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.body.symbolTable = new SymbolTable_1.SymbolTable(`Function Body`);
         }
-        this.symbolTable = new SymbolTable_2.SymbolTable('FunctionExpression', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+        this.symbolTable = new SymbolTable_1.SymbolTable('FunctionExpression', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
-    getLeadingTrivia() {
-        var _a, _b;
-        return (_b = (_a = this.functionType) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    /**
+     * 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 the name of the wrapping namespace (if it exists)
+     * @deprecated use `.findAncestor(isFunctionExpression)` instead.
+     */
+    get parentFunction() {
+        return this.findAncestor(reflection_1.isFunctionExpression);
+    }
+    /**
+     * A list of all child functions declared directly within this function
+     * @deprecated use `.walk(createVisitor({ FunctionExpression: ()=>{}), { walkMode: WalkMode.visitAllRecursive })` instead
+     */
+    get childFunctionExpressions() {
+        const expressions = [];
+        this.walk((0, visitors_1.createVisitor)({
+            FunctionExpression: (expression) => {
+                expressions.push(expression);
+            }
+        }), {
+            walkMode: visitors_1.WalkMode.visitAllRecursive
+        });
+        return expressions;
     }
     /**
      * 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'
      */
     get range() {
-        return util_1.default.createBoundingRange(this.functionType, this.leftParen, ...this.parameters, this.rightParen, this.asToken, this.returnTypeExpression, this.end);
+        return util_1.default.createBoundingRange(this.functionType, this.leftParen, ...this.parameters, this.rightParen, this.asToken, this.returnTypeToken, this.end);
     }
     transpile(state, name, includeBody = true) {
         let results = [];
@@ -183,12 +190,12 @@ class FunctionExpression extends AstNode_1.Expression {
         //right paren
         results.push(state.transpileToken(this.rightParen));
         //as [Type]
-        if (this.asToken && !state.options.removeParameterTypes && this.returnTypeExpression) {
+        if (this.asToken && !state.options.removeParameterTypes) {
             results.push(' ', 
             //as
             state.transpileToken(this.asToken), ' ', 
             //return type
-            ...this.returnTypeExpression.transpile(state));
+            state.sourceNode(this.returnTypeToken, this.returnType.toTypeString()));
         }
         if (includeBody) {
             state.lineage.unshift(this);
@@ -202,7 +209,7 @@ class FunctionExpression extends AstNode_1.Expression {
         return results;
     }
     getTypedef(state) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         let results = [
             new source_map_1.SourceNode(1, 0, null, [
                 //'function'|'sub'
@@ -222,7 +229,7 @@ class FunctionExpression extends AstNode_1.Expression {
                 //as <ReturnType>
                 ...(this.asToken ? [
                     ' as ',
-                    ...this.returnTypeExpression.getTypedef(state)
+                    (_f = this.returnTypeToken) === null || _f === void 0 ? void 0 : _f.text
                 ] : []),
                 '\n',
                 state.indent(),
@@ -235,68 +242,41 @@ class FunctionExpression extends AstNode_1.Expression {
     walk(visitor, options) {
         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_2.InternalWalkMode.recurseChildFunctions) {
                 (0, visitors_2.walk)(this, 'body', visitor, options);
             }
         }
     }
-    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(Object.assign(Object.assign({}, options), { typeChain: undefined }));
-        const isSub = this.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;
+    getFunctionType() {
+        var _a;
+        let functionType = new FunctionType_1.FunctionType(this.returnType);
+        functionType.isSub = ((_a = this.functionType) === null || _a === void 0 ? void 0 : _a.text) === 'sub';
         for (let param of this.parameters) {
-            resultType.addParameter(param.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
-                (_b = this.parent.parent) === null || _b === void 0 ? void 0 : _b.getType(options);
-            }
-        }
-        else if ((0, reflection_1.isFunctionStatement)(this.parent)) {
-            funcName = this.parent.getName(Parser_1.ParseMode.BrighterScript);
-        }
-        if (funcName) {
-            resultType.setName(funcName);
+            functionType.addParameter(param.name.text, param.type, !!param.typeToken);
         }
-        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(funcName, resultType, options.flags, this.range));
-        return resultType;
+        return functionType;
     }
 }
 exports.FunctionExpression = FunctionExpression;
 class FunctionParameterExpression extends AstNode_1.Expression {
-    constructor(name, equalToken, defaultValue, asToken, typeExpression) {
+    constructor(name, typeToken, defaultValue, asToken) {
         super();
         this.name = name;
-        this.equalToken = equalToken;
+        this.typeToken = typeToken;
         this.defaultValue = defaultValue;
         this.asToken = asToken;
-        this.typeExpression = typeExpression;
-        this.kind = AstNode_1.AstNodeKind.FunctionParameterExpression;
-    }
-    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.name.text, paramType, options.flags, this.range));
-        return paramType;
+        if (typeToken) {
+            this.type = util_1.default.tokenToBscType(typeToken);
+        }
+        else {
+            this.type = new DynamicType_1.DynamicType();
+        }
     }
     get range() {
-        return util_1.default.createBoundingRange(this.name, this.asToken, this.typeExpression, this.defaultValue);
+        return util_1.default.createBoundingRange(this.name, this.asToken, this.typeToken, this.defaultValue);
     }
     transpile(state) {
-        var _a, _b;
         let result = [
             //name
             state.transpileToken(this.name)
@@ -311,36 +291,78 @@ class FunctionParameterExpression extends AstNode_1.Expression {
             result.push(' ');
             result.push(state.transpileToken(this.asToken));
             result.push(' ');
-            result.push(...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : []));
+            result.push(state.sourceNode(this.typeToken, this.type.toTypeString()));
         }
         return result;
     }
     getTypedef(state) {
-        var _a, _b;
-        return [
-            //name
-            this.name.text,
-            //default value
-            ...(this.defaultValue ? [
-                ' = ',
-                ...this.defaultValue.transpile(state)
-            ] : []),
-            //type declaration
-            ...(this.asToken ? [
-                ' as ',
-                ...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getTypedef(state)) !== null && _b !== void 0 ? _b : [''])
-            ] : [])
-        ];
+        const results = [this.name.text];
+        if (this.defaultValue) {
+            results.push(' = ', ...this.defaultValue.transpile(state));
+        }
+        if (this.asToken) {
+            results.push(' as ');
+            // TODO: Is this conditional needed? Will typeToken always exist
+            // so long as `asToken` exists?
+            if (this.typeToken) {
+                results.push(this.typeToken.text);
+            }
+        }
+        return results;
     }
     walk(visitor, options) {
         // eslint-disable-next-line no-bitwise
-        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+        if (this.defaultValue && options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
             (0, visitors_2.walk)(this, 'defaultValue', visitor, options);
-            (0, visitors_2.walk)(this, 'typeExpression', visitor, options);
         }
     }
 }
 exports.FunctionParameterExpression = FunctionParameterExpression;
+class NamespacedVariableNameExpression extends AstNode_1.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) {
+        return [
+            state.sourceNode(this, this.getName(Parser_1.ParseMode.BrightScript))
+        ];
+    }
+    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) {
+        if (parseMode === Parser_1.ParseMode.BrighterScript) {
+            return this.getNameParts().join('.');
+        }
+        else {
+            return this.getNameParts().join('_');
+        }
+    }
+    walk(visitor, options) {
+        var _a;
+        (_a = this.expression) === null || _a === void 0 ? void 0 : _a.link();
+        if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
+            (0, visitors_2.walk)(this, 'expression', visitor, options);
+        }
+    }
+}
+exports.NamespacedVariableNameExpression = NamespacedVariableNameExpression;
 class DottedGetExpression extends AstNode_1.Expression {
     constructor(obj, name, 
     /**
@@ -351,15 +373,12 @@ class DottedGetExpression extends AstNode_1.Expression {
         this.obj = obj;
         this.name = name;
         this.dot = dot;
-        this.kind = AstNode_1.AstNodeKind.DottedGetExpression;
         this.range = util_1.default.createBoundingRange(this.obj, this.dot, this.name);
     }
     transpile(state) {
         //if the callee starts with a namespace name, transpile the name
         if (state.file.calleeStartsWithNamespace(this)) {
-            return [
-                state.sourceNode(this, this.getName(Parser_1.ParseMode.BrightScript))
-            ];
+            return new NamespacedVariableNameExpression(this).transpile(state);
         }
         else {
             return [
@@ -374,22 +393,6 @@ class DottedGetExpression extends AstNode_1.Expression {
             (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.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.name) === null || _d === void 0 ? void 0 : _d.text, result, options.flags, (_f = (_e = this.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 AstNode_1.Expression {
@@ -402,7 +405,6 @@ class XmlAttributeGetExpression extends AstNode_1.Expression {
         this.obj = obj;
         this.name = name;
         this.at = at;
-        this.kind = AstNode_1.AstNodeKind.XmlAttributeGetExpression;
         this.range = util_1.default.createBoundingRange(this.obj, this.at, this.name);
     }
     transpile(state) {
@@ -424,41 +426,45 @@ class IndexedGetExpression extends AstNode_1.Expression {
     /**
      * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.`
      */
-    openingSquare, closingSquare, questionDotToken //  ? or ?.
-    ) {
+    openingSquare, closingSquare, questionDotToken, //  ? or ?.
+    /**
+     * More indexes, separated by commas
+     */
+    additionalIndexes) {
+        var _a;
         super();
         this.obj = obj;
         this.index = index;
         this.openingSquare = openingSquare;
         this.closingSquare = closingSquare;
         this.questionDotToken = questionDotToken;
-        this.kind = AstNode_1.AstNodeKind.IndexedGetExpression;
+        this.additionalIndexes = additionalIndexes;
         this.range = util_1.default.createBoundingRange(this.obj, this.openingSquare, this.questionDotToken, this.openingSquare, this.index, this.closingSquare);
+        (_a = this.additionalIndexes) !== null && _a !== void 0 ? _a : (this.additionalIndexes = []);
     }
     transpile(state) {
         var _a, _b;
-        return [
-            ...this.obj.transpile(state),
-            this.questionDotToken ? state.transpileToken(this.questionDotToken) : '',
-            state.transpileToken(this.openingSquare),
-            ...((_b = (_a = this.index) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : []),
-            this.closingSquare ? state.transpileToken(this.closingSquare) : ''
-        ];
+        const result = [];
+        result.push(...this.obj.transpile(state), this.questionDotToken ? state.transpileToken(this.questionDotToken) : '', state.transpileToken(this.openingSquare));
+        const indexes = [this.index, ...(_a = this.additionalIndexes) !== null && _a !== void 0 ? _a : []];
+        for (let i = 0; i < indexes.length; i++) {
+            //add comma between indexes
+            if (i > 0) {
+                result.push(', ');
+            }
+            let index = indexes[i];
+            result.push(...((_b = index === null || index === void 0 ? void 0 : index.transpile(state)) !== null && _b !== void 0 ? _b : []));
+        }
+        result.push(this.closingSquare ? state.transpileToken(this.closingSquare) : '');
+        return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
             (0, visitors_2.walk)(this, 'obj', visitor, options);
             (0, visitors_2.walk)(this, 'index', visitor, options);
+            (0, visitors_2.walkArray)(this.additionalIndexes, 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 AstNode_1.Expression {
@@ -466,10 +472,12 @@ class GroupingExpression extends AstNode_1.Expression {
         super();
         this.tokens = tokens;
         this.expression = expression;
-        this.kind = AstNode_1.AstNodeKind.GroupingExpression;
         this.range = util_1.default.createBoundingRange(this.tokens.left, this.expression, this.tokens.right);
     }
     transpile(state) {
+        if ((0, reflection_1.isTypeCastExpression)(this.expression)) {
+            return this.expression.transpile(state);
+        }
         return [
             state.transpileToken(this.tokens.left),
             ...this.expression.transpile(state),
@@ -481,30 +489,24 @@ class GroupingExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'expression', visitor, options);
         }
     }
-    getType(options) {
-        return this.expression.getType(options);
-    }
 }
 exports.GroupingExpression = GroupingExpression;
 class LiteralExpression extends AstNode_1.Expression {
     constructor(token) {
         super();
         this.token = token;
-        this.kind = AstNode_1.AstNodeKind.LiteralExpression;
+        this.type = util_1.default.tokenToBscType(token);
     }
     get range() {
         return this.token.range;
     }
-    getType(options) {
-        return util_1.default.tokenToBscType(this.token);
-    }
     transpile(state) {
         let text;
         if (this.token.kind === TokenKind_1.TokenKind.TemplateStringQuasi) {
             //wrap quasis with quotes (and escape inner quotemarks)
             text = `"${this.token.text.replace(/"/g, '""')}"`;
         }
-        else if (this.token.kind === TokenKind_1.TokenKind.StringLiteral) {
+        else if ((0, reflection_1.isStringType)(this.type)) {
             text = this.token.text;
             //add trailing quotemark if it's missing. We will have already generated a diagnostic for this.
             if (text.endsWith('"') === false) {
@@ -531,7 +533,6 @@ class EscapedCharCodeLiteralExpression extends AstNode_1.Expression {
     constructor(token) {
         super();
         this.token = token;
-        this.kind = AstNode_1.AstNodeKind.EscapedCharCodeLiteralExpression;
         this.range = token.range;
     }
     transpile(state) {
@@ -551,7 +552,6 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
         this.open = open;
         this.close = close;
         this.hasSpread = hasSpread;
-        this.kind = AstNode_1.AstNodeKind.ArrayLiteralExpression;
         this.range = util_1.default.createBoundingRange(this.open, ...this.elements, this.close);
     }
     transpile(state) {
@@ -595,10 +595,6 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
             (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 AstNode_1.Expression {
@@ -609,7 +605,6 @@ class AAMemberExpression extends AstNode_1.Expression {
         this.keyToken = keyToken;
         this.colonToken = colonToken;
         this.value = value;
-        this.kind = AstNode_1.AstNodeKind.AAMemberExpression;
         this.range = util_1.default.createBoundingRange(this.keyToken, this.colonToken, this.value);
     }
     transpile(state) {
@@ -619,9 +614,6 @@ class AAMemberExpression extends AstNode_1.Expression {
     walk(visitor, options) {
         (0, visitors_2.walk)(this, 'value', visitor, options);
     }
-    getType(options) {
-        return this.value.getType(options);
-    }
 }
 exports.AAMemberExpression = AAMemberExpression;
 class AALiteralExpression extends AstNode_1.Expression {
@@ -630,10 +622,10 @@ class AALiteralExpression extends AstNode_1.Expression {
         this.elements = elements;
         this.open = open;
         this.close = close;
-        this.kind = AstNode_1.AstNodeKind.AALiteralExpression;
         this.range = util_1.default.createBoundingRange(this.open, ...this.elements, this.close);
     }
     transpile(state) {
+        var _a, _b;
         let result = [];
         //open curly
         result.push(state.transpileToken(this.open));
@@ -669,7 +661,7 @@ class AALiteralExpression extends AstNode_1.Expression {
                 result.push(...element.value.transpile(state));
             }
             //if next element is a same-line comment, skip the newline
-            if (nextElement && (0, reflection_1.isCommentStatement)(nextElement) && nextElement.range.start.line === element.range.start.line) {
+            if (nextElement && (0, reflection_1.isCommentStatement)(nextElement) && ((_a = nextElement.range) === null || _a === void 0 ? void 0 : _a.start.line) === ((_b = element.range) === null || _b === void 0 ? void 0 : _b.start.line)) {
                 //add a newline between statements
             }
             else {
@@ -692,15 +684,6 @@ class AALiteralExpression extends AstNode_1.Expression {
             (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.keyToken.text, { definingNode: element }, element.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
-            }
-        }
-        return resultType;
-    }
 }
 exports.AALiteralExpression = AALiteralExpression;
 class UnaryExpression extends AstNode_1.Expression {
@@ -708,7 +691,6 @@ class UnaryExpression extends AstNode_1.Expression {
         super();
         this.operator = operator;
         this.right = right;
-        this.kind = AstNode_1.AstNodeKind.UnaryExpression;
         this.range = util_1.default.createBoundingRange(this.operator, this.right);
     }
     transpile(state) {
@@ -719,12 +701,9 @@ class UnaryExpression extends AstNode_1.Expression {
         else if ((0, reflection_1.isLiteralExpression)(this.right)) {
             separatingWhitespace = this.right.token.leadingWhitespace;
         }
-        else {
-            separatingWhitespace = ' ';
-        }
         return [
             state.transpileToken(this.operator),
-            separatingWhitespace,
+            separatingWhitespace !== null && separatingWhitespace !== void 0 ? separatingWhitespace : ' ',
             ...this.right.transpile(state)
         ];
     }
@@ -733,9 +712,6 @@ class UnaryExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'right', visitor, options);
         }
     }
-    getType(options) {
-        return util_1.default.unaryOperatorResultType(this.operator, this.right.getType(options));
-    }
 }
 exports.UnaryExpression = UnaryExpression;
 class VariableExpression extends AstNode_1.Expression {
@@ -743,7 +719,6 @@ class VariableExpression extends AstNode_1.Expression {
         var _a;
         super();
         this.name = name;
-        this.kind = AstNode_1.AstNodeKind.VariableExpression;
         this.range = (_a = this.name) === null || _a === void 0 ? void 0 : _a.range;
     }
     getName(parseMode) {
@@ -753,7 +728,7 @@ class VariableExpression extends AstNode_1.Expression {
         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, namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) {
+        if (namespace && state.file.calleeIsKnownNamespaceFunction(this, namespace.getName(Parser_1.ParseMode.BrighterScript))) {
             result.push(state.sourceNode(this, [
                 namespace.getName(Parser_1.ParseMode.BrightScript),
                 '_',
@@ -769,56 +744,39 @@ class VariableExpression extends AstNode_1.Expression {
     walk(visitor, options) {
         //nothing to walk
     }
-    getType(options) {
-        var _a;
-        let resultType = util_1.default.tokenToBscType(this.name);
-        const nameKey = this.name.text;
-        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.flags, this.range));
-        return resultType;
-    }
 }
 exports.VariableExpression = VariableExpression;
 class SourceLiteralExpression extends AstNode_1.Expression {
     constructor(token) {
         super();
         this.token = token;
-        this.kind = AstNode_1.AstNodeKind.SourceLiteralExpression;
         this.range = token === null || token === void 0 ? void 0 : token.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 func = state.file.getFunctionScopeAtPosition(this.token.range.start).func;
+        let func = this.findAncestor(reflection_1.isFunctionExpression);
         let nameParts = [];
-        let parentFunction;
-        while ((parentFunction = func.findAncestor(reflection_1.isFunctionExpression))) {
-            let index = this.findFunctionIndex(parentFunction, func);
+        while (func.parentFunction) {
+            let index = func.parentFunction.childFunctionExpressions.indexOf(func);
             nameParts.unshift(`anon${index}`);
-            func = parentFunction;
+            func = func.parentFunction;
         }
         //get the index of this function in its parent
         nameParts.unshift(func.functionStatement.getName(parseMode));
         return nameParts.join('$');
     }
+    /**
+     * Get the line number from our token or from the closest ancestor that has a range
+     */
+    getClosestLineNumber() {
+        let node = this;
+        while (node) {
+            if (node.range) {
+                return node.range.start.line + 1;
+            }
+            node = node.parent;
+        }
+        return -1;
+    }
     transpile(state) {
         let text;
         switch (this.token.kind) {
@@ -827,7 +785,8 @@ class SourceLiteralExpression extends AstNode_1.Expression {
                 text = `"${pathUrl.substring(0, 4)}" + "${pathUrl.substring(4)}"`;
                 break;
             case TokenKind_1.TokenKind.SourceLineNumLiteral:
-                text = `${this.token.range.start.line + 1}`;
+                //TODO find first parent that has range, or default to -1
+                text = `${this.getClosestLineNumber()}`;
                 break;
             case TokenKind_1.TokenKind.FunctionNameLiteral:
                 text = `"${this.getFunctionName(state, Parser_1.ParseMode.BrightScript)}"`;
@@ -837,13 +796,20 @@ class SourceLiteralExpression extends AstNode_1.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}"`;
+                //TODO find first parent that has range, or default to -1
+                text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.getClosestLineNumber()}"`;
                 break;
             case TokenKind_1.TokenKind.PkgPathLiteral:
-                text = `"${util_1.default.sanitizePkgPath(state.file.pkgPath)}"`;
+                let pkgPath1 = `pkg:/${state.file.pkgPath}`
+                    .replace(/\\/g, '/')
+                    .replace(/\.bs$/i, '.brs');
+                text = `"${pkgPath1}"`;
                 break;
             case TokenKind_1.TokenKind.PkgLocationLiteral:
-                text = `"${util_1.default.sanitizePkgPath(state.file.pkgPath)}:" + str(LINE_NUM)`;
+                let pkgPath2 = `pkg:/${state.file.pkgPath}`
+                    .replace(/\\/g, '/')
+                    .replace(/\.bs$/i, '.brs');
+                text = `"${pkgPath2}:" + str(LINE_NUM)`;
                 break;
             case TokenKind_1.TokenKind.LineNumLiteral:
             default:
@@ -870,7 +836,6 @@ class NewExpression extends AstNode_1.Expression {
         super();
         this.newKeyword = newKeyword;
         this.call = call;
-        this.kind = AstNode_1.AstNodeKind.NewExpression;
         this.range = util_1.default.createBoundingRange(this.newKeyword, this.call);
     }
     /**
@@ -878,7 +843,7 @@ class NewExpression extends AstNode_1.Expression {
      */
     get className() {
         //the parser guarantees the callee of a new statement's call object will be
-        //either a VariableExpression or a DottedGet
+        //a NamespacedVariableNameExpression
         return this.call.callee;
     }
     transpile(state) {
@@ -894,9 +859,6 @@ class NewExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'call', visitor, options);
         }
     }
-    getType(options) {
-        return this.call.getType(options);
-    }
 }
 exports.NewExpression = NewExpression;
 class CallfuncExpression extends AstNode_1.Expression {
@@ -908,9 +870,16 @@ class CallfuncExpression extends AstNode_1.Expression {
         this.openingParen = openingParen;
         this.args = args;
         this.closingParen = closingParen;
-        this.kind = AstNode_1.AstNodeKind.CallfuncExpression;
         this.range = util_1.default.createBoundingRange(callee, operator, methodName, openingParen, ...args, closingParen);
     }
+    /**
+     * 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) {
         let result = [];
         result.push(...this.callee.transpile(state), state.sourceNode(this.operator, '.callfunc'), state.transpileToken(this.openingParen), 
@@ -940,31 +909,6 @@ class CallfuncExpression extends AstNode_1.Expression {
             (0, visitors_2.walkArray)(this.args, visitor, options, this);
         }
     }
-    getType(options) {
-        var _a;
-        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 = calleeType.getCallFuncType(this.methodName.text, options);
-            (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry(this.methodName.text, funcType, options.flags, this.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;
 /**
@@ -975,7 +919,6 @@ class TemplateStringQuasiExpression extends AstNode_1.Expression {
     constructor(expressions) {
         super();
         this.expressions = expressions;
-        this.kind = AstNode_1.AstNodeKind.TemplateStringQuasiExpression;
         this.range = util_1.default.createBoundingRange(...expressions);
     }
     transpile(state, skipEmptyStrings = true) {
@@ -1006,12 +949,8 @@ class TemplateStringExpression extends AstNode_1.Expression {
         this.quasis = quasis;
         this.expressions = expressions;
         this.closingBacktick = closingBacktick;
-        this.kind = AstNode_1.AstNodeKind.TemplateStringExpression;
         this.range = util_1.default.createBoundingRange(openingBacktick, quasis[0], quasis[quasis.length - 1], 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);
@@ -1035,7 +974,7 @@ class TemplateStringExpression extends AstNode_1.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.getType()))) {
+                    ((0, reflection_1.isLiteralExpression)(expression) && (0, reflection_1.isStringType)(expression.type))) {
                     add(...expression.transpile(state));
                     //wrap all other expressions with a bslib_toString call to prevent runtime type mismatch errors
                 }
@@ -1070,7 +1009,6 @@ class TaggedTemplateStringExpression extends AstNode_1.Expression {
         this.quasis = quasis;
         this.expressions = expressions;
         this.closingBacktick = closingBacktick;
-        this.kind = AstNode_1.AstNodeKind.TaggedTemplateStringExpression;
         this.range = util_1.default.createBoundingRange(tagName, openingBacktick, quasis[0], quasis[quasis.length - 1], closingBacktick);
     }
     transpile(state) {
@@ -1116,9 +1054,10 @@ class AnnotationExpression extends AstNode_1.Expression {
         super();
         this.atToken = atToken;
         this.nameToken = nameToken;
-        this.kind = AstNode_1.AstNodeKind.AnnotationExpression;
         this.name = nameToken.text;
-        this.range = util_1.default.createBoundingRange(atToken, nameToken);
+    }
+    get range() {
+        return util_1.default.createBoundingRange(this.atToken, this.nameToken, this.call);
     }
     /**
      * Convert annotation arguments to JavaScript types
@@ -1130,9 +1069,6 @@ class AnnotationExpression extends AstNode_1.Expression {
         }
         return this.call.args.map(e => expressionToValue(e, strict));
     }
-    getLeadingTrivia() {
-        return this.atToken.leadingTrivia;
-    }
     transpile(state) {
         return [];
     }
@@ -1157,14 +1093,14 @@ class TernaryExpression extends AstNode_1.Expression {
         this.consequent = consequent;
         this.colonToken = colonToken;
         this.alternate = alternate;
-        this.kind = AstNode_1.AstNodeKind.TernaryExpression;
         this.range = util_1.default.createBoundingRange(test, questionMarkToken, consequent, colonToken, alternate);
     }
     transpile(state) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         let result = [];
-        let consequentInfo = util_1.default.getExpressionInfo(this.consequent);
-        let alternateInfo = util_1.default.getExpressionInfo(this.alternate);
+        const file = state.file;
+        let consequentInfo = util_1.default.getExpressionInfo(this.consequent, file);
+        let alternateInfo = util_1.default.getExpressionInfo(this.alternate, file);
         //get all unique variable names used in the consequent and alternate, and sort them alphabetically so the output is consistent
         let allUniqueVarNames = [...new Set([...consequentInfo.uniqueVarNames, ...alternateInfo.uniqueVarNames])].sort();
         let mutatingExpressions = [
@@ -1175,9 +1111,9 @@ class TernaryExpression extends AstNode_1.Expression {
             result.push(state.sourceNode(this.questionMarkToken, 
             //write all the scope variables as parameters.
             //TODO handle when there are more than 31 parameters
-            `(function(__bsCondition, ${allUniqueVarNames.join(', ')})`), state.newline, 
+            `(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.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.blockDepth--;
         }
         else {
@@ -1200,13 +1136,12 @@ class NullCoalescingExpression extends AstNode_1.Expression {
         this.consequent = consequent;
         this.questionQuestionToken = questionQuestionToken;
         this.alternate = alternate;
-        this.kind = AstNode_1.AstNodeKind.NullCoalescingExpression;
         this.range = util_1.default.createBoundingRange(consequent, questionQuestionToken, alternate);
     }
     transpile(state) {
         let result = [];
-        let consequentInfo = util_1.default.getExpressionInfo(this.consequent);
-        let alternateInfo = util_1.default.getExpressionInfo(this.alternate);
+        let consequentInfo = util_1.default.getExpressionInfo(this.consequent, state.file);
+        let alternateInfo = util_1.default.getExpressionInfo(this.alternate, state.file);
         //get all unique variable names used in the consequent and alternate, and sort them alphabetically so the output is consistent
         let allUniqueVarNames = [...new Set([...consequentInfo.uniqueVarNames, ...alternateInfo.uniqueVarNames])].sort();
         let hasMutatingExpression = [
@@ -1241,7 +1176,6 @@ class RegexLiteralExpression extends AstNode_1.Expression {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.kind = AstNode_1.AstNodeKind.RegexLiteralExpression;
     }
     get range() {
         var _a, _b;
@@ -1276,6 +1210,24 @@ class RegexLiteralExpression extends AstNode_1.Expression {
     }
 }
 exports.RegexLiteralExpression = RegexLiteralExpression;
+class TypeCastExpression extends AstNode_1.Expression {
+    constructor(obj, asToken, typeToken) {
+        super();
+        this.obj = obj;
+        this.asToken = asToken;
+        this.typeToken = typeToken;
+        this.range = util_1.default.createBoundingRange(this.obj, this.asToken, this.typeToken);
+    }
+    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);
+        }
+    }
+}
+exports.TypeCastExpression = TypeCastExpression;
 function expressionToValue(expr, strict) {
     if (!expr) {
         return null;
@@ -1309,92 +1261,11 @@ function expressionToValue(expr, strict) {
     return strict ? null : expr;
 }
 function numberExpressionToValue(expr, operator = '') {
-    if ((0, reflection_1.isIntegerType)(expr.getType()) || (0, reflection_1.isLongIntegerType)(expr.getType())) {
+    if ((0, reflection_1.isIntegerType)(expr.type) || (0, reflection_1.isLongIntegerType)(expr.type)) {
         return parseInt(operator + expr.token.text);
     }
     else {
         return parseFloat(operator + expr.token.text);
     }
 }
-class TypeExpression extends AstNode_1.Expression {
-    constructor(
-    /**
-     * The standard AST expression that represents the type for this TypeExpression.
-     */
-    expression) {
-        super();
-        this.expression = expression;
-        this.kind = AstNode_1.AstNodeKind.TypeExpression;
-        this.range = expression === null || expression === void 0 ? void 0 : expression.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(obj, asToken, typeExpression) {
-        super();
-        this.obj = obj;
-        this.asToken = asToken;
-        this.typeExpression = typeExpression;
-        this.kind = AstNode_1.AstNodeKind.TypeCastExpression;
-        this.range = util_1.default.createBoundingRange(this.obj, this.asToken, 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(innerType, leftBracket, rightBracket) {
-        super();
-        this.innerType = innerType;
-        this.leftBracket = leftBracket;
-        this.rightBracket = rightBracket;
-        this.kind = AstNode_1.AstNodeKind.TypedArrayExpression;
-        this.range = util_1.default.createBoundingRange(this.innerType, this.leftBracket, this.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