Skip to content

Fix: Add Type parameter to resolve bug with generic types in mixin usage #1310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahmtydn wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix: Add Type parameter to resolve bug with generic types in mixin usage #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79b1488
Fix: Add Type parameter to resolve bug with generic types in mixin usage
ahmtydn Sep 15, 2024
5eb6fe5
set as optional parameter
ahmtydn Sep 15, 2024
fdcf919
Update isar dependency to use git reference for development
ahmtydn Sep 16, 2025
20a9efd
Revert "Update isar dependency to use git reference for development"
ahmtydn Sep 16, 2025
b3b0ec3
Replace isar dependency with isar_plus in multiple files
ahmtydn Sep 17, 2025
aa61dcb
Update isar_plus dependency to version 1.0.3
ahmtydn Sep 17, 2025
52384de
Bump isar_plus dependency to version 1.0.4
ahmtydn Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/hive.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import 'dart:isolate'
if (dart.library.html) 'package:hive/src/impl/isolate_stub.dart';

import 'package:hive/src/impl/frame.dart';
import 'package:isar/isar.dart';
import 'package:isar_plus/isar_plus.dart';

part 'src/impl/box_impl.dart';
part 'src/impl/type_registry.dart';
part 'src/box.dart';
part 'src/hive.dart';
part 'src/impl/box_impl.dart';
part 'src/impl/type_registry.dart';
7 changes: 4 additions & 3 deletions lib/src/hive.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ class Hive {
/// ```
static void registerAdapter<T>(
String typeName,
T? Function(dynamic json) fromJson,
) {
_typeRegistry.register<T>(Isar.fastHash(typeName), fromJson);
T? Function(dynamic json) fromJson, [
Type? type,
]) {
_typeRegistry.register<T>(Isar.fastHash(typeName), fromJson, type);
}

/// Get or open the box with [name] in the given [directory]. If no directory
Expand Down
2 changes: 1 addition & 1 deletion lib/src/impl/frame.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:isar/isar.dart';
import 'package:isar_plus/isar_plus.dart';

part 'frame.g.dart';

Expand Down
8 changes: 6 additions & 2 deletions lib/src/impl/type_registry.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,18 @@ class _TypeRegistry {
final Map<int, _TypeHandler<dynamic>> _registry = {};
final Map<Type, _TypeHandler<dynamic>> _reverseRegistry = {..._builtinTypes};

void register<T>(int typeId, T? Function(dynamic json) fromJson) {
void register<T>(
int typeId,
T? Function(dynamic json) fromJson,
Type? type,
) {
if (T == dynamic) {
throw ArgumentError('Cannot register dynamic type.');
}

final handler = _TypeHandler<T>(typeId, fromJson);
_registry[typeId] = handler;
_reverseRegistry[T] = handler;
_reverseRegistry[type ?? T] = handler;
}

T fromJson<T>(int? typeId, dynamic json) {
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ environment:
sdk: ">=3.1.0 <4.0.0"

dependencies:
isar: ^4.0.0-dev.13
isar_plus: ^1.0.4
meta: ^1.9.0

dev_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion test/common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'dart:math';

import 'package:hive/hive.dart';
import 'package:hive/src/impl/frame.dart';
import 'package:isar/isar.dart';
import 'package:isar_plus/isar_plus.dart';
import 'package:test/test.dart';

const _releases = 'https://github.com/isar/isar/releases/download/';
Expand Down