prep 0.8.1

Author: ethanblake4

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.8.1
+- Added support for configurable parser error handling
+- Fix accessing enum index values from an imported enum (thanks @jacksonrl)
+- Improve error handling when using `await` on a bridged future 
+  (thanks @MohamedAl-Kainai)
+- Support for enums in the binding generator
+- Fix serializing generic function types in BridgeTypeRef
+- Fix binding generator outputting incorrect import paths in eval_plugin.dart
+- Document how to create JSON bindings
+- Support for double.nan, double.infinity, and double.negativeInfinity
+
 ## 0.8.0
 - (Breaking) Type parameters provided to BridgeTypeRef are now
   `BridgeTypeAnnotation` objects instead of `BridgeTypeRef` objects to allow

README.md

@@ -20,7 +20,7 @@ can be used outside it by creating an interface and [bridge class](#bridge-inter
 dart_eval's compiler is powered under the hood by the Dart 
 [analyzer](https://pub.dev/packages/analyzer), so it achieves 100% correct and 
 up-to-date parsing. While compilation and execution aren't quite there yet, dart_eval
-has over 250 tests that are run in CI to ensure correctness.
+has over 300 tests that are run in CI to ensure correctness.
 
 Currently dart_eval implements a majority of the Dart spec, but there 
 are still missing features like generators and extension methods.
@@ -340,7 +340,7 @@ final program = compiler.compile({'my_package': {
 final runtime = Runtime.ofProgram(program);
 runtime.addPlugin(MyAppPlugin()); // MyAppPlugin is the generated plugin
 
-final book = runtime.executeLib('package:my_package/main.dart', 'main') as Book;
+final book = runtime.executeLib('package:my_package/main.dart', 'main').$value as Book;
 print(book.getPage(0)); // prints 'Page 1'
 ```
 
@@ -396,6 +396,10 @@ The binding generator also supports binding classes that rely on an
 existing plugin by using JSON binding files. To add these, create a folder in your project 
 root called `.dart_eval`, add a `bindings` subfolder, and place JSON binding files there.
 
+Currently, the binding generator does not support directly creating JSON bindings, but
+they can be created by first generating Dart bindings and then making a script to convert them 
+to JSON with a `BridgeSerializer`.
+
 For some specialized use cases, bindings may need to be manually adjusted or written from scratch.
 For information about this, refer to the 
 [wrapper interop wiki page](https://github.com/ethanblake4/dart_eval/wiki/Wrappers) and 

example/dart_eval_example.dart

@@ -5,7 +5,7 @@ import 'package:dart_eval/stdlib/core.dart';
 
 // ** Sample class definitions ** //
 // Typically you would mark these with @Bind() to generate bindings,
-// but that annotation is part of the eval_annotation package so we 
+// but that annotation is part of the eval_annotation package so we
 // don't have access to it here.
 
 // @Bind()
@@ -73,7 +73,7 @@ void main(List<String> args) {
   // Create a runtime from the compiled program, and add our plugin.
   final runtime = Runtime.ofProgram(program);
   runtime.addPlugin(ExamplePlugin());
-    
+
   // Call the function and cast the result to the desired type
   final timeTracker = runtime.executeLib(
     'package:example/main.dart',
@@ -282,4 +282,4 @@ class ExamplePlugin implements EvalPlugin {
           $WorldTimeTracker$bridge.$new,
           isBridge: true);
   }
-}
+}

lib/dart_eval.dart

@@ -6,3 +6,4 @@ export 'src/eval/runtime/runtime.dart' show Runtime;
 export 'src/eval/compiler/compiler.dart';
 export 'src/eval/compiler/program.dart';
 export 'src/eval/runtime/override.dart' hide runtimeOverride;
+export 'src/eval/compiler/model/diagnostic_mode.dart';

lib/src/eval/bindgen/bindgen.dart

@@ -9,6 +9,7 @@ import 'package:dart_eval/src/eval/bindgen/bridge.dart';
 import 'package:dart_eval/src/eval/bindgen/bridge_declaration.dart';
 import 'package:dart_eval/src/eval/bindgen/configure.dart';
 import 'package:dart_eval/src/eval/bindgen/context.dart';
+import 'package:dart_eval/src/eval/bindgen/enum.dart';
 import 'package:dart_eval/src/eval/bindgen/methods.dart';
 import 'package:dart_eval/src/eval/bindgen/properties.dart';
 import 'package:dart_eval/src/eval/bindgen/statics.dart';
@@ -27,6 +28,7 @@ class Bindgen implements BridgeDeclarationRegistry {
   final _bridgeDeclarations = <String, List<BridgeDeclaration>>{};
   final _exportedLibMappings = <String, String>{};
   final List<({String file, String uri, String name})> registerClasses = [];
+  final List<({String file, String uri, String name})> registerEnums = [];
 
   AnalysisContextCollection? _contextCollection;
 
@@ -151,13 +153,15 @@ class Bindgen implements BridgeDeclarationRegistry {
         }
       }
 
-      final units =
-          analysisResult.unit.declarations.whereType<ClassDeclaration>();
+      final units = analysisResult.unit.declarations;
 
       final resolved = units
           .where((declaration) => declaration.declaredFragment != null)
-          .map((declaration) =>
-              _$instance(ctx, declaration.declaredFragment!.element))
+          .map((declaration) => declaration is ClassDeclaration
+              ? _$instance(ctx, declaration.declaredFragment!.element)
+              : (declaration is EnumDeclaration
+                  ? _$enum(ctx, declaration.declaredFragment!.element)
+                  : null))
           .toList()
           .nonNulls;
 
@@ -177,29 +181,38 @@ class Bindgen implements BridgeDeclarationRegistry {
     return null;
   }
 
-  String? _$instance(BindgenContext ctx, ClassElement2 element) {
+  ({bool process, bool isBridge}) _shouldProcess(
+      BindgenContext ctx, TypeDefiningElement2 element) {
     final metadata = element.metadata2;
     final bindAnno = metadata.annotations
         .firstWhereOrNull((element) => element.element2?.displayName == 'Bind');
     final bindAnnoValue = bindAnno?.computeConstantValue();
-    if (!ctx.all) {
-      if (bindAnnoValue == null) {
-        return null;
-      }
-      final implicitSupers =
-          bindAnnoValue.getField('implicitSupers')?.toBoolValue() ?? false;
-      ctx.implicitSupers = implicitSupers;
-      final override = bindAnnoValue.getField('overrideLibrary');
-      if (override != null && !override.isNull) {
-        final overrideUri = override.toStringValue();
-        if (overrideUri != null) {
-          ctx.libOverrides[element.name3!] = overrideUri;
-        }
+
+    if (bindAnnoValue == null && !ctx.all) {
+      return (process: false, isBridge: false);
+    }
+    final implicitSupers =
+        bindAnnoValue?.getField('implicitSupers')?.toBoolValue() ?? false;
+    ctx.implicitSupers = implicitSupers;
+    final override = bindAnnoValue?.getField('overrideLibrary');
+    if (override != null && !override.isNull) {
+      final overrideUri = override.toStringValue();
+      if (overrideUri != null) {
+        ctx.libOverrides[element.name3!] = overrideUri;
       }
     }
 
     final isBridge = bindAnnoValue?.getField('bridge')?.toBoolValue() ?? false;
 
+    return (process: ctx.all || bindAnnoValue != null, isBridge: isBridge);
+  }
+
+  String? _$instance(BindgenContext ctx, ClassElement2 element) {
+    final (:process, :isBridge) = _shouldProcess(ctx, element);
+    if (!process) {
+      return null;
+    }
+
     if (element.isSealed) {
       throw CompileError(
           'Cannot bind sealed class ${element.name3} as a bridge type. '
@@ -261,10 +274,46 @@ ${$setProperty(ctx, element)}
 ''';
   }
 
-  String $superclassWrapper(BindgenContext ctx, ClassElement2 element) {
+  String? _$enum(BindgenContext ctx, EnumElement2 element) {
+    final (:process, :isBridge) = _shouldProcess(ctx, element);
+    if (!process) {
+      return null;
+    }
+
+    registerEnums.add((
+      file: ctx.filename,
+      uri: ctx.libOverrides[element.name3!] ?? ctx.uri,
+      name: '${element.name3!}${isBridge ? '\$bridge' : ''}',
+    ));
+
+    return '''
+/// dart_eval enum wrapper binding for [${element.name3}]
+class \$${element.name3} implements \$Instance {
+  /// Configure this enum for use in a [Runtime]
+  ${bindConfigureEnumForRuntime(ctx, element)}
+  /// Compile-time type specification of [\$${element.name3}]
+  ${bindTypeSpec(ctx, element)}
+  /// Compile-time type declaration of [\$${element.name3}]
+  ${bindBridgeType(ctx, element)}
+  /// Compile-time class declaration of [\$${element.name3}]
+  ${bindBridgeDeclaration(ctx, element)}
+  ${$enumValues(ctx, element)}
+  ${$staticMethods(ctx, element)}
+  ${$staticGetters(ctx, element)}
+  ${$staticSetters(ctx, element)}
+  ${$wrap(ctx, element)}
+  ${$getRuntimeType(element)}
+  ${$getProperty(ctx, element)}
+  ${$methods(ctx, element)}
+  ${$setProperty(ctx, element)}
+}
+''';
+  }
+
+  String $superclassWrapper(BindgenContext ctx, InterfaceElement2 element) {
     final supertype = element.supertype;
     final objectWrapper = '\$Object(\$value)';
-    if (supertype == null || ctx.implicitSupers) {
+    if (supertype == null || ctx.implicitSupers || element is EnumElement2) {
       ctx.imports.add('package:dart_eval/stdlib/core.dart');
       return objectWrapper;
     }
@@ -279,14 +328,14 @@ ${$setProperty(ctx, element)}
     return narrowWrapper;
   }
 
-  String $getRuntimeType(ClassElement2 element) {
+  String $getRuntimeType(InterfaceElement2 element) {
     return '''
   @override
   int \$getRuntimeType(Runtime runtime) => runtime.lookupType(\$spec);
 ''';
   }
 
-  String $wrap(BindgenContext ctx, ClassElement2 element) {
+  String $wrap(BindgenContext ctx, InterfaceElement2 element) {
     return '''
   final \$Instance _superclass;
 

lib/src/eval/bindgen/bridge.dart

@@ -108,7 +108,8 @@ String parameterHeader(List<FormalParameterElement> params,
           paramBuffer.write('${param.type.getDisplayString()} ');
         }
     }
-    paramBuffer.write(param.name3 ?? 'arg$i');
+    paramBuffer.write(
+        param.name3 == null || param.name3!.isEmpty ? 'arg$i' : param.name3);
     if (i < params.length - 1) {
       paramBuffer.write(', ');
     }

lib/src/eval/bindgen/bridge_declaration.dart

@@ -3,7 +3,7 @@ import 'package:dart_eval/src/eval/bindgen/context.dart';
 import 'package:dart_eval/src/eval/bindgen/parameters.dart';
 import 'package:dart_eval/src/eval/bindgen/type.dart';
 
-String bindTypeSpec(BindgenContext ctx, ClassElement2 element) {
+String bindTypeSpec(BindgenContext ctx, InterfaceElement2 element) {
   final uri = ctx.libOverrides[element.name3] ?? ctx.uri;
   return '''
   static const \$spec = BridgeTypeSpec(
@@ -13,21 +13,21 @@ String bindTypeSpec(BindgenContext ctx, ClassElement2 element) {
 ''';
 }
 
-String bindBridgeType(BindgenContext ctx, ClassElement2 element) {
+String bindBridgeType(BindgenContext ctx, InterfaceElement2 element) {
   return '''
   static const \$type = BridgeTypeRef(\$spec);
 ''';
 }
 
-String? bindBridgeDeclaration(BindgenContext ctx, ClassElement2 element,
+String? bindBridgeDeclaration(BindgenContext ctx, InterfaceElement2 element,
     {bool isBridge = false}) {
-  if (element.constructors2.isEmpty) {
+  if (element is ClassElement2 && element.constructors2.isEmpty) {
     return null;
   }
 
   var genericsStr = '';
   final typeParams = element.typeParameters2;
-  if (typeParams.isNotEmpty) {
+  if (typeParams.isNotEmpty && element is ClassElement2) {
     genericsStr = '''\ngenerics: {
       ${typeParams.map((e) {
       final boundStr = e.bound != null && !ctx.implicitSupers
@@ -39,31 +39,41 @@ String? bindBridgeDeclaration(BindgenContext ctx, ClassElement2 element,
   }
 
   var extendsStr = '';
-  if (element.supertype != null &&
+  if (element is ClassElement2 &&
+      element.supertype != null &&
       !element.supertype!.isDartCoreObject &&
       !ctx.implicitSupers) {
     extendsStr =
         '\n\$extends: ${bridgeTypeRefFromType(ctx, element.supertype!)},';
   }
 
   var implementsStr = '';
-  if (element.interfaces.isNotEmpty) {
+  if (element is ClassElement2 && element.interfaces.isNotEmpty) {
     implementsStr =
         '\n\$implements: [${element.interfaces.map((e) => bridgeTypeRefFromType(ctx, e)).join(', ')}],';
   }
 
+  var enumValuesStr = '';
+  if (element is EnumElement2) {
+    enumValuesStr = '''
+    values: [${element.constants2.map((e) => "'${e.name3}'").join(', ')}],
+    ''';
+  }
+
   return '''
-  static const \$declaration = BridgeClassDef(
-    BridgeClassType(
+  static const \$declaration = ${element is ClassElement2 ? 'BridgeClassDef(BridgeClassType(' : 'BridgeEnumDef('}
       \$type,
-      isAbstract: ${element.isAbstract},
+      ${element is ClassElement2 && element.isAbstract ? 'isAbstract: true,' : ''}
+      $enumValuesStr
       $genericsStr
       $extendsStr
       $implementsStr
-    ),
+    ${element is ClassElement2 ? '),' : ''}
+    ${element is ClassElement2 ? '''
     constructors: {
 ${constructors(ctx, element)}
     },
+    ''' : ''}
     methods: {
 ${methods(ctx, element)}
     },
@@ -76,19 +86,21 @@ ${setters(ctx, element)}
     fields: {
 ${fields(ctx, element)}
     },
+    ${element is ClassElement2 ? '''
     wrap: ${!isBridge},
     bridge: $isBridge,
+    ''' : ''}
   );
     ''';
 }
 
-String constructors(BindgenContext ctx, ClassElement2 element) {
+String constructors(BindgenContext ctx, InterfaceElement2 element) {
   return element.constructors2
       .map((e) => bridgeConstructorDef(ctx, constructor: e))
       .join('\n');
 }
 
-String methods(BindgenContext ctx, ClassElement2 element) {
+String methods(BindgenContext ctx, InterfaceElement2 element) {
   final methods = {
     if (ctx.implicitSupers)
       for (var s in element.allSupertypes)
@@ -103,7 +115,7 @@ String methods(BindgenContext ctx, ClassElement2 element) {
       .join('\n');
 }
 
-String getters(BindgenContext ctx, ClassElement2 element) {
+String getters(BindgenContext ctx, InterfaceElement2 element) {
   final getters = {
     if (ctx.implicitSupers)
       for (var s in element.allSupertypes)
@@ -114,12 +126,16 @@ String getters(BindgenContext ctx, ClassElement2 element) {
 
   return getters.values
       .where((m) => !(const ['hashCode', 'runtimeType'].contains(m.name3)))
-      .where((element) => !element.isSynthetic)
+      .where((element) =>
+          !element.isSynthetic ||
+          (element is EnumElement2 &&
+              element.nonSynthetic2 is FieldElement2 &&
+              !(element.nonSynthetic2 as FieldElement2).isEnumConstant))
       .map((e) => bridgeGetterDef(ctx, getter: e))
       .join('\n');
 }
 
-String setters(BindgenContext ctx, ClassElement2 element) {
+String setters(BindgenContext ctx, InterfaceElement2 element) {
   final setters = {
     if (ctx.implicitSupers)
       for (var s in element.allSupertypes)
@@ -134,7 +150,7 @@ String setters(BindgenContext ctx, ClassElement2 element) {
       .join('\n');
 }
 
-String fields(BindgenContext ctx, ClassElement2 element) {
+String fields(BindgenContext ctx, InterfaceElement2 element) {
   final allFields = {
     if (ctx.implicitSupers)
       for (var s in element.allSupertypes)
@@ -145,7 +161,8 @@ String fields(BindgenContext ctx, ClassElement2 element) {
     for (final f in element.fields2) f.name3: f
   };
 
-  final fields = allFields.values.where((element) => !element.isSynthetic);
+  final fields = allFields.values
+      .where((element) => !element.isSynthetic && !element.isEnumConstant);
 
   return fields
       .map(