webassembly/proxy_js: Revert back to converting Py None to JS null.

dpgeorge · dpgeorge · commit 0148bbb495d6 · 2024-05-16T12:44:43.000+10:00
This reverts part of commit fa23e4b, to make it so that Python `None` converts to JavaScript `null` (and JavaScript `null` already converts to Python `None`). That's consistent with how the `json` module converts these values back and forth. Signed-off-by: Damien George <damien@micropython.org>
diff --git a/ports/webassembly/proxy_js.js b/ports/webassembly/proxy_js.js
@@ -188,7 +188,7 @@ function proxy_convert_mp_to_js_obj_jsside(value) {
     }
     if (kind === PROXY_KIND_MP_NONE) {
         // None
-        obj = undefined;
+        obj = null;
     } else if (kind === PROXY_KIND_MP_BOOL) {
         // bool
         obj = Module.getValue(value + 4, "i32") ? true : false;
diff --git a/tests/ports/webassembly/py_proxy_to_js.mjs.exp b/tests/ports/webassembly/py_proxy_to_js.mjs.exp
@@ -1,4 +1,4 @@
 false 1
 true [ 1, 2, 3 ]
-true [ undefined, true, 1.2 ]
-true { tuple: [ 1, 2, 3 ], one: 1, list: [ undefined, true, 1.2 ] }
+true [ null, true, 1.2 ]
+true { tuple: [ 1, 2, 3 ], one: 1, list: [ null, true, 1.2 ] }
diff --git a/tests/ports/webassembly/run_python_async.mjs.exp b/tests/ports/webassembly/run_python_async.mjs.exp
@@ -23,7 +23,7 @@ py 1
 setTimeout resolved
 resolved value: 123
 py 2
-2 undefined
+2 null
 = TEST 4 ==========
 1
 py 1
@@ -35,4 +35,4 @@ py 3
 setTimeout B resolved
 resolved value: 456
 py 4
-2 undefined
+2 null

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ function proxy_convert_mp_to_js_obj_jsside(value) {`
`188`	`188`	`}`
`189`	`189`	`if (kind === PROXY_KIND_MP_NONE) {`
`190`	`190`	`// None`
`191`		`- obj = undefined;`
	`191`	`+ obj = null;`
`192`	`192`	`} else if (kind === PROXY_KIND_MP_BOOL) {`
`193`	`193`	`// bool`
`194`	`194`	`obj = Module.getValue(value + 4, "i32") ? true : false;`