fix: Enabled setter to have null as param value (#122)

* fix: Enabled setter to have null as param value
rdkcentral · Aug 8, 2023 · 2bfee25 · 2bfee25
1 parent 0c4fbd6
commit 2bfee25
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/languages/javascript/src/shared/Prop/index.mjs b/languages/javascript/src/shared/Prop/index.mjs
@@ -1,10 +1,10 @@
 import Transport from "../Transport/index.mjs"
 import Events from "../Events/index.mjs"
 
-function prop(moduleName, key, params, callbackOrValue = null, immutable, readonly, contextParameterCount) {
+function prop(moduleName, key, params, callbackOrValue = undefined, immutable, readonly, contextParameterCount) {
   const numArgs = Object.values(params).length
 
-  if (numArgs === contextParameterCount && callbackOrValue === null) {
+  if (numArgs === contextParameterCount && callbackOrValue === undefined) {
     // getter
     return Transport.send(moduleName, key, params)
   } else if (numArgs === contextParameterCount && typeof callbackOrValue === 'function') {
@@ -13,7 +13,7 @@ function prop(moduleName, key, params, callbackOrValue = null, immutable, readon
       throw new Error('Cannot subscribe to an immutable property')
     }
     return Events.listen(moduleName, key + 'Changed', ...Object.values(params), callbackOrValue)
-  } else if (numArgs === (contextParameterCount) && callbackOrValue !== null) {
+  } else if (numArgs === (contextParameterCount) && callbackOrValue !== undefined) {
     // setter
     if (immutable) {
       throw new Error('Cannot set a value to an immutable property')

diff --git a/test/openrpc/simple.json b/test/openrpc/simple.json
@@ -92,7 +92,7 @@
                     ],
                     "properties": {
                         "foo": {
-                            "type": "string",
+                            "type": ["string", "null"],
                             "description": "A required field in the result."
                         },
                         "bar": {
@@ -133,6 +133,21 @@
                             "foo": "here's bar"
                         }
                     }
+                },
+                {
+                    "name": "Example to set null value",
+                    "params": [
+                        {
+                            "name": "parameter",
+                            "value": null
+                        }
+                    ],
+                    "result": {
+                        "name": "Another Result",
+                        "value": {
+                            "foo": null
+                        }
+                    }
                 }                
             ]            
         },

diff --git a/test/suite/properties.test.js b/test/suite/properties.test.js
@@ -48,16 +48,12 @@ beforeAll( () => {
         }
         else if (json.method === 'simple.setProperty') {
             propertySetterWasTriggered = true
-            if (json.params.value.foo === 'a new foo!') {
+            if (json.params.value.foo === 'a new foo!' || json.params.value.foo === null) {
                 propertySetterWasTriggeredWithValue = true
             }
         }
     })
 
-    Simple.property({
-        foo: 'a new foo!'
-    })
-
     return new Promise( (resolve, reject) => {
         setTimeout(resolve, 100)
     })
@@ -76,6 +72,18 @@ test('Basic Property subscribe', () => {
 });
 
 test('Basic Property set', () => {
+    Simple.property({
+        foo: 'a new foo!'
+    })
+
+    expect(propertySetterWasTriggered).toBe(true)
+    expect(propertySetterWasTriggeredWithValue).toBe(true)
+});
+
+test('Basic Property set with null', () => {
+    Simple.property({
+        foo: null
+    })
     expect(propertySetterWasTriggered).toBe(true)
     expect(propertySetterWasTriggeredWithValue).toBe(true)
 });