Updated the promises prefix and FileFactory to auto import it

rokucommunity · Jan 15, 2025 · 956efaa · 956efaa
1 parent 8497348
commit 956efaa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/bsc-plugin/package-lock.json b/bsc-plugin/package-lock.json
diff --git a/bsc-plugin/package.json b/bsc-plugin/package.json
@@ -36,7 +36,7 @@
     "dependencies": {
         "roku-debug": "^0.21.10",
         "roku-deploy": "^3.12.1",
-        "rooibospromises": "npm:@rokucommunity/promises@^0.5.0",
+        "rooibos_promises": "npm:@rokucommunity/promises@^0.5.0",
         "source-map": "^0.7.3",
         "undent": "^0.1.0",
         "vscode-languageserver": "~6.1.1",

diff --git a/bsc-plugin/src/lib/rooibos/FileFactory.ts b/bsc-plugin/src/lib/rooibos/FileFactory.ts
@@ -24,7 +24,7 @@ export class FileFactory {
         this.coverageComponentBrsTemplate = fs.readFileSync(path.join(this.frameworkSourcePath, '/source/rooibos/CodeCoverage.brs'), 'utf8');
     }
 
-    public addedSourceFrameworkFilePaths: string[] = [];
+    public sourceFilesToAutoImport: string[] = [];
     public addedFrameworkFiles: BscFile[] = [];
 
     public addFrameworkFiles(program: Program) {
@@ -43,10 +43,10 @@ export class FileFactory {
         });
 
         for (let filePath of globedFiles) {
-            if (/^source[/\\]rooibos[/\\]/g.test(filePath)) {
+            if (this.shouldAddFileToImportList(filePath)) {
                 // Save a list of all source files added to the program
                 // to be imported by node test components
-                this.addedSourceFrameworkFilePaths.push(filePath);
+                this.sourceFilesToAutoImport.push(filePath);
             }
             let sourcePath = path.resolve(this.frameworkSourcePath, filePath);
             let fileContents = fs.readFileSync(sourcePath, 'utf8').toString();
@@ -67,7 +67,7 @@ export class FileFactory {
 
     public createTestXML(name: string, baseName: string, suite?: TestSuite): string {
         let scriptImports = [];
-        for (let filePath of this.addedSourceFrameworkFilePaths) {
+        for (let filePath of this.sourceFilesToAutoImport) {
             scriptImports.push(`<script type="text/brighterscript" uri="pkg:/${filePath}" />`);
         }
 
@@ -117,6 +117,16 @@ export class FileFactory {
         return result !== undefined;
     }
 
+    private shouldAddFileToImportList(destFilePath): boolean {
+        const pathDetails = path.parse(destFilePath);
+        if (pathDetails.dir === 'source' || pathDetails.dir.startsWith('source\\') || pathDetails.dir.startsWith('source/')) {
+            if (pathDetails.ext === '.brs' || (pathDetails.ext === '.bs' && !pathDetails.name.endsWith('.d'))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public addFile(program, projectPath: string, contents: string) {
         try {
             const file = program.setFile({