@_nazmiforreal/flutter-ota 0.1.11 → 0.1.13

package/dart-src/plugins/cloudflare/test/d1_database_test.dart

@@ -25,20 +25,19 @@ Bundle _makeBundle({
   String? targetAppVersion,
   String? message,
   List<BundlePatchArtifact>? patches,
-}) =>
-    Bundle(
-      id: id,
-      channel: channel,
-      enabled: enabled,
-      shouldForceUpdate: false,
-      fileHash: 'h-$id',
-      platform: Platform.android,
-      targetAppVersion: targetAppVersion,
-      storageUri: 's3://$id',
-      fingerprintHash: fingerprintHash,
-      message: message,
-      patches: patches,
-    );
+}) => Bundle(
+  id: id,
+  channel: channel,
+  enabled: enabled,
+  shouldForceUpdate: false,
+  fileHash: 'h-$id',
+  platform: Platform.android,
+  targetAppVersion: targetAppVersion,
+  storageUri: 's3://$id',
+  fingerprintHash: fingerprintHash,
+  message: message,
+  patches: patches,
+);
 
 void main() {
   group('cloudflare d1Database', () {
@@ -61,48 +60,51 @@ void main() {
       expect(channels, containsAll(['production', 'staging']));
     });
 
-    test('getBundles returns bundles and pagination; filters by channel',
-        () async {
-      for (final id in ['b1', 'b2', 'b3']) {
-        await plugin.appendBundle(_makeBundle(id: id));
-      }
-      await plugin.commitBundle();
-
-      final res = await plugin.getBundles(
-        DatabaseBundleQueryOptions(
-          where: const DatabaseBundleQueryWhere(),
-          limit: 2,
-          offset: 0,
-          orderBy: const DatabaseBundleQueryOrder(direction: 'desc'),
-        ),
-      );
-      expect(res.data, hasLength(2));
-      expect(res.pagination.total, 3);
-      expect(res.pagination.hasNextPage, isTrue);
-
-      final staging = await plugin.getBundles(
-        DatabaseBundleQueryOptions(
-          where: const DatabaseBundleQueryWhere(channel: 'staging'),
-          limit: 10,
-          offset: 0,
-        ),
-      );
-      expect(staging.data, isEmpty);
-    });
-
-    test('getBundleById returns null for missing, bundle for existing',
-        () async {
-      await plugin.appendBundle(_makeBundle(id: 'b1'));
-      await plugin.commitBundle();
+    test(
+      'getBundles returns bundles and pagination; filters by channel',
+      () async {
+        for (final id in ['b1', 'b2', 'b3']) {
+          await plugin.appendBundle(_makeBundle(id: id));
+        }
+        await plugin.commitBundle();
+
+        final res = await plugin.getBundles(
+          DatabaseBundleQueryOptions(
+            where: const DatabaseBundleQueryWhere(),
+            limit: 2,
+            offset: 0,
+            orderBy: const DatabaseBundleQueryOrder(direction: 'desc'),
+          ),
+        );
+        expect(res.data, hasLength(2));
+        expect(res.pagination.total, 3);
+        expect(res.pagination.hasNextPage, isTrue);
+
+        final staging = await plugin.getBundles(
+          DatabaseBundleQueryOptions(
+            where: const DatabaseBundleQueryWhere(channel: 'staging'),
+            limit: 10,
+            offset: 0,
+          ),
+        );
+        expect(staging.data, isEmpty);
+      },
+    );
 
-      expect(await plugin.getBundleById('missing'), isNull);
-      final got = await plugin.getBundleById('b1');
-      expect(got, isNotNull);
-      expect(got!.id, 'b1');
-    });
+    test(
+      'getBundleById returns null for missing, bundle for existing',
+      () async {
+        await plugin.appendBundle(_makeBundle(id: 'b1'));
+        await plugin.commitBundle();
+
+        expect(await plugin.getBundleById('missing'), isNull);
+        final got = await plugin.getBundleById('b1');
+        expect(got, isNotNull);
+        expect(got!.id, 'b1');
+      },
+    );
 
-    test('commitBundle append -> update -> delete reflects in store',
-        () async {
+    test('commitBundle append -> update -> delete reflects in store', () async {
       await plugin.appendBundle(_makeBundle(id: 'b1', message: 'original'));
       await plugin.commitBundle();
       expect((await plugin.getBundleById('b1'))!.message, 'original');
@@ -118,43 +120,51 @@ void main() {
       expect(await plugin.getBundleById('b1'), isNull);
     });
 
-    test('getUpdateInfo (appVersion) returns UpdateInfo for compatible bundle',
-        () async {
-      await plugin.appendBundle(_makeBundle(id: 'b1', targetAppVersion: '1.0.0'));
-      await plugin.commitBundle();
-
-      final info = await plugin.getUpdateInfo(
-        AppVersionGetBundlesArgs(
-          platform: Platform.android,
-          bundleId: nilUuid,
-          appVersion: '1.0.0',
-          channel: 'production',
-          minBundleId: nilUuid,
-        ),
-      );
-
-      expect(info, isNotNull);
-      expect(info!.id, 'b1');
-      expect(info.status, UpdateStatus.update);
-    });
-
-    test('getUpdateInfo (appVersion) returns null when no compatible bundle',
-        () async {
-      await plugin.appendBundle(_makeBundle(id: 'b1', targetAppVersion: '1.0.0'));
-      await plugin.commitBundle();
-
-      final info = await plugin.getUpdateInfo(
-        AppVersionGetBundlesArgs(
-          platform: Platform.android,
-          bundleId: nilUuid,
-          appVersion: '9.9.9',
-          channel: 'production',
-          minBundleId: nilUuid,
-        ),
-      );
+    test(
+      'getUpdateInfo (appVersion) returns UpdateInfo for compatible bundle',
+      () async {
+        await plugin.appendBundle(
+          _makeBundle(id: 'b1', targetAppVersion: '1.0.0'),
+        );
+        await plugin.commitBundle();
+
+        final info = await plugin.getUpdateInfo(
+          AppVersionGetBundlesArgs(
+            platform: Platform.android,
+            bundleId: nilUuid,
+            appVersion: '1.0.0',
+            channel: 'production',
+            minBundleId: nilUuid,
+          ),
+        );
+
+        expect(info, isNotNull);
+        expect(info!.id, 'b1');
+        expect(info.status, UpdateStatus.update);
+      },
+    );
 
-      expect(info, isNull);
-    });
+    test(
+      'getUpdateInfo (appVersion) returns null when no compatible bundle',
+      () async {
+        await plugin.appendBundle(
+          _makeBundle(id: 'b1', targetAppVersion: '1.0.0'),
+        );
+        await plugin.commitBundle();
+
+        final info = await plugin.getUpdateInfo(
+          AppVersionGetBundlesArgs(
+            platform: Platform.android,
+            bundleId: nilUuid,
+            appVersion: '9.9.9',
+            channel: 'production',
+            minBundleId: nilUuid,
+          ),
+        );
+
+        expect(info, isNull);
+      },
+    );
 
     test('getUpdateInfo (fingerprint) returns matching bundle', () async {
       await plugin.appendBundle(_makeBundle(id: 'fp', fingerprintHash: 'fp1'));

package/dart-src/plugins/cloudflare/test/mock_d1_client.dart

@@ -76,7 +76,9 @@ class MockD1Client implements D1ClientLike {
     if (where.contains('target_app_version = ?')) {
       if (row['target_app_version'] != params[p++]) return false;
     }
-    if (where.contains('target_app_version IN (SELECT value FROM json_each(?))')) {
+    if (where.contains(
+      'target_app_version IN (SELECT value FROM json_each(?))',
+    )) {
       if (!_asList(params[p++]).contains(row['target_app_version'])) {
         return false;
       }
@@ -140,7 +142,9 @@ class MockD1Client implements D1ClientLike {
       final channels = {
         for (final row in store.bundleRows) row['channel'] as String,
       };
-      return [for (final c in channels) {'channel': c}];
+      return [
+        for (final c in channels) {'channel': c},
+      ];
     }
 
     if (sql.contains('SELECT target_app_version FROM bundles')) {
@@ -164,9 +168,11 @@ class MockD1Client implements D1ClientLike {
           .where((row) => ids.contains(row['bundle_id']))
           .toList();
       rows.sort(
-        (a, b) => (a['order_index'] as num).compareTo(b['order_index'] as num) +
-            (a['base_bundle_id'] as String)
-                .compareTo(b['base_bundle_id'] as String),
+        (a, b) =>
+            (a['order_index'] as num).compareTo(b['order_index'] as num) +
+            (a['base_bundle_id'] as String).compareTo(
+              b['base_bundle_id'] as String,
+            ),
       );
       return rows;
     }
@@ -195,8 +201,7 @@ class MockD1Client implements D1ClientLike {
         'rollout_cohort_count': params[15],
         'target_cohorts': params[16],
       };
-      store.bundleRows
-          .removeWhere((r) => r['id'] == row['id']);
+      store.bundleRows.removeWhere((r) => r['id'] == row['id']);
       store.bundleRows.add(row);
       return const [];
     }
@@ -219,8 +224,9 @@ class MockD1Client implements D1ClientLike {
     if (sql.contains('DELETE FROM bundles')) {
       final id = params[0];
       store.bundleRows.removeWhere((r) => r['id'] == id);
-      store.patchRows
-          .removeWhere((r) => r['bundle_id'] == id || r['base_bundle_id'] == id);
+      store.patchRows.removeWhere(
+        (r) => r['bundle_id'] == id || r['base_bundle_id'] == id,
+      );
       return const [];
     }
 
@@ -240,17 +246,16 @@ class MockD1Client implements D1ClientLike {
 
 /// Build a [D1DatabaseConfig] wired to an in-memory [Store].
 D1DatabaseConfig mockConfig(Store store) => D1DatabaseConfig(
-      databaseId: 'test-db',
-      accountId: 'test-account',
-      cloudflareApiToken: 'test-token',
-      clientFactory: (_) => MockD1Client(store),
-    );
+  databaseId: 'test-db',
+  accountId: 'test-account',
+  cloudflareApiToken: 'test-token',
+  clientFactory: (_) => MockD1Client(store),
+);
 
 /// Construct the plugin with an in-memory store.
 DatabasePlugin newPlugin(Store store) => d1Database(mockConfig(store))();
 
 /// Construct the Workers D1 variant with an in-memory store.
-DatabasePlugin newWorkerPlugin(Store store) =>
-    cloudflareWorkerDatabase(
-      CloudflareWorkerDatabaseConfig(getDb: () => MockD1Client(store)),
-    )();
+DatabasePlugin newWorkerPlugin(Store store) => cloudflareWorkerDatabase(
+  CloudflareWorkerDatabaseConfig(getDb: () => MockD1Client(store)),
+)();

package/dart-src/plugins/cloudflare/test/mock_r2_client.dart

@@ -29,8 +29,7 @@ class MockR2Client implements R2S3ClientLike {
   }
 
   @override
-  Future<bool> headObject(String key) async =>
-      store.objects.containsKey(key);
+  Future<bool> headObject(String key) async => store.objects.containsKey(key);
 
   @override
   Future<List<int>> getObjectAsBytes(String key) async {
@@ -64,20 +63,16 @@ class MockR2Client implements R2S3ClientLike {
   }
 
   @override
-  Future<void> putObject(
-    String key,
-    List<int> body,
-    String contentType,
-  ) async {
+  Future<void> putObject(String key, List<int> body, String contentType) async {
     store.objects[key] = body;
   }
 }
 
 /// Build an [R2S3StorageConfig] wired to an in-memory [Store].
 R2S3StorageConfig mockR2Config(Store store) => R2S3StorageConfig(
-      accountId: 'test-account',
-      bucketName: 'test-bucket',
-      accessKeyId: 'test-access-key',
-      secretAccessKey: 'test-secret',
-      clientFactory: (_) => MockR2Client(store),
-    );
+  accountId: 'test-account',
+  bucketName: 'test-bucket',
+  accessKeyId: 'test-access-key',
+  secretAccessKey: 'test-secret',
+  clientFactory: (_) => MockR2Client(store),
+);

package/dart-src/plugins/cloudflare/test/r2_storage_test.dart

@@ -35,10 +35,7 @@ void main() {
     test('node upload + exists + downloadFile + delete', () async {
       final node = plugin.profiles.node!;
       final res = await node.upload('v1', tmpFile);
-      expect(
-        res['storageUri'],
-        'r2://test-bucket/v1/${basename(tmpFile)}',
-      );
+      expect(res['storageUri'], 'r2://test-bucket/v1/${basename(tmpFile)}');
       expect(await node.exists(res['storageUri']!), isTrue);
 
       await node.downloadFile(res['storageUri']!, outFile);

package/dart-src/plugins/plugin-core/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.0.2
+
+### Changed
+
+- **Shared previously-duplicated backend helpers in one place.** Extracted
+  `ensureExpectedBucket` (the S3/R2 bucket-mismatch guard, formerly copied
+  byte-for-byte in the cloudflare + aws storage profiles), `normalizeMetadata`
+  (bundle `metadata` JSON-string/object normalization, formerly in the supabase +
+  postgres mappers and cloudflare's `parseMetadata`), `buildBundlePatchId`
+  (the `${bundleId}:${baseBundleId}` patch primary key, formerly in three mappers),
+  and `updateJsonKeyRegex` (the `update.json` key matcher, formerly duplicated in
+  the aws blob database + `createBlobDatabasePlugin`). The four backend plugins
+  now import these from `plugin-core` instead of maintaining their own copies.
+  Public API of the backend packages is unchanged (cloudflare still re-exports
+  `buildBundlePatchId` / `parseMetadata` as aliases of the shared helpers).
+
 ## 0.0.1
 
 - Initial release of `flutter_ota_kit_plugin_core` as part of the flutter_ota_kit OTA toolkit.

package/dart-src/plugins/plugin-core/example/lib/main.dart

@@ -0,0 +1,61 @@
+// flutter_ota_kit_plugin_core example
+//
+// `flutter_ota_kit_plugin_core` provides the shared abstractions that
+// every backend plugin is built on top of: `DatabasePlugin`,
+// `StoragePlugin`, `Bundle` filtering, storage-URI parsing, pagination,
+// and the "blob database" factory used by the AWS, Cloudflare, and
+// PocketBase backends.
+//
+// Most apps don't import this package directly; the SDK's update
+// pipeline does. This file shows the standalone helpers so you can
+// use them while writing a custom backend or a CLI tool.
+//
+// Run: `dart run example/main.dart`
+
+import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart';
+
+void main() {
+  // ── 1. Storage URI parser. ───────────────────────────────────────
+  // `parseStorageUri` validates the protocol and returns the bucket +
+  // key. Throws on unknown protocols so misuse is caught early.
+  const supabaseUri =
+      'supabase-storage://flutter-ota-bundles/'
+      '01a059a6/patch.zip';
+  final parsed = parseStorageUri(supabaseUri, 'supabase-storage');
+  print('Parsed protocol: ${parsed.protocol}');
+  print('Parsed bucket:   ${parsed.bucket}');
+  print('Parsed key:      ${parsed.key}');
+
+  // ── 2. Bundle storage keys. ──────────────────────────────────────
+  // `createBundleStorageKey` returns a flat key for the patch blob
+  // inside a storage bucket. The default layout is `{id}/patch.zip`;
+  // for assets it's `{id}/assets/{path}`.
+  final patchKey = createBundleStorageKey('01a059a6');
+  print('Patch key: $patchKey');
+
+  final assetKey = createBundleStorageKey('01a059a6', [
+    'assets',
+    'images',
+    'logo.png',
+  ]);
+  print('Asset key: $assetKey');
+
+  // ── 3. Patch ID helper. ──────────────────────────────────────────
+  // The device SDK reports the currently-installed patch id back to
+  // the server (so the server can compute diffs). For patches with a
+  // base, the id is `{currentId}-h{patchCount}`; for standalone
+  // patches, the id is the current id.
+  final patchId = buildBundlePatchId(
+    '01a059a6-7d3c-4f3e-8a2c-9c2e3a4b5d6e',
+    '00000000-0000-0000-0000-000000000000',
+  );
+  print('Patch id: $patchId');
+
+  // ── 4. Pagination math. ──────────────────────────────────────────
+  // `calculatePagination` returns total/page/hasNext/hasPrev info
+  // used by the CLI's `bundle list` command.
+  final p = calculatePagination(247, limit: 20, offset: 40);
+  print('Page ${p.currentPage} of ${p.totalPages} (${p.total} items)');
+  print('  hasNextPage:     ${p.hasNextPage}');
+  print('  hasPreviousPage: ${p.hasPreviousPage}');
+}

package/dart-src/plugins/plugin-core/lib/flutter_ota_kit_plugin_core.dart

@@ -2,17 +2,14 @@ library;
 
 // Re-export core types for convenience.
 export 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart'
-    show
-        Bundle,
-        GetBundlesArgs,
-        Platform,
-        UpdateInfo,
-        semverSatisfies;
+    show Bundle, GetBundlesArgs, Platform, UpdateInfo, semverSatisfies;
 
 // Plugin-core types.
 export 'src/types.dart';
 
 // Helpers.
+export 'src/storage_helpers.dart';
+export 'src/bundle_helpers.dart';
 export 'src/calculate_pagination.dart';
 export 'src/query_bundles.dart';
 export 'src/paginate_bundles.dart';
@@ -39,4 +36,3 @@ export 'src/generate_min_bundle_id.dart';
 export 'src/uuidv7.dart';
 export 'src/get_update_info.dart';
 export 'src/resolve_update_info_from_bundles.dart';
-export 'src/resolve_update_info_from_bundles.dart';

package/dart-src/plugins/plugin-core/lib/src/asset_storage_layout.dart

@@ -1,5 +1,6 @@
 import 'content_addressed_assets.dart' show getContentAddressedAssetStoragePath;
-import 'legacy_asset_storage_layout.dart' show getLegacyManifestAssetStoragePath;
+import 'legacy_asset_storage_layout.dart'
+    show getLegacyManifestAssetStoragePath;
 
 /// The two supported asset storage layout strategies.
 typedef AssetStorageLayout = String;
@@ -27,8 +28,7 @@ String createStorageUriWithRelativePath({
   required String relativePath,
 }) {
   final storageUrl = Uri.parse(baseStorageUri);
-  final normalizedBasePath =
-      storageUrl.path.replaceAll(RegExp(r'/+$'), '');
+  final normalizedBasePath = storageUrl.path.replaceAll(RegExp(r'/+$'), '');
   final normalizedRelativePath = relativePath
       .replaceAll('\\', '/')
       .split('/')
@@ -46,8 +46,8 @@ String createStorageUriWithRelativePath({
 /// Returns `'content-addressed'` if the URI path ends with `/assets`,
 /// otherwise `'legacy-files'`.
 AssetStorageLayout getAssetStorageLayout(String assetBaseStorageUri) {
-  final pathname =
-      Uri.parse(assetBaseStorageUri).path.replaceAll(RegExp(r'/+$'), '');
+  final pathname = Uri.parse(assetBaseStorageUri).path
+      .replaceAll(RegExp(r'/+$'), '');
   return pathname.endsWith('/assets') || pathname == '/assets'
       ? assetLayoutContentAddressed
       : assetLayoutLegacyFiles;

package/dart-src/plugins/plugin-core/lib/src/bundle_helpers.dart

@@ -0,0 +1,23 @@
+import 'dart:convert' show jsonDecode;
+
+/// Normalize bundle `metadata` from various shapes (a JSON string or an
+/// already-decoded object) to a plain map. Identical across every backend
+/// mapper (supabase / postgres / cloudflare), so it lives here once.
+Map<String, Object?>? normalizeMetadata(Object? value) {
+  if (value == null) return null;
+  if (value is String) {
+    try {
+      final parsed = jsonDecode(value);
+      return normalizeMetadata(parsed);
+    } catch (_) {
+      return null;
+    }
+  }
+  if (value is Map) return value.cast<String, Object?>();
+  return null;
+}
+
+/// Compound primary key for a patch row: `${bundleId}:${baseBundleId}`.
+/// Shared by every backend mapper.
+String buildBundlePatchId(String bundleId, String baseBundleId) =>
+    '$bundleId:$baseBundleId';

package/dart-src/plugins/plugin-core/lib/src/bundle_storage_layout.dart

@@ -1,16 +1,21 @@
 /// The top-level prefix for bundle storage keys.
 const String bundleStoragePrefix = 'bundles';
 
-/// Build a storage key for a bundle, e.g. `bundles/<bundleId>/patch.zip`.
-String createBundleStorageKey(String bundleId, [List<String> relativePaths = const []]) {
-  return [bundleStoragePrefix, bundleId, ...relativePaths]
-      .where((s) => s.isNotEmpty)
-      .join('/');
+/// Build a storage key for a bundle, e.g. `bundles/{bundleId}/patch.zip`.
+String createBundleStorageKey(
+  String bundleId, [
+  List<String> relativePaths = const [],
+]) {
+  return [
+    bundleStoragePrefix,
+    bundleId,
+    ...relativePaths,
+  ].where((s) => s.isNotEmpty).join('/');
 }
 
 /// Replace the bundle-id segment in a storage URI with a relative path.
 ///
-/// For example, given a storage URI containing `.../bundles/<bundleId>/patch.zip`
+/// For example, given a storage URI containing `.../bundles/{bundleId}/patch.zip`
 /// and a [relativePath] of `files/manifest.json`, this returns a URI pointing
 /// to `.../files/manifest.json`.
 String createStorageRootUriWithPath(
@@ -19,12 +24,13 @@ String createStorageRootUriWithPath(
   String relativePath,
 ) {
   final storageUrl = Uri.parse(storageUri);
-  final segments = storageUrl.path.split('/').where((s) => s.isNotEmpty).toList();
+  final segments = storageUrl.path
+      .split('/')
+      .where((s) => s.isNotEmpty)
+      .toList();
   final bundleIndex = segments.lastIndexOf(bundleId);
   if (bundleIndex < 0) {
-    throw StateError(
-      'Storage URI does not contain bundle id: $bundleId',
-    );
+    throw StateError('Storage URI does not contain bundle id: $bundleId');
   }
 
   final rootSegments = segments.sublist(0, bundleIndex);

package/dart-src/plugins/plugin-core/lib/src/bundle_unit_of_work.dart

@@ -105,9 +105,7 @@ class BundleUnitOfWork {
       return const TrackedBundleNotFound();
     }
     final entry = _entries[bundleId];
-    return TrackedBundleFound(
-      entry is _PresentEntry ? entry.bundle : null,
-    );
+    return TrackedBundleFound(entry is _PresentEntry ? entry.bundle : null);
   }
 
   /// Deduped async lookup: returns cached entry, coalesces concurrent loads,
@@ -124,19 +122,23 @@ class BundleUnitOfWork {
     final pending = _pendingLoads[bundleId];
     if (pending != null) return pending;
 
-    final load = loadBundleById().then<Bundle?>((bundle) {
-      _pendingLoads.remove(bundleId);
-      final currentEntry = _entries[bundleId];
-      if (currentEntry != null) {
-        return currentEntry is _PresentEntry ? currentEntry.bundle : null;
-      }
-      _entries[bundleId] =
-          bundle != null ? _PresentEntry(bundle) : const _MissingEntry();
-      return bundle;
-    }, onError: (Object error) {
-      _pendingLoads.remove(bundleId);
-      throw error;
-    });
+    final load = loadBundleById().then<Bundle?>(
+      (bundle) {
+        _pendingLoads.remove(bundleId);
+        final currentEntry = _entries[bundleId];
+        if (currentEntry != null) {
+          return currentEntry is _PresentEntry ? currentEntry.bundle : null;
+        }
+        _entries[bundleId] = bundle != null
+            ? _PresentEntry(bundle)
+            : const _MissingEntry();
+        return bundle;
+      },
+      onError: (Object error) {
+        _pendingLoads.remove(bundleId);
+        throw error;
+      },
+    );
     _pendingLoads[bundleId] = load;
     return load;
   }
@@ -177,9 +179,7 @@ class BundleUnitOfWork {
       }
     }
 
-    return sortBundles(dataById.values.toList(), orderBy)
-        .take(limit)
-        .toList();
+    return sortBundles(dataById.values.toList(), orderBy).take(limit).toList();
   }
 
   void markInsert(Bundle bundle) {
@@ -199,7 +199,8 @@ class BundleUnitOfWork {
     _changes[bundle.id] = _TrackedBundleChange(
       operation: op,
       data: bundle,
-      before: prev?.before ??
+      before:
+          prev?.before ??
           (prevEntry is _PresentEntry ? prevEntry.bundle : null),
     );
   }
@@ -211,7 +212,8 @@ class BundleUnitOfWork {
     _changes[bundle.id] = _TrackedBundleChange(
       operation: BundleChangeOperation.delete,
       data: bundle,
-      before: prev?.before ??
+      before:
+          prev?.before ??
           (prevEntry is _PresentEntry ? prevEntry.bundle : bundle),
     );
   }
@@ -226,9 +228,11 @@ class BundleUnitOfWork {
 
   int listFetchExtraCount() {
     return _changes.values
-        .where((c) =>
-            c.operation == BundleChangeOperation.update ||
-            c.operation == BundleChangeOperation.delete)
+        .where(
+          (c) =>
+              c.operation == BundleChangeOperation.update ||
+              c.operation == BundleChangeOperation.delete,
+        )
         .length;
   }
 
@@ -237,10 +241,11 @@ class BundleUnitOfWork {
     for (final change in _changes.values) {
       if (change.operation == BundleChangeOperation.insert) continue;
       final matchedBefore =
-          change.before != null && bundleMatchesQueryWhere(change.before!, where);
+          change.before != null &&
+          bundleMatchesQueryWhere(change.before!, where);
       final matchesAfter =
           change.operation == BundleChangeOperation.update &&
-              bundleMatchesQueryWhere(change.data, where);
+          bundleMatchesQueryWhere(change.data, where);
       if (matchedBefore && !matchesAfter) {
         total -= 1;
       } else if (!matchedBefore && matchesAfter) {