Merge pull request #132 from Rexios80/add-missing-getters

Fix issues with new js interop

lib/src/generated/event/event.dart

@@ -42,9 +42,9 @@ extension type event._(JSObject _) implements JSObject {
   );
   external static void trigger(
     JSObject /*Object<null>*/ instance,
-    String eventName,
+    String eventName, [
     JSAny? /*UNPARSED:...?*/ eventArgs,
-  );
+  ]);
   external static MapsEventListener addDomListener(
     JSObject /*Object<null>*/ instance,
     String eventName,

lib/src/generated/image_overlay/map_type.dart

@@ -24,13 +24,30 @@ extension type MapType._(JSObject _) implements JSObject {
     String? name,
     Projection? projection,
   });
+  Element? Function(
+    Point? tileCoord,
+    num? zoom,
+    Document? ownerDocument,
+  ) get getTile {
+    final function = (getProperty('getTile'.toJS) as JSObject)
+        .callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return (tileCoord, zoom, ownerDocument) => function.callAsFunction(
+        null, tileCoord, zoom?.toJS, ownerDocument) as Element?;
+  }
+
   void set getTile(
           Element? Function(
             Point tileCoord,
             num zoom,
             Document ownerDocument,
           ) getTile) =>
       setProperty('getTile'.toJS, getTile.toJS);
+  void Function([Element? tile]) get releaseTile {
+    final function = (getProperty('releaseTile'.toJS) as JSObject)
+        .callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return ([tile]) => function.callAsFunction(null, tile);
+  }
+
   void set releaseTile(
           void Function(
             Element? tile,

lib/src/generated/image_overlay/projection.dart

@@ -16,12 +16,32 @@ part of '../image_overlay.dart';
 
 extension type Projection._(JSObject _) implements JSObject {
   factory Projection() => JSObject() as Projection;
+  Point? Function(
+    LatLngOrLatLngLiteral latLng, [
+    Point? point,
+  ]) get fromLatLngToPoint {
+    final function = (getProperty('fromLatLngToPoint'.toJS) as JSObject)
+        .callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return (latLng, [point]) =>
+        function.callAsFunction(null, latLng, point) as Point?;
+  }
+
   void set fromLatLngToPoint(
           Point? Function(
             LatLngOrLatLngLiteral latLng, [
             Point? point,
           ]) fromLatLngToPoint) =>
       setProperty('fromLatLngToPoint'.toJS, fromLatLngToPoint.toJS);
+  LatLng? Function(
+    Point? pixel, [
+    bool? noClampNoWrap,
+  ]) get fromPointToLatLng {
+    final function = (getProperty('fromPointToLatLng'.toJS) as JSObject)
+        .callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return (pixel, [noClampNoWrap]) =>
+        function.callAsFunction(null, pixel, noClampNoWrap?.toJS) as LatLng?;
+  }
+
   void set fromPointToLatLng(
           LatLng? Function(
             Point pixel, [

lib/src/generated/marker.dart

@@ -14,6 +14,7 @@
 
 import 'dart:async' show Stream, StreamController;
 import 'dart:js_interop';
+import 'dart:js_interop_unsafe' show JSObjectUnsafeUtilExtension;
 
 import 'coordinates.dart' show LatLng, LatLngOrLatLngLiteral, Point, Size;
 import 'event.dart' show MVCObject, MapsEventListener, event;

lib/src/generated/marker/marker.dart

@@ -19,6 +19,8 @@ extension type Marker._(MVCObject _) implements MVCObject {
   external Marker([
     MarkerOptions? opts,
   ]);
+  bool isDraggableDefined() => callMethod('getDraggable'.toJS) != null;
+
   external static int get MAX_ZINDEX;
   @JS('getAnimation')
   external Animation? _getAnimation();

lib/src/generated/polygon.dart

@@ -14,6 +14,7 @@
 
 import 'dart:async' show Stream, StreamController;
 import 'dart:js_interop';
+import 'dart:js_interop_unsafe' show JSObjectUnsafeUtilExtension;
 
 import 'coordinates.dart'
     show

lib/src/generated/polygon/circle.dart

@@ -22,6 +22,8 @@ extension type Circle._(MVCObject _) implements MVCObject {
   external Circle.js([
     JSAny? /*(Circle|CircleLiteral|CircleOptions)?*/ circleOrCircleOptions,
   ]);
+  bool isDraggableDefined() => callMethod('getDraggable'.toJS) != null;
+
   @JS('getBounds')
   external LatLngBounds? _getBounds();
   LatLngBounds? get bounds => _getBounds();

lib/src/generated/polygon/polygon.dart

@@ -19,6 +19,8 @@ extension type Polygon._(MVCObject _) implements MVCObject {
   external Polygon([
     PolygonOptions? opts,
   ]);
+  bool isDraggableDefined() => callMethod('getDraggable'.toJS) != null;
+
   @JS('getDraggable')
   external bool _getDraggable();
   bool get draggable => _getDraggable();

lib/src/generated/polygon/polyline.dart

@@ -19,6 +19,8 @@ extension type Polyline._(MVCObject _) implements MVCObject {
   external Polyline([
     PolylineOptions? opts,
   ]);
+  bool isDraggableDefined() => callMethod('getDraggable'.toJS) != null;
+
   @JS('getDraggable')
   external bool _getDraggable();
   bool get draggable => _getDraggable();

tool/generate_lib.dart

@@ -510,6 +510,10 @@ extension LatLngBoundsOrLatLngBoundsLiteral$Ext on LatLngBoundsOrLatLngBoundsLit
         '  external Circle.copy(Circle circle);',
         '  external Circle.copyLiteral(CircleLiteral circle);',
       ]);
+      customCode.add('''
+  bool isDraggableDefined() => callMethod('getDraggable'.toJS) != null;
+      ''');
+      customDependencies.add('JSObjectUnsafeUtilExtension');
 
     case 'Projection':
       customDependencies.addAll([
@@ -521,10 +525,24 @@ extension LatLngBoundsOrLatLngBoundsLiteral$Ext on LatLngBoundsOrLatLngBoundsLit
       customConstructors
           .add('factory Projection() => JSObject() as Projection;');
       customCode.add('''
+  Point? Function(
+    LatLngOrLatLngLiteral latLng, [
+    Point? point,
+  ]) get fromLatLngToPoint {
+    final function = (getProperty('fromLatLngToPoint'.toJS) as JSObject).callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return (latLng, [point]) => function.callAsFunction(null, latLng, point) as Point?;
+  }
   void set fromLatLngToPoint(Point? Function(
     LatLngOrLatLngLiteral latLng, [
     Point? point,
   ]) fromLatLngToPoint) => setProperty('fromLatLngToPoint'.toJS, fromLatLngToPoint.toJS);
+  LatLng? Function(
+    Point? pixel, [
+    bool? noClampNoWrap,
+  ]) get fromPointToLatLng {
+    final function = (getProperty('fromPointToLatLng'.toJS) as JSObject).callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return (pixel, [noClampNoWrap]) => function.callAsFunction(null, pixel, noClampNoWrap?.toJS) as LatLng?;
+  }
   void set fromPointToLatLng(LatLng? Function(
     Point pixel, [
     bool? noClampNoWrap,
@@ -551,11 +569,23 @@ extension LatLngBoundsOrLatLngBoundsLiteral$Ext on LatLngBoundsOrLatLngBoundsLit
         'Document',
       ]);
       customCode.add('''
+  Element? Function(
+    Point? tileCoord,
+    num? zoom,
+    Document? ownerDocument,
+  ) get getTile {
+    final function = (getProperty('getTile'.toJS) as JSObject).callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return (tileCoord, zoom, ownerDocument) => function.callAsFunction(null, tileCoord, zoom?.toJS, ownerDocument) as Element?;
+  }
   void set getTile(Element? Function(
     Point tileCoord,
     num zoom,
     Document ownerDocument,
   ) getTile) => setProperty('getTile'.toJS, getTile.toJS);
+  void Function([Element? tile]) get releaseTile {
+    final function = (getProperty('releaseTile'.toJS) as JSObject).callMethod('bind'.toJS, [this].toJS) as JSFunction;
+    return ([tile]) => function.callAsFunction(null, tile);
+  }
   void set releaseTile(void Function(
     Element? tile,
   ) releaseTile) => setProperty('releaseTile'.toJS, releaseTile.toJS);
@@ -618,6 +648,20 @@ extension LatLngBoundsOrLatLngBoundsLiteral$Ext on LatLngBoundsOrLatLngBoundsLit
     case 'DataGeometryCollection':
       methods.removeWhere(
           (e) => {'forEachLatLng', 'getType'}.contains(e.method.name));
+    case 'event':
+      final triggerMethod =
+          methods.firstWhere((e) => e.method.name == 'trigger');
+      final eventArgsParameter = triggerMethod.method.parameters
+          .firstWhere((e) => e.name == 'eventArgs');
+      triggerMethod.method.parameters.remove(eventArgsParameter);
+      triggerMethod.method.optionalParameters.add(eventArgsParameter);
+    case 'Marker':
+    case 'Polyline':
+    case 'Polygon':
+      customCode.add('''
+  bool isDraggableDefined() => callMethod('getDraggable'.toJS) != null;
+      ''');
+      customDependencies.add('JSObjectUnsafeUtilExtension');
   }
   for (final method in methods) {
     if (method.method.returnType.startsWith('JSPromise<') &&