diff --git a/packages/cedar_core/.gitignore b/packages/cedar/.gitignore similarity index 100% rename from packages/cedar_core/.gitignore rename to packages/cedar/.gitignore diff --git a/packages/cedar_core/CHANGELOG.md b/packages/cedar/CHANGELOG.md similarity index 100% rename from packages/cedar_core/CHANGELOG.md rename to packages/cedar/CHANGELOG.md diff --git a/packages/cedar/README.md b/packages/cedar/README.md new file mode 100644 index 00000000..73d4f385 --- /dev/null +++ b/packages/cedar/README.md @@ -0,0 +1,5 @@ +# cedar + +Base types and utilities of the Cedar language in Dart. + +This is separate from `package:cedar` so that the types can be used without bundling the native assets of `package:cedar`. diff --git a/packages/cedar_core/analysis_options.yaml b/packages/cedar/analysis_options.yaml similarity index 100% rename from packages/cedar_core/analysis_options.yaml rename to packages/cedar/analysis_options.yaml diff --git a/packages/cedar_core/lib/cedar_core.dart b/packages/cedar/lib/cedar.dart similarity index 72% rename from packages/cedar_core/lib/cedar_core.dart rename to packages/cedar/lib/cedar.dart index d03d05d8..85028b63 100644 --- a/packages/cedar_core/lib/cedar_core.dart +++ b/packages/cedar/lib/cedar.dart @@ -1,7 +1,7 @@ /// Base types and utilities of the Cedar language in Dart. /// -/// This is separate from `package:cedar_dart` so that the types can be used -/// without bundling the native assets of `package:cedar_dart`. +/// This is separate from `package:cedar_ffi` so that the types can be used +/// without bundling the native assets of `package:cedar_ffi`. library; export 'src/ast/cedar_entity.dart'; diff --git a/packages/cedar_core/lib/src/ast/cedar_entity.dart b/packages/cedar/lib/src/ast/cedar_entity.dart similarity index 90% rename from packages/cedar_core/lib/src/ast/cedar_entity.dart rename to packages/cedar/lib/src/ast/cedar_entity.dart index f55c1d13..9e905e38 100644 --- a/packages/cedar_core/lib/src/ast/cedar_entity.dart +++ b/packages/cedar/lib/src/ast/cedar_entity.dart @@ -1,9 +1,9 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:cedar_core/src/ast/cedar_entity_id.dart'; -import 'package:cedar_core/src/ast/cedar_node.dart'; -import 'package:cedar_core/src/policy/json_expr.dart'; +import 'package:cedar/src/ast/cedar_entity_id.dart'; +import 'package:cedar/src/ast/cedar_node.dart'; +import 'package:cedar/src/policy/json_expr.dart'; part 'cedar_entity.g.dart'; diff --git a/packages/cedar_core/lib/src/ast/cedar_entity.g.dart b/packages/cedar/lib/src/ast/cedar_entity.g.dart similarity index 100% rename from packages/cedar_core/lib/src/ast/cedar_entity.g.dart rename to packages/cedar/lib/src/ast/cedar_entity.g.dart diff --git a/packages/cedar_core/lib/src/ast/cedar_entity_id.dart b/packages/cedar/lib/src/ast/cedar_entity_id.dart similarity index 97% rename from packages/cedar_core/lib/src/ast/cedar_entity_id.dart rename to packages/cedar/lib/src/ast/cedar_entity_id.dart index d3f00ddc..59dfb278 100644 --- a/packages/cedar_core/lib/src/ast/cedar_entity_id.dart +++ b/packages/cedar/lib/src/ast/cedar_entity_id.dart @@ -1,6 +1,6 @@ import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:cedar_core/src/ast/cedar_node.dart'; +import 'package:cedar/src/ast/cedar_node.dart'; part 'cedar_entity_id.g.dart'; diff --git a/packages/cedar_core/lib/src/ast/cedar_entity_id.g.dart b/packages/cedar/lib/src/ast/cedar_entity_id.g.dart similarity index 100% rename from packages/cedar_core/lib/src/ast/cedar_entity_id.g.dart rename to packages/cedar/lib/src/ast/cedar_entity_id.g.dart diff --git a/packages/cedar_core/lib/src/ast/cedar_node.dart b/packages/cedar/lib/src/ast/cedar_node.dart similarity index 100% rename from packages/cedar_core/lib/src/ast/cedar_node.dart rename to packages/cedar/lib/src/ast/cedar_node.dart diff --git a/packages/cedar_core/lib/src/ast/cedar_schema.dart b/packages/cedar/lib/src/ast/cedar_schema.dart similarity index 98% rename from packages/cedar_core/lib/src/ast/cedar_schema.dart rename to packages/cedar/lib/src/ast/cedar_schema.dart index 2608dbde..03a1f374 100644 --- a/packages/cedar_core/lib/src/ast/cedar_schema.dart +++ b/packages/cedar/lib/src/ast/cedar_schema.dart @@ -1,6 +1,6 @@ -import 'package:cedar_core/src/ast/cedar_entity_id.dart'; -import 'package:cedar_core/src/ast/cedar_node.dart'; -import 'package:cedar_core/src/util.dart'; +import 'package:cedar/src/ast/cedar_entity_id.dart'; +import 'package:cedar/src/ast/cedar_node.dart'; +import 'package:cedar/src/util.dart'; final class CedarSchema implements CedarNode { CedarSchema({ diff --git a/packages/cedar_core/lib/src/policy/cedar_policy.dart b/packages/cedar/lib/src/policy/cedar_policy.dart similarity index 99% rename from packages/cedar_core/lib/src/policy/cedar_policy.dart rename to packages/cedar/lib/src/policy/cedar_policy.dart index 0e0f8505..5088927e 100644 --- a/packages/cedar_core/lib/src/policy/cedar_policy.dart +++ b/packages/cedar/lib/src/policy/cedar_policy.dart @@ -6,7 +6,7 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/json_object.dart'; import 'package:built_value/serializer.dart'; -import 'package:cedar_core/cedar_core.dart'; +import 'package:cedar/cedar.dart'; part 'cedar_policy.g.dart'; diff --git a/packages/cedar_core/lib/src/policy/cedar_policy.g.dart b/packages/cedar/lib/src/policy/cedar_policy.g.dart similarity index 100% rename from packages/cedar_core/lib/src/policy/cedar_policy.g.dart rename to packages/cedar/lib/src/policy/cedar_policy.g.dart diff --git a/packages/cedar_core/lib/src/policy/cedar_policy_set.dart b/packages/cedar/lib/src/policy/cedar_policy_set.dart similarity index 96% rename from packages/cedar_core/lib/src/policy/cedar_policy_set.dart rename to packages/cedar/lib/src/policy/cedar_policy_set.dart index 2e0fbd54..1cdb6c06 100644 --- a/packages/cedar_core/lib/src/policy/cedar_policy_set.dart +++ b/packages/cedar/lib/src/policy/cedar_policy_set.dart @@ -1,7 +1,7 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:cedar_core/cedar_core.dart'; +import 'package:cedar/cedar.dart'; part 'cedar_policy_set.g.dart'; diff --git a/packages/cedar_core/lib/src/policy/cedar_policy_set.g.dart b/packages/cedar/lib/src/policy/cedar_policy_set.g.dart similarity index 100% rename from packages/cedar_core/lib/src/policy/cedar_policy_set.g.dart rename to packages/cedar/lib/src/policy/cedar_policy_set.g.dart diff --git a/packages/cedar_core/lib/src/policy/json_expr.dart b/packages/cedar/lib/src/policy/json_expr.dart similarity index 99% rename from packages/cedar_core/lib/src/policy/json_expr.dart rename to packages/cedar/lib/src/policy/json_expr.dart index 56a948cf..71831527 100644 --- a/packages/cedar_core/lib/src/policy/json_expr.dart +++ b/packages/cedar/lib/src/policy/json_expr.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:cedar_core/src/ast/cedar_entity_id.dart'; +import 'package:cedar/src/ast/cedar_entity_id.dart'; import 'package:collection/collection.dart'; import 'package:meta/meta.dart'; diff --git a/packages/cedar_core/lib/src/serializers.dart b/packages/cedar/lib/src/serializers.dart similarity index 90% rename from packages/cedar_core/lib/src/serializers.dart rename to packages/cedar/lib/src/serializers.dart index 84d4b1e5..a2afb173 100644 --- a/packages/cedar_core/lib/src/serializers.dart +++ b/packages/cedar/lib/src/serializers.dart @@ -1,6 +1,6 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/serializer.dart'; -import 'package:cedar_core/cedar_core.dart'; +import 'package:cedar/cedar.dart'; part 'serializers.g.dart'; diff --git a/packages/cedar_core/lib/src/serializers.g.dart b/packages/cedar/lib/src/serializers.g.dart similarity index 100% rename from packages/cedar_core/lib/src/serializers.g.dart rename to packages/cedar/lib/src/serializers.g.dart diff --git a/packages/cedar_core/lib/src/util.dart b/packages/cedar/lib/src/util.dart similarity index 100% rename from packages/cedar_core/lib/src/util.dart rename to packages/cedar/lib/src/util.dart diff --git a/packages/cedar_core/pubspec.yaml b/packages/cedar/pubspec.yaml similarity index 94% rename from packages/cedar_core/pubspec.yaml rename to packages/cedar/pubspec.yaml index 3ab9a247..c3a3f720 100644 --- a/packages/cedar_core/pubspec.yaml +++ b/packages/cedar/pubspec.yaml @@ -1,4 +1,4 @@ -name: cedar_core +name: cedar description: Base types and utilities of the Cedar policy language. version: 0.1.0 diff --git a/packages/cedar_core/README.md b/packages/cedar_core/README.md deleted file mode 100644 index af1c5a57..00000000 --- a/packages/cedar_core/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# cedar_core - -Base types and utilities of the Cedar language in Dart. - -This is separate from `package:cedar_dart` so that the types can be used without bundling the native assets of `package:cedar_dart`. diff --git a/packages/celest_auth/example/pubspec.yaml b/packages/celest_auth/example/pubspec.yaml index 946fe7b8..737a9577 100644 --- a/packages/celest_auth/example/pubspec.yaml +++ b/packages/celest_auth/example/pubspec.yaml @@ -14,8 +14,8 @@ dependencies: flutter_state_notifier: ^1.0.0 dependency_overrides: - cedar_core: - path: ../../cedar_core + cedar: + path: ../../cedar celest: path: ../../celest celest_auth: diff --git a/packages/celest_auth/pubspec.yaml b/packages/celest_auth/pubspec.yaml index 4dc44b45..52cc6fc5 100644 --- a/packages/celest_auth/pubspec.yaml +++ b/packages/celest_auth/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: async: ^2.11.0 built_collection: ^5.1.1 built_value: ^8.9.1 - cedar_core: ^0.1.0 + cedar: ^0.1.0 celest_core: ^0.2.0 chunked_stream: ^1.4.2 corks: ^0.1.0 diff --git a/packages/corks/lib/src/cork.dart b/packages/corks/lib/src/cork.dart index 8aaf96d7..5386e448 100644 --- a/packages/corks/lib/src/cork.dart +++ b/packages/corks/lib/src/cork.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'dart:math'; import 'dart:typed_data'; -import 'package:cedar_core/cedar_core.dart' as cedar; +import 'package:cedar/cedar.dart' as cedar; import 'package:corks/corks_proto.dart' as proto; import 'package:corks/src/interop/proto_interop.dart'; import 'package:corks/src/proto/google/protobuf/any.pb.dart' as proto; diff --git a/packages/corks/lib/src/interop/proto_interop.dart b/packages/corks/lib/src/interop/proto_interop.dart index 3276d454..4913e609 100644 --- a/packages/corks/lib/src/interop/proto_interop.dart +++ b/packages/corks/lib/src/interop/proto_interop.dart @@ -3,7 +3,7 @@ library; import 'dart:typed_data'; -import 'package:cedar_core/cedar_core.dart' as cedar; +import 'package:cedar/cedar.dart' as cedar; import 'package:corks/src/proto/cedar/v3/entity.pb.dart'; import 'package:corks/src/proto/cedar/v3/entity_id.pb.dart'; import 'package:corks/src/proto/cedar/v3/expr.pb.dart'; diff --git a/packages/corks/pubspec.yaml b/packages/corks/pubspec.yaml index 657f9417..2d9d5162 100644 --- a/packages/corks/pubspec.yaml +++ b/packages/corks/pubspec.yaml @@ -7,8 +7,8 @@ environment: sdk: ^3.3.0 dependencies: - cedar_core: - path: ../cedar_core + cedar: + path: ../cedar crypto: ^3.0.3 fixnum: ^1.1.0 meta: ^1.10.0 diff --git a/packages/corks/test/cedar_test_todo.dart b/packages/corks/test/cedar_test_todo.dart index 34c19a2b..73720212 100644 --- a/packages/corks/test/cedar_test_todo.dart +++ b/packages/corks/test/cedar_test_todo.dart @@ -1,7 +1,7 @@ -// TODO(dnys1): Get this working with a dependency on cedar_dart. +// TODO(dnys1): Get this working with a dependency on cedar. -// import 'package:cedar_core/cedar_core.dart' as cedar; -// import 'package:cedar_dart/testing/cedar_test_corpus.dart'; +// import 'package:cedar/cedar.dart' as cedar; +// import 'package:cedar/testing/cedar_test_corpus.dart'; // import 'package:corks/src/interop/proto_interop.dart'; // import 'package:test/test.dart'; diff --git a/packages/corks/test/cork_test.dart b/packages/corks/test/cork_test.dart index dd4a3e2d..0d289274 100644 --- a/packages/corks/test/cork_test.dart +++ b/packages/corks/test/cork_test.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:math'; import 'dart:typed_data'; -import 'package:cedar_core/cedar_core.dart'; +import 'package:cedar/cedar.dart'; import 'package:corks/corks.dart'; import 'package:test/test.dart';