brighterscript 1.0.0-alpha.41 → 1.0.0-alpha.43

package/dist/parser/Statement.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConditionalCompileConstStatement = exports.ConditionalCompileStatement = exports.AliasStatement = exports.ConditionalCompileErrorStatement = exports.TypecastStatement = exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.FieldStatement = exports.MethodStatement = 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.ExitStatement = exports.ExpressionStatement = exports.Block = exports.AugmentedAssignmentStatement = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
+const Expression_2 = require("./Expression");
 const util_1 = require("../util");
 const Parser_1 = require("./Parser");
 const visitors_1 = require("../astUtils/visitors");
@@ -12,7 +13,6 @@ const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
 const AstNode_1 = require("./AstNode");
-const AstNode_2 = require("./AstNode");
 const ClassType_1 = require("../types/ClassType");
 const EnumType_1 = require("../types/EnumType");
 const NamespaceType_1 = require("../types/NamespaceType");
@@ -21,7 +21,7 @@ const VoidType_1 = require("../types/VoidType");
 const TypedFunctionType_1 = require("../types/TypedFunctionType");
 const ArrayType_1 = require("../types/ArrayType");
 const BrightScriptDocParser_1 = require("./BrightScriptDocParser");
-class EmptyStatement extends AstNode_2.Statement {
+class EmptyStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.EmptyStatement;
@@ -43,7 +43,7 @@ exports.EmptyStatement = EmptyStatement;
 /**
  * This is a top-level statement. Consider this the root of the AST
  */
-class Body extends AstNode_2.Statement {
+class Body extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -116,7 +116,7 @@ class Body extends AstNode_2.Statement {
     }
 }
 exports.Body = Body;
-class AssignmentStatement extends AstNode_2.Statement {
+class AssignmentStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.AssignmentStatement;
@@ -134,7 +134,7 @@ class AssignmentStatement extends AstNode_2.Statement {
         return [
             state.transpileToken(this.tokens.name),
             ' ',
-            state.transpileToken((_a = this.tokens.equals) !== null && _a !== void 0 ? _a : (0, creators_1.createToken)(TokenKind_1.TokenKind.Equal)),
+            state.transpileToken((_a = this.tokens.equals) !== null && _a !== void 0 ? _a : (0, creators_1.createToken)(TokenKind_1.TokenKind.Equal), '='),
             ' ',
             ...this.value.transpile(state)
         ];
@@ -171,7 +171,7 @@ class AssignmentStatement extends AstNode_2.Statement {
     }
 }
 exports.AssignmentStatement = AssignmentStatement;
-class AugmentedAssignmentStatement extends AstNode_2.Statement {
+class AugmentedAssignmentStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.AugmentedAssignmentStatement;
@@ -219,7 +219,7 @@ class AugmentedAssignmentStatement extends AstNode_2.Statement {
     }
 }
 exports.AugmentedAssignmentStatement = AugmentedAssignmentStatement;
-class Block extends AstNode_2.Statement {
+class Block extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.Block;
@@ -333,7 +333,7 @@ class Block extends AstNode_2.Statement {
     }
 }
 exports.Block = Block;
-class ExpressionStatement extends AstNode_2.Statement {
+class ExpressionStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -363,7 +363,7 @@ class ExpressionStatement extends AstNode_2.Statement {
     }
 }
 exports.ExpressionStatement = ExpressionStatement;
-class ExitStatement extends AstNode_2.Statement {
+class ExitStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ExitStatement;
@@ -396,7 +396,7 @@ class ExitStatement extends AstNode_2.Statement {
     }
 }
 exports.ExitStatement = ExitStatement;
-class FunctionStatement extends AstNode_2.Statement {
+class FunctionStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a, _b;
         super();
@@ -467,7 +467,7 @@ class FunctionStatement extends AstNode_2.Statement {
     }
 }
 exports.FunctionStatement = FunctionStatement;
-class IfStatement extends AstNode_2.Statement {
+class IfStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.IfStatement;
@@ -504,7 +504,7 @@ class IfStatement extends AstNode_2.Statement {
         //then
         if (this.tokens.then) {
             results.push(' ');
-            results.push(state.transpileToken(this.tokens.then));
+            results.push(state.transpileToken(this.tokens.then, 'then'));
         }
         state.lineage.unshift(this);
         //if statement body
@@ -580,7 +580,7 @@ class IfStatement extends AstNode_2.Statement {
     }
 }
 exports.IfStatement = IfStatement;
-class IncrementStatement extends AstNode_2.Statement {
+class IncrementStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.IncrementStatement;
@@ -617,12 +617,12 @@ exports.IncrementStatement = IncrementStatement;
 /**
  * Represents a `print` statement within BrightScript.
  */
-class PrintStatement extends AstNode_2.Statement {
+class PrintStatement extends AstNode_1.Statement {
     /**
      * Creates a new internal representation of a BrightScript `print` statement.
      * @param options the options for this statement
      * @param options.print a print token
-     * @param options.expressions an array of expressions or `PrintSeparator`s to be evaluated and printed.
+     * @param options.expressions an array of expressions to be evaluated and printed. Wrap PrintSeparator tokens (`;` or `,`) in `PrintSeparatorExpression`
      */
     constructor(options) {
         var _a;
@@ -637,28 +637,30 @@ class PrintStatement extends AstNode_2.Statement {
     transpile(state) {
         var _a;
         let result = [
-            state.transpileToken(this.tokens.print),
-            ' '
+            state.transpileToken(this.tokens.print, 'print')
         ];
+        //if the first expression has no leading whitespace, add a single space between the `print` and the expression
+        if (this.expressions.length > 0 && !this.expressions[0].leadingTrivia.find(t => t.kind === TokenKind_1.TokenKind.Whitespace)) {
+            result.push(' ');
+        }
+        // eslint-disable-next-line @typescript-eslint/prefer-for-of
         for (let i = 0; i < this.expressions.length; i++) {
-            const expressionOrSeparator = this.expressions[i];
-            if (expressionOrSeparator.transpile) {
-                result.push(...expressionOrSeparator.transpile(state));
-            }
-            else {
-                result.push(state.tokenToSourceNode(expressionOrSeparator));
+            const expression = this.expressions[i];
+            let leadingWhitespace = (_a = expression.leadingTrivia.find(t => t.kind === TokenKind_1.TokenKind.Whitespace)) === null || _a === void 0 ? void 0 : _a.text;
+            if (leadingWhitespace) {
+                result.push(leadingWhitespace);
+                //if the previous expression was NOT a separator, and this one is not also, add a space between them
             }
-            //if there's an expression after us, add a space
-            if ((_a = this.expressions[i + 1]) === null || _a === void 0 ? void 0 : _a.transpile) {
+            else if (i > 0 && !(0, reflection_1.isPrintSeparatorExpression)(this.expressions[i - 1]) && !(0, reflection_1.isPrintSeparatorExpression)(expression) && !leadingWhitespace) {
                 result.push(' ');
             }
+            result.push(...expression.transpile(state));
         }
         return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            //sometimes we have semicolon Tokens in the expressions list (should probably fix that...), so only walk the actual expressions
-            (0, visitors_1.walkArray)(this.expressions, visitor, options, this, (item) => (0, reflection_1.isExpression)(item));
+            (0, visitors_1.walkArray)(this.expressions, visitor, options, this);
         }
     }
     get leadingTrivia() {
@@ -669,19 +671,12 @@ class PrintStatement extends AstNode_2.Statement {
         var _a;
         return this.finalizeClone(new PrintStatement({
             print: util_1.util.cloneToken(this.tokens.print),
-            expressions: (_a = this.expressions) === null || _a === void 0 ? void 0 : _a.map(e => {
-                if ((0, reflection_1.isExpression)(e)) {
-                    return e.clone();
-                }
-                else {
-                    return util_1.util.cloneToken(e);
-                }
-            })
+            expressions: (_a = this.expressions) === null || _a === void 0 ? void 0 : _a.map(e => e === null || e === void 0 ? void 0 : e.clone())
         }), ['expressions']);
     }
 }
 exports.PrintStatement = PrintStatement;
-class DimStatement extends AstNode_2.Statement {
+class DimStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -742,7 +737,7 @@ class DimStatement extends AstNode_2.Statement {
     }
 }
 exports.DimStatement = DimStatement;
-class GotoStatement extends AstNode_2.Statement {
+class GotoStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.GotoStatement;
@@ -774,7 +769,7 @@ class GotoStatement extends AstNode_2.Statement {
     }
 }
 exports.GotoStatement = GotoStatement;
-class LabelStatement extends AstNode_2.Statement {
+class LabelStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.LabelStatement;
@@ -804,7 +799,7 @@ class LabelStatement extends AstNode_2.Statement {
     }
 }
 exports.LabelStatement = LabelStatement;
-class ReturnStatement extends AstNode_2.Statement {
+class ReturnStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ReturnStatement;
@@ -841,7 +836,7 @@ class ReturnStatement extends AstNode_2.Statement {
     }
 }
 exports.ReturnStatement = ReturnStatement;
-class EndStatement extends AstNode_2.Statement {
+class EndStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -870,7 +865,7 @@ class EndStatement extends AstNode_2.Statement {
     }
 }
 exports.EndStatement = EndStatement;
-class StopStatement extends AstNode_2.Statement {
+class StopStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a, _b;
         super();
@@ -897,7 +892,7 @@ class StopStatement extends AstNode_2.Statement {
     }
 }
 exports.StopStatement = StopStatement;
-class ForStatement extends AstNode_2.Statement {
+class ForStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ForStatement;
@@ -970,7 +965,7 @@ class ForStatement extends AstNode_2.Statement {
     }
 }
 exports.ForStatement = ForStatement;
-class ForEachStatement extends AstNode_2.Statement {
+class ForEachStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ForEachStatement;
@@ -1034,7 +1029,7 @@ class ForEachStatement extends AstNode_2.Statement {
     }
 }
 exports.ForEachStatement = ForEachStatement;
-class WhileStatement extends AstNode_2.Statement {
+class WhileStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.WhileStatement;
@@ -1087,7 +1082,7 @@ class WhileStatement extends AstNode_2.Statement {
     }
 }
 exports.WhileStatement = WhileStatement;
-class DottedSetStatement extends AstNode_2.Statement {
+class DottedSetStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.DottedSetStatement;
@@ -1098,7 +1093,7 @@ class DottedSetStatement extends AstNode_2.Statement {
         };
         this.obj = options.obj;
         this.value = options.value;
-        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.dot, this.tokens.name, this.value);
+        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.dot, this.tokens.equals, this.tokens.name, this.value);
     }
     transpile(state) {
         //if the value is a compound assignment, don't add the obj, dot, name, or operator...the expression will handle that
@@ -1148,7 +1143,7 @@ class DottedSetStatement extends AstNode_2.Statement {
     }
 }
 exports.DottedSetStatement = DottedSetStatement;
-class IndexedSetStatement extends AstNode_2.Statement {
+class IndexedSetStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -1159,9 +1154,9 @@ class IndexedSetStatement extends AstNode_2.Statement {
             equals: options.equals
         };
         this.obj = options.obj;
-        this.indexes = options.indexes;
+        this.indexes = (_a = options.indexes) !== null && _a !== void 0 ? _a : [];
         this.value = options.value;
-        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.openingSquare, ...(_a = this.indexes) !== null && _a !== void 0 ? _a : [], this.tokens.closingSquare, this.value);
+        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.openingSquare, ...this.indexes, this.tokens.closingSquare, this.value);
     }
     transpile(state) {
         var _a;
@@ -1198,14 +1193,14 @@ class IndexedSetStatement extends AstNode_2.Statement {
             obj: (_a = this.obj) === null || _a === void 0 ? void 0 : _a.clone(),
             openingSquare: util_1.util.cloneToken(this.tokens.openingSquare),
             indexes: (_b = this.indexes) === null || _b === void 0 ? void 0 : _b.map(x => x === null || x === void 0 ? void 0 : x.clone()),
+            closingSquare: util_1.util.cloneToken(this.tokens.closingSquare),
             equals: util_1.util.cloneToken(this.tokens.equals),
-            value: (_c = this.value) === null || _c === void 0 ? void 0 : _c.clone(),
-            closingSquare: util_1.util.cloneToken(this.tokens.closingSquare)
+            value: (_c = this.value) === null || _c === void 0 ? void 0 : _c.clone()
         }), ['obj', 'indexes', 'value']);
     }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
-class LibraryStatement extends AstNode_2.Statement {
+class LibraryStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.LibraryStatement;
@@ -1243,7 +1238,7 @@ class LibraryStatement extends AstNode_2.Statement {
     }
 }
 exports.LibraryStatement = LibraryStatement;
-class NamespaceStatement extends AstNode_2.Statement {
+class NamespaceStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.NamespaceStatement;
@@ -1342,7 +1337,7 @@ class NamespaceStatement extends AstNode_2.Statement {
     }
 }
 exports.NamespaceStatement = NamespaceStatement;
-class ImportStatement extends AstNode_2.Statement {
+class ImportStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a, _b;
         super();
@@ -1397,7 +1392,7 @@ class ImportStatement extends AstNode_2.Statement {
     }
 }
 exports.ImportStatement = ImportStatement;
-class InterfaceStatement extends AstNode_2.Statement {
+class InterfaceStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -1552,7 +1547,7 @@ class InterfaceStatement extends AstNode_2.Statement {
     }
 }
 exports.InterfaceStatement = InterfaceStatement;
-class InterfaceFieldStatement extends AstNode_2.Statement {
+class InterfaceFieldStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.InterfaceFieldStatement;
@@ -1617,7 +1612,7 @@ class InterfaceFieldStatement extends AstNode_2.Statement {
 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 {
+class InterfaceMethodStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -1726,7 +1721,7 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
     }
 }
 exports.InterfaceMethodStatement = InterfaceMethodStatement;
-class ClassStatement extends AstNode_2.Statement {
+class ClassStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a, _b, _c, _d, _e;
         super();
@@ -1870,7 +1865,7 @@ class ClassStatement extends AstNode_2.Statement {
         let stmt = this;
         while (stmt) {
             if (stmt.parentClassName) {
-                const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+                const namespace = stmt.findAncestor(reflection_1.isNamespaceStatement);
                 stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
                 ancestors.push(stmt);
             }
@@ -1901,6 +1896,20 @@ class ClassStatement extends AstNode_2.Statement {
             return ((_b = (_a = stmt === null || stmt === void 0 ? void 0 : stmt.tokens.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'new';
         });
     }
+    /**
+     * Return the parameters for the first constructor function for this class
+     * @param ancestors The list of ancestors for this class
+     * @returns The parameters for the first constructor function for this class
+     */
+    getConstructorParams(ancestors) {
+        for (let ancestor of ancestors) {
+            const ctor = ancestor === null || ancestor === void 0 ? void 0 : ancestor.getConstructorFunction();
+            if (ctor) {
+                return ctor.func.parameters;
+            }
+        }
+        return [];
+    }
     /**
      * Determine if the specified field was declared in one of the ancestor classes
      */
@@ -1943,10 +1952,43 @@ class ClassStatement extends AstNode_2.Statement {
         let body = this.body;
         //inject an empty "new" method if missing
         if (!this.getConstructorFunction()) {
-            body = [
-                (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
-                ...this.body
-            ];
+            if (ancestors.length === 0) {
+                body = [
+                    (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
+                    ...this.body
+                ];
+            }
+            else {
+                const params = this.getConstructorParams(ancestors);
+                const call = new ExpressionStatement({
+                    expression: new Expression_2.CallExpression({
+                        callee: new Expression_2.VariableExpression({
+                            name: (0, creators_1.createToken)(TokenKind_1.TokenKind.Identifier, 'super')
+                        }),
+                        openingParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.LeftParen),
+                        args: params.map(x => new Expression_2.VariableExpression({
+                            name: util_1.util.cloneToken(x.tokens.name)
+                        })),
+                        closingParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.RightParen)
+                    })
+                });
+                body = [
+                    new MethodStatement({
+                        name: (0, creators_1.createIdentifier)('new'),
+                        func: new Expression_1.FunctionExpression({
+                            parameters: params.map(x => x.clone()),
+                            body: new Block({
+                                statements: [call]
+                            }),
+                            functionType: (0, creators_1.createToken)(TokenKind_1.TokenKind.Sub),
+                            endFunctionType: (0, creators_1.createToken)(TokenKind_1.TokenKind.EndSub),
+                            leftParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.LeftParen),
+                            rightParen: (0, creators_1.createToken)(TokenKind_1.TokenKind.RightParen)
+                        })
+                    }),
+                    ...this.body
+                ];
+            }
         }
         for (let statement of body) {
             //is field statement
@@ -1994,7 +2036,13 @@ class ClassStatement extends AstNode_2.Statement {
     getTranspiledClassFunction(state) {
         let result = state.transpileAnnotations(this);
         const constructorFunction = this.getConstructorFunction();
-        const constructorParams = constructorFunction ? constructorFunction.func.parameters : [];
+        let constructorParams = [];
+        if (constructorFunction) {
+            constructorParams = constructorFunction.func.parameters;
+        }
+        else {
+            constructorParams = this.getConstructorParams(this.getAncestors(state));
+        }
         result.push(state.transpileLeadingComments(this.tokens.class), state.sourceNode(this.tokens.class, 'function'), state.sourceNode(this.tokens.class, ' '), state.sourceNode(this.tokens.name, this.getName(Parser_1.ParseMode.BrightScript)), `(`);
         let i = 0;
         for (let param of constructorParams) {
@@ -2184,8 +2232,8 @@ class MethodStatement extends FunctionStatement {
         }
         //this is a child class, and the constructor doesn't contain a call to super. Inject one
         const superCall = new ExpressionStatement({
-            expression: new Expression_1.CallExpression({
-                callee: new Expression_1.VariableExpression({
+            expression: new Expression_2.CallExpression({
+                callee: new Expression_2.VariableExpression({
                     name: {
                         kind: TokenKind_1.TokenKind.Identifier,
                         text: 'super',
@@ -2261,7 +2309,7 @@ class MethodStatement extends FunctionStatement {
     }
 }
 exports.MethodStatement = MethodStatement;
-class FieldStatement extends AstNode_2.Statement {
+class FieldStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.FieldStatement;
@@ -2282,7 +2330,11 @@ class FieldStatement extends AstNode_2.Statement {
      */
     getType(options) {
         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: 2 /* SymbolTypeFlag.typetime */ }))) !== null && _b !== void 0 ? _b : (_c = this.initialValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: 1 /* SymbolTypeFlag.runtime */ }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
+        let initialValueType = (_a = this.initialValue) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: 1 /* SymbolTypeFlag.runtime */ }));
+        if ((0, reflection_1.isInvalidType)(initialValueType) || (0, reflection_1.isVoidType)(initialValueType) || (0, reflection_1.isUninitializedType)(initialValueType)) {
+            initialValueType = undefined;
+        }
+        return (_d = (_c = (_b = this.typeExpression) === null || _b === void 0 ? void 0 : _b.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */ }))) !== null && _c !== void 0 ? _c : util_1.util.getDefaultTypeFromValueType(initialValueType)) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
     }
     get leadingTrivia() {
         var _a, _b, _c, _d;
@@ -2305,7 +2357,7 @@ class FieldStatement extends AstNode_2.Statement {
                 result.push(...annotation.getTypedef(state), state.newline, state.indent());
             }
             let type = this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
-            if ((0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type)) {
+            if ((0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type) || (0, reflection_1.isUninitializedType)(type)) {
                 type = new DynamicType_1.DynamicType();
             }
             result.push((_d = (_c = this.tokens.accessModifier) === null || _c === void 0 ? void 0 : _c.text) !== null && _d !== void 0 ? _d : 'public', ' ');
@@ -2336,7 +2388,7 @@ class FieldStatement extends AstNode_2.Statement {
     }
 }
 exports.FieldStatement = FieldStatement;
-class TryCatchStatement extends AstNode_2.Statement {
+class TryCatchStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.TryCatchStatement;
@@ -2386,7 +2438,7 @@ class TryCatchStatement extends AstNode_2.Statement {
     }
 }
 exports.TryCatchStatement = TryCatchStatement;
-class CatchStatement extends AstNode_2.Statement {
+class CatchStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.CatchStatement;
@@ -2430,7 +2482,7 @@ class CatchStatement extends AstNode_2.Statement {
     }
 }
 exports.CatchStatement = CatchStatement;
-class ThrowStatement extends AstNode_2.Statement {
+class ThrowStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ThrowStatement;
@@ -2473,7 +2525,7 @@ class ThrowStatement extends AstNode_2.Statement {
     }
 }
 exports.ThrowStatement = ThrowStatement;
-class EnumStatement extends AstNode_2.Statement {
+class EnumStatement extends AstNode_1.Statement {
     constructor(options) {
         var _a;
         super();
@@ -2612,7 +2664,9 @@ class EnumStatement extends AstNode_2.Statement {
         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 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), 1 /* SymbolTypeFlag.runtime */);
+            const memberType = statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
+            memberType.parentEnumType = resultType;
+            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 }, memberType, 1 /* SymbolTypeFlag.runtime */);
         }
         return resultType;
     }
@@ -2627,7 +2681,7 @@ class EnumStatement extends AstNode_2.Statement {
     }
 }
 exports.EnumStatement = EnumStatement;
-class EnumMemberStatement extends AstNode_2.Statement {
+class EnumMemberStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.EnumMemberStatement;
@@ -2686,7 +2740,7 @@ class EnumMemberStatement extends AstNode_2.Statement {
     }
 }
 exports.EnumMemberStatement = EnumMemberStatement;
-class ConstStatement extends AstNode_2.Statement {
+class ConstStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ConstStatement;
@@ -2761,7 +2815,7 @@ class ConstStatement extends AstNode_2.Statement {
     }
 }
 exports.ConstStatement = ConstStatement;
-class ContinueStatement extends AstNode_2.Statement {
+class ContinueStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ContinueStatement;
@@ -2794,7 +2848,7 @@ class ContinueStatement extends AstNode_2.Statement {
     }
 }
 exports.ContinueStatement = ContinueStatement;
-class TypecastStatement extends AstNode_2.Statement {
+class TypecastStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.TypecastStatement;
@@ -2837,7 +2891,7 @@ class TypecastStatement extends AstNode_2.Statement {
     }
 }
 exports.TypecastStatement = TypecastStatement;
-class ConditionalCompileErrorStatement extends AstNode_2.Statement {
+class ConditionalCompileErrorStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ConditionalCompileErrorStatement;
@@ -2869,7 +2923,7 @@ class ConditionalCompileErrorStatement extends AstNode_2.Statement {
     }
 }
 exports.ConditionalCompileErrorStatement = ConditionalCompileErrorStatement;
-class AliasStatement extends AstNode_2.Statement {
+class AliasStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.AliasStatement;
@@ -2916,7 +2970,7 @@ class AliasStatement extends AstNode_2.Statement {
     }
 }
 exports.AliasStatement = AliasStatement;
-class ConditionalCompileStatement extends AstNode_2.Statement {
+class ConditionalCompileStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ConditionalCompileStatement;
@@ -3028,7 +3082,7 @@ class ConditionalCompileStatement extends AstNode_2.Statement {
     }
 }
 exports.ConditionalCompileStatement = ConditionalCompileStatement;
-class ConditionalCompileConstStatement extends AstNode_2.Statement {
+class ConditionalCompileConstStatement extends AstNode_1.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.ConditionalCompileConstStatement;