Support JS$ prefix for dart and fix bug where _operator_getter and the [] operator were used incons…

sdk/lib/html/html_common/conversions_dartium.dart

 part of html_common;
 
 convertDartToNative_PrepareForStructuredClone(value) =>
     new _StructuredCloneDartium().convertDartToNative_PrepareForStructuredClone(value);
 
 convertNativeToDart_AcceptStructuredClone(object, {mustCopy: false}) =>
     new _AcceptStructuredCloneDartium().convertNativeToDart_AcceptStructuredClone(object, mustCopy: mustCopy);
 
 class _StructuredCloneDartium extends _StructuredClone {
   newJsMap() => new js.JsObject(js.context["Object"]);
@@ skipping 108 matching lines @@
       return jsObject;
     }
 
     var wrapper = js.getDartHtmlWrapperFor(jsObject);
     // if we have a wrapper return the Dart instance.
     if (wrapper != null) {
       return wrapper;
     }
 
     if (jsObject is js.JsArray) {
-      var wrappingList = new DartHtmlWrappingList(jsObject);
-      js.setDartHtmlWrapperFor(jsObject, wrappingList);
-      return wrappingList;
+      wrapper = new js.JSArray.create(jsObject);
+      js.setDartHtmlWrapperFor(jsObject, wrapper);
+      return wrapper;
+    }
+    if (jsObject is js.JsFunction) {
+      wrapper = new js.JSFunction.create(jsObject);
+      js.setDartHtmlWrapperFor(jsObject, wrapper);
+      return wrapper;
     }
 
     // Try the most general type conversions on it.
     // TODO(alanknight): We may be able to do better. This maintains identity,
     // which is useful, but expensive. And if we nest something that only
     // this conversion handles, how does that work? e.g. a list of maps of elements.
     var converted = convertNativeToDart_SerializedScriptValue(jsObject);
     if (!identical(converted, jsObject)) {
       return converted;
     }
 
     var constructor = js.JsNative.getProperty(jsObject, 'constructor');
     if (constructor == null) {
       // Perfectly valid case for JavaScript objects where __proto__ has
       // intentionally been set to null.
-      js.setDartHtmlWrapperFor(jsObject, jsObject);
+      js.setDartHtmlWrapperFor(jsObject, new js.JSObject.create(jsObject));
       return jsObject;
     }
     var jsTypeName = js.JsNative.getProperty(constructor, 'name');
     if (jsTypeName is! String || jsTypeName.length == 0) {
       // Not an html type.
-      js.setDartHtmlWrapperFor(jsObject, jsObject);
-      return jsObject;
+      wrapper = new js.JSObject.create(jsObject);
+      js.setDartHtmlWrapperFor(jsObject, wrapper);
+      return wrapper;
     }
 
     var dartClass_instance;
     var customElementClass = null;
     var extendsTag = "";
     var custom = getCustomElementEntry(jsObject);
     if (custom != null) {
       customElementClass = custom['type'];
       extendsTag = custom['extends'];
     }
@@ skipping 32 matching lines @@
     if (func != null) {
       dartClass_instance = func();
 
       // Wrap our Dart instance in both directions.
       dartClass_instance.blink_jsObject = jsObject;
       js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
     }
 
     // TODO(jacobr): cache that this is not a dart:html JS class.
     return dartClass_instance;
-  } catch(e, stacktrace){
+  } catch (e, stacktrace) {
     if (interop_checks) {
-      if (e is DebugAssertException)
-        window.console.log("${e.message}\n ${stacktrace}");
-      else
-        window.console.log("${stacktrace}");
+      if (e is DebugAssertException) window.console
+          .log("${e.message}\n ${stacktrace}");
+      else window.console.log("${stacktrace}");
     }
   }
 
   return null;
 }
 
 /**
  * Create Dart class that maps to the JS Type, add the JsObject as an expando
  * on the Dart class and return the created Dart class.
  */
 wrap_jso_no_SerializedScriptvalue(jsObject) {
   try {
     if (jsObject is! js.JsObject || jsObject == null) {
       // JS Interop converted the object to a Dart class e.g., Uint8ClampedList.
       // or it's a simple type.
       return jsObject;
     }
 
     // TODO(alanknight): With upgraded custom elements this causes a failure because
     // we need a new wrapper after the type changes. We could possibly invalidate this
     // if the constructor name didn't match?
     var wrapper = js.getDartHtmlWrapperFor(jsObject);
     if (wrapper != null) {
       return wrapper;
     }
 
-    // TODO(jacobr): auomatically wrapping JsArray here is fundamentally broken
-    // as it hijacks adding custom methods on JS Array classes as part of the
-    // new typed DartJsInterop.
-    // To make this work we really need to make DartHtmlWrappingList extend
-    // JsArrayImpl. Fixing this issue needs to be part of a broader refactor
-    // that allows calling custom typed JS interop methods on all dart:html
-    // classes.
     if (jsObject is js.JsArray) {
-      var wrappingList = new DartHtmlWrappingList(jsObject);
-      js.setDartHtmlWrapperFor(jsObject, wrappingList);
-      return wrappingList;
+      wrapper = new js.JSArray.create(jsObject);
+      js.setDartHtmlWrapperFor(jsObject, wrapper);
+      return wrapper;
+    }
+    if (jsObject is js.JsFunction) {
+      wrapper = new js.JSFunction.create(jsObject);
+      js.setDartHtmlWrapperFor(jsObject, wrapper);
+      return wrapper;
     }
 
     var constructor = js.JsNative.getProperty(jsObject, 'constructor');
     if (constructor == null) {
       // Perfectly valid case for JavaScript objects where __proto__ has
       // intentionally been set to null.
-      js.setDartHtmlWrapperFor(jsObject, jsObject);
+      js.setDartHtmlWrapperFor(jsObject, new js.JSObject.create(jsObject));
       return jsObject;
     }
     var jsTypeName = js.JsNative.getProperty(constructor, 'name');
     if (jsTypeName is! String || jsTypeName.length == 0) {
       // Not an html type.
-      js.setDartHtmlWrapperFor(jsObject, jsObject);
-      return jsObject;
+      wrapper = new js.JSObject.create(jsObject);
+      js.setDartHtmlWrapperFor(jsObject, wrapper);
+      return wrapper;
     }
 
     var func = getHtmlCreateFunction(jsTypeName);
     if (func != null) {
       var dartClass_instance = func();
       dartClass_instance.blink_jsObject = jsObject;
       js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
       return dartClass_instance;
     }
-    return jsObject;
-  } catch(e, stacktrace){
+    wrapper = new js.JSObject.create(jsObject);
+    js.setDartHtmlWrapperFor(jsObject, wrapper);
+    return wrapper;
+  } catch (e, stacktrace) {
     if (interop_checks) {
-      if (e is DebugAssertException)
-        window.console.log("${e.message}\n ${stacktrace}");
-      else
-        window.console.log("${stacktrace}");
+      if (e is DebugAssertException) window.console
+          .log("${e.message}\n ${stacktrace}");
+      else window.console.log("${stacktrace}");
     }
   }
 
   return null;
 }
 
 /**
  * Create Dart class that maps to the JS Type that is the JS type being
  * extended using JS interop createCallback (we need the base type of the
  * custom element) not the Dart created constructor.
@@ skipping 36 matching lines @@
   var hasAttribute = false;
 
   var jsObject;
   var tag = "";
   var runtimeType = element.runtimeType;
   if (runtimeType == HtmlElement) {
     tag = element.localName;
   } else if (runtimeType == TemplateElement) {
     // Data binding with a Dart class.
     tag = element.attributes['is'];
-  } else if (runtimeType == js.JsObjectImpl) {
+  } else if (runtimeType == js.JsObject) {
     // It's a Polymer core element (written in JS).
     // Make sure it's an element anything else we can ignore.
     if (element.hasProperty('nodeType') && element['nodeType'] == 1) {
       if (js.JsNative.callMethod(element, 'hasAttribute', ['is'])) {
         hasAttribute = true;
         // It's data binding use the is attribute.
         tag = js.JsNative.callMethod(element, 'getAttribute', ['is']);
       } else {
         // It's a custom element we want the local name.
         tag = element['localName'];
       }
     }
   } else {
-    throw new UnsupportedError('Element is incorrect type. Got ${runtimeType}, expected HtmlElement/HtmlTemplate/JsObjectImpl.');
+    throw new UnsupportedError(
+        'Element is incorrect type. Got ${runtimeType}, expected HtmlElement/HtmlTemplate/JsObject.');
   }
 
   var entry = _knownCustomElements[tag];
   if (entry != null) {
     // If there's an 'is' attribute then check if the extends tag registered
     // matches the tag if so then return the entry that's registered for this
     // extendsTag or if there's no 'is' tag then return the entry found.
     if ((hasAttribute && entry['extends'] == tag) || !hasAttribute) {
       return entry;
     }
@@ skipping 10 matching lines @@
       {'type': dartClass, 'extends': extendTag != null ? extendTag : "" };
 }
 
 Type getCustomElementType(object) {
   var entry = getCustomElementEntry(object);
   if (entry != null) {
     return entry['type'];
   }
   return null;
 }
-
-/**
- * Wraps a JsArray and will call wrap_jso on its entries.
- */
-class DartHtmlWrappingList extends ListBase implements NativeFieldWrapperClass2 {
-  DartHtmlWrappingList(this.blink_jsObject);
-
-  final js.JsArray blink_jsObject;
-
-  operator [](int index) => wrap_jso_no_SerializedScriptvalue(js.JsNative.getArrayIndex(blink_jsObject, index));
-
-  operator []=(int index, value) => blink_jsObject[index] = value;
-
-  int get length => blink_jsObject.length;
-  int set length(int newLength) => blink_jsObject.length = newLength;
-}