Merge pull request #68 from IO-Design-Team/feature/type-id-extension

Type ID extension
IO-Design-Team · Feb 4, 2025 · 6e8f715 · 6e8f715
2 parents b5b8346 + dd30829
commit 6e8f715
Show file tree

Hide file tree

Showing 11 changed files with 271 additions and 165 deletions.
diff --git a/hive/CHANGELOG.md b/hive/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.10.0
+
+- Raises the maximum type ID from 223 to 65439
+
 ## 2.9.0
 
 - Prints a warning when writing `int` or `List<int>` types in a WASM environment

diff --git a/hive/README.md b/hive/README.md
@@ -36,6 +36,7 @@ Hive CE is a spiritual continuation of Hive v2 with the following new features:
 - Automatic type adapter generation using the `GenerateAdapters` annotation
   - No more manually adding annotations to every type and field
   - Generate adapters for classes outside the current package
+- Extends the maximum type ID from `223` to `65439`
 
 ## Hive CE (v2) vs Hive v4 (Isar)
 

diff --git a/hive/lib/src/binary/binary_reader_impl.dart b/hive/lib/src/binary/binary_reader_impl.dart
@@ -7,6 +7,7 @@ import 'package:hive_ce/src/crypto/crc32.dart';
 import 'package:hive_ce/src/object/hive_list_impl.dart';
 import 'package:hive_ce/src/registry/type_registry_impl.dart';
 import 'package:hive_ce/src/util/extensions.dart';
+import 'package:meta/meta.dart';
 
 /// Not part of public API
 class BinaryReaderImpl extends BinaryReader {
@@ -242,6 +243,19 @@ class BinaryReaderImpl extends BinaryReader {
     return HiveListImpl.lazy(boxName, keys);
   }
 
+  /// Read a type ID and handle extension
+  @pragma('vm:prefer-inline')
+  @pragma('dart2js:tryInline')
+  @visibleForTesting
+  int readTypeId() {
+    final typeId = readByte();
+    if (typeId == FrameValueType.typeIdExtension) {
+      return readWord();
+    } else {
+      return typeId;
+    }
+  }
+
   /// Not part of public API
   Frame? readFrame({
     HiveCipher? cipher,
@@ -296,7 +310,7 @@ class BinaryReaderImpl extends BinaryReader {
 
   @override
   dynamic read([int? typeId]) {
-    typeId ??= readByte();
+    typeId ??= readTypeId();
     switch (typeId) {
       case FrameValueType.nullT:
         return null;

diff --git a/hive/lib/src/binary/binary_writer.dart b/hive/lib/src/binary/binary_writer.dart
@@ -64,5 +64,5 @@ abstract class BinaryWriter {
   void writeHiveList(HiveList list, {bool writeLength = true});
 
   /// Write any [value].
-  void write<T>(T value, {bool writeTypeId = true});
+  void write<T>(T value, {bool withTypeId = true});
 }