rooibos-roku 4.8.2 → 5.0.2

package/dist/lib/framework/BaseTestSuite.bs

@@ -263,8 +263,8 @@ namespace rooibos
       try
         if not Rooibos.Common.eqValues(first, second)
           if msg = ""
-            first_as_string = Rooibos.Common.asString(first)
-            second_as_string = Rooibos.Common.asString(second)
+            first_as_string = Rooibos.Common.asString(first, true)
+            second_as_string = Rooibos.Common.asString(second, true)
             msg = first_as_string + " != " + second_as_string
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
@@ -295,7 +295,7 @@ namespace rooibos
         return false
       end if
       try
-        if first <> second
+        if not Rooibos.Common.eqValues(first, second, true)
           if msg = ""
             first_as_string = Rooibos.Common.asString(first)
             second_as_string = Rooibos.Common.asString(second)
@@ -331,8 +331,8 @@ namespace rooibos
       try
         if Rooibos.Common.eqValues(first, second)
           if msg = ""
-            first_as_string = Rooibos.Common.asString(first)
-            second_as_string = Rooibos.Common.asString(second)
+            first_as_string = Rooibos.Common.asString(first, true)
+            second_as_string = Rooibos.Common.asString(second, true)
             msg = first_as_string + " == " + second_as_string
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
@@ -365,7 +365,7 @@ namespace rooibos
       try
         if value <> invalid
           if msg = ""
-            expr_as_string = Rooibos.Common.asString(value)
+            expr_as_string = Rooibos.Common.asString(value, true)
             msg = expr_as_string + " <> Invalid"
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
@@ -590,7 +590,7 @@ namespace rooibos
       try
         if Rooibos.Common.isAssociativeArray(array) or Rooibos.Common.isArray(array)
           if not Rooibos.Common.arrayContains(array, value, key)
-            msg = "Array doesn't have the '" + Rooibos.Common.asString(value) + "' value."
+            msg = "Array doesn't have the '" + Rooibos.Common.asString(value, true) + "' value."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
           end if
@@ -634,7 +634,7 @@ namespace rooibos
           for each value in values
             isMatched = false
             if not Rooibos.Common.isAssociativeArray(value)
-              msg = "Value to search for was not associativeArray " + Rooibos.Common.asString(value)
+              msg = "Value to search for was not associativeArray " + Rooibos.Common.asString(value, true)
               m.currentResult.fail(msg, m.currentAssertLineNumber)
               return false
             end if
@@ -657,7 +657,7 @@ namespace rooibos
             end for ' items in array
 
             if not isMatched
-              msg = "array missing value: " + Rooibos.Common.asString(value)
+              msg = "array missing value: " + Rooibos.Common.asString(value, true)
               m.currentResult.fail(msg, m.currentAssertLineNumber)
               return false
             end if
@@ -697,7 +697,7 @@ namespace rooibos
       try
         if Rooibos.Common.isAssociativeArray(array) or Rooibos.Common.isArray(array)
           if Rooibos.Common.arrayContains(array, value, key)
-            msg = "Array has the '" + Rooibos.Common.asString(value) + "' value."
+            msg = "Array has the '" + Rooibos.Common.asString(value, true) + "' value."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
           end if
@@ -741,7 +741,7 @@ namespace rooibos
               value = subset[key]
             end if
             if not Rooibos.Common.arrayContains(array, value, key)
-              msg = "Array doesn't have the '" + Rooibos.Common.asString(value) + "' value."
+              msg = "Array doesn't have the '" + Rooibos.Common.asString(value, true) + "' value."
               m.currentResult.fail(msg, m.currentAssertLineNumber)
               return false
             end if
@@ -786,7 +786,7 @@ namespace rooibos
               value = item[key]
             end if
             if Rooibos.Common.arrayContains(array, value, key)
-              msg = "Array has the '" + Rooibos.Common.asString(value) + "' value."
+              msg = "Array has the '" + Rooibos.Common.asString(value, true) + "' value."
               m.currentResult.fail(msg, m.currentAssertLineNumber)
               return false
             end if
@@ -900,7 +900,7 @@ namespace rooibos
           end if
         else if Rooibos.Common.isString(item)
           if Rooibos.Common.asString(item) <> ""
-            msg = "Input value is not empty."
+            msg = "String is not empty, contains: " + Rooibos.Common.asString(item, true)
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
           end if
@@ -988,7 +988,7 @@ namespace rooibos
           if typeCheckFunction <> invalid
             for each item in array
               if not typeCheckFunction(item)
-                msg = Rooibos.Common.asString(item) + "is not a '" + typeStr + "' type."
+                msg = Rooibos.Common.asString(item, true) + " is not a '" + typeStr + "' type."
                 m.currentResult.fail(msg, m.currentAssertLineNumber)
                 return false
               end if
@@ -1066,7 +1066,7 @@ namespace rooibos
       try
         if type(value) <> typeStr
           if msg = ""
-            expr_as_string = Rooibos.Common.asString(value)
+            expr_as_string = Rooibos.Common.asString(value, true)
             msg = expr_as_string + " was not expected type " + typeStr
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
@@ -1099,14 +1099,14 @@ namespace rooibos
       try
         if type(value) <> "roSGNode"
           if msg = ""
-            expr_as_string = Rooibos.Common.asString(value)
+            expr_as_string = Rooibos.Common.asString(value, true)
             msg = expr_as_string + " was not a node, so could not match subtype " + typeStr
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
           return false
         else if value.subType() <> typeStr
           if msg = ""
-            expr_as_string = Rooibos.Common.asString(value)
+            expr_as_string = Rooibos.Common.asString(value, true)
             msg = expr_as_string + "( type : " + value.subType() + ") was not of subType " + typeStr
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
@@ -1134,10 +1134,10 @@ namespace rooibos
           m.currentResult.fail(msg, m.currentAssertLineNumber)
           return false
         end if
-        className = Rooibos.Common.asString(value.__classname)
+        className = `${value.__classname}`
         if className <> typeStr
           if msg = ""
-            msg = "Expected class: " + typeStr + ", got " + className
+            msg = `Expected class: ${typeStr} got ${className}`
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
           return false
@@ -1308,7 +1308,7 @@ namespace rooibos
       try
         if type(node) = "roSGNode"
           if not Rooibos.Common.nodeContains(node, value)
-            msg = "Node doesn't have the '" + Rooibos.Common.asString(value) + "' value."
+            msg = "Node doesn't have the '" + Rooibos.Common.asString(value, true) + "' value."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
           end if
@@ -1344,7 +1344,7 @@ namespace rooibos
       try
         if type(node) = "roSGNode"
           if not Rooibos.Common.nodeContains(node, value)
-            msg = "Node doesn't have the '" + Rooibos.Common.asString(value) + "' value."
+            msg = "Node doesn't have the '" + Rooibos.Common.asString(value, true) + "' value."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
           else if node.getChildCount() <> 1
@@ -1385,7 +1385,7 @@ namespace rooibos
       try
         if type(node) = "roSGNode"
           if Rooibos.Common.nodeContains(node, value)
-            msg = "Node has the '" + Rooibos.Common.asString(value) + "' value."
+            msg = "Node has the '" + Rooibos.Common.asString(value, true) + "' value."
             m.currentResult.fail(msg, m.currentAssertLineNumber)
             return false
           end if
@@ -1427,7 +1427,7 @@ namespace rooibos
                 subsetValue = subset[key]
                 nodeValue = node[key]
                 if not Rooibos.Common.eqValues(nodeValue, subsetValue)
-                  msg = key + ": Expected '" + Rooibos.Common.asString(subsetValue) + "', got '" + Rooibos.Common.asString(nodeValue) + "'"
+                  msg = key + ": Expected '" + Rooibos.Common.asString(subsetValue, true) + "', got '" + Rooibos.Common.asString(nodeValue, true) + "'"
                   m.currentResult.fail(msg, m.currentAssertLineNumber)
                   return false
                 end if
@@ -1476,7 +1476,7 @@ namespace rooibos
               value = item[key]
             end if
             if Rooibos.Common.nodeContains(node, value)
-              msg = "Node has the '" + Rooibos.Common.asString(value) + "' value."
+              msg = "Node has the '" + Rooibos.Common.asString(value, true) + "' value."
               m.currentResult.fail(msg, m.currentAssertLineNumber)
               return false
             end if
@@ -1524,7 +1524,7 @@ namespace rooibos
                 subsetValue = subset[key]
                 arrayValue = array[key]
                 if not Rooibos.Common.eqValues(arrayValue, subsetValue)
-                  msg = key + ": Expected '" + Rooibos.Common.asString(subsetValue) + "', got '" + Rooibos.Common.asString(arrayValue) + "'"
+                  msg = key + ": Expected '" + Rooibos.Common.asString(subsetValue, true) + "', got '" + Rooibos.Common.asString(arrayValue, true) + "'"
                   m.currentResult.fail(msg, m.currentAssertLineNumber)
                   return false
                 end if
@@ -2022,7 +2022,7 @@ namespace rooibos
 
               if isUsingMatcher
                 if not expected.matcher(value)
-                  m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to match matching function '" + Rooibos.Common.asString(expected.matcher) + "' got '" + Rooibos.Common.asString(value) + "')")
+                  m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to match matching function '" + Rooibos.Common.asString(expected.matcher) + "' got '" + Rooibos.Common.asString(value, true) + "')")
                   m.cleanMocks()
                 end if
               else
@@ -2031,7 +2031,7 @@ namespace rooibos
                     expected = "[INVALID]"
                   end if
 
-                  m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to be '" + Rooibos.Common.asString(expected) + "' got '" + Rooibos.Common.asString(value) + "')")
+                  m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to be '" + Rooibos.Common.asString(expected, true) + "' got '" + Rooibos.Common.asString(value, true) + "')")
                   m.cleanMocks()
                   return
                 end if

package/dist/lib/framework/CommonUtils.bs

@@ -303,15 +303,27 @@ namespace rooibos.Common
   '  * @param {Dynamic} input - value to check
   '  * @returns {String} - converted string
   '  */
-  function asString(input) as string
+  function asString(input, includeType = false) as string
     if Rooibos.Common.isValid(input) = false
-      return "Invalid"
+      return "INVALID"
     else if Rooibos.Common.isString(input)
-      return input
+      if includeType
+        return """" + input + """"
+      else
+        return input
+      end if
     else if Rooibos.Common.isInteger(input) or Rooibos.Common.isLongInteger(input) or Rooibos.Common.isBoolean(input)
-      return input.ToStr()
+      if includeType
+        return input.ToStr() + " (" + Rooibos.Common.getSafeType(input) + ")"
+      else
+        return input.ToStr()
+      end if
     else if Rooibos.Common.isFloat(input) or Rooibos.Common.isDouble(input)
-      return Str(input).Trim()
+      if includeType
+        return Str(input).Trim() + " (" + Rooibos.Common.getSafeType(input) + ")"
+      else
+        return Str(input).Trim()
+      end if
     else if type(input) = "roSGNode"
       return "Node(" + input.subType() + ")"
     else if type(input) = "roAssociativeArray"
@@ -324,7 +336,7 @@ namespace rooibos.Common
       end if
       for each key in input
         if rooibos.Common.canSafelyIterateAAKey(input, key)
-          text = text + key + ":" + Rooibos.Common.asString(input[key])
+          text = text + key + ":" + Rooibos.Common.asString(input[key], includeType)
         end if
       end for
       text = text + "}"
@@ -335,7 +347,7 @@ namespace rooibos.Common
       maxLen = 500
       for each v in input
         if len(text) < maxLen
-          text += join + rooibos.Common.asString(v)
+          text += join + rooibos.Common.asString(v, includeType)
           join = ", "
         end if
       end for
@@ -345,7 +357,7 @@ namespace rooibos.Common
       text = text + "]"
       return text
     else if Rooibos.Common.isFunction(input)
-      return input.toStr()
+      return input.toStr() + "(function)"
     else
       return ""
     end if
@@ -617,7 +629,7 @@ namespace rooibos.Common
   '  * @param {Dynamic} Value2 - second item to compare
   '  * @returns {boolean} - True if values are equal or False in other case.
   '  */
-  function eqValues(Value1, Value2) as dynamic
+  function eqValues(Value1, Value2, fuzzy = false) as dynamic
     ' Workaraund for bug with string boxing, and box everything else
     val1Type = Rooibos.Common.getSafeType(Value1)
     val2Type = Rooibos.Common.getSafeType(Value2)
@@ -633,17 +645,17 @@ namespace rooibos.Common
       Value1 = cdbl(Value1)
     end if
 
-    if val1Type <> val2Type
+    if val1Type <> val2Type and fuzzy <> true
       return false
     else
       valtype = val1Type
 
-      if valtype = "List"
-        return Rooibos.Common.eqArray(Value1, Value2)
+      if val1Type = "List"
+        return Rooibos.Common.eqArray(Value1, Value2, fuzzy)
       else if valtype = "roAssociativeArray"
-        return Rooibos.Common.eqAssocArray(Value1, Value2)
+        return Rooibos.Common.eqAssocArray(Value1, Value2, fuzzy)
       else if valtype = "roArray"
-        return Rooibos.Common.eqArray(Value1, Value2)
+        return Rooibos.Common.eqArray(Value1, Value2, fuzzy)
       else if valtype = "roSGNode"
         if val2Type <> "roSGNode"
           return false
@@ -651,14 +663,37 @@ namespace rooibos.Common
           return Value1.isSameNode(Value2)
         end if
       else
-        'If you crashed on this line, then you're trying to compare
-        '2 things which can't be compared - check what value1 and value2
-        'are in your debug log
-        return Value1 = Value2
+        if fuzzy = true
+          return Rooibos.Common.asString(Value1) = Rooibos.Common.asString(Value2)
+        else
+          'If you crashed on this line, then you're trying to compare
+          '2 things which can't be compared - check what value1 and value2
+          'are in your debug log
+          return Value1 = Value2
+        end if
       end if
     end if
   end function
 
+  function eqTypes(Value1, Value2) as dynamic
+    val1Type = Rooibos.Common.getSafeType(Value1)
+    val2Type = Rooibos.Common.getSafeType(Value2)
+    if val1Type = invalid or val2Type = invalid
+      ? "ERROR!!!! - undefined value passed"
+      return false
+    end if
+
+    'Upcast int to float, if other is float
+    if val1Type = "Float" and val2Type = "Integer"
+      Value2 = cdbl(Value2)
+    else if val2Type = "Float" and val1Type = "Integer"
+      Value1 = cdbl(Value1)
+    end if
+
+    return val1Type <> val2Type
+  end function
+
+
   ' /**
   '  * @memberof module:CommonUtils
   '  * @name EqAssocArray
@@ -669,7 +704,7 @@ namespace rooibos.Common
   '  * @param {Dynamic} Value2 - second associative array
   '  * @returns {boolean} - True if arrays are equal or False in other case.
   '  */
-  function eqAssocArray(Value1, Value2) as dynamic
+  function eqAssocArray(Value1, Value2, fuzzy = false) as dynamic
     l1 = Value1.Count()
     l2 = Value2.Count()
 
@@ -683,7 +718,7 @@ namespace rooibos.Common
           if rooibos.common.canSafelyIterateAAKey(Value1, k) and rooibos.common.canSafelyIterateAAKey(Value2, k)
             v1 = Value1[k]
             v2 = Value2[k]
-            if not Rooibos.Common.eqValues(v1, v2)
+            if not Rooibos.Common.eqValues(v1, v2, fuzzy)
               return false
             end if
           end if
@@ -713,7 +748,7 @@ namespace rooibos.Common
   '  * @param {Dynamic} Value2 - second array
   '  * @returns {boolean} - True if arrays are equal or False in other case.
   '  */
-  function eqArray(Value1, Value2) as dynamic
+  function eqArray(Value1, Value2, fuzzy = false) as dynamic
     if not (Rooibos.Common.isArray(Value1)) or not Rooibos.Common.isArray(Value2)
       return false
     end if
@@ -727,7 +762,7 @@ namespace rooibos.Common
       for i = 0 to l1 - 1
         v1 = Value1[i]
         v2 = Value2[i]
-        if not Rooibos.Common.eqValues(v1, v2)
+        if not Rooibos.Common.eqValues(v1, v2, fuzzy)
           return false
         end if
       end for

package/dist/lib/rooibos/FileFactory.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileFactory = void 0;
+const brighterscript_1 = require("brighterscript");
 const path = require("path");
 const fs = require("fs");
 class FileFactory {
     constructor(options) {
+        var _a;
+        this.options = options;
         this.frameworkFileNames = [
             'BaseTestSuite',
             'CommonUtils',
@@ -21,35 +24,34 @@ class FileFactory {
             'TestRunner',
             'Utils'
         ];
-        this.sourcePath = path.join(__dirname, '../framework');
         this.targetPath = 'source/rooibos/';
         this.targetCompsPath = 'components/rooibos/';
         this.addedFrameworkFiles = [];
-        if (options.frameworkSourcePath) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            this.sourcePath = options.frameworkSourcePath;
+        this.options = (_a = this.options) !== null && _a !== void 0 ? _a : {};
+        if (!this.options.frameworkSourcePath) {
+            if (__filename.endsWith('.ts')) {
+                //load the files directly from their source location. (i.e. the plugin is running as a typescript file from within ts-node)
+                this.options.frameworkSourcePath = brighterscript_1.standardizePath `${__dirname}/../../../../framework/src/source`;
+            }
+            else {
+                //load the framework files from the dist folder (i.e. the plugin is running as a node_module)
+                this.options.frameworkSourcePath = brighterscript_1.standardizePath `${__dirname}/../framework`;
+            }
         }
     }
-    getFrameworkFiles() {
-        let files = [];
-        for (let fileName of this.frameworkFileNames) {
-            files.push({ src: path.resolve(path.join(this.sourcePath, `${fileName}.bs`)), dest: path.join(this.targetPath, `${fileName}.bs`) });
-        }
-        files.push({ src: path.resolve(path.join(this.sourcePath, `RooibosScene.xml`)), dest: path.join(this.targetCompsPath, `RooibosScene.xml`) });
-        return files;
-    }
     addFrameworkFiles(program) {
         this.addedFrameworkFiles = [];
         for (let fileName of this.frameworkFileNames) {
-            let sourcePath = path.resolve(path.join(this.sourcePath, `${fileName}.bs`));
+            let sourcePath = path.resolve(path.join(this.options.frameworkSourcePath, `${fileName}.bs`));
             let fileContents = fs.readFileSync(sourcePath, 'utf8');
             let destPath = path.join(this.targetPath, `${fileName}.bs`);
             let entry = { src: sourcePath, dest: destPath };
             this.addedFrameworkFiles.push(program.setFile(entry, fileContents));
         }
-        let sourcePath = path.resolve(path.join(this.sourcePath, `RooibosScene.xml`));
-        let destPath = path.join(this.targetCompsPath, `RooibosScene.xml`);
-        let entry = { src: sourcePath, dest: destPath };
+        let entry = {
+            src: brighterscript_1.standardizePath `${this.options.frameworkSourcePath}/RooibosScene.xml`,
+            dest: brighterscript_1.standardizePath `${this.targetCompsPath}/RooibosScene.xml`
+        };
         this.addedFrameworkFiles.push(program.setFile(entry, this.createTestXML('TestsScene', 'Scene')));
     }
     createTestXML(name, baseName, useBs = true) {
@@ -58,25 +60,23 @@ class FileFactory {
             scriptImports.push(`<script type="text/bright${useBs ? 'er' : ''}script" uri="pkg:/${this.targetPath}${fileName}.${useBs ? 'bs' : 'brs'}" />`);
         }
         let contents = `<?xml version="1.0" encoding="UTF-8" ?>
-  <component
-      name="${name}"
-      extends="${baseName}">
-${scriptImports.join('\n')}
-    <interface>
-      <field id="rooibosTestResult" type="assocarray"/>
-      <field id="testText" type="string" alias="statusLabel.text" />
-      <field id="failedText" type="string" alias="failedLabel.text" />
-      <field id="statusColor" type="string" alias="statusBackground.color" />
-      <function name='Rooibos_CreateTestNode' />
-    </interface>
+            <component name="${name}" extends="${baseName}">
+                ${scriptImports.join('\n')}
+                <interface>
+                    <field id="rooibosTestResult" type="assocarray"/>
+                    <field id="testText" type="string" alias="statusLabel.text" />
+                    <field id="failedText" type="string" alias="failedLabel.text" />
+                    <field id="statusColor" type="string" alias="statusBackground.color" />
+                    <function name='Rooibos_CreateTestNode' />
+                </interface>
 
-    <children>
-      <Rectangle id="statusBackground" color="#444444" width="1920" height="1080" />
-      <Label id="statusLabel" text='Rooibos is running tests' />
-      <Label id="failedLabel" text="" translation="[0, 100]" width="1800" wrap="true" maxLines="15"/>
-    </children>
-  </component>
-   `;
+                <children>
+                    <Rectangle id="statusBackground" color="#444444" width="1920" height="1080" />
+                    <Label id="statusLabel" text='Rooibos is running tests' />
+                    <Label id="failedLabel" text="" translation="[0, 100]" width="1800" wrap="true" maxLines="15"/>
+                </children>
+            </component>
+        `;
         return contents;
     }
     isIgnoredFile(file) {
@@ -88,7 +88,10 @@ ${scriptImports.join('\n')}
     }
     addFile(program, projectPath, contents) {
         try {
-            const file = program.setFile({ src: path.resolve(projectPath), dest: projectPath }, contents);
+            const file = program.setFile({
+                src: path.resolve(projectPath),
+                dest: projectPath
+            }, contents);
             this.addedFrameworkFiles.push(file);
             return file;
         }

package/dist/lib/rooibos/FileFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileFactory.js","sourceRoot":"","sources":["../../../src/lib/rooibos/FileFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileFactory.js","sourceRoot":"","sources":["../../../src/lib/rooibos/FileFactory.ts"],"names":[],"mappings":"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"}

package/dist/lib/rooibos/RawCodeStatement.js

@@ -11,7 +11,11 @@ class RawCodeStatement extends brighterscript_1.Statement {
         this.range = range;
     }
     transpile(state) {
-        return [new source_map_1.SourceNode(this.range.start.line + 1, this.range.start.character, this.sourceFile ? this.sourceFile.pathAbsolute : state.srcPath, this.source)];
+        //indent every line with the current transpile indent level (except the first line, because that's pre-indented by bsc)
+        let source = this.source.replace(/\r?\n/g, (match, newline) => {
+            return state.newline + state.indent();
+        });
+        return [new source_map_1.SourceNode(this.range.start.line + 1, this.range.start.character, this.sourceFile ? this.sourceFile.pathAbsolute : state.srcPath, source)];
     }
     walk(visitor, options) {
         //nothing to walk

package/dist/lib/rooibos/RawCodeStatement.js.map

@@ -1 +1 @@
-{"version":3,"file":"RawCodeStatement.js","sourceRoot":"","sources":["../../../src/lib/rooibos/RawCodeStatement.ts"],"names":[],"mappings":";;;AAGA,mDACsC;AAGtC,2CAAwC;AAExC,MAAa,gBAAiB,SAAQ,0BAAS;IAC3C,YACW,MAAc,EACd,UAAoB,EACpB,QAAe,sBAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;QAElD,KAAK,EAAE,CAAC;QAJD,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAU;QACpB,UAAK,GAAL,KAAK,CAAsC;IAGtD,CAAC;IAEM,SAAS,CAAC,KAAwB;QACrC,OAAO,CAAC,IAAI,uBAAU,CAClB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EACzB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAC1B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAC9D,IAAI,CAAC,MAAM,CACd,CAAC,CAAC;IACP,CAAC;IACM,IAAI,CAAC,OAAoB,EAAE,OAAoB;QAClD,iBAAiB;IACrB,CAAC;CACJ;AApBD,4CAoBC"}
+{"version":3,"file":"RawCodeStatement.js","sourceRoot":"","sources":["../../../src/lib/rooibos/RawCodeStatement.ts"],"names":[],"mappings":";;;AAKA,mDAGwB;AAExB,2CAAwC;AAIxC,MAAa,gBAAiB,SAAQ,0BAAS;IAC3C,YACW,MAAc,EACd,UAAoB,EACpB,QAAe,sBAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;QAElD,KAAK,EAAE,CAAC;QAJD,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAU;QACpB,UAAK,GAAL,KAAK,CAAsC;IAGtD,CAAC;IAEM,SAAS,CAAC,KAAwB;QACrC,uHAAuH;QACvH,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC1D,OAAO,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,uBAAU,CAClB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EACzB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAC1B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAC9D,MAAM,CACT,CAAC,CAAC;IACP,CAAC;IACM,IAAI,CAAC,OAAoB,EAAE,OAAoB;QAClD,iBAAiB;IACrB,CAAC;CACJ;AAzBD,4CAyBC"}