Serialize/deserialize lists in JS ports

client/dart.js

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Bootstrap support for Dart scripts on the page as this script.
 if (navigator.webkitStartDart) {
   if (!navigator.webkitStartDart()) {
     document.body.innerHTML = 'This build has expired.  Please download a new Dartium at http://www.dartlang.org/dartium/index.html';
   }
 } else {
@@ skipping 35 matching lines @@
 }
 
 (function() {
   function serialize(message) {
     if (message == null) {
       return null;  // Convert undefined to null.
     } else if (typeof(message) == 'string' ||
                typeof(message) == 'number' ||
                typeof(message) == 'boolean') {
       return message;
+    } else if (message instanceof Array) {
+      var values = new Array(message.length);
+      for (var i = 0; i < message.length; i++) {
+        values[i] = serialize(message[i]);
+      }
+      return [ 'list', message.length, values ];
     } else if (message instanceof LocalSendPortSync) {
       return [ 'sendport', 'nativejs', message.receivePort.id ];
     } else if (message instanceof DartSendPortSync) {
       return [ 'sendport', 'dart', message.receivePort.isolateId,
                message.receivePort.portId ];
     } else {
       var id = 0;
       var keys = Object.getOwnPropertyNames(message);
       var values = new Array(keys.length);
       for (var i = 0; i < keys.length; i++) {
-        values[i] = message[keys[i]];
+        values[i] = serialize(message[keys[i]]);
       }
       return [ 'map', id, keys, values ];
     }
   }
 
   function deserialize(message) {
     return deserializeHelper(message);
   }
 
   function deserializeHelper(x) {
     if (x == null ||
         typeof(x) == 'string' ||
         typeof(x) == 'number' ||
         typeof(x) == 'boolean') {
       return x;
     }
     switch (x[0]) {
       case 'map': return deserializeMap(x);
       case 'sendport': return deserializeSendPort(x);
+      case 'list': return deserializeList(x);
       default: throw 'unimplemented';
     }
   }
 
   function deserializeMap(x) {
     var result = { };
     var id = x[1];
     var keys = x[2];
     var values = x[3];
     for (var i = 0, length = keys.length; i < length; i++) {
       var key = deserializeHelper(keys[i]);
       var value = deserializeHelper(values[i]);
       result[key] = value;
     }
     return result;
   }
 
   function deserializeSendPort(x) {
     var tag = x[1];
     switch (tag) {
       case 'nativejs':
         var id = x[2];
-        return new LocalSendPortSync(id);
+        return new LocalSendPortSync(ReceivePortSync.map[id]);

[sammccall, 2012/07/06 16:01:41]

I think this was just an oversight before?

       case 'dart':
         var isolateId = x[2];
         var portId = x[3];
         return new DartSendPortSync(isolateId, portId);
       default:
         throw 'Illegal SendPortSync type: $tag';
     }
   }
 
+  function deserializeList(x) {
+    var length = x[1];
+    var values = x[2];
+    var result = new Array(length);
+    for (var i = 0; i < length; i++) {
+      result[i] = values[i];
+    }
+    return result;
+  }
+
   window.registerPort = function(name, port) {
     var stringified = JSON.stringify(serialize(port));
     window.localStorage['dart-port:' + name] = stringified;
   };
 
   window.lookupPort = function(name) {
     var stringified = window.localStorage['dart-port:' + name];
     return deserialize(JSON.parse(stringified));
   };
 
@@ skipping 64 matching lines @@
     var result = null;
     var listener = function (e) {
       result = JSON.parse(e.data);
     };
     window.addEventListener(source, listener, false);
     dispatchEvent(target, [source, serialized]);
     window.removeEventListener(source, listener, false);
     return deserialize(result);
   }
 })();