brighterscript 0.66.0-alpha.8 → 0.67.0

package/dist/files/XmlFile.spec.js

@@ -7,11 +7,12 @@ const vscode_languageserver_1 = require("vscode-languageserver");
 const fsExtra = require("fs-extra");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
 const Program_1 = require("../Program");
+const BrsFile_1 = require("./BrsFile");
 const XmlFile_1 = require("./XmlFile");
 const util_1 = require("../util");
 const testHelpers_spec_1 = require("../testHelpers.spec");
 const ProgramBuilder_1 = require("../ProgramBuilder");
-const Logger_1 = require("../Logger");
+const logging_1 = require("../logging");
 const reflection_1 = require("../astUtils/reflection");
 const testHelpers_spec_2 = require("../testHelpers.spec");
 describe('XmlFile', () => {
@@ -23,12 +24,8 @@ describe('XmlFile', () => {
         fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
         fsExtra.ensureDirSync(testHelpers_spec_2.rootDir);
         fsExtra.ensureDirSync(testHelpers_spec_2.stagingDir);
-        program = new Program_1.Program({ rootDir: testHelpers_spec_2.rootDir, stagingDir: testHelpers_spec_2.stagingDir });
-        file = new XmlFile_1.XmlFile({
-            srcPath: `${testHelpers_spec_2.rootDir}/components/MainComponent.xml`,
-            destPath: 'components/MainComponent.xml',
-            program: program
-        });
+        program = new Program_1.Program({ rootDir: testHelpers_spec_2.rootDir });
+        file = new XmlFile_1.XmlFile(`${testHelpers_spec_2.rootDir}/components/MainComponent.xml`, 'components/MainComponent.xml', program);
     });
     afterEach(() => {
         sinon.restore();
@@ -39,11 +36,10 @@ describe('XmlFile', () => {
             const expected = 'OtherName';
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
-                afterProvideFile: (event) => {
+                afterFileParse: (file) => {
                     var _a, _b, _c;
-                    const file = event.files[0];
-                    if ((0, reflection_1.isXmlFile)(file) && ((_c = (_b = (_a = file.parser.ast.rootElement) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value)) {
-                        file.parser.ast.rootElement.attributes[0].value = expected;
+                    if ((0, reflection_1.isXmlFile)(file) && ((_c = (_b = (_a = file.parser.ast.root) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.value)) {
+                        file.parser.ast.root.attributes[0].value.text = expected;
                     }
                 }
             });
@@ -55,17 +51,17 @@ describe('XmlFile', () => {
             (0, chai_config_spec_1.expect)(file.componentName.text).to.equal(expected);
         });
         it('only removes specified attribute when calling setAttribute', () => {
-            const file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file = new XmlFile_1.XmlFile('abs', 'rel', program);
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
                 afterFileParse: () => {
-                    let child = file.parser.ast.componentElement.childrenElement.elements[0];
+                    let child = file.parser.ast.component.children.children[0];
                     (0, chai_config_spec_1.expect)(child.attributes).to.have.lengthOf(4);
-                    child.setAttributeValue('text', undefined);
-                    (0, chai_config_spec_1.expect)(child.getAttribute('id').value).to.equal('one');
+                    child.setAttribute('text', undefined);
+                    (0, chai_config_spec_1.expect)(child.getAttribute('id').value.text).to.equal('one');
                     (0, chai_config_spec_1.expect)(child.attributes).to.have.lengthOf(3);
-                    child.setAttributeValue('text3', undefined);
-                    (0, chai_config_spec_1.expect)(child.getAttribute('id').value).to.equal('one');
+                    child.setAttribute('text3', undefined);
+                    (0, chai_config_spec_1.expect)(child.getAttribute('id').value.text).to.equal('one');
                     (0, chai_config_spec_1.expect)(child.attributes).to.have.lengthOf(2);
                 }
             });
@@ -90,7 +86,7 @@ describe('XmlFile', () => {
                     <script type="text/brightscript" uri="ChildScene.bs" />
                 </component>
             `);
-            (0, chai_config_spec_1.expect)(file.scriptTagImports.map(x => x.destPath)[0]).to.equal((0, util_1.standardizePath) `components/ChildScene.bs`);
+            (0, chai_config_spec_1.expect)(file.scriptTagImports.map(x => x.pkgPath)[0]).to.equal((0, util_1.standardizePath) `components/ChildScene.bs`);
         });
         it('does not include commented-out script imports', () => {
             var _a, _b;
@@ -103,10 +99,10 @@ describe('XmlFile', () => {
                     -->
                 </component>
             `);
-            (0, chai_config_spec_1.expect)((_b = (_a = file.scriptTagImports) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.destPath).to.eql((0, util_1.standardizePath) `components/ChildScene.brs`);
+            (0, chai_config_spec_1.expect)((_b = (_a = file.scriptTagImports) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.pkgPath).to.eql((0, util_1.standardizePath) `components/ChildScene.brs`);
         });
         it('finds scripts when more than one per line', () => {
-            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file = new XmlFile_1.XmlFile('abs', 'rel', program);
             file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="Scene">
@@ -128,7 +124,7 @@ describe('XmlFile', () => {
             });
         });
         it('finds component names', () => {
-            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file = new XmlFile_1.XmlFile('abs', 'rel', program);
             file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
@@ -139,7 +135,7 @@ describe('XmlFile', () => {
             (0, chai_config_spec_1.expect)(file.componentName.text).to.equal('ChildScene');
         });
         it('Adds error when whitespace appears before the prolog', () => {
-            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file = new XmlFile_1.XmlFile('abs', 'rel', program);
             file.parse(/* not trimmed */ `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
@@ -153,7 +149,7 @@ describe('XmlFile', () => {
             (0, chai_config_spec_1.expect)(file.diagnostics[1]).to.deep.include(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlGenericParseError('Syntax error: whitespace found before the XML prolog')), { range: vscode_languageserver_1.Range.create(0, 0, 1, 16) }));
         });
         it('Adds error when an unknown tag is found in xml', () => {
-            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file = new XmlFile_1.XmlFile('abs', 'rel', program);
             file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
@@ -204,7 +200,7 @@ describe('XmlFile', () => {
             });
         });
         it('finds script imports', () => {
-            file = new XmlFile_1.XmlFile({ srcPath: 'abspath/components/cmp1.xml', destPath: 'components/cmp1.xml', program: program });
+            file = new XmlFile_1.XmlFile('abspath/components/cmp1.xml', 'components/cmp1.xml', program);
             file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
@@ -215,12 +211,12 @@ describe('XmlFile', () => {
             (0, chai_config_spec_1.expect)(file.scriptTagImports[0]).to.deep.include({
                 sourceFile: file,
                 text: 'pkg:/components/cmp1.brs',
-                destPath: `components${path.sep}cmp1.brs`,
+                pkgPath: `components${path.sep}cmp1.brs`,
                 filePathRange: vscode_languageserver_1.Range.create(2, 42, 2, 66)
             });
         });
         it('throws an error if the file has already been parsed', () => {
-            file = new XmlFile_1.XmlFile({ srcPath: 'abspath', destPath: 'relpath', program: program });
+            file = new XmlFile_1.XmlFile('abspath', 'relpath', program);
             file.parse('a comment');
             try {
                 file.parse(`'a new comment`);
@@ -240,7 +236,7 @@ describe('XmlFile', () => {
             (0, chai_config_spec_1.expect)(file.scriptTagImports.length).to.equal(1);
             (0, chai_config_spec_1.expect)(file.scriptTagImports[0]).to.deep.include({
                 text: 'cmp1.brs',
-                destPath: `components${path.sep}cmp1.brs`
+                pkgPath: `components${path.sep}cmp1.brs`
             });
         });
         it('finds correct position for empty uri in script tag', () => {
@@ -314,6 +310,41 @@ describe('XmlFile', () => {
             (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
     });
+    describe('getCompletions', () => {
+        it('formats completion paths with proper slashes', () => {
+            let scriptPath = (0, util_1.standardizePath) `C:/app/components/component1/component1.brs`;
+            program.files[scriptPath] = new BrsFile_1.BrsFile(scriptPath, (0, util_1.standardizePath) `components/component1/component1.brs`, program);
+            let xmlFile = new XmlFile_1.XmlFile((0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/components/component1/component1.xml`, (0, util_1.standardizePath) `components/component1/component1.xml`, program);
+            xmlFile.parser.references.scriptTagImports.push({
+                pkgPath: (0, util_1.standardizePath) `components/component1/component1.brs`,
+                text: 'component1.brs',
+                filePathRange: vscode_languageserver_1.Range.create(1, 1, 1, 1)
+            });
+            (0, chai_config_spec_1.expect)(xmlFile.getCompletions(vscode_languageserver_1.Position.create(1, 1))[0]).to.include({
+                label: 'component1.brs',
+                kind: vscode_languageserver_1.CompletionItemKind.File
+            });
+            (0, chai_config_spec_1.expect)(xmlFile.getCompletions(vscode_languageserver_1.Position.create(1, 1))[1]).to.include({
+                label: 'pkg:/components/component1/component1.brs',
+                kind: vscode_languageserver_1.CompletionItemKind.File
+            });
+        });
+        it('returns empty set when out of range', () => {
+            program.setFile('components/component1.brs', ``);
+            (0, chai_config_spec_1.expect)(file.getCompletions(vscode_languageserver_1.Position.create(99, 99))).to.be.empty;
+        });
+        //TODO - refine this test once cdata scripts are supported
+        it('prevents scope completions entirely', () => {
+            program.setFile('components/component1.brs', ``);
+            let xmlFile = program.setFile('components/component1.xml', (0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="ParentScene" extends="GrandparentScene">
+                    <script type="text/brightscript" uri="./Component1.brs" />
+                </component>
+            `);
+            (0, chai_config_spec_1.expect)(program.getCompletions(xmlFile.srcPath, vscode_languageserver_1.Position.create(1, 1))).to.be.empty;
+        });
+    });
     describe('getAllDependencies', () => {
         it('returns own imports', () => {
             file = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
@@ -469,8 +500,8 @@ describe('XmlFile', () => {
         ]);
     });
     describe('transpile', () => {
-        it('handles single quotes properly', async () => {
-            await testTranspile((0, testHelpers_spec_1.trim) `
+        it('handles single quotes properly', () => {
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="AnimationExample" extends="Scene">
                     <children>
@@ -504,28 +535,27 @@ describe('XmlFile', () => {
             await builder.run({
                 cwd: testHelpers_spec_2.rootDir,
                 retainStagingDir: true,
-                createPackage: false,
                 stagingDir: testHelpers_spec_2.stagingDir,
-                logLevel: Logger_1.LogLevel.off
+                logLevel: logging_1.LogLevel.off
             });
             (0, chai_config_spec_1.expect)((0, testHelpers_spec_1.trim)(fsExtra.readFileSync(`${testHelpers_spec_2.stagingDir}/components/MainScene.xml`).toString())).to.eql((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="MainScene" extends="Scene">
                     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
-                    <customization resumehandler="customResume" />
-                    <customization suspendhandler="customSuspend" />
                     <children>
                         <Rectangle width="1920" height="1080" />
                     </children>
+                    <customization resumehandler="customResume" />
+                    <customization suspendhandler="customSuspend" />
                 </component>
             `);
         });
         it(`honors the 'needsTranspiled' flag when set in 'afterFileParse'`, () => {
             program.plugins.add({
                 name: 'test',
-                afterProvideFile: (event) => {
+                afterFileParse: (file) => {
                     //enable transpile for every file
-                    event.files[0].needsTranspiled = true;
+                    file.needsTranspiled = true;
                 }
             });
             const file = program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
@@ -533,10 +563,10 @@ describe('XmlFile', () => {
                 <component name="Comp" extends="Group">
                 </component>
             `);
-            (0, chai_config_spec_1.expect)(file['needsTranspiled']).to.be.true;
+            (0, chai_config_spec_1.expect)(file.needsTranspiled).to.be.true;
         });
-        it('includes bslib script', async () => {
-            await testTranspile((0, testHelpers_spec_1.trim) `
+        it('includes bslib script', () => {
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                 </component>
@@ -547,8 +577,8 @@ describe('XmlFile', () => {
                 </component>
             `, 'none', 'components/Comp.xml');
         });
-        it('does not include additional bslib script if already there ', async () => {
-            await testTranspile((0, testHelpers_spec_1.trim) `
+        it('does not include additional bslib script if already there ', () => {
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
@@ -560,11 +590,11 @@ describe('XmlFile', () => {
                 </component>
             `, 'none', 'components/child.xml');
         });
-        it('does not include bslib script if already there from ropm', async () => {
+        it('does not include bslib script if already there from ropm', () => {
             program.setFile('source/roku_modules/bslib/bslib.brs', ``);
             program.setFile('source/lib.bs', ``);
             //include a bs file to force transpile for the xml file
-            await testTranspile((0, testHelpers_spec_1.trim) `
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                     <script type="text/brightscript" uri="pkg:/source/lib.bs" />
@@ -587,7 +617,7 @@ describe('XmlFile', () => {
             `);
             program.validate();
             (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
-            (0, chai_config_spec_1.expect)(file['needsTranspiled']).to.be.false;
+            (0, chai_config_spec_1.expect)(file.needsTranspiled).to.be.false;
         });
         /**
          * There was a bug that would incorrectly replace one of the script paths on the second or third transpile, so this test verifies it doesn't do that anymore
@@ -607,71 +637,19 @@ describe('XmlFile', () => {
                     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 </component>
             `;
-            await program.build();
+            await program.transpile([], testHelpers_spec_2.stagingDir);
             (0, chai_config_spec_1.expect)((0, testHelpers_spec_1.trim)(fsExtra.readFileSync(`${testHelpers_spec_2.stagingDir}/components/SimpleScene.xml`).toString())).to.eql(expected);
             //clear the output folder
             fsExtra.emptyDirSync(testHelpers_spec_2.stagingDir);
-            await program.build();
+            await program.transpile([], testHelpers_spec_2.stagingDir);
             (0, chai_config_spec_1.expect)((0, testHelpers_spec_1.trim)(fsExtra.readFileSync(`${testHelpers_spec_2.stagingDir}/components/SimpleScene.xml`).toString())).to.eql(expected);
         });
-        it('injects new scripts near existing scripts', async () => {
+        it('keeps all content of the XML', () => {
             program.setFile(`components/SimpleScene.bs`, `
                 sub b()
                 end sub
             `);
-            await testTranspile((0, testHelpers_spec_1.trim) `
-                <component name="SimpleScene" extends="group">
-                    <script type="text/brightscript" uri="SimpleScene.bs"/>
-                    <children>
-                        <aa id="aa">
-                            <bb id="bb" />
-                        </aa>
-                    </children>
-                </component>
-            `, (0, testHelpers_spec_1.trim) `
-                <component name="SimpleScene" extends="group">
-                    <script type="text/brightscript" uri="SimpleScene.brs" />
-                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
-                    <children>
-                        <aa id="aa">
-                            <bb id="bb" />
-                        </aa>
-                    </children>
-                </component>
-            `, 'none', 'components/SimpleScene.xml');
-        });
-        it('injects new scripts at top of component when no scripts were present', async () => {
-            program.setFile(`components/SimpleScene.bs`, `
-                sub b()
-                end sub
-            `);
-            program.options.autoImportComponentScript = true;
-            await testTranspile((0, testHelpers_spec_1.trim) `
-                <component name="SimpleScene" extends="group">
-                    <children>
-                        <aa id="aa">
-                            <bb id="bb" />
-                        </aa>
-                    </children>
-                </component>
-            `, (0, testHelpers_spec_1.trim) `
-                <component name="SimpleScene" extends="group">
-                    <script type="text/brightscript" uri="pkg:/components/SimpleScene.brs" />
-                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
-                    <children>
-                        <aa id="aa">
-                            <bb id="bb" />
-                        </aa>
-                    </children>
-                </component>
-            `, 'none', 'components/SimpleScene.xml');
-        });
-        it('keeps all content of the XML', async () => {
-            program.setFile(`components/SimpleScene.bs`, `
-                sub b()
-                end sub
-            `);
-            await testTranspile((0, testHelpers_spec_1.trim) `
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component
                     name="SimpleScene" extends="Scene"
@@ -706,12 +684,12 @@ describe('XmlFile', () => {
                 </component>
             `, 'none', 'components/SimpleScene.xml');
         });
-        it('changes file extensions from bs to brs', async () => {
+        it('changes file extensions from bs to brs', () => {
             program.setFile(`components/SimpleScene.bs`, `
                 import "pkg:/source/lib.bs"
             `);
             program.setFile('source/lib.bs', ``);
-            await testTranspile((0, testHelpers_spec_1.trim) `
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script type="text/brighterscript" uri="SimpleScene.bs"/>
@@ -725,9 +703,9 @@ describe('XmlFile', () => {
                 </component>
             `, 'none', 'components/SimpleScene.xml');
         });
-        it('does not fail on missing script type', async () => {
+        it('does not fail on missing script type', () => {
             program.setFile('components/SimpleScene.brs', '');
-            await testTranspile((0, testHelpers_spec_1.trim) `
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script uri="SimpleScene.brs"/>
@@ -764,7 +742,7 @@ describe('XmlFile', () => {
                 <component name="SimpleScene" extends="Scene" >
                 </component>
             `);
-            (0, chai_config_spec_1.expect)(file['needsTranspiled']).to.be.false;
+            (0, chai_config_spec_1.expect)(file.needsTranspiled).to.be.false;
         });
         it('needsTranspiled is true if an import is brighterscript', () => {
             let file = program.setFile('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
@@ -773,7 +751,7 @@ describe('XmlFile', () => {
                     <script type="text/brightscript" uri="SimpleScene.bs"/>
                 </component>
             `);
-            (0, chai_config_spec_1.expect)(file['needsTranspiled']).to.be.true;
+            (0, chai_config_spec_1.expect)(file.needsTranspiled).to.be.true;
         });
         it('simple source mapping includes sourcemap reference', () => {
             program.options.sourceMap = true;
@@ -794,10 +772,91 @@ describe('XmlFile', () => {
                 <component name="SimpleScene" extends="Scene">
                 </component>
             `);
-            file['needsTranspiled'] = true;
+            file.needsTranspiled = true;
             const code = file.transpile().code;
             (0, chai_config_spec_1.expect)(code.endsWith(`<!--//# sourceMappingURL=./SimpleScene.xml.map -->`)).to.be.true;
         });
+        it('removes script imports if given file is not publishable', () => {
+            program.options.pruneEmptyCodeFiles = true;
+            program.setFile(`components/SimpleScene.bs`, `
+                enum simplescenetypes
+                    hero
+                    intro
+                end enum
+            `);
+            testTranspile((0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component
+                    name="SimpleScene" extends="Scene"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd"
+                >
+                    <script type="text/brightscript" uri="SimpleScene.bs"/>
+                </component>
+            `, (0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="SimpleScene" extends="Scene" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd">
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                </component>
+            `, 'none', 'components/SimpleScene.xml');
+        });
+        it('removes extra imports found via dependencies if given file is not publishable', () => {
+            program.options.pruneEmptyCodeFiles = true;
+            program.setFile(`source/simplescenetypes.bs`, `
+                enum SimpleSceneTypes
+                    world = "world"
+                end enum
+            `);
+            program.setFile(`components/SimpleScene.bs`, `
+                import "pkg:/source/simplescenetypes.bs"
+
+                sub init()
+                    ? "Hello " + SimpleSceneTypes.world
+                end sub
+            `);
+            testTranspile((0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component
+                    name="SimpleScene" extends="Scene"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd"
+                >
+                    <script type="text/brightscript" uri="SimpleScene.bs"/>
+                </component>
+            `, (0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="SimpleScene" extends="Scene" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd">
+                    <script type="text/brightscript" uri="SimpleScene.brs" />
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                </component>
+            `, 'none', 'components/SimpleScene.xml');
+        });
+        it('removes imports of empty brightscript files', () => {
+            program.options.pruneEmptyCodeFiles = true;
+            program.setFile(`components/EmptyFile.brs`, '');
+            program.setFile(`components/SimpleScene.brs`, `
+                sub init()
+                    ? "Hello World"
+                end sub
+            `);
+            testTranspile((0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component
+                    name="SimpleScene" extends="Scene"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd"
+                >
+                    <script type="text/brightscript" uri="SimpleScene.brs"/>
+                    <script type="text/brightscript" uri="EmptyFile.brs"/>
+                </component>
+            `, (0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="SimpleScene" extends="Scene" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd">
+                    <script type="text/brightscript" uri="SimpleScene.brs" />
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                </component>
+            `, 'none', 'components/SimpleScene.xml');
+        });
     });
     describe('Transform plugins', () => {
         function parseFileWithPlugins(validateXml) {
@@ -807,7 +866,7 @@ describe('XmlFile', () => {
             });
             program.plugins.add({
                 name: 'Transform plugins',
-                onFileValidate: event => validateXml(event.file)
+                afterFileParse: file => validateXml(file)
             });
             file = program.setFile('components/component.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -827,16 +886,14 @@ describe('XmlFile', () => {
     it('plugin diagnostics work for xml files', () => {
         program.plugins.add({
             name: 'Xml diagnostic test',
-            afterProvideFile: (event) => {
-                for (const file of event.files) {
-                    if (file.srcPath.endsWith('.xml')) {
-                        file.diagnostics.push({
+            afterFileParse: (file) => {
+                if (file.srcPath.endsWith('.xml')) {
+                    file.addDiagnostics([{
                             file: file,
                             message: 'Test diagnostic',
                             range: vscode_languageserver_1.Range.create(0, 0, 0, 0),
                             code: 9999
-                        });
-                    }
+                        }]);
                 }
             }
         });
@@ -913,7 +970,7 @@ describe('XmlFile', () => {
             `);
             (0, chai_config_spec_1.expect)(program.getScopesForFile(xmlFile)[0].getAllCallables().map(x => x.callable.name)).to.include('logInfo');
         });
-        it('does not include `d.bs` script during transpile', async () => {
+        it('does not include `d.bs` script during transpile', () => {
             program.setFile('source/logger.d.bs', `
                 sub logInfo()
                 end sub
@@ -927,7 +984,7 @@ describe('XmlFile', () => {
                 sub init()
                 end sub
             `);
-            await testTranspile((0, testHelpers_spec_1.trim) `
+            testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
                     <script type="text/brighterscript" uri="Component1.bs" />
@@ -1021,7 +1078,7 @@ describe('XmlFile', () => {
             program.validate();
             (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
-        it('ignores a specific diagnostic on next line', () => {
+        it('ignores warning from previous line just for the specified code', () => {
             //component without a name attribute
             program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -1034,7 +1091,7 @@ describe('XmlFile', () => {
                 DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute()
             ]);
         });
-        it('ignores all warnings from previous line comment', () => {
+        it('ignores warning from previous line comment', () => {
             //component without a name attribute
             program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -1048,7 +1105,7 @@ describe('XmlFile', () => {
             //component without a name attribute
             program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
-                <component name="ButtonCustom"> <!--bs:disable-line 1006-->
+                <component> <!--bs:disable-line 1006-->
                 </component>
             `);
             program.validate();
@@ -1087,17 +1144,17 @@ describe('XmlFile', () => {
                 <component name="comp1">
                 </component>
             `);
-            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.destPath).to.equal(comp2.destPath);
+            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.pkgPath).to.equal(comp2.pkgPath);
             //add comp1. it should become the main component with this name
             const comp1 = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="comp1" extends="Group">
                 </component>
             `);
-            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.destPath).to.equal(comp1.destPath);
+            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.pkgPath).to.equal(comp1.pkgPath);
             //remove comp1, comp2 should be the primary again
             program.removeFile((0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/components/comp1.xml`);
-            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.destPath).to.equal(comp2.destPath);
+            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.pkgPath).to.equal(comp2.pkgPath);
             //add comp3
             program.setFile('components/comp3.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -1105,7 +1162,7 @@ describe('XmlFile', () => {
                 </component>
             `);
             //...the 2nd file should still be main
-            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.destPath).to.equal(comp2.destPath);
+            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.pkgPath).to.equal(comp2.pkgPath);
         });
     });
 });