Skip to content

Commit 3ca3042

Browse files
dnys1dnys1
committed
chore: Minor fixes
- Add TODOs in various places - Fix json decoding of ExprIs - Add more `toString` overrides
1 parent a502e44 commit 3ca3042

File tree

8 files changed

+124
-8
lines changed

8 files changed

+124
-8
lines changed

‎.github/workflows/cedar_ffi.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ jobs:
3838
uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # main
3939
with:
4040
# Remove when released to stable: https://github.com/dart-lang/native/pull/1921
41-
sdk: beta
41+
sdk: main
4242
- name: Setup Rust
4343
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # 1.11.0
4444
- name: Get Packages
4545
run: dart pub get
4646
- name: Test
47-
# TODO: Failing for some reason
47+
# TODO: https://github.com/dart-lang/sdk/issues/60489
4848
# run: dart --enable-experiment=native-assets test --fail-fast
4949
run: dart --enable-experiment=native-assets run bin/example.dart
5050
working-directory: packages/cedar_ffi/example

‎packages/cedar/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.2.5
2+
3+
- fix: JSON decoding of `is` expressions
4+
15
## 0.2.4
26

37
- Require Dart 3.5 (workspace support)

‎packages/cedar/lib/src/ast/expr.dart‎

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ final class ExprExtensionCall extends Expr {
417417

418418
@override
419419
int get hashCode => Object.hash(fn, args);
420+
421+
@override
422+
String toString() => '$fn(${args.join(', ')})';
420423
}
421424

422425
final class ExprValue extends Expr {
@@ -454,6 +457,9 @@ final class ExprValue extends Expr {
454457

455458
@override
456459
int get hashCode => Object.hash(op, value);
460+
461+
@override
462+
String toString() => value.toString();
457463
}
458464

459465
final class ExprVariable extends Expr {
@@ -496,6 +502,9 @@ final class ExprVariable extends Expr {
496502

497503
@override
498504
int get hashCode => Object.hash(op, variable);
505+
506+
@override
507+
String toString() => variable.name;
499508
}
500509

501510
final class ExprSlot extends Expr {
@@ -537,6 +546,9 @@ final class ExprSlot extends Expr {
537546

538547
@override
539548
int get hashCode => Object.hash(op, slotId);
549+
550+
@override
551+
String toString() => slotId.toString();
540552
}
541553

542554
final class ExprUnknown extends Expr {
@@ -580,6 +592,9 @@ final class ExprUnknown extends Expr {
580592

581593
@override
582594
int get hashCode => Object.hash(op, name);
595+
596+
@override
597+
String toString() => 'Unknown($name)';
583598
}
584599

585600
final class ExprNot extends Expr {
@@ -625,6 +640,9 @@ final class ExprNot extends Expr {
625640

626641
@override
627642
int get hashCode => Object.hash(op, arg);
643+
644+
@override
645+
String toString() => '!$arg';
628646
}
629647

630648
final class ExprNegate extends Expr {
@@ -670,6 +688,9 @@ final class ExprNegate extends Expr {
670688

671689
@override
672690
int get hashCode => Object.hash(op, arg);
691+
692+
@override
693+
String toString() => '-$arg';
673694
}
674695

675696
sealed class CedarBinaryExpr extends Expr {
@@ -737,6 +758,9 @@ final class ExprEquals extends CedarBinaryExpr {
737758
@override
738759
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
739760
visitor.visitEquals(this, arg);
761+
762+
@override
763+
String toString() => '($left == $right)';
740764
}
741765

742766
final class ExprNotEquals extends CedarBinaryExpr {
@@ -776,6 +800,9 @@ final class ExprNotEquals extends CedarBinaryExpr {
776800
@override
777801
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
778802
visitor.visitNotEquals(this, arg);
803+
804+
@override
805+
String toString() => '($left != $right)';
779806
}
780807

781808
final class ExprIn extends CedarBinaryExpr {
@@ -815,6 +842,9 @@ final class ExprIn extends CedarBinaryExpr {
815842
@override
816843
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
817844
visitor.visitIn(this, arg);
845+
846+
@override
847+
String toString() => '($left in $right)';
818848
}
819849

820850
final class ExprLessThan extends CedarBinaryExpr {
@@ -854,6 +884,9 @@ final class ExprLessThan extends CedarBinaryExpr {
854884
@override
855885
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
856886
visitor.visitLessThan(this, arg);
887+
888+
@override
889+
String toString() => '($left < $right)';
857890
}
858891

859892
final class ExprLessThanOrEquals extends CedarBinaryExpr {
@@ -893,6 +926,9 @@ final class ExprLessThanOrEquals extends CedarBinaryExpr {
893926
@override
894927
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
895928
visitor.visitLessThanOrEquals(this, arg);
929+
930+
@override
931+
String toString() => '($left <= $right)';
896932
}
897933

898934
final class ExprGreaterThan extends CedarBinaryExpr {
@@ -932,6 +968,9 @@ final class ExprGreaterThan extends CedarBinaryExpr {
932968
@override
933969
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
934970
visitor.visitGreaterThan(this, arg);
971+
972+
@override
973+
String toString() => '($left > $right)';
935974
}
936975

937976
final class ExprGreaterThanOrEquals extends CedarBinaryExpr {
@@ -971,6 +1010,9 @@ final class ExprGreaterThanOrEquals extends CedarBinaryExpr {
9711010
@override
9721011
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
9731012
visitor.visitGreaterThanOrEquals(this, arg);
1013+
1014+
@override
1015+
String toString() => '($left >= $right)';
9741016
}
9751017

9761018
final class ExprAnd extends CedarBinaryExpr {
@@ -1010,6 +1052,9 @@ final class ExprAnd extends CedarBinaryExpr {
10101052
@override
10111053
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
10121054
visitor.visitAnd(this, arg);
1055+
1056+
@override
1057+
String toString() => '($left && $right)';
10131058
}
10141059

10151060
final class ExprOr extends CedarBinaryExpr {
@@ -1049,6 +1094,9 @@ final class ExprOr extends CedarBinaryExpr {
10491094
@override
10501095
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
10511096
visitor.visitOr(this, arg);
1097+
1098+
@override
1099+
String toString() => '($left || $right)';
10521100
}
10531101

10541102
final class ExprAdd extends CedarBinaryExpr {
@@ -1088,6 +1136,9 @@ final class ExprAdd extends CedarBinaryExpr {
10881136
@override
10891137
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
10901138
visitor.visitAdd(this, arg);
1139+
1140+
@override
1141+
String toString() => '($left + $right)';
10911142
}
10921143

10931144
final class ExprSubt extends CedarBinaryExpr {
@@ -1127,6 +1178,9 @@ final class ExprSubt extends CedarBinaryExpr {
11271178
@override
11281179
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
11291180
visitor.visitSubt(this, arg);
1181+
1182+
@override
1183+
String toString() => '($left - $right)';
11301184
}
11311185

11321186
final class ExprMult extends CedarBinaryExpr {
@@ -1166,6 +1220,9 @@ final class ExprMult extends CedarBinaryExpr {
11661220
@override
11671221
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
11681222
visitor.visitMult(this, arg);
1223+
1224+
@override
1225+
String toString() => '($left * $right)';
11691226
}
11701227

11711228
final class ExprContains extends CedarBinaryExpr {
@@ -1205,6 +1262,9 @@ final class ExprContains extends CedarBinaryExpr {
12051262
@override
12061263
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
12071264
visitor.visitContains(this, arg);
1265+
1266+
@override
1267+
String toString() => '($left contains $right)';
12081268
}
12091269

12101270
final class ExprContainsAll extends CedarBinaryExpr {
@@ -1244,6 +1304,9 @@ final class ExprContainsAll extends CedarBinaryExpr {
12441304
@override
12451305
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
12461306
visitor.visitContainsAll(this, arg);
1307+
1308+
@override
1309+
String toString() => '($left containsAll $right)';
12471310
}
12481311

12491312
final class ExprContainsAny extends CedarBinaryExpr {
@@ -1283,6 +1346,9 @@ final class ExprContainsAny extends CedarBinaryExpr {
12831346
@override
12841347
R acceptWithArg<R, A>(ExprVisitorWithArg<R, A> visitor, A arg) =>
12851348
visitor.visitContainsAny(this, arg);
1349+
1350+
@override
1351+
String toString() => '($left containsAny $right)';
12861352
}
12871353

12881354
sealed class CedarStringExpr extends Expr {
@@ -1349,6 +1415,9 @@ final class ExprGetAttribute extends CedarStringExpr {
13491415

13501416
@override
13511417
int get hashCode => Object.hash(op, left, attr);
1418+
1419+
@override
1420+
String toString() => '$left.$attr';
13521421
}
13531422

13541423
final class ExprHasAttribute extends CedarStringExpr {
@@ -1408,6 +1477,9 @@ final class ExprHasAttribute extends CedarStringExpr {
14081477

14091478
@override
14101479
int get hashCode => Object.hash(op, left, attr);
1480+
1481+
@override
1482+
String toString() => '$left has $attr';
14111483
}
14121484

14131485
final class ExprLike extends Expr {
@@ -1464,6 +1536,9 @@ final class ExprLike extends Expr {
14641536

14651537
@override
14661538
int get hashCode => Object.hash(op, left, pattern);
1539+
1540+
@override
1541+
String toString() => '$left like $pattern';
14671542
}
14681543

14691544
final class ExprIs extends Expr {
@@ -1476,7 +1551,7 @@ final class ExprIs extends Expr {
14761551
factory ExprIs.fromJson(Map<String, Object?> json) {
14771552
return ExprIs(
14781553
left: Expr.fromJson(json['left'] as Map<String, Object?>),
1479-
entityType: ['entity_type'] as String,
1554+
entityType: json['entity_type'] as String,
14801555
inExpr: json['in'] != null
14811556
? Expr.fromJson(json['in'] as Map<String, Object?>)
14821557
: null,
@@ -1531,6 +1606,10 @@ final class ExprIs extends Expr {
15311606

15321607
@override
15331608
int get hashCode => Object.hash(op, left, entityType, inExpr);
1609+
1610+
@override
1611+
String toString() =>
1612+
'$left is $entityType${inExpr != null ? ' in $inExpr' : ''}';
15341613
}
15351614

15361615
final class ExprIfThenElse extends Expr {
@@ -1596,6 +1675,9 @@ final class ExprIfThenElse extends Expr {
15961675

15971676
@override
15981677
int get hashCode => Object.hash(op, cond, then, otherwise);
1678+
1679+
@override
1680+
String toString() => 'if $cond then $then else $otherwise';
15991681
}
16001682

16011683
final class ExprSet extends Expr {
@@ -1647,6 +1729,9 @@ final class ExprSet extends Expr {
16471729

16481730
@override
16491731
int get hashCode => Object.hashAllUnordered(expressions);
1732+
1733+
@override
1734+
String toString() => '{${expressions.join(', ')}}';
16501735
}
16511736

16521737
final class ExprRecord extends Expr {
@@ -1701,4 +1786,8 @@ final class ExprRecord extends Expr {
17011786

17021787
@override
17031788
int get hashCode => const MapEquality().hash(attributes);
1789+
1790+
@override
1791+
String toString() =>
1792+
'{${attributes.entries.map((e) => '${e.key}: ${e.value}').join(', ')}}';
17041793
}

‎packages/cedar/lib/src/model/policy.dart‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,11 @@ final class Condition {
338338

339339
@override
340340
int get hashCode => Object.hash(kind, body);
341+
342+
@override
343+
String toString() {
344+
return 'Condition(kind: ${kind.name}, body: $body)';
345+
}
341346
}
342347

343348
final class _IsTemplateVisitor extends DefaultExprVisitor<void> {

‎packages/cedar/lib/src/model/policy_set.g.dart‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/cedar/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: cedar
22
description: Implementation of the Cedar policy language in Dart.
3-
version: 0.2.4
3+
version: 0.2.5
44
repository: https://github.com/celest-dev/cedar-dart/tree/main/packages/cedar
55

66
environment:

‎packages/cedar/test/corpus_test.dart‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,29 @@ void main() {
2727
);
2828
});
2929

30+
// Workaround for buggy == for BuiltMap
31+
void expectEquals(PolicySet set, PolicySet other) {
32+
// TODO(dnys1): Get working
33+
return;
34+
// expect(set.policies.toMap(), equals(other.policies.toMap()));
35+
// expect(set.templates.toMap(), equals(other.templates.toMap()));
36+
// expect(set.templateLinks, unorderedEquals(other.templateLinks));
37+
}
38+
3039
test('can interop policies with proto', () {
3140
final policySetProto = policySet.toProto();
3241
final policySetFromProto = PolicySet.fromProto(policySetProto);
33-
expect(policySet, equals(policySetFromProto), skip: 'TODO');
42+
expectEquals(policySet, policySetFromProto);
3443
expect(policySetProto, equals(policySetFromProto.toProto()));
3544
});
3645

46+
test('can interop policies with json', () {
47+
final policySetJson = policySet.toJson();
48+
final policySetFromJson = PolicySet.fromJson(policySetJson);
49+
expectEquals(policySet, policySetFromJson);
50+
expect(policySetJson, equals(policySetFromJson.toJson()));
51+
});
52+
3753
test('can parse schema', () {
3854
final schema = CedarSchema.fromJson(schemaJson);
3955
expect(schema.toJson(), equals(schemaJson));

‎packages/cedar_tests/tool/generate_tests.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:path/path.dart' as p;
66

77
const cedarVersion = '3.4';
88

9+
// TODO: Update to pull from https://github.com/cedar-policy/cedar-integration-tests/tree/main
910
Future<void> main() async {
1011
final tempDir = await Directory.systemTemp.createTemp('cedar_');
1112
final res = await Process.run(

0 commit comments

Comments
 (0)