[sembast] v3.7.4+2 fix import

tekartik · Sep 25, 2024 · 68c30b8 · 68c30b8
1 parent 5bc954f
commit 68c30b8
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 25 deletions.
diff --git a/sembast/CHANGELOG.md b/sembast/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.7.4+1
+## 3.7.4+2
 
 * Add `DatabaseFactory.databaseExists(String path)` to check if a database exists.
 

diff --git a/sembast/lib/utils/database_utils.dart b/sembast/lib/utils/database_utils.dart
@@ -1,2 +1,3 @@
+export 'package:sembast/sembast.dart';
 export 'package:sembast/src/database_utils.dart'
     show getNonEmptyStoreNames, databaseMerge;
diff --git a/sembast/lib/utils/import_export_io.dart b/sembast/lib/utils/import_export_io.dart
@@ -2,9 +2,9 @@ library sembast.utils.sembast_import_export_io;
 
 import 'dart:io';
 
-import 'package:sembast/src/api/sembast.dart';
 import 'package:sembast/src/common_import.dart';
 import 'package:sembast/utils/sembast_import_export.dart';
+export 'package:sembast/sembast.dart';
 
 ///
 /// Write the export in a file (currently in .jsonl format)

diff --git a/sembast/lib/utils/sembast_import_export.dart b/sembast/lib/utils/sembast_import_export.dart
@@ -11,6 +11,7 @@ import 'package:sembast/src/model.dart';
 import 'package:sembast/src/store_impl.dart';
 import 'package:sembast/src/store_ref_impl.dart';
 import 'package:sembast/src/transaction_impl.dart';
+export 'package:sembast/sembast.dart';
 
 const String _dbVersion = 'version';
 const String _exportSignatureKey = 'sembast_export';

diff --git a/sembast/pubspec.yaml b/sembast/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sembast
-version: 3.7.4+1
+version: 3.7.4+2
 description: NoSQL persistent embedded file system document-based database for Dart VM and Flutter with encryption support.
 homepage: https://github.com/tekartik/sembast.dart/tree/master/sembast
 topics:

diff --git a/sembast_web/example/doc_example.dart b/sembast_web/example/doc_example.dart
@@ -1,4 +1,3 @@
-import 'package:sembast/sembast.dart';
 import 'package:sembast_web/sembast_web.dart';
 
 Future main() async {

diff --git a/sembast_web/example/example.dart b/sembast_web/example/example.dart
@@ -1,4 +1,3 @@
-import 'package:sembast/sembast.dart';
 import 'package:sembast_web/sembast_web.dart';
 
 Future main() async {

diff --git a/sembast_web/lib/sembast_web.dart b/sembast_web/lib/sembast_web.dart
@@ -1,6 +1,8 @@
 import 'package:sembast/sembast.dart';
 import 'package:sembast_web/sembast_web_interop.dart' as src;
 
+export 'package:sembast/sembast.dart';
+
 /// Sembast factory for the Web.
 ///
 /// Build on top of IndexedDB and localStorage.

diff --git a/sembast_web/pubspec.yaml b/sembast_web/pubspec.yaml
@@ -11,8 +11,8 @@ environment:
 
 dependencies:
   web: '>=0.5.0 <2.0.0'
-  sembast: '>=3.7.4-1 <5.0.0'
-  idb_shim: '>=2.5.0+1 <4.0.0'
+  sembast: '>=3.7.4+1 <5.0.0'
+  idb_shim: '>=2.6.1+4 <4.0.0'
   synchronized: '>=3.0.1 <5.0.0'
 dev_dependencies:
   lints: '>=1.0.1'

diff --git a/sembast_web/test/multiplatform/idb_format_test.dart b/sembast_web/test/multiplatform/idb_format_test.dart
@@ -1,7 +1,5 @@
 library;
 
-import 'package:idb_shim/idb.dart';
-import 'package:idb_shim/idb_client_memory.dart';
 import 'package:idb_shim/utils/idb_utils.dart';
 import 'package:sembast/sembast.dart';
 import 'package:sembast_web/src/jdb_factory_idb.dart' show JdbFactoryIdb;

diff --git a/sembast_web/test/multiplatform/idb_jdb_test.dart b/sembast_web/test/multiplatform/idb_jdb_test.dart
@@ -1,29 +1,29 @@
 library;
 
-import 'package:idb_shim/idb_client_memory.dart';
 import 'package:idb_shim/utils/idb_import_export.dart';
-import 'package:sembast/sembast.dart';
+import 'package:sembast/sembast.dart' as sembast;
 import 'package:sembast_web/src/jdb_database_idb.dart' show JdbDatabaseIdb;
 import 'package:sembast_web/src/jdb_factory_idb.dart' show JdbFactoryIdb;
 import 'package:sembast_web/src/jdb_import.dart';
 import 'package:test/test.dart';
 
 import '../base64_codec.dart';
 
-DatabaseFactoryJdb asDatabaseFactoryIdb(DatabaseFactory databaseFactory) =>
+DatabaseFactoryJdb asDatabaseFactoryIdb(
+        sembast.DatabaseFactory databaseFactory) =>
     databaseFactory as DatabaseFactoryJdb;
 
 JdbFactoryIdb asJdbJactoryIdb(JdbFactory factory) => factory as JdbFactoryIdb;
 
-SembastDatabase asSembastDatabase(Database db) => db as SembastDatabase;
+SembastDatabase asSembastDatabase(sembast.Database db) => db as SembastDatabase;
 
 SembastStorageJdb? asSembastStorateJdb(StorageJdb? storageJdb) =>
     storageJdb as SembastStorageJdb?;
 
 JdbDatabaseIdb? asJsbDatabaseIdb(JdbDatabase? database) =>
     database as JdbDatabaseIdb?;
 
-JdbDatabaseIdb? dbAsJsbDatabaseIdb(Database db) => asJsbDatabaseIdb(
+JdbDatabaseIdb? dbAsJsbDatabaseIdb(sembast.Database db) => asJsbDatabaseIdb(
     asSembastStorateJdb(asSembastDatabase(db).storageJdb)!.jdbDatabase);
 
 Future main() async {
@@ -78,7 +78,7 @@ void defineTests(JdbFactoryIdb jdbFactoryIdb) {
       };
 
       test('export', () async {
-        var store = StoreRef<String, String>.main();
+        var store = sembast.StoreRef<String, String>.main();
         var record = store.record('key');
         await factory.deleteDatabase('test');
         var db = await factory.openDatabase('test');
@@ -98,7 +98,7 @@ void defineTests(JdbFactoryIdb jdbFactoryIdb) {
 
       test('import/close open', () async {
         var dbName = 'test_import.db';
-        var store = StoreRef<String, String>.main();
+        var store = sembast.StoreRef<String, String>.main();
         var record = store.record('key');
         await factory.deleteDatabase(dbName);
 
@@ -163,9 +163,9 @@ void defineTests(JdbFactoryIdb jdbFactoryIdb) {
       };
 
       test('export', () async {
-        var codec =
-            SembastCodec(signature: 'base64', codec: SembastBase64Codec());
-        var store = StoreRef<String, String>.main();
+        var codec = sembast.SembastCodec(
+            signature: 'base64', codec: SembastBase64Codec());
+        var store = sembast.StoreRef<String, String>.main();
         var record = store.record('key');
         await factory.deleteDatabase('test');
         var db = await factory.openDatabase('test', codec: codec);
@@ -184,9 +184,9 @@ void defineTests(JdbFactoryIdb jdbFactoryIdb) {
       });
 
       test('async codec', () async {
-        var codec =
-            SembastCodec(signature: 'base64', codec: SembastBase64CodecAsync());
-        var store = StoreRef<String, String>.main();
+        var codec = sembast.SembastCodec(
+            signature: 'base64', codec: SembastBase64CodecAsync());
+        var store = sembast.StoreRef<String, String>.main();
         var record = store.record('key');
         await factory.deleteDatabase('test');
         var db = await factory.openDatabase('test', codec: codec);
@@ -206,7 +206,7 @@ void defineTests(JdbFactoryIdb jdbFactoryIdb) {
 
       test('import/close open', () async {
         var dbName = 'test_import.db';
-        var store = StoreRef<String, String>.main();
+        var store = sembast.StoreRef<String, String>.main();
         var record = store.record('key');
         await factory.deleteDatabase(dbName);
 

diff --git a/sembast_web/test/web/idb_native_simple_test.dart b/sembast_web/test/web/idb_native_simple_test.dart
@@ -3,9 +3,7 @@
 @TestOn('browser')
 library sembast_web.test.web.idb_native_simple_test;
 
-import 'package:sembast/sembast.dart';
 import 'package:sembast_web/sembast_web.dart';
-import 'package:sembast_web/src/sembast_import.dart';
 import 'package:test/test.dart';
 import 'package:web/web.dart';