add JsArray and JsObject.asJsMap()

sdk/lib/js/dart2js/js_dart2js.dart

 // Copyright (c) 2013, 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.
 
 library dart.js;
 
+import 'dart:collection' show ListMixin, Maps;
 import 'dart:_foreign_helper' show JS;
 import 'dart:_js_helper' show convertDartClosureToJS;
 
 JsObject get context {
   return new JsObject._fromJs(JS('=Object', 'window'));
 }
 
 JsObject jsify(dynamic data) => data == null ? null : new JsObject._json(data);
 
 class Callback implements Serializable<JsFunction> {
@@ skipping 77 matching lines @@
     return new JsObject._fromJs(JS('=Object', r'''(function(){
 var Type = function(){};
 Type.prototype = #.prototype;
 var instance = new Type();
 ret = #.apply(instance, #);
 ret = Object(ret) === ret ? ret : instance;
 return ret;
 })()''', constr, constr, args));
   }
 
-  factory JsObject._json(data) => new JsObject._fromJs(_convertDataTree(data));
+  factory JsObject._json(data) => _convertToDart(_convertDataTree(data));
 
   static _convertDataTree(data) {
     if (data is Map) {
       final convertedData = JS('=Object', '{}');
       for (var key in data.keys) {
         JS('=Object', '#[#]=#', convertedData, key,
             _convertDataTree(data[key]));
       }
       return convertedData;
     } else if (data is Iterable) {
@@ skipping 32 matching lines @@
       return JS('String', '#.toString()', _convertToJS(this));
     } catch(e) {
       return super.toString();
     }
   }
 
   callMethod(String name, [List args]) =>
       _convertToDart(JS('=Object', '#[#].apply(#, #)', _convertToJS(this), name,
           _convertToJS(this),
           args == null ? null : args.map(_convertToJS).toList()));
+
+  Map<String, dynamic> asDartMap() => new _JsObjectAsMap(this);
 }
 
 class JsFunction extends JsObject implements Serializable<JsFunction> {
   JsFunction._fromJs(jsObject) : super._fromJs(jsObject);
   apply(thisArg, [List args]) =>
       _convertToDart(JS('=Object', '#.apply(#, #)', _convertToJS(this),
           _convertToJS(thisArg),
           args == null ? null : args.map(_convertToJS).toList()));
 }
 
+/// A [JsObject] subtype for JavaScript arrays.
+class JsArray extends JsObject with ListMixin {
+  JsArray._fromJs(jsObject) : super._fromJs(jsObject);
+
+  // Iterable
+  /*@override*/ int get length => super['length'];

[justinfagnani, 2013/08/22 18:29:36]

The /*@override*/ part is visually noisy. Can you remove it or import the actual
annotation from dart:meta? AFIK, we don't really use those annotations much.

[alexandre.ardhuin, 2013/08/23 21:08:33]

Unfortunately there's no library 'dart:meta' there's only a package (meta) but I
don't know if it is legal to use "import 'package:meta/meta.dart'" in /sdk/lib .
So I have removed this comment.
BTW I like this @override because it allows to prevent errors (if the Editor
handles this metadata correctly). For instance if I had put "lenght" instead of
"length" the tools could notify that something is wrong if @override is present
and that the annotated method does not override a method for parent class. Same
thing if the parent class renames an overriden method.

+
+  // Collection
+  /*@override*/ void add(value) { callMethod('push', [value]); }
+
+  // List
+  /*@override*/ operator [](index) {
+    if (index is int && (index < 0 || index >= this.length)) {
+      throw new RangeError.value(index);
+    }
+    return super[index];
+  }
+  /*@override*/ void operator []=(index, value) {
+    if (index is int && (index < 0 || index >= this.length)) {
+      throw new RangeError.value(index);
+    }
+    super[index] = value;
+  }
+  /*@override*/ void set length(int length) { super['length'] = length; }
+  /*@override*/ void sort([int compare(a, b)]) {
+    final sortedList = toList()..sort(compare);
+    setRange(0, sortedList.length, sortedList);
+  }
+  /*@override*/ void insert(int index, element) {
+    callMethod('splice', [index, 0, element]);
+  }
+  /*@override*/ removeAt(int index) {
+    if (index < 0 || index >= this.length) throw new RangeError.value(index);
+    return callMethod('splice', [index, 1])[0];
+  }
+  /*@override*/ removeLast() => callMethod('pop');
+  /*@override*/ void setRange(int start, int length, List from,
+                              [int startFrom = 0]) {
+    final args = [start, length];
+    for(int i = startFrom; i < startFrom + length; i++) {
+      args.add(from[i]);
+    }
+    callMethod('splice', args);
+  }
+  /*@override*/ void removeRange(int start, int end) {
+    callMethod('splice', [start, end - start]);
+  }
+}
+
+class _JsObjectAsMap implements Map<String, dynamic> {
+  JsObject _jsObject;
+
+  _JsObjectAsMap(this._jsObject);
+
+  /*@override*/ operator [](String key) => _jsObject[key];
+  /*@override*/ void operator []=(String key, value) {
+    _jsObject[key] = value;
+  }
+  /*@override*/ remove(String key) {
+    final value = this[key];
+    _jsObject.deleteProperty(key);
+    return value;
+  }
+  /*@override*/ Iterable<String> get keys =>
+      context['Object'].callMethod('keys', [_jsObject]);
+
+  // use Maps to implement functions
+  /*@override*/ bool containsValue(value) => Maps.containsValue(this, value);
+  /*@override*/ bool containsKey(String key) => Maps.containsKey(this, key);
+  /*@override*/ putIfAbsent(String key, ifAbsent()) =>
+      Maps.putIfAbsent(this, key, ifAbsent);
+  /*@override*/ void addAll(Map<String, dynamic> other) {
+    if (other != null) {
+      other.forEach((k,v) => this[k] = v);
+    }
+  }
+  /*@override*/ void clear() => Maps.clear(this);
+  /*@override*/ void forEach(void f(String key, value)) => Maps.forEach(this, f);

[justinfagnani, 2013/08/22 18:29:36]

long line

[alexandre.ardhuin, 2013/08/23 21:08:33]

Done.

+  /*@override*/ Iterable get values => Maps.getValues(this);
+  /*@override*/ int get length => Maps.length(this);
+  /*@override*/ bool get isEmpty => Maps.isEmpty(this);
+  /*@override*/ bool get isNotEmpty => Maps.isNotEmpty(this);
+}
+
 abstract class Serializable<T> {
   T toJs();
 }
 
 dynamic _convertToJS(dynamic o) {
   if (o == null) {
     return null;
   } else if (o is String || o is num || o is bool) {
     return o;
   } else if (o is JsObject) {
     return o._jsObject;
   } else if (o is Serializable) {
     return _convertToJS(o.toJs());
   } else if (o is Function) {
     return _convertToJS(new Callback(o));
+  } else if (o is Map) {
+    return _convertToJS(jsify(o));
+  } else if (o is Iterable) {
+    return _convertToJS(jsify(o));
   } else {
     return JS('=Object', 'new DartProxy(#)', o);
   }
 }
 
 dynamic _convertToDart(dynamic o) {
   if (JS('bool', '# == null', o)) {
     return null;
   } else if (JS('bool', 'typeof # == "string" || # instanceof String', o, o) ||
       JS('bool', 'typeof # == "number" || # instanceof Number', o, o) ||
       JS('bool', 'typeof # == "boolean" || # instanceof Boolean', o, o)) {
     return o;
   } else if (JS('bool', '# instanceof Function', o)) {
-    return new JsFunction._fromJs(JS('=Object', '#', o));
+    return new JsFunction._fromJs(JS('var', '#', o));
+  } else if (JS('bool', '# instanceof Array', o)) {
+    return new JsArray._fromJs(JS('var', '#', o));
   } else if (JS('bool', '# instanceof DartProxy', o)) {
     return JS('var', '#.o', o);
   } else {
-    return new JsObject._fromJs(JS('=Object', '#', o));
+    return new JsObject._fromJs(JS('var', '#', o));
   }
 }