fix: Fixed onInitialize being called twice.

mathrunet · Feb 7, 2023 · eb671ff · eb671ff
1 parent 30b0fee
commit eb671ff
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 36 deletions.
diff --git a/packages/katana_model/example/pubspec.lock b/packages/katana_model/example/pubspec.lock
@@ -337,18 +337,17 @@ packages:
     source: hosted
     version: "4.8.0"
   katana:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: katana
-      sha256: "9a3ec047c35ec88e027139e88ce45202b022dd2111b38848c85159101b0028ce"
-      url: "https://pub.dev"
-    source: hosted
+      path: "../../katana"
+      relative: true
+    source: path
     version: "1.0.5"
   katana_listenables_annotation:
     dependency: "direct overridden"
     description:
-      path: "../../katana_listenables_annotation"
-      relative: true
+      path: "/Users/mathru/Documents/github/flutter_masamune/packages/katana_model/example/../../katana_listenables_annotation"
+      relative: false
     source: path
     version: "1.2.14"
   katana_model:
@@ -357,7 +356,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.5.10"
+    version: "1.5.11"
   lints:
     dependency: transitive
     description:

diff --git a/packages/katana_model/lib/src/no_sql_database.dart b/packages/katana_model/lib/src/no_sql_database.dart
@@ -76,9 +76,7 @@ class NoSqlDatabase {
     this.onLoad,
     this.onSaved,
     this.onDeleted,
-  }) {
-    onInitialize?.call(this);
-  }
+  });
 
   /// Location where real data is stored.
   ///
@@ -137,13 +135,13 @@ class NoSqlDatabase {
     try {
       _initialized = true;
       await onInitialize?.call(this);
-      _completer?.complete(e);
+      _completer?.complete();
       _completer = null;
     } catch (e) {
       _completer?.completeError(e);
       _completer = null;
     } finally {
-      _completer?.complete(e);
+      _completer?.complete();
       _completer = null;
     }
   }
@@ -389,6 +387,7 @@ class NoSqlDatabase {
           value
               .toList(
                 (key, value) {
+                  // ignore: unnecessary_type_check
                   if (value is! Map) {
                     return null;
                   }

diff --git a/packages/katana_model/lib/src/others/database_exporter.dart b/packages/katana_model/lib/src/others/database_exporter.dart
@@ -69,7 +69,7 @@ class DatabaseExporter {
   ///
   /// [fileName]に保存されているデータをインポートします。
   ///
-  /// Webの場合は[fileName]をキーにした状態でLocalStorage`から取得します。
+  /// Webの場合は[fileName]をキーにした状態で`LocalStorage`から取得します。
   ///
   /// [fileName]に基づく復号化を行ないます。エクスポート時と[fileName]が異なる場合インポートできません。
   static Future<DynamicMap> import(String fileName) async {

diff --git a/packages/katana_model/lib/src/web/database_exporter.dart b/packages/katana_model/lib/src/web/database_exporter.dart
@@ -64,7 +64,7 @@ class DatabaseExporter {
   ///
   /// [fileName]に保存されているデータをインポートします。
   ///
-  /// Webの場合は[fileName]をキーにした状態でLocalStorage`から取得します。
+  /// Webの場合は[fileName]をキーにした状態で`LocalStorage`から取得します。
   ///
   /// [fileName]に基づく復号化を行ないます。エクスポート時と[fileName]が異なる場合インポートできません。
   static Future<DynamicMap> import(String fileName) async {

diff --git a/packages/katana_model/pubspec.lock b/packages/katana_model/pubspec.lock
@@ -165,10 +165,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "961c4aebd27917269b1896382c7cb1b1ba81629ba669ba09c27a7e5710ec9040"
+      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.3"
   crypto:
     dependency: transitive
     description:
@@ -350,10 +350,9 @@ packages:
   katana:
     dependency: "direct main"
     description:
-      name: katana
-      sha256: "9a3ec047c35ec88e027139e88ce45202b022dd2111b38848c85159101b0028ce"
-      url: "https://pub.dev"
-    source: hosted
+      path: "../katana"
+      relative: true
+    source: path
     version: "1.0.5"
   lints:
     dependency: transitive

diff --git a/packages/katana_model_firestore/pubspec.lock b/packages/katana_model_firestore/pubspec.lock
@@ -117,10 +117,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "961c4aebd27917269b1896382c7cb1b1ba81629ba669ba09c27a7e5710ec9040"
+      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.3"
   crypto:
     dependency: transitive
     description:
@@ -283,27 +283,24 @@ packages:
   katana:
     dependency: "direct main"
     description:
-      name: katana
-      sha256: "9a3ec047c35ec88e027139e88ce45202b022dd2111b38848c85159101b0028ce"
-      url: "https://pub.dev"
-    source: hosted
+      path: "../katana"
+      relative: true
+    source: path
     version: "1.0.5"
   katana_firebase:
     dependency: "direct main"
     description:
-      name: katana_firebase
-      sha256: "8294c984f0c13d5dd2950694279242e7b8b167493ecd0f0f7a82bf3384da2b4d"
-      url: "https://pub.dev"
-    source: hosted
+      path: "../katana_firebase"
+      relative: true
+    source: path
     version: "1.1.12"
   katana_model:
     dependency: "direct main"
     description:
-      name: katana_model
-      sha256: "10fa4f40f70d9e3dbadc3fd57987087ce175ee6cfd5e22c9dfc95e0fa3393cdb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.10"
+      path: "../katana_model"
+      relative: true
+    source: path
+    version: "1.5.11"
   lints:
     dependency: transitive
     description: