brighterscript 0.66.0-alpha.0 → 0.66.0-alpha.10

package/dist/parser/Statement.js

@@ -7,6 +7,7 @@ const util_1 = require("../util");
 const Parser_1 = require("./Parser");
 const visitors_1 = require("../astUtils/visitors");
 const reflection_1 = require("../astUtils/reflection");
+const interfaces_1 = require("../interfaces");
 const SymbolTable_1 = require("../SymbolTable");
 const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
@@ -18,7 +19,7 @@ const EnumType_1 = require("../types/EnumType");
 const NamespaceType_1 = require("../types/NamespaceType");
 const InterfaceType_1 = require("../types/InterfaceType");
 const VoidType_1 = require("../types/VoidType");
-const FunctionType_1 = require("../types/FunctionType");
+const TypedFunctionType_1 = require("../types/TypedFunctionType");
 class EmptyStatement extends AstNode_2.Statement {
     constructor(
     /**
@@ -132,7 +133,12 @@ class AssignmentStatement extends AstNode_2.Statement {
         }
     }
     getType(options) {
-        const rhs = this.value.getType(options);
+        // TODO: Do we still need this.typeExpression?
+        var _a;
+        // Note: compound assignments (eg. +=) are internally dealt with via the RHS being a BinaryExpression
+        // so this.value will be a BinaryExpression, and BinaryExpressions can figure out their own types
+        const rhs = this.value.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
+        (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry(this.name.text, rhs, options.flags, this.name.range));
         return rhs;
     }
 }
@@ -287,6 +293,9 @@ class FunctionStatement extends AstNode_2.Statement {
             return this.name.text;
         }
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
+    }
     transpile(state) {
         //create a fake token using the full transpiled name
         let nameToken = Object.assign(Object.assign({}, this.name), { text: this.getName(Parser_1.ParseMode.BrightScript) });
@@ -307,8 +316,9 @@ class FunctionStatement extends AstNode_2.Statement {
         }
     }
     getType(options) {
+        var _a;
         const funcExprType = this.func.getType(options);
-        funcExprType.setName(this.name.text);
+        funcExprType.setName((_a = this.name) === null || _a === void 0 ? void 0 : _a.text);
         return funcExprType;
     }
 }
@@ -528,6 +538,9 @@ class LabelStatement extends AstNode_2.Statement {
         this.kind = AstNode_1.AstNodeKind.LabelStatement;
         this.range = util_1.util.createBoundingRange(tokens.identifier, tokens.colon);
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.identifier.leadingTrivia);
+    }
     transpile(state) {
         return [
             state.transpileToken(this.tokens.identifier),
@@ -830,9 +843,7 @@ class LibraryStatement extends AstNode_2.Statement {
 }
 exports.LibraryStatement = LibraryStatement;
 class NamespaceStatement extends AstNode_2.Statement {
-    constructor(keyword, 
-    // this should technically only be a VariableExpression or DottedGetExpression, but that can be enforced elsewhere
-    nameExpression, body, endKeyword) {
+    constructor(keyword, nameExpression, body, endKeyword) {
         super();
         this.keyword = keyword;
         this.nameExpression = nameExpression;
@@ -853,14 +864,25 @@ class NamespaceStatement extends AstNode_2.Statement {
         return this._range;
     }
     getName(parseMode) {
-        const parentNamespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        var _a, _b;
         const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
         let name = util_1.util.getAllDottedGetPartsAsString(this.nameExpression, parseMode);
-        if (parentNamespace) {
-            name = parentNamespace.getName(parseMode) + sep + name;
+        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
+            name = this.parent.parent.getName(parseMode) + sep + name;
         }
         return name;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.keyword.leadingTrivia);
+    }
+    getNameParts() {
+        var _a, _b;
+        let parts = util_1.util.getAllDottedGetParts(this.nameExpression);
+        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
+            parts = this.parent.parent.getNameParts().concat(parts);
+        }
+        return parts;
+    }
     transpile(state) {
         //namespaces don't actually have any real content, so just transpile their bodies
         return this.body.transpile(state);
@@ -887,7 +909,6 @@ class NamespaceStatement extends AstNode_2.Statement {
     }
     getType(options) {
         const resultType = new NamespaceType_1.NamespaceType(this.name);
-        resultType.pushMemberProvider(() => this.body.getSymbolTable());
         return resultType;
     }
 }
@@ -954,6 +975,9 @@ class InterfaceStatement extends AstNode_2.Statement {
     hasParentInterface() {
         return !!this.parentInterfaceName;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.interface.leadingTrivia);
+    }
     /**
      * The name of the interface WITH its leading namespace (if applicable)
      */
@@ -1037,35 +1061,48 @@ class InterfaceStatement extends AstNode_2.Statement {
         }
     }
     getType(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const superIface = (_a = this.parentInterfaceName) === null || _a === void 0 ? void 0 : _a.getType(options);
         const resultType = new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), superIface);
         for (const statement of this.methods) {
-            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, statement === null || statement === void 0 ? void 0 : statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
+            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
+            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _b === void 0 ? void 0 : _b.text, { definingNode: statement }, memberType, flag);
         }
         for (const statement of this.fields) {
-            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
+            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
+            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, memberType, flag);
         }
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(this.getName(Parser_1.ParseMode.BrighterScript), resultType, options.flags, this.range));
         return resultType;
     }
 }
 exports.InterfaceStatement = InterfaceStatement;
 class InterfaceFieldStatement extends AstNode_2.Statement {
-    constructor(nameToken, asToken, typeExpression) {
+    constructor(nameToken, asToken, typeExpression, optionalToken) {
         super();
         this.typeExpression = typeExpression;
         this.kind = AstNode_1.AstNodeKind.InterfaceFieldStatement;
         this.tokens = {};
+        this.tokens.optional = optionalToken;
         this.tokens.name = nameToken;
         this.tokens.as = asToken;
-        this.range = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.typeExpression);
+        this.range = util_1.util.createBoundingRange(this.tokens.optional, this.tokens.name, this.tokens.as, this.typeExpression);
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.name.leadingTrivia);
+    }
     get name() {
         return this.tokens.name.text;
     }
+    get isOptional() {
+        return !!this.tokens.optional;
+    }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
             (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
@@ -1077,6 +1114,9 @@ class InterfaceFieldStatement extends AstNode_2.Statement {
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
+        if (this.isOptional) {
+            result.push(this.tokens.optional.text, ' ');
+        }
         result.push(this.tokens.name.text);
         if (this.typeExpression) {
             result.push(' as ', ...this.typeExpression.getTypedef(state));
@@ -1092,12 +1132,13 @@ exports.InterfaceFieldStatement = InterfaceFieldStatement;
 //TODO: there is much that is similar with this and FunctionExpression.
 //It would be nice to refactor this so there is less duplicated code
 class InterfaceMethodStatement extends AstNode_2.Statement {
-    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeExpression) {
+    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeExpression, optionalToken) {
         super();
         this.params = params;
         this.returnTypeExpression = returnTypeExpression;
         this.kind = AstNode_1.AstNodeKind.InterfaceMethodStatement;
         this.tokens = {};
+        this.tokens.optional = optionalToken;
         this.tokens.functionType = functionTypeToken;
         this.tokens.name = nameToken;
         this.tokens.leftParen = leftParen;
@@ -1109,7 +1150,20 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
     }
     get range() {
         var _a;
-        return util_1.util.createBoundingRange(this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.returnTypeExpression);
+        return util_1.util.createBoundingRange(this.tokens.optional, this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.returnTypeExpression);
+    }
+    /**
+     * Get the name of this method.
+     */
+    getName(parseMode) {
+        return this.tokens.name.text;
+    }
+    get isOptional() {
+        return !!this.tokens.optional;
+    }
+    getLeadingTrivia() {
+        var _a, _b;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.functionType.leadingTrivia);
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
@@ -1122,6 +1176,9 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
+        if (this.isOptional) {
+            result.push(this.tokens.optional.text, ' ');
+        }
         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++) {
@@ -1141,7 +1198,7 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
         return result;
     }
     getType(options) {
-        var _a;
+        var _a, _b, _c;
         //if there's a defined return type, use that
         let returnType = (_a = this.returnTypeExpression) === null || _a === void 0 ? void 0 : _a.getType(options);
         const isSub = this.tokens.functionType.kind === TokenKind_1.TokenKind.Sub;
@@ -1149,11 +1206,18 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
         if (!returnType) {
             returnType = isSub ? VoidType_1.VoidType.instance : DynamicType_1.DynamicType.instance;
         }
-        const resultType = new FunctionType_1.FunctionType(returnType);
+        const resultType = new TypedFunctionType_1.TypedFunctionType(returnType);
         resultType.isSub = isSub;
         for (let param of this.params) {
             resultType.addParameter(param.name.text, param.getType(options), !!param.defaultValue);
         }
+        if (options.typeChain) {
+            // need Interface type for type chain
+            (_b = this.parent) === null || _b === void 0 ? void 0 : _b.getType(options);
+        }
+        let funcName = this.getName(Parser_1.ParseMode.BrighterScript);
+        resultType.setName(funcName);
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, options.flags, this.range));
         return resultType;
     }
 }
@@ -1164,7 +1228,7 @@ class ClassStatement extends AstNode_2.Statement {
      * The name of the class (without namespace prefix)
      */
     name, body, end, extendsKeyword, parentClassName) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         super();
         this.classKeyword = classKeyword;
         this.name = name;
@@ -1177,14 +1241,15 @@ class ClassStatement extends AstNode_2.Statement {
         this.methods = [];
         this.fields = [];
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
+        this.symbolTable = new SymbolTable_2.SymbolTable(`ClassStatement: '${(_b = this.name) === null || _b === void 0 ? void 0 : _b.text}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
         for (let statement of this.body) {
             if ((0, reflection_1.isMethodStatement)(statement)) {
                 this.methods.push(statement);
-                this.memberMap[(_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text.toLowerCase()] = statement;
+                this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
             else if ((0, reflection_1.isFieldStatement)(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.memberMap[(_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text.toLowerCase()] = statement;
             }
         }
         this.range = util_1.util.createBoundingRange(classKeyword, name, extendsKeyword, parentClassName, ...(body !== null && body !== void 0 ? body : []), end);
@@ -1208,6 +1273,9 @@ class ClassStatement extends AstNode_2.Statement {
             return undefined;
         }
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.classKeyword.leadingTrivia);
+    }
     transpile(state) {
         let result = [];
         //make the builder
@@ -1309,6 +1377,12 @@ class ClassStatement extends AstNode_2.Statement {
         }
         return `__${name}_builder`;
     }
+    getConstructorType() {
+        var _a, _b;
+        const constructorType = (_b = (_a = this.getConstructorFunction()) === null || _a === void 0 ? void 0 : _a.getType({ flags: SymbolTable_1.SymbolTypeFlag.runtime })) !== null && _b !== void 0 ? _b : new TypedFunctionType_1.TypedFunctionType(null);
+        constructorType.returnType = this.getType({ flags: SymbolTable_1.SymbolTypeFlag.runtime });
+        return constructorType;
+    }
     /**
      * Get the constructor function for this class (if exists), or undefined if not exist
      */
@@ -1446,16 +1520,20 @@ class ClassStatement extends AstNode_2.Statement {
         }
     }
     getType(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const superClass = (_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getType(options);
         const resultType = new ClassType_1.ClassType(this.getName(Parser_1.ParseMode.BrighterScript), superClass);
         for (const statement of this.methods) {
-            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getType(options);
-            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, funcType, SymbolTable_1.SymbolTypeFlag.runtime);
+            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
+            const flag = SymbolTable_1.SymbolTypeFlag.runtime;
+            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text, { definingNode: statement }, funcType, flag);
         }
         for (const statement of this.fields) {
-            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+            const fieldType = statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
+            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
+            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, fieldType, flag);
         }
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, options.flags, this.range));
         return resultType;
     }
 }
@@ -1490,6 +1568,9 @@ class MethodStatement extends FunctionStatement {
     getName(parseMode) {
         return this.name.text;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
+    }
     transpile(state) {
         if (this.name.text.toLowerCase() === 'new') {
             this.ensureSuperConstructorCall(state);
@@ -1562,19 +1643,22 @@ class MethodStatement extends FunctionStatement {
             text: 'super',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: ''
+            leadingWhitespace: '',
+            leadingTrivia: []
         }), {
             kind: TokenKind_1.TokenKind.LeftParen,
             text: '(',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: ''
+            leadingWhitespace: '',
+            leadingTrivia: []
         }, {
             kind: TokenKind_1.TokenKind.RightParen,
             text: ')',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: ''
+            leadingWhitespace: '',
+            leadingTrivia: []
         }, []));
         state.editor.arrayUnshift(this.func.body.statements, superCall);
     }
@@ -1588,13 +1672,14 @@ class MethodStatement extends FunctionStatement {
         for (let field of state.classStatement.fields) {
             let thisQualifiedName = Object.assign({}, field.name);
             thisQualifiedName.text = 'm.' + field.name.text;
-            if (field.initialValue) {
-                newStatements.push(new AssignmentStatement(field.equal, thisQualifiedName, field.initialValue));
-            }
-            else {
+            const fieldAssignment = field.initialValue
+                ? new AssignmentStatement(field.equal, thisQualifiedName, field.initialValue)
+                : new AssignmentStatement((0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.name.range), thisQualifiedName, 
                 //if there is no initial value, set the initial value to `invalid`
-                newStatements.push(new AssignmentStatement((0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.name.range), thisQualifiedName, (0, creators_1.createInvalidLiteral)('invalid', field.name.range)));
-            }
+                (0, creators_1.createInvalidLiteral)('invalid', field.name.range));
+            // Add parent so namespace lookups work
+            fieldAssignment.parent = state.classStatement;
+            newStatements.push(fieldAssignment);
         }
         state.editor.arraySplice(this.func.body.statements, startingIndex, 0, ...newStatements);
     }
@@ -1606,7 +1691,7 @@ class MethodStatement extends FunctionStatement {
 }
 exports.MethodStatement = MethodStatement;
 class FieldStatement extends AstNode_2.Statement {
-    constructor(accessModifier, name, as, typeExpression, equal, initialValue) {
+    constructor(accessModifier, name, as, typeExpression, equal, initialValue, optional) {
         super();
         this.accessModifier = accessModifier;
         this.name = name;
@@ -1614,8 +1699,9 @@ class FieldStatement extends AstNode_2.Statement {
         this.typeExpression = typeExpression;
         this.equal = equal;
         this.initialValue = initialValue;
+        this.optional = optional;
         this.kind = AstNode_1.AstNodeKind.FieldStatement;
-        this.range = util_1.util.createBoundingRange(accessModifier, name, as, typeExpression, equal, initialValue);
+        this.range = util_1.util.createBoundingRange(accessModifier, optional, name, as, typeExpression, equal, initialValue);
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
@@ -1625,6 +1711,13 @@ class FieldStatement extends AstNode_2.Statement {
         var _a, _b, _c, _d;
         return (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime }))) !== null && _b !== void 0 ? _b : (_c = this.initialValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
     }
+    getLeadingTrivia() {
+        var _a, _b, _c, _d, _e, _f;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_f = (_d = (_b = (_a = this.accessModifier) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : (_c = this.optional) === null || _c === void 0 ? void 0 : _c.leadingTrivia) !== null && _d !== void 0 ? _d : (_e = this.name) === null || _e === void 0 ? void 0 : _e.leadingTrivia) !== null && _f !== void 0 ? _f : []);
+    }
+    get isOptional() {
+        return !!this.optional;
+    }
     transpile(state) {
         throw new Error('transpile not implemented for ' + Object.getPrototypeOf(this).constructor.name);
     }
@@ -1639,7 +1732,11 @@ class FieldStatement extends AstNode_2.Statement {
             if ((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());
+            result.push((_c = (_b = this.accessModifier) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'public', ' ');
+            if (this.isOptional) {
+                result.push(this.optional.text, ' ');
+            }
+            result.push((_d = this.name) === null || _d === void 0 ? void 0 : _d.text, ' as ', type.toTypeString());
         }
         return result;
     }
@@ -1758,6 +1855,9 @@ class EnumStatement extends AstNode_2.Statement {
         }
         return result;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.enum.leadingTrivia);
+    }
     /**
      * Get a map of member names and their values.
      * All values are stored as their AST LiteralExpression representation (i.e. string enum values include the wrapping quotes)
@@ -1852,12 +1952,13 @@ class EnumStatement extends AstNode_2.Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
-    getType() {
-        var _a, _b;
-        const resultType = new EnumType_1.EnumType(this.fullName);
+    getType(options) {
+        var _a, _b, _c;
+        const members = this.getMembers();
+        const resultType = new EnumType_1.EnumType(this.fullName, (_a = members[0]) === null || _a === void 0 ? void 0 : _a.getType(options).underlyingType);
         resultType.pushMemberProvider(() => this.getSymbolTable());
-        for (const statement of this.getMembers()) {
-            resultType.addMember((_b = (_a = statement === null || statement === void 0 ? void 0 : statement.tokens) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType(), SymbolTable_1.SymbolTypeFlag.runtime);
+        for (const statement of members) {
+            resultType.addMember((_c = (_b = statement === null || statement === void 0 ? void 0 : statement.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
         }
         return resultType;
     }
@@ -1879,6 +1980,9 @@ class EnumMemberStatement extends AstNode_2.Statement {
     get name() {
         return this.tokens.name.text;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.name.leadingTrivia);
+    }
     transpile(state) {
         return [];
     }
@@ -1899,9 +2003,9 @@ class EnumMemberStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getType() {
-        var _a, _b, _c;
-        return new EnumType_1.EnumMemberType((_a = this.parent) === null || _a === void 0 ? void 0 : _a.fullName, (_c = (_b = this.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text);
+    getType(options) {
+        var _a, _b, _c, _d;
+        return new EnumType_1.EnumMemberType((_a = this.parent) === null || _a === void 0 ? void 0 : _a.fullName, (_c = (_b = this.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text, (_d = this.value) === null || _d === void 0 ? void 0 : _d.getType(options));
     }
 }
 exports.EnumMemberStatement = EnumMemberStatement;
@@ -1916,6 +2020,9 @@ class ConstStatement extends AstNode_2.Statement {
     get name() {
         return this.tokens.name.text;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.const.leadingTrivia);
+    }
     /**
      * The name of the statement WITH its leading namespace (if applicable)
      */