v0.8.0

ethanblake4 · ethanblake4 · commit f4e56929fb2b · 2025-07-19T20:07:45.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8.0
+- Support for dart_eval v0.8.0
+- Add exported library mappings to allow referencing flutter_eval classes
+  in the dart_eval binding generator
+
 ## 0.7.8
 - Support for Flutter 3.32
 - Export the Foundation library to allow using `$Key` and other classes
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  dart_eval: ^0.7.9
+  dart_eval: ^0.8.0
   flutter_eval:
     path: ../
 
diff --git a/lib/flutter_eval.dart b/lib/flutter_eval.dart
@@ -4,7 +4,6 @@ library flutter_eval;
 
 export 'src/flutter_eval.dart';
 
-import 'package:dart_eval/dart_eval.dart';
 import 'package:dart_eval/dart_eval_bridge.dart';
 import 'package:flutter_eval/src/animation.dart';
 import 'package:flutter_eval/src/animation/animation.dart';
@@ -92,19 +91,6 @@ import 'package:flutter_eval/src/widgets/text.dart';
 /// Global instance of [FlutterEvalPlugin]
 const flutterEvalPlugin = FlutterEvalPlugin();
 
-/// Setup flutter_eval classes for use in a dart_eval [Compiler].
-@Deprecated("Use compiler.addPlugin(flutterEvalPlugin) instead.")
-void setupFlutterForCompile(EvalPluginRegistry registry) {
-  registry.addPlugin(flutterEvalPlugin);
-}
-
-/// Setup Flutter classes for use in a dart_eval [Runtime]. After
-/// calling this function, you must call `runtime.setup()`.
-@Deprecated("Use runtime.addPlugin(flutterEvalPlugin) instead.")
-void setupFlutterForRuntime(Runtime runtime) {
-  runtime.addPlugin(flutterEvalPlugin);
-}
-
 /// A [EvalPlugin] for dart_eval that provides Flutter classes.
 class FlutterEvalPlugin implements EvalPlugin {
   const FlutterEvalPlugin();
@@ -306,6 +292,17 @@ class FlutterEvalPlugin implements EvalPlugin {
         'package:flutter/src/widgets/framework.dart', widgetsFrameworkSource));
     registry.addSource(DartSource(
         'package:flutter/src/widgets/basic.dart', widgetsBasicSource));
+
+    registry.addExportedLibraryMapping('package:flutter/src/animation', 'package:flutter_eval/animation.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/foundation', 'package:flutter_eval/foundation.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/gestures', 'package:flutter_eval/gestures.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/material', 'package:flutter_eval/material.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/painting', 'package:flutter_eval/painting.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/rendering', 'package:flutter_eval/rendering.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/scheduler', 'package:flutter_eval/scheduler.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/services', 'package:flutter_eval/services.dart');
+    registry.addExportedLibraryMapping('package:flutter/src/widgets', 'package:flutter_eval/widgets.dart');
+    registry.addExportedLibraryMapping('dart:ui', 'package:flutter_eval/ui.dart');
   }
 
   @override
diff --git a/lib/src/animation/animation.dart b/lib/src/animation/animation.dart
@@ -72,7 +72,7 @@ class $Animation implements $Instance {
                 BridgeTypeSpec(
                     'package:flutter/src/foundation/change_notifier.dart',
                     'ValueListenable'),
-                [BridgeTypeRef.ref('T')])
+                [BridgeTypeAnnotation(BridgeTypeRef.ref('T'))])
           ],
           $extends: $Listenable.$type),
       constructors: {},
diff --git a/lib/src/material/app_bar.dart b/lib/src/material/app_bar.dart
@@ -26,7 +26,8 @@ class $AppBar implements $Instance {
               BridgeParameter(
                   'actions',
                   BridgeTypeAnnotation(BridgeTypeRef(
-                      BridgeTypeSpec('dart:core', 'List'), [$Widget.$type])),
+                      BridgeTypeSpec('dart:core', 'List'),
+                      [BridgeTypeAnnotation($Widget.$type)])),
                   true),
               BridgeParameter(
                   'flexibleSpace', BridgeTypeAnnotation($Widget.$type), true),
diff --git a/lib/src/material/page.dart b/lib/src/material/page.dart
@@ -15,8 +15,8 @@ class $MaterialPageRoute implements $Instance {
       BridgeClassType($type,
           isAbstract: true,
           generics: {'T': BridgeGenericParam()},
-          $extends:
-              BridgeTypeRef($PageRoute$bridge.$spec, [BridgeTypeRef.ref('T')])),
+          $extends: BridgeTypeRef($PageRoute$bridge.$spec,
+              [BridgeTypeAnnotation(BridgeTypeRef.ref('T'))])),
       constructors: {
         '': BridgeConstructorDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation($type),
diff --git a/lib/src/painting/image_provider.dart b/lib/src/painting/image_provider.dart
@@ -164,7 +164,7 @@ class $MemoryImage implements $Instance {
             BridgeParameter(
               'data',
               BridgeTypeAnnotation(BridgeTypeRef(
-                  CoreTypes.list, [BridgeTypeRef(CoreTypes.int)])),
+                  CoreTypes.list, [BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.int))])),
               false,
             ),
           ],
diff --git a/lib/src/services/platform_channel.dart b/lib/src/services/platform_channel.dart
@@ -35,8 +35,8 @@ class $MethodChannel implements $Instance {
       },
       methods: {
         'invokeMethod': BridgeMethodDef(BridgeFunctionDef(
-            returns: BridgeTypeAnnotation(
-                BridgeTypeRef(CoreTypes.future, [BridgeTypeRef.ref('T')])),
+            returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.future,
+                [BridgeTypeAnnotation(BridgeTypeRef.ref('T'))])),
             generics: {
               'T': BridgeGenericParam()
             },
@@ -48,7 +48,8 @@ class $MethodChannel implements $Instance {
             ])),
         'invokeListMethod': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.future, [
-              BridgeTypeRef(CoreTypes.list, [BridgeTypeRef.ref('T')])
+              BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.list,
+                  [BridgeTypeAnnotation(BridgeTypeRef.ref('T'))]))
             ])),
             generics: {
               'T': BridgeGenericParam()
@@ -61,8 +62,10 @@ class $MethodChannel implements $Instance {
             ])),
         'invokeMapMethod': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.future, [
-              BridgeTypeRef(CoreTypes.map,
-                  [BridgeTypeRef.ref('K'), BridgeTypeRef.ref('V')])
+              BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.map, [
+                BridgeTypeAnnotation(BridgeTypeRef.ref('K')),
+                BridgeTypeAnnotation(BridgeTypeRef.ref('V'))
+              ]))
             ])),
             generics: {
               'K': BridgeGenericParam(),
diff --git a/lib/src/widgets/basic.dart b/lib/src/widgets/basic.dart
@@ -350,7 +350,7 @@ class $Column implements $Instance {
               BridgeParameter(
                   'children',
                   BridgeTypeAnnotation(
-                      BridgeTypeRef(CoreTypes.list, [$Widget.$type])),
+                      BridgeTypeRef(CoreTypes.list, [BridgeTypeAnnotation($Widget.$type)])),
                   true),
             ]))
       },
@@ -896,7 +896,7 @@ class $Row implements $Instance {
               BridgeParameter(
                   'children',
                   BridgeTypeAnnotation(
-                      BridgeTypeRef(CoreTypes.list, [$Widget.$type])),
+                      BridgeTypeRef(CoreTypes.list, [BridgeTypeAnnotation($Widget.$type)])),
                   true),
             ]))
       },
@@ -964,7 +964,7 @@ class $Stack implements $Instance {
               BridgeParameter(
                   'children',
                   BridgeTypeAnnotation(
-                      BridgeTypeRef(CoreTypes.list, [$Widget.$type])),
+                      BridgeTypeRef(CoreTypes.list, [BridgeTypeAnnotation($Widget.$type)])),
                   true),
             ]))
       },
diff --git a/lib/src/widgets/framework.dart b/lib/src/widgets/framework.dart
@@ -16,7 +16,7 @@ export 'package:flutter/foundation.dart' show FlutterError, ErrorSummary, ErrorD
 class $Widget implements Widget, $Instance {
   /// Compile-time type reference to [$Widget]
   static const $type =
-      BridgeTypeRef(BridgeTypeSpec('package:flutter/widgets.dart', 'Widget'));
+      BridgeTypeRef(BridgeTypeSpec('package:flutter/src/widgets/framework.dart', 'Widget'));
 
   /// Compile-time wrapper declaration for [$Widget]
   static const $declaration = BridgeClassDef(
diff --git a/lib/src/widgets/navigator.dart b/lib/src/widgets/navigator.dart
@@ -344,7 +344,7 @@ class $NavigatorState implements $Instance {
           ],
           returns: BridgeTypeAnnotation(
             BridgeTypeRef(CoreTypes.future, [
-              BridgeTypeRef(CoreTypes.bool),
+              BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.bool)),
             ]),
           ),
         )),
diff --git a/lib/src/widgets/pages.dart b/lib/src/widgets/pages.dart
@@ -26,7 +26,7 @@ class $PageRoute$bridge extends PageRoute with $Bridge<PageRoute> {
         isAbstract: true,
         generics: {'T': BridgeGenericParam()},
         $extends: BridgeTypeRef($TransitionRoute.$spec, [
-          BridgeTypeRef.ref('T'),
+          BridgeTypeAnnotation(BridgeTypeRef.ref('T')),
         ]),
       ),
       constructors: {},
diff --git a/lib/src/widgets/routes.dart b/lib/src/widgets/routes.dart
@@ -72,14 +72,14 @@ class $Route implements $Instance {
                 BridgeTypeSpec(
                     'package:flutter/src/foundation/change_notifier.dart',
                     'ValueListenable'),
-                [BridgeTypeRef(CoreTypes.string)])))),
+                [BridgeTypeAnnotation(BridgeTypeRef((CoreTypes.string)))])))),
         'willHandlePopInternally': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.bool)))),
         'currentResult': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(BridgeTypeRef.ref('T')))),
         'popped': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(
-                BridgeTypeRef(CoreTypes.future, [BridgeTypeRef.ref('T')])))),
+                BridgeTypeRef(CoreTypes.future, [BridgeTypeAnnotation(BridgeTypeRef.ref('T'))])))),
         'isCurrent': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.bool)))),
         'isFirst': BridgeMethodDef(BridgeFunctionDef(
@@ -263,12 +263,12 @@ class $OverlayRoute implements $Instance {
       methods: {
         'createOverlayEntries': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(
-                BridgeTypeRef(CoreTypes.iterable, [$OverlayEntry.$type])))),
+                BridgeTypeRef(CoreTypes.iterable, [BridgeTypeAnnotation($OverlayEntry.$type)])))),
       },
       getters: {
         'overlayEntries': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(
-                BridgeTypeRef(CoreTypes.iterable, [$OverlayEntry.$type])))),
+                BridgeTypeRef(CoreTypes.iterable, [BridgeTypeAnnotation($OverlayEntry.$type)])))),
       },
       fields: {},
       wrap: true);
@@ -323,13 +323,13 @@ class $TransitionRoute implements $Instance {
             'T': BridgeGenericParam(),
           },
           $extends: BridgeTypeRef($OverlayRoute.$spec, [
-            BridgeTypeRef.ref('T'),
+            BridgeTypeAnnotation(BridgeTypeRef.ref('T')),
           ])),
       constructors: {},
       methods: {
         'createAnimation': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(BridgeTypeRef($Animation.$spec, [
-          BridgeTypeRef(CoreTypes.double),
+          BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.double)),
         ])))),
         'createAnimationController': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation($AnimationController.$type))),
@@ -352,7 +352,7 @@ class $TransitionRoute implements $Instance {
         'animation': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(
                 BridgeTypeRef($Animation.$spec, [
-                  BridgeTypeRef(CoreTypes.double),
+                  BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.double)),
                 ]),
                 nullable: true))),
         'controller': BridgeMethodDef(BridgeFunctionDef(
@@ -361,7 +361,7 @@ class $TransitionRoute implements $Instance {
         'secondaryAnimation': BridgeMethodDef(BridgeFunctionDef(
             returns: BridgeTypeAnnotation(
                 BridgeTypeRef($Animation.$spec, [
-                  BridgeTypeRef(CoreTypes.double),
+                  BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.double)),
                 ]),
                 nullable: true))),
       },
@@ -458,7 +458,7 @@ class $PopEntry implements $Instance {
             )),
             'canPopNotifier': BridgeMethodDef(BridgeFunctionDef(
               returns: BridgeTypeAnnotation(BridgeTypeRef(
-                  $ValueListenable.$spec, [BridgeTypeRef(CoreTypes.bool)])),
+                  $ValueListenable.$spec, [BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.bool))])),
             )),
           },
           methods: {},
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_eval
 description: Flutter bridge library for dart_eval, enabling creation of fully dynamic Flutter apps and widgets that can be loaded from a file or the Internet at runtime.
-version: 0.7.8
+version: 0.8.0
 homepage: https://github.com/ethanblake4/flutter_eval
 
 platforms:
@@ -19,13 +19,13 @@ topics:
   - widget
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
-  flutter: ">=3.7.0 <4.0.0"
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: ">=3.16.0 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  dart_eval: ^0.7.9
+  dart_eval: ^0.8.0
   path_provider: ^2.1.0
   http: ^1.1.0
 
diff --git a/tool/generate_bindings.dart b/tool/generate_bindings.dart
@@ -12,4 +12,6 @@ void main() {
   serializer.addPlugin(const FlutterEvalPlugin());
   final output = serializer.serialize();
   File('flutter_eval.json').writeAsStringSync(json.encode(output));
+  // ignore: avoid_print
+  print('SUCCESS: Bindings generated and written to flutter_eval.json\n');
 }
