Merge remote-tracking branch 'origin/dart3a' into dart3a

# Conflicts: # sembast/CHANGELOG.md # sembast/lib/utils/type_adapter.dart # sembast/pubspec.yaml
tekartik · Dec 8, 2024 · 25ed4c1 · 25ed4c1
2 parents ef4bf58 + a5f498b
commit 25ed4c1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/sembast/CHANGELOG.md b/sembast/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 * Add experimental onAllStore listeners (not typed) `Database.addAllStoresChangesListener` and `Database.removeAllStoresChangesListener`
 
-## 3.8.0
+## 3.8.0+1
 
 * Add `Query.getKey`, `Query.getKeys`,  `Query.onKey`, `Query.onKeys`,
   `Query.getKeySync`, `Query.getKeysSync`, `Query.onKeysSync`, `Query.onKeySync` methods
+* Export json helpers from `utils/type_adapters.dart`
 
 ## 3.7.5+2
 

diff --git a/sembast/lib/utils/type_adapter.dart b/sembast/lib/utils/type_adapter.dart
@@ -4,4 +4,14 @@ export 'package:sembast/src/json_encodable_codec.dart'
         JsonEncodableDecoder,
         JsonEncodableEncoder,
         sembastDefaultJsonEncodableCodec;
-export 'package:sembast/src/type_adapter_impl.dart' show SembastTypeAdapter;
+export 'package:sembast/src/sembast_codec.dart'
+    show
+        sembastCodecToJsonEncodable,
+        sembastCodecFromJsonEncodable,
+        sembastCodecDefault;
+export 'package:sembast/src/type_adapter_impl.dart'
+    show
+        SembastTypeAdapter,
+        sembastTimestampAdapter,
+        sembastBlobAdapter,
+        sembastDefaultTypeAdapters;
diff --git a/sembast/test/type_adapter_test.dart b/sembast/test/type_adapter_test.dart
@@ -1,8 +1,9 @@
 library;
 
 import 'package:sembast/blob.dart';
-import 'package:sembast/src/timestamp_impl.dart';
-import 'package:sembast/src/type_adapter_impl.dart';
+import 'package:sembast/src/type_adapter_impl.dart' show sembastDateTimeAdapter;
+import 'package:sembast/timestamp.dart';
+import 'package:sembast/utils/type_adapter.dart';
 
 import 'test_common.dart';
 import 'timestamp_test.dart';