brighterscript 0.57.2 → 0.59.0

package/dist/parser/AstNode.spec.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = require("../util");
+const fsExtra = require("fs-extra");
+const Program_1 = require("../Program");
+const chai_1 = require("chai");
+const testHelpers_spec_1 = require("../testHelpers.spec");
+const testHelpers_spec_2 = require("../testHelpers.spec");
+describe('Program', () => {
+    let program;
+    beforeEach(() => {
+        fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
+        program = new Program_1.Program({
+            rootDir: testHelpers_spec_2.rootDir,
+            stagingDir: testHelpers_spec_2.stagingDir
+        });
+        program.createSourceScope(); //ensure source scope is created
+    });
+    afterEach(() => {
+        fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
+        program.dispose();
+    });
+    describe('AstNode', () => {
+        describe('findNodeAtPosition', () => {
+            it('finds deepest AstNode that matches the position', () => {
+                const file = program.setFile('source/main.brs', `
+                    sub main()
+                        alpha = invalid
+                        print alpha.beta.charlie.delta(alpha.echo.foxtrot())
+                    end sub
+                `);
+                program.validate();
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+                const delta = file.ast.findChildAtPosition(util_1.util.createPosition(3, 52));
+                (0, chai_1.expect)(delta.name.text).to.eql('delta');
+                const foxtrot = file.ast.findChildAtPosition(util_1.util.createPosition(3, 71));
+                (0, chai_1.expect)(foxtrot.name.text).to.eql('foxtrot');
+            });
+        });
+    });
+});
+//# sourceMappingURL=AstNode.spec.js.map

package/dist/parser/AstNode.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AstNode.spec.js","sourceRoot":"","sources":["../../src/parser/AstNode.spec.ts"],"names":[],"mappings":";;AAAA,kCAA+B;AAC/B,oCAAoC;AACpC,wCAAqC;AAErC,+BAA8B;AAE9B,0DAA4D;AAC5D,0DAAmE;AAEnE,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACrB,IAAI,OAAgB,CAAC;IAErB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,YAAY,CAAC,0BAAO,CAAC,CAAC;QAC9B,OAAO,GAAG,IAAI,iBAAO,CAAC;YAClB,OAAO,EAAE,0BAAO;YAChB,UAAU,EAAE,6BAAU;SACzB,CAAC,CAAC;QACH,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,gCAAgC;IACjE,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,CAAC,YAAY,CAAC,0BAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACrB,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAChC,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;gBACvD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,iBAAiB,EAAE;;;;;iBAKxD,CAAC,CAAC;gBACH,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC;gBAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAsB,WAAI,CAAC,cAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC5F,IAAA,aAAM,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAExC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAsB,WAAI,CAAC,cAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC9F,IAAA,aAAM,EAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/parser/Expression.d.ts

@@ -1,36 +1,14 @@
 import type { Token, Identifier } from '../lexer/Token';
-import type { Block, CommentStatement, FunctionStatement, Statement } from './Statement';
+import type { Block, CommentStatement, FunctionStatement } from './Statement';
 import type { Range } from 'vscode-languageserver';
 import type { BrsTranspileState } from './BrsTranspileState';
 import { ParseMode } from './Parser';
 import type { WalkOptions, WalkVisitor } from '../astUtils/visitors';
-import { InternalWalkMode } from '../astUtils/visitors';
 import type { TranspileResult, TypedefProvider } from '../interfaces';
 import type { BscType } from '../types/BscType';
 import { FunctionType } from '../types/FunctionType';
-import { SymbolTable } from '../SymbolTable';
+import { Expression } from './AstNode';
 export declare type ExpressionVisitor = (expression: Expression, parent: Expression) => void;
-/** A BrightScript expression */
-export declare abstract class Expression {
-    /**
-     * The starting and ending location of the expression.
-     */
-    abstract range: Range;
-    abstract transpile(state: BrsTranspileState): TranspileResult;
-    /**
-     * When being considered by the walk visitor, this describes what type of element the current class is.
-     */
-    visitMode: InternalWalkMode;
-    abstract walk(visitor: WalkVisitor, options: WalkOptions): any;
-    /**
-     * The parent node for this expression. This is set dynamically during `onFileValidate`, and should not be set directly.
-     */
-    parent?: Statement | Expression;
-    /**
-     * Get the closest symbol table for this node. Should be overridden in children that directly contain a symbol table
-     */
-    getSymbolTable(): SymbolTable;
-}
 export declare class BinaryExpression extends Expression {
     left: Expression;
     operator: Token;
@@ -48,20 +26,12 @@ export declare class CallExpression extends Expression {
     readonly openingParen: Token;
     readonly closingParen: Token;
     readonly args: Expression[];
-    /**
-     * The namespace that currently wraps this call expression. This is NOT the namespace of the callee...that will be represented in the callee expression itself.
-     */
-    readonly namespaceName: NamespacedVariableNameExpression;
     static MaximumArguments: number;
     constructor(callee: Expression, 
     /**
      * Can either be `(`, or `?(` for optional chaining
      */
-    openingParen: Token, closingParen: Token, args: Expression[], 
-    /**
-     * The namespace that currently wraps this call expression. This is NOT the namespace of the callee...that will be represented in the callee expression itself.
-     */
-    namespaceName: NamespacedVariableNameExpression);
+    openingParen: Token, closingParen: Token, args: Expression[]);
     readonly range: Range;
     transpile(state: BrsTranspileState, nameOverride?: string): any[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
@@ -79,15 +49,11 @@ export declare class FunctionExpression extends Expression implements TypedefPro
      * If this function is enclosed within another function, this will reference that parent function
      */
     readonly parentFunction?: FunctionExpression;
-    readonly namespaceName?: NamespacedVariableNameExpression;
-    readonly parentSymbolTable?: SymbolTable;
     constructor(parameters: FunctionParameterExpression[], body: Block, functionType: Token | null, end: Token, leftParen: Token, rightParen: Token, asToken?: Token, returnTypeToken?: Token, 
     /**
      * If this function is enclosed within another function, this will reference that parent function
      */
-    parentFunction?: FunctionExpression, namespaceName?: NamespacedVariableNameExpression, parentSymbolTable?: SymbolTable);
-    symbolTable: SymbolTable;
-    getSymbolTable(): SymbolTable;
+    parentFunction?: FunctionExpression);
     /**
      * The type this function returns
      */
@@ -120,8 +86,7 @@ export declare class FunctionParameterExpression extends Expression {
     typeToken?: Token;
     defaultValue?: Expression;
     asToken?: Token;
-    readonly namespaceName?: NamespacedVariableNameExpression;
-    constructor(name: Identifier, typeToken?: Token, defaultValue?: Expression, asToken?: Token, namespaceName?: NamespacedVariableNameExpression);
+    constructor(name: Identifier, typeToken?: Token, defaultValue?: Expression, asToken?: Token);
     type: BscType;
     get range(): Range;
     transpile(state: BrsTranspileState): any[];
@@ -268,8 +233,7 @@ export declare class UnaryExpression extends Expression {
 }
 export declare class VariableExpression extends Expression {
     readonly name: Identifier;
-    readonly namespaceName: NamespacedVariableNameExpression;
-    constructor(name: Identifier, namespaceName: NamespacedVariableNameExpression);
+    constructor(name: Identifier);
     readonly range: Range;
     getName(parseMode: ParseMode): string;
     transpile(state: BrsTranspileState): any[];
@@ -296,7 +260,6 @@ export declare class NewExpression extends Expression {
      * The name of the class to initialize (with optional namespace prefixed)
      */
     get className(): NamespacedVariableNameExpression;
-    get namespaceName(): NamespacedVariableNameExpression;
     readonly range: Range;
     transpile(state: BrsTranspileState): any[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;

package/dist/parser/Expression.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegexLiteralExpression = exports.NullCoalescingExpression = exports.TernaryExpression = exports.AnnotationExpression = exports.TaggedTemplateStringExpression = exports.TemplateStringExpression = exports.TemplateStringQuasiExpression = exports.CallfuncExpression = exports.NewExpression = exports.SourceLiteralExpression = exports.VariableExpression = exports.UnaryExpression = exports.AALiteralExpression = exports.AAMemberExpression = exports.ArrayLiteralExpression = exports.EscapedCharCodeLiteralExpression = exports.LiteralExpression = exports.GroupingExpression = exports.IndexedGetExpression = exports.XmlAttributeGetExpression = exports.DottedGetExpression = exports.NamespacedVariableNameExpression = exports.FunctionParameterExpression = exports.FunctionExpression = exports.CallExpression = exports.BinaryExpression = exports.Expression = void 0;
+exports.RegexLiteralExpression = exports.NullCoalescingExpression = exports.TernaryExpression = exports.AnnotationExpression = exports.TaggedTemplateStringExpression = exports.TemplateStringExpression = exports.TemplateStringQuasiExpression = exports.CallfuncExpression = exports.NewExpression = exports.SourceLiteralExpression = exports.VariableExpression = exports.UnaryExpression = exports.AALiteralExpression = exports.AAMemberExpression = exports.ArrayLiteralExpression = exports.EscapedCharCodeLiteralExpression = exports.LiteralExpression = exports.GroupingExpression = exports.IndexedGetExpression = exports.XmlAttributeGetExpression = exports.DottedGetExpression = exports.NamespacedVariableNameExpression = exports.FunctionParameterExpression = exports.FunctionExpression = exports.CallExpression = exports.BinaryExpression = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const util_1 = require("../util");
 const Parser_1 = require("./Parser");
@@ -10,25 +10,8 @@ const reflection_1 = require("../astUtils/reflection");
 const VoidType_1 = require("../types/VoidType");
 const DynamicType_1 = require("../types/DynamicType");
 const FunctionType_1 = require("../types/FunctionType");
-const SymbolTable_1 = require("../SymbolTable");
-/** A BrightScript expression */
-class Expression {
-    constructor() {
-        /**
-         * When being considered by the walk visitor, this describes what type of element the current class is.
-         */
-        this.visitMode = visitors_1.InternalWalkMode.visitExpressions;
-    }
-    /**
-     * Get the closest symbol table for this node. Should be overridden in children that directly contain a symbol table
-     */
-    getSymbolTable() {
-        var _a;
-        return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable();
-    }
-}
-exports.Expression = Expression;
-class BinaryExpression extends Expression {
+const AstNode_1 = require("./AstNode");
+class BinaryExpression extends AstNode_1.Expression {
     constructor(left, operator, right) {
         super();
         this.left = left;
@@ -53,23 +36,18 @@ class BinaryExpression extends Expression {
     }
 }
 exports.BinaryExpression = BinaryExpression;
-class CallExpression extends Expression {
+class CallExpression extends AstNode_1.Expression {
     constructor(callee, 
     /**
      * Can either be `(`, or `?(` for optional chaining
      */
-    openingParen, closingParen, args, 
-    /**
-     * The namespace that currently wraps this call expression. This is NOT the namespace of the callee...that will be represented in the callee expression itself.
-     */
-    namespaceName) {
+    openingParen, closingParen, args) {
         super();
         this.callee = callee;
         this.openingParen = openingParen;
         this.closingParen = closingParen;
         this.args = args;
-        this.namespaceName = namespaceName;
-        this.range = util_1.default.createRangeFromPositions(this.callee.range.start, this.closingParen.range.end);
+        this.range = util_1.default.createBoundingRange(this.callee, this.openingParen, ...args, this.closingParen);
     }
     transpile(state, nameOverride) {
         let result = [];
@@ -89,7 +67,9 @@ class CallExpression extends Expression {
             let arg = this.args[i];
             result.push(...arg.transpile(state));
         }
-        result.push(state.transpileToken(this.closingParen));
+        if (this.closingParen) {
+            result.push(state.transpileToken(this.closingParen));
+        }
         return result;
     }
     walk(visitor, options) {
@@ -101,12 +81,12 @@ class CallExpression extends Expression {
 }
 exports.CallExpression = CallExpression;
 CallExpression.MaximumArguments = 32;
-class FunctionExpression extends Expression {
+class FunctionExpression extends AstNode_1.Expression {
     constructor(parameters, body, functionType, end, leftParen, rightParen, asToken, returnTypeToken, 
     /**
      * If this function is enclosed within another function, this will reference that parent function
      */
-    parentFunction, namespaceName, parentSymbolTable) {
+    parentFunction) {
         super();
         this.parameters = parameters;
         this.body = body;
@@ -117,8 +97,6 @@ class FunctionExpression extends Expression {
         this.asToken = asToken;
         this.returnTypeToken = returnTypeToken;
         this.parentFunction = parentFunction;
-        this.namespaceName = namespaceName;
-        this.parentSymbolTable = parentSymbolTable;
         /**
          * The list of function calls that are declared within this function scope. This excludes CallExpressions
          * declared in child functions
@@ -137,13 +115,6 @@ class FunctionExpression extends Expression {
         else {
             this.returnType = DynamicType_1.DynamicType.instance;
         }
-        this.symbolTable = new SymbolTable_1.SymbolTable(parentSymbolTable);
-        for (let param of parameters) {
-            this.symbolTable.addSymbol(param.name.text, param.name.range, DynamicType_1.DynamicType.instance);
-        }
-    }
-    getSymbolTable() {
-        return this.symbolTable;
     }
     /**
      * The range of the function, starting at the 'f' in function or 's' in sub (or the open paren if the keyword is missing),
@@ -216,14 +187,13 @@ class FunctionExpression extends Expression {
     }
 }
 exports.FunctionExpression = FunctionExpression;
-class FunctionParameterExpression extends Expression {
-    constructor(name, typeToken, defaultValue, asToken, namespaceName) {
+class FunctionParameterExpression extends AstNode_1.Expression {
+    constructor(name, typeToken, defaultValue, asToken) {
         super();
         this.name = name;
         this.typeToken = typeToken;
         this.defaultValue = defaultValue;
         this.asToken = asToken;
-        this.namespaceName = namespaceName;
         if (typeToken) {
             this.type = util_1.default.tokenToBscType(typeToken);
         }
@@ -264,7 +234,7 @@ class FunctionParameterExpression extends Expression {
     }
 }
 exports.FunctionParameterExpression = FunctionParameterExpression;
-class NamespacedVariableNameExpression extends Expression {
+class NamespacedVariableNameExpression extends AstNode_1.Expression {
     constructor(
     //if this is a `DottedGetExpression`, it must be comprised only of `VariableExpression`s
     expression) {
@@ -307,7 +277,7 @@ class NamespacedVariableNameExpression extends Expression {
     }
 }
 exports.NamespacedVariableNameExpression = NamespacedVariableNameExpression;
-class DottedGetExpression extends Expression {
+class DottedGetExpression extends AstNode_1.Expression {
     constructor(obj, name, 
     /**
      * Can either be `.`, or `?.` for optional chaining
@@ -339,7 +309,7 @@ class DottedGetExpression extends Expression {
     }
 }
 exports.DottedGetExpression = DottedGetExpression;
-class XmlAttributeGetExpression extends Expression {
+class XmlAttributeGetExpression extends AstNode_1.Expression {
     constructor(obj, name, 
     /**
      * Can either be `@`, or `?@` for optional chaining
@@ -365,7 +335,7 @@ class XmlAttributeGetExpression extends Expression {
     }
 }
 exports.XmlAttributeGetExpression = XmlAttributeGetExpression;
-class IndexedGetExpression extends Expression {
+class IndexedGetExpression extends AstNode_1.Expression {
     constructor(obj, index, 
     /**
      * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.`
@@ -381,12 +351,13 @@ class IndexedGetExpression extends Expression {
         this.range = util_1.default.createBoundingRange(this.obj, this.openingSquare, this.questionDotToken, this.openingSquare, this.index, this.closingSquare);
     }
     transpile(state) {
+        var _a, _b;
         return [
             ...this.obj.transpile(state),
             this.questionDotToken ? state.transpileToken(this.questionDotToken) : '',
             state.transpileToken(this.openingSquare),
-            ...this.index.transpile(state),
-            state.transpileToken(this.closingSquare)
+            ...((_b = (_a = this.index) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : []),
+            this.closingSquare ? state.transpileToken(this.closingSquare) : ''
         ];
     }
     walk(visitor, options) {
@@ -397,7 +368,7 @@ class IndexedGetExpression extends Expression {
     }
 }
 exports.IndexedGetExpression = IndexedGetExpression;
-class GroupingExpression extends Expression {
+class GroupingExpression extends AstNode_1.Expression {
     constructor(tokens, expression) {
         super();
         this.tokens = tokens;
@@ -418,7 +389,7 @@ class GroupingExpression extends Expression {
     }
 }
 exports.GroupingExpression = GroupingExpression;
-class LiteralExpression extends Expression {
+class LiteralExpression extends AstNode_1.Expression {
     constructor(token) {
         super();
         this.token = token;
@@ -456,7 +427,7 @@ exports.LiteralExpression = LiteralExpression;
  * This is a special expression only used within template strings. It exists so we can prevent producing lots of empty strings
  * during template string transpile by identifying these expressions explicitly and skipping the bslib_toString around them
  */
-class EscapedCharCodeLiteralExpression extends Expression {
+class EscapedCharCodeLiteralExpression extends AstNode_1.Expression {
     constructor(token) {
         super();
         this.token = token;
@@ -472,14 +443,14 @@ class EscapedCharCodeLiteralExpression extends Expression {
     }
 }
 exports.EscapedCharCodeLiteralExpression = EscapedCharCodeLiteralExpression;
-class ArrayLiteralExpression extends Expression {
+class ArrayLiteralExpression extends AstNode_1.Expression {
     constructor(elements, open, close, hasSpread = false) {
         super();
         this.elements = elements;
         this.open = open;
         this.close = close;
         this.hasSpread = hasSpread;
-        this.range = util_1.default.createRangeFromPositions(this.open.range.start, this.close.range.end);
+        this.range = util_1.default.createBoundingRange(this.open, ...this.elements, this.close);
     }
     transpile(state) {
         let result = [];
@@ -512,7 +483,9 @@ class ArrayLiteralExpression extends Expression {
             result.push('\n');
             result.push(state.indent());
         }
-        result.push(state.transpileToken(this.close));
+        if (this.close) {
+            result.push(state.transpileToken(this.close));
+        }
         return result;
     }
     walk(visitor, options) {
@@ -522,7 +495,7 @@ class ArrayLiteralExpression extends Expression {
     }
 }
 exports.ArrayLiteralExpression = ArrayLiteralExpression;
-class AAMemberExpression extends Expression {
+class AAMemberExpression extends AstNode_1.Expression {
     constructor(keyToken, colonToken, 
     /** The expression evaluated to determine the member's initial value. */
     value) {
@@ -541,13 +514,13 @@ class AAMemberExpression extends Expression {
     }
 }
 exports.AAMemberExpression = AAMemberExpression;
-class AALiteralExpression extends Expression {
+class AALiteralExpression extends AstNode_1.Expression {
     constructor(elements, open, close) {
         super();
         this.elements = elements;
         this.open = open;
         this.close = close;
-        this.range = util_1.default.createRangeFromPositions(this.open.range.start, this.close.range.end);
+        this.range = util_1.default.createBoundingRange(this.open, ...this.elements, this.close);
     }
     transpile(state) {
         let result = [];
@@ -598,7 +571,9 @@ class AALiteralExpression extends Expression {
             result.push(state.indent());
         }
         //close curly
-        result.push(state.transpileToken(this.close));
+        if (this.close) {
+            result.push(state.transpileToken(this.close));
+        }
         return result;
     }
     walk(visitor, options) {
@@ -608,7 +583,7 @@ class AALiteralExpression extends Expression {
     }
 }
 exports.AALiteralExpression = AALiteralExpression;
-class UnaryExpression extends Expression {
+class UnaryExpression extends AstNode_1.Expression {
     constructor(operator, right) {
         super();
         this.operator = operator;
@@ -629,23 +604,22 @@ class UnaryExpression extends Expression {
     }
 }
 exports.UnaryExpression = UnaryExpression;
-class VariableExpression extends Expression {
-    constructor(name, namespaceName) {
+class VariableExpression extends AstNode_1.Expression {
+    constructor(name) {
         super();
         this.name = name;
-        this.namespaceName = namespaceName;
         this.range = this.name.range;
     }
     getName(parseMode) {
         return this.name.text;
     }
     transpile(state) {
-        var _a;
         let result = [];
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
         //if the callee is the name of a known namespace function
-        if (state.file.calleeIsKnownNamespaceFunction(this, (_a = this.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) {
+        if (state.file.calleeIsKnownNamespaceFunction(this, namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) {
             result.push(state.sourceNode(this, [
-                this.namespaceName.getName(Parser_1.ParseMode.BrightScript),
+                namespace.getName(Parser_1.ParseMode.BrightScript),
                 '_',
                 this.getName(Parser_1.ParseMode.BrightScript)
             ]));
@@ -661,7 +635,7 @@ class VariableExpression extends Expression {
     }
 }
 exports.VariableExpression = VariableExpression;
-class SourceLiteralExpression extends Expression {
+class SourceLiteralExpression extends AstNode_1.Expression {
     constructor(token) {
         super();
         this.token = token;
@@ -731,7 +705,7 @@ exports.SourceLiteralExpression = SourceLiteralExpression;
  * except we need to uniquely identify these statements so we can
  * do more type checking.
  */
-class NewExpression extends Expression {
+class NewExpression extends AstNode_1.Expression {
     constructor(newKeyword, call) {
         super();
         this.newKeyword = newKeyword;
@@ -746,12 +720,10 @@ class NewExpression extends Expression {
         //a NamespacedVariableNameExpression
         return this.call.callee;
     }
-    get namespaceName() {
-        return this.call.namespaceName;
-    }
     transpile(state) {
-        var _a, _b;
-        const cls = (_b = state.file.getClassFileLink(this.className.getName(Parser_1.ParseMode.BrighterScript), (_a = this.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) === null || _b === void 0 ? void 0 : _b.item;
+        var _a;
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        const cls = (_a = state.file.getClassFileLink(this.className.getName(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
         //new statements within a namespace block can omit the leading namespace if the class resides in that same namespace.
         //So we need to figure out if this is a namespace-omitted class, or if this class exists without a namespace.
         return this.call.transpile(state, cls === null || cls === void 0 ? void 0 : cls.getName(Parser_1.ParseMode.BrightScript));
@@ -763,7 +735,7 @@ class NewExpression extends Expression {
     }
 }
 exports.NewExpression = NewExpression;
-class CallfuncExpression extends Expression {
+class CallfuncExpression extends AstNode_1.Expression {
     constructor(callee, operator, methodName, openingParen, args, closingParen) {
         var _a, _b, _c;
         super();
@@ -810,7 +782,7 @@ exports.CallfuncExpression = CallfuncExpression;
  * Since template strings can contain newlines, we need to concatenate multiple strings together with chr() calls.
  * This is a single expression that represents the string contatenation of all parts of a single quasi.
  */
-class TemplateStringQuasiExpression extends Expression {
+class TemplateStringQuasiExpression extends AstNode_1.Expression {
     constructor(expressions) {
         super();
         this.expressions = expressions;
@@ -837,7 +809,7 @@ class TemplateStringQuasiExpression extends Expression {
     }
 }
 exports.TemplateStringQuasiExpression = TemplateStringQuasiExpression;
-class TemplateStringExpression extends Expression {
+class TemplateStringExpression extends AstNode_1.Expression {
     constructor(openingBacktick, quasis, expressions, closingBacktick) {
         super();
         this.openingBacktick = openingBacktick;
@@ -894,7 +866,7 @@ class TemplateStringExpression extends Expression {
     }
 }
 exports.TemplateStringExpression = TemplateStringExpression;
-class TaggedTemplateStringExpression extends Expression {
+class TaggedTemplateStringExpression extends AstNode_1.Expression {
     constructor(tagName, openingBacktick, quasis, expressions, closingBacktick) {
         super();
         this.tagName = tagName;
@@ -942,7 +914,7 @@ class TaggedTemplateStringExpression extends Expression {
     }
 }
 exports.TaggedTemplateStringExpression = TaggedTemplateStringExpression;
-class AnnotationExpression extends Expression {
+class AnnotationExpression extends AstNode_1.Expression {
     constructor(atToken, nameToken) {
         super();
         this.atToken = atToken;
@@ -976,7 +948,7 @@ class AnnotationExpression extends Expression {
     }
 }
 exports.AnnotationExpression = AnnotationExpression;
-class TernaryExpression extends Expression {
+class TernaryExpression extends AstNode_1.Expression {
     constructor(test, questionMarkToken, consequent, colonToken, alternate) {
         var _a, _b, _c;
         super();
@@ -1021,7 +993,7 @@ class TernaryExpression extends Expression {
     }
 }
 exports.TernaryExpression = TernaryExpression;
-class NullCoalescingExpression extends Expression {
+class NullCoalescingExpression extends AstNode_1.Expression {
     constructor(consequent, questionQuestionToken, alternate) {
         var _a;
         super();
@@ -1064,7 +1036,7 @@ class NullCoalescingExpression extends Expression {
     }
 }
 exports.NullCoalescingExpression = NullCoalescingExpression;
-class RegexLiteralExpression extends Expression {
+class RegexLiteralExpression extends AstNode_1.Expression {
     constructor(tokens) {
         super();
         this.tokens = tokens;