Skip to content

Commit 025bb14

Browse files
committed
Use TypeChecker.fromUrl for all checkers
Eliminates usage of dart:mirrors
1 parent 526e840 commit 025bb14

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

json_serializable/lib/src/shared_checkers.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:source_gen/source_gen.dart' show TypeChecker;
88
/// A [TypeChecker] for [Iterable].
99
const coreIterableTypeChecker = TypeChecker.fromUrl('dart:core#Iterable');
1010

11-
const coreStringTypeChecker = TypeChecker.fromRuntime(String);
11+
const coreStringTypeChecker = TypeChecker.fromUrl('dart:core#String');
1212

1313
const coreMapTypeChecker = TypeChecker.fromUrl('dart:core#Map');
1414

@@ -31,8 +31,8 @@ List<DartType> typeArgumentsOf(DartType type, TypeChecker checker) {
3131
/// A [TypeChecker] for [String], [bool] and [num].
3232
const simpleJsonTypeChecker = TypeChecker.any([
3333
coreStringTypeChecker,
34-
TypeChecker.fromRuntime(bool),
35-
TypeChecker.fromRuntime(num)
34+
TypeChecker.fromUrl('dart:core#bool'),
35+
TypeChecker.fromUrl('dart:core#num')
3636
]);
3737

3838
String asStatement(DartType type) {

json_serializable/lib/src/type_helpers/value_helper.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ValueHelper extends TypeHelper {
2929
if (targetType.isDynamic || targetType.isObject) {
3030
// just return it as-is. We'll hope it's safe.
3131
return expression;
32-
} else if (const TypeChecker.fromRuntime(double)
32+
} else if (const TypeChecker.fromUrl('dart:core#double')
3333
.isExactlyType(targetType)) {
3434
return '($expression as num)${context.nullable ? '?' : ''}.toDouble()';
3535
} else if (simpleJsonTypeChecker.isAssignableFromType(targetType)) {

0 commit comments

Comments
 (0)