brighterscript 0.42.0 → 0.45.0

package/dist/files/XmlFile.spec.js

@@ -13,6 +13,7 @@ const util_1 = require("../util");
 const testHelpers_spec_1 = require("../testHelpers.spec");
 const ProgramBuilder_1 = require("../ProgramBuilder");
 const Logger_1 = require("../Logger");
+const reflection_1 = require("../astUtils/reflection");
 describe('XmlFile', () => {
     const tempDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp`;
     const rootDir = (0, util_1.standardizePath) `${tempDir}/rootDir`;
@@ -36,17 +37,18 @@ describe('XmlFile', () => {
     describe('parse', () => {
         it('allows modifying the parsed XML model', () => {
             const expected = 'OtherName';
-            file = new XmlFile_1.XmlFile('abs', 'rel', program);
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
-                afterFileParse: () => {
-                    file.parser.ast.root.attributes[0].value.text = expected;
+                afterFileParse: (file) => {
+                    var _a, _b, _c;
+                    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;
+                    }
                 }
             });
-            file.parse((0, 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>
             `);
             (0, chai_1.expect)(file.componentName.text).to.equal(expected);
@@ -81,7 +83,7 @@ describe('XmlFile', () => {
             `);
         });
         it('supports importing BrighterScript files', () => {
-            file = program.addOrReplaceFile({ src: `${rootDir}/components/custom.xml`, dest: 'components/custom.xml' }, (0, testHelpers_spec_1.trim) `
+            file = program.setFile({ src: `${rootDir}/components/custom.xml`, dest: '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" />
@@ -91,7 +93,7 @@ describe('XmlFile', () => {
         });
         it('does not include commented-out script imports', () => {
             var _a, _b;
-            file = program.addOrReplaceFile({ src: `${rootDir}/components/custom.xml`, dest: 'components/custom.xml' }, (0, testHelpers_spec_1.trim) `
+            file = program.setFile({ src: `${rootDir}/components/custom.xml`, dest: '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" />
@@ -165,20 +167,21 @@ describe('XmlFile', () => {
             (0, 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) }));
         });
         it('Adds error when no component is declared in xml', () => {
-            file = new XmlFile_1.XmlFile('abs', 'rel', program);
-            file.parse('<script type="text/brightscript" uri="ChildScene.brs" />');
-            (0, chai_1.expect)(file.diagnostics).to.be.lengthOf(2);
-            (0, 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) }));
-            (0, chai_1.expect)(file.diagnostics[1]).to.deep.include(DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingComponentDeclaration());
+            program.setFile('components/comp.xml', '<script type="text/brightscript" uri="ChildScene.brs" />');
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlUnexpectedTag('script')), { 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 = new XmlFile_1.XmlFile('abs', 'rel', program);
-            file.parse((0, 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();
             (0, chai_1.expect)(file.diagnostics).to.be.lengthOf(1);
             (0, chai_1.expect)(file.diagnostics[0]).to.deep.include({
                 message: DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingNameAttribute().message,
@@ -186,12 +189,12 @@ describe('XmlFile', () => {
             });
         });
         it('catches xml parse errors', () => {
-            file = new XmlFile_1.XmlFile('abs', 'rel', program);
-            file.parse((0, 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();
             (0, chai_1.expect)(file.diagnostics).to.be.lengthOf(2);
             (0, chai_1.expect)(file.diagnostics[0].code).to.equal(DiagnosticMessages_1.DiagnosticMessages.xmlGenericParseError('').code); //unexpected character '1'
             (0, chai_1.expect)(file.diagnostics[1]).to.deep.include({
@@ -227,7 +230,7 @@ describe('XmlFile', () => {
             }
         });
         it('resolves relative paths', () => {
-            file = program.addOrReplaceFile({
+            file = program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: 'components/comp1.xml'
             }, (0, testHelpers_spec_1.trim) `
@@ -244,7 +247,7 @@ describe('XmlFile', () => {
         });
         it('finds correct position for empty uri in script tag', () => {
             var _a;
-            file = program.addOrReplaceFile({
+            file = program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: 'components/comp1.xml'
             }, (0, testHelpers_spec_1.trim) `
@@ -259,7 +262,7 @@ describe('XmlFile', () => {
     });
     describe('doesReferenceFile', () => {
         it('compares case insensitive', () => {
-            let xmlFile = program.addOrReplaceFile({
+            let xmlFile = program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: 'components/comp1.xml'
             }, (0, testHelpers_spec_1.trim) `
@@ -268,7 +271,7 @@ describe('XmlFile', () => {
                     <script type="text/brightscript" uri="HeroGrid.brs" />
                 </component>
             `);
-            let brsFile = program.addOrReplaceFile({
+            let brsFile = program.setFile({
                 src: `${rootDir}/components/HEROGRID.brs`,
                 dest: `components/HEROGRID.brs`
             }, ``);
@@ -277,47 +280,49 @@ describe('XmlFile', () => {
     });
     describe('autoImportComponentScript', () => {
         it('is not enabled by default', () => {
-            program.addOrReplaceFile({ src: `${rootDir}/components/comp1.xml`, dest: 'components/comp1.xml' }, (0, testHelpers_spec_1.trim) `
+            program.setFile({ src: `${rootDir}/components/comp1.xml`, dest: '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.addOrReplaceFile({ src: `${rootDir}/components/lib.brs`, dest: 'components/lib.brs' }, `
+            program.setFile({ src: `${rootDir}/components/lib.brs`, dest: 'components/lib.brs' }, `
                 function libFunc()
                 end function
             `);
-            program.addOrReplaceFile({ src: `${rootDir}/components/comp1.bs`, dest: 'components/comp1.bs' }, `
+            program.setFile({ src: `${rootDir}/components/comp1.bs`, dest: 'components/comp1.bs' }, `
                 function init()
                     libFunc()
                 end function
             `);
             program.validate();
-            (0, 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,
                 autoImportComponentScript: true
             });
-            program.addOrReplaceFile({ src: `${rootDir}/components/comp1.xml`, dest: 'components/comp1.xml' }, (0, testHelpers_spec_1.trim) `
+            program.setFile({ src: `${rootDir}/components/comp1.xml`, dest: '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.addOrReplaceFile({ src: `${rootDir}/components/lib.brs`, dest: 'components/lib.brs' }, `
+            program.setFile({ src: `${rootDir}/components/lib.brs`, dest: 'components/lib.brs' }, `
                 function libFunc()
                 end function
             `);
-            program.addOrReplaceFile({ src: `${rootDir}/components/comp1.bs`, dest: 'components/comp1.bs' }, `
+            program.setFile({ src: `${rootDir}/components/comp1.bs`, dest: 'components/comp1.bs' }, `
                 function init()
                     libFunc()
                 end function
             `);
             program.validate();
             //there should be no errors
-            (0, chai_1.expect)(program.getDiagnostics().map(x => x.message)[0]).not.to.exist;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
     });
     describe('getCompletions', () => {
@@ -340,13 +345,13 @@ describe('XmlFile', () => {
             });
         });
         it('returns empty set when out of range', () => {
-            program.addOrReplaceFile({ src: `${rootDir}/components/Component1.brs`, dest: 'components/component1.brs' }, ``);
+            program.setFile({ src: `${rootDir}/components/Component1.brs`, dest: 'components/component1.brs' }, ``);
             (0, 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.addOrReplaceFile({ src: `${rootDir}/components/Component1.brs`, dest: 'components/component1.brs' }, ``);
-            let xmlFile = program.addOrReplaceFile({ src: `${rootDir}/components/Component1.xml`, dest: 'components/component1.xml' }, (0, testHelpers_spec_1.trim) `
+            program.setFile({ src: `${rootDir}/components/Component1.brs`, dest: 'components/component1.brs' }, ``);
+            let xmlFile = program.setFile({ src: `${rootDir}/components/Component1.xml`, dest: '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" />
@@ -357,7 +362,7 @@ describe('XmlFile', () => {
     });
     describe('getAllDependencies', () => {
         it('returns own imports', () => {
-            file = program.addOrReplaceFile('components/comp1.xml', (0, 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" />
@@ -370,7 +375,7 @@ describe('XmlFile', () => {
         });
     });
     it('invalidates dependent scopes on change', () => {
-        let xmlFile = program.addOrReplaceFile({
+        let xmlFile = program.setFile({
             src: `${rootDir}/components/comp1.xml`,
             dest: `components/comp1.xml`
         }, (0, testHelpers_spec_1.trim) `
@@ -384,7 +389,7 @@ describe('XmlFile', () => {
         //scope should be validated
         (0, chai_1.expect)(scope.isValidated);
         //add lib1
-        program.addOrReplaceFile({
+        program.setFile({
             src: `${rootDir}/source/lib.bs`,
             dest: `source/lib.bs`
         }, ``);
@@ -393,7 +398,7 @@ describe('XmlFile', () => {
         program.validate();
         (0, chai_1.expect)(scope.isValidated).to.be.true;
         //update lib1 to include an import
-        program.addOrReplaceFile({
+        program.setFile({
             src: `${rootDir}/source/lib.bs`,
             dest: `source/lib.bs`
         }, `
@@ -404,7 +409,7 @@ describe('XmlFile', () => {
         program.validate();
         (0, chai_1.expect)(scope.isValidated).to.be.true;
         //add the lib2 imported from lib
-        program.addOrReplaceFile({
+        program.setFile({
             src: `${rootDir}/source/lib2.bs`,
             dest: `source/lib2.bs`
         }, ``);
@@ -416,7 +421,7 @@ describe('XmlFile', () => {
         (0, chai_1.expect)(scope.isValidated).to.be.false;
     });
     it('does not invalidate unrelated scopes on change', () => {
-        let xmlFile1 = program.addOrReplaceFile({
+        let xmlFile1 = program.setFile({
             src: `${rootDir}/components/comp1.xml`,
             dest: `components/comp1.xml`
         }, (0, testHelpers_spec_1.trim) `
@@ -425,7 +430,7 @@ describe('XmlFile', () => {
                 <script type="text/brightscript" uri="pkg:/source/lib.brs" />
             </component>
         `);
-        let xmlFile2 = program.addOrReplaceFile({
+        let xmlFile2 = program.setFile({
             src: `${rootDir}/components/comp2.xml`,
             dest: `components/comp2.xml`
         }, (0, testHelpers_spec_1.trim) `
@@ -438,7 +443,7 @@ describe('XmlFile', () => {
         (0, chai_1.expect)(program.getScopesForFile(xmlFile1)[0].isValidated).to.be.true;
         (0, chai_1.expect)(program.getScopesForFile(xmlFile2)[0].isValidated).to.be.true;
         //add the lib file
-        program.addOrReplaceFile({
+        program.setFile({
             src: `${rootDir}/source/lib.brs`,
             dest: `source/lib.brs`
         }, ``);
@@ -452,12 +457,11 @@ describe('XmlFile', () => {
                 range: undefined
             }];
         file.addDiagnostics(expected);
-        const actual = file.getDiagnostics();
-        (0, chai_1.expect)(actual).deep.equal(expected);
+        (0, testHelpers_spec_1.expectDiagnostics)(file, expected);
     });
     describe('component extends', () => {
         it('works for single-line', () => {
-            file = program.addOrReplaceFile({
+            file = program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
             }, (0, testHelpers_spec_1.trim) `
@@ -468,7 +472,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(file.parentComponentName.range).to.eql(vscode_languageserver_1.Range.create(1, 38, 1, 47));
         });
         it('works for multi-line', () => {
-            file = program.addOrReplaceFile({
+            file = program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
             }, (0, testHelpers_spec_1.trim) `
@@ -480,7 +484,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(file.parentComponentName.range).to.eql(vscode_languageserver_1.Range.create(2, 13, 2, 22));
         });
         it('does not throw when unable to find extends', () => {
-            file = program.addOrReplaceFile({
+            file = program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
             }, (0, testHelpers_spec_1.trim) `
@@ -491,7 +495,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(file.parentComponentName).to.not.exist;
         });
         it('adds warning when no "extends" attribute is found', () => {
-            file = program.addOrReplaceFile({
+            program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
             }, (0, testHelpers_spec_1.trim) `
@@ -499,23 +503,22 @@ describe('XmlFile', () => {
                     <component name="ChildScene">
                     </component>
                 `);
-            (0, chai_1.expect)(file.getDiagnostics()[0]).to.include({
-                severity: vscode_languageserver_1.DiagnosticSeverity.Warning,
-                message: DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute().message
-            });
+            program.validate();
+            (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
         });
-        program.addOrReplaceFile({
+        program.setFile({
             src: `${rootDir}/components/SimpleScene.bs`,
             dest: `components/SimpleScene.bs`
         }, '');
-        program.addOrReplaceFile({
+        program.setFile({
             src: `${rootDir}/components/SimpleScene.xml`,
             dest: `components/SimpleScene.xml`
         }, (0, testHelpers_spec_1.trim) `
@@ -525,7 +528,9 @@ describe('XmlFile', () => {
             </component>
         `);
         program.validate();
-        (0, 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('supports instantresume <customization> elements', async () => {
@@ -568,7 +573,7 @@ describe('XmlFile', () => {
                     file.needsTranspiled = true;
                 }
             });
-            const file = program.addOrReplaceFile('components/file.xml', (0, 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>
@@ -601,8 +606,8 @@ describe('XmlFile', () => {
             `, 'none', 'components/child.xml');
         });
         it('does not include bslib script if already there from ropm', () => {
-            program.addOrReplaceFile('source/roku_modules/bslib/bslib.brs', ``);
-            program.addOrReplaceFile('source/lib.bs', ``);
+            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((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -619,7 +624,7 @@ describe('XmlFile', () => {
             `, 'none', 'components/child.xml');
         });
         it('does not transpile xml file when bslib script is already present', () => {
-            const file = program.addOrReplaceFile('components/comp.xml', (0, 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" />
@@ -633,8 +638,8 @@ describe('XmlFile', () => {
          * 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.addOrReplaceFile('components/SimpleScene.bs', ``);
-            program.addOrReplaceFile(`components/SimpleScene.xml`, (0, 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/brightscript" uri="SimpleScene.bs" />
@@ -655,7 +660,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(fsExtra.readFileSync(`${stagingDir}/components/SimpleScene.xml`).toString()).to.eql(expected);
         });
         it('keeps all content of the XML', () => {
-            program.addOrReplaceFile(`components/SimpleScene.bs`, `
+            program.setFile(`components/SimpleScene.bs`, `
                 sub b()
                 end sub
             `);
@@ -695,10 +700,10 @@ describe('XmlFile', () => {
             `, 'none', 'components/SimpleScene.xml');
         });
         it('changes file extensions from bs to brs', () => {
-            program.addOrReplaceFile(`components/SimpleScene.bs`, `
+            program.setFile(`components/SimpleScene.bs`, `
                 import "pkg:/source/lib.bs"
             `);
-            program.addOrReplaceFile('source/lib.bs', ``);
+            program.setFile('source/lib.bs', ``);
             testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
@@ -714,7 +719,7 @@ describe('XmlFile', () => {
             `, 'none', 'components/SimpleScene.xml');
         });
         it('does not fail on missing script type', () => {
-            program.addOrReplaceFile('components/SimpleScene.brs', '');
+            program.setFile('components/SimpleScene.brs', '');
             testTranspile((0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
@@ -729,7 +734,7 @@ describe('XmlFile', () => {
             `, null, 'components/comp.xml');
         });
         it('returns the XML unmodified if needsTranspiled is false', () => {
-            let file = program.addOrReplaceFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
+            let file = program.setFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <!-- should stay as-is -->
                 <component name="SimpleScene" extends="Scene" >
@@ -747,7 +752,7 @@ describe('XmlFile', () => {
             `);
         });
         it('needsTranspiled is false by default', () => {
-            let file = program.addOrReplaceFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
+            let file = program.setFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene" >
                 </component>
@@ -755,7 +760,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(file.needsTranspiled).to.be.false;
         });
         it('needsTranspiled is true if an import is brighterscript', () => {
-            let file = program.addOrReplaceFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
+            let file = program.setFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: '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"/>
@@ -765,7 +770,7 @@ describe('XmlFile', () => {
         });
         it('simple source mapping includes sourcemap reference', () => {
             program.options.sourceMap = true;
-            let file = program.addOrReplaceFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
+            let file = program.setFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                 </component>
@@ -777,7 +782,7 @@ describe('XmlFile', () => {
         });
         it('AST-based source mapping includes sourcemap reference', () => {
             program.options.sourceMap = true;
-            let file = program.addOrReplaceFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
+            let file = program.setFile({ src: (0, util_1.standardizePath) `${rootDir}/components/SimpleScene.xml`, dest: 'components/SimpleScene.xml' }, (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                 </component>
@@ -793,23 +798,23 @@ describe('XmlFile', () => {
             const program = new Program_1.Program({
                 rootDir: rootDir
             });
-            file = new XmlFile_1.XmlFile('abs', 'rel', program);
             program.plugins.add({
                 name: 'Transform plugins',
-                afterFileParse: () => validateXml(file)
+                afterFileParse: file => validateXml(file)
             });
-            file.parse((0, 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);
-            (0, chai_1.expect)(validateXml.callCount).to.equal(1);
-            (0, chai_1.expect)(validateXml.calledWith(file)).to.be.true;
+            (0, chai_1.expect)(validateXml.callCount).to.be.greaterThan(0);
+            (0, chai_1.expect)(validateXml.getCalls().flatMap(x => x.args)).to.include(file);
         });
     });
     it('plugin diagnostics work for xml files', () => {
@@ -826,61 +831,60 @@ describe('XmlFile', () => {
                 }
             }
         });
-        program.addOrReplaceFile('components/comp.xml', (0, 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();
-        (0, 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.addOrReplaceFile('components/ParentComponent.xml', (0, 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" />
                 </component>
             `);
-            program.addOrReplaceFile('components/ParentComponent.d.bs', `
+            program.setFile('components/ParentComponent.d.bs', `
                 import "Lib.brs"
                 namespace Parent
                     sub log()
                     end sub
                 end namespace
             `);
-            program.addOrReplaceFile('components/ParentComponent.brs', `
+            program.setFile('components/ParentComponent.brs', `
                 sub Parent_log()
                 end sub
             `);
-            program.addOrReplaceFile('components/Lib.d.bs', `
+            program.setFile('components/Lib.d.bs', `
                 namespace Lib
                     sub log()
                     end sub
                 end namespace
             `);
-            program.addOrReplaceFile('components/Lib.brs', `
+            program.setFile('components/Lib.brs', `
                 sub Lib_log()
                 end sub
             `);
-            program.addOrReplaceFile('components/ChildComponent.xml', (0, 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" />
                 </component>
             `);
-            program.addOrReplaceFile('components/ChildComponent.bs', `
+            program.setFile('components/ChildComponent.bs', `
                 sub init()
                     Parent.log()
                     Lib.log()
                 end sub
             `);
             program.validate();
-            (0, 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');
             (0, chai_1.expect)([...scope.namespaceLookup.keys()].sort()).to.eql([
                 'lib',
@@ -888,28 +892,28 @@ describe('XmlFile', () => {
             ]);
         });
         it('loads `d.bs` files into scope', () => {
-            const xmlFile = program.addOrReplaceFile('components/Component1.xml', (0, 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" />
                 </component>
             `);
-            program.addOrReplaceFile('components/Component1.d.bs', `
+            program.setFile('components/Component1.d.bs', `
                 sub logInfo()
                 end sub
             `);
             (0, chai_1.expect)(program.getScopesForFile(xmlFile)[0].getAllCallables().map(x => x.callable.name)).to.include('logInfo');
         });
         it('does not include `d.bs` script during transpile', () => {
-            program.addOrReplaceFile('source/logger.d.bs', `
+            program.setFile('source/logger.d.bs', `
                 sub logInfo()
                 end sub
             `);
-            program.addOrReplaceFile('source/logger.brs', `
+            program.setFile('source/logger.brs', `
                 sub logInfo()
                 end sub
             `);
-            program.addOrReplaceFile('components/Component1.bs', `
+            program.setFile('components/Component1.bs', `
                 import "pkg:/source/logger.brs"
                 sub init()
                 end sub
@@ -929,7 +933,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.addOrReplaceFile('components/Component1.xml', (0, 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" />
@@ -937,7 +941,7 @@ describe('XmlFile', () => {
             `);
             const scope = program.getScopesForFile(xmlFile)[0];
             //load brs file
-            program.addOrReplaceFile('components/Component1.brs', `
+            program.setFile('components/Component1.brs', `
                 sub logInfo()
                 end sub
                 sub logWarning()
@@ -947,7 +951,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(functionNames).to.include('logInfo');
             (0, chai_1.expect)(functionNames).to.include('logWarning');
             //load d.bs file, which should shadow out the .brs file
-            program.addOrReplaceFile('components/Component1.d.bs', `
+            program.setFile('components/Component1.d.bs', `
                 sub logError()
                 end sub
             `);
@@ -957,7 +961,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(functionNames).not.to.include('logWarning');
         });
         it('updates xml scope when typedef disappears', () => {
-            const xmlFile = program.addOrReplaceFile('components/Component1.xml', (0, 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" />
@@ -965,12 +969,12 @@ describe('XmlFile', () => {
             `);
             const scope = program.getScopesForFile(xmlFile)[0];
             //load brs file
-            program.addOrReplaceFile('components/Component1.brs', `
+            program.setFile('components/Component1.brs', `
                 sub logBrs()
                 end sub
             `);
             //load d.bs file, which should shadow out the .brs file
-            const typedef = program.addOrReplaceFile('components/Component1.d.bs', `
+            const typedef = program.setFile('components/Component1.d.bs', `
                 sub logTypedef()
                 end sub
             `);
@@ -988,7 +992,7 @@ describe('XmlFile', () => {
     });
     it('finds script imports for single-quoted script tags', () => {
         var _a;
-        const file = program.addOrReplaceFile('components/file.xml', (0, 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' />
@@ -999,7 +1003,7 @@ describe('XmlFile', () => {
     describe('commentFlags', () => {
         it('ignores warning from previous line comment', () => {
             //component without a name attribute
-            program.addOrReplaceFile('components/file.xml', (0, 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>
@@ -1010,20 +1014,20 @@ describe('XmlFile', () => {
         });
         it('ignores warning from previous line just for the specified code', () => {
             //component without a name attribute
-            program.addOrReplaceFile('components/file.xml', (0, 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();
-            (0, 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', () => {
             //component without a name attribute
-            program.addOrReplaceFile('components/file.xml', (0, 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>
@@ -1033,50 +1037,50 @@ describe('XmlFile', () => {
         });
         it('ignores warning from previous line just for the specified code', () => {
             //component without a name attribute
-            program.addOrReplaceFile('components/file.xml', (0, 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>
             `);
             program.validate();
-            (0, 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.addOrReplaceFile('components/comp1.brs', ``);
-            program.addOrReplaceFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
+            program.setFile('components/comp1.brs', ``);
+            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" />
                 </component>
             `);
             //add another component with the same name
-            program.addOrReplaceFile('components/comp2.brs', ``);
-            program.addOrReplaceFile('components/comp2.xml', (0, testHelpers_spec_1.trim) `
+            program.setFile('components/comp2.brs', ``);
+            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();
-            (0, 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.addOrReplaceFile('components/comp2.xml', (0, 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>
             `);
             (0, chai_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.addOrReplaceFile('components/comp1.xml', (0, 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>
@@ -1086,7 +1090,7 @@ describe('XmlFile', () => {
             program.removeFile((0, util_1.standardizePath) `${rootDir}/components/comp1.xml`);
             (0, chai_1.expect)(program.getComponent('comp1').file.pkgPath).to.equal(comp2.pkgPath);
             //add comp3
-            program.addOrReplaceFile('components/comp3.xml', (0, 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>