Make Dartium JS interop implementation more robust in the presence of JS paths that touch dart:html…

sdk/lib/js/dartium/js_dartium.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.
 
 /**
  * Support for interoperating with JavaScript.
  *
  * This library provides access to JavaScript objects from Dart, allowing
  * Dart code to get and set properties, and call methods of JavaScript objects
  * and invoke JavaScript functions. The library takes care of converting
@@ skipping 292 matching lines @@
   if (declaration is mirrors.MethodMirror && declaration.isSetter) {
     assert(name.endsWith("="));
     name = name.substring(0, name.length - 1);
   }
   return name;
 }
 
 final _JS_LIBRARY_PREFIX = "js_library";
 final _UNDEFINED_VAR = "_UNDEFINED_JS_CONST";
 
-String _accessJsPath(String path) =>
-    "${_JS_LIBRARY_PREFIX}.context${path.split(".").map((p) => "['$p']").join('')}";
+String _accessJsPath(String path) {
+  var parts = path.split(".");
+  var sb = new StringBuffer();
+  sb
+    ..write('${_JS_LIBRARY_PREFIX}.JsNative.getProperty(' * parts.length)
+    ..write("${_JS_LIBRARY_PREFIX}.context");
+  for (var p in parts) {
+    sb.write(", '$p')");
+  }
+  return sb.toString();
+}
+
+
+String _accessJsPathSetter(String path) {
+  var parts = path.split(".");
+  return "${_JS_LIBRARY_PREFIX}.JsNative.setProperty(${_accessJsPath(parts.getRange(0, parts.length - 1).join('.'))
+      }, '{parts.end}', v)";
+}
 
 @Deprecated("Internal Use Only")
 void addMemberHelper(
     mirrors.MethodMirror declaration, String path, StringBuffer sb,
     {bool isStatic: false, String memberName}) {
   if (!declaration.isConstructor) {
     var jsName = _getJsMemberName(declaration);
     path = (path != null && path.isNotEmpty) ? "${path}.${jsName}" : jsName;
   }
   var name = memberName != null ? memberName : _getDeclarationName(declaration);
   if (declaration.isConstructor) {
     sb.write("factory");
   } else if (isStatic) {
     sb.write("static");
   } else {
     sb.write("patch");
   }
   sb.write(" ");
   if (declaration.isGetter) {
-    sb.write("get $name => ${_accessJsPath(path)};");
+    sb.write("get $name => ${_JS_LIBRARY_PREFIX}.maybeWrapTypedInterop(${_accessJsPath(path)});");
   } else if (declaration.isSetter) {
-    sb.write("set $name(v) => ${_accessJsPath(path)} = v;");
+    sb.write("set $name(v) => ${_JS_LIBRARY_PREFIX}.maybeWrapTypedInterop(${_accessJsPathSetter(path)});");
   } else {
     sb.write("$name(");
     bool hasOptional = false;
     int i = 0;
     var args = <String>[];
     for (var p in declaration.parameters) {
       assert(!p.isNamed); // XXX throw
       assert(!p.hasDefaultValue);
       if (i > 0) {
         sb.write(", ");
       }
       if (p.isOptional && !hasOptional) {
         sb.write("[");
         hasOptional = true;
       }
       var arg = "p$i";
       args.add(arg);
       sb.write(arg);
       if (p.isOptional) {
         sb.write("=${_UNDEFINED_VAR}");
       }
       i++;
     }
     if (hasOptional) {
       sb.write("]");
     }
     // TODO(jacobr):
     sb.write(") => ");
+    sb.write('${_JS_LIBRARY_PREFIX}.maybeWrapTypedInterop(');
     if (declaration.isConstructor) {
       sb.write("new ${_JS_LIBRARY_PREFIX}.JsObject(");
     }
     sb
       ..write(_accessJsPath(path))
       ..write(declaration.isConstructor ? "," : ".apply(")
       ..write("[${args.join(",")}]");
 
     if (hasOptional) {
       sb.write(".takeWhile((i) => i != ${_UNDEFINED_VAR}).toList()");
     }
-    sb.write(");");
+    sb.write("));");
   }
   sb.write("\n");
 }
 
 // TODO(jacobr): make this check more robust.
 bool _isExternal(mirrors.Mirror mirror) {
   /*
   var source = mirror.source;
   return source != null && source.startsWith("external ");
   */
@@ skipping 459 matching lines @@
 
 bool get _finalized native "Js_interfacesFinalized_Callback";
 
 JsObject get context {
   if (_cachedContext == null) {
     _cachedContext = _context;
   }
   return _cachedContext;
 }
 
+@Deprecated("Internal Use Only")
+maybeWrapTypedInterop(o) =>
+    html_common.wrap_jso_no_SerializedScriptvalue(o);
+
 _maybeWrap(o) {
   var wrapped = html_common.wrap_jso_no_SerializedScriptvalue(o);
   if (identical(wrapped, o)) return o;
   return (wrapped is html.Blob ||
       wrapped is html.Event ||
       wrapped is indexed_db.KeyRange ||
       wrapped is html.ImageData ||
       wrapped is html.Node ||
       wrapped is TypedData ||
       wrapped is html.Window) ? wrapped : o;
@@ skipping 229 matching lines @@
         }
         var ret = this[name];
         if (matches != null && matches._checkReturnType(ret)) return ret;
         if (ret is Function ||
             (ret is JsFunction /* shouldn't be needed in the future*/) &&
                 _allowedMethods.containsKey(
                     invocation.memberName)) return ret; // Warning: we have not bound "this"... we could type check on the Function but that is of little value in Dart.
         throwError();
       } else {
         // TODO(jacobr): should we throw if the JavaScript object doesn't have the property?
-        return this[name];
+        return maybeWrapTypedInterop(this._operator_getter(name));
       }
     } else if (invocation.isSetter) {
       if (CHECK_JS_INVOCATIONS) {
         var matches = _allowedSetters[invocation.memberName];
         if (matches == null ||
             !matches.checkInvocation(invocation)) throwError();
       }
       assert(name.endsWith("="));
       name = name.substring(0, name.length - 1);
-      return this[name] = invocation.positionalArguments.first;
+      return maybeWrapTypedInterop(_operator_setter(
+          name, invocation.positionalArguments.first));
     } else {
       // TODO(jacobr): also allow calling getters that look like functions.
       var matches;
       if (CHECK_JS_INVOCATIONS) {
         matches = _allowedMethods[invocation.memberName];
         if (matches == null ||
             !matches.checkInvocation(invocation)) throwError();
       }
-      var ret = this.callMethod(name, _buildArgs(invocation));
+      var ret = maybeWrapTypedInterop(this._callMethod(name, _buildArgs(invocation)));
       if (CHECK_JS_INVOCATIONS) {
         if (!matches._checkReturnType(ret)) throwError();
       }
       return ret;
     }
   }
 
   _callMethod(String name, List args) native "JsObject_callMethod";
 }
 
 // JavaScript interop methods that do not automatically wrap to dart:html types.
 // Warning: this API is not exposed to dart:js.
 @Deprecated("Internal Use Only")
 class JsNative {
-  static getProperty(JsObject o, name) {
-    return o._operator_getter(name);
+  static getProperty(o, name) {
+    o = unwrap_jso(o);
+    return o != null ? o._operator_getter(name) : null;
   }
 
-  static callMethod(JsObject o, String method, List args) {
-    return o._callMethod(method, args);
+  static setProperty(o, name, value) {
+    return unwrap_jso(o)._operator_setter(name, value);
+  }
+
+  static callMethod(o, String method, List args) {
+    return unwrap_jso(o)._callMethod(method, args);
   }
 
   static getArrayIndex(JsArray array, int index) {
     array._checkIndex(index);
     return getProperty(array, index);
   }
 
   /**
    * Same behavior as new JsFunction.withThis except that JavaScript "this" is not
    * wrapped.
@@ skipping 218 matching lines @@
     return f;
   } else {
     var ret = _interopCaptureThisExpando[f];
     if (ret == null) {
       ret = new JsFunction.withThis(f);
       _interopCaptureThisExpando[f] = ret;
     }
     return ret;
   }
 }