Merge branch 'master' of github.com:georgejecook/rooibos

rokucommunity · Feb 21, 2023 · ac533d7 · ac533d7
2 parents 4889580 + c2e5b30
commit ac533d7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/bsc-plugin/package.json b/bsc-plugin/package.json
@@ -110,4 +110,4 @@
             "ts"
         ]
     }
-}
+}
diff --git a/bsc-plugin/src/lib/rooibos/RooibosSession.ts b/bsc-plugin/src/lib/rooibos/RooibosSession.ts
@@ -9,7 +9,7 @@ import { TestSuiteBuilder } from './TestSuiteBuilder';
 import { RawCodeStatement } from './RawCodeStatement';
 import type { FileFactory } from './FileFactory';
 import type { TestSuite } from './TestSuite';
-import { diagnosticErrorNoMainFound as diagnosticWarnNoMainFound } from '../utils/Diagnostics';
+import { diagnosticErrorNoMainFound as diagnosticWarnNoMainFound, diagnosticNoStagingDir } from '../utils/Diagnostics';
 import undent from 'undent';
 import { BrsTranspileState } from 'brighterscript/dist/parser/BrsTranspileState';
 import * as fsExtra from 'fs-extra';
@@ -76,8 +76,14 @@ export class RooibosSession {
         }
         if (!mainFunction) {
             diagnosticWarnNoMainFound(files[0]);
-            const filePath = path.join(this._builder.options.stagingDir, 'source/rooibosMain.brs');
-            fsExtra.writeFileSync(filePath, `function main()\n    Rooibos_init()\nend function`);
+            if (!this._builder.options.stagingDir && !this._builder.options.stagingFolderPath) {
+                console.error('this plugin requires that stagingDir or the deprecated stagingFolderPath bsconfig option is set');
+                diagnosticNoStagingDir(files[0]);
+            } else {
+                const filePath = path.join(this._builder.options.stagingDir ?? this._builder.options.stagingFolderPath, 'source/rooibosMain.brs');
+                fsExtra.writeFileSync(filePath, `function main()\n    Rooibos_init()\nend function`);
+
+            }
         }
     }
 

diff --git a/bsc-plugin/src/lib/utils/Diagnostics.ts b/bsc-plugin/src/lib/utils/Diagnostics.ts
@@ -254,3 +254,12 @@ export function diagnosticCorruptTestProduced(file: BrsFile, annotation: Annotat
         annotation
     );
 }
+
+export function diagnosticNoStagingDir(file: BscFile) {
+    addDiagnostic(
+        file,
+        2221,
+        `The bsconfig must define stagingDir, or the deprecated stagingFolderPath options`, 1, 1, 1, 1, DiagnosticSeverity.Error
+    );
+}
+
diff --git a/bsc-plugin/src/plugin.ts b/bsc-plugin/src/plugin.ts
@@ -83,7 +83,7 @@ export class RooibosPlugin implements CompilerPlugin {
             return;
         }
 
-        console.log('processing ', file.pkgPath);
+        // console.log('processing ', file.pkgPath);
         if (isBrsFile(file)) {
             if (this.session.processFile(file)) {
                 //

diff --git a/framework/src/source/Utils.bs b/framework/src/source/Utils.bs
@@ -18,6 +18,10 @@ namespace rooibos.utils
       return m._subType
     end function
 
+    function isSubType(name)
+      return false
+    end function
+
     function createObject(nodeType)
       node = new rooibos.utils.MockNode("", nodeType)
       m.createdNodes.push(node)
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,4 +110,4 @@ @@
                 "ts"
             ]
         }
-    }
+    }