@dazn/kopytko-framework 2.1.1 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazn/kopytko-framework",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "A modern Roku's Brightscript framework",
   "keywords": [
     "brightscript",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@dazn/eslint-plugin-kopytko": "^2.1.0",
-    "@dazn/kopytko-packager": "^1.2.4",
+    "@dazn/kopytko-packager": "^1.2.5",
     "@dazn/kopytko-unit-testing-framework": "^2.3.1",
     "eslint": "^8.21.0"
   },

package/src/components/http/HttpResponse.brs

@@ -9,6 +9,7 @@
 ' @param {String} responseData.failureReason
 ' @param {Object} responseData.headers
 ' @param {Integer} responseData.httpStatusCode
+' @param {Object} responseData.rawData
 ' @param {Object} responseData.requestOptions
 ' @param {Integer} [responseData.time]
 function HttpResponse(responseData as Object) as Object
@@ -25,7 +26,7 @@ function HttpResponse(responseData as Object) as Object
   prototype._failureReason = getProperty(responseData, "failureReason", "OK")
   prototype._headers = getProperty(responseData, "headers", {})
   prototype._httpStatusCode = getProperty(responseData, "httpStatusCode", -1)
-  prototype._rawData = getProperty(responseData, "rawData", {})
+  prototype._rawData = getProperty(responseData, "rawData")
   prototype._requestOptions = responseData.requestOptions
   prototype._time = DateTime().asSeconds()
 
@@ -44,6 +45,7 @@ function HttpResponse(responseData as Object) as Object
       isReusable: m.isReusable(),
       isSuccess: m._isSuccess(),
       maxAge: m.getMaxAge(),
+      raw: { data: m._rawData },
       rawData: m._rawData,
       requestOptions: m._requestOptions,
     })

package/src/components/http/HttpResponse.model.xml

@@ -9,7 +9,8 @@
     <field id="isReusable" type="boolean" />
     <field id="isSuccess" type="boolean" />
     <field id="maxAge" type="integer" />
-    <field id="rawData" type="assocarray" />
+    <field id="raw" type="assocarray" />
+    <field id="rawData" type="assocarray" /> <!-- @deprecated - raw field contains data key with rawData value now - raw = { data: <rawData value>} -->
     <field id="requestOptions" type="assocarray" />
   </interface>
 </component>

package/src/components/http/request/_mocks/Request.mock.xml

@@ -6,6 +6,8 @@
     <field id="data" type="assocarray" />
     <field id="options" type="assocarray" />
     <field id="result" type="node" />
+    <!-- Task fields -->
+    <field id="control" type="string" />
   </interface>
 
   <script type="text/brightscript" uri="Request.mock.brs" />

package/src/components/renderer/kopytkoRoot.brs

@@ -1,8 +1,10 @@
+' @import /components/ternary.brs from @dazn/kopytko-utils
+
 sub initKopytkoRoot(dynamicProps as Object)
-  m._dynamicProps = dynamicProps
+  m._dynamicProps = ternary(Type(dynamicProps) = "roArray", dynamicProps, [])
 
   dynamicPropsValues = {}
-  for each prop in dynamicProps
+  for each prop in m._dynamicProps
     dynamicPropsValues[prop] = m.top[prop]
   end for
 
@@ -14,11 +16,14 @@ sub initKopytkoRoot(dynamicProps as Object)
 end sub
 
 sub destroyKopytkoRoot()
-  for each prop in m._dynamicProps
-    m.top.unobserveFieldScoped(prop)
-  end for
+  if m._dynamicProps <> Invalid
+    for each prop in m._dynamicProps
+      m.top.unobserveFieldScoped(prop)
+    end for
+
+    m._dynamicProps = Invalid
+  end if
 
-  m._dynamicProps = Invalid
   destroyKopytko()
 end sub