web: Fix finding preferrable implementation

Author: simolus3

sqlite3_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2-wip
+
+- Fix preferred databases not being sorted correctly.
+
 ## 0.1.1-wip
 
 - Fix remote error after closing databases.

sqlite3_web/lib/src/client.dart

@@ -365,7 +365,7 @@ final class DatabaseClient implements WebSqlite {
 
     // Enum values are ordered by preferrability, so just pick the best option
     // left.
-    availableImplementations.sort(_preferrableMode);
+    availableImplementations.sort(preferrableMode);
 
     final (storage, access) = availableImplementations.firstOrNull ??
         (StorageMode.inMemory, AccessMode.inCurrentContext);
@@ -384,17 +384,17 @@ final class DatabaseClient implements WebSqlite {
   ///
   /// Returns negative values if `a` is more preferrable than `b` and positive
   /// values if `b` is more preferrable than `a`.
-  static int _preferrableMode(
+  static int preferrableMode(
       (StorageMode, AccessMode) a, (StorageMode, AccessMode) b) {
     // First, prefer OPFS (an actual file system API) over IndexedDB, a custom
     // file system implementation.
     if (a.$1 != b.$1) {
-      return a.$1.index.compareTo(b.$2.index);
+      return a.$1.index.compareTo(b.$1.index);
     }
 
     // In a storage API, prefer shared workers which cause less contention
     // because we can actually share database resources between tabs.
-    return a.$2.index.compareTo(a.$2.index);
+    return a.$2.index.compareTo(b.$2.index);
   }
 }
 

sqlite3_web/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sqlite3_web
 description: Utilities to simplify accessing sqlite3 on the web, with automated feature detection.
-version: 0.1.1-wip
+version: 0.1.2-wip
 homepage: https://github.com/simolus3/sqlite3.dart/tree/main/sqlite3_web
 repository: https://github.com/simolus3/sqlite3.dart
 

sqlite3_web/test/client_test.dart

@@ -0,0 +1,30 @@
+@TestOn('browser')
+library;
+
+import 'package:sqlite3_web/sqlite3_web.dart';
+import 'package:sqlite3_web/src/client.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('finds preferrable implementations', () {
+    final all = [
+      for (final storage in StorageMode.values)
+        for (final access in AccessMode.values) (storage, access)
+    ];
+
+    all.shuffle();
+    all.sort(DatabaseClient.preferrableMode);
+
+    expect(all, [
+      (StorageMode.opfs, AccessMode.throughSharedWorker),
+      (StorageMode.opfs, AccessMode.throughDedicatedWorker),
+      (StorageMode.opfs, AccessMode.inCurrentContext),
+      (StorageMode.indexedDb, AccessMode.throughSharedWorker),
+      (StorageMode.indexedDb, AccessMode.throughDedicatedWorker),
+      (StorageMode.indexedDb, AccessMode.inCurrentContext),
+      (StorageMode.inMemory, AccessMode.throughSharedWorker),
+      (StorageMode.inMemory, AccessMode.throughDedicatedWorker),
+      (StorageMode.inMemory, AccessMode.inCurrentContext),
+    ]);
+  });
+}