brighterscript 0.66.0-alpha.4 → 0.66.0-alpha.6

package/dist/parser/Statement.d.ts

@@ -1,6 +1,7 @@
 import type { Token, Identifier } from '../lexer/Token';
 import { TokenKind } from '../lexer/TokenKind';
-import type { FunctionExpression, FunctionParameterExpression, TypeExpression } from './Expression';
+import type { DottedGetExpression, FunctionExpression, FunctionParameterExpression, TypeExpression } from './Expression';
+import { VariableExpression } from './Expression';
 import type { Range } from 'vscode-languageserver';
 import type { BrsTranspileState } from './BrsTranspileState';
 import { ParseMode } from './Parser';
@@ -13,7 +14,6 @@ import type { Expression } from './AstNode';
 import { AstNodeKind } from './AstNode';
 import { Statement } from './AstNode';
 import { ClassType } from '../types/ClassType';
-import { EnumMemberType, EnumType } from '../types/EnumType';
 import { NamespaceType } from '../types/NamespaceType';
 import { InterfaceType } from '../types/InterfaceType';
 import type { BscType } from '../types/BscType';
@@ -119,6 +119,7 @@ export declare class FunctionStatement extends Statement implements TypedefProvi
      * Get the name of this expression based on the parse mode
      */
     getName(parseMode: ParseMode): string;
+    getLeadingTrivia(): Token[];
     transpile(state: BrsTranspileState): any[];
     getTypedef(state: BrsTranspileState): any[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
@@ -222,6 +223,7 @@ export declare class LabelStatement extends Statement {
     });
     readonly kind = AstNodeKind.LabelStatement;
     readonly range: Range;
+    getLeadingTrivia(): Token[];
     transpile(state: BrsTranspileState): SourceNode[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
 }
@@ -352,10 +354,10 @@ export declare class LibraryStatement extends Statement implements TypedefProvid
 }
 export declare class NamespaceStatement extends Statement implements TypedefProvider {
     keyword: Token;
-    nameExpression: Expression;
+    nameExpression: VariableExpression | DottedGetExpression;
     body: Body;
     endKeyword: Token;
-    constructor(keyword: Token, nameExpression: Expression, body: Body, endKeyword: Token);
+    constructor(keyword: Token, nameExpression: VariableExpression | DottedGetExpression, body: Body, endKeyword: Token);
     readonly kind = AstNodeKind.NamespaceStatement;
     /**
      * The string name for this namespace
@@ -365,6 +367,7 @@ export declare class NamespaceStatement extends Statement implements TypedefProv
     private _range;
     cacheRange(): Range;
     getName(parseMode: ParseMode): string;
+    getLeadingTrivia(): Token[];
     getNameParts(): Identifier[];
     transpile(state: BrsTranspileState): TranspileResult;
     getTypedef(state: BrsTranspileState): string[];
@@ -400,6 +403,7 @@ export declare class InterfaceStatement extends Statement implements TypedefProv
     get fields(): InterfaceFieldStatement[];
     get methods(): InterfaceMethodStatement[];
     hasParentInterface(): boolean;
+    getLeadingTrivia(): Token[];
     /**
      * The name of the interface WITH its leading namespace (if applicable)
      */
@@ -427,6 +431,7 @@ export declare class InterfaceFieldStatement extends Statement implements Typede
         name: Identifier;
         as: Token;
     };
+    getLeadingTrivia(): Token[];
     get name(): string;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getTypedef(state: BrsTranspileState): (string | SourceNode)[];
@@ -450,6 +455,7 @@ export declare class InterfaceMethodStatement extends Statement implements Typed
         rightParen: Token;
         as: Token;
     };
+    getLeadingTrivia(): Token[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
     getTypedef(state: BrsTranspileState): TranspileResult;
     getType(options: GetTypeOptions): TypedFunctionType;
@@ -471,6 +477,7 @@ export declare class ClassStatement extends Statement implements TypedefProvider
     name: Identifier, body: Statement[], end: Token, extendsKeyword?: Token, parentClassName?: TypeExpression);
     readonly kind = AstNodeKind.ClassStatement;
     getName(parseMode: ParseMode): string;
+    getLeadingTrivia(): Token[];
     memberMap: Record<string, MemberStatement>;
     methods: MethodStatement[];
     fields: FieldStatement[];
@@ -524,6 +531,7 @@ export declare class MethodStatement extends FunctionStatement {
      * Get the name of this method.
      */
     getName(parseMode: ParseMode): string;
+    getLeadingTrivia(): Token[];
     transpile(state: BrsTranspileState): any[];
     getTypedef(state: BrsTranspileState): (string | SourceNode)[];
     /**
@@ -552,6 +560,7 @@ export declare class FieldStatement extends Statement implements TypedefProvider
      */
     getType(options: GetTypeOptions): BscType;
     readonly range: Range;
+    getLeadingTrivia(): Token[];
     transpile(state: BrsTranspileState): TranspileResult;
     getTypedef(state: BrsTranspileState): any[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
@@ -612,6 +621,7 @@ export declare class EnumStatement extends Statement implements TypedefProvider
     symbolTable: SymbolTable;
     get range(): Range;
     getMembers(): EnumMemberStatement[];
+    getLeadingTrivia(): Token[];
     /**
      * 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)
@@ -629,7 +639,7 @@ export declare class EnumStatement extends Statement implements TypedefProvider
     transpile(state: BrsTranspileState): any[];
     getTypedef(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
-    getType(options: GetTypeOptions): EnumType;
+    getType(options: GetTypeOptions): any;
 }
 export declare class EnumMemberStatement extends Statement implements TypedefProvider {
     tokens: {
@@ -647,10 +657,11 @@ export declare class EnumMemberStatement extends Statement implements TypedefPro
      * The name of the member
      */
     get name(): string;
+    getLeadingTrivia(): Token[];
     transpile(state: BrsTranspileState): TranspileResult;
     getTypedef(state: BrsTranspileState): (string | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
-    getType(options: GetTypeOptions): EnumMemberType;
+    getType(options: GetTypeOptions): any;
 }
 export declare class ConstStatement extends Statement implements TypedefProvider {
     tokens: {
@@ -667,6 +678,7 @@ export declare class ConstStatement extends Statement implements TypedefProvider
     readonly kind = AstNodeKind.ConstStatement;
     range: Range;
     get name(): string;
+    getLeadingTrivia(): Token[];
     /**
      * The name of the statement WITH its leading namespace (if applicable)
      */

package/dist/parser/Statement.js

@@ -293,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) });
@@ -534,6 +537,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),
@@ -836,9 +842,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;
@@ -867,6 +871,9 @@ class NamespaceStatement extends AstNode_2.Statement {
         }
         return name;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.keyword.leadingTrivia);
+    }
     getNameParts() {
         var _a, _b;
         let parts = util_1.util.getAllDottedGetParts(this.nameExpression);
@@ -901,7 +908,6 @@ class NamespaceStatement extends AstNode_2.Statement {
     }
     getType(options) {
         const resultType = new NamespaceType_1.NamespaceType(this.name);
-        resultType.pushMemberProvider(() => this.body.getSymbolTable());
         return resultType;
     }
 }
@@ -968,6 +974,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)
      */
@@ -1056,11 +1065,11 @@ class InterfaceStatement extends AstNode_2.Statement {
         const resultType = new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), superIface);
         for (const statement of this.methods) {
             const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
-            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, memberType, 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, SymbolTable_1.SymbolTypeFlag.runtime);
         }
         for (const statement of this.fields) {
             const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
-            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, memberType, 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, SymbolTable_1.SymbolTypeFlag.runtime);
         }
         (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(this.getName(Parser_1.ParseMode.BrighterScript), resultType, this.range));
         return resultType;
@@ -1080,6 +1089,9 @@ class InterfaceFieldStatement extends AstNode_2.Statement {
     transpile(state) {
         throw new Error('Method not implemented.');
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.name.leadingTrivia);
+    }
     get name() {
         return this.tokens.name.text;
     }
@@ -1134,6 +1146,9 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
     getName(parseMode) {
         return this.tokens.name.text;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.functionType.leadingTrivia);
+    }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
             (0, visitors_1.walk)(this, 'returnTypeExpression', visitor, options);
@@ -1194,7 +1209,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;
@@ -1207,14 +1222,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);
@@ -1238,6 +1254,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
@@ -1481,11 +1500,11 @@ class ClassStatement extends AstNode_2.Statement {
         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(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
-            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);
+            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text, { definingNode: statement }, funcType, SymbolTable_1.SymbolTypeFlag.runtime);
         }
         for (const statement of this.fields) {
             const fieldType = statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
-            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, fieldType, 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, SymbolTable_1.SymbolTypeFlag.runtime);
         }
         (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, this.range));
         return resultType;
@@ -1522,6 +1541,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);
@@ -1594,19 +1616,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);
     }
@@ -1657,6 +1682,10 @@ 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;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_d = (_b = (_a = this.accessModifier) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : (_c = this.name) === null || _c === void 0 ? void 0 : _c.leadingTrivia) !== null && _d !== void 0 ? _d : []);
+    }
     transpile(state) {
         throw new Error('transpile not implemented for ' + Object.getPrototypeOf(this).constructor.name);
     }
@@ -1790,6 +1819,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)
@@ -1887,10 +1919,10 @@ class EnumStatement extends AstNode_2.Statement {
     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));
+        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, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+            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;
     }
@@ -1912,6 +1944,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 [];
     }
@@ -1949,6 +1984,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)
      */