brighterscript 0.66.0-alpha.5 → 0.66.0-alpha.7

package/dist/files/BrsFile.spec.js

@@ -15,10 +15,8 @@ const Lexer_1 = require("../lexer/Lexer");
 const TokenKind_1 = require("../lexer/TokenKind");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
 const util_1 = require("../util");
-const PluginInterface_1 = require("../PluginInterface");
 const testHelpers_spec_1 = require("../testHelpers.spec");
 const Parser_1 = require("../parser/Parser");
-const Logger_1 = require("../Logger");
 const Statement_1 = require("../parser/Statement");
 const creators_1 = require("../astUtils/creators");
 const fsExtra = require("fs-extra");
@@ -36,12 +34,41 @@ describe('BrsFile', () => {
     beforeEach(() => {
         fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
         program = new Program_1.Program({ rootDir: testHelpers_spec_2.rootDir, sourceMap: true });
-        file = new BrsFile_1.BrsFile(srcPath, destPath, program);
+        file = new BrsFile_1.BrsFile({
+            srcPath: srcPath,
+            destPath: destPath,
+            program: program
+        });
     });
     afterEach(() => {
         sinon.restore();
         program.dispose();
     });
+    describe('constructor', () => {
+        it('calculates correct paths when no pkgPath specified', () => {
+            (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                program: program
+            })).to.include({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                pkgPath: (0, util_1.standardizePath) `source/main.brs`
+            });
+        });
+        it('uses supplied pkgPath', () => {
+            (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                pkgPath: (0, util_1.standardizePath) `source/main.transpiled.brs`,
+                program: program
+            })).to.include({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                pkgPath: (0, util_1.standardizePath) `source/main.transpiled.brs`
+            });
+        });
+    });
     describe('allowBrighterScriptInBrightScript', () => {
         it('is false by default', () => {
             program.setFile('source/main.brs', `
@@ -125,9 +152,17 @@ describe('BrsFile', () => {
     });
     it('sets needsTranspiled to true for .bs files', () => {
         //BrightScript
-        (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile(`${testHelpers_spec_2.rootDir}/source/main.brs`, 'source/main.brs', program).needsTranspiled).to.be.false;
+        (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+            srcPath: `${testHelpers_spec_2.rootDir}/source/main.brs`,
+            destPath: 'source/main.brs',
+            program: program
+        })['needsTranspiled']).to.be.false;
         //BrighterScript
-        (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile(`${testHelpers_spec_2.rootDir}/source/main.bs`, 'source/main.bs', program).needsTranspiled).to.be.true;
+        (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+            srcPath: `${testHelpers_spec_2.rootDir}/source/main.bs`,
+            destPath: 'source/main.bs',
+            program: program
+        })['needsTranspiled']).to.be.true;
     });
     it('computes new import statements after clearing parser references', () => {
         const file = program.setFile('source/main.bs', ``);
@@ -235,12 +270,12 @@ describe('BrsFile', () => {
                         something = true 'bs:disable-line: LINT1005
                     end sub
                 `);
-                file.addDiagnostics([{
-                        code: 'LINT1005',
-                        file: file,
-                        message: 'Something is not right',
-                        range: util_1.default.createRange(2, 16, 2, 26)
-                    }]);
+                file.diagnostics.push({
+                    code: 'LINT1005',
+                    file: file,
+                    message: 'Something is not right',
+                    range: util_1.default.createRange(2, 16, 2, 26)
+                });
                 const scope = program.getScopesForFile(file)[0];
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(scope);
             });
@@ -925,7 +960,11 @@ describe('BrsFile', () => {
             `);
         });
         it('finds line and column numbers for functions', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     print "A"
@@ -941,7 +980,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(file.callables[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 26, 5, 29));
         });
         it('throws an error if the file has already been parsed', () => {
-            let file = new BrsFile_1.BrsFile('abspath', 'relpath', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'abspath',
+                destPath: 'relpath',
+                program: program
+            });
             file.parse(`'a comment`);
             try {
                 file.parse(`'a new comment`);
@@ -952,7 +995,11 @@ describe('BrsFile', () => {
             }
         });
         it('finds and registers duplicate callables', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     print "A"
@@ -969,7 +1016,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(file.callables[1].nameRange.start.line).to.equal(5);
         });
         it('finds function call line and column numbers', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     DoB("a")
@@ -985,7 +1036,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(file.functionCalls[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 23));
         });
         it('finds function calls that are unfinished', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     DoB("a"
@@ -1008,7 +1063,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(file.functionCalls[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 23));
         });
         it('sanitizes brs errors', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoSomething
                 end function
@@ -1018,7 +1077,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(file.getDiagnostics()[0].range.start.line).to.equal(1);
         });
         it('supports using the `next` keyword in a for loop', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub countit()
                     for each num in [1,2,3]
@@ -1030,7 +1093,11 @@ describe('BrsFile', () => {
         });
         //test is not working yet, but will be enabled when brs supports this syntax
         it('supports assigning functions to objects', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function main()
                     o = CreateObject("roAssociativeArray")
@@ -1058,7 +1125,11 @@ describe('BrsFile', () => {
     });
     describe('findCallables', () => {
         it('finds range', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub Sum()
                     print "hello world"
@@ -1068,7 +1139,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
         });
         it('finds correct body range even with inner function', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub Sum()
                     sayHi = sub()
@@ -1081,7 +1156,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 6, 23));
         });
         it('finds callable parameters', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a, b, c)
 
@@ -1108,7 +1187,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(callable.params[2].type).instanceof(DynamicType_1.DynamicType);
         });
         it('finds optional parameters', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a=2)
 
@@ -1123,7 +1206,11 @@ describe('BrsFile', () => {
             (0, chai_config_spec_1.expect)(callable.params[0].type).instanceof(IntegerType_1.IntegerType);
         });
         it('finds parameter types', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a, b as integer, c as string)
 
@@ -1152,7 +1239,11 @@ describe('BrsFile', () => {
     });
     describe('findCallableInvocations', () => {
         it('finds arguments with literal values', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum()
                     DoSomething("name", 12, true)
@@ -1191,7 +1282,11 @@ describe('BrsFile', () => {
             ]);
         });
         it('finds arguments with variable values', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum()
                     count = 1
@@ -1218,7 +1313,11 @@ describe('BrsFile', () => {
     describe('findCallables', () => {
         //this test is to help with code coverage
         it('skips top-level statements', () => {
-            let file = new BrsFile_1.BrsFile('absolute', 'relative', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute',
+                destPath: 'relative',
+                program: program
+            });
             file.parse('name = "Bob"');
             (0, chai_config_spec_1.expect)(file.callables.length).to.equal(0);
         });
@@ -1373,7 +1472,7 @@ describe('BrsFile', () => {
                 end if
             end sub
         `);
-        (0, chai_config_spec_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
         mainFile = program.setFile('source/main.brs', `
             sub Main()
                 if true Then
@@ -1381,7 +1480,7 @@ describe('BrsFile', () => {
                 end if
             end sub
         `);
-        (0, chai_config_spec_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
         mainFile = program.setFile('source/main.brs', `
             sub Main()
                 if true THEN
@@ -1389,7 +1488,7 @@ describe('BrsFile', () => {
                 end if
             end sub
         `);
-        (0, chai_config_spec_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
     });
     it('does not throw when encountering incomplete import statement', () => {
         program.setFile('source/main.brs', `
@@ -1401,8 +1500,8 @@ describe('BrsFile', () => {
         //this test will throw an exception if something went wrong
     });
     describe('transpile', () => {
-        it('excludes trailing commas in array literals', () => {
-            testTranspile(`
+        it('excludes trailing commas in array literals', async () => {
+            await testTranspile(`
                 sub main()
                     arr = [
                         1,
@@ -1430,7 +1529,7 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles if statement keywords as provided', () => {
+        it('transpiles if statement keywords as provided', async () => {
             const code = `
                 sub main()
                     If True Then
@@ -1444,12 +1543,12 @@ describe('BrsFile', () => {
                     End If
                 end sub
             `;
-            testTranspile(code);
-            testTranspile(code.toLowerCase());
-            testTranspile(code.toUpperCase());
+            await testTranspile(code);
+            await testTranspile(code.toLowerCase());
+            await testTranspile(code.toUpperCase());
         });
-        it('does not transpile `then` tokens', () => {
-            testTranspile(`
+        it('does not transpile `then` tokens', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                         print true
@@ -1459,8 +1558,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('honors spacing between multi-word tokens', () => {
-            testTranspile(`
+        it('honors spacing between multi-word tokens', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                         print true
@@ -1470,8 +1569,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('handles when only some of the statements have `then`', () => {
-            testTranspile(`
+        it('handles when only some of the statements have `then`', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                     else if true then
@@ -1484,25 +1583,25 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('retains casing of parameter types', () => {
-            function test(type) {
-                testTranspile(`
+        it('retains casing of parameter types', async () => {
+            async function test(type) {
+                await testTranspile(`
                     sub one(a as ${type}, b as ${type.toUpperCase()}, c as ${type.toLowerCase()})
                     end sub
                 `);
             }
-            test('Boolean');
-            test('Double');
-            test('Dynamic');
-            test('Float');
-            test('Integer');
-            test('LongInteger');
-            test('Object');
-            test('String');
-        });
-        it('retains casing of return types', () => {
-            function test(type) {
-                testTranspile(`
+            await test('Boolean');
+            await test('Double');
+            await test('Dynamic');
+            await test('Float');
+            await test('Integer');
+            await test('LongInteger');
+            await test('Object');
+            await test('String');
+        });
+        it('retains casing of return types', async () => {
+            async function test(type) {
+                await testTranspile(`
                     sub one() as ${type}
                     end sub
 
@@ -1513,19 +1612,19 @@ describe('BrsFile', () => {
                     end sub
                 `);
             }
-            test('Boolean');
-            test('Double');
-            test('Dynamic');
-            test('Float');
-            test('Integer');
-            test('LongInteger');
-            test('Object');
-            test('String');
-            test('Void');
-        });
-        it('retains casing of literal types', () => {
-            function test(type) {
-                testTranspile(`
+            await test('Boolean');
+            await test('Double');
+            await test('Dynamic');
+            await test('Float');
+            await test('Integer');
+            await test('LongInteger');
+            await test('Object');
+            await test('String');
+            await test('Void');
+        });
+        it('retains casing of literal types', async () => {
+            async function test(type) {
+                await testTranspile(`
                     sub main()
                         thing = ${type}
                         thing = ${type.toLowerCase()}
@@ -1533,13 +1632,13 @@ describe('BrsFile', () => {
                     end sub
                 `);
             }
-            test('Invalid');
-            test('True');
-            test('False');
+            await test('Invalid');
+            await test('True');
+            await test('False');
         });
         describe('throwStatement', () => {
-            it('transpiles properly', () => {
-                testTranspile(`
+            it('transpiles properly', async () => {
+                await testTranspile(`
                     sub main()
                         try
                             throw "some message"
@@ -1550,8 +1649,8 @@ describe('BrsFile', () => {
             });
         });
         describe('try/catch', () => {
-            it('transpiles properly', () => {
-                testTranspile(`
+            it('transpiles properly', async () => {
+                await testTranspile(`
                     sub main()
                         try
                             print m.b.c
@@ -1563,8 +1662,8 @@ describe('BrsFile', () => {
             });
         });
         describe('namespaces', () => {
-            it('properly transpiles namespace functions for assignments', () => {
-                testTranspile(`
+            it('properly transpiles namespace functions for assignments', async () => {
+                await testTranspile(`
                     namespace NameA.NameB
                         sub Speak()
                         end sub
@@ -1585,8 +1684,8 @@ describe('BrsFile', () => {
                     end sub
                 `);
             });
-            it('properly transpiles inferred namespace function for assignment', () => {
-                testTranspile(`
+            it('properly transpiles inferred namespace function for assignment', async () => {
+                await testTranspile(`
                     namespace NameA.NameB
                         sub Speak()
                         end sub
@@ -1606,26 +1705,26 @@ describe('BrsFile', () => {
                 `);
             });
         });
-        it('includes all text to end of line for a non-terminated string', () => {
-            testTranspile('sub main()\n    name = "john \nend sub', 'sub main()\n    name = "john "\nend sub', null, 'source/main.bs', false);
+        it('includes all text to end of line for a non-terminated string', async () => {
+            await testTranspile('sub main()\n    name = "john \nend sub', 'sub main()\n    name = "john "\nend sub', null, 'source/main.bs', false);
         });
-        it('escapes quotes in string literals', () => {
-            testTranspile(`
+        it('escapes quotes in string literals', async () => {
+            await testTranspile(`
                 sub main()
                     expected = "Hello"
                     expected += chr(10) + " version=""2.0"""
                 end sub
             `);
         });
-        it('keeps function parameter types in proper order', () => {
-            testTranspile(`
+        it('keeps function parameter types in proper order', async () => {
+            await testTranspile(`
                 function CreateTestStatistic(name as string, result = "Success" as string, time = 0 as integer, errorCode = 0 as integer, errorMessage = "" as string) as object
                 end function
             `);
         });
-        it('discard parameter types when removeParameterTypes is true', () => {
+        it('discard parameter types when removeParameterTypes is true', async () => {
             program.options.removeParameterTypes = true;
-            testTranspile(`
+            await testTranspile(`
                 sub one(a as integer, b = "" as string, c = invalid as dynamic)
                 end sub
             `, `
@@ -1633,9 +1732,9 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('discard return type when removeParameterTypes is true', () => {
+        it('discard return type when removeParameterTypes is true', async () => {
             program.options.removeParameterTypes = true;
-            testTranspile(`
+            await testTranspile(`
                 function one() as string
                     return ""
                 end function
@@ -1645,8 +1744,8 @@ describe('BrsFile', () => {
                 end function
             `);
         });
-        it('transpiles local var assignment operators', () => {
-            testTranspile(`
+        it('transpiles local var assignment operators', async () => {
+            await testTranspile(`
                 sub main()
                     count = 0
                     count += 1
@@ -1659,8 +1758,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles AA property assignment operators', () => {
-            testTranspile(`
+        it('transpiles AA property assignment operators', async () => {
+            await testTranspile(`
                 sub main()
                     person = {
                         count: 0
@@ -1669,8 +1768,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles AA indexed assignment operators', () => {
-            testTranspile(`
+        it('transpiles AA indexed assignment operators', async () => {
+            await testTranspile(`
                 sub main()
                     person = {
                         count: 0
@@ -1679,8 +1778,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('relative-referenced namespaced functions get prefixed', () => {
-            testTranspile(`
+        it('relative-referenced namespaced functions get prefixed', async () => {
+            await testTranspile(`
                 namespace Vertibrates.Birds
                     function GetAllBirds()
                         return [
@@ -1710,8 +1809,8 @@ describe('BrsFile', () => {
                 end function
             `, 'trim', 'source/main.bs');
         });
-        it('transpiles namespaced functions', () => {
-            testTranspile(`
+        it('transpiles namespaced functions', async () => {
+            await testTranspile(`
                 namespace NameA
                     sub alert()
                     end sub
@@ -1727,9 +1826,9 @@ describe('BrsFile', () => {
                 end sub
             `, 'trim', 'source/main.bs');
         });
-        it('transpiles dim', () => {
-            function doTest(code) {
-                testTranspile(`
+        it('transpiles dim', async () => {
+            async function doTest(code) {
+                await testTranspile(`
                     sub main()
                         requestList = []
                         ${code}
@@ -1741,20 +1840,20 @@ describe('BrsFile', () => {
                     end sub
                 `);
             }
-            doTest(`Dim c[5]`);
-            doTest(`Dim c[5, 4]`);
-            doTest(`Dim c[5, 4, 6]`);
-            doTest(`Dim requestData[requestList.count()]`);
-            doTest(`Dim requestData[1, requestList.count()]`);
-            doTest(`Dim requestData[1, requestList.count(), 2]`);
-            doTest(`Dim requestData[requestList[2]]`);
-            doTest(`Dim requestData[1, requestList[2]]`);
-            doTest(`Dim requestData[1, requestList[2], 2]`);
-            doTest(`Dim requestData[requestList["2"]]`);
-            doTest(`Dim requestData[1, requestList["2"]]`);
-            doTest(`Dim requestData[1, requestList["2"], 2]`);
-            doTest(`Dim requestData[1, StrToI("1"), 2]`);
-            testTranspile(`
+            await doTest(`Dim c[5]`);
+            await doTest(`Dim c[5, 4]`);
+            await doTest(`Dim c[5, 4, 6]`);
+            await doTest(`Dim requestData[requestList.count()]`);
+            await doTest(`Dim requestData[1, requestList.count()]`);
+            await doTest(`Dim requestData[1, requestList.count(), 2]`);
+            await doTest(`Dim requestData[requestList[2]]`);
+            await doTest(`Dim requestData[1, requestList[2]]`);
+            await doTest(`Dim requestData[1, requestList[2], 2]`);
+            await doTest(`Dim requestData[requestList["2"]]`);
+            await doTest(`Dim requestData[1, requestList["2"]]`);
+            await doTest(`Dim requestData[1, requestList["2"], 2]`);
+            await doTest(`Dim requestData[1, StrToI("1"), 2]`);
+            await testTranspile(`
                 function getValue(param1)
                 end function
 
@@ -1766,8 +1865,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles calls to fully-qualified namespaced functions', () => {
-            testTranspile(`
+        it('transpiles calls to fully-qualified namespaced functions', async () => {
+            await testTranspile(`
                 namespace NameA
                     sub alert()
                     end sub
@@ -1792,15 +1891,15 @@ describe('BrsFile', () => {
                 end sub
             `, 'trim', 'source/main.bs');
         });
-        it('keeps end-of-line comments with their line', () => {
-            testTranspile(`
+        it('keeps end-of-line comments with their line', async () => {
+            await testTranspile(`
                 function DoSomething() 'comment 1
                     name = "bob" 'comment 2
                 end function 'comment 3
             `);
         });
-        it('works for functions', () => {
-            testTranspile(`
+        it('works for functions', async () => {
+            await testTranspile(`
                 function DoSomething()
                     'lots of empty white space
                     'that will be removed during transpile
@@ -1815,16 +1914,16 @@ describe('BrsFile', () => {
                 end function
             `);
         });
-        it('keeps empty AAs and arrays on same line', () => {
-            testTranspile(`
+        it('keeps empty AAs and arrays on same line', async () => {
+            await testTranspile(`
                 sub a()
                     person = {}
                     stuff = []
                 end sub
         `, null, 'trim');
         });
-        it('does not add leading or trailing newlines', () => {
-            testTranspile(`function abc()\nend function`, undefined, 'none');
+        it('does not add leading or trailing newlines', async () => {
+            await testTranspile(`function abc()\nend function`, undefined, 'none');
         });
         it('handles sourcemap edge case', async () => {
             let source = 'sub main()\n' +
@@ -1833,9 +1932,9 @@ describe('BrsFile', () => {
                 '\n' +
                 'end sub';
             program.options.sourceMap = true;
-            let result = testTranspile(source, `sub main()\n    print 1\nend sub`, 'none', 'source/main.bs');
+            let result = await testTranspile(source, `sub main()\n    print 1\nend sub`, 'none', 'source/main.bs');
             //load the source map
-            let location = await source_map_1.SourceMapConsumer.with(result.map.toJSON(), null, (consumer) => {
+            let location = await source_map_1.SourceMapConsumer.with(result.map, null, (consumer) => {
                 return consumer.generatedPositionFor({
                     line: 3,
                     column: 0,
@@ -1852,7 +1951,7 @@ describe('BrsFile', () => {
                 //remove newlines and EOF
                 .filter(x => x.kind !== TokenKind_1.TokenKind.Eof && x.kind !== TokenKind_1.TokenKind.Newline);
             program.options.sourceMap = true;
-            let result = testTranspile(source, source, 'none');
+            let result = await testTranspile(source, source, 'none');
             //load the source map
             await source_map_1.SourceMapConsumer.with(result.map.toString(), null, (consumer) => {
                 let tokenResult = tokens.map(token => ({
@@ -1875,8 +1974,8 @@ describe('BrsFile', () => {
                 (0, chai_config_spec_1.expect)(sourcemapResult).to.eql(tokenResult);
             });
         });
-        it('handles empty if block', () => {
-            testTranspile(`
+        it('handles empty if block', async () => {
+            await testTranspile(`
                 sub main()
                     if true then
                     end if
@@ -1897,8 +1996,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('handles empty elseif block', () => {
-            testTranspile(`
+        it('handles empty elseif block', async () => {
+            await testTranspile(`
                 sub main()
                     if true then
                         print "if"
@@ -1912,8 +2011,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('handles empty else block', () => {
-            testTranspile(`
+        it('handles empty else block', async () => {
+            await testTranspile(`
                 sub main()
                     if true then
                         print "if"
@@ -1928,8 +2027,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('handles else block with a leading comment', () => {
-            testTranspile(`
+        it('handles else block with a leading comment', async () => {
+            await testTranspile(`
                 sub main()
                     if true then
                         print "if"
@@ -1940,8 +2039,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('works for function parameters', () => {
-            testTranspile(`
+        it('works for function parameters', async () => {
+            await testTranspile(`
                 function DoSomething(name, age as integer, text as string)
                 end function
             `, `
@@ -1949,8 +2048,8 @@ describe('BrsFile', () => {
                 end function
             `);
         });
-        it('adds newlines between top-level statements', () => {
-            testTranspile(`
+        it('adds newlines between top-level statements', async () => {
+            await testTranspile(`
                 function a()
                 end function
 
@@ -1958,8 +2057,8 @@ describe('BrsFile', () => {
                 end function
             `);
         });
-        it('properly indents nested AA literals', () => {
-            testTranspile(`
+        it('properly indents nested AA literals', async () => {
+            await testTranspile(`
                 sub doSomething()
                     grandparent = {
                         parent: {
@@ -1973,8 +2072,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('does not add comma after final object property even when comments are present', () => {
-            testTranspile(`
+        it('does not add comma after final object property even when comments are present', async () => {
+            await testTranspile(`
                 sub doSomething()
                     person = {
                         age: 12 'comment
@@ -1997,8 +2096,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('works for a complex function with comments all over the place', () => {
-            testTranspile(`
+        it('works for a complex function with comments all over the place', async () => {
+            await testTranspile(`
                 'import some library
                 library "v30/bslCore.brs" 'comment
 
@@ -2088,7 +2187,7 @@ describe('BrsFile', () => {
                 sub logInfo()
                 end sub
             `);
-            file.needsTranspiled = false;
+            file['needsTranspiled'] = false;
             const { code } = file.transpile();
             (0, chai_config_spec_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
         });
@@ -2097,16 +2196,16 @@ describe('BrsFile', () => {
                 sub logInfo()
                 end sub
             `);
-            file.needsTranspiled = true;
+            file['needsTranspiled'] = true;
             const { code } = file.transpile();
             (0, chai_config_spec_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
         });
-        it('replaces custom types in parameter types and return types', () => {
+        it('replaces custom types in parameter types and return types', async () => {
             program.setFile('source/SomeKlass.bs', `
                 class SomeKlass
                 end class
             `);
-            testTranspile(`
+            await testTranspile(`
                 function foo() as SomeKlass
                     return new SomeKlass()
                 end function
@@ -2135,8 +2234,8 @@ describe('BrsFile', () => {
                 program.validate();
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
-            it('sets invalid on empty callfunc', () => {
-                testTranspile(`
+            it('sets invalid on empty callfunc', async () => {
+                await testTranspile(`
                     sub main()
                         node = invalid
                         node@.doSomething()
@@ -2152,8 +2251,8 @@ describe('BrsFile', () => {
                     end sub
                 `);
             });
-            it('includes original arguments', () => {
-                testTranspile(`
+            it('includes original arguments', async () => {
+                await testTranspile(`
                     sub main()
                         node = invalid
                         node@.doSomething(1, true, m.top.someVal)
@@ -2255,8 +2354,8 @@ describe('BrsFile', () => {
         });
     });
     describe('typedef', () => {
-        it('includes enum and interface types', () => {
-            testGetTypedef(`
+        it('includes enum and interface types', async () => {
+            await testGetTypedef(`
                 interface Foo
                     field as string
                 end interface
@@ -2632,8 +2731,8 @@ describe('BrsFile', () => {
                 function plugin() {
                     return {
                         name: 'lower-file-name',
-                        afterFileParse: (evt) => {
-                            evt.file._customProp = true;
+                        afterProvideFile: (evt) => {
+                            evt.files[0]._customProp = true;
                         }
                     };
                 }
@@ -2641,16 +2740,16 @@ describe('BrsFile', () => {
             `);
         });
         it('can load an absolute plugin which receives callbacks', () => {
-            program.plugins = new PluginInterface_1.default(util_1.default.loadPlugins(testHelpers_spec_2.tempDir, [
-                (0, util_1.standardizePath) `${testHelpers_spec_2.tempDir}/plugins/${pluginFileName}`
-            ]), { logger: new Logger_1.Logger() });
+            for (const plugin of util_1.default.loadPlugins(testHelpers_spec_2.tempDir, [(0, util_1.standardizePath) `${testHelpers_spec_2.tempDir}/plugins/${pluginFileName}`])) {
+                program.plugins.add(plugin);
+            }
             const file = program.setFile('source/MAIN.brs', '');
             (0, chai_config_spec_1.expect)(file._customProp).to.exist;
         });
         it('can load a relative plugin which receives callbacks', () => {
-            program.plugins = new PluginInterface_1.default(util_1.default.loadPlugins(testHelpers_spec_2.tempDir, [
-                `./plugins/${pluginFileName}`
-            ]), { logger: new Logger_1.Logger() });
+            for (const plugin of util_1.default.loadPlugins(testHelpers_spec_2.tempDir, [`./plugins/${pluginFileName}`])) {
+                program.plugins.add(plugin);
+            }
             const file = program.setFile('source/MAIN.brs', '');
             (0, chai_config_spec_1.expect)(file._customProp).to.exist;
         });