WIP fixes for internalize and zero val translation of undefined and null

myitcv · myitcv · commit 0bbcb74c7b43 · 2017-04-06T10:15:32.000+01:00
diff --git a/compiler/prelude/jsmapping.go b/compiler/prelude/jsmapping.go
@@ -321,6 +321,9 @@ var $internalize = function(v, t, recv) {
   case $kindSlice:
     return new t($mapArray(v, function(e) { return $internalize(e, t.elem); }));
   case $kindString:
+    if (v === undefined || v == null) {
+      return "";
+    }
     v = String(v);
     if (v.search(/^[\x00-\x7F]*$/) !== -1) {
       return v;
diff --git a/js/js_test.go b/js/js_test.go
@@ -571,3 +571,20 @@ func TestUint8Array(t *testing.T) {
 		t.Errorf("Non-empty byte array is not externalized as a Uint8Array")
 	}
 }
+
+func TestInternalizeZeroVal(t *testing.T) {
+	type S struct {
+		*js.Object
+
+		string `js:"string"`
+	}
+
+	s := &S{Object: js.Global.Get("Object").New()}
+
+	{
+		exp := ""
+		if v := s.string; v != exp {
+			t.Fatalf("expected string field to be %q, got %q", exp, v)
+		}
+	}
+}
