brighterscript 0.41.2 → 1.0.0-alpha.12

package/dist/files/XmlFile.spec.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
-const path = require("path");
 const sinonImport = require("sinon");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const fsExtra = require("fs-extra");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
 const Program_1 = require("../Program");
-const BrsFile_1 = require("./BrsFile");
 const XmlFile_1 = require("./XmlFile");
 const util_1 = require("../util");
 const testHelpers_spec_1 = require("../testHelpers.spec");
@@ -34,14 +32,13 @@ 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: (event) => {
+                    event.file.parser.ast.root.attributes[0].tokens.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" />
@@ -54,13 +51,13 @@ describe('XmlFile', () => {
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
                 afterFileParse: () => {
-                    let child = file.parser.ast.component.children.children[0];
+                    let child = file.parser.ast.component.children.childNodes[0];
                     (0, chai_1.expect)(child.attributes).to.have.lengthOf(4);
-                    child.setAttribute('text', undefined);
-                    (0, chai_1.expect)(child.getAttribute('id').value.text).to.equal('one');
+                    child.setAttributeValue('text', undefined);
+                    (0, chai_1.expect)(child.id).to.equal('one');
                     (0, chai_1.expect)(child.attributes).to.have.lengthOf(3);
-                    child.setAttribute('text3', undefined);
-                    (0, chai_1.expect)(child.getAttribute('id').value.text).to.equal('one');
+                    child.setAttributeValue('text3', undefined);
+                    (0, chai_1.expect)(child.id).to.equal('one');
                     (0, chai_1.expect)(child.attributes).to.have.lengthOf(2);
                 }
             });
@@ -79,17 +76,17 @@ 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" />
                 </component>
             `);
-            (0, chai_1.expect)(file.scriptTagImports.map(x => x.pkgPath)[0]).to.equal((0, util_1.standardizePath) `components/ChildScene.bs`);
+            (0, chai_1.expect)(file.scriptTagImports.map(x => x.pkgPath)[0]).to.equal('pkg:/components/ChildScene.bs');
         });
         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" />
@@ -98,7 +95,7 @@ describe('XmlFile', () => {
                     -->
                 </component>
             `);
-            (0, 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((0, util_1.standardizePath) `components/ChildScene.brs`);
+            (0, 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');
         });
         it('finds scripts when more than one per line', () => {
             file = new XmlFile_1.XmlFile('abs', 'rel', program);
@@ -163,20 +160,20 @@ 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" />');
+            file = program.setFile('components/file.xml', '<script type="text/brightscript" uri="ChildScene.brs" />');
+            program.validate();
             (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());
         });
         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/ParentScene.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,
@@ -184,12 +181,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/ParentScene.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({
@@ -209,7 +206,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(file.scriptTagImports[0]).to.deep.include({
                 sourceFile: file,
                 text: 'pkg:/components/cmp1.brs',
-                pkgPath: `components${path.sep}cmp1.brs`,
+                pkgPath: `pkg:/components/cmp1.brs`,
                 filePathRange: vscode_languageserver_1.Range.create(2, 42, 2, 66)
             });
         });
@@ -225,7 +222,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) `
@@ -237,12 +234,12 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(file.scriptTagImports.length).to.equal(1);
             (0, chai_1.expect)(file.scriptTagImports[0]).to.deep.include({
                 text: 'cmp1.brs',
-                pkgPath: `components${path.sep}cmp1.brs`
+                pkgPath: `pkg:/components/cmp1.brs`
             });
         });
         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) `
@@ -257,7 +254,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) `
@@ -266,7 +263,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`
             }, ``);
@@ -275,17 +272,17 @@ 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
@@ -298,17 +295,17 @@ describe('XmlFile', () => {
                 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
@@ -320,11 +317,14 @@ describe('XmlFile', () => {
     });
     describe('getCompletions', () => {
         it('formats completion paths with proper slashes', () => {
-            let scriptPath = (0, util_1.standardizePath) `C:/app/components/component1/component1.brs`;
-            program.files[scriptPath] = new BrsFile_1.BrsFile(scriptPath, (0, util_1.standardizePath) `components/component1/component1.brs`, program);
-            let xmlFile = new XmlFile_1.XmlFile((0, util_1.standardizePath) `${rootDir}/components/component1/component1.xml`, (0, util_1.standardizePath) `components/component1/component1.xml`, program);
+            program.setFile('pkg:/components/component1/component1.brs', '');
+            const xmlFile = program.setFile('components/component1/component1.xml', (0, testHelpers_spec_1.trim) `
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Component1" extends="Group">
+                </component
+            `);
             xmlFile.parser.references.scriptTagImports.push({
-                pkgPath: (0, util_1.standardizePath) `components/component1/component1.brs`,
+                pkgPath: 'pkg:/components/component1/component1.brs',
                 text: 'component1.brs',
                 filePathRange: vscode_languageserver_1.Range.create(1, 1, 1, 1)
             });
@@ -338,37 +338,37 @@ 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" />
                 </component>
             `);
-            (0, chai_1.expect)(program.getCompletions(xmlFile.pathAbsolute, vscode_languageserver_1.Position.create(1, 1))).to.be.empty;
+            (0, chai_1.expect)(program.getCompletions(xmlFile.srcPath, vscode_languageserver_1.Position.create(1, 1))).to.be.empty;
         });
     });
     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" />
                 </component>
             `);
             (0, chai_1.expect)(file.getOwnDependencies().sort()).to.eql([
-                (0, util_1.standardizePath) `source/lib.brs`,
-                (0, util_1.standardizePath) `source/lib.d.bs`
+                'pkg:/source/lib.brs',
+                'pkg:/source/lib.d.bs'
             ]);
         });
     });
     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) `
@@ -382,7 +382,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`
         }, ``);
@@ -391,7 +391,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`
         }, `
@@ -402,7 +402,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`
         }, ``);
@@ -414,7 +414,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) `
@@ -423,7 +423,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) `
@@ -436,7 +436,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`
         }, ``);
@@ -455,7 +455,7 @@ describe('XmlFile', () => {
     });
     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) `
@@ -466,7 +466,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) `
@@ -478,7 +478,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) `
@@ -489,7 +489,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(file.parentComponentName).to.not.exist;
         });
         it('adds warning when no "extends" attribute is found', () => {
-            file = program.addOrReplaceFile({
+            file = program.setFile({
                 src: `${rootDir}/components/comp1.xml`,
                 dest: `components/comp1.xml`
             }, (0, testHelpers_spec_1.trim) `
@@ -497,6 +497,7 @@ describe('XmlFile', () => {
                     <component name="ChildScene">
                     </component>
                 `);
+            program.validate();
             (0, chai_1.expect)(file.getDiagnostics()[0]).to.include({
                 severity: vscode_languageserver_1.DiagnosticSeverity.Warning,
                 message: DiagnosticMessages_1.DiagnosticMessages.xmlComponentMissingExtendsAttribute().message
@@ -509,11 +510,11 @@ describe('XmlFile', () => {
             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) `
@@ -529,12 +530,12 @@ describe('XmlFile', () => {
         it(`honors the 'needsTranspiled' flag when set in 'afterFileParse'`, () => {
             program.plugins.add({
                 name: 'test',
-                afterFileParse: (file) => {
+                afterFileParse: (event) => {
                     //enable transpile for every file
-                    file.needsTranspiled = true;
+                    event.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>
@@ -567,8 +568,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" ?>
@@ -585,7 +586,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" />
@@ -599,8 +600,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" />
@@ -621,7 +622,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
             `);
@@ -651,20 +652,20 @@ describe('XmlFile', () => {
                         <function name="b" />
                     </interface>
                     <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>
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 </component>
             `, '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">
@@ -680,7 +681,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">
@@ -695,7 +696,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('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <!-- should stay as-is -->
                 <component name="SimpleScene" extends="Scene" >
@@ -713,7 +714,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('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene" >
                 </component>
@@ -721,17 +722,18 @@ 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('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();
             (0, chai_1.expect)(file.needsTranspiled).to.be.true;
         });
         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('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                 </component>
@@ -743,7 +745,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('components/SimpleScene.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                 </component>
@@ -759,17 +761,15 @@ 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: (event) => validateXml(event.file)
             });
-            file.parse((0, testHelpers_spec_1.trim) `
+            return program.setFile('components/Cmp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
                 </component>
             `);
-            return file;
         }
         it('Calls XML file validation plugins', () => {
             const validateXml = sinon.spy();
@@ -781,8 +781,8 @@ describe('XmlFile', () => {
     it('plugin diagnostics work for xml files', () => {
         program.plugins.add({
             name: 'Xml diagnostic test',
-            afterFileParse: (file) => {
-                if (file.pathAbsolute.endsWith('.xml')) {
+            afterFileParse: ({ file }) => {
+                if (file.srcPath.endsWith('.xml')) {
                     file.addDiagnostics([{
                             file: file,
                             message: 'Test diagnostic',
@@ -792,7 +792,7 @@ 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>
@@ -806,40 +806,40 @@ describe('XmlFile', () => {
     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()
@@ -854,28 +854,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
@@ -895,7 +895,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" />
@@ -903,7 +903,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()
@@ -913,7 +913,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
             `);
@@ -923,7 +923,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" />
@@ -931,12 +931,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
             `);
@@ -945,7 +945,7 @@ describe('XmlFile', () => {
             (0, chai_1.expect)(functionNames).to.include('logTypedef');
             (0, chai_1.expect)(functionNames).not.to.include('logBrs');
             //remove the typdef file
-            program.removeFile(typedef.pathAbsolute);
+            program.removeFile(typedef.srcPath);
             program.validate();
             functionNames = scope.getOwnCallables().map(x => x.callable.name);
             (0, chai_1.expect)(functionNames).not.to.include('logTypedef');
@@ -954,7 +954,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' />
@@ -965,7 +965,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>
@@ -976,7 +976,7 @@ 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>
@@ -989,7 +989,7 @@ describe('XmlFile', () => {
         });
         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>
@@ -999,7 +999,7 @@ 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>
@@ -1012,16 +1012,16 @@ describe('XmlFile', () => {
     });
     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" />
@@ -1035,14 +1035,14 @@ describe('XmlFile', () => {
         });
         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>
@@ -1052,7 +1052,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>