brighterscript 1.0.0-alpha.26 → 1.0.0-alpha.27

package/dist/parser/Expression.d.ts

@@ -4,8 +4,7 @@ import type { Range } from 'vscode-languageserver';
 import type { BrsTranspileState } from './BrsTranspileState';
 import { ParseMode } from './Parser';
 import type { WalkOptions, WalkVisitor } from '../astUtils/visitors';
-import type { GetTypeOptions } from '../interfaces';
-import { type TranspileResult, type TypedefProvider } from '../interfaces';
+import type { GetTypeOptions, TranspileResult, TypedefProvider } from '../interfaces';
 import { VoidType } from '../types/VoidType';
 import { DynamicType } from '../types/DynamicType';
 import type { BscType } from '../types/BscType';
@@ -21,11 +20,11 @@ export declare class BinaryExpression extends Expression {
         operator: Token;
         right: Expression;
     });
-    tokens: {
-        operator: Token;
+    readonly tokens: {
+        readonly operator: Token;
     };
-    left: Expression;
-    right: Expression;
+    readonly left: Expression;
+    readonly right: Expression;
     readonly kind = AstNodeKind.BinaryExpression;
     readonly range: Range;
     transpile(state: BrsTranspileState): (string | SourceNode)[];
@@ -42,7 +41,7 @@ export declare class CallExpression extends Expression {
     });
     readonly callee: Expression;
     readonly args: Expression[];
-    tokens: {
+    readonly tokens: {
         /**
          * Can either be `(`, or `?(` for optional chaining - defaults to '('
          */
@@ -68,20 +67,15 @@ export declare class FunctionExpression extends Expression implements TypedefPro
     });
     readonly kind = AstNodeKind.FunctionExpression;
     readonly parameters: FunctionParameterExpression[];
-    body: Block;
-    returnTypeExpression?: TypeExpression;
+    readonly body: Block;
+    readonly returnTypeExpression?: TypeExpression;
     readonly tokens: {
-        functionType?: Token;
-        endFunctionType?: Token;
-        leftParen?: Token;
-        rightParen?: Token;
-        as?: Token;
+        readonly functionType?: Token;
+        readonly endFunctionType?: Token;
+        readonly leftParen?: Token;
+        readonly rightParen?: Token;
+        readonly as?: Token;
     };
-    /**
-     * The list of function calls that are declared within this function scope. This excludes CallExpressions
-     * declared in child functions
-     */
-    callExpressions: CallExpression[];
     /**
      * If this function is part of a FunctionStatement, this will be set. Otherwise this will be undefined
      */
@@ -106,13 +100,13 @@ export declare class FunctionParameterExpression extends Expression {
         typeExpression?: TypeExpression;
     });
     readonly kind = AstNodeKind.FunctionParameterExpression;
-    tokens: {
-        name: Identifier;
-        equals?: Token;
-        as?: Token;
+    readonly tokens: {
+        readonly name: Identifier;
+        readonly equals?: Token;
+        readonly as?: Token;
     };
-    defaultValue?: Expression;
-    typeExpression?: TypeExpression;
+    readonly defaultValue?: Expression;
+    readonly typeExpression?: TypeExpression;
     getType(options: GetTypeOptions): BscType;
     get range(): Range;
     transpile(state: BrsTranspileState): any[];
@@ -129,8 +123,8 @@ export declare class DottedGetExpression extends Expression {
         dot?: Token;
     });
     readonly tokens: {
-        name: Identifier;
-        dot?: Token;
+        readonly name: Identifier;
+        readonly dot?: Token;
     };
     readonly obj: Expression;
     readonly kind = AstNodeKind.DottedGetExpression;
@@ -150,7 +144,7 @@ export declare class XmlAttributeGetExpression extends Expression {
         name: Identifier;
     });
     readonly kind = AstNodeKind.XmlAttributeGetExpression;
-    tokens: {
+    readonly tokens: {
         name: Identifier;
         at?: Token;
     };
@@ -171,15 +165,15 @@ export declare class IndexedGetExpression extends Expression {
         questionDot?: Token;
     });
     readonly kind = AstNodeKind.IndexedGetExpression;
-    obj: Expression;
-    indexes: Expression[];
-    tokens: {
+    readonly obj: Expression;
+    readonly indexes: Expression[];
+    readonly tokens: {
         /**
          * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.` - defaults to '[' in transpile
          */
-        openingSquare?: Token;
-        closingSquare?: Token;
-        questionDot?: Token;
+        readonly openingSquare?: Token;
+        readonly closingSquare?: Token;
+        readonly questionDot?: Token;
     };
     readonly range: Range;
     transpile(state: BrsTranspileState): any[];
@@ -193,10 +187,10 @@ export declare class GroupingExpression extends Expression {
         expression: Expression;
     });
     readonly tokens: {
-        leftParen?: Token;
-        rightParen?: Token;
+        readonly leftParen?: Token;
+        readonly rightParen?: Token;
     };
-    expression: Expression;
+    readonly expression: Expression;
     readonly kind = AstNodeKind.GroupingExpression;
     readonly range: Range;
     transpile(state: BrsTranspileState): TranspileResult;
@@ -207,12 +201,12 @@ export declare class LiteralExpression extends Expression {
     constructor(options: {
         value: Token;
     });
-    tokens: {
-        value: Token;
+    readonly tokens: {
+        readonly value: Token;
     };
     readonly kind = AstNodeKind.LiteralExpression;
     get range(): Range;
-    getType(options?: GetTypeOptions): DynamicType | import("../types").ObjectType | StringType | import("../types").IntegerType | import("../types").BooleanType | import("../types").FloatType | import("../types").DoubleType | import("../types").LongIntegerType | VoidType | import("../types/FunctionType").FunctionType;
+    getType(options?: GetTypeOptions): DynamicType | import("..").ObjectType | StringType | import("..").IntegerType | import("..").BooleanType | import("..").FloatType | import("..").DoubleType | import("..").LongIntegerType | VoidType | import("../types/FunctionType").FunctionType;
     transpile(state: BrsTranspileState): SourceNode[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
 }
@@ -227,8 +221,8 @@ export declare class EscapedCharCodeLiteralExpression extends Expression {
         };
     });
     readonly kind = AstNodeKind.EscapedCharCodeLiteralExpression;
-    tokens: {
-        value: Token & {
+    readonly tokens: {
+        readonly value: Token & {
             charCode: number;
         };
     };
@@ -244,8 +238,8 @@ export declare class ArrayLiteralExpression extends Expression {
     });
     readonly elements: Array<Expression | CommentStatement>;
     readonly tokens: {
-        open?: Token;
-        close?: Token;
+        readonly open?: Token;
+        readonly close?: Token;
     };
     readonly kind = AstNodeKind.ArrayLiteralExpression;
     readonly range: Range;
@@ -262,14 +256,14 @@ export declare class AAMemberExpression extends Expression {
         comma?: Token;
     });
     readonly kind = AstNodeKind.AAMemberExpression;
-    range: Range;
-    tokens: {
-        key: Token;
-        colon?: Token;
-        comma?: Token;
+    readonly range: Range;
+    readonly tokens: {
+        readonly key: Token;
+        readonly colon?: Token;
+        readonly comma?: Token;
     };
     /** The expression evaluated to determine the member's initial value. */
-    value: Expression;
+    readonly value: Expression;
     transpile(state: BrsTranspileState): any[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -282,8 +276,8 @@ export declare class AALiteralExpression extends Expression {
     });
     readonly elements: Array<AAMemberExpression | CommentStatement>;
     readonly tokens: {
-        open?: Token;
-        close?: Token;
+        readonly open?: Token;
+        readonly close?: Token;
     };
     readonly kind = AstNodeKind.AALiteralExpression;
     readonly range: Range;
@@ -298,10 +292,10 @@ export declare class UnaryExpression extends Expression {
     });
     readonly kind = AstNodeKind.UnaryExpression;
     readonly range: Range;
-    tokens: {
-        operator: Token;
+    readonly tokens: {
+        readonly operator: Token;
     };
-    right: Expression;
+    readonly right: Expression;
     transpile(state: BrsTranspileState): (string | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -311,7 +305,7 @@ export declare class VariableExpression extends Expression {
         name: Identifier;
     });
     readonly tokens: {
-        name: Identifier;
+        readonly name: Identifier;
     };
     readonly kind = AstNodeKind.VariableExpression;
     readonly range: Range;
@@ -327,7 +321,7 @@ export declare class SourceLiteralExpression extends Expression {
     readonly range: Range;
     readonly kind = AstNodeKind.SourceLiteralExpression;
     readonly tokens: {
-        value: Token;
+        readonly value: Token;
     };
     /**
      * Find the index of the function in its parent
@@ -350,7 +344,7 @@ export declare class NewExpression extends Expression {
     readonly kind = AstNodeKind.NewExpression;
     readonly range: Range;
     readonly tokens: {
-        new?: Token;
+        readonly new?: Token;
     };
     readonly call: CallExpression;
     /**
@@ -373,10 +367,10 @@ export declare class CallfuncExpression extends Expression {
     readonly callee: Expression;
     readonly args: Expression[];
     readonly tokens: {
-        operator: Token;
-        methodName: Identifier;
-        openingParen?: Token;
-        closingParen?: Token;
+        readonly operator: Token;
+        readonly methodName: Identifier;
+        readonly openingParen?: Token;
+        readonly closingParen?: Token;
     };
     readonly kind = AstNodeKind.CallfuncExpression;
     readonly range: Range;
@@ -407,8 +401,8 @@ export declare class TemplateStringExpression extends Expression {
     });
     readonly kind = AstNodeKind.TemplateStringExpression;
     readonly tokens: {
-        openingBacktick?: Token;
-        closingBacktick?: Token;
+        readonly openingBacktick?: Token;
+        readonly closingBacktick?: Token;
     };
     readonly quasis: TemplateStringQuasiExpression[];
     readonly expressions: Expression[];
@@ -426,10 +420,10 @@ export declare class TaggedTemplateStringExpression extends Expression {
         closingBacktick?: Token;
     });
     readonly kind = AstNodeKind.TaggedTemplateStringExpression;
-    tokens: {
-        tagName: Identifier;
-        openingBacktick?: Token;
-        closingBacktick?: Token;
+    readonly tokens: {
+        readonly tagName: Identifier;
+        readonly openingBacktick?: Token;
+        readonly closingBacktick?: Token;
     };
     readonly quasis: TemplateStringQuasiExpression[];
     readonly expressions: Expression[];
@@ -445,11 +439,11 @@ export declare class AnnotationExpression extends Expression {
     });
     readonly kind = AstNodeKind.AnnotationExpression;
     readonly tokens: {
-        at: Token;
-        name: Token;
+        readonly at: Token;
+        readonly name: Token;
     };
     get range(): Range;
-    name: string;
+    readonly name: string;
     call: CallExpression;
     /**
      * Convert annotation arguments to JavaScript types
@@ -470,10 +464,10 @@ export declare class TernaryExpression extends Expression {
         alternate?: Expression;
     });
     readonly kind = AstNodeKind.TernaryExpression;
-    range: Range;
+    readonly range: Range;
     readonly tokens: {
-        questionMark?: Token;
-        colon?: Token;
+        readonly questionMark?: Token;
+        readonly colon?: Token;
     };
     readonly test: Expression;
     readonly consequent?: Expression;
@@ -489,11 +483,11 @@ export declare class NullCoalescingExpression extends Expression {
     });
     readonly kind = AstNodeKind.NullCoalescingExpression;
     readonly range: Range;
-    tokens: {
-        questionQuestion?: Token;
+    readonly tokens: {
+        readonly questionQuestion?: Token;
     };
-    consequent: Expression;
-    alternate: Expression;
+    readonly consequent: Expression;
+    readonly alternate: Expression;
     transpile(state: BrsTranspileState): any[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
 }
@@ -502,8 +496,8 @@ export declare class RegexLiteralExpression extends Expression {
         regexLiteral: Token;
     });
     readonly kind = AstNodeKind.RegexLiteralExpression;
-    tokens: {
-        regexLiteral: Token;
+    readonly tokens: {
+        readonly regexLiteral: Token;
     };
     get range(): Range;
     transpile(state: BrsTranspileState): TranspileResult;
@@ -523,8 +517,8 @@ export declare class TypeExpression extends Expression implements TypedefProvide
     /**
      * The standard AST expression that represents the type for this TypeExpression.
      */
-    expression: Expression;
-    range: Range;
+    readonly expression: Expression;
+    readonly range: Range;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -539,12 +533,12 @@ export declare class TypeCastExpression extends Expression {
         typeExpression?: TypeExpression;
     });
     readonly kind = AstNodeKind.TypeCastExpression;
-    obj: Expression;
-    tokens: {
-        as?: Token;
+    readonly obj: Expression;
+    readonly tokens: {
+        readonly as?: Token;
     };
     typeExpression?: TypeExpression;
-    range: Range;
+    readonly range: Range;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;
@@ -555,13 +549,13 @@ export declare class TypedArrayExpression extends Expression {
         leftBracket?: Token;
         rightBracket?: Token;
     });
-    tokens: {
-        leftBracket?: Token;
-        rightBracket?: Token;
+    readonly tokens: {
+        readonly leftBracket?: Token;
+        readonly rightBracket?: Token;
     };
-    innerType: Expression;
+    readonly innerType: Expression;
     readonly kind = AstNodeKind.TypedArrayExpression;
-    range: Range;
+    readonly range: Range;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getType(options: GetTypeOptions): BscType;

package/dist/parser/Expression.js

@@ -11,15 +11,14 @@ 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 TypedFunctionType_1 = require("../types/TypedFunctionType");
 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 ReferenceType_1 = require("../types/ReferenceType");
 const UnionType_1 = require("../types/UnionType");
-const types_1 = require("../types");
+const ArrayType_1 = require("../types/ArrayType");
 const AssociativeArrayType_1 = require("../types/AssociativeArrayType");
 const creators_1 = require("../astUtils/creators");
 class BinaryExpression extends AstNode_1.Expression {
@@ -50,7 +49,7 @@ class BinaryExpression extends AstNode_1.Expression {
     }
     getType(options) {
         const operatorKind = this.tokens.operator.kind;
-        if (options.flags & SymbolTable_1.SymbolTypeFlag.typetime) {
+        if (options.flags & 2 /* SymbolTypeFlag.typetime */) {
             // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
             switch (operatorKind) {
                 case TokenKind_1.TokenKind.Or:
@@ -58,7 +57,7 @@ class BinaryExpression extends AstNode_1.Expression {
                 //TODO: Intersection Types?, eg. case TokenKind.And:
             }
         }
-        else if (options.flags & SymbolTable_1.SymbolTypeFlag.runtime) {
+        else if (options.flags & 1 /* SymbolTypeFlag.runtime */) {
             return util_1.default.binaryOperatorResultType(this.left.getType(options), this.tokens.operator, this.right.getType(options));
         }
         return DynamicType_1.DynamicType.instance;
@@ -132,11 +131,6 @@ class FunctionExpression extends AstNode_1.Expression {
         var _a;
         super();
         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 = [];
         this.tokens = {
             functionType: options.functionType,
             leftParen: options.leftParen,
@@ -149,9 +143,9 @@ class FunctionExpression extends AstNode_1.Expression {
         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.body.symbolTable = new SymbolTable_1.SymbolTable(`Block`, () => this.getSymbolTable());
         }
-        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;
@@ -278,7 +272,7 @@ class FunctionExpression extends AstNode_1.Expression {
         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));
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry({ name: funcName, type: resultType, data: options.data, range: this.range, kind: this.kind }));
         return resultType;
     }
 }
@@ -297,8 +291,8 @@ class FunctionParameterExpression extends AstNode_1.Expression {
     }
     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));
+        const paramType = (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: 2 /* 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: 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({ name: this.tokens.name.text, type: paramType, data: options.data, range: this.range, kind: this.kind }));
         return paramType;
     }
     get range() {
@@ -385,8 +379,14 @@ class DottedGetExpression extends AstNode_1.Expression {
         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) {
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({
+            name: (_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.text,
+            type: result,
+            data: options.data,
+            range: (_f = (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range,
+            kind: this.kind
+        }));
+        if (result || options.flags & 2 /* SymbolTypeFlag.typetime */) {
             // All types should be known at typetime
             return result;
         }
@@ -610,7 +610,7 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
     }
     getType(options) {
         const innerTypes = this.elements.filter(x => !(0, reflection_1.isCommentStatement)(x)).map(expr => expr.getType(options));
-        return new types_1.ArrayType(...innerTypes);
+        return new ArrayType_1.ArrayType(...innerTypes);
     }
 }
 exports.ArrayLiteralExpression = ArrayLiteralExpression;
@@ -710,7 +710,7 @@ class AALiteralExpression extends AstNode_1.Expression {
         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);
+                resultType.addMember(element.tokens.key.text, { definingNode: element }, element.getType(options), 1 /* SymbolTypeFlag.runtime */);
             }
         }
         return resultType;
@@ -795,7 +795,7 @@ class VariableExpression extends AstNode_1.Expression {
             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));
+        (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry({ name: nameKey, type: resultType, data: options.data, range: this.range, kind: this.kind }));
         return resultType;
     }
 }
@@ -918,7 +918,15 @@ class NewExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return this.call.getType(options);
+        const result = this.call.getType(options);
+        if (options.typeChain) {
+            // modify last typechain entry to show it is a new ...()
+            const lastEntry = options.typeChain[options.typeChain.length - 1];
+            if (lastEntry) {
+                lastEntry.kind = this.kind;
+            }
+        }
+        return result;
     }
 }
 exports.NewExpression = NewExpression;
@@ -972,11 +980,17 @@ class CallfuncExpression extends AstNode_1.Expression {
         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 }));
+        const calleeType = this.callee.getType(Object.assign(Object.assign({}, options), { flags: 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)));
+                (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({
+                    name: this.tokens.methodName.text,
+                    type: funcType,
+                    data: options.data, range: this.tokens.methodName.range,
+                    separatorToken: (0, creators_1.createToken)(TokenKind_1.TokenKind.Callfunc),
+                    kind: this.kind
+                }));
                 if (options.ignoreCall) {
                     result = funcType;
                 }
@@ -1370,7 +1384,7 @@ class TypeExpression extends AstNode_1.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()];
+        return [this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }).toTypeString()];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
@@ -1378,7 +1392,7 @@ class TypeExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return this.expression.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime }));
+        return this.expression.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */ }));
     }
     getTypedef(state) {
         // TypeDefs should pass through any valid type names
@@ -1415,7 +1429,15 @@ class TypeCastExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return this.typeExpression.getType(options);
+        const result = this.typeExpression.getType(options);
+        if (options.typeChain) {
+            // modify last typechain entry to show it is a typecast
+            const lastEntry = options.typeChain[options.typeChain.length - 1];
+            if (lastEntry) {
+                lastEntry.kind = this.kind;
+            }
+        }
+        return result;
     }
 }
 exports.TypeCastExpression = TypeCastExpression;
@@ -1431,7 +1453,7 @@ class TypedArrayExpression extends AstNode_1.Expression {
         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()];
+        return [this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }).toTypeString()];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
@@ -1439,7 +1461,7 @@ class TypedArrayExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return new types_1.ArrayType(this.innerType.getType(options));
+        return new ArrayType_1.ArrayType(this.innerType.getType(options));
     }
 }
 exports.TypedArrayExpression = TypedArrayExpression;