chore: Fix remaining discrepancies with Rust

- Re-implement cedar_ffi with latest Cedar rust crate
- Fix remaining discrepancies with Rust library and roundtripping corpus tests

Author: dnys1

.github/workflows/cedar.yaml

@@ -31,7 +31,8 @@ jobs:
         run: dart pub get
       - name: Test
         run: dart test --fail-fast
-      - name: Test (dart2js)
-        run: dart test -p chrome --fail-fast
+      # TODO: Corpus tests will not run currently because of large integers in test data.
+      # - name: Test (dart2js)
+      #   run: dart test -p chrome --fail-fast
       - name: Test (dart2wasm)
         run: dart test -p chrome -c dart2wasm --fail-fast

.github/workflows/cedar_ffi.yaml

@@ -28,7 +28,7 @@ jobs:
           - windows-latest
     runs-on: ${{ matrix.os }}
     # TODO(dnys1): Speed up Rust builds
-    timeout-minutes: 15
+    timeout-minutes: 30
     steps:
       - name: Git Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
@@ -37,12 +37,12 @@ jobs:
       - name: Setup Dart
         uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # 1.7.1
         with:
-          # Native assets is only enabled on dev/main channels for now.
-          sdk: dev
+          # Native assets is only enabled on beta/dev/main channels for now.
+          sdk: beta
       - name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # 1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # 1.15.2
       - name: Get Packages
         run: dart pub get
       - name: Test
-        run: dart --enable-experiment=native-assets test --fail-fast
+        run: dart test --fail-fast
         working-directory: packages/cedar_ffi

.vscode/settings.json

@@ -17,8 +17,8 @@ final class Annotations with IterableMixin<Annotation> {
 
   final Map<String, String> annotations;
 
-  operator [](String key) => annotations[key];
-  operator []=(String key, String value) => annotations[key] = value;
+  String? operator [](String key) => annotations[key];
+  void operator []=(String key, String value) => annotations[key] = value;
 
   void add(Annotation annotation) {
     annotations[annotation.key] = annotation.value;

packages/cedar/lib/src/ast/annotation.dart

@@ -132,6 +132,8 @@ enum OpBuiltin implements Op {
   };
 }
 
+enum ExtensionCallJsonForm { positional, singleArgObject, multiArgsObject }
+
 sealed class Expr {
   const Expr();
 
@@ -194,15 +196,65 @@ sealed class Expr {
       ),
       OpBuiltin.set => ExprSet.fromJson(value as List<Object?>),
       OpBuiltin.record => ExprRecord.fromJson(value as Map<String, Object?>),
-      final OpExtension op => ExprExtensionCall(
-        fn: op.name,
-        args: (value as List<Object?>)
-            .map((el) => Expr.fromJson(el as Map<String, Object?>))
-            .toList(),
-      ),
+      final OpExtension op => _extensionCallFromJson(op.name, value),
     };
   }
 
+  static List<Expr> _extensionArgsFromList(String fn, List<Object?> json) {
+    return json.map((element) {
+      if (element is! Map<String, Object?>) {
+        throw FormatException(
+          'Invalid extension call argument for $fn: $element',
+        );
+      }
+      return Expr.fromJson(element);
+    }).toList();
+  }
+
+  static (List<Expr>, ExtensionCallJsonForm) _extensionArgsFromJson(
+    String fn,
+    Object? json,
+  ) {
+    if (json is List<Object?>) {
+      return (
+        _extensionArgsFromList(fn, json),
+        ExtensionCallJsonForm.positional,
+      );
+    }
+    if (json is Map<String, Object?>) {
+      if (json.containsKey('arg')) {
+        final singleArg = json['arg'];
+        if (singleArg is! Map<String, Object?>) {
+          throw FormatException(
+            'Invalid extension call argument for $fn: $singleArg',
+          );
+        }
+        return (
+          [Expr.fromJson(singleArg)],
+          ExtensionCallJsonForm.singleArgObject,
+        );
+      }
+      if (json.containsKey('args')) {
+        final multiArgs = json['args'];
+        if (multiArgs is! List<Object?>) {
+          throw FormatException(
+            'Invalid extension call arguments for $fn: $multiArgs',
+          );
+        }
+        return (
+          _extensionArgsFromList(fn, multiArgs),
+          ExtensionCallJsonForm.multiArgsObject,
+        );
+      }
+    }
+    throw FormatException('Invalid extension call arguments for $fn: $json');
+  }
+
+  static ExprExtensionCall _extensionCallFromJson(String fn, Object? json) {
+    final (args, form) = _extensionArgsFromJson(fn, json);
+    return ExprExtensionCall(fn: fn, args: args, jsonForm: form);
+  }
+
   factory Expr.fromProto(pb.Expr proto) {
     return switch (proto.whichExpr()) {
       pb.Expr_Expr.value => ExprValue.fromProto(proto.value),
@@ -343,12 +395,13 @@ sealed class Expr {
   const factory Expr.extensionCall({
     required String fn,
     required List<Expr> args,
+    ExtensionCallJsonForm jsonForm,
   }) = ExprExtensionCall;
 
-  operator +(Expr rhs) => add(rhs);
-  operator -(Expr rhs) => subtract(rhs);
-  operator *(Expr rhs) => multiply(rhs);
-  operator -() => negate();
+  Expr operator +(Expr rhs) => add(rhs);
+  Expr operator -(Expr rhs) => subtract(rhs);
+  Expr operator *(Expr rhs) => multiply(rhs);
+  Expr operator -() => negate();
 
   Op get op;
 
@@ -366,7 +419,11 @@ sealed class Expr {
 }
 
 final class ExprExtensionCall extends Expr {
-  const ExprExtensionCall({required this.fn, required this.args});
+  const ExprExtensionCall({
+    required this.fn,
+    required this.args,
+    this.jsonForm = ExtensionCallJsonForm.positional,
+  });
 
   factory ExprExtensionCall.fromProto(pb.ExprExtensionCall proto) {
     return ExprExtensionCall(
@@ -377,6 +434,7 @@ final class ExprExtensionCall extends Expr {
 
   final String fn;
   final List<Expr> args;
+  final ExtensionCallJsonForm jsonForm;
 
   @override
   OpExtension get op => OpExtension(fn);
@@ -389,8 +447,14 @@ final class ExprExtensionCall extends Expr {
       visitor.visitExtensionCall(this, arg);
 
   @override
-  List<Map<String, Object?>> valueToJson() =>
-      args.map((arg) => arg.toJson()).toList();
+  Object? valueToJson() {
+    final positionalJson = args.map((arg) => arg.toJson()).toList();
+    return switch (jsonForm) {
+      ExtensionCallJsonForm.positional => positionalJson,
+      ExtensionCallJsonForm.singleArgObject => {'arg': positionalJson.first},
+      ExtensionCallJsonForm.multiArgsObject => {'args': positionalJson},
+    };
+  }
 
   @override
   pb.Expr toProto() => pb.Expr(
@@ -405,10 +469,11 @@ final class ExprExtensionCall extends Expr {
       identical(this, other) ||
       other is ExprExtensionCall &&
           fn == other.fn &&
+          jsonForm == other.jsonForm &&
           const ListEquality<Expr>().equals(args, other.args);
 
   @override
-  int get hashCode => Object.hashAll([fn, ...args]);
+  int get hashCode => Object.hashAll([fn, jsonForm, ...args]);
 
   @override
   String toString() => '$fn(${args.join(', ')})';
@@ -1349,7 +1414,7 @@ final class ExprGetTag extends Expr {
   factory ExprGetTag.fromJson(Map<String, Object?> json) {
     return ExprGetTag(
       left: Expr.fromJson(json['left'] as Map<String, Object?>),
-      tag: Expr.fromJson(json['tag'] as Map<String, Object?>),
+      tag: Expr.fromJson(json['right'] as Map<String, Object?>),
     );
   }
 
@@ -1381,7 +1446,7 @@ final class ExprGetTag extends Expr {
   @override
   Map<String, Object?> valueToJson() => {
     'left': left.toJson(),
-    'tag': tag.toJson(),
+    'right': tag.toJson(),
   };
 
   @override
@@ -1402,7 +1467,7 @@ final class ExprHasTag extends Expr {
   factory ExprHasTag.fromJson(Map<String, Object?> json) {
     return ExprHasTag(
       left: Expr.fromJson(json['left'] as Map<String, Object?>),
-      tag: Expr.fromJson(json['tag'] as Map<String, Object?>),
+      tag: Expr.fromJson(json['right'] as Map<String, Object?>),
     );
   }
 
@@ -1434,7 +1499,7 @@ final class ExprHasTag extends Expr {
   @override
   Map<String, Object?> valueToJson() => {
     'left': left.toJson(),
-    'tag': tag.toJson(),
+    'right': tag.toJson(),
   };
 
   @override
@@ -1453,9 +1518,20 @@ final class ExprLike extends Expr {
   const ExprLike({required this.left, required this.pattern});
 
   factory ExprLike.fromJson(Map<String, Object?> json) {
+    CedarPattern parsePattern(Object? raw) {
+      if (raw is String) {
+        return CedarPattern.parse(raw);
+      }
+      if (raw is List) {
+        final components = List<Object?>.from(raw);
+        return CedarPattern.from(components, jsonForm: components);
+      }
+      throw FormatException('Invalid pattern value: $raw');
+    }
+
     return ExprLike(
       left: Expr.fromJson(json['left'] as Map<String, Object?>),
-      pattern: CedarPattern.parse(json['pattern'] as String),
+      pattern: parsePattern(json['pattern']),
     );
   }
 
@@ -1487,7 +1563,7 @@ final class ExprLike extends Expr {
   @override
   Map<String, Object?> valueToJson() => {
     'left': left.toJson(),
-    'pattern': pattern.toString(),
+    'pattern': pattern.toJson(),
   };
 
   @override