Merge pull request #353 from georgejecook/fix/mioc-issues

Fix/mioc issues

bsconfig.json

@@ -24,6 +24,9 @@
     {
       "src": "**/rooibos-roku/**/*.*"
     },
+    {
+      "src": "**/rooibos-roku/*.*"
+    },
     1120,
     1001,
     1128,

package.json

@@ -20,7 +20,7 @@
   "devDependencies": {
     "@rokucommunity/bslint": "^0.8.1",
     "auto-changelog": "^2.2.1",
-    "brighterscript": "^0.61.3",
+    "brighterscript": "^0.64.0",
     "fs-extra": "^7.0.1",
     "maestro-roku-bsc-plugin": "^0.28.4",
     "rimraf": "^3.0.2",

src-ml-test-app/source/models/Item.bs

@@ -1,22 +1,11 @@
 import "pkg:/source/core/Utils.bs"
 
 namespace models
-  ' /**
-  '  * @module nba.content.models.Item
-  '  * @description contains info pertinent to items, such as videos, etc.
-  '  */
   @node("Item", "ContentNode")
   class Item
 
     public json as mc.types.assocarray
 
-    ' /**
-    '  * @member type
-    '  * @memberof module:nba.models.Item
-    '  * @instance
-    '  * @description Describes the type of the item:
-    '  *              types are (video|other|TBD)
-    '  */
     public version = 0
     public type = ""
     public isSerializable = true

src/source/core/MIOC.bs

@@ -254,7 +254,7 @@ namespace mioc
 
   function isValidType(instance as dynamic)
     instanceType = type(instance)
-    if instanceType = "roSGNode" or instanceType = "roAssociativeArray" or instanceType = "String" or instanceType = "roArray" or instanceType = "Integer" or instanceType = "Float" or instance = invalid
+    if instanceType = "roSGNode" or instanceType = "roAssociativeArray" or instanceType = "String" or instanceType = "Integer" or instanceType = "Float" or instance = invalid or GetInterface(instance, "ifString") <> invalid or GetInterface(instance, "ifBoolean") <> invalid or GetInterface(instance, "ifInt") <> invalid or GetInterface(instance, "ifDouble") <> invalid or GetInterface(instance, "ifAssociativeArray") <> invalid or GetInterface(instance, "ifFloat") <> invalid or GetInterface(instance, "ifArray") <> invalid
       return true
     end if
     return false

src/source/core/MIOC.spec.bs

@@ -191,6 +191,14 @@ namespace tests
       m.assertEqual(mioc.getInstance("v2.sub.sub2", "b"), "b")
     end function
 
+    @it("supports simple values")
+    function _()
+      m.assertTrue(mioc.setInstance("v1", "en"))
+      m.assertEqual(mioc.getInstance("v1"), "en")
+      m.assertEqual(mioc.getInstance("v1", invalid, ""), "en")
+      m.assertEqual(mioc.getInstance("v2", invalid, "b"), "b")
+    end function
+
   end class
 
 end namespace

src/source/core/Selection.bs

@@ -82,5 +82,12 @@ namespace mc
         result: result
       })
     end function
+
+    function setCompletionState(state as string)
+      if m.itemCompletionState = "pending"
+        m.itemCompletionState = state
+      end if
+    end function
+
   end class
 end namespace

src/source/view/BaseView.bs

@@ -76,9 +76,9 @@ namespace mv
     ' for a field
     ' Views that create their child views from json, will automatically have a _dataMappedControlIds property, which tells this function which controls to apply the data source to.
     ' Alternately, a _controls_ array can be used to apply the datamap to the passed in array of controls
-    protected function applyDataMapToControls(dataSource = invalid as dynamic, controls = invalid as mc.types.array) as boolean
-      if controls <> invalid
-        for each control in controls
+    protected function applyDataMapToControls(dataSource = invalid as dynamic, targetControls = invalid as mc.types.array) as boolean
+      if targetControls <> invalid
+        for each control in targetControls
           mv.applyDataMap(control, dataSource)
         end for
         return true
@@ -107,7 +107,7 @@ namespace mv
       timeNow = UpTime(0)
       ' ? "key " ; key ; " P " ; press ; " " ; abs(timeNow - m.lastPressTime)
       ' if abs(timeNow - m.lastPressTime) < 0.35 and press
-        ' ? " skipping rapid key"
+      ' ? " skipping rapid key"
       '   m.lastPressTime = timeNow
       '   return true
       ' end if

src/source/view/DialogUtils.bs

@@ -12,7 +12,6 @@ namespace mv
     '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     public dialog
-    ' private date = new nba.models.Date()
 
     '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     '++ Private Fields

src/source/view/KeyboardDialogUtils.bs

@@ -12,7 +12,6 @@ namespace mv
     '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     public dialog
-    ' private date = new nba.models.Date()
 
     '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     '++ Private Fields