brighterscript 1.0.0-alpha.1 → 1.0.0-alpha.13

package/dist/parser/Statement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThrowStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.ClassMethodStatement = exports.ClassStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = exports.Statement = void 0;
+exports.ThrowStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.ClassMethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = exports.Statement = void 0;
 const lexer_1 = require("../lexer");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
@@ -11,6 +11,7 @@ const reflection_1 = require("../astUtils/reflection");
 const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
+const CustomType_1 = require("../types/CustomType");
 /**
  * A BrightScript statement
  */
@@ -62,15 +63,15 @@ class Body extends Statement {
                 //this is the first statement. do nothing related to spacing and newlines
                 //if comment is on same line as prior sibling
             }
-            else if (reflection_1.isCommentStatement(statement) && previousStatement && statement.range.start.line === previousStatement.range.end.line) {
+            else if ((0, reflection_1.isCommentStatement)(statement) && previousStatement && statement.range.start.line === previousStatement.range.end.line) {
                 result.push(' ');
                 //add double newline if this is a comment, and next is a function
             }
-            else if (reflection_1.isCommentStatement(statement) && nextStatement && reflection_1.isFunctionStatement(nextStatement)) {
+            else if ((0, reflection_1.isCommentStatement)(statement) && nextStatement && (0, reflection_1.isFunctionStatement)(nextStatement)) {
                 result.push('\n\n');
                 //add double newline if is function not preceeded by a comment
             }
-            else if (reflection_1.isFunctionStatement(statement) && previousStatement && !(reflection_1.isCommentStatement(previousStatement))) {
+            else if ((0, reflection_1.isFunctionStatement)(statement) && previousStatement && !((0, reflection_1.isCommentStatement)(previousStatement))) {
                 result.push('\n\n');
             }
             else {
@@ -85,7 +86,7 @@ class Body extends Statement {
         let result = [];
         for (const statement of this.statements) {
             //if the current statement supports generating typedef, call it
-            if ('getTypedef' in statement) {
+            if ((0, reflection_1.isTypedefProvider)(statement)) {
                 result.push(state.indent(), ...statement.getTypedef(state), state.newline);
             }
         }
@@ -94,7 +95,7 @@ class Body extends Statement {
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
             for (let i = 0; i < this.statements.length; i++) {
-                visitors_1.walk(this.statements, i, visitor, options, this);
+                (0, visitors_1.walk)(this.statements, i, visitor, options, this);
             }
         }
     }
@@ -127,7 +128,7 @@ class AssignmentStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
 }
@@ -148,7 +149,7 @@ class Block extends Statement {
             let previousStatement = this.statements[i - 1];
             let statement = this.statements[i];
             //if comment is on same line as parent
-            if (reflection_1.isCommentStatement(statement) &&
+            if ((0, reflection_1.isCommentStatement)(statement) &&
                 (util_1.util.linesTouch(state.lineage[0], statement) || util_1.util.linesTouch(previousStatement, statement))) {
                 results.push(' ');
                 //is not a comment
@@ -168,7 +169,7 @@ class Block extends Statement {
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
             for (let i = 0; i < this.statements.length; i++) {
-                visitors_1.walk(this.statements, i, visitor, options, this);
+                (0, visitors_1.walk)(this.statements, i, visitor, options, this);
             }
         }
     }
@@ -185,7 +186,7 @@ class ExpressionStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'expression', visitor, options);
+            (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
 }
@@ -295,7 +296,7 @@ class FunctionStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'func', visitor, options);
+            (0, visitors_1.walk)(this, 'func', visitor, options);
         }
     }
 }
@@ -340,7 +341,7 @@ class IfStatement extends Statement {
             results.push(state.indent(), state.transpileToken(this.tokens.else));
         }
         if (this.elseBranch) {
-            if (reflection_1.isIfStatement(this.elseBranch)) {
+            if ((0, reflection_1.isIfStatement)(this.elseBranch)) {
                 //chained elseif
                 state.lineage.unshift(this.elseBranch);
                 let body = this.elseBranch.transpile(state);
@@ -378,13 +379,13 @@ class IfStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'condition', visitor, options);
+            (0, visitors_1.walk)(this, 'condition', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'thenBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'thenBranch', visitor, options);
         }
         if (this.elseBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'elseBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'elseBranch', visitor, options);
         }
     }
 }
@@ -404,7 +405,7 @@ class IncrementStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
 }
@@ -451,8 +452,8 @@ class PrintStatement extends Statement {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
             for (let i = 0; i < this.expressions.length; i++) {
                 //sometimes we have semicolon `Token`s in the expressions list (should probably fix that...), so only emit the actual expressions
-                if (reflection_1.isExpression(this.expressions[i])) {
-                    visitors_1.walk(this.expressions, i, visitor, options, this);
+                if ((0, reflection_1.isExpression)(this.expressions[i])) {
+                    (0, visitors_1.walk)(this.expressions, i, visitor, options, this);
                 }
             }
         }
@@ -490,7 +491,7 @@ class DimStatement extends Statement {
         var _a;
         if (((_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) > 0 && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
             for (let i = 0; i < this.dimensions.length; i++) {
-                visitors_1.walk(this.dimensions, i, visitor, options, this);
+                (0, visitors_1.walk)(this.dimensions, i, visitor, options, this);
             }
         }
     }
@@ -550,7 +551,7 @@ class ReturnStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
 }
@@ -629,14 +630,14 @@ class ForStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'counterDeclaration', visitor, options);
+            (0, visitors_1.walk)(this, 'counterDeclaration', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'finalValue', visitor, options);
-            visitors_1.walk(this, 'increment', visitor, options);
+            (0, visitors_1.walk)(this, 'finalValue', visitor, options);
+            (0, visitors_1.walk)(this, 'increment', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
 }
@@ -676,10 +677,10 @@ class ForEachStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'target', visitor, options);
+            (0, visitors_1.walk)(this, 'target', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
 }
@@ -712,10 +713,10 @@ class WhileStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'condition', visitor, options);
+            (0, visitors_1.walk)(this, 'condition', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
 }
@@ -749,8 +750,8 @@ class DottedSetStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'obj', visitor, options);
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'obj', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
 }
@@ -790,9 +791,9 @@ class IndexedSetStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'obj', visitor, options);
-            visitors_1.walk(this, 'index', visitor, options);
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'obj', visitor, options);
+            (0, visitors_1.walk)(this, 'index', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
 }
@@ -858,10 +859,10 @@ class NamespaceStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'nameExpression', visitor, options);
+            (0, visitors_1.walk)(this, 'nameExpression', visitor, options);
         }
         if (this.body.statements.length > 0 && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
 }
@@ -905,12 +906,184 @@ class ImportStatement extends Statement {
     }
 }
 exports.ImportStatement = ImportStatement;
+class InterfaceStatement extends Statement {
+    constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken, namespaceName) {
+        super();
+        this.parentInterfaceName = parentInterfaceName;
+        this.body = body;
+        this.namespaceName = namespaceName;
+        this.tokens = {};
+        this.tokens.interface = interfaceToken;
+        this.tokens.name = name;
+        this.tokens.extends = extendsToken;
+        this.tokens.endInterface = endInterfaceToken;
+    }
+    get fields() {
+        return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
+    }
+    get methods() {
+        return this.body.filter(x => (0, reflection_1.isInterfaceMethodStatement)(x));
+    }
+    /**
+     * The name of the interface WITH its leading namespace (if applicable)
+     */
+    get fullName() {
+        var _a;
+        const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+        if (name) {
+            if (this.namespaceName) {
+                let namespaceName = this.namespaceName.getName(Parser_1.ParseMode.BrighterScript);
+                return `${namespaceName}.${name}`;
+            }
+            else {
+                return name;
+            }
+        }
+        else {
+            //return undefined which will allow outside callers to know that this interface doesn't have a name
+            return undefined;
+        }
+    }
+    /**
+     * The name of the interface (without the namespace prefix)
+     */
+    get name() {
+        var _a;
+        return (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+    }
+    transpile(state) {
+        //interfaces should completely disappear at runtime
+        return [];
+    }
+    getTypedef(state) {
+        var _a, _b, _c;
+        const result = [];
+        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push(this.tokens.interface.text, ' ', this.tokens.name.text);
+        const parentInterfaceName = (_b = this.parentInterfaceName) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript);
+        if (parentInterfaceName) {
+            result.push(' extends ', parentInterfaceName);
+        }
+        const body = (_c = this.body) !== null && _c !== void 0 ? _c : [];
+        if (body.length > 0) {
+            state.blockDepth++;
+        }
+        for (const statement of body) {
+            if ((0, reflection_1.isInterfaceMethodStatement)(statement) || (0, reflection_1.isInterfaceFieldStatement)(statement)) {
+                result.push(state.newline, state.indent(), ...statement.getTypedef(state));
+            }
+            else {
+                result.push(state.newline, state.indent(), ...statement.transpile(state));
+            }
+        }
+        if (body.length > 0) {
+            state.blockDepth--;
+        }
+        result.push(state.newline, state.indent(), 'end interface', state.newline);
+        return result;
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            for (let i = 0; i < this.body.length; i++) {
+                (0, visitors_1.walk)(this.body, i, visitor, options, this);
+            }
+        }
+    }
+}
+exports.InterfaceStatement = InterfaceStatement;
+class InterfaceFieldStatement extends Statement {
+    constructor(nameToken, asToken, typeToken, type) {
+        super();
+        this.type = type;
+        this.tokens = {};
+        this.tokens.name = nameToken;
+        this.tokens.as = asToken;
+        this.tokens.type = typeToken;
+    }
+    transpile(state) {
+        throw new Error('Method not implemented.');
+    }
+    get range() {
+        var _a, _b;
+        return util_1.util.createRangeFromPositions(this.tokens.name.range.start, ((_b = (_a = this.tokens.type) !== null && _a !== void 0 ? _a : this.tokens.as) !== null && _b !== void 0 ? _b : this.tokens.name).range.end);
+    }
+    get name() {
+        return this.tokens.name.text;
+    }
+    walk(visitor, options) {
+        //nothing to walk
+    }
+    getTypedef(state) {
+        var _a, _b, _c;
+        const result = [];
+        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push(this.tokens.name.text);
+        if (((_c = (_b = this.tokens.type) === null || _b === void 0 ? void 0 : _b.text) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+            result.push(' as ', this.tokens.type.text);
+        }
+        return result;
+    }
+}
+exports.InterfaceFieldStatement = InterfaceFieldStatement;
+class InterfaceMethodStatement extends Statement {
+    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeToken, returnType) {
+        super();
+        this.params = params;
+        this.returnType = returnType;
+        this.tokens = {};
+        this.tokens.functionType = functionTypeToken;
+        this.tokens.name = nameToken;
+        this.tokens.leftParen = leftParen;
+        this.tokens.rightParen = rightParen;
+        this.tokens.as = asToken;
+        this.tokens.returnType = returnTypeToken;
+    }
+    transpile(state) {
+        throw new Error('Method not implemented.');
+    }
+    get range() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        return util_1.util.createRangeFromPositions(this.tokens.name.range.start, ((_h = (_g = (_f = (_c = (_b = (_a = this.tokens.returnType) !== null && _a !== void 0 ? _a : this.tokens.as) !== null && _b !== void 0 ? _b : this.tokens.rightParen) !== null && _c !== void 0 ? _c : (_d = this.params) === null || _d === void 0 ? void 0 : _d[((_e = this.params) === null || _e === void 0 ? void 0 : _e.length) - 1]) !== null && _f !== void 0 ? _f : this.tokens.leftParen) !== null && _g !== void 0 ? _g : this.tokens.name) !== null && _h !== void 0 ? _h : this.tokens.functionType).range.end);
+    }
+    walk(visitor, options) {
+        //nothing to walk
+    }
+    getTypedef(state) {
+        var _a, _b, _c, _d, _e;
+        const result = [];
+        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push(this.tokens.functionType.text, ' ', this.tokens.name.text, '(');
+        const params = (_b = this.params) !== null && _b !== void 0 ? _b : [];
+        for (let i = 0; i < params.length; i++) {
+            if (i > 0) {
+                result.push(', ');
+            }
+            const param = params[i];
+            result.push(param.name.text);
+            if (((_d = (_c = param.typeToken) === null || _c === void 0 ? void 0 : _c.text) === null || _d === void 0 ? void 0 : _d.length) > 0) {
+                result.push(' as ', param.typeToken.text);
+            }
+        }
+        result.push(')');
+        if (((_e = this.tokens.returnType) === null || _e === void 0 ? void 0 : _e.text.length) > 0) {
+            result.push(' as ', this.tokens.returnType.text);
+        }
+        return result;
+    }
+}
+exports.InterfaceMethodStatement = InterfaceMethodStatement;
 class ClassStatement extends Statement {
     constructor(classKeyword, 
     /**
      * The name of the class (without namespace prefix)
      */
-    name, body, end, extendsKeyword, parentClassName, namespaceName) {
+    name, body, end, extendsKeyword, parentClassName, namespaceName, currentSymbolTable) {
         var _a, _b, _c;
         super();
         this.classKeyword = classKeyword;
@@ -920,21 +1093,25 @@ class ClassStatement extends Statement {
         this.extendsKeyword = extendsKeyword;
         this.parentClassName = parentClassName;
         this.namespaceName = namespaceName;
+        this.currentSymbolTable = currentSymbolTable;
+        this.symbolTable = new SymbolTable_1.SymbolTable();
+        this.memberTable = new SymbolTable_1.SymbolTable();
         this.memberMap = {};
         this.methods = [];
         this.fields = [];
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
+        this.symbolTable.setParent(currentSymbolTable);
+        this.range = util_1.util.createRangeFromPositions(this.classKeyword.range.start, this.end.range.end);
         for (let statement of this.body) {
-            if (reflection_1.isClassMethodStatement(statement)) {
+            if ((0, reflection_1.isClassMethodStatement)(statement)) {
                 this.methods.push(statement);
                 this.memberMap[(_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text.toLowerCase()] = statement;
             }
-            else if (reflection_1.isClassFieldStatement(statement)) {
+            else if ((0, reflection_1.isClassFieldStatement)(statement)) {
                 this.fields.push(statement);
                 this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
         }
-        this.range = util_1.util.createRangeFromPositions(this.classKeyword.range.start, this.end.range.end);
     }
     getName(parseMode) {
         var _a;
@@ -954,6 +1131,36 @@ class ClassStatement extends Statement {
             return undefined;
         }
     }
+    getCustomType() {
+        return new CustomType_1.CustomType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
+    }
+    getConstructorFunctionType() {
+        var _a;
+        const constructFunc = (_a = this.getConstructorFunction()) !== null && _a !== void 0 ? _a : this.getEmptyNewFunction();
+        const constructorFuncType = constructFunc.func.getFunctionType();
+        constructorFuncType.setName(this.getName(Parser_1.ParseMode.BrighterScript));
+        constructorFuncType.isNew = true;
+        return constructorFuncType;
+    }
+    buildSymbolTable(parentClass) {
+        var _a, _b, _c, _d, _e;
+        this.symbolTable.clear();
+        this.symbolTable.addSymbol('m', (_a = this.name) === null || _a === void 0 ? void 0 : _a.range, this.getCustomType());
+        this.memberTable.clear();
+        if (parentClass) {
+            this.symbolTable.addSymbol('super', (_b = this.parentClassName) === null || _b === void 0 ? void 0 : _b.range, parentClass.getConstructorFunctionType());
+            this.memberTable.setParent(parentClass === null || parentClass === void 0 ? void 0 : parentClass.memberTable);
+        }
+        for (const statement of this.methods) {
+            statement === null || statement === void 0 ? void 0 : statement.func.symbolTable.setParent(this.symbolTable);
+            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getFunctionType();
+            funcType.setName(this.getName(Parser_1.ParseMode.BrighterScript) + '.' + ((_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text));
+            this.memberTable.addSymbol((_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text, statement === null || statement === void 0 ? void 0 : statement.range, funcType);
+        }
+        for (const statement of this.fields) {
+            this.memberTable.addSymbol((_e = statement === null || statement === void 0 ? void 0 : statement.name) === null || _e === void 0 ? void 0 : _e.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType());
+        }
+    }
     transpile(state) {
         let result = [];
         //make the builder
@@ -977,7 +1184,7 @@ class ClassStatement extends Statement {
         result.push(state.newline);
         state.blockDepth++;
         for (const member of this.body) {
-            if ('getTypedef' in member) {
+            if ((0, reflection_1.isTypedefProvider)(member)) {
                 result.push(state.indent(), ...member.getTypedef(state), state.newline);
             }
         }
@@ -1009,6 +1216,27 @@ class ClassStatement extends Statement {
     hasParentClass() {
         return !!this.parentClassName;
     }
+    /**
+     * Gets an array of possible parent class names, taking into account the namespace this class was created under
+     * @returns array of possible parent class names
+     */
+    getPossibleFullParentNames() {
+        var _a;
+        if (!this.hasParentClass()) {
+            return [];
+        }
+        if (((_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getNameParts().length) > 1) {
+            // The specified parent class already has a dot, so it must already reference a namespace
+            return [this.parentClassName.getName()];
+        }
+        const names = [];
+        if (this.namespaceName) {
+            // We're under a namespace, so the full parent name MIGHT be with this namespace too
+            names.push(this.namespaceName.getName() + '.' + this.parentClassName.getName());
+        }
+        names.push(this.parentClassName.getName());
+        return names;
+    }
     /**
      * Get all ancestor classes, in closest-to-furthest order (i.e. 0 is parent, 1 is grandparent, etc...).
      * This will return an empty array if no ancestors were found
@@ -1102,12 +1330,12 @@ class ClassStatement extends Statement {
         }
         for (let statement of this.body) {
             //is field statement
-            if (reflection_1.isClassFieldStatement(statement)) {
+            if ((0, reflection_1.isClassFieldStatement)(statement)) {
                 //do nothing with class fields in this situation, they are handled elsewhere
                 continue;
                 //methods
             }
-            else if (reflection_1.isClassMethodStatement(statement)) {
+            else if ((0, reflection_1.isClassMethodStatement)(statement)) {
                 //store overridden parent methods as super{parentIndex}_{methodName}
                 if (
                 //is override method
@@ -1176,7 +1404,7 @@ class ClassStatement extends Statement {
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
             for (let i = 0; i < this.body.length; i++) {
-                visitors_1.walk(this.body, i, visitor, options, this);
+                (0, visitors_1.walk)(this.body, i, visitor, options, this);
             }
         }
     }
@@ -1199,7 +1427,7 @@ class ClassMethodStatement extends FunctionStatement {
         //TODO - remove type information from these methods because that doesn't work
         //convert the `super` calls into the proper methods
         const parentClassIndex = state.classStatement.getParentClassIndex(state);
-        const visitor = visitors_1.createVisitor({
+        const visitor = (0, visitors_1.createVisitor)({
             VariableExpression: e => {
                 if (e.name.text.toLocaleLowerCase() === 'super') {
                     e.name.text = `m.super${parentClassIndex}_new`;
@@ -1249,7 +1477,7 @@ class ClassMethodStatement extends FunctionStatement {
         let firstStatement = this.func.body.statements[0];
         if (
         //is a call statement
-        reflection_1.isExpressionStatement(firstStatement) && reflection_1.isCallExpression(firstStatement.expression) &&
+        (0, reflection_1.isExpressionStatement)(firstStatement) && (0, reflection_1.isCallExpression)(firstStatement.expression) &&
             //is a call to super
             util_1.util.findBeginningVariableExpression(firstStatement === null || firstStatement === void 0 ? void 0 : firstStatement.expression.callee).name.text.toLowerCase() === 'super') {
             return;
@@ -1290,20 +1518,20 @@ class ClassMethodStatement extends FunctionStatement {
             }
             else {
                 //if there is no initial value, set the initial value to `invalid`
-                newStatements.push(new AssignmentStatement(thisQualifiedName, creators_1.createToken(lexer_1.TokenKind.Equal, '=', field.name.range), creators_1.createInvalidLiteral('invalid', field.name.range), this.func));
+                newStatements.push(new AssignmentStatement(thisQualifiedName, (0, creators_1.createToken)(lexer_1.TokenKind.Equal, '=', field.name.range), (0, creators_1.createInvalidLiteral)('invalid', field.name.range), this.func));
             }
         }
         this.func.body.statements.splice(startingIndex, 0, ...newStatements);
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'func', visitor, options);
+            (0, visitors_1.walk)(this, 'func', visitor, options);
         }
     }
 }
 exports.ClassMethodStatement = ClassMethodStatement;
 class ClassFieldStatement extends Statement {
-    constructor(accessModifier, name, as, type, equal, initialValue) {
+    constructor(accessModifier, name, as, type, equal, initialValue, namespaceName) {
         var _a, _b, _c, _d;
         super();
         this.accessModifier = accessModifier;
@@ -1312,17 +1540,18 @@ class ClassFieldStatement extends Statement {
         this.type = type;
         this.equal = equal;
         this.initialValue = initialValue;
+        this.namespaceName = namespaceName;
         this.range = util_1.util.createRangeFromPositions(((_a = this.accessModifier) !== null && _a !== void 0 ? _a : this.name).range.start, ((_d = (_c = (_b = this.initialValue) !== null && _b !== void 0 ? _b : this.type) !== null && _c !== void 0 ? _c : this.as) !== null && _d !== void 0 ? _d : this.name).range.end);
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
-     * Defaults to `ValueKind.Dynamic`
+     * Defaults to `DynamicType`
      */
-    getType() {
+    getType(parseMode = Parser_1.ParseMode.BrighterScript) {
         if (this.type) {
-            return util_1.util.tokenToBscType(this.type);
+            return util_1.util.tokenToBscType(this.type, parseMode === Parser_1.ParseMode.BrighterScript, this.namespaceName);
         }
-        else if (reflection_1.isLiteralExpression(this.initialValue)) {
+        else if ((0, reflection_1.isLiteralExpression)(this.initialValue)) {
             return this.initialValue.type;
         }
         else {
@@ -1339,8 +1568,8 @@ class ClassFieldStatement extends Statement {
             for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
                 result.push(...annotation.getTypedef(state), state.newline, state.indent());
             }
-            let type = this.getType();
-            if (reflection_1.isInvalidType(type) || reflection_1.isVoidType(type)) {
+            let type = this.getType(Parser_1.ParseMode.BrightScript);
+            if (!type || (0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type)) {
                 type = new DynamicType_1.DynamicType();
             }
             result.push((_c = (_b = this.accessModifier) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'public', ' ', (_d = this.name) === null || _d === void 0 ? void 0 : _d.text, ' as ', type.toTypeString());
@@ -1349,7 +1578,7 @@ class ClassFieldStatement extends Statement {
     }
     walk(visitor, options) {
         if (this.initialValue && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'initialValue', visitor, options);
+            (0, visitors_1.walk)(this, 'initialValue', visitor, options);
         }
     }
 }
@@ -1385,8 +1614,8 @@ class TryCatchStatement extends Statement {
     }
     walk(visitor, options) {
         if (this.tryBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'tryBranch', visitor, options);
-            visitors_1.walk(this, 'catchBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'tryBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'catchBranch', visitor, options);
         }
     }
 }
@@ -1416,7 +1645,7 @@ class ThrowStatement extends Statement {
     }
     walk(visitor, options) {
         if (this.expression && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'expression', visitor, options);
+            (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
 }