brighterscript 1.0.0-alpha.4 → 1.0.0-alpha.40

package/dist/files/XmlFile.spec.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
+const chai_config_spec_1 = require("../chai-config.spec");
+const path = require("path");
 const sinonImport = require("sinon");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const fsExtra = require("fs-extra");
@@ -9,21 +10,25 @@ const Program_1 = require("../Program");
 const XmlFile_1 = require("./XmlFile");
 const util_1 = require("../util");
 const testHelpers_spec_1 = require("../testHelpers.spec");
+const ProgramBuilder_1 = require("../ProgramBuilder");
+const logging_1 = require("../logging");
+const reflection_1 = require("../astUtils/reflection");
+const testHelpers_spec_2 = require("../testHelpers.spec");
 describe('XmlFile', () => {
-    const tempDir = util_1.standardizePath `${process.cwd()}/.tmp`;
-    const rootDir = util_1.standardizePath `${tempDir}/rootDir`;
-    const stagingDir = util_1.standardizePath `${tempDir}/stagingDir`;
     let program;
     let sinon = sinonImport.createSandbox();
     let file;
-    let testTranspile = testHelpers_spec_1.getTestTranspile(() => [program, rootDir]);
+    let testTranspile = (0, testHelpers_spec_1.getTestTranspile)(() => [program, testHelpers_spec_2.rootDir]);
     beforeEach(() => {
-        fsExtra.ensureDirSync(tempDir);
-        fsExtra.emptyDirSync(tempDir);
-        fsExtra.ensureDirSync(rootDir);
-        fsExtra.ensureDirSync(stagingDir);
-        program = new Program_1.Program({ rootDir: rootDir });
-        file = new XmlFile_1.XmlFile(`${rootDir}/components/MainComponent.xml`, 'components/MainComponent.xml', program);
+        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
+        });
     });
     afterEach(() => {
         sinon.restore();
@@ -34,34 +39,37 @@ describe('XmlFile', () => {
             const expected = 'OtherName';
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
-                afterFileParse: (event) => {
-                    event.file.parser.ast.root.attributes[0].value.text = expected;
+                afterProvideFile: (event) => {
+                    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;
+                    }
                 }
             });
-            file = program.setFile('components/ChildScene.xml', testHelpers_spec_1.trim `
+            file = program.setFile('components/ChildScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="Scene">
-                    <script type="text/brightscript" uri="ChildScene1.brs" /> <script type="text/brightscript" uri="ChildScene2.brs" /> <script type="text/brightscript" uri="ChildScene3.brs" />
                 </component>
             `);
-            chai_1.expect(file.componentName.text).to.equal(expected);
+            (0, chai_config_spec_1.expect)(file.componentName.text).to.equal(expected);
         });
         it('only removes specified attribute when calling setAttribute', () => {
-            file = new XmlFile_1.XmlFile('abs', 'rel', program);
+            const file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
                 afterFileParse: () => {
-                    let child = file.parser.ast.component.children.children[0];
-                    chai_1.expect(child.attributes).to.have.lengthOf(4);
-                    child.setAttribute('text', undefined);
-                    chai_1.expect(child.getAttribute('id').value.text).to.equal('one');
-                    chai_1.expect(child.attributes).to.have.lengthOf(3);
-                    child.setAttribute('text3', undefined);
-                    chai_1.expect(child.getAttribute('id').value.text).to.equal('one');
-                    chai_1.expect(child.attributes).to.have.lengthOf(2);
+                    let child = file.parser.ast.componentElement.childrenElement.elements[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');
+                    (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');
+                    (0, chai_config_spec_1.expect)(child.attributes).to.have.lengthOf(2);
                 }
             });
-            file.parse(testHelpers_spec_1.trim `
+            file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="Scene">
                     <script type="text/brightscript" uri="ChildScene1.brs" /> <script type="text/brightscript" uri="ChildScene2.brs" /> <script type="text/brightscript" uri="ChildScene3.brs" />
@@ -76,17 +84,17 @@ describe('XmlFile', () => {
             `);
         });
         it('supports importing BrighterScript files', () => {
-            file = program.setFile({ src: `${rootDir}/components/custom.xml`, dest: 'components/custom.xml' }, testHelpers_spec_1.trim `
+            file = program.setFile('components/custom.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="Scene">
                     <script type="text/brightscript" uri="ChildScene.bs" />
                 </component>
             `);
-            chai_1.expect(file.scriptTagImports.map(x => x.pkgPath)[0]).to.equal('pkg:/components/ChildScene.bs');
+            (0, chai_config_spec_1.expect)(file.scriptTagImports.map(x => x.destPath)[0]).to.equal((0, util_1.standardizePath) `components/ChildScene.bs`);
         });
         it('does not include commented-out script imports', () => {
             var _a, _b;
-            file = program.setFile({ src: `${rootDir}/components/custom.xml`, dest: 'components/custom.xml' }, testHelpers_spec_1.trim `
+            file = program.setFile('components/custom.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="Scene">
                     <script type="text/brightscript" uri="ChildScene.brs" />
@@ -95,58 +103,56 @@ describe('XmlFile', () => {
                     -->
                 </component>
             `);
-            chai_1.expect((_b = (_a = file.scriptTagImports) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.pkgPath).to.eql('pkg:/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.destPath).to.eql((0, util_1.standardizePath) `components/ChildScene.brs`);
         });
         it('finds scripts when more than one per line', () => {
-            file = new XmlFile_1.XmlFile('abs', 'rel', program);
-            file.parse(testHelpers_spec_1.trim `
+            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="Scene">
                     <script type="text/brightscript" uri="ChildScene1.brs" /> <script type="text/brightscript" uri="ChildScene2.brs" /> <script type="text/brightscript" uri="ChildScene3.brs" />
                 </component>
             `);
-            chai_1.expect(file.scriptTagImports).to.be.lengthOf(3);
-            chai_1.expect(file.scriptTagImports[0]).to.deep.include({
+            (0, chai_config_spec_1.expect)(file.scriptTagImports).to.be.lengthOf(3);
+            (0, chai_config_spec_1.expect)(file.scriptTagImports[0]).to.deep.include({
                 text: 'ChildScene1.brs',
                 filePathRange: vscode_languageserver_1.Range.create(2, 42, 2, 57)
             });
-            chai_1.expect(file.scriptTagImports[1]).to.deep.include({
+            (0, chai_config_spec_1.expect)(file.scriptTagImports[1]).to.deep.include({
                 text: 'ChildScene2.brs',
                 filePathRange: vscode_languageserver_1.Range.create(2, 100, 2, 115)
             });
-            chai_1.expect(file.scriptTagImports[2]).to.deep.include({
+            (0, chai_config_spec_1.expect)(file.scriptTagImports[2]).to.deep.include({
                 text: 'ChildScene3.brs',
                 filePathRange: vscode_languageserver_1.Range.create(2, 158, 2, 173)
             });
         });
         it('finds component names', () => {
-            file = new XmlFile_1.XmlFile('abs', 'rel', program);
-            file.parse(testHelpers_spec_1.trim `
+            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
                     <script type="text/brightscript" uri="ChildScene.brs" />
                 </component>
             `);
-            chai_1.expect(file.parentComponentName.text).to.equal('ParentScene');
-            chai_1.expect(file.componentName.text).to.equal('ChildScene');
+            (0, chai_config_spec_1.expect)(file.parentComponentName.text).to.equal('ParentScene');
+            (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('abs', 'rel', program);
+            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
             file.parse(/* not trimmed */ `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
                     <script type="text/brightscript" uri="ChildScene.brs" />
                 </component>`);
-            chai_1.expect(file.diagnostics).to.be.lengthOf(2);
-            chai_1.expect(file.diagnostics[0]).to.deep.include({
-                code: DiagnosticMessages_1.DiagnosticMessages.xmlGenericParseError('').code,
-                range: vscode_languageserver_1.Range.create(1, 16, 1, 22)
-            });
-            chai_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) }));
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [{
+                    code: DiagnosticMessages_1.DiagnosticMessages.xmlGenericParseError('').code,
+                    location: { range: vscode_languageserver_1.Range.create(1, 16, 1, 22) }
+                }, Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlGenericParseError('Syntax error: whitespace found before the XML prolog')), { location: { 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('abs', 'rel', program);
-            file.parse(testHelpers_spec_1.trim `
+            file = new XmlFile_1.XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
+            file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
                     <interface>
@@ -155,223 +161,174 @@ describe('XmlFile', () => {
                     <unexpectedToo />
                 </component>
             `);
-            chai_1.expect(file.diagnostics).to.be.lengthOf(2);
-            chai_1.expect(file.diagnostics[0]).to.deep.include(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlUnexpectedTag('unexpected')), { range: vscode_languageserver_1.Range.create(3, 9, 3, 19) }));
-            chai_1.expect(file.diagnostics[1]).to.deep.include(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlUnexpectedTag('unexpectedToo')), { range: vscode_languageserver_1.Range.create(5, 5, 5, 18) }));
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlUnexpectedTag('unexpected')), { location: { range: vscode_languageserver_1.Range.create(3, 9, 3, 19) } }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlUnexpectedTag('unexpectedToo')), { location: { range: vscode_languageserver_1.Range.create(5, 5, 5, 18) } })]);
         });
         it('Adds error when no component is declared in xml', () => {
-            file = program.setFile('components/file.xml', '<script type="text/brightscript" uri="ChildScene.brs" />');
+            program.setFile('components/comp.xml', '<script type="text/brightscript" uri="ChildScene.brs" />');
             program.validate();
-            chai_1.expect(file.diagnostics).to.be.lengthOf(2);
-            chai_1.expect(file.diagnostics[0]).to.deep.include(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlUnexpectedTag('script')), { range: vscode_languageserver_1.Range.create(0, 1, 0, 7) }));
-            chai_1.expect(file.diagnostics[1]).to.deep.include(DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingComponentDeclaration());
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlUnexpectedTag('script')), { location: { range: vscode_languageserver_1.Range.create(0, 1, 0, 7) } }),
+                DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingComponentDeclaration()
+            ]);
         });
         it('adds error when component does not declare a name', () => {
-            file = program.setFile('components/ParentScene.xml', testHelpers_spec_1.trim `
+            file = program.setFile('components/comp.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component extends="ParentScene">
                     <script type="text/brightscript" uri="ChildScene.brs" />
                 </component>
             `);
             program.validate();
-            chai_1.expect(file.diagnostics).to.be.lengthOf(1);
-            chai_1.expect(file.diagnostics[0]).to.deep.include({
-                message: DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingNameAttribute().message,
-                range: vscode_languageserver_1.Range.create(1, 1, 1, 10)
-            });
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [{
+                    message: DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingNameAttribute().message,
+                    location: { range: vscode_languageserver_1.Range.create(1, 1, 1, 10) }
+                }]);
         });
         it('catches xml parse errors', () => {
-            file = program.setFile('components/ParentScene.xml', testHelpers_spec_1.trim `
+            file = program.setFile('components/comp.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component 1extends="ParentScene">
                 </component>
             `);
             program.validate();
-            chai_1.expect(file.diagnostics).to.be.lengthOf(2);
-            chai_1.expect(file.diagnostics[0].code).to.equal(DiagnosticMessages_1.DiagnosticMessages.xmlGenericParseError('').code); //unexpected character '1'
-            chai_1.expect(file.diagnostics[1]).to.deep.include({
+            const diagnostics = program.getDiagnostics();
+            (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(2);
+            (0, chai_config_spec_1.expect)(diagnostics[0].code).to.equal(DiagnosticMessages_1.DiagnosticMessages.xmlGenericParseError('').code); //unexpected character '1'
+            (0, chai_config_spec_1.expect)(diagnostics[1]).to.deep.include({
                 code: DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingNameAttribute().code,
-                range: vscode_languageserver_1.Range.create(1, 1, 1, 10)
+                location: util_1.default.createLocationFromFileRange(file, vscode_languageserver_1.Range.create(1, 1, 1, 10))
             });
         });
         it('finds script imports', () => {
-            file = new XmlFile_1.XmlFile('abspath/components/cmp1.xml', 'components/cmp1.xml', program);
-            file.parse(testHelpers_spec_1.trim `
+            file = new XmlFile_1.XmlFile({ srcPath: 'abspath/components/cmp1.xml', destPath: 'components/cmp1.xml', program: program });
+            file.parse((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
                     <script type="text/brightscript" uri="pkg:/components/cmp1.brs" />
                 </component>
             `);
-            chai_1.expect(file.scriptTagImports.length).to.equal(1);
-            chai_1.expect(file.scriptTagImports[0]).to.deep.include({
+            (0, chai_config_spec_1.expect)(file.scriptTagImports.length).to.equal(1);
+            (0, chai_config_spec_1.expect)(file.scriptTagImports[0]).to.deep.include({
                 sourceFile: file,
                 text: 'pkg:/components/cmp1.brs',
-                pkgPath: `pkg:/components/cmp1.brs`,
+                destPath: `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('abspath', 'relpath', program);
+            file = new XmlFile_1.XmlFile({ srcPath: 'abspath', destPath: 'relpath', program: program });
             file.parse('a comment');
             try {
                 file.parse(`'a new comment`);
-                chai_1.assert.fail(null, null, 'Should have thrown an exception, but did not');
+                chai_config_spec_1.assert.fail(null, null, 'Should have thrown an exception, but did not');
             }
             catch (e) {
                 //test passes
             }
         });
         it('resolves relative paths', () => {
-            file = program.setFile({
-                src: `${rootDir}/components/comp1.xml`,
-                dest: 'components/comp1.xml'
-            }, testHelpers_spec_1.trim `
+            file = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
                     <script type="text/brightscript" uri="cmp1.brs" />
                 </component>
             `);
-            chai_1.expect(file.scriptTagImports.length).to.equal(1);
-            chai_1.expect(file.scriptTagImports[0]).to.deep.include({
+            (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',
-                pkgPath: `pkg:/components/cmp1.brs`
+                destPath: `components${path.sep}cmp1.brs`
             });
         });
         it('finds correct position for empty uri in script tag', () => {
             var _a;
-            file = program.setFile({
-                src: `${rootDir}/components/comp1.xml`,
-                dest: 'components/comp1.xml'
-            }, testHelpers_spec_1.trim `
+            file = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
                     <script type="text/brightscript" uri="" />
                 </component>
             `);
-            chai_1.expect(file.scriptTagImports.length).to.equal(1);
-            chai_1.expect((_a = file.scriptTagImports[0]) === null || _a === void 0 ? void 0 : _a.filePathRange).to.eql(vscode_languageserver_1.Range.create(2, 42, 2, 42));
+            (0, chai_config_spec_1.expect)(file.scriptTagImports.length).to.equal(1);
+            (0, chai_config_spec_1.expect)((_a = file.scriptTagImports[0]) === null || _a === void 0 ? void 0 : _a.filePathRange).to.eql(vscode_languageserver_1.Range.create(2, 42, 2, 42));
         });
     });
     describe('doesReferenceFile', () => {
         it('compares case insensitive', () => {
-            let xmlFile = program.setFile({
-                src: `${rootDir}/components/comp1.xml`,
-                dest: 'components/comp1.xml'
-            }, testHelpers_spec_1.trim `
+            let xmlFile = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
                     <script type="text/brightscript" uri="HeroGrid.brs" />
                 </component>
             `);
-            let brsFile = program.setFile({
-                src: `${rootDir}/components/HEROGRID.brs`,
-                dest: `components/HEROGRID.brs`
-            }, ``);
-            chai_1.expect(xmlFile.doesReferenceFile(brsFile)).to.be.true;
+            let brsFile = program.setFile(`components/HEROGRID.brs`, ``);
+            (0, chai_config_spec_1.expect)(xmlFile.doesReferenceFile(brsFile)).to.be.true;
         });
     });
     describe('autoImportComponentScript', () => {
         it('is not enabled by default', () => {
-            program.setFile({ src: `${rootDir}/components/comp1.xml`, dest: 'components/comp1.xml' }, testHelpers_spec_1.trim `
+            program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ParentScene" extends="GrandparentScene">
                     <script type="text/brightscript" uri="./lib.brs" />
                 </component>
             `);
-            program.setFile({ src: `${rootDir}/components/lib.brs`, dest: 'components/lib.brs' }, `
+            program.setFile('components/lib.brs', `
                 function libFunc()
                 end function
             `);
-            program.setFile({ src: `${rootDir}/components/comp1.bs`, dest: 'components/comp1.bs' }, `
+            program.setFile('components/comp1.bs', `
                 function init()
                     libFunc()
                 end function
             `);
             program.validate();
-            chai_1.expect(program.getDiagnostics().map(x => x.message)).to.include(DiagnosticMessages_1.DiagnosticMessages.fileNotReferencedByAnyOtherFile().message);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.fileNotReferencedByAnyOtherFile()
+            ]);
         });
         it('is not enabled by default', () => {
             program = new Program_1.Program({
-                rootDir: rootDir,
+                rootDir: testHelpers_spec_2.rootDir,
                 autoImportComponentScript: true
             });
-            program.setFile({ src: `${rootDir}/components/comp1.xml`, dest: 'components/comp1.xml' }, testHelpers_spec_1.trim `
+            program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ParentScene" extends="GrandparentScene">
                     <script type="text/brightscript" uri="./lib.brs" />
                 </component>
             `);
-            program.setFile({ src: `${rootDir}/components/lib.brs`, dest: 'components/lib.brs' }, `
+            program.setFile('components/lib.brs', `
                 function libFunc()
                 end function
             `);
-            program.setFile({ src: `${rootDir}/components/comp1.bs`, dest: 'components/comp1.bs' }, `
+            program.setFile('components/comp1.bs', `
                 function init()
                     libFunc()
                 end function
             `);
             program.validate();
             //there should be no errors
-            chai_1.expect(program.getDiagnostics().map(x => x.message)[0]).not.to.exist;
-        });
-    });
-    describe('getCompletions', () => {
-        it('formats completion paths with proper slashes', () => {
-            program.setFile('pkg:/components/component1/component1.brs', '');
-            const xmlFile = program.setFile('components/component1/component1.xml', testHelpers_spec_1.trim `
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="Component1" extends="Group">
-                </component
-            `);
-            xmlFile.parser.references.scriptTagImports.push({
-                pkgPath: 'pkg:/components/component1/component1.brs',
-                text: 'component1.brs',
-                filePathRange: vscode_languageserver_1.Range.create(1, 1, 1, 1)
-            });
-            chai_1.expect(xmlFile.getCompletions(vscode_languageserver_1.Position.create(1, 1))[0]).to.include({
-                label: 'component1.brs',
-                kind: vscode_languageserver_1.CompletionItemKind.File
-            });
-            chai_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({ src: `${rootDir}/components/Component1.brs`, dest: 'components/component1.brs' }, ``);
-            chai_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({ src: `${rootDir}/components/Component1.brs`, dest: 'components/component1.brs' }, ``);
-            let xmlFile = program.setFile({ src: `${rootDir}/components/Component1.xml`, dest: 'components/component1.xml' }, testHelpers_spec_1.trim `
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="ParentScene" extends="GrandparentScene">
-                    <script type="text/brightscript" uri="./Component1.brs" />
-                </component>
-            `);
-            chai_1.expect(program.getCompletions(xmlFile.srcPath, vscode_languageserver_1.Position.create(1, 1))).to.be.empty;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
     });
     describe('getAllDependencies', () => {
         it('returns own imports', () => {
-            file = program.setFile('components/comp1.xml', testHelpers_spec_1.trim `
+            file = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="BaseScene">
                     <script type="text/brightscript" uri="pkg:/source/lib.brs" />
                 </component>
             `);
-            chai_1.expect(file.getOwnDependencies().sort()).to.eql([
-                'pkg:/source/lib.brs',
-                'pkg:/source/lib.d.bs'
+            (0, chai_config_spec_1.expect)(file.getOwnDependencies().sort()).to.eql([
+                (0, util_1.standardizePath) `source/lib.brs`,
+                (0, util_1.standardizePath) `source/lib.d.bs`
             ]);
         });
     });
     it('invalidates dependent scopes on change', () => {
         let xmlFile = program.setFile({
-            src: `${rootDir}/components/comp1.xml`,
+            src: `${testHelpers_spec_2.rootDir}/components/comp1.xml`,
             dest: `components/comp1.xml`
-        }, testHelpers_spec_1.trim `
+        }, (0, testHelpers_spec_1.trim) `
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="BaseScene">
                 <script type="text/brightscript" uri="pkg:/source/lib.bs" />
@@ -380,204 +337,229 @@ describe('XmlFile', () => {
         program.validate();
         let scope = program.getScopesForFile(xmlFile)[0];
         //scope should be validated
-        chai_1.expect(scope.isValidated);
+        (0, chai_config_spec_1.expect)(scope.isValidated);
         //add lib1
-        program.setFile({
-            src: `${rootDir}/source/lib.bs`,
-            dest: `source/lib.bs`
-        }, ``);
+        program.setFile(`source/lib.bs`, ``);
         //adding a dependent file should have invalidated the scope
-        chai_1.expect(scope.isValidated).to.be.false;
+        (0, chai_config_spec_1.expect)(scope.isValidated).to.be.false;
         program.validate();
-        chai_1.expect(scope.isValidated).to.be.true;
+        (0, chai_config_spec_1.expect)(scope.isValidated).to.be.true;
         //update lib1 to include an import
-        program.setFile({
-            src: `${rootDir}/source/lib.bs`,
-            dest: `source/lib.bs`
-        }, `
+        program.setFile(`source/lib.bs`, `
             import "lib2.bs"
         `);
         //scope should have been invalidated again
-        chai_1.expect(scope.isValidated).to.be.false;
+        (0, chai_config_spec_1.expect)(scope.isValidated).to.be.false;
         program.validate();
-        chai_1.expect(scope.isValidated).to.be.true;
+        (0, chai_config_spec_1.expect)(scope.isValidated).to.be.true;
         //add the lib2 imported from lib
-        program.setFile({
-            src: `${rootDir}/source/lib2.bs`,
-            dest: `source/lib2.bs`
-        }, ``);
+        program.setFile(`source/lib2.bs`, ``);
         //scope should have been invalidated again because of chained dependency
-        chai_1.expect(scope.isValidated).to.be.false;
+        (0, chai_config_spec_1.expect)(scope.isValidated).to.be.false;
         program.validate();
-        chai_1.expect(scope.isValidated).to.be.true;
-        program.removeFile(`${rootDir}/source/lib.bs`);
-        chai_1.expect(scope.isValidated).to.be.false;
+        (0, chai_config_spec_1.expect)(scope.isValidated).to.be.true;
+        program.removeFile(`${testHelpers_spec_2.rootDir}/source/lib.bs`);
+        (0, chai_config_spec_1.expect)(scope.isValidated).to.be.false;
     });
     it('does not invalidate unrelated scopes on change', () => {
         let xmlFile1 = program.setFile({
-            src: `${rootDir}/components/comp1.xml`,
+            src: `${testHelpers_spec_2.rootDir}/components/comp1.xml`,
             dest: `components/comp1.xml`
-        }, testHelpers_spec_1.trim `
+        }, (0, testHelpers_spec_1.trim) `
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene1" extends="BaseScene">
                 <script type="text/brightscript" uri="pkg:/source/lib.brs" />
             </component>
         `);
         let xmlFile2 = program.setFile({
-            src: `${rootDir}/components/comp2.xml`,
+            src: `${testHelpers_spec_2.rootDir}/components/comp2.xml`,
             dest: `components/comp2.xml`
-        }, testHelpers_spec_1.trim `
+        }, (0, testHelpers_spec_1.trim) `
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene2" extends="BaseScene">
             </component>
         `);
         program.validate();
         //scope should be validated
-        chai_1.expect(program.getScopesForFile(xmlFile1)[0].isValidated).to.be.true;
-        chai_1.expect(program.getScopesForFile(xmlFile2)[0].isValidated).to.be.true;
+        (0, chai_config_spec_1.expect)(program.getScopesForFile(xmlFile1)[0].isValidated).to.be.true;
+        (0, chai_config_spec_1.expect)(program.getScopesForFile(xmlFile2)[0].isValidated).to.be.true;
         //add the lib file
-        program.setFile({
-            src: `${rootDir}/source/lib.brs`,
-            dest: `source/lib.brs`
-        }, ``);
-        chai_1.expect(program.getScopesForFile(xmlFile1)[0].isValidated).to.be.false;
-        chai_1.expect(program.getScopesForFile(xmlFile2)[0].isValidated).to.be.true;
-    });
-    it('allows adding diagnostics', () => {
-        const expected = [{
-                message: 'message',
-                file: undefined,
-                range: undefined
-            }];
-        file.addDiagnostics(expected);
-        const actual = file.getDiagnostics();
-        chai_1.expect(actual).deep.equal(expected);
+        program.setFile(`source/lib.brs`, ``);
+        (0, chai_config_spec_1.expect)(program.getScopesForFile(xmlFile1)[0].isValidated).to.be.false;
+        (0, chai_config_spec_1.expect)(program.getScopesForFile(xmlFile2)[0].isValidated).to.be.true;
     });
     describe('component extends', () => {
         it('works for single-line', () => {
+            var _a;
             file = program.setFile({
-                src: `${rootDir}/components/comp1.xml`,
+                src: `${testHelpers_spec_2.rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
-            }, testHelpers_spec_1.trim `
+            }, (0, testHelpers_spec_1.trim) `
                     <?xml version="1.0" encoding="utf-8" ?>
                     <component name="ChildScene" extends="BaseScene">
                     </component>
                 `);
-            chai_1.expect(file.parentComponentName.range).to.eql(vscode_languageserver_1.Range.create(1, 38, 1, 47));
+            (0, chai_config_spec_1.expect)((_a = file.parentComponentName.location) === null || _a === void 0 ? void 0 : _a.range).to.eql(vscode_languageserver_1.Range.create(1, 38, 1, 47));
         });
         it('works for multi-line', () => {
+            var _a;
             file = program.setFile({
-                src: `${rootDir}/components/comp1.xml`,
+                src: `${testHelpers_spec_2.rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
-            }, testHelpers_spec_1.trim `
+            }, (0, testHelpers_spec_1.trim) `
                     <?xml version="1.0" encoding="utf-8" ?>
                     <component name="ChildScene"
                         extends="BaseScene">
                     </component>
                 `);
-            chai_1.expect(file.parentComponentName.range).to.eql(vscode_languageserver_1.Range.create(2, 13, 2, 22));
+            (0, chai_config_spec_1.expect)((_a = file.parentComponentName.location) === null || _a === void 0 ? void 0 : _a.range).to.eql(vscode_languageserver_1.Range.create(2, 13, 2, 22));
         });
         it('does not throw when unable to find extends', () => {
             file = program.setFile({
-                src: `${rootDir}/components/comp1.xml`,
+                src: `${testHelpers_spec_2.rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
-            }, testHelpers_spec_1.trim `
+            }, (0, testHelpers_spec_1.trim) `
                     <?xml version="1.0" encoding="utf-8" ?>
                     <component name="ChildScene">
                     </component>
                 `);
-            chai_1.expect(file.parentComponentName).to.not.exist;
+            (0, chai_config_spec_1.expect)(file.parentComponentName).to.not.exist;
         });
         it('adds warning when no "extends" attribute is found', () => {
-            file = program.setFile({
-                src: `${rootDir}/components/comp1.xml`,
+            program.setFile({
+                src: `${testHelpers_spec_2.rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
-            }, testHelpers_spec_1.trim `
+            }, (0, testHelpers_spec_1.trim) `
                     <?xml version="1.0" encoding="utf-8" ?>
                     <component name="ChildScene">
                     </component>
                 `);
             program.validate();
-            chai_1.expect(file.getDiagnostics()[0]).to.include({
-                severity: vscode_languageserver_1.DiagnosticSeverity.Warning,
-                message: DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute().message
-            });
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute()
+            ]);
         });
     });
     it('detects when importing the codebehind file unnecessarily', () => {
-        var _a;
         program = new Program_1.Program({
             autoImportComponentScript: true,
-            rootDir: rootDir
+            rootDir: testHelpers_spec_2.rootDir
         });
-        program.setFile({
-            src: `${rootDir}/components/SimpleScene.bs`,
-            dest: `components/SimpleScene.bs`
-        }, '');
-        program.setFile({
-            src: `${rootDir}/components/SimpleScene.xml`,
-            dest: `components/SimpleScene.xml`
-        }, testHelpers_spec_1.trim `
+        program.setFile(`components/SimpleScene.bs`, '');
+        program.setFile(`components/SimpleScene.xml`, (0, testHelpers_spec_1.trim) `
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="SimpleScene" extends="Scene">
                 <script type="text/brighterscript" uri="SimpleScene.bs" />
             </component>
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.unnecessaryCodebehindScriptImport().message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.unnecessaryCodebehindScriptImport()
+        ]);
     });
     describe('transpile', () => {
+        it('handles single quotes properly', async () => {
+            await testTranspile((0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="AnimationExample" extends="Scene">
+                    <children>
+                        <Animated frames='["pkg:/images/animation-1.png"]' />
+                    </children>
+                </component>
+            `, (0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="AnimationExample" extends="Scene">
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                    <children>
+                        <Animated frames='["pkg:/images/animation-1.png"]' />
+                    </children>
+                </component>
+            `, 'none', 'components/Comp.xml');
+        });
+        it('supports instantresume <customization> elements', async () => {
+            fsExtra.outputFileSync(`${testHelpers_spec_2.rootDir}/manifest`, '');
+            fsExtra.outputFileSync(`${testHelpers_spec_2.rootDir}/source/main.brs`, `sub main()\nend sub`);
+            fsExtra.outputFileSync(`${testHelpers_spec_2.rootDir}/components/MainScene.xml`, (0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="MainScene" extends="Scene">
+                    <customization resumehandler="customResume" />
+                    <customization suspendhandler="customSuspend" />
+                    <children>
+                        <Rectangle width="1920" height="1080" />
+                    </children>
+                </component>
+            `);
+            const builder = new ProgramBuilder_1.ProgramBuilder();
+            await builder.run({
+                cwd: testHelpers_spec_2.rootDir,
+                retainStagingDir: true,
+                createPackage: false,
+                stagingDir: testHelpers_spec_2.stagingDir,
+                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>
+                </component>
+            `);
+        });
         it(`honors the 'needsTranspiled' flag when set in 'afterFileParse'`, () => {
             program.plugins.add({
                 name: 'test',
-                afterFileParse: (event) => {
+                afterProvideFile: (event) => {
                     //enable transpile for every file
-                    event.file.needsTranspiled = true;
+                    event.files[0].needsTranspiled = true;
                 }
             });
-            const file = program.setFile('components/file.xml', testHelpers_spec_1.trim `
+            const file = program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                 </component>
             `);
-            chai_1.expect(file.needsTranspiled).to.be.true;
+            (0, chai_config_spec_1.expect)(file['needsTranspiled']).to.be.true;
         });
-        it('includes bslib script', () => {
-            testTranspile(testHelpers_spec_1.trim `
+        it('includes bslib script', async () => {
+            await testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                 </component>
-            `, testHelpers_spec_1.trim `
+            `, (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" />
                 </component>
             `, 'none', 'components/Comp.xml');
         });
-        it('does not include additional bslib script if already there ', () => {
-            testTranspile(testHelpers_spec_1.trim `
+        it('does not include additional bslib script if already there ', async () => {
+            await 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" />
                 </component>
-            `, testHelpers_spec_1.trim `
+            `, (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" />
                 </component>
             `, 'none', 'components/child.xml');
         });
-        it('does not include bslib script if already there from ropm', () => {
+        it('does not include bslib script if already there from ropm', async () => {
             program.setFile('source/roku_modules/bslib/bslib.brs', ``);
             program.setFile('source/lib.bs', ``);
             //include a bs file to force transpile for the xml file
-            testTranspile(testHelpers_spec_1.trim `
+            await 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" />
                     <script type="text/brightscript" uri="pkg:/source/roku_modules/bslib/bslib.brs" />
                 </component>
-            `, testHelpers_spec_1.trim `
+            `, (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.brs" />
@@ -586,47 +568,99 @@ describe('XmlFile', () => {
             `, 'none', 'components/child.xml');
         });
         it('does not transpile xml file when bslib script is already present', () => {
-            const file = program.setFile('components/comp.xml', testHelpers_spec_1.trim `
+            const file = program.setFile('components/comp.xml', (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" />
                 </component>
             `);
             program.validate();
-            testHelpers_spec_1.expectZeroDiagnostics(program);
-            chai_1.expect(file.needsTranspiled).to.be.false;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+            (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
          */
         it('does not mangle scripts on multiple transpile', async () => {
             program.setFile('components/SimpleScene.bs', ``);
-            program.setFile(`components/SimpleScene.xml`, testHelpers_spec_1.trim `
+            program.setFile(`components/SimpleScene.xml`, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script type="text/brightscript" uri="SimpleScene.bs" />
                 </component>
             `);
-            const expected = testHelpers_spec_1.trim `
+            const expected = (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script type="text/brightscript" uri="SimpleScene.brs" />
                     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 </component>
             `;
-            await program.transpile([], stagingDir);
-            chai_1.expect(fsExtra.readFileSync(`${stagingDir}/components/SimpleScene.xml`).toString()).to.eql(expected);
+            await program.build();
+            (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(stagingDir);
-            await program.transpile([], stagingDir);
-            chai_1.expect(fsExtra.readFileSync(`${stagingDir}/components/SimpleScene.xml`).toString()).to.eql(expected);
+            fsExtra.emptyDirSync(testHelpers_spec_2.stagingDir);
+            await program.build();
+            (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('keeps all content of the XML', () => {
+        it('injects new scripts near existing scripts', async () => {
             program.setFile(`components/SimpleScene.bs`, `
                 sub b()
                 end sub
             `);
-            testTranspile(testHelpers_spec_1.trim `
+            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) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component
                     name="SimpleScene" extends="Scene"
@@ -644,7 +678,7 @@ describe('XmlFile', () => {
                         </aa>
                     </children>
                 </component>
-            `, testHelpers_spec_1.trim `
+            `, (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">
                     <interface>
@@ -661,17 +695,17 @@ describe('XmlFile', () => {
                 </component>
             `, 'none', 'components/SimpleScene.xml');
         });
-        it('changes file extensions from bs to brs', () => {
+        it('changes file extensions from bs to brs', async () => {
             program.setFile(`components/SimpleScene.bs`, `
                 import "pkg:/source/lib.bs"
             `);
             program.setFile('source/lib.bs', ``);
-            testTranspile(testHelpers_spec_1.trim `
+            await 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"/>
                 </component>
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script type="text/brightscript" uri="SimpleScene.brs" />
@@ -680,14 +714,14 @@ describe('XmlFile', () => {
                 </component>
             `, 'none', 'components/SimpleScene.xml');
         });
-        it('does not fail on missing script type', () => {
+        it('does not fail on missing script type', async () => {
             program.setFile('components/SimpleScene.brs', '');
-            testTranspile(testHelpers_spec_1.trim `
+            await testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script uri="SimpleScene.brs"/>
                 </component>
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script uri="SimpleScene.brs" type="text/brightscript" />
@@ -696,7 +730,7 @@ describe('XmlFile', () => {
             `, null, 'components/comp.xml');
         });
         it('returns the XML unmodified if needsTranspiled is false', () => {
-            let file = program.setFile('components/SimpleScene.xml', testHelpers_spec_1.trim `
+            let file = program.setFile('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <!-- should stay as-is -->
                 <component name="SimpleScene" extends="Scene" >
@@ -705,7 +739,7 @@ describe('XmlFile', () => {
             `);
             //prevent the default auto-imports to ensure no transpilation from AST
             file.getMissingImportsForTranspile = () => [];
-            chai_1.expect(testHelpers_spec_1.trimMap(file.transpile().code)).to.equal(testHelpers_spec_1.trim `
+            (0, chai_config_spec_1.expect)((0, testHelpers_spec_1.trimMap)(file.transpile().code)).to.equal((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <!-- should stay as-is -->
                 <component name="SimpleScene" extends="Scene" >
@@ -714,26 +748,25 @@ describe('XmlFile', () => {
             `);
         });
         it('needsTranspiled is false by default', () => {
-            let file = program.setFile('components/SimpleScene.xml', testHelpers_spec_1.trim `
+            let file = program.setFile('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene" >
                 </component>
             `);
-            chai_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', testHelpers_spec_1.trim `
+            let file = program.setFile('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene" >
                     <script type="text/brightscript" uri="SimpleScene.bs"/>
                 </component>
             `);
-            program.validate();
-            chai_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;
-            let file = program.setFile('components/SimpleScene.xml', testHelpers_spec_1.trim `
+            let file = program.setFile('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                 </component>
@@ -741,18 +774,110 @@ describe('XmlFile', () => {
             //prevent the default auto-imports to ensure no transpilation from AST
             file.getMissingImportsForTranspile = () => [];
             const code = file.transpile().code;
-            chai_1.expect(code.endsWith(`<!--//# sourceMappingURL=./SimpleScene.xml.map -->`)).to.be.true;
+            (0, chai_config_spec_1.expect)(code.endsWith(`<!--//# sourceMappingURL=./SimpleScene.xml.map -->`)).to.be.true;
         });
         it('AST-based source mapping includes sourcemap reference', () => {
             program.options.sourceMap = true;
-            let file = program.setFile('components/SimpleScene.xml', testHelpers_spec_1.trim `
+            let file = program.setFile('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                 </component>
             `);
-            file.needsTranspiled = true;
+            file['needsTranspiled'] = true;
             const code = file.transpile().code;
-            chai_1.expect(code.endsWith(`<!--//# sourceMappingURL=./SimpleScene.xml.map -->`)).to.be.true;
+            (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', async () => {
+            program.options.pruneEmptyCodeFiles = true;
+            program.setFile(`components/SimpleScene.bs`, `
+                enum simplescenetypes
+                    hero
+                    intro
+                end enum
+            `);
+            await 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', async () => {
+            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
+            `);
+            await 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', async () => {
+            program.options.pruneEmptyCodeFiles = true;
+            program.setFile(`components/EmptyFile.brs`, '');
+            program.setFile(`components/SimpleScene.brs`, `
+                sub init()
+                    ? "Hello World"
+                end sub
+            `);
+            await 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');
+        });
+        it('includes script tags in self closing component', async () => {
+            await testTranspile((0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Comp" extends="Group" />
+            `, (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" />
+                </component>
+            `, 'none', 'components/Comp.xml');
         });
     });
     describe('Transform plugins', () => {
@@ -763,50 +888,52 @@ describe('XmlFile', () => {
             });
             program.plugins.add({
                 name: 'Transform plugins',
-                afterFileParse: (event) => validateXml(event.file)
+                onFileValidate: event => validateXml(event.file)
             });
-            return program.setFile('components/Cmp1.xml', testHelpers_spec_1.trim `
+            file = program.setFile('components/component.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
                 </component>
             `);
+            program.validate();
+            return file;
         }
         it('Calls XML file validation plugins', () => {
             const validateXml = sinon.spy();
             const file = parseFileWithPlugins(validateXml);
-            chai_1.expect(validateXml.callCount).to.equal(1);
-            chai_1.expect(validateXml.calledWith(file)).to.be.true;
+            (0, chai_config_spec_1.expect)(validateXml.callCount).to.be.greaterThan(0);
+            (0, chai_config_spec_1.expect)(validateXml.getCalls().flatMap(x => x.args)).to.include(file);
         });
     });
     it('plugin diagnostics work for xml files', () => {
         program.plugins.add({
             name: 'Xml diagnostic test',
-            afterFileParse: ({ file }) => {
-                if (file.srcPath.endsWith('.xml')) {
-                    file.addDiagnostics([{
-                            file: file,
+            afterProvideFile: (event) => {
+                for (const file of event.files) {
+                    if ((0, reflection_1.isXmlFile)(file)) {
+                        program.diagnostics.register({
                             message: 'Test diagnostic',
-                            range: vscode_languageserver_1.Range.create(0, 0, 0, 0),
+                            location: util_1.default.createLocationFromFileRange(file, vscode_languageserver_1.Range.create(0, 0, 0, 0)),
                             code: 9999
-                        }]);
+                        });
+                    }
                 }
             }
         });
-        program.setFile('components/comp.xml', testHelpers_spec_1.trim `
+        program.setFile('components/comp.xml', (0, testHelpers_spec_1.trim) `
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="Cmp1" extends="Scene">
             </component>
         `);
         program.validate();
-        chai_1.expect(program.getDiagnostics().map(x => ({ message: x.message, code: x.code }))).to.eql([{
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [{
                 message: 'Test diagnostic',
                 code: 9999
             }]);
     });
     describe('typedef', () => {
         it('loads d.bs files from parent scope', () => {
-            var _a;
-            program.setFile('components/ParentComponent.xml', testHelpers_spec_1.trim `
+            program.setFile('components/ParentComponent.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ParentComponent" extends="Scene">
                     <script uri="ParentComponent.brs" />
@@ -833,7 +960,7 @@ describe('XmlFile', () => {
                 sub Lib_log()
                 end sub
             `);
-            program.setFile('components/ChildComponent.xml', testHelpers_spec_1.trim `
+            program.setFile('components/ChildComponent.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildComponent" extends="ParentComponent">
                     <script uri="ChildComponent.bs" />
@@ -846,15 +973,15 @@ describe('XmlFile', () => {
                 end sub
             `);
             program.validate();
-            chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             const scope = program.getComponentScope('ChildComponent');
-            chai_1.expect(Object.keys(scope.namespaceLookup).sort()).to.eql([
+            (0, chai_config_spec_1.expect)([...scope.namespaceLookup.keys()].sort()).to.eql([
                 'lib',
                 'parent'
             ]);
         });
         it('loads `d.bs` files into scope', () => {
-            const xmlFile = program.setFile('components/Component1.xml', testHelpers_spec_1.trim `
+            const xmlFile = program.setFile('components/Component1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
                     <script uri="Component1.brs" />
@@ -864,9 +991,9 @@ describe('XmlFile', () => {
                 sub logInfo()
                 end sub
             `);
-            chai_1.expect(program.getScopesForFile(xmlFile)[0].getAllCallables().map(x => x.callable.name)).to.include('logInfo');
+            (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', () => {
+        it('does not include `d.bs` script during transpile', async () => {
             program.setFile('source/logger.d.bs', `
                 sub logInfo()
                 end sub
@@ -880,12 +1007,12 @@ describe('XmlFile', () => {
                 sub init()
                 end sub
             `);
-            testTranspile(testHelpers_spec_1.trim `
+            await 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" />
                 </component>
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
                     <script type="text/brightscript" uri="Component1.brs" />
@@ -895,7 +1022,7 @@ describe('XmlFile', () => {
             `, 'none', 'components/Component1.xml');
         });
         it('does not load .brs information into scope if related d.bs is in scope', () => {
-            const xmlFile = program.setFile('components/Component1.xml', testHelpers_spec_1.trim `
+            const xmlFile = program.setFile('components/Component1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
                     <script uri="Component1.brs" />
@@ -910,20 +1037,20 @@ describe('XmlFile', () => {
                 end sub
             `);
             let functionNames = scope.getAllCallables().map(x => x.callable.name);
-            chai_1.expect(functionNames).to.include('logInfo');
-            chai_1.expect(functionNames).to.include('logWarning');
+            (0, chai_config_spec_1.expect)(functionNames).to.include('logInfo');
+            (0, chai_config_spec_1.expect)(functionNames).to.include('logWarning');
             //load d.bs file, which should shadow out the .brs file
             program.setFile('components/Component1.d.bs', `
                 sub logError()
                 end sub
             `);
             functionNames = scope.getAllCallables().map(x => x.callable.name);
-            chai_1.expect(functionNames).to.include('logError');
-            chai_1.expect(functionNames).not.to.include('logInfo');
-            chai_1.expect(functionNames).not.to.include('logWarning');
+            (0, chai_config_spec_1.expect)(functionNames).to.include('logError');
+            (0, chai_config_spec_1.expect)(functionNames).not.to.include('logInfo');
+            (0, chai_config_spec_1.expect)(functionNames).not.to.include('logWarning');
         });
         it('updates xml scope when typedef disappears', () => {
-            const xmlFile = program.setFile('components/Component1.xml', testHelpers_spec_1.trim `
+            const xmlFile = program.setFile('components/Component1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
                     <script uri="Component1.brs" />
@@ -942,78 +1069,78 @@ describe('XmlFile', () => {
             `);
             program.validate();
             let functionNames = scope.getOwnCallables().map(x => x.callable.name);
-            chai_1.expect(functionNames).to.include('logTypedef');
-            chai_1.expect(functionNames).not.to.include('logBrs');
+            (0, chai_config_spec_1.expect)(functionNames).to.include('logTypedef');
+            (0, chai_config_spec_1.expect)(functionNames).not.to.include('logBrs');
             //remove the typdef file
             program.removeFile(typedef.srcPath);
             program.validate();
             functionNames = scope.getOwnCallables().map(x => x.callable.name);
-            chai_1.expect(functionNames).not.to.include('logTypedef');
-            chai_1.expect(functionNames).to.include('logBrs');
+            (0, chai_config_spec_1.expect)(functionNames).not.to.include('logTypedef');
+            (0, chai_config_spec_1.expect)(functionNames).to.include('logBrs');
         });
     });
     it('finds script imports for single-quoted script tags', () => {
         var _a;
-        const file = program.setFile('components/file.xml', testHelpers_spec_1.trim `
+        const file = program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="Cmp1" extends="Scene">
                 <script uri='SingleQuotedFile.brs' />
             </component>
         `);
-        chai_1.expect((_a = file.scriptTagImports[0]) === null || _a === void 0 ? void 0 : _a.text).to.eql('SingleQuotedFile.brs');
+        (0, chai_config_spec_1.expect)((_a = file.scriptTagImports[0]) === null || _a === void 0 ? void 0 : _a.text).to.eql('SingleQuotedFile.brs');
     });
     describe('commentFlags', () => {
         it('ignores warning from previous line comment', () => {
             //component without a name attribute
-            program.setFile('components/file.xml', testHelpers_spec_1.trim `
+            program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <!--bs:disable-next-line-->
                 <component>
                 </component>
             `);
             program.validate();
-            testHelpers_spec_1.expectZeroDiagnostics(program);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
-        it('ignores warning from previous line just for the specified code', () => {
+        it('ignores a specific diagnostic on next line', () => {
             //component without a name attribute
-            program.setFile('components/file.xml', testHelpers_spec_1.trim `
+            program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <!--bs:disable-next-line 1006-->
                 <component>
                 </component>
             `);
             program.validate();
-            chai_1.expect(program.getDiagnostics().map(x => x.message)).to.eql([
-                DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute().message
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute()
             ]);
         });
-        it('ignores warning from previous line comment', () => {
+        it('ignores all warnings from previous line comment', () => {
             //component without a name attribute
-            program.setFile('components/file.xml', testHelpers_spec_1.trim `
+            program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component> <!--bs:disable-line-->
                 </component>
             `);
             program.validate();
-            testHelpers_spec_1.expectZeroDiagnostics(program);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
         it('ignores warning from previous line just for the specified code', () => {
             //component without a name attribute
-            program.setFile('components/file.xml', testHelpers_spec_1.trim `
+            program.setFile('components/file.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
-                <component> <!--bs:disable-line 1006-->
+                <component name="ButtonCustom"> <!--bs:disable-line 1006-->
                 </component>
             `);
             program.validate();
-            chai_1.expect(program.getDiagnostics().map(x => x.message)).to.eql([
-                DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute().message
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute()
             ]);
         });
     });
     describe('duplicate components', () => {
         it('more gracefully handles multiple components with the same name', () => {
             program.setFile('components/comp1.brs', ``);
-            program.setFile('components/comp1.xml', testHelpers_spec_1.trim `
+            program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="comp1" extends="Group">
                     <script uri="comp1.brs" />
@@ -1021,44 +1148,44 @@ describe('XmlFile', () => {
             `);
             //add another component with the same name
             program.setFile('components/comp2.brs', ``);
-            program.setFile('components/comp2.xml', testHelpers_spec_1.trim `
+            program.setFile('components/comp2.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="comp1" extends="Group">
                     <script uri="comp2.brs" />
                 </component>
             `);
             program.validate();
-            chai_1.expect(program.getDiagnostics().map(x => x.message).sort()).to.eql([
-                DiagnosticMessages_1.DiagnosticMessages.duplicateComponentName('comp1').message,
-                DiagnosticMessages_1.DiagnosticMessages.duplicateComponentName('comp1').message
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.duplicateComponentName('comp1'),
+                DiagnosticMessages_1.DiagnosticMessages.duplicateComponentName('comp1')
             ]);
         });
         it('maintains consistent component selection', () => {
             //add comp2 first
-            const comp2 = program.setFile('components/comp2.xml', testHelpers_spec_1.trim `
+            const comp2 = program.setFile('components/comp2.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="comp1">
                 </component>
             `);
-            chai_1.expect(program.getComponent('comp1').file.pkgPath).to.equal(comp2.pkgPath);
+            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.destPath).to.equal(comp2.destPath);
             //add comp1. it should become the main component with this name
-            const comp1 = program.setFile('components/comp1.xml', testHelpers_spec_1.trim `
+            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>
             `);
-            chai_1.expect(program.getComponent('comp1').file.pkgPath).to.equal(comp1.pkgPath);
+            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.destPath).to.equal(comp1.destPath);
             //remove comp1, comp2 should be the primary again
-            program.removeFile(util_1.standardizePath `${rootDir}/components/comp1.xml`);
-            chai_1.expect(program.getComponent('comp1').file.pkgPath).to.equal(comp2.pkgPath);
+            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);
             //add comp3
-            program.setFile('components/comp3.xml', testHelpers_spec_1.trim `
+            program.setFile('components/comp3.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="comp1">
                 </component>
             `);
             //...the 2nd file should still be main
-            chai_1.expect(program.getComponent('comp1').file.pkgPath).to.equal(comp2.pkgPath);
+            (0, chai_config_spec_1.expect)(program.getComponent('comp1').file.destPath).to.equal(comp2.destPath);
         });
     });
 });