Support references in serialization.

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 29 matching lines @@
 function SendPortSync() {
 }
 
 function ReceivePortSync() {
   this.id = ReceivePortSync.id++;
   ReceivePortSync.map[this.id] = this;
 }
 
 (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]);
+    var visited = [];
+    function checkedSerialization(obj, serializer) {
+      for (var i = 0; i < visited.length; i++) {
+        if (visited[i] === obj) {

[vsm, 2012/07/13 14:10:40]

An expando on obj to avoid the linear search?

[Anton Muhin, 2012/07/13 15:30:58]

That's probably stupid, but for some reason I don't want to add/remove expando
on objects not to break various JS optimizations.  thoughts?

[vsm, 2012/07/13 15:39:01]

You may be right.  From what I understand, deleting turns the object to a
dictionary.  That may be worse than the linear search here depending on usage. 
How about a comment on your concern?

On 2012/07/13 15:30:58, Anton Mukhin wrote:

[Anton Muhin, 2012/07/13 15:43:29]

Good idea, done.

On 2012/07/13 15:39:01, vsm wrote:

+          return ['ref', 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.isolateId, message.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] = serialize(message[keys[i]]);
+      var id = visited.length;
+      visited.push(obj);
+      return serializer(id);
+    }
+
+    function do(message) {

[podivilov, 2012/07/13 11:07:55]

doSerialize maybe?

[Anton Muhin, 2012/07/13 15:30:58]

Done.

+      if (message == null) {
+        return null;  // Convert undefined to null.
+      } else if (typeof(message) == 'string' ||

[podivilov, 2012/07/13 11:07:55]

no else, please

[Anton Muhin, 2012/07/13 15:30:58]

just keeping the way old code was structured.

+                typeof(message) == 'number' ||

[podivilov, 2012/07/13 11:07:55]

wrong indentation

[Anton Muhin, 2012/07/13 15:30:58]

Done.

+                typeof(message) == 'boolean') {
+        return message;
+      } else if (message instanceof Array) {
+        return checkedSerialization(message, function(id) {

[podivilov, 2012/07/13 11:07:55]

up to you, but I think
var index = visited.indexOf(message);
if (index !== -1) return ['ref', index];
// serialize, push, return
is ways easier to read.

[Anton Muhin, 2012/07/13 15:30:58]

Absolutely, thanks, I should learn JS core lib.

On 2012/07/13 11:07:55, podivilov wrote:

+          var values = new Array(message.length);
+          for (var i = 0; i < message.length; i++) {
+            values[i] = do(message[i]);
+          }
+          return [ 'list', id, values ];
+        });
+      } else if (message instanceof LocalSendPortSync) {
+        return [ 'sendport', 'nativejs', message.receivePort.id ];
+      } else if (message instanceof DartSendPortSync) {
+        return [ 'sendport', 'dart', message.isolateId, message.portId ];
+      } else {
+        return checkedSerialization(message, function(id) {
+          var keys = Object.getOwnPropertyNames(message);
+          var values = new Array(keys.length);
+          for (var i = 0; i < keys.length; i++) {
+            values[i] = do(message[keys[i]]);
+          }
+          return [ 'map', id, keys, values ];
+        });
       }
-      return [ 'map', id, keys, values ];
     }
+    return do(message);
   }
 
   function deserialize(message) {
     return deserializeHelper(message);
   }
 
   function deserializeHelper(x) {
     if (x == null ||
         typeof(x) == 'string' ||
         typeof(x) == 'number' ||
@@ skipping 123 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);
   }
 })();