From 43d83180130e75a183b62be8c01e4138e78b651b Mon Sep 17 00:00:00 2001
From: Jeremy LaCivita <jeremy.lacivita@comcast.com>
Date: Tue, 9 May 2023 12:16:07 -0400
Subject: [PATCH] fix(Events): Support for multiple context parameters

https://github.com/rdkcentral/firebolt-openrpc/issues/91
---
 .../javascript/src/shared/Events/index.mjs    |  2 +-
 .../javascript/src/shared/Prop/index.mjs      |  2 +-
 test/openrpc/advanced.json                    | 63 ++++++++++++++++++-
 test/suite/properties-context.test.js         | 15 ++++-
 4 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/languages/javascript/src/shared/Events/index.mjs b/languages/javascript/src/shared/Events/index.mjs
index 87e4cfdd..18c2092a 100644
--- a/languages/javascript/src/shared/Events/index.mjs
+++ b/languages/javascript/src/shared/Events/index.mjs
@@ -201,7 +201,7 @@ const getClearArgs = function(...args) {
   const event = args.shift() || '*'
   const context = {}
   
-  for (let i = 0; i<args.length; i++) {
+  for (let i = 0; args.length; i++) {
     context[validContext[module][event][i]] = args.shift()
   }
 
diff --git a/languages/javascript/src/shared/Prop/index.mjs b/languages/javascript/src/shared/Prop/index.mjs
index 5271c727..96aaa958 100644
--- a/languages/javascript/src/shared/Prop/index.mjs
+++ b/languages/javascript/src/shared/Prop/index.mjs
@@ -12,7 +12,7 @@ function prop(moduleName, key, params, callbackOrValue = null, immutable, readon
     if (immutable) {
       throw new Error('Cannot subscribe to an immutable property')
     }
-    return Events.listen(moduleName, key + 'Changed', callbackOrValue)
+    return Events.listen(moduleName, key + 'Changed', ...Object.values(params), callbackOrValue)
   } else if (numArgs === (contextParameterCount) && callbackOrValue !== null) {
     // setter
     if (immutable) {
diff --git a/test/openrpc/advanced.json b/test/openrpc/advanced.json
index 6cca417a..74d1b12d 100644
--- a/test/openrpc/advanced.json
+++ b/test/openrpc/advanced.json
@@ -17,7 +17,7 @@
                     "x-uses": ["xrn:firebolt:capability:test:test"]
                 }
             ],
-            "summary": "A temporal set method that lists Advanced objects.",
+            "summary": "An event with one context parameter.",
             "params": [
                 {
                     "name": "appId",
@@ -56,6 +56,67 @@
                 }
             ]
         },
+        {
+            "name": "onEventWithTwoContext",
+            "tags": [
+                {
+                    "name": "event"
+                },
+                {
+                    "name": "capabilities",
+                    "x-uses": ["xrn:firebolt:capability:test:test"]
+                }
+            ],
+            "summary": "An event with two context parameters.",
+            "params": [
+                {
+                    "name": "appId",
+                    "required": true,
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                {
+                    "name": "state",
+                    "required": true,
+                    "schema": {
+                        "type": "string"
+                    }
+                }
+            ],
+            "result": {
+                "name": "result",
+                "schema": {
+                    "type": "object",
+                    "properties": {
+                        "foo": {
+                            "type": "string"
+                        }
+                    }    
+                }
+            },
+            "examples": [
+                {
+                    "name": "Default Example",
+                    "params": [
+                        {
+                            "name": "appId",
+                            "value": "hulu"
+                        },
+                        {
+                            "name": "state",
+                            "value": "inactive"
+                        }
+                    ],
+                    "result": {
+                        "name": "result",
+                        "value": {
+                            "foo": "bar"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "propertyWithContext",
             "summary":"",
diff --git a/test/suite/properties-context.test.js b/test/suite/properties-context.test.js
index 9743a89a..77ba2c6f 100644
--- a/test/suite/properties-context.test.js
+++ b/test/suite/properties-context.test.js
@@ -27,10 +27,12 @@ let contextSentToGetter = false
 let contextSentToSetter = false
 let contextSentToSubscriber = false
 let contextSentToEvent = false
+let bothContextSentToEvent = false
 
 beforeAll( () => {
 
     transport.onSend(json => {
+        console.dir(json)
         if (json.method === 'advanced.propertyWithContext') {
             if (json.params.appId === 'some-app') {
                 contextSentToGetter = true
@@ -68,6 +70,11 @@ beforeAll( () => {
                 contextSentToEvent = true
             }
         }
+        else if (json.method === "advanced.onEventWithTwoContext") {
+            if (json.params.appId === 'some-app' && json.params.state === 'inactive') {
+                bothContextSentToEvent = true
+            }
+        }
     })
 
     Advanced.propertyWithContext('some-app', true)
@@ -97,8 +104,14 @@ test('Context Property set', () => {
     expect(contextSentToSetter).toBe(true)
 });
 
-test('Event with context', () => {
+test('Event with single context param', () => {
     Advanced.listen("eventWithContext", "some-app", (data) => {
         expect(contextSentToEvent).toBe(true)
     })
+})
+    
+test('Event with two context params', () => {
+    Advanced.listen("eventWithTwoContext", "some-app", "inactive", (data) => {
+        expect(bothContextSentToEvent).toBe(true)
+    })
 })
\ No newline at end of file