refactor: merge cbl_ffi into cbl (#554)

.github/dependabot.yml

@@ -37,10 +37,6 @@ updates:
     directory: /packages/cbl_e2e_tests_standalone_dart
     schedule:
       interval: weekly
-  - package-ecosystem: pub
-    directory: /packages/cbl_ffi
-    schedule:
-      interval: weekly
     versioning-strategy: increase-if-necessary
   - package-ecosystem: pub
     directory: /packages/cbl_flutter

CONTRIBUTING.md

@@ -18,7 +18,6 @@ All Dart code is organized into several [packages].
 | [cbl_e2e_tests]                  | E2E tests                                                                                                                                   |                                                                                                       |              |
 | [cbl_e2e_tests_flutter]          | E2E tests runner for Flutter                                                                                                                |                                                                                                       |              |
 | [cbl_e2e_tests_standalone_dart]  | E2E tests runner for standalone Dart                                                                                                        |                                                                                                       |              |
-| [cbl_ffi]                        | FFI bindings for `libcblite` and `libcblitedart`                                                                                            | [![](https://badgen.net/pub/v/cbl_ffi)](https://pub.dev/packages/cbl_ffi)                             | :red_circle: |
 | [cbl_libcblite_api]              | Marker package for API versions of `libcblite`                                                                                              | [![](https://badgen.net/pub/v/cbl_libcblite_api)](https://pub.dev/packages/cbl_libcblite_api)         | :red_circle: |
 | [cbl_libcblitedart_api]          | Marker package for API versions of `libcblitedart`                                                                                          | [![](https://badgen.net/pub/v/cbl_libcblitedart_api)](https://pub.dev/packages/cbl_libcblitedart_api) | :red_circle: |
 | [cbl_flutter]                    | Flutter plugin for Couchbase Lite (frontend)                                                                                                | [![](https://badgen.net/pub/v/cbl_flutter)](https://pub.dev/packages/cbl_flutter)                     |              |
@@ -128,7 +127,6 @@ through `flutter test` with a specific test file in `integration_test`. By using
   https://github.com/cbl-dart/cbl-dart/tree/main/packages/cbl_e2e_tests_standalone_dart
 [cbl_e2e_tests_flutter]:
   https://github.com/cbl-dart/cbl-dart/tree/main/packages/cbl_e2e_tests_flutter
-[cbl_ffi]: https://github.com/cbl-dart/cbl-dart/tree/main/packages/cbl_ffi
 [cbl_libcblite_api]:
   https://github.com/cbl-dart/cbl-dart/tree/main/packages/cbl_libcblite_api
 [cbl_libcblitedart_api]:

packages/cbl_ffi/lib/cbl_ffi.dart → packages/cbl/lib/src/bindings.dart

@@ -1,5 +1,5 @@
-export 'src/async_callback.dart';
-export 'src/base.dart'
+export 'bindings/async_callback.dart';
+export 'bindings/base.dart'
     hide
         OptionIterable,
         CBLErrorExt,
@@ -11,33 +11,33 @@ export 'src/base.dart'
         IntCBLErrorDomainExt,
         IntErrorCodeExt,
         CBLError;
-export 'src/bindings.dart';
-export 'src/blob.dart';
-export 'src/collection.dart';
-export 'src/data.dart';
-export 'src/database.dart' hide CBLConcurrencyControlExt;
-export 'src/document.dart';
-export 'src/fleece.dart'
+export 'bindings/bindings.dart';
+export 'bindings/blob.dart';
+export 'bindings/collection.dart';
+export 'bindings/data.dart';
+export 'bindings/database.dart' hide CBLConcurrencyControlExt;
+export 'bindings/document.dart';
+export 'bindings/fleece.dart'
     hide FLErrorCodeIntExt, FLResultSliceExt, FLStringResultExt;
-export 'src/global.dart'
+export 'bindings/global.dart'
     show
         globalLoadedDictKey,
         globalLoadedFLValue,
         globalFLSlice,
         globalFLString,
         globalFLSliceResult;
-export 'src/libraries.dart';
-export 'src/logging.dart';
-export 'src/native_utf8_string.dart'
+export 'bindings/libraries.dart';
+export 'bindings/logging.dart';
+export 'bindings/native_utf8_string.dart'
     show NativeUtf8String, NativeUtf8StringEncoder, nativeUtf8StringEncoder;
-export 'src/query.dart' hide CBLQueryLanguageExt;
-export 'src/replicator.dart';
-export 'src/slice.dart'
+export 'bindings/query.dart' hide CBLQueryLanguageExt;
+export 'bindings/replicator.dart';
+export 'bindings/slice.dart'
     hide
         cachedSliceResultAllocator,
         sliceResultAllocator,
         SingleSliceResultAllocator,
         SliceResultAllocator;
-export 'src/tracing.dart'
+export 'bindings/tracing.dart'
     show cblIncludeTracePoints, TracedNativeCall, TracedCallHandler;
-export 'src/utils.dart' show cblReachabilityFence;
+export 'bindings/utils.dart' show cblReachabilityFence;

packages/cbl_ffi/lib/src/async_callback.dart → packages/cbl/lib/src/bindings/async_callback.dart

@@ -1,5 +1,5 @@
 // ignore: lines_longer_than_80_chars
-// ignore_for_file: avoid_redundant_argument_values, avoid_positional_boolean_parameters
+// ignore_for_file: avoid_redundant_argument_values, avoid_positional_boolean_parameters, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:ffi';
 import 'dart:isolate';

packages/cbl_ffi/lib/src/base.dart → packages/cbl/lib/src/bindings/base.dart

@@ -1,4 +1,5 @@
-// ignore_for_file: avoid_redundant_argument_values
+// ignore: lines_longer_than_80_chars
+// ignore_for_file: avoid_redundant_argument_values, camel_case_types, avoid_private_typedef_functions
 
 import 'dart:ffi';
 import 'dart:io' as io;

packages/cbl_ffi/lib/src/blob.dart → packages/cbl/lib/src/bindings/blob.dart

@@ -1,4 +1,5 @@
-// ignore_for_file: avoid_redundant_argument_values
+// ignore: lines_longer_than_80_chars
+// ignore_for_file: avoid_redundant_argument_values, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:ffi';
 

packages/cbl_ffi/lib/src/collection.dart → packages/cbl/lib/src/bindings/collection.dart

@@ -1,5 +1,5 @@
 // ignore: lines_longer_than_80_chars
-// ignore_for_file: non_constant_identifier_names, avoid_redundant_argument_values
+// ignore_for_file: non_constant_identifier_names, avoid_redundant_argument_values, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:convert';
 import 'dart:ffi';

packages/cbl_ffi/lib/src/database.dart → packages/cbl/lib/src/bindings/database.dart

@@ -1,5 +1,5 @@
 // ignore: lines_longer_than_80_chars
-// ignore_for_file: avoid_redundant_argument_values, avoid_positional_boolean_parameters
+// ignore_for_file: avoid_redundant_argument_values, avoid_positional_boolean_parameters, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:ffi';
 import 'dart:typed_data';

packages/cbl_ffi/lib/src/document.dart → packages/cbl/lib/src/bindings/document.dart

@@ -1,4 +1,5 @@
-// ignore_for_file: avoid_redundant_argument_values
+// ignore: lines_longer_than_80_chars
+// ignore_for_file: avoid_redundant_argument_values, camel_case_types, avoid_private_typedef_functions
 
 import 'dart:ffi';
 

packages/cbl_ffi/lib/src/fleece.dart → packages/cbl/lib/src/bindings/fleece.dart

@@ -1,5 +1,5 @@
 // ignore: lines_longer_than_80_chars
-// ignore_for_file: avoid_redundant_argument_values, avoid_positional_boolean_parameters
+// ignore_for_file: avoid_redundant_argument_values, avoid_positional_boolean_parameters, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:convert';
 import 'dart:ffi';

packages/cbl_ffi/lib/src/logging.dart → packages/cbl/lib/src/bindings/logging.dart

@@ -1,5 +1,5 @@
 // ignore: lines_longer_than_80_chars
-// ignore_for_file: cast_nullable_to_non_nullable,avoid_redundant_argument_values, avoid_positional_boolean_parameters
+// ignore_for_file: cast_nullable_to_non_nullable,avoid_redundant_argument_values, avoid_positional_boolean_parameters, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:convert';
 import 'dart:ffi';

packages/cbl_ffi/lib/src/query.dart → packages/cbl/lib/src/bindings/query.dart

@@ -1,4 +1,5 @@
-// ignore_for_file: avoid_redundant_argument_values
+// ignore: lines_longer_than_80_chars
+// ignore_for_file: avoid_redundant_argument_values, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:ffi';
 

packages/cbl_ffi/lib/src/replicator.dart → packages/cbl/lib/src/bindings/replicator.dart

@@ -1,11 +1,11 @@
 // ignore: lines_longer_than_80_chars
-// ignore_for_file: cast_nullable_to_non_nullable,avoid_redundant_argument_values, avoid_positional_boolean_parameters
+// ignore_for_file: cast_nullable_to_non_nullable,avoid_redundant_argument_values, avoid_positional_boolean_parameters, avoid_private_typedef_functions, camel_case_types
 
 import 'dart:convert';
 import 'dart:ffi';
 import 'dart:typed_data';
 
-import '../cbl_ffi.dart';
+import '../bindings.dart';
 import 'base.dart';
 import 'global.dart';
 import 'utils.dart';

packages/cbl/lib/src/database/blob_store.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
+import '../bindings.dart';
 
 abstract class BlobStore {
   Future<Map<String, Object?>> saveBlobFromData(String contentType, Data data);

packages/cbl/lib/src/database/database_configuration.dart

@@ -4,9 +4,9 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
 import 'package:collection/collection.dart';
 
+import '../bindings.dart';
 import '../service/cbl_service_api.dart';
 import '../service/cbl_worker.dart';
 import '../support/edition.dart';

packages/cbl/lib/src/database/ffi_blob_store.dart

@@ -1,8 +1,7 @@
 import 'dart:async';
 import 'dart:ffi';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../document/blob.dart';
 import '../fleece/containers.dart';
 import '../support/errors.dart';

packages/cbl/lib/src/database/ffi_database.dart

@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:ffi';
 import 'dart:io';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
 import 'package:collection/collection.dart';
 import 'package:path/path.dart' as path_lib;
 
+import '../bindings.dart';
 import '../document/blob.dart';
 import '../document/document.dart';
 import '../document/ffi_document.dart';

packages/cbl/lib/src/database/proxy_blob_store.dart

@@ -1,5 +1,4 @@
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../service/cbl_service_api.dart';
 import 'blob_store.dart';
 import 'proxy_database.dart';

packages/cbl/lib/src/document/array.dart

@@ -3,9 +3,9 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
 import 'package:collection/collection.dart';
 
+import '../bindings.dart';
 import '../fleece/encoder.dart';
 import '../fleece/integration/integration.dart';
 import 'blob.dart';

packages/cbl/lib/src/document/blob.dart

@@ -3,8 +3,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../database/blob_store.dart';
 import '../database/database.dart';
 import '../errors.dart';

packages/cbl/lib/src/document/common.dart

@@ -2,8 +2,7 @@ import 'dart:async';
 import 'dart:ffi';
 import 'dart:typed_data';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../database.dart';
 import '../database/database_base.dart';
 import '../fleece/containers.dart' as fl;

packages/cbl/lib/src/document/dictionary.dart

@@ -3,9 +3,9 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
 import 'package:collection/collection.dart';
 
+import '../bindings.dart';
 import '../fleece/encoder.dart';
 import '../fleece/integration/integration.dart';
 import 'array.dart';

packages/cbl/lib/src/document/document.dart

@@ -3,8 +3,7 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../database/collection.dart';
 import '../database/database_base.dart';
 import '../fleece/containers.dart' show Doc;

packages/cbl/lib/src/document/ffi_document.dart

@@ -1,7 +1,6 @@
 import 'dart:ffi';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../fleece/containers.dart' as fl;
 import '../fleece/containers.dart';
 import '../fleece/encoder.dart';

packages/cbl/lib/src/document/proxy_document.dart

@@ -1,5 +1,4 @@
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../database/proxy_database.dart';
 import '../fleece/containers.dart';
 import '../fleece/integration/root.dart';

packages/cbl/lib/src/fleece/containers.dart

@@ -4,9 +4,9 @@ import 'dart:collection';
 import 'dart:ffi';
 import 'dart:typed_data';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
 import 'package:collection/collection.dart';
 
+import '../bindings.dart';
 import '../support/errors.dart';
 import '../support/ffi.dart';
 import '../support/utils.dart';

packages/cbl/lib/src/fleece/decoder.dart

@@ -3,8 +3,7 @@ import 'dart:convert';
 import 'dart:ffi';
 import 'dart:typed_data';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../support/ffi.dart';
 import 'containers.dart';
 

packages/cbl/lib/src/fleece/dict_key.dart

@@ -2,8 +2,7 @@ import 'dart:collection';
 import 'dart:ffi';
 import 'dart:math';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../support/ffi.dart';
 import 'encoder.dart';
 

packages/cbl/lib/src/fleece/encoder.dart

@@ -2,8 +2,7 @@ import 'dart:convert';
 import 'dart:ffi';
 import 'dart:typed_data';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../support/errors.dart';
 import '../support/ffi.dart';
 import 'containers.dart';

packages/cbl/lib/src/fleece/integration/array.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:ffi';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
 import 'package:collection/collection.dart';
 
+import '../../bindings.dart';
 import '../../support/ffi.dart';
 import '../../support/utils.dart';
 import '../encoder.dart';

packages/cbl/lib/src/fleece/integration/collection.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
 import 'package:meta/meta.dart';
 
+import '../../bindings.dart';
 import '../../support/utils.dart';
 import '../encoder.dart';
 import 'context.dart';

packages/cbl/lib/src/fleece/integration/delegate.dart

@@ -2,8 +2,7 @@ import 'dart:async';
 import 'dart:ffi';
 import 'dart:typed_data';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../../bindings.dart';
 import '../../support/ffi.dart';
 import '../decoder.dart';
 import '../encoder.dart';

packages/cbl/lib/src/fleece/integration/dict.dart

@@ -1,8 +1,7 @@
 import 'dart:async';
 import 'dart:ffi';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../../bindings.dart';
 import '../../support/utils.dart';
 import '../decoder.dart';
 import '../dict_key.dart';

packages/cbl/lib/src/fleece/integration/root.dart

@@ -1,8 +1,7 @@
 import 'dart:async';
 import 'dart:ffi';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../../bindings.dart';
 import '../containers.dart';
 import '../encoder.dart';
 import 'collection.dart';

packages/cbl/lib/src/fleece/integration/value.dart

@@ -3,8 +3,7 @@
 import 'dart:async';
 import 'dart:ffi';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../../bindings.dart';
 import '../encoder.dart';
 import 'collection.dart';
 import 'delegate.dart';

packages/cbl/lib/src/log/file_logger.dart

@@ -2,8 +2,7 @@
 
 import 'dart:io';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../support/ffi.dart';
 import 'logger.dart';
 

packages/cbl/lib/src/log/logger.dart

@@ -1,8 +1,7 @@
 import 'dart:async';
 import 'dart:ffi';
 
-import 'package:cbl_ffi/cbl_ffi.dart';
-
+import '../bindings.dart';
 import '../support/async_callback.dart';
 import '../support/ffi.dart';