Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions packages/freezed/lib/builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,26 @@ import 'src/freezed_generator.dart';

/// Builds generators for `build_runner` to run
Builder freezed(BuilderOptions options) {
return PartBuilder(
[FreezedGenerator(Freezed.fromJson(options.config))],
formatOutput: options.config['format'] == false ? (str) => str : null,
'.freezed.dart',
header: '''
final generators = [FreezedGenerator(Freezed.fromJson(options.config))];
const generatedExtension = '.freezed.dart';
const header = '''
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
''',
options: options,
);
''';
if (options.config['format'] == false) {
return PartBuilder(
generators,
generatedExtension,
formatOutput:(code, languageVersion) => code,
header: header,
);
} else {
return PartBuilder(
generators,
generatedExtension,
header: header,
);
}
}
9 changes: 3 additions & 6 deletions packages/freezed/lib/src/ast.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,21 @@ extension ClassX on ClassDeclaration {

extension ConstructorX on ConstructorDeclaration {
String get fullName {
// ignore: deprecated_member_use, latest analyzer with enclosingElement3 not available in stable channel
final classElement = declaredElement!.enclosingElement;
final classElement = declaredElement!.enclosingElement3;

var generics =
classElement.typeParameters.map((e) => '\$${e.name}').join(', ');
if (generics.isNotEmpty) {
generics = '<$generics>';
}

// ignore: deprecated_member_use, latest analyzer with enclosingElement3 not available in stable channel
final className = classElement.enclosingElement.name;
final className = classElement.enclosingElement3.name;

return name == null ? '$className$generics' : '$className$generics.$name';
}

String get escapedName {
// ignore: deprecated_member_use, latest analyzer with enclosingElement3 not available in stable channel
final classElement = declaredElement!.enclosingElement;
final classElement = declaredElement!.enclosingElement3;

var generics =
classElement.typeParameters.map((e) => '\$${e.name}').join(', ');
Expand Down
10 changes: 8 additions & 2 deletions packages/freezed/lib/src/tools/recursive_import_locator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,14 @@ extension FindAllAvailableTopLevelElements on LibraryElement {
yield* topLevelElements;

final librariesToCheck = checkExports
? libraryExports.map(_LibraryDirectives.fromExport).nonNulls
: libraryImports.map(_LibraryDirectives.fromImport).nonNulls;
? units
.expand((e) => e.libraryExports)
.map(_LibraryDirectives.fromExport)
.nonNulls
: units
.expand((e) => e.libraryImports)
.map(_LibraryDirectives.fromImport)
.nonNulls;

for (final directive in librariesToCheck) {
if (!visitedLibraryPaths.add(directive.key)) {
Expand Down
4 changes: 3 additions & 1 deletion packages/freezed/lib/src/tools/type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ String resolveFullTypeStringFrom(
LibraryElement originLibrary,
DartType type,
) {
final owner = originLibrary.prefixes.firstWhereOrNull(
final owner = originLibrary.units
.expand((e) => e.libraryImportPrefixes)
.firstWhereOrNull(
(e) {
return e.imports.any((l) {
return l.importedLibrary!.anyTransitiveExport((library) {
Expand Down
6 changes: 3 additions & 3 deletions packages/freezed/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ environment:
sdk: ">=3.0.0 <4.0.0"

dependencies:
analyzer: ">=6.5.0 <7.0.0"
analyzer: ">=6.5.0 <8.0.0"
build: ^2.3.1
build_config: ^1.1.0
collection: ^1.15.0
meta: ^1.9.1
source_gen: ^1.4.0
source_gen: ^2.0.0
freezed_annotation: ^2.4.4
json_annotation: ^4.8.0
# Indirect dependency, but fixes a compiler error when using `pub downgrade`
dart_style: ^2.3.6
dart_style: ^3.0.0

dev_dependencies:
json_serializable: ^6.3.2
Expand Down