From db9a94eafec02b0f6febf6c5139a0e8fe5766e23 Mon Sep 17 00:00:00 2001 From: Jonas Greifenhain Date: Wed, 18 Nov 2026 17:25:22 +0100 Subject: [PATCH 1/4] fix(native-dart): format generated clients The generator returned raw StringBuffer output from every sink, so generated clients failed `dart format`. generate() now formats the complete unit with dart_style using the target package language version from package_config for build_runner and CLI, with Dart 3.11 fallback. It prepends `// dart format width=80` so output is stable regardless of consumer page_width. Dart goldens were regenerated. --- .../01-primitives/dart/client.dart | 31 +- .../02-objects-and-refs/dart/client.dart | 36 +- .../03-nullable/dart/client.dart | 17 +- .../04-arrays/dart/client.dart | 25 +- .../05-enums/dart/client.dart | 36 +- .../06-format-types/dart/client.dart | 14 +- .../07-maps-and-records/dart/client.dart | 41 +- .../08-discriminated-union/dart/client.dart | 90 +- .../09-anyof-union/dart/client.dart | 27 +- .../10-const-literal/dart/client.dart | 27 +- .../11-tuples/dart/client.dart | 82 +- .../12-defaults/dart/client.dart | 16 +- .../13-constraints-string/dart/client.dart | 56 +- .../14-constraints-numeric/dart/client.dart | 40 +- .../15-constraints-array/dart/client.dart | 45 +- .../16-ref-in-union-arm/dart/client.dart | 41 +- .../17-transferables/dart/client.dart | 31 +- .../18-hybrid-arm/dart/client.dart | 549 +++++----- .../19-optional-collections/dart/client.dart | 72 +- .../20-multiple-namespaces/dart/client.dart | 100 +- .../21-deeply-nested-objects/dart/client.dart | 219 ++-- .../22-reserved-keywords/dart/client.dart | 73 +- .../23-cognito-nested-unions/dart/client.dart | 972 ++++++++++++------ .../dart/client.dart | 121 +-- .../dart/client.dart | 175 ++-- .../26-unknown-transferable/dart/client.dart | 40 +- .../dart/client.dart | 119 ++- .../28-escaping/dart/client.dart | 96 +- .../29-unknown-values/dart/client.dart | 49 +- .../dart/client.dart | 218 ++-- .../dart/client.dart | 268 +++-- .../32-name-collisions/dart/client.dart | 409 +++----- .../dart/client.dart | 299 +++--- .../34-reserved-member-names/dart/client.dart | 51 +- .../36-union-value-arms/dart/client.dart | 51 +- .../37-oidc-provider-enum/dart/client.dart | 52 +- .../dart/client.dart | 179 +--- .../dart/client.dart | 78 +- .../40-empty-object-schemas/dart/client.dart | 26 +- .../41-void-methods/dart/client.dart | 11 +- .../dart/client.dart | 98 +- .../43-non-identifier-names/dart/client.dart | 119 +-- .../dart/packages/blocks_codegen/CHANGELOG.md | 3 + native/dart/packages/blocks_codegen/README.md | 6 + .../blocks_codegen/bin/blocks_codegen.dart | 52 +- .../packages/blocks_codegen/lib/builder.dart | 18 +- .../blocks_codegen/lib/src/generator.dart | 29 +- .../lib/src/language_version.dart | 22 + .../dart/packages/blocks_codegen/pubspec.yaml | 9 +- .../blocks_codegen/test/cli_test.dart | 222 +++- .../blocks_codegen/test/collision_test.dart | 4 +- .../test/dart_source_matchers.dart | 307 ++++++ .../test/dart_source_matchers_test.dart | 36 + .../blocks_codegen/test/formatting_test.dart | 37 + .../test/generated_code_compiles_test.dart | 12 + .../blocks_codegen/test/generator_test.dart | 14 +- .../blocks_codegen/test/golden_file_test.dart | 7 + .../test/language_version_test.dart | 46 + .../test/local_name_collision_test.dart | 22 +- .../test/model_equality_test.dart | 4 +- .../test/native_bindings_test.dart | 35 +- .../test/nested_container_test.dart | 10 +- .../test/oidc_provider_enum_test.dart | 4 +- .../blocks_codegen/test/open_record_test.dart | 6 +- .../test/positional_params_test.dart | 4 +- .../test/reserved_name_test.dart | 34 +- .../test/schema_alias_ref_test.dart | 6 +- .../test/schema_rename_ref_test.dart | 13 +- .../test/spec_string_identifier_test.dart | 19 +- 69 files changed, 3379 insertions(+), 2701 deletions(-) create mode 100644 native/dart/packages/blocks_codegen/lib/src/language_version.dart create mode 100644 native/dart/packages/blocks_codegen/test/dart_source_matchers.dart create mode 100644 native/dart/packages/blocks_codegen/test/dart_source_matchers_test.dart create mode 100644 native/dart/packages/blocks_codegen/test/formatting_test.dart create mode 100644 native/dart/packages/blocks_codegen/test/language_version_test.dart diff --git a/native/codegen-fixtures/01-primitives/dart/client.dart b/native/codegen-fixtures/01-primitives/dart/client.dart index 0c9f25ab4a..3c434d950b 100644 --- a/native/codegen-fixtures/01-primitives/dart/client.dart +++ b/native/codegen-fixtures/01-primitives/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -34,12 +36,7 @@ class EchoResult { } Map toJson() { - return { - 'text': text, - 'count': count, - 'score': score, - 'enabled': enabled, - }; + return {'text': text, 'count': count, 'score': score, 'enabled': enabled}; } @override @@ -55,27 +52,26 @@ class EchoResult { int get hashCode => Object.hash(text, count, score, enabled); @override - String toString() => 'EchoResult(text: $text, count: $count, score: $score, enabled: $enabled)'; + String toString() => + 'EchoResult(text: $text, count: $count, score: $score, enabled: $enabled)'; } - class Api { final BlocksClient _client; Api(this._client); - Future echo({required String text, required int count, required num score, required bool enabled}) async { - final params = [ - text, - count, - score, - enabled, - ]; + Future echo({ + required String text, + required int count, + required num score, + required bool enabled, + }) async { + final params = [text, count, score, enabled]; final result = await _client.call('api.echo', params); return EchoResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -86,4 +82,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/02-objects-and-refs/dart/client.dart b/native/codegen-fixtures/02-objects-and-refs/dart/client.dart index 9c6c11119d..820735ee44 100644 --- a/native/codegen-fixtures/02-objects-and-refs/dart/client.dart +++ b/native/codegen-fixtures/02-objects-and-refs/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -34,12 +36,7 @@ class Todo { } Map toJson() { - return { - 'id': id, - 'title': title, - 'done': done, - 'priority': priority, - }; + return {'id': id, 'title': title, 'done': done, 'priority': priority}; } @override @@ -55,18 +52,15 @@ class Todo { int get hashCode => Object.hash(id, title, done, priority); @override - String toString() => 'Todo(id: $id, title: $title, done: $done, priority: $priority)'; + String toString() => + 'Todo(id: $id, title: $title, done: $done, priority: $priority)'; } - class ApiCreateTodoInput { final String title; final int priority; - const ApiCreateTodoInput({ - required this.title, - required this.priority, - }); + const ApiCreateTodoInput({required this.title, required this.priority}); factory ApiCreateTodoInput.fromJson(Map json) { return ApiCreateTodoInput( @@ -76,10 +70,7 @@ class ApiCreateTodoInput { } Map toJson() { - return { - 'title': title, - 'priority': priority, - }; + return {'title': title, 'priority': priority}; } @override @@ -96,29 +87,23 @@ class ApiCreateTodoInput { String toString() => 'ApiCreateTodoInput(title: $title, priority: $priority)'; } - class Api { final BlocksClient _client; Api(this._client); Future getTodo({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.getTodo', params); return Todo.fromJson(result as Map); } Future createTodo({required ApiCreateTodoInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('api.createTodo', params); return Todo.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -129,4 +114,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/03-nullable/dart/client.dart b/native/codegen-fixtures/03-nullable/dart/client.dart index a08a3a5a9c..f51c2d6b51 100644 --- a/native/codegen-fixtures/03-nullable/dart/client.dart +++ b/native/codegen-fixtures/03-nullable/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -16,11 +18,7 @@ class GetProfileResult { final String? bio; final int? age; - const GetProfileResult({ - required this.name, - this.bio, - this.age, - }); + const GetProfileResult({required this.name, this.bio, this.age}); factory GetProfileResult.fromJson(Map json) { return GetProfileResult( @@ -53,21 +51,17 @@ class GetProfileResult { String toString() => 'GetProfileResult(name: $name, bio: $bio, age: $age)'; } - class Api { final BlocksClient _client; Api(this._client); Future getProfile({required String userId}) async { - final params = [ - userId, - ]; + final params = [userId]; final result = await _client.call('api.getProfile', params); return GetProfileResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -78,4 +72,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/04-arrays/dart/client.dart b/native/codegen-fixtures/04-arrays/dart/client.dart index 020f7ed9f0..8b2da71869 100644 --- a/native/codegen-fixtures/04-arrays/dart/client.dart +++ b/native/codegen-fixtures/04-arrays/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -15,10 +17,7 @@ class ListItemsResult { final String id; final String name; - const ListItemsResult({ - required this.id, - required this.name, - }); + const ListItemsResult({required this.id, required this.name}); factory ListItemsResult.fromJson(Map json) { return ListItemsResult( @@ -28,18 +27,13 @@ class ListItemsResult { } Map toJson() { - return { - 'id': id, - 'name': name, - }; + return {'id': id, 'name': name}; } @override bool operator ==(Object other) => identical(this, other) || - other is ListItemsResult && - id == other.id && - name == other.name; + other is ListItemsResult && id == other.id && name == other.name; @override int get hashCode => Object.hash(id, name); @@ -48,7 +42,6 @@ class ListItemsResult { String toString() => 'ListItemsResult(id: $id, name: $name)'; } - class Api { final BlocksClient _client; Api(this._client); @@ -60,11 +53,12 @@ class Api { Future> listItems() async { final result = await _client.call('api.listItems', const []); - return (result as List).map((e) => ListItemsResult.fromJson(e as Map)).toList(); + return (result as List) + .map((e) => ListItemsResult.fromJson(e as Map)) + .toList(); } } - // --- Blocks Client --- class Blocks { @@ -75,4 +69,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/05-enums/dart/client.dart b/native/codegen-fixtures/05-enums/dart/client.dart index 67f5be9799..5e25c0ab1a 100644 --- a/native/codegen-fixtures/05-enums/dart/client.dart +++ b/native/codegen-fixtures/05-enums/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,42 +6,36 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- enum SetStatusResultStatus { active, inactive, - pending -; + pending; String toJson() => name; static SetStatusResultStatus fromJson(String json) => values.byName(json); } - // --- API Namespaces --- enum ApiSetStatusStatus { active, inactive, - pending -; + pending; String toJson() => name; static ApiSetStatusStatus fromJson(String json) => values.byName(json); } - class SetStatusResult { final SetStatusResultStatus status; final String updatedAt; - const SetStatusResult({ - required this.status, - required this.updatedAt, - }); + const SetStatusResult({required this.status, required this.updatedAt}); factory SetStatusResult.fromJson(Map json) { return SetStatusResult( @@ -50,10 +45,7 @@ class SetStatusResult { } Map toJson() { - return { - 'status': status.toJson(), - 'updatedAt': updatedAt, - }; + return {'status': status.toJson(), 'updatedAt': updatedAt}; } @override @@ -67,24 +59,23 @@ class SetStatusResult { int get hashCode => Object.hash(status, updatedAt); @override - String toString() => 'SetStatusResult(status: $status, updatedAt: $updatedAt)'; + String toString() => + 'SetStatusResult(status: $status, updatedAt: $updatedAt)'; } - class Api { final BlocksClient _client; Api(this._client); - Future setStatus({required ApiSetStatusStatus status}) async { - final params = [ - status.toJson(), - ]; + Future setStatus({ + required ApiSetStatusStatus status, + }) async { + final params = [status.toJson()]; final result = await _client.call('api.setStatus', params); return SetStatusResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -95,4 +86,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/06-format-types/dart/client.dart b/native/codegen-fixtures/06-format-types/dart/client.dart index 204f6507dc..ad93580583 100644 --- a/native/codegen-fixtures/06-format-types/dart/client.dart +++ b/native/codegen-fixtures/06-format-types/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -65,24 +67,21 @@ class GetEventResult { int get hashCode => Object.hash(id, createdAt, date, time, url, email); @override - String toString() => 'GetEventResult(id: $id, createdAt: $createdAt, date: $date, time: $time, url: $url, email: $email)'; + String toString() => + 'GetEventResult(id: $id, createdAt: $createdAt, date: $date, time: $time, url: $url, email: $email)'; } - class Api { final BlocksClient _client; Api(this._client); Future getEvent({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.getEvent', params); return GetEventResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -93,4 +92,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/07-maps-and-records/dart/client.dart b/native/codegen-fixtures/07-maps-and-records/dart/client.dart index 0d48fab704..be0ab694a4 100644 --- a/native/codegen-fixtures/07-maps-and-records/dart/client.dart +++ b/native/codegen-fixtures/07-maps-and-records/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -28,7 +30,8 @@ class ApiSignUpInput { username: json['username'] as String, password: json['password'] as String, additionalProperties: Map.fromEntries( - json.entries.where((e) => !knownKeys.contains(e.key)) + json.entries + .where((e) => !knownKeys.contains(e.key)) .map((e) => MapEntry(e.key, e.value as String)), ), ); @@ -52,37 +55,30 @@ class ApiSignUpInput { blocksDeepEquals(additionalProperties, other.additionalProperties); @override - int get hashCode => Object.hash(username, password, blocksDeepHash(additionalProperties)); + int get hashCode => + Object.hash(username, password, blocksDeepHash(additionalProperties)); @override - String toString() => 'ApiSignUpInput(username: $username, password: $password, additionalProperties: $additionalProperties)'; + String toString() => + 'ApiSignUpInput(username: $username, password: $password, additionalProperties: $additionalProperties)'; } - class SignUpResult { final bool ok; - const SignUpResult({ - required this.ok, - }); + const SignUpResult({required this.ok}); factory SignUpResult.fromJson(Map json) { - return SignUpResult( - ok: json['ok'] as bool, - ); + return SignUpResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is SignUpResult && - ok == other.ok; + identical(this, other) || other is SignUpResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -91,26 +87,24 @@ class SignUpResult { String toString() => 'SignUpResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future> getScores() async { final result = await _client.call('api.getScores', const []); - return (result as Map).map((k, v) => MapEntry(k, v as num)); + return (result as Map).map( + (k, v) => MapEntry(k, v as num), + ); } Future signUp({required ApiSignUpInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('api.signUp', params); return SignUpResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -121,4 +115,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/08-discriminated-union/dart/client.dart b/native/codegen-fixtures/08-discriminated-union/dart/client.dart index 014c7b4fe6..8cf0640ff2 100644 --- a/native/codegen-fixtures/08-discriminated-union/dart/client.dart +++ b/native/codegen-fixtures/08-discriminated-union/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -16,10 +18,14 @@ sealed class ApiDoActionInput { Map toJson(); static ApiDoActionInput fromJson(Map json) { switch (json['action'] as String) { - case 'create': return CreateInput.fromJson(json); - case 'delete': return DeleteInput.fromJson(json); - case 'update': return UpdateInput.fromJson(json); - default: throw ArgumentError('Unknown action: ${json['action']}'); + case 'create': + return CreateInput.fromJson(json); + case 'delete': + return DeleteInput.fromJson(json); + case 'update': + return UpdateInput.fromJson(json); + default: + throw ArgumentError('Unknown action: ${json['action']}'); } } } @@ -27,29 +33,20 @@ sealed class ApiDoActionInput { class CreateInput extends ApiDoActionInput { final String title; - const CreateInput({ - required this.title, - }); + const CreateInput({required this.title}); factory CreateInput.fromJson(Map json) { - return CreateInput( - title: json['title'] as String, - ); + return CreateInput(title: json['title'] as String); } @override Map toJson() { - return { - 'action': 'create', - 'title': title, - }; + return {'action': 'create', 'title': title}; } @override bool operator ==(Object other) => - identical(this, other) || - other is CreateInput && - title == other.title; + identical(this, other) || other is CreateInput && title == other.title; @override int get hashCode => title.hashCode; @@ -61,29 +58,20 @@ class CreateInput extends ApiDoActionInput { class DeleteInput extends ApiDoActionInput { final String id; - const DeleteInput({ - required this.id, - }); + const DeleteInput({required this.id}); factory DeleteInput.fromJson(Map json) { - return DeleteInput( - id: json['id'] as String, - ); + return DeleteInput(id: json['id'] as String); } @override Map toJson() { - return { - 'action': 'delete', - 'id': id, - }; + return {'action': 'delete', 'id': id}; } @override bool operator ==(Object other) => - identical(this, other) || - other is DeleteInput && - id == other.id; + identical(this, other) || other is DeleteInput && id == other.id; @override int get hashCode => id.hashCode; @@ -96,10 +84,7 @@ class UpdateInput extends ApiDoActionInput { final String id; final String title; - const UpdateInput({ - required this.id, - required this.title, - }); + const UpdateInput({required this.id, required this.title}); factory UpdateInput.fromJson(Map json) { return UpdateInput( @@ -110,19 +95,13 @@ class UpdateInput extends ApiDoActionInput { @override Map toJson() { - return { - 'action': 'update', - 'id': id, - 'title': title, - }; + return {'action': 'update', 'id': id, 'title': title}; } @override bool operator ==(Object other) => identical(this, other) || - other is UpdateInput && - id == other.id && - title == other.title; + other is UpdateInput && id == other.id && title == other.title; @override int get hashCode => Object.hash(id, title); @@ -131,32 +110,22 @@ class UpdateInput extends ApiDoActionInput { String toString() => 'UpdateInput(id: $id, title: $title)'; } - - class DoActionResult { final bool ok; - const DoActionResult({ - required this.ok, - }); + const DoActionResult({required this.ok}); factory DoActionResult.fromJson(Map json) { - return DoActionResult( - ok: json['ok'] as bool, - ); + return DoActionResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is DoActionResult && - ok == other.ok; + identical(this, other) || other is DoActionResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -165,21 +134,17 @@ class DoActionResult { String toString() => 'DoActionResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future doAction({required ApiDoActionInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('api.doAction', params); return DoActionResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -190,4 +155,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/09-anyof-union/dart/client.dart b/native/codegen-fixtures/09-anyof-union/dart/client.dart index dfc49ef99b..377b6394f1 100644 --- a/native/codegen-fixtures/09-anyof-union/dart/client.dart +++ b/native/codegen-fixtures/09-anyof-union/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -14,27 +16,19 @@ export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpc class SearchResult { final int count; - const SearchResult({ - required this.count, - }); + const SearchResult({required this.count}); factory SearchResult.fromJson(Map json) { - return SearchResult( - count: (json['count'] as num).toInt(), - ); + return SearchResult(count: (json['count'] as num).toInt()); } Map toJson() { - return { - 'count': count, - }; + return {'count': count}; } @override bool operator ==(Object other) => - identical(this, other) || - other is SearchResult && - count == other.count; + identical(this, other) || other is SearchResult && count == other.count; @override int get hashCode => count.hashCode; @@ -43,15 +37,12 @@ class SearchResult { String toString() => 'SearchResult(count: $count)'; } - class Api { final BlocksClient _client; Api(this._client); Future search({required dynamic query}) async { - final params = [ - query, - ]; + final params = [query]; final result = await _client.call('api.search', params); return SearchResult.fromJson(result as Map); } @@ -62,7 +53,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -73,4 +63,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/10-const-literal/dart/client.dart b/native/codegen-fixtures/10-const-literal/dart/client.dart index 7cf649aaab..94b0d83227 100644 --- a/native/codegen-fixtures/10-const-literal/dart/client.dart +++ b/native/codegen-fixtures/10-const-literal/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -14,27 +16,19 @@ export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpc class DoActionResult { final bool ok; - const DoActionResult({ - required this.ok, - }); + const DoActionResult({required this.ok}); factory DoActionResult.fromJson(Map json) { - return DoActionResult( - ok: json['ok'] as bool, - ); + return DoActionResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is DoActionResult && - ok == other.ok; + identical(this, other) || other is DoActionResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -43,21 +37,17 @@ class DoActionResult { String toString() => 'DoActionResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future doAction({required dynamic input}) async { - final params = [ - input, - ]; + final params = [input]; final result = await _client.call('api.doAction', params); return DoActionResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -68,4 +58,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/11-tuples/dart/client.dart b/native/codegen-fixtures/11-tuples/dart/client.dart index a0e746464a..8dd8162014 100644 --- a/native/codegen-fixtures/11-tuples/dart/client.dart +++ b/native/codegen-fixtures/11-tuples/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,20 +6,22 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- class QueryRangeResultWhere { final (String, String) between; - const QueryRangeResultWhere({ - required this.between, - }); + const QueryRangeResultWhere({required this.between}); factory QueryRangeResultWhere.fromJson(Map json) { return QueryRangeResultWhere( - between: ((json['between'] as List)[0] as String, (json['between'] as List)[1] as String), + between: ( + (json['between'] as List)[0] as String, + (json['between'] as List)[1] as String, + ), ); } @@ -31,8 +34,7 @@ class QueryRangeResultWhere { @override bool operator ==(Object other) => identical(this, other) || - other is QueryRangeResultWhere && - between == other.between; + other is QueryRangeResultWhere && between == other.between; @override int get hashCode => between.hashCode; @@ -41,22 +43,27 @@ class QueryRangeResultWhere { String toString() => 'QueryRangeResultWhere(between: $between)'; } - // --- API Namespaces --- class QueryRangeResult { final QueryRangeResultWhere where; final List<(String, int)> pairs; - const QueryRangeResult({ - required this.where, - required this.pairs, - }); + const QueryRangeResult({required this.where, required this.pairs}); factory QueryRangeResult.fromJson(Map json) { return QueryRangeResult( - where: QueryRangeResultWhere.fromJson(json['where'] as Map), - pairs: (json['pairs'] as List).map((e) => ((e as List)[0] as String, ((e as List)[1] as num).toInt())).toList(), + where: QueryRangeResultWhere.fromJson( + json['where'] as Map, + ), + pairs: (json['pairs'] as List) + .map( + (e) => ( + (e as List)[0] as String, + ((e as List)[1] as num).toInt(), + ), + ) + .toList(), ); } @@ -81,23 +88,27 @@ class QueryRangeResult { String toString() => 'QueryRangeResult(where: $where, pairs: $pairs)'; } - class GetShortTuplesResult { final List one; final (String, int?) short; - GetShortTuplesResult({ - required this.one, - required this.short, - }) { - if (!(one.length >= 1)) throw ArgumentError('one must have at least 1 items'); - if (!(one.length <= 1)) throw ArgumentError('one must have at most 1 items'); + GetShortTuplesResult({required this.one, required this.short}) { + if (!(one.length >= 1)) + throw ArgumentError('one must have at least 1 items'); + if (!(one.length <= 1)) + throw ArgumentError('one must have at most 1 items'); } factory GetShortTuplesResult.fromJson(Map json) { return GetShortTuplesResult( one: (json['one'] as List).cast(), - short: ((json['short'] as List)[0] as String, ((json['short'] as List).length > 1 ? (json['short'] as List)[1] : null) as int?), + short: ( + (json['short'] as List)[0] as String, + ((json['short'] as List).length > 1 + ? (json['short'] as List)[1] + : null) + as int?, + ), ); } @@ -122,22 +133,31 @@ class GetShortTuplesResult { String toString() => 'GetShortTuplesResult(one: $one, short: $short)'; } - class Api { final BlocksClient _client; Api(this._client); Future<(num, num, String)> getCoords() async { final result = await _client.call('api.getCoords', const []); - return ((result as List)[0] as num, (result as List)[1] as num, (result as List)[2] as String); + return ( + (result as List)[0] as num, + (result as List)[1] as num, + (result as List)[2] as String, + ); } Future<(String, int)> getPair() async { final result = await _client.call('api.getPair', const []); - return ((result as List)[0] as String, ((result as List)[1] as num).toInt()); + return ( + (result as List)[0] as String, + ((result as List)[1] as num).toInt(), + ); } - Future queryRange({required (num, num) range, (String, int?)? cursor}) async { + Future queryRange({ + required (num, num) range, + (String, int?)? cursor, + }) async { final params = [ [range.$1, range.$2], if (cursor != null) [cursor.$1, cursor.$2], @@ -146,16 +166,15 @@ class Api { return QueryRangeResult.fromJson(result as Map); } - Future getShortTuples({required List one}) async { - final params = [ - one, - ]; + Future getShortTuples({ + required List one, + }) async { + final params = [one]; final result = await _client.call('api.getShortTuples', params); return GetShortTuplesResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -166,4 +185,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/12-defaults/dart/client.dart b/native/codegen-fixtures/12-defaults/dart/client.dart index 4162f8f9a4..b736e23cf3 100644 --- a/native/codegen-fixtures/12-defaults/dart/client.dart +++ b/native/codegen-fixtures/12-defaults/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -31,11 +33,7 @@ class CreateItemResult { } Map toJson() { - return { - 'role': role, - 'active': active, - 'retries': retries, - }; + return {'role': role, 'active': active, 'retries': retries}; } @override @@ -50,10 +48,10 @@ class CreateItemResult { int get hashCode => Object.hash(role, active, retries); @override - String toString() => 'CreateItemResult(role: $role, active: $active, retries: $retries)'; + String toString() => + 'CreateItemResult(role: $role, active: $active, retries: $retries)'; } - class Api { final BlocksClient _client; Api(this._client); @@ -64,7 +62,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -75,4 +72,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/13-constraints-string/dart/client.dart b/native/codegen-fixtures/13-constraints-string/dart/client.dart index 4e8c6cdc79..7bb5f1e1c7 100644 --- a/native/codegen-fixtures/13-constraints-string/dart/client.dart +++ b/native/codegen-fixtures/13-constraints-string/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -16,17 +18,18 @@ class ApiCreateUserInput { final String code; final String? nickname; - ApiCreateUserInput({ - required this.email, - required this.code, - this.nickname, - }) { - if (!(email.length >= 5)) throw ArgumentError('email must be at least 5 characters'); - if (!(email.length <= 254)) throw ArgumentError('email must be at most 254 characters'); - if (!(RegExp(r'^[A-Z]{3}$').hasMatch(code))) throw ArgumentError('code must match pattern'); + ApiCreateUserInput({required this.email, required this.code, this.nickname}) { + if (!(email.length >= 5)) + throw ArgumentError('email must be at least 5 characters'); + if (!(email.length <= 254)) + throw ArgumentError('email must be at most 254 characters'); + if (!(RegExp(r'^[A-Z]{3}$').hasMatch(code))) + throw ArgumentError('code must match pattern'); if (nickname case final nickname?) { - if (!(nickname.length >= 2)) throw ArgumentError('nickname must be at least 2 characters'); - if (!(nickname.length <= 30)) throw ArgumentError('nickname must be at most 30 characters'); + if (!(nickname.length >= 2)) + throw ArgumentError('nickname must be at least 2 characters'); + if (!(nickname.length <= 30)) + throw ArgumentError('nickname must be at most 30 characters'); } } @@ -58,34 +61,26 @@ class ApiCreateUserInput { int get hashCode => Object.hash(email, code, nickname); @override - String toString() => 'ApiCreateUserInput(email: $email, code: $code, nickname: $nickname)'; + String toString() => + 'ApiCreateUserInput(email: $email, code: $code, nickname: $nickname)'; } - class CreateUserResult { final bool ok; - const CreateUserResult({ - required this.ok, - }); + const CreateUserResult({required this.ok}); factory CreateUserResult.fromJson(Map json) { - return CreateUserResult( - ok: json['ok'] as bool, - ); + return CreateUserResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is CreateUserResult && - ok == other.ok; + identical(this, other) || other is CreateUserResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -94,21 +89,19 @@ class CreateUserResult { String toString() => 'CreateUserResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); - Future createUser({required ApiCreateUserInput input}) async { - final params = [ - input.toJson(), - ]; + Future createUser({ + required ApiCreateUserInput input, + }) async { + final params = [input.toJson()]; final result = await _client.call('api.createUser', params); return CreateUserResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -119,4 +112,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/14-constraints-numeric/dart/client.dart b/native/codegen-fixtures/14-constraints-numeric/dart/client.dart index 368f2f5d97..63ece685d8 100644 --- a/native/codegen-fixtures/14-constraints-numeric/dart/client.dart +++ b/native/codegen-fixtures/14-constraints-numeric/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -24,7 +26,8 @@ class ApiSetScoreInput { if (!(score >= 0)) throw ArgumentError('score must be >= 0'); if (!(score <= 100)) throw ArgumentError('score must be <= 100'); if (!(level > 0)) throw ArgumentError('level must be > 0'); - if (!(step % 0.5 == 0)) throw ArgumentError('step must be a multiple of 0.5'); + if (!(step % 0.5 == 0)) + throw ArgumentError('step must be a multiple of 0.5'); } factory ApiSetScoreInput.fromJson(Map json) { @@ -36,11 +39,7 @@ class ApiSetScoreInput { } Map toJson() { - return { - 'score': score, - 'level': level, - 'step': step, - }; + return {'score': score, 'level': level, 'step': step}; } @override @@ -55,34 +54,26 @@ class ApiSetScoreInput { int get hashCode => Object.hash(score, level, step); @override - String toString() => 'ApiSetScoreInput(score: $score, level: $level, step: $step)'; + String toString() => + 'ApiSetScoreInput(score: $score, level: $level, step: $step)'; } - class SetScoreResult { final bool ok; - const SetScoreResult({ - required this.ok, - }); + const SetScoreResult({required this.ok}); factory SetScoreResult.fromJson(Map json) { - return SetScoreResult( - ok: json['ok'] as bool, - ); + return SetScoreResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is SetScoreResult && - ok == other.ok; + identical(this, other) || other is SetScoreResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -91,21 +82,17 @@ class SetScoreResult { String toString() => 'SetScoreResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future setScore({required ApiSetScoreInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('api.setScore', params); return SetScoreResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -116,4 +103,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/15-constraints-array/dart/client.dart b/native/codegen-fixtures/15-constraints-array/dart/client.dart index 4ea5d8b36a..5ede0945ad 100644 --- a/native/codegen-fixtures/15-constraints-array/dart/client.dart +++ b/native/codegen-fixtures/15-constraints-array/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -14,11 +16,11 @@ export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpc class ApiSetTagsInput { final List tags; - ApiSetTagsInput({ - required this.tags, - }) { - if (!(tags.length >= 1)) throw ArgumentError('tags must have at least 1 items'); - if (!(tags.length <= 10)) throw ArgumentError('tags must have at most 10 items'); + ApiSetTagsInput({required this.tags}) { + if (!(tags.length >= 1)) + throw ArgumentError('tags must have at least 1 items'); + if (!(tags.length <= 10)) + throw ArgumentError('tags must have at most 10 items'); } factory ApiSetTagsInput.fromJson(Map json) { @@ -28,16 +30,13 @@ class ApiSetTagsInput { } Map toJson() { - return { - 'tags': tags, - }; + return {'tags': tags}; } @override bool operator ==(Object other) => identical(this, other) || - other is ApiSetTagsInput && - blocksDeepEquals(tags, other.tags); + other is ApiSetTagsInput && blocksDeepEquals(tags, other.tags); @override int get hashCode => blocksDeepHash(tags); @@ -46,31 +45,22 @@ class ApiSetTagsInput { String toString() => 'ApiSetTagsInput(tags: $tags)'; } - class SetTagsResult { final bool ok; - const SetTagsResult({ - required this.ok, - }); + const SetTagsResult({required this.ok}); factory SetTagsResult.fromJson(Map json) { - return SetTagsResult( - ok: json['ok'] as bool, - ); + return SetTagsResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is SetTagsResult && - ok == other.ok; + identical(this, other) || other is SetTagsResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -79,21 +69,17 @@ class SetTagsResult { String toString() => 'SetTagsResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future setTags({required ApiSetTagsInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('api.setTags', params); return SetTagsResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -104,4 +90,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/16-ref-in-union-arm/dart/client.dart b/native/codegen-fixtures/16-ref-in-union-arm/dart/client.dart index fe1ac75e7f..b95a8f0498 100644 --- a/native/codegen-fixtures/16-ref-in-union-arm/dart/client.dart +++ b/native/codegen-fixtures/16-ref-in-union-arm/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,19 +6,18 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- enum MfaChallengeAction { - mfa -; + mfa; String toJson() => name; static MfaChallengeAction fromJson(String json) => values.byName(json); } - class MfaChallenge { final MfaChallengeAction action; final String code; @@ -38,11 +38,7 @@ class MfaChallenge { } Map toJson() { - return { - 'action': action.toJson(), - 'code': code, - 'session': session, - }; + return {'action': action.toJson(), 'code': code, 'session': session}; } @override @@ -57,36 +53,28 @@ class MfaChallenge { int get hashCode => Object.hash(action, code, session); @override - String toString() => 'MfaChallenge(action: $action, code: $code, session: $session)'; + String toString() => + 'MfaChallenge(action: $action, code: $code, session: $session)'; } - // --- API Namespaces --- class DoActionResult { final bool ok; - const DoActionResult({ - required this.ok, - }); + const DoActionResult({required this.ok}); factory DoActionResult.fromJson(Map json) { - return DoActionResult( - ok: json['ok'] as bool, - ); + return DoActionResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is DoActionResult && - ok == other.ok; + identical(this, other) || other is DoActionResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -95,21 +83,17 @@ class DoActionResult { String toString() => 'DoActionResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future doAction({required dynamic input}) async { - final params = [ - input, - ]; + final params = [input]; final result = await _client.call('api.doAction', params); return DoActionResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -120,4 +104,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/17-transferables/dart/client.dart b/native/codegen-fixtures/17-transferables/dart/client.dart index ecfc8af537..827550d850 100644 --- a/native/codegen-fixtures/17-transferables/dart/client.dart +++ b/native/codegen-fixtures/17-transferables/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,8 +6,10 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; // --- Models --- @@ -27,10 +30,7 @@ class GetChannelResultMessage { } Map toJson() { - return { - 'message': message, - 'timestamp': timestamp, - }; + return {'message': message, 'timestamp': timestamp}; } @override @@ -44,10 +44,10 @@ class GetChannelResultMessage { int get hashCode => Object.hash(message, timestamp); @override - String toString() => 'GetChannelResultMessage(message: $message, timestamp: $timestamp)'; + String toString() => + 'GetChannelResultMessage(message: $message, timestamp: $timestamp)'; } - // --- API Namespaces --- class Api { @@ -56,27 +56,25 @@ class Api { Future> getChannel() async { final result = await _client.call('api.getChannel', const []); - return RealtimeChannel.fromJson(result as Map, (json) => GetChannelResultMessage.fromJson(json)); + return RealtimeChannel.fromJson( + result as Map, + (json) => GetChannelResultMessage.fromJson(json), + ); } Future getFile({required String path}) async { - final params = [ - path, - ]; + final params = [path]; final result = await _client.call('api.getFile', params); return FileDownloadHandle.fromJson(result as Map); } Future getUpload({required String path}) async { - final params = [ - path, - ]; + final params = [path]; final result = await _client.call('api.getUpload', params); return FileUploadHandle.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -87,4 +85,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/18-hybrid-arm/dart/client.dart b/native/codegen-fixtures/18-hybrid-arm/dart/client.dart index b44d403da0..f1862d24f2 100644 --- a/native/codegen-fixtures/18-hybrid-arm/dart/client.dart +++ b/native/codegen-fixtures/18-hybrid-arm/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -60,27 +62,26 @@ class Todo { createdAt == other.createdAt; @override - int get hashCode => Object.hash(userId, todoId, title, completed, priority, createdAt); + int get hashCode => + Object.hash(userId, todoId, title, completed, priority, createdAt); @override - String toString() => 'Todo(userId: $userId, todoId: $todoId, title: $title, completed: $completed, priority: $priority, createdAt: $createdAt)'; + String toString() => + 'Todo(userId: $userId, todoId: $todoId, title: $title, completed: $completed, priority: $priority, createdAt: $createdAt)'; } - enum AuthStateState { signedOut, signedIn, confirmingSignUp, confirmingSignIn, confirmingMfa, - confirmingPasswordReset -; + confirmingPasswordReset; String toJson() => name; static AuthStateState fromJson(String json) => values.byName(json); } - class AuthUser { final String userId; final String username; @@ -120,24 +121,21 @@ class AuthUser { int get hashCode => Object.hash(userId, username, displayName); @override - String toString() => 'AuthUser(userId: $userId, username: $username, displayName: $displayName)'; + String toString() => + 'AuthUser(userId: $userId, username: $username, displayName: $displayName)'; } - enum AuthActionMethod { GET, - POST -; + POST; String toJson() => name; static AuthActionMethod fromJson(String json) => values.byName(json); } - enum AuthActionCapability { webauthnGet, - webauthnCreate -; + webauthnCreate; static const _jsonMap = { 'webauthn-get': webauthnGet, @@ -151,7 +149,6 @@ enum AuthActionCapability { static AuthActionCapability fromJson(String json) => _jsonMap[json]!; } - class AuthAction { final String name; final String label; @@ -175,10 +172,16 @@ class AuthAction { return AuthAction( name: json['name'] as String, label: json['label'] as String, - fields: (json['fields'] as List).map((e) => AuthField.fromJson(e as Map)).toList(), + fields: (json['fields'] as List) + .map((e) => AuthField.fromJson(e as Map)) + .toList(), url: json['url'] as String?, - method: json['method'] != null ? AuthActionMethod.fromJson(json['method'] as String) : null, - capability: json['capability'] != null ? AuthActionCapability.fromJson(json['capability'] as String) : null, + method: json['method'] != null + ? AuthActionMethod.fromJson(json['method'] as String) + : null, + capability: json['capability'] != null + ? AuthActionCapability.fromJson(json['capability'] as String) + : null, unavailable: json['unavailable'] as String?, ); } @@ -208,27 +211,33 @@ class AuthAction { unavailable == other.unavailable; @override - int get hashCode => Object.hash(name, label, blocksDeepHash(fields), url, method, capability, unavailable); + int get hashCode => Object.hash( + name, + label, + blocksDeepHash(fields), + url, + method, + capability, + unavailable, + ); @override - String toString() => 'AuthAction(name: $name, label: $label, fields: $fields, url: $url, method: $method, capability: $capability, unavailable: $unavailable)'; + String toString() => + 'AuthAction(name: $name, label: $label, fields: $fields, url: $url, method: $method, capability: $capability, unavailable: $unavailable)'; } - enum AuthFieldType { number, password, email, text, tel, - hidden -; + hidden; String toJson() => name; static AuthFieldType fromJson(String json) => values.byName(json); } - class AuthField { final String name; final String label; @@ -278,24 +287,33 @@ class AuthField { int get hashCode => Object.hash(name, label, type, required$, defaultValue); @override - String toString() => 'AuthField(name: $name, label: $label, type: $type, required\$: ${required$}, defaultValue: $defaultValue)'; + String toString() => + 'AuthField(name: $name, label: $label, type: $type, required\$: ${required$}, defaultValue: $defaultValue)'; } - sealed class ConfirmSignInInputChallenge { const ConfirmSignInInputChallenge(); Map toJson(); static ConfirmSignInInputChallenge fromJson(Map json) { switch (json['challenge'] as String) { - case 'code': return CodeConfirmSignInInputChallenge.fromJson(json); - case 'mfaType': return MfaTypeConfirmSignInInputChallenge.fromJson(json); - case 'newPassword': return NewPasswordConfirmSignInInputChallenge.fromJson(json); - case 'totpSetup': return TotpSetupConfirmSignInInputChallenge.fromJson(json); - case 'email': return EmailConfirmSignInInputChallenge.fromJson(json); - case 'password': return PasswordConfirmSignInInputChallenge.fromJson(json); - case 'firstFactor': return FirstFactorConfirmSignInInputChallenge.fromJson(json); - case 'webauthn': return WebauthnConfirmSignInInputChallenge.fromJson(json); - default: throw ArgumentError('Unknown challenge: ${json['challenge']}'); + case 'code': + return CodeConfirmSignInInputChallenge.fromJson(json); + case 'mfaType': + return MfaTypeConfirmSignInInputChallenge.fromJson(json); + case 'newPassword': + return NewPasswordConfirmSignInInputChallenge.fromJson(json); + case 'totpSetup': + return TotpSetupConfirmSignInInputChallenge.fromJson(json); + case 'email': + return EmailConfirmSignInInputChallenge.fromJson(json); + case 'password': + return PasswordConfirmSignInInputChallenge.fromJson(json); + case 'firstFactor': + return FirstFactorConfirmSignInInputChallenge.fromJson(json); + case 'webauthn': + return WebauthnConfirmSignInInputChallenge.fromJson(json); + default: + throw ArgumentError('Unknown challenge: ${json['challenge']}'); } } } @@ -303,29 +321,21 @@ sealed class ConfirmSignInInputChallenge { class CodeConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { final String code; - const CodeConfirmSignInInputChallenge({ - required this.code, - }); + const CodeConfirmSignInInputChallenge({required this.code}); factory CodeConfirmSignInInputChallenge.fromJson(Map json) { - return CodeConfirmSignInInputChallenge( - code: json['code'] as String, - ); + return CodeConfirmSignInInputChallenge(code: json['code'] as String); } @override Map toJson() { - return { - 'challenge': 'code', - 'code': code, - }; + return {'challenge': 'code', 'code': code}; } @override bool operator ==(Object other) => identical(this, other) || - other is CodeConfirmSignInInputChallenge && - code == other.code; + other is CodeConfirmSignInInputChallenge && code == other.code; @override int get hashCode => code.hashCode; @@ -337,11 +347,11 @@ class CodeConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { class MfaTypeConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { final String mfaType; - const MfaTypeConfirmSignInInputChallenge({ - required this.mfaType, - }); + const MfaTypeConfirmSignInInputChallenge({required this.mfaType}); - factory MfaTypeConfirmSignInInputChallenge.fromJson(Map json) { + factory MfaTypeConfirmSignInInputChallenge.fromJson( + Map json, + ) { return MfaTypeConfirmSignInInputChallenge( mfaType: json['mfaType'] as String, ); @@ -349,17 +359,13 @@ class MfaTypeConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { @override Map toJson() { - return { - 'challenge': 'mfaType', - 'mfaType': mfaType, - }; + return {'challenge': 'mfaType', 'mfaType': mfaType}; } @override bool operator ==(Object other) => identical(this, other) || - other is MfaTypeConfirmSignInInputChallenge && - mfaType == other.mfaType; + other is MfaTypeConfirmSignInInputChallenge && mfaType == other.mfaType; @override int get hashCode => mfaType.hashCode; @@ -368,14 +374,15 @@ class MfaTypeConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { String toString() => 'MfaTypeConfirmSignInInputChallenge(mfaType: $mfaType)'; } -class NewPasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { +class NewPasswordConfirmSignInInputChallenge + extends ConfirmSignInInputChallenge { final String newPassword; - const NewPasswordConfirmSignInInputChallenge({ - required this.newPassword, - }); + const NewPasswordConfirmSignInInputChallenge({required this.newPassword}); - factory NewPasswordConfirmSignInInputChallenge.fromJson(Map json) { + factory NewPasswordConfirmSignInInputChallenge.fromJson( + Map json, + ) { return NewPasswordConfirmSignInInputChallenge( newPassword: json['newPassword'] as String, ); @@ -383,10 +390,7 @@ class NewPasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge @override Map toJson() { - return { - 'challenge': 'newPassword', - 'newPassword': newPassword, - }; + return {'challenge': 'newPassword', 'newPassword': newPassword}; } @override @@ -399,7 +403,8 @@ class NewPasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge int get hashCode => newPassword.hashCode; @override - String toString() => 'NewPasswordConfirmSignInInputChallenge(newPassword: $newPassword)'; + String toString() => + 'NewPasswordConfirmSignInInputChallenge(newPassword: $newPassword)'; } class TotpSetupConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { @@ -411,7 +416,9 @@ class TotpSetupConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { required this.code, }); - factory TotpSetupConfirmSignInInputChallenge.fromJson(Map json) { + factory TotpSetupConfirmSignInInputChallenge.fromJson( + Map json, + ) { return TotpSetupConfirmSignInInputChallenge( sharedSecret: json['sharedSecret'] as String, code: json['code'] as String, @@ -438,35 +445,28 @@ class TotpSetupConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { int get hashCode => Object.hash(sharedSecret, code); @override - String toString() => 'TotpSetupConfirmSignInInputChallenge(sharedSecret: $sharedSecret, code: $code)'; + String toString() => + 'TotpSetupConfirmSignInInputChallenge(sharedSecret: $sharedSecret, code: $code)'; } class EmailConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { final String email; - const EmailConfirmSignInInputChallenge({ - required this.email, - }); + const EmailConfirmSignInInputChallenge({required this.email}); factory EmailConfirmSignInInputChallenge.fromJson(Map json) { - return EmailConfirmSignInInputChallenge( - email: json['email'] as String, - ); + return EmailConfirmSignInInputChallenge(email: json['email'] as String); } @override Map toJson() { - return { - 'challenge': 'email', - 'email': email, - }; + return {'challenge': 'email', 'email': email}; } @override bool operator ==(Object other) => identical(this, other) || - other is EmailConfirmSignInInputChallenge && - email == other.email; + other is EmailConfirmSignInInputChallenge && email == other.email; @override int get hashCode => email.hashCode; @@ -478,11 +478,11 @@ class EmailConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { class PasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { final String password; - const PasswordConfirmSignInInputChallenge({ - required this.password, - }); + const PasswordConfirmSignInInputChallenge({required this.password}); - factory PasswordConfirmSignInInputChallenge.fromJson(Map json) { + factory PasswordConfirmSignInInputChallenge.fromJson( + Map json, + ) { return PasswordConfirmSignInInputChallenge( password: json['password'] as String, ); @@ -490,10 +490,7 @@ class PasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { @override Map toJson() { - return { - 'challenge': 'password', - 'password': password, - }; + return {'challenge': 'password', 'password': password}; } @override @@ -506,17 +503,19 @@ class PasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { int get hashCode => password.hashCode; @override - String toString() => 'PasswordConfirmSignInInputChallenge(password: $password)'; + String toString() => + 'PasswordConfirmSignInInputChallenge(password: $password)'; } -class FirstFactorConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { +class FirstFactorConfirmSignInInputChallenge + extends ConfirmSignInInputChallenge { final String firstFactor; - const FirstFactorConfirmSignInInputChallenge({ - required this.firstFactor, - }); + const FirstFactorConfirmSignInInputChallenge({required this.firstFactor}); - factory FirstFactorConfirmSignInInputChallenge.fromJson(Map json) { + factory FirstFactorConfirmSignInInputChallenge.fromJson( + Map json, + ) { return FirstFactorConfirmSignInInputChallenge( firstFactor: json['firstFactor'] as String, ); @@ -524,10 +523,7 @@ class FirstFactorConfirmSignInInputChallenge extends ConfirmSignInInputChallenge @override Map toJson() { - return { - 'challenge': 'firstFactor', - 'firstFactor': firstFactor, - }; + return {'challenge': 'firstFactor', 'firstFactor': firstFactor}; } @override @@ -540,17 +536,18 @@ class FirstFactorConfirmSignInInputChallenge extends ConfirmSignInInputChallenge int get hashCode => firstFactor.hashCode; @override - String toString() => 'FirstFactorConfirmSignInInputChallenge(firstFactor: $firstFactor)'; + String toString() => + 'FirstFactorConfirmSignInInputChallenge(firstFactor: $firstFactor)'; } class WebauthnConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { final String credential; - const WebauthnConfirmSignInInputChallenge({ - required this.credential, - }); + const WebauthnConfirmSignInInputChallenge({required this.credential}); - factory WebauthnConfirmSignInInputChallenge.fromJson(Map json) { + factory WebauthnConfirmSignInInputChallenge.fromJson( + Map json, + ) { return WebauthnConfirmSignInInputChallenge( credential: json['credential'] as String, ); @@ -558,10 +555,7 @@ class WebauthnConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { @override Map toJson() { - return { - 'challenge': 'webauthn', - 'credential': credential, - }; + return {'challenge': 'webauthn', 'credential': credential}; } @override @@ -574,47 +568,43 @@ class WebauthnConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { int get hashCode => credential.hashCode; @override - String toString() => 'WebauthnConfirmSignInInputChallenge(credential: $credential)'; + String toString() => + 'WebauthnConfirmSignInInputChallenge(credential: $credential)'; } - - enum UpdateMfaPreferenceInputSms { ENABLED, DISABLED, PREFERRED, - NOT_PREFERRED -; + NOT_PREFERRED; String toJson() => name; - static UpdateMfaPreferenceInputSms fromJson(String json) => values.byName(json); + static UpdateMfaPreferenceInputSms fromJson(String json) => + values.byName(json); } - enum UpdateMfaPreferenceInputTotp { ENABLED, DISABLED, PREFERRED, - NOT_PREFERRED -; + NOT_PREFERRED; String toJson() => name; - static UpdateMfaPreferenceInputTotp fromJson(String json) => values.byName(json); + static UpdateMfaPreferenceInputTotp fromJson(String json) => + values.byName(json); } - enum UpdateMfaPreferenceInputEmail { ENABLED, DISABLED, PREFERRED, - NOT_PREFERRED -; + NOT_PREFERRED; String toJson() => name; - static UpdateMfaPreferenceInputEmail fromJson(String json) => values.byName(json); + static UpdateMfaPreferenceInputEmail fromJson(String json) => + values.byName(json); } - // --- API Namespaces --- class AuthState { @@ -637,8 +627,12 @@ class AuthState { factory AuthState.fromJson(Map json) { return AuthState( state: AuthStateState.fromJson(json['state'] as String), - user: json['user'] != null ? AuthUser.fromJson(json['user'] as Map) : null, - actions: (json['actions'] as List).map((e) => AuthAction.fromJson(e as Map)).toList(), + user: json['user'] != null + ? AuthUser.fromJson(json['user'] as Map) + : null, + actions: (json['actions'] as List) + .map((e) => AuthAction.fromJson(e as Map)) + .toList(), error: json['error'] as String?, errorName: json['errorName'] as String?, retriable: json['retriable'] as bool?, @@ -668,37 +662,63 @@ class AuthState { retriable == other.retriable; @override - int get hashCode => Object.hash(state, user, blocksDeepHash(actions), error, errorName, retriable); + int get hashCode => Object.hash( + state, + user, + blocksDeepHash(actions), + error, + errorName, + retriable, + ); @override - String toString() => 'AuthState(state: $state, user: $user, actions: $actions, error: $error, errorName: $errorName, retriable: $retriable)'; + String toString() => + 'AuthState(state: $state, user: $user, actions: $actions, error: $error, errorName: $errorName, retriable: $retriable)'; } - sealed class AuthApiSetAuthStateInput { const AuthApiSetAuthStateInput(); Map toJson(); static AuthApiSetAuthStateInput fromJson(Map json) { switch (json['action'] as String) { - case 'signUp': return SignUpInput.fromJson(json); - case 'resetPassword': return ResetPasswordInput.fromJson(json); - case 'signIn': return SignInInput.fromJson(json); - case 'signInWithPasskey': return SignInWithPasskeyInput.fromJson(json); - case 'confirmSignUp': return ConfirmSignUpInput.fromJson(json); - case 'resendSignUpCode': return ResendSignUpCodeInput.fromJson(json); - case 'signOut': return SignOutInput.fromJson(json); - case 'confirmResetPassword': return ConfirmResetPasswordInput.fromJson(json); - case 'autoSignIn': return AutoSignInInput.fromJson(json); - case 'confirmSignIn': return ConfirmSignInInput.fromJson(json); - case 'startPasskeyRegistration': return StartPasskeyRegistrationInput.fromJson(json); - case 'completePasskeyRegistration': return CompletePasskeyRegistrationInput.fromJson(json); - case 'listPasskeys': return ListPasskeysInput.fromJson(json); - case 'deletePasskey': return DeletePasskeyInput.fromJson(json); - case 'setUpTotp': return SetUpTotpInput.fromJson(json); - case 'verifyTotpSetup': return VerifyTotpSetupInput.fromJson(json); - case 'getMfaPreference': return GetMfaPreferenceInput.fromJson(json); - case 'updateMfaPreference': return UpdateMfaPreferenceInput.fromJson(json); - default: throw ArgumentError('Unknown action: ${json['action']}'); + case 'signUp': + return SignUpInput.fromJson(json); + case 'resetPassword': + return ResetPasswordInput.fromJson(json); + case 'signIn': + return SignInInput.fromJson(json); + case 'signInWithPasskey': + return SignInWithPasskeyInput.fromJson(json); + case 'confirmSignUp': + return ConfirmSignUpInput.fromJson(json); + case 'resendSignUpCode': + return ResendSignUpCodeInput.fromJson(json); + case 'signOut': + return SignOutInput.fromJson(json); + case 'confirmResetPassword': + return ConfirmResetPasswordInput.fromJson(json); + case 'autoSignIn': + return AutoSignInInput.fromJson(json); + case 'confirmSignIn': + return ConfirmSignInInput.fromJson(json); + case 'startPasskeyRegistration': + return StartPasskeyRegistrationInput.fromJson(json); + case 'completePasskeyRegistration': + return CompletePasskeyRegistrationInput.fromJson(json); + case 'listPasskeys': + return ListPasskeysInput.fromJson(json); + case 'deletePasskey': + return DeletePasskeyInput.fromJson(json); + case 'setUpTotp': + return SetUpTotpInput.fromJson(json); + case 'verifyTotpSetup': + return VerifyTotpSetupInput.fromJson(json); + case 'getMfaPreference': + return GetMfaPreferenceInput.fromJson(json); + case 'updateMfaPreference': + return UpdateMfaPreferenceInput.fromJson(json); + default: + throw ArgumentError('Unknown action: ${json['action']}'); } } } @@ -720,7 +740,8 @@ class SignUpInput extends AuthApiSetAuthStateInput { username: json['username'] as String, password: json['password'] as String, additionalProperties: Map.fromEntries( - json.entries.where((e) => !knownKeys.contains(e.key)) + json.entries + .where((e) => !knownKeys.contains(e.key)) .map((e) => MapEntry(e.key, e.value as String)), ), ); @@ -733,7 +754,8 @@ class SignUpInput extends AuthApiSetAuthStateInput { 'username': username, 'password': password, for (final e in additionalProperties.entries) - if (!const {'action', 'username', 'password'}.contains(e.key)) e.key: e.value, + if (!const {'action', 'username', 'password'}.contains(e.key)) + e.key: e.value, }; } @@ -746,38 +768,32 @@ class SignUpInput extends AuthApiSetAuthStateInput { blocksDeepEquals(additionalProperties, other.additionalProperties); @override - int get hashCode => Object.hash(username, password, blocksDeepHash(additionalProperties)); + int get hashCode => + Object.hash(username, password, blocksDeepHash(additionalProperties)); @override - String toString() => 'SignUpInput(username: $username, password: $password, additionalProperties: $additionalProperties)'; + String toString() => + 'SignUpInput(username: $username, password: $password, additionalProperties: $additionalProperties)'; } class ResetPasswordInput extends AuthApiSetAuthStateInput { final String username; - const ResetPasswordInput({ - required this.username, - }); + const ResetPasswordInput({required this.username}); factory ResetPasswordInput.fromJson(Map json) { - return ResetPasswordInput( - username: json['username'] as String, - ); + return ResetPasswordInput(username: json['username'] as String); } @override Map toJson() { - return { - 'action': 'resetPassword', - 'username': username, - }; + return {'action': 'resetPassword', 'username': username}; } @override bool operator ==(Object other) => identical(this, other) || - other is ResetPasswordInput && - username == other.username; + other is ResetPasswordInput && username == other.username; @override int get hashCode => username.hashCode; @@ -790,10 +806,7 @@ class SignInInput extends AuthApiSetAuthStateInput { final String username; final String password; - const SignInInput({ - required this.username, - required this.password, - }); + const SignInInput({required this.username, required this.password}); factory SignInInput.fromJson(Map json) { return SignInInput( @@ -804,11 +817,7 @@ class SignInInput extends AuthApiSetAuthStateInput { @override Map toJson() { - return { - 'action': 'signIn', - 'username': username, - 'password': password, - }; + return {'action': 'signIn', 'username': username, 'password': password}; } @override @@ -828,29 +837,21 @@ class SignInInput extends AuthApiSetAuthStateInput { class SignInWithPasskeyInput extends AuthApiSetAuthStateInput { final String username; - const SignInWithPasskeyInput({ - required this.username, - }); + const SignInWithPasskeyInput({required this.username}); factory SignInWithPasskeyInput.fromJson(Map json) { - return SignInWithPasskeyInput( - username: json['username'] as String, - ); + return SignInWithPasskeyInput(username: json['username'] as String); } @override Map toJson() { - return { - 'action': 'signInWithPasskey', - 'username': username, - }; + return {'action': 'signInWithPasskey', 'username': username}; } @override bool operator ==(Object other) => identical(this, other) || - other is SignInWithPasskeyInput && - username == other.username; + other is SignInWithPasskeyInput && username == other.username; @override int get hashCode => username.hashCode; @@ -900,35 +901,28 @@ class ConfirmSignUpInput extends AuthApiSetAuthStateInput { int get hashCode => Object.hash(username, code, password); @override - String toString() => 'ConfirmSignUpInput(username: $username, code: $code, password: $password)'; + String toString() => + 'ConfirmSignUpInput(username: $username, code: $code, password: $password)'; } class ResendSignUpCodeInput extends AuthApiSetAuthStateInput { final String username; - const ResendSignUpCodeInput({ - required this.username, - }); + const ResendSignUpCodeInput({required this.username}); factory ResendSignUpCodeInput.fromJson(Map json) { - return ResendSignUpCodeInput( - username: json['username'] as String, - ); + return ResendSignUpCodeInput(username: json['username'] as String); } @override Map toJson() { - return { - 'action': 'resendSignUpCode', - 'username': username, - }; + return {'action': 'resendSignUpCode', 'username': username}; } @override bool operator ==(Object other) => identical(this, other) || - other is ResendSignUpCodeInput && - username == other.username; + other is ResendSignUpCodeInput && username == other.username; @override int get hashCode => username.hashCode; @@ -938,25 +932,20 @@ class ResendSignUpCodeInput extends AuthApiSetAuthStateInput { } class SignOutInput extends AuthApiSetAuthStateInput { - const SignOutInput(); factory SignOutInput.fromJson(Map json) { - return SignOutInput( - ); + return SignOutInput(); } @override Map toJson() { - return { - 'action': 'signOut', - }; + return {'action': 'signOut'}; } @override bool operator ==(Object other) => - identical(this, other) || - other is SignOutInput; + identical(this, other) || other is SignOutInput; @override int get hashCode => runtimeType.hashCode; @@ -1006,35 +995,28 @@ class ConfirmResetPasswordInput extends AuthApiSetAuthStateInput { int get hashCode => Object.hash(username, code, newPassword); @override - String toString() => 'ConfirmResetPasswordInput(username: $username, code: $code, newPassword: $newPassword)'; + String toString() => + 'ConfirmResetPasswordInput(username: $username, code: $code, newPassword: $newPassword)'; } class AutoSignInInput extends AuthApiSetAuthStateInput { final String username; - const AutoSignInInput({ - required this.username, - }); + const AutoSignInInput({required this.username}); factory AutoSignInInput.fromJson(Map json) { - return AutoSignInInput( - username: json['username'] as String, - ); + return AutoSignInInput(username: json['username'] as String); } @override Map toJson() { - return { - 'action': 'autoSignIn', - 'username': username, - }; + return {'action': 'autoSignIn', 'username': username}; } @override bool operator ==(Object other) => identical(this, other) || - other is AutoSignInInput && - username == other.username; + other is AutoSignInInput && username == other.username; @override int get hashCode => username.hashCode; @@ -1043,16 +1025,11 @@ class AutoSignInInput extends AuthApiSetAuthStateInput { String toString() => 'AutoSignInInput(username: $username)'; } - - class ConfirmSignInInput extends AuthApiSetAuthStateInput { final String session; final ConfirmSignInInputChallenge challenge; - const ConfirmSignInInput({ - required this.session, - required this.challenge, - }); + const ConfirmSignInInput({required this.session, required this.challenge}); factory ConfirmSignInInput.fromJson(Map json) { return ConfirmSignInInput( @@ -1081,29 +1058,25 @@ class ConfirmSignInInput extends AuthApiSetAuthStateInput { int get hashCode => Object.hash(session, challenge); @override - String toString() => 'ConfirmSignInInput(session: $session, challenge: $challenge)'; + String toString() => + 'ConfirmSignInInput(session: $session, challenge: $challenge)'; } class StartPasskeyRegistrationInput extends AuthApiSetAuthStateInput { - const StartPasskeyRegistrationInput(); factory StartPasskeyRegistrationInput.fromJson(Map json) { - return StartPasskeyRegistrationInput( - ); + return StartPasskeyRegistrationInput(); } @override Map toJson() { - return { - 'action': 'startPasskeyRegistration', - }; + return {'action': 'startPasskeyRegistration'}; } @override bool operator ==(Object other) => - identical(this, other) || - other is StartPasskeyRegistrationInput; + identical(this, other) || other is StartPasskeyRegistrationInput; @override int get hashCode => runtimeType.hashCode; @@ -1115,9 +1088,7 @@ class StartPasskeyRegistrationInput extends AuthApiSetAuthStateInput { class CompletePasskeyRegistrationInput extends AuthApiSetAuthStateInput { final String credential; - const CompletePasskeyRegistrationInput({ - required this.credential, - }); + const CompletePasskeyRegistrationInput({required this.credential}); factory CompletePasskeyRegistrationInput.fromJson(Map json) { return CompletePasskeyRegistrationInput( @@ -1127,10 +1098,7 @@ class CompletePasskeyRegistrationInput extends AuthApiSetAuthStateInput { @override Map toJson() { - return { - 'action': 'completePasskeyRegistration', - 'credential': credential, - }; + return {'action': 'completePasskeyRegistration', 'credential': credential}; } @override @@ -1143,29 +1111,25 @@ class CompletePasskeyRegistrationInput extends AuthApiSetAuthStateInput { int get hashCode => credential.hashCode; @override - String toString() => 'CompletePasskeyRegistrationInput(credential: $credential)'; + String toString() => + 'CompletePasskeyRegistrationInput(credential: $credential)'; } class ListPasskeysInput extends AuthApiSetAuthStateInput { - const ListPasskeysInput(); factory ListPasskeysInput.fromJson(Map json) { - return ListPasskeysInput( - ); + return ListPasskeysInput(); } @override Map toJson() { - return { - 'action': 'listPasskeys', - }; + return {'action': 'listPasskeys'}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ListPasskeysInput; + identical(this, other) || other is ListPasskeysInput; @override int get hashCode => runtimeType.hashCode; @@ -1177,29 +1141,21 @@ class ListPasskeysInput extends AuthApiSetAuthStateInput { class DeletePasskeyInput extends AuthApiSetAuthStateInput { final String credentialId; - const DeletePasskeyInput({ - required this.credentialId, - }); + const DeletePasskeyInput({required this.credentialId}); factory DeletePasskeyInput.fromJson(Map json) { - return DeletePasskeyInput( - credentialId: json['credentialId'] as String, - ); + return DeletePasskeyInput(credentialId: json['credentialId'] as String); } @override Map toJson() { - return { - 'action': 'deletePasskey', - 'credentialId': credentialId, - }; + return {'action': 'deletePasskey', 'credentialId': credentialId}; } @override bool operator ==(Object other) => identical(this, other) || - other is DeletePasskeyInput && - credentialId == other.credentialId; + other is DeletePasskeyInput && credentialId == other.credentialId; @override int get hashCode => credentialId.hashCode; @@ -1209,25 +1165,20 @@ class DeletePasskeyInput extends AuthApiSetAuthStateInput { } class SetUpTotpInput extends AuthApiSetAuthStateInput { - const SetUpTotpInput(); factory SetUpTotpInput.fromJson(Map json) { - return SetUpTotpInput( - ); + return SetUpTotpInput(); } @override Map toJson() { - return { - 'action': 'setUpTotp', - }; + return {'action': 'setUpTotp'}; } @override bool operator ==(Object other) => - identical(this, other) || - other is SetUpTotpInput; + identical(this, other) || other is SetUpTotpInput; @override int get hashCode => runtimeType.hashCode; @@ -1239,29 +1190,21 @@ class SetUpTotpInput extends AuthApiSetAuthStateInput { class VerifyTotpSetupInput extends AuthApiSetAuthStateInput { final String code; - const VerifyTotpSetupInput({ - required this.code, - }); + const VerifyTotpSetupInput({required this.code}); factory VerifyTotpSetupInput.fromJson(Map json) { - return VerifyTotpSetupInput( - code: json['code'] as String, - ); + return VerifyTotpSetupInput(code: json['code'] as String); } @override Map toJson() { - return { - 'action': 'verifyTotpSetup', - 'code': code, - }; + return {'action': 'verifyTotpSetup', 'code': code}; } @override bool operator ==(Object other) => identical(this, other) || - other is VerifyTotpSetupInput && - code == other.code; + other is VerifyTotpSetupInput && code == other.code; @override int get hashCode => code.hashCode; @@ -1271,25 +1214,20 @@ class VerifyTotpSetupInput extends AuthApiSetAuthStateInput { } class GetMfaPreferenceInput extends AuthApiSetAuthStateInput { - const GetMfaPreferenceInput(); factory GetMfaPreferenceInput.fromJson(Map json) { - return GetMfaPreferenceInput( - ); + return GetMfaPreferenceInput(); } @override Map toJson() { - return { - 'action': 'getMfaPreference', - }; + return {'action': 'getMfaPreference'}; } @override bool operator ==(Object other) => - identical(this, other) || - other is GetMfaPreferenceInput; + identical(this, other) || other is GetMfaPreferenceInput; @override int get hashCode => runtimeType.hashCode; @@ -1303,17 +1241,19 @@ class UpdateMfaPreferenceInput extends AuthApiSetAuthStateInput { final UpdateMfaPreferenceInputTotp? totp; final UpdateMfaPreferenceInputEmail? email; - const UpdateMfaPreferenceInput({ - this.sms, - this.totp, - this.email, - }); + const UpdateMfaPreferenceInput({this.sms, this.totp, this.email}); factory UpdateMfaPreferenceInput.fromJson(Map json) { return UpdateMfaPreferenceInput( - sms: json['sms'] != null ? UpdateMfaPreferenceInputSms.fromJson(json['sms'] as String) : null, - totp: json['totp'] != null ? UpdateMfaPreferenceInputTotp.fromJson(json['totp'] as String) : null, - email: json['email'] != null ? UpdateMfaPreferenceInputEmail.fromJson(json['email'] as String) : null, + sms: json['sms'] != null + ? UpdateMfaPreferenceInputSms.fromJson(json['sms'] as String) + : null, + totp: json['totp'] != null + ? UpdateMfaPreferenceInputTotp.fromJson(json['totp'] as String) + : null, + email: json['email'] != null + ? UpdateMfaPreferenceInputEmail.fromJson(json['email'] as String) + : null, ); } @@ -1339,25 +1279,23 @@ class UpdateMfaPreferenceInput extends AuthApiSetAuthStateInput { int get hashCode => Object.hash(sms, totp, email); @override - String toString() => 'UpdateMfaPreferenceInput(sms: $sms, totp: $totp, email: $email)'; + String toString() => + 'UpdateMfaPreferenceInput(sms: $sms, totp: $totp, email: $email)'; } - - class AuthApi { final BlocksClient _client; AuthApi(this._client); - Future setAuthState({required AuthApiSetAuthStateInput input}) async { - final params = [ - input.toJson(), - ]; + Future setAuthState({ + required AuthApiSetAuthStateInput input, + }) async { + final params = [input.toJson()]; final result = await _client.call('authApi.setAuthState', params); return AuthState.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -1368,4 +1306,3 @@ class Blocks { authApi = AuthApi(client); } } - diff --git a/native/codegen-fixtures/19-optional-collections/dart/client.dart b/native/codegen-fixtures/19-optional-collections/dart/client.dart index 74f48e62b4..3ff6dce220 100644 --- a/native/codegen-fixtures/19-optional-collections/dart/client.dart +++ b/native/codegen-fixtures/19-optional-collections/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -30,8 +32,12 @@ class GetUserResult { return GetUserResult( name: json['name'] as String, tags: (json['tags'] as List).cast(), - scores: (json['scores'] as List?)?.map((e) => (e as num).toInt()).toList(), - metadata: (json['metadata'] as Map?)?.map((k, v) => MapEntry(k, v as String)), + scores: (json['scores'] as List?) + ?.map((e) => (e as num).toInt()) + .toList(), + metadata: (json['metadata'] as Map?)?.map( + (k, v) => MapEntry(k, v as String), + ), nicknames: (json['nicknames'] as List?)?.cast(), ); } @@ -57,29 +63,33 @@ class GetUserResult { blocksDeepEquals(nicknames, other.nicknames); @override - int get hashCode => Object.hash(name, blocksDeepHash(tags), blocksDeepHash(scores), blocksDeepHash(metadata), blocksDeepHash(nicknames)); + int get hashCode => Object.hash( + name, + blocksDeepHash(tags), + blocksDeepHash(scores), + blocksDeepHash(metadata), + blocksDeepHash(nicknames), + ); @override - String toString() => 'GetUserResult(name: $name, tags: $tags, scores: $scores, metadata: $metadata, nicknames: $nicknames)'; + String toString() => + 'GetUserResult(name: $name, tags: $tags, scores: $scores, metadata: $metadata, nicknames: $nicknames)'; } - class ApiUpdateUserInput { final String id; final List? tags; final Map? metadata; - const ApiUpdateUserInput({ - required this.id, - this.tags, - this.metadata, - }); + const ApiUpdateUserInput({required this.id, this.tags, this.metadata}); factory ApiUpdateUserInput.fromJson(Map json) { return ApiUpdateUserInput( id: json['id'] as String, tags: (json['tags'] as List?)?.cast(), - metadata: (json['metadata'] as Map?)?.map((k, v) => MapEntry(k, v as String)), + metadata: (json['metadata'] as Map?)?.map( + (k, v) => MapEntry(k, v as String), + ), ); } @@ -100,37 +110,30 @@ class ApiUpdateUserInput { blocksDeepEquals(metadata, other.metadata); @override - int get hashCode => Object.hash(id, blocksDeepHash(tags), blocksDeepHash(metadata)); + int get hashCode => + Object.hash(id, blocksDeepHash(tags), blocksDeepHash(metadata)); @override - String toString() => 'ApiUpdateUserInput(id: $id, tags: $tags, metadata: $metadata)'; + String toString() => + 'ApiUpdateUserInput(id: $id, tags: $tags, metadata: $metadata)'; } - class UpdateUserResult { final bool ok; - const UpdateUserResult({ - required this.ok, - }); + const UpdateUserResult({required this.ok}); factory UpdateUserResult.fromJson(Map json) { - return UpdateUserResult( - ok: json['ok'] as bool, - ); + return UpdateUserResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is UpdateUserResult && - ok == other.ok; + identical(this, other) || other is UpdateUserResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -139,29 +142,25 @@ class UpdateUserResult { String toString() => 'UpdateUserResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future getUser({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.getUser', params); return GetUserResult.fromJson(result as Map); } - Future updateUser({required ApiUpdateUserInput input}) async { - final params = [ - input.toJson(), - ]; + Future updateUser({ + required ApiUpdateUserInput input, + }) async { + final params = [input.toJson()]; final result = await _client.call('api.updateUser', params); return UpdateUserResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -172,4 +171,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/20-multiple-namespaces/dart/client.dart b/native/codegen-fixtures/20-multiple-namespaces/dart/client.dart index 9e6ef28f56..1874ac3613 100644 --- a/native/codegen-fixtures/20-multiple-namespaces/dart/client.dart +++ b/native/codegen-fixtures/20-multiple-namespaces/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -16,11 +18,7 @@ class User { final String name; final String email; - const User({ - required this.id, - required this.name, - required this.email, - }); + const User({required this.id, required this.name, required this.email}); factory User.fromJson(Map json) { return User( @@ -31,11 +29,7 @@ class User { } Map toJson() { - return { - 'id': id, - 'name': name, - 'email': email, - }; + return {'id': id, 'name': name, 'email': email}; } @override @@ -53,15 +47,11 @@ class User { String toString() => 'User(id: $id, name: $name, email: $email)'; } - class UsersCreateInput { final String name; final String email; - const UsersCreateInput({ - required this.name, - required this.email, - }); + const UsersCreateInput({required this.name, required this.email}); factory UsersCreateInput.fromJson(Map json) { return UsersCreateInput( @@ -71,18 +61,13 @@ class UsersCreateInput { } Map toJson() { - return { - 'name': name, - 'email': email, - }; + return {'name': name, 'email': email}; } @override bool operator ==(Object other) => identical(this, other) || - other is UsersCreateInput && - name == other.name && - email == other.email; + other is UsersCreateInput && name == other.name && email == other.email; @override int get hashCode => Object.hash(name, email); @@ -91,34 +76,30 @@ class UsersCreateInput { String toString() => 'UsersCreateInput(name: $name, email: $email)'; } - class UsersApi { final BlocksClient _client; UsersApi(this._client); Future get$({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('users.get', params); return User.fromJson(result as Map); } Future> list() async { final result = await _client.call('users.list', const []); - return (result as List).map((e) => User.fromJson(e as Map)).toList(); + return (result as List) + .map((e) => User.fromJson(e as Map)) + .toList(); } Future create({required UsersCreateInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('users.create', params); return User.fromJson(result as Map); } } - class PostsListResult { final String id; final String title; @@ -139,11 +120,7 @@ class PostsListResult { } Map toJson() { - return { - 'id': id, - 'title': title, - 'authorId': authorId, - }; + return {'id': id, 'title': title, 'authorId': authorId}; } @override @@ -158,10 +135,10 @@ class PostsListResult { int get hashCode => Object.hash(id, title, authorId); @override - String toString() => 'PostsListResult(id: $id, title: $title, authorId: $authorId)'; + String toString() => + 'PostsListResult(id: $id, title: $title, authorId: $authorId)'; } - class PostsCreateInput { final String title; final String body; @@ -182,11 +159,7 @@ class PostsCreateInput { } Map toJson() { - return { - 'title': title, - 'body': body, - 'authorId': authorId, - }; + return {'title': title, 'body': body, 'authorId': authorId}; } @override @@ -201,34 +174,26 @@ class PostsCreateInput { int get hashCode => Object.hash(title, body, authorId); @override - String toString() => 'PostsCreateInput(title: $title, body: $body, authorId: $authorId)'; + String toString() => + 'PostsCreateInput(title: $title, body: $body, authorId: $authorId)'; } - class PostsDeleteResult { final bool ok; - const PostsDeleteResult({ - required this.ok, - }); + const PostsDeleteResult({required this.ok}); factory PostsDeleteResult.fromJson(Map json) { - return PostsDeleteResult( - ok: json['ok'] as bool, - ); + return PostsDeleteResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is PostsDeleteResult && - ok == other.ok; + identical(this, other) || other is PostsDeleteResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -237,37 +202,31 @@ class PostsDeleteResult { String toString() => 'PostsDeleteResult(ok: $ok)'; } - class PostsApi { final BlocksClient _client; PostsApi(this._client); Future> list({required String authorId}) async { - final params = [ - authorId, - ]; + final params = [authorId]; final result = await _client.call('posts.list', params); - return (result as List).map((e) => PostsListResult.fromJson(e as Map)).toList(); + return (result as List) + .map((e) => PostsListResult.fromJson(e as Map)) + .toList(); } Future create({required PostsCreateInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('posts.create', params); return PostsListResult.fromJson(result as Map); } Future delete({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('posts.delete', params); return PostsDeleteResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -280,4 +239,3 @@ class Blocks { posts = PostsApi(client); } } - diff --git a/native/codegen-fixtures/21-deeply-nested-objects/dart/client.dart b/native/codegen-fixtures/21-deeply-nested-objects/dart/client.dart index 4012ac855c..06f222a375 100644 --- a/native/codegen-fixtures/21-deeply-nested-objects/dart/client.dart +++ b/native/codegen-fixtures/21-deeply-nested-objects/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,34 +6,30 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- class GetOrganizationResultAddressContact { final String email; - const GetOrganizationResultAddressContact({ - required this.email, - }); + const GetOrganizationResultAddressContact({required this.email}); - factory GetOrganizationResultAddressContact.fromJson(Map json) { - return GetOrganizationResultAddressContact( - email: json['email'] as String, - ); + factory GetOrganizationResultAddressContact.fromJson( + Map json, + ) { + return GetOrganizationResultAddressContact(email: json['email'] as String); } Map toJson() { - return { - 'email': email, - }; + return {'email': email}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetOrganizationResultAddressContact && - email == other.email; + other is GetOrganizationResultAddressContact && email == other.email; @override int get hashCode => email.hashCode; @@ -41,7 +38,6 @@ class GetOrganizationResultAddressContact { String toString() => 'GetOrganizationResultAddressContact(email: $email)'; } - class GetOrganizationResultAddress { final String street; final String city; @@ -57,16 +53,14 @@ class GetOrganizationResultAddress { return GetOrganizationResultAddress( street: json['street'] as String, city: json['city'] as String, - contact: GetOrganizationResultAddressContact.fromJson(json['contact'] as Map), + contact: GetOrganizationResultAddressContact.fromJson( + json['contact'] as Map, + ), ); } Map toJson() { - return { - 'street': street, - 'city': city, - 'contact': contact.toJson(), - }; + return {'street': street, 'city': city, 'contact': contact.toJson()}; } @override @@ -81,10 +75,10 @@ class GetOrganizationResultAddress { int get hashCode => Object.hash(street, city, contact); @override - String toString() => 'GetOrganizationResultAddress(street: $street, city: $city, contact: $contact)'; + String toString() => + 'GetOrganizationResultAddress(street: $street, city: $city, contact: $contact)'; } - class GetOrganizationResultOwnerContact { final String email; final String phone; @@ -94,7 +88,9 @@ class GetOrganizationResultOwnerContact { required this.phone, }); - factory GetOrganizationResultOwnerContact.fromJson(Map json) { + factory GetOrganizationResultOwnerContact.fromJson( + Map json, + ) { return GetOrganizationResultOwnerContact( email: json['email'] as String, phone: json['phone'] as String, @@ -102,10 +98,7 @@ class GetOrganizationResultOwnerContact { } Map toJson() { - return { - 'email': email, - 'phone': phone, - }; + return {'email': email, 'phone': phone}; } @override @@ -119,31 +112,27 @@ class GetOrganizationResultOwnerContact { int get hashCode => Object.hash(email, phone); @override - String toString() => 'GetOrganizationResultOwnerContact(email: $email, phone: $phone)'; + String toString() => + 'GetOrganizationResultOwnerContact(email: $email, phone: $phone)'; } - class GetOrganizationResultOwner { final String name; final GetOrganizationResultOwnerContact contact; - const GetOrganizationResultOwner({ - required this.name, - required this.contact, - }); + const GetOrganizationResultOwner({required this.name, required this.contact}); factory GetOrganizationResultOwner.fromJson(Map json) { return GetOrganizationResultOwner( name: json['name'] as String, - contact: GetOrganizationResultOwnerContact.fromJson(json['contact'] as Map), + contact: GetOrganizationResultOwnerContact.fromJson( + json['contact'] as Map, + ), ); } Map toJson() { - return { - 'name': name, - 'contact': contact.toJson(), - }; + return {'name': name, 'contact': contact.toJson()}; } @override @@ -157,10 +146,10 @@ class GetOrganizationResultOwner { int get hashCode => Object.hash(name, contact); @override - String toString() => 'GetOrganizationResultOwner(name: $name, contact: $contact)'; + String toString() => + 'GetOrganizationResultOwner(name: $name, contact: $contact)'; } - class ApiCreateOrganizationInputAddress { final String street; final String city; @@ -172,7 +161,9 @@ class ApiCreateOrganizationInputAddress { required this.countryCode, }); - factory ApiCreateOrganizationInputAddress.fromJson(Map json) { + factory ApiCreateOrganizationInputAddress.fromJson( + Map json, + ) { return ApiCreateOrganizationInputAddress( street: json['street'] as String, city: json['city'] as String, @@ -181,11 +172,7 @@ class ApiCreateOrganizationInputAddress { } Map toJson() { - return { - 'street': street, - 'city': city, - 'countryCode': countryCode, - }; + return {'street': street, 'city': city, 'countryCode': countryCode}; } @override @@ -200,10 +187,10 @@ class ApiCreateOrganizationInputAddress { int get hashCode => Object.hash(street, city, countryCode); @override - String toString() => 'ApiCreateOrganizationInputAddress(street: $street, city: $city, countryCode: $countryCode)'; + String toString() => + 'ApiCreateOrganizationInputAddress(street: $street, city: $city, countryCode: $countryCode)'; } - class ApiCreateOrganizationInputOwner { final String name; final String email; @@ -221,10 +208,7 @@ class ApiCreateOrganizationInputOwner { } Map toJson() { - return { - 'name': name, - 'email': email, - }; + return {'name': name, 'email': email}; } @override @@ -238,10 +222,10 @@ class ApiCreateOrganizationInputOwner { int get hashCode => Object.hash(name, email); @override - String toString() => 'ApiCreateOrganizationInputOwner(name: $name, email: $email)'; + String toString() => + 'ApiCreateOrganizationInputOwner(name: $name, email: $email)'; } - class ApiUpdateOrganizationInputAddress { final String street; final String city; @@ -253,7 +237,9 @@ class ApiUpdateOrganizationInputAddress { required this.zip, }); - factory ApiUpdateOrganizationInputAddress.fromJson(Map json) { + factory ApiUpdateOrganizationInputAddress.fromJson( + Map json, + ) { return ApiUpdateOrganizationInputAddress( street: json['street'] as String, city: json['city'] as String, @@ -262,11 +248,7 @@ class ApiUpdateOrganizationInputAddress { } Map toJson() { - return { - 'street': street, - 'city': city, - 'zip': zip, - }; + return {'street': street, 'city': city, 'zip': zip}; } @override @@ -281,10 +263,10 @@ class ApiUpdateOrganizationInputAddress { int get hashCode => Object.hash(street, city, zip); @override - String toString() => 'ApiUpdateOrganizationInputAddress(street: $street, city: $city, zip: $zip)'; + String toString() => + 'ApiUpdateOrganizationInputAddress(street: $street, city: $city, zip: $zip)'; } - class ApiUpdateOrganizationInputOwner { final String name; final GetOrganizationResultOwnerContact contact; @@ -297,15 +279,14 @@ class ApiUpdateOrganizationInputOwner { factory ApiUpdateOrganizationInputOwner.fromJson(Map json) { return ApiUpdateOrganizationInputOwner( name: json['name'] as String, - contact: GetOrganizationResultOwnerContact.fromJson(json['contact'] as Map), + contact: GetOrganizationResultOwnerContact.fromJson( + json['contact'] as Map, + ), ); } Map toJson() { - return { - 'name': name, - 'contact': contact.toJson(), - }; + return {'name': name, 'contact': contact.toJson()}; } @override @@ -319,10 +300,10 @@ class ApiUpdateOrganizationInputOwner { int get hashCode => Object.hash(name, contact); @override - String toString() => 'ApiUpdateOrganizationInputOwner(name: $name, contact: $contact)'; + String toString() => + 'ApiUpdateOrganizationInputOwner(name: $name, contact: $contact)'; } - // --- API Namespaces --- class GetOrganizationResult { @@ -342,8 +323,12 @@ class GetOrganizationResult { return GetOrganizationResult( id: json['id'] as String, name: json['name'] as String, - address: GetOrganizationResultAddress.fromJson(json['address'] as Map), - owner: GetOrganizationResultOwner.fromJson(json['owner'] as Map), + address: GetOrganizationResultAddress.fromJson( + json['address'] as Map, + ), + owner: GetOrganizationResultOwner.fromJson( + json['owner'] as Map, + ), ); } @@ -369,10 +354,10 @@ class GetOrganizationResult { int get hashCode => Object.hash(id, name, address, owner); @override - String toString() => 'GetOrganizationResult(id: $id, name: $name, address: $address, owner: $owner)'; + String toString() => + 'GetOrganizationResult(id: $id, name: $name, address: $address, owner: $owner)'; } - class ApiCreateOrganizationInput { final String name; final ApiCreateOrganizationInputAddress address; @@ -387,17 +372,17 @@ class ApiCreateOrganizationInput { factory ApiCreateOrganizationInput.fromJson(Map json) { return ApiCreateOrganizationInput( name: json['name'] as String, - address: ApiCreateOrganizationInputAddress.fromJson(json['address'] as Map), - owner: ApiCreateOrganizationInputOwner.fromJson(json['owner'] as Map), + address: ApiCreateOrganizationInputAddress.fromJson( + json['address'] as Map, + ), + owner: ApiCreateOrganizationInputOwner.fromJson( + json['owner'] as Map, + ), ); } Map toJson() { - return { - 'name': name, - 'address': address.toJson(), - 'owner': owner.toJson(), - }; + return {'name': name, 'address': address.toJson(), 'owner': owner.toJson()}; } @override @@ -412,34 +397,27 @@ class ApiCreateOrganizationInput { int get hashCode => Object.hash(name, address, owner); @override - String toString() => 'ApiCreateOrganizationInput(name: $name, address: $address, owner: $owner)'; + String toString() => + 'ApiCreateOrganizationInput(name: $name, address: $address, owner: $owner)'; } - class CreateOrganizationResult { final String id; - const CreateOrganizationResult({ - required this.id, - }); + const CreateOrganizationResult({required this.id}); factory CreateOrganizationResult.fromJson(Map json) { - return CreateOrganizationResult( - id: json['id'] as String, - ); + return CreateOrganizationResult(id: json['id'] as String); } Map toJson() { - return { - 'id': id, - }; + return {'id': id}; } @override bool operator ==(Object other) => identical(this, other) || - other is CreateOrganizationResult && - id == other.id; + other is CreateOrganizationResult && id == other.id; @override int get hashCode => id.hashCode; @@ -448,7 +426,6 @@ class CreateOrganizationResult { String toString() => 'CreateOrganizationResult(id: $id)'; } - class ApiUpdateOrganizationInput { final String id; final String? name; @@ -466,8 +443,16 @@ class ApiUpdateOrganizationInput { return ApiUpdateOrganizationInput( id: json['id'] as String, name: json['name'] as String?, - address: json['address'] != null ? ApiUpdateOrganizationInputAddress.fromJson(json['address'] as Map) : null, - owner: json['owner'] != null ? ApiUpdateOrganizationInputOwner.fromJson(json['owner'] as Map) : null, + address: json['address'] != null + ? ApiUpdateOrganizationInputAddress.fromJson( + json['address'] as Map, + ) + : null, + owner: json['owner'] != null + ? ApiUpdateOrganizationInputOwner.fromJson( + json['owner'] as Map, + ) + : null, ); } @@ -493,34 +478,27 @@ class ApiUpdateOrganizationInput { int get hashCode => Object.hash(id, name, address, owner); @override - String toString() => 'ApiUpdateOrganizationInput(id: $id, name: $name, address: $address, owner: $owner)'; + String toString() => + 'ApiUpdateOrganizationInput(id: $id, name: $name, address: $address, owner: $owner)'; } - class UpdateOrganizationResult { final bool ok; - const UpdateOrganizationResult({ - required this.ok, - }); + const UpdateOrganizationResult({required this.ok}); factory UpdateOrganizationResult.fromJson(Map json) { - return UpdateOrganizationResult( - ok: json['ok'] as bool, - ); + return UpdateOrganizationResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => identical(this, other) || - other is UpdateOrganizationResult && - ok == other.ok; + other is UpdateOrganizationResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -529,37 +507,33 @@ class UpdateOrganizationResult { String toString() => 'UpdateOrganizationResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future getOrganization({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.getOrganization', params); return GetOrganizationResult.fromJson(result as Map); } - Future createOrganization({required ApiCreateOrganizationInput input}) async { - final params = [ - input.toJson(), - ]; + Future createOrganization({ + required ApiCreateOrganizationInput input, + }) async { + final params = [input.toJson()]; final result = await _client.call('api.createOrganization', params); return CreateOrganizationResult.fromJson(result as Map); } - Future updateOrganization({required ApiUpdateOrganizationInput input}) async { - final params = [ - input.toJson(), - ]; + Future updateOrganization({ + required ApiUpdateOrganizationInput input, + }) async { + final params = [input.toJson()]; final result = await _client.call('api.updateOrganization', params); return UpdateOrganizationResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -570,4 +544,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/22-reserved-keywords/dart/client.dart b/native/codegen-fixtures/22-reserved-keywords/dart/client.dart index ea1ab95dfc..d90028aec8 100644 --- a/native/codegen-fixtures/22-reserved-keywords/dart/client.dart +++ b/native/codegen-fixtures/22-reserved-keywords/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -92,13 +94,26 @@ class GetClassResult { super$ == other.super$; @override - int get hashCode => Object.hash(type, class$, default$, in$, is$, return$, var$, val, when, switch$, self, super$); + int get hashCode => Object.hash( + type, + class$, + default$, + in$, + is$, + return$, + var$, + val, + when, + switch$, + self, + super$, + ); @override - String toString() => 'GetClassResult(type: $type, class\$: ${class$}, default\$: ${default$}, in\$: ${in$}, is\$: ${is$}, return\$: ${return$}, var\$: ${var$}, val: $val, when: $when, switch\$: ${switch$}, self: $self, super\$: ${super$})'; + String toString() => + 'GetClassResult(type: $type, class\$: ${class$}, default\$: ${default$}, in\$: ${in$}, is\$: ${is$}, return\$: ${return$}, var\$: ${var$}, val: $val, when: $when, switch\$: ${switch$}, self: $self, super\$: ${super$})'; } - class ApiImportInput { final String for$; final int while$; @@ -160,37 +175,30 @@ class ApiImportInput { abstract$ == other.abstract$; @override - int get hashCode => Object.hash(for$, while$, do$, else$, enum$, extends$, final$, abstract$); + int get hashCode => + Object.hash(for$, while$, do$, else$, enum$, extends$, final$, abstract$); @override - String toString() => 'ApiImportInput(for\$: ${for$}, while\$: ${while$}, do\$: ${do$}, else\$: ${else$}, enum\$: ${enum$}, extends\$: ${extends$}, final\$: ${final$}, abstract\$: ${abstract$})'; + String toString() => + 'ApiImportInput(for\$: ${for$}, while\$: ${while$}, do\$: ${do$}, else\$: ${else$}, enum\$: ${enum$}, extends\$: ${extends$}, final\$: ${final$}, abstract\$: ${abstract$})'; } - class ImportResult { final bool ok; - const ImportResult({ - required this.ok, - }); + const ImportResult({required this.ok}); factory ImportResult.fromJson(Map json) { - return ImportResult( - ok: json['ok'] as bool, - ); + return ImportResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ImportResult && - ok == other.ok; + identical(this, other) || other is ImportResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -199,7 +207,6 @@ class ImportResult { String toString() => 'ImportResult(ok: $ok)'; } - class ExportResult { final String object; final String package; @@ -266,29 +273,35 @@ class ExportResult { null$ == other.null$; @override - int get hashCode => Object.hash(object, package, internal, operator$, this$, throw$, true$, false$, null$); + int get hashCode => Object.hash( + object, + package, + internal, + operator$, + this$, + throw$, + true$, + false$, + null$, + ); @override - String toString() => 'ExportResult(object: $object, package: $package, internal: $internal, operator\$: ${operator$}, this\$: ${this$}, throw\$: ${throw$}, true\$: ${true$}, false\$: ${false$}, null\$: ${null$})'; + String toString() => + 'ExportResult(object: $object, package: $package, internal: $internal, operator\$: ${operator$}, this\$: ${this$}, throw\$: ${throw$}, true\$: ${true$}, false\$: ${false$}, null\$: ${null$})'; } - class Api { final BlocksClient _client; Api(this._client); Future getClass({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.getClass', params); return GetClassResult.fromJson(result as Map); } Future import$({required ApiImportInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('api.import', params); return ImportResult.fromJson(result as Map); } @@ -299,7 +312,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -310,4 +322,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/23-cognito-nested-unions/dart/client.dart b/native/codegen-fixtures/23-cognito-nested-unions/dart/client.dart index ecdfc8edf1..e8a36efd55 100644 --- a/native/codegen-fixtures/23-cognito-nested-unions/dart/client.dart +++ b/native/codegen-fixtures/23-cognito-nested-unions/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,21 +6,21 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- enum CodeDeliveryDetailsDeliveryMedium { SMS, EMAIL, - PHONE_NUMBER -; + PHONE_NUMBER; String toJson() => name; - static CodeDeliveryDetailsDeliveryMedium fromJson(String json) => values.byName(json); + static CodeDeliveryDetailsDeliveryMedium fromJson(String json) => + values.byName(json); } - class CodeDeliveryDetails { final String destination; final CodeDeliveryDetailsDeliveryMedium deliveryMedium; @@ -34,7 +35,9 @@ class CodeDeliveryDetails { factory CodeDeliveryDetails.fromJson(Map json) { return CodeDeliveryDetails( destination: json['destination'] as String, - deliveryMedium: CodeDeliveryDetailsDeliveryMedium.fromJson(json['deliveryMedium'] as String), + deliveryMedium: CodeDeliveryDetailsDeliveryMedium.fromJson( + json['deliveryMedium'] as String, + ), attributeName: json['attributeName'] as String, ); } @@ -59,29 +62,26 @@ class CodeDeliveryDetails { int get hashCode => Object.hash(destination, deliveryMedium, attributeName); @override - String toString() => 'CodeDeliveryDetails(destination: $destination, deliveryMedium: $deliveryMedium, attributeName: $attributeName)'; + String toString() => + 'CodeDeliveryDetails(destination: $destination, deliveryMedium: $deliveryMedium, attributeName: $attributeName)'; } - enum AuthenticatedUserGroups { admins, - users -; + users; String toJson() => name; static AuthenticatedUserGroups fromJson(String json) => values.byName(json); } - enum AuthenticatedUserSignInProvider { - password -; + password; String toJson() => name; - static AuthenticatedUserSignInProvider fromJson(String json) => values.byName(json); + static AuthenticatedUserSignInProvider fromJson(String json) => + values.byName(json); } - class AuthenticatedUser { final String userSub; final List groups; @@ -106,11 +106,23 @@ class AuthenticatedUser { factory AuthenticatedUser.fromJson(Map json) { return AuthenticatedUser( userSub: json['userSub'] as String, - groups: (json['groups'] as List).map((e) => AuthenticatedUserGroups.fromJson(e as String)).toList(), - attributes: (json['attributes'] as Map).map((k, v) => MapEntry(k, v as String?)), - signInProvider: AuthenticatedUserSignInProvider.fromJson(json['signInProvider'] as String), - claims: (json['claims'] as Map?)?.map((k, v) => MapEntry(k, v as dynamic)), - federatedIdentity: json['federatedIdentity'] != null ? FederatedIdentity.fromJson(json['federatedIdentity'] as Map) : null, + groups: (json['groups'] as List) + .map((e) => AuthenticatedUserGroups.fromJson(e as String)) + .toList(), + attributes: (json['attributes'] as Map).map( + (k, v) => MapEntry(k, v as String?), + ), + signInProvider: AuthenticatedUserSignInProvider.fromJson( + json['signInProvider'] as String, + ), + claims: (json['claims'] as Map?)?.map( + (k, v) => MapEntry(k, v as dynamic), + ), + federatedIdentity: json['federatedIdentity'] != null + ? FederatedIdentity.fromJson( + json['federatedIdentity'] as Map, + ) + : null, userId: json['userId'] as String, username: json['username'] as String, ); @@ -123,7 +135,8 @@ class AuthenticatedUser { 'attributes': attributes, 'signInProvider': signInProvider.toJson(), if (claims != null) 'claims': claims, - if (federatedIdentity != null) 'federatedIdentity': federatedIdentity?.toJson(), + if (federatedIdentity != null) + 'federatedIdentity': federatedIdentity?.toJson(), 'userId': userId, 'username': username, }; @@ -143,21 +156,27 @@ class AuthenticatedUser { username == other.username; @override - int get hashCode => Object.hash(userSub, blocksDeepHash(groups), blocksDeepHash(attributes), signInProvider, blocksDeepHash(claims), federatedIdentity, userId, username); + int get hashCode => Object.hash( + userSub, + blocksDeepHash(groups), + blocksDeepHash(attributes), + signInProvider, + blocksDeepHash(claims), + federatedIdentity, + userId, + username, + ); @override - String toString() => 'AuthenticatedUser(userSub: $userSub, groups: $groups, attributes: $attributes, signInProvider: $signInProvider, claims: $claims, federatedIdentity: $federatedIdentity, userId: $userId, username: $username)'; + String toString() => + 'AuthenticatedUser(userSub: $userSub, groups: $groups, attributes: $attributes, signInProvider: $signInProvider, claims: $claims, federatedIdentity: $federatedIdentity, userId: $userId, username: $username)'; } - class FederatedIdentity { final String providerId; final String sub; - const FederatedIdentity({ - required this.providerId, - required this.sub, - }); + const FederatedIdentity({required this.providerId, required this.sub}); factory FederatedIdentity.fromJson(Map json) { return FederatedIdentity( @@ -167,10 +186,7 @@ class FederatedIdentity { } Map toJson() { - return { - 'providerId': providerId, - 'sub': sub, - }; + return {'providerId': providerId, 'sub': sub}; } @override @@ -187,66 +203,111 @@ class FederatedIdentity { String toString() => 'FederatedIdentity(providerId: $providerId, sub: $sub)'; } - enum CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes { SMS, TOTP, - EMAIL -; + EMAIL; String toJson() => name; - static CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes fromJson(String json) => values.byName(json); + static CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes + fromJson(String json) => values.byName(json); } - enum CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes { TOTP, - EMAIL -; + EMAIL; String toJson() => name; - static CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes fromJson(String json) => values.byName(json); + static CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes + fromJson(String json) => values.byName(json); } - enum CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAvailableChallenges { PASSWORD, EMAIL_OTP, SMS_OTP, - WEB_AUTHN -; + WEB_AUTHN; String toJson() => name; - static CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAvailableChallenges fromJson(String json) => values.byName(json); + static CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAvailableChallenges + fromJson(String json) => values.byName(json); } - sealed class ContinueSignInCognitoConfirmSignInResultNextStep { const ContinueSignInCognitoConfirmSignInResultNextStep(); Map toJson(); - static ContinueSignInCognitoConfirmSignInResultNextStep fromJson(Map json) { + static ContinueSignInCognitoConfirmSignInResultNextStep fromJson( + Map json, + ) { switch (json['name'] as String) { - case 'CONFIRM_SIGN_IN_WITH_SMS_CODE': return CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_TOTP_CODE': return CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_EMAIL_CODE': return CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_MFA_SELECTION': return CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTION': return CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_TOTP_SETUP': return CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP': return CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIRED': return CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTION': return CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_PASSWORD': return CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTP': return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTP': return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_WEB_AUTHN': return CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'RESET_PASSWORD': return RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_UP': return CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json); - default: throw ArgumentError('Unknown name: ${json['name']}'); + case 'CONFIRM_SIGN_IN_WITH_SMS_CODE': + return CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_TOTP_CODE': + return CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_EMAIL_CODE': + return CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_MFA_SELECTION': + return CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTION': + return CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_TOTP_SETUP': + return CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP': + return CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIRED': + return CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTION': + return CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_PASSWORD': + return CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTP': + return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTP': + return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_WEB_AUTHN': + return CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'RESET_PASSWORD': + return RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_UP': + return CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json, + ); + default: + throw ArgumentError('Unknown name: ${json['name']}'); } } } -class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -255,10 +316,14 @@ class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextS required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -274,7 +339,8 @@ class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextS @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && codeDeliveryDetails == other.codeDeliveryDetails; @@ -282,17 +348,21 @@ class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextS int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; const CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep({ required this.session, }); - factory CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, ); @@ -300,26 +370,26 @@ class CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNext @override Map toJson() { - return { - 'name': 'CONFIRM_SIGN_IN_WITH_TOTP_CODE', - 'session': session, - }; + return {'name': 'CONFIRM_SIGN_IN_WITH_TOTP_CODE', 'session': session}; } @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep && session == other.session; @override int get hashCode => session.hashCode; @override - String toString() => 'CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep(session: $session)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoConfirmSignInResultNextStep(session: $session)'; } -class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -328,10 +398,14 @@ class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNex required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -347,7 +421,8 @@ class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNex @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && codeDeliveryDetails == other.codeDeliveryDetails; @@ -355,22 +430,36 @@ class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNex int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; - final List allowedMFATypes; + final List< + CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes + > + allowedMFATypes; const CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep({ required this.session, required this.allowedMFATypes, }); - factory CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - allowedMFATypes: (json['allowedMFATypes'] as List).map((e) => CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes.fromJson(e as String)).toList(), + allowedMFATypes: (json['allowedMFATypes'] as List) + .map( + (e) => + CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes.fromJson( + e as String, + ), + ) + .toList(), ); } @@ -386,7 +475,8 @@ class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResul @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && blocksDeepEquals(allowedMFATypes, other.allowedMFATypes); @@ -394,22 +484,36 @@ class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResul int get hashCode => Object.hash(session, blocksDeepHash(allowedMFATypes)); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; } -class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; - final List allowedMFATypes; + final List< + CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes + > + allowedMFATypes; const CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep({ required this.session, required this.allowedMFATypes, }); - factory CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - allowedMFATypes: (json['allowedMFATypes'] as List).map((e) => CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes.fromJson(e as String)).toList(), + allowedMFATypes: (json['allowedMFATypes'] as List) + .map( + (e) => + CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAllowedMFATypes.fromJson( + e as String, + ), + ) + .toList(), ); } @@ -425,7 +529,8 @@ class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignI @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && blocksDeepEquals(allowedMFATypes, other.allowedMFATypes); @@ -433,10 +538,12 @@ class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignI int get hashCode => Object.hash(session, blocksDeepHash(allowedMFATypes)); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; } -class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; final String sharedSecret; @@ -445,7 +552,9 @@ class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNe required this.sharedSecret, }); - factory CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, sharedSecret: json['sharedSecret'] as String, @@ -464,7 +573,8 @@ class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNe @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && sharedSecret == other.sharedSecret; @@ -472,17 +582,21 @@ class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNe int get hashCode => Object.hash(session, sharedSecret); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep(session: $session, sharedSecret: $sharedSecret)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoConfirmSignInResultNextStep(session: $session, sharedSecret: $sharedSecret)'; } -class CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; const CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep({ required this.session, }); - factory CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, ); @@ -490,26 +604,26 @@ class CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultN @override Map toJson() { - return { - 'name': 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP', - 'session': session, - }; + return {'name': 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP', 'session': session}; } @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep && session == other.session; @override int get hashCode => session.hashCode; @override - String toString() => 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep(session: $session)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoConfirmSignInResultNextStep(session: $session)'; } -class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; final List? requiredAttributes; @@ -518,10 +632,13 @@ class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSign this.requiredAttributes, }); - factory CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - requiredAttributes: (json['requiredAttributes'] as List?)?.cast(), + requiredAttributes: (json['requiredAttributes'] as List?) + ?.cast(), ); } @@ -537,7 +654,8 @@ class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSign @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && blocksDeepEquals(requiredAttributes, other.requiredAttributes); @@ -545,22 +663,36 @@ class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSign int get hashCode => Object.hash(session, blocksDeepHash(requiredAttributes)); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep(session: $session, requiredAttributes: $requiredAttributes)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoConfirmSignInResultNextStep(session: $session, requiredAttributes: $requiredAttributes)'; } -class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; - final List availableChallenges; + final List< + CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAvailableChallenges + > + availableChallenges; const CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep({ required this.session, required this.availableChallenges, }); - factory CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - availableChallenges: (json['availableChallenges'] as List).map((e) => CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAvailableChallenges.fromJson(e as String)).toList(), + availableChallenges: (json['availableChallenges'] as List) + .map( + (e) => + CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStepAvailableChallenges.fromJson( + e as String, + ), + ) + .toList(), ); } @@ -569,14 +701,17 @@ class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSi return { 'name': 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTION', 'session': session, - 'availableChallenges': availableChallenges.map((e) => e.toJson()).toList(), + 'availableChallenges': availableChallenges + .map((e) => e.toJson()) + .toList(), }; } @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && blocksDeepEquals(availableChallenges, other.availableChallenges); @@ -584,17 +719,21 @@ class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSi int get hashCode => Object.hash(session, blocksDeepHash(availableChallenges)); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep(session: $session, availableChallenges: $availableChallenges)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoConfirmSignInResultNextStep(session: $session, availableChallenges: $availableChallenges)'; } -class CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; const CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep({ required this.session, }); - factory CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, ); @@ -602,26 +741,26 @@ class CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextS @override Map toJson() { - return { - 'name': 'CONFIRM_SIGN_IN_WITH_PASSWORD', - 'session': session, - }; + return {'name': 'CONFIRM_SIGN_IN_WITH_PASSWORD', 'session': session}; } @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep && session == other.session; @override int get hashCode => session.hashCode; @override - String toString() => 'CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep(session: $session)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep(session: $session)'; } -class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -630,10 +769,14 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSig required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -649,7 +792,8 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSig @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && codeDeliveryDetails == other.codeDeliveryDetails; @@ -657,10 +801,12 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSig int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -669,10 +815,14 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignI required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -688,7 +838,8 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignI @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && codeDeliveryDetails == other.codeDeliveryDetails; @@ -696,10 +847,12 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignI int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoConfirmSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final String session; final String credentialRequestOptions; @@ -708,7 +861,9 @@ class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNext required this.credentialRequestOptions, }); - factory CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep( session: json['session'] as String, credentialRequestOptions: json['credentialRequestOptions'] as String, @@ -727,7 +882,8 @@ class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNext @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep && session == other.session && credentialRequestOptions == other.credentialRequestOptions; @@ -735,23 +891,23 @@ class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNext int get hashCode => Object.hash(session, credentialRequestOptions); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep(session: $session, credentialRequestOptions: $credentialRequestOptions)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoConfirmSignInResultNextStep(session: $session, credentialRequestOptions: $credentialRequestOptions)'; } -class RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { - +class RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { const RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep(); - factory RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { - return RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep( - ); + factory RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { + return RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep(); } @override Map toJson() { - return { - 'name': 'RESET_PASSWORD', - }; + return {'name': 'RESET_PASSWORD'}; } @override @@ -763,19 +919,27 @@ class RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep extends Con int get hashCode => runtimeType.hashCode; @override - String toString() => 'RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep()'; + String toString() => + 'RESET_PASSWORDContinueSignInCognitoConfirmSignInResultNextStep()'; } -class CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep extends ContinueSignInCognitoConfirmSignInResultNextStep { +class CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep + extends ContinueSignInCognitoConfirmSignInResultNextStep { final CodeDeliveryDetails? codeDeliveryDetails; const CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep({ this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep( - codeDeliveryDetails: json['codeDeliveryDetails'] != null ? CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map) : null, + codeDeliveryDetails: json['codeDeliveryDetails'] != null + ? CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ) + : null, ); } @@ -783,7 +947,8 @@ class CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep extends Co Map toJson() { return { 'name': 'CONFIRM_SIGN_UP', - if (codeDeliveryDetails != null) 'codeDeliveryDetails': codeDeliveryDetails?.toJson(), + if (codeDeliveryDetails != null) + 'codeDeliveryDetails': codeDeliveryDetails?.toJson(), }; } @@ -797,70 +962,115 @@ class CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep extends Co int get hashCode => codeDeliveryDetails.hashCode; @override - String toString() => 'CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep(codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_UPContinueSignInCognitoConfirmSignInResultNextStep(codeDeliveryDetails: $codeDeliveryDetails)'; } - - enum CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes { SMS, TOTP, - EMAIL -; + EMAIL; String toJson() => name; - static CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes fromJson(String json) => values.byName(json); + static CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes + fromJson(String json) => values.byName(json); } - enum CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes { TOTP, - EMAIL -; + EMAIL; String toJson() => name; - static CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes fromJson(String json) => values.byName(json); + static CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes + fromJson(String json) => values.byName(json); } - enum CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStepAvailableChallenges { PASSWORD, EMAIL_OTP, SMS_OTP, - WEB_AUTHN -; + WEB_AUTHN; String toJson() => name; - static CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStepAvailableChallenges fromJson(String json) => values.byName(json); + static CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStepAvailableChallenges + fromJson(String json) => values.byName(json); } - sealed class ContinueSignInCognitoSignInResultNextStep { const ContinueSignInCognitoSignInResultNextStep(); Map toJson(); - static ContinueSignInCognitoSignInResultNextStep fromJson(Map json) { + static ContinueSignInCognitoSignInResultNextStep fromJson( + Map json, + ) { switch (json['name'] as String) { - case 'CONFIRM_SIGN_IN_WITH_SMS_CODE': return CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_TOTP_CODE': return CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_EMAIL_CODE': return CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_MFA_SELECTION': return CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTION': return CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_TOTP_SETUP': return CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP': return CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIRED': return CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTION': return CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_PASSWORD': return CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTP': return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTP': return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_IN_WITH_WEB_AUTHN': return CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'RESET_PASSWORD': return RESET_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson(json); - case 'CONFIRM_SIGN_UP': return CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep.fromJson(json); - default: throw ArgumentError('Unknown name: ${json['name']}'); + case 'CONFIRM_SIGN_IN_WITH_SMS_CODE': + return CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_TOTP_CODE': + return CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_EMAIL_CODE': + return CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_MFA_SELECTION': + return CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTION': + return CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_TOTP_SETUP': + return CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP': + return CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIRED': + return CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTION': + return CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_PASSWORD': + return CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTP': + return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTP': + return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_IN_WITH_WEB_AUTHN': + return CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'RESET_PASSWORD': + return RESET_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + case 'CONFIRM_SIGN_UP': + return CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep.fromJson( + json, + ); + default: + throw ArgumentError('Unknown name: ${json['name']}'); } } } -class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -869,10 +1079,14 @@ class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep ext required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -896,17 +1110,21 @@ class CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep ext int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_SMS_CODEContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; const CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep({ required this.session, }); - factory CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, ); @@ -914,26 +1132,26 @@ class CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep ex @override Map toJson() { - return { - 'name': 'CONFIRM_SIGN_IN_WITH_TOTP_CODE', - 'session': session, - }; + return {'name': 'CONFIRM_SIGN_IN_WITH_TOTP_CODE', 'session': session}; } @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep && session == other.session; @override int get hashCode => session.hashCode; @override - String toString() => 'CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep(session: $session)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_TOTP_CODEContinueSignInCognitoSignInResultNextStep(session: $session)'; } -class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -942,10 +1160,14 @@ class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep e required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -961,7 +1183,8 @@ class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep e @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep && session == other.session && codeDeliveryDetails == other.codeDeliveryDetails; @@ -969,22 +1192,36 @@ class CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep e int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_EMAIL_CODEContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; - final List allowedMFATypes; + final List< + CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes + > + allowedMFATypes; const CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep({ required this.session, required this.allowedMFATypes, }); - factory CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - allowedMFATypes: (json['allowedMFATypes'] as List).map((e) => CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes.fromJson(e as String)).toList(), + allowedMFATypes: (json['allowedMFATypes'] as List) + .map( + (e) => + CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes.fromJson( + e as String, + ), + ) + .toList(), ); } @@ -1000,7 +1237,8 @@ class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextSt @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep && session == other.session && blocksDeepEquals(allowedMFATypes, other.allowedMFATypes); @@ -1008,22 +1246,36 @@ class CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextSt int get hashCode => Object.hash(session, blocksDeepHash(allowedMFATypes)); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_MFA_SELECTIONContinueSignInCognitoSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; } -class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; - final List allowedMFATypes; + final List< + CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes + > + allowedMFATypes; const CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep({ required this.session, required this.allowedMFATypes, }); - factory CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - allowedMFATypes: (json['allowedMFATypes'] as List).map((e) => CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes.fromJson(e as String)).toList(), + allowedMFATypes: (json['allowedMFATypes'] as List) + .map( + (e) => + CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStepAllowedMFATypes.fromJson( + e as String, + ), + ) + .toList(), ); } @@ -1039,7 +1291,8 @@ class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResult @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep && session == other.session && blocksDeepEquals(allowedMFATypes, other.allowedMFATypes); @@ -1047,10 +1300,12 @@ class CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResult int get hashCode => Object.hash(session, blocksDeepHash(allowedMFATypes)); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTIONContinueSignInCognitoSignInResultNextStep(session: $session, allowedMFATypes: $allowedMFATypes)'; } -class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; final String sharedSecret; @@ -1059,7 +1314,9 @@ class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep required this.sharedSecret, }); - factory CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, sharedSecret: json['sharedSecret'] as String, @@ -1078,7 +1335,8 @@ class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep && session == other.session && sharedSecret == other.sharedSecret; @@ -1086,17 +1344,21 @@ class CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep int get hashCode => Object.hash(session, sharedSecret); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep(session: $session, sharedSecret: $sharedSecret)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_TOTP_SETUPContinueSignInCognitoSignInResultNextStep(session: $session, sharedSecret: $sharedSecret)'; } -class CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; const CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep({ required this.session, }); - factory CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, ); @@ -1104,26 +1366,26 @@ class CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep @override Map toJson() { - return { - 'name': 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP', - 'session': session, - }; + return {'name': 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP', 'session': session}; } @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep && session == other.session; @override int get hashCode => session.hashCode; @override - String toString() => 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep(session: $session)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUPContinueSignInCognitoSignInResultNextStep(session: $session)'; } -class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; final List? requiredAttributes; @@ -1132,10 +1394,13 @@ class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResul this.requiredAttributes, }); - factory CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - requiredAttributes: (json['requiredAttributes'] as List?)?.cast(), + requiredAttributes: (json['requiredAttributes'] as List?) + ?.cast(), ); } @@ -1151,7 +1416,8 @@ class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResul @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep && session == other.session && blocksDeepEquals(requiredAttributes, other.requiredAttributes); @@ -1159,22 +1425,36 @@ class CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResul int get hashCode => Object.hash(session, blocksDeepHash(requiredAttributes)); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep(session: $session, requiredAttributes: $requiredAttributes)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIREDContinueSignInCognitoSignInResultNextStep(session: $session, requiredAttributes: $requiredAttributes)'; } -class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; - final List availableChallenges; + final List< + CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStepAvailableChallenges + > + availableChallenges; const CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep({ required this.session, required this.availableChallenges, }); - factory CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - availableChallenges: (json['availableChallenges'] as List).map((e) => CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStepAvailableChallenges.fromJson(e as String)).toList(), + availableChallenges: (json['availableChallenges'] as List) + .map( + (e) => + CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStepAvailableChallenges.fromJson( + e as String, + ), + ) + .toList(), ); } @@ -1183,14 +1463,17 @@ class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInRes return { 'name': 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTION', 'session': session, - 'availableChallenges': availableChallenges.map((e) => e.toJson()).toList(), + 'availableChallenges': availableChallenges + .map((e) => e.toJson()) + .toList(), }; } @override bool operator ==(Object other) => identical(this, other) || - other is CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep && + other + is CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep && session == other.session && blocksDeepEquals(availableChallenges, other.availableChallenges); @@ -1198,17 +1481,21 @@ class CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInRes int get hashCode => Object.hash(session, blocksDeepHash(availableChallenges)); @override - String toString() => 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep(session: $session, availableChallenges: $availableChallenges)'; + String toString() => + 'CONTINUE_SIGN_IN_WITH_FIRST_FACTOR_SELECTIONContinueSignInCognitoSignInResultNextStep(session: $session, availableChallenges: $availableChallenges)'; } -class CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; const CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep({ required this.session, }); - factory CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, ); @@ -1216,10 +1503,7 @@ class CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep ext @override Map toJson() { - return { - 'name': 'CONFIRM_SIGN_IN_WITH_PASSWORD', - 'session': session, - }; + return {'name': 'CONFIRM_SIGN_IN_WITH_PASSWORD', 'session': session}; } @override @@ -1232,10 +1516,12 @@ class CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep ext int get hashCode => session.hashCode; @override - String toString() => 'CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep(session: $session)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_PASSWORDContinueSignInCognitoSignInResultNextStep(session: $session)'; } -class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -1244,10 +1530,14 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResu required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -1263,7 +1553,8 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResu @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep && session == other.session && codeDeliveryDetails == other.codeDeliveryDetails; @@ -1271,10 +1562,12 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResu int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_EMAIL_OTPContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; final CodeDeliveryDetails codeDeliveryDetails; @@ -1283,10 +1576,14 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResult required this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, - codeDeliveryDetails: CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map), + codeDeliveryDetails: CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ), ); } @@ -1302,7 +1599,8 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResult @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep && session == other.session && codeDeliveryDetails == other.codeDeliveryDetails; @@ -1310,10 +1608,12 @@ class CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResult int get hashCode => Object.hash(session, codeDeliveryDetails); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_FIRST_FACTOR_SMS_OTPContinueSignInCognitoSignInResultNextStep(session: $session, codeDeliveryDetails: $codeDeliveryDetails)'; } -class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final String session; final String credentialRequestOptions; @@ -1322,7 +1622,9 @@ class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep ex required this.credentialRequestOptions, }); - factory CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep( session: json['session'] as String, credentialRequestOptions: json['credentialRequestOptions'] as String, @@ -1341,7 +1643,8 @@ class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep ex @override bool operator ==(Object other) => identical(this, other) || - other is CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep && + other + is CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep && session == other.session && credentialRequestOptions == other.credentialRequestOptions; @@ -1349,23 +1652,23 @@ class CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep ex int get hashCode => Object.hash(session, credentialRequestOptions); @override - String toString() => 'CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep(session: $session, credentialRequestOptions: $credentialRequestOptions)'; + String toString() => + 'CONFIRM_SIGN_IN_WITH_WEB_AUTHNContinueSignInCognitoSignInResultNextStep(session: $session, credentialRequestOptions: $credentialRequestOptions)'; } -class RESET_PASSWORDContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { - +class RESET_PASSWORDContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { const RESET_PASSWORDContinueSignInCognitoSignInResultNextStep(); - factory RESET_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { - return RESET_PASSWORDContinueSignInCognitoSignInResultNextStep( - ); + factory RESET_PASSWORDContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { + return RESET_PASSWORDContinueSignInCognitoSignInResultNextStep(); } @override Map toJson() { - return { - 'name': 'RESET_PASSWORD', - }; + return {'name': 'RESET_PASSWORD'}; } @override @@ -1377,19 +1680,27 @@ class RESET_PASSWORDContinueSignInCognitoSignInResultNextStep extends ContinueSi int get hashCode => runtimeType.hashCode; @override - String toString() => 'RESET_PASSWORDContinueSignInCognitoSignInResultNextStep()'; + String toString() => + 'RESET_PASSWORDContinueSignInCognitoSignInResultNextStep()'; } -class CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep extends ContinueSignInCognitoSignInResultNextStep { +class CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep + extends ContinueSignInCognitoSignInResultNextStep { final CodeDeliveryDetails? codeDeliveryDetails; const CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep({ this.codeDeliveryDetails, }); - factory CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep.fromJson(Map json) { + factory CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep.fromJson( + Map json, + ) { return CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep( - codeDeliveryDetails: json['codeDeliveryDetails'] != null ? CodeDeliveryDetails.fromJson(json['codeDeliveryDetails'] as Map) : null, + codeDeliveryDetails: json['codeDeliveryDetails'] != null + ? CodeDeliveryDetails.fromJson( + json['codeDeliveryDetails'] as Map, + ) + : null, ); } @@ -1397,7 +1708,8 @@ class CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep extends ContinueS Map toJson() { return { 'name': 'CONFIRM_SIGN_UP', - if (codeDeliveryDetails != null) 'codeDeliveryDetails': codeDeliveryDetails?.toJson(), + if (codeDeliveryDetails != null) + 'codeDeliveryDetails': codeDeliveryDetails?.toJson(), }; } @@ -1411,11 +1723,10 @@ class CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep extends ContinueS int get hashCode => codeDeliveryDetails.hashCode; @override - String toString() => 'CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep(codeDeliveryDetails: $codeDeliveryDetails)'; + String toString() => + 'CONFIRM_SIGN_UPContinueSignInCognitoSignInResultNextStep(codeDeliveryDetails: $codeDeliveryDetails)'; } - - // --- API Namespaces --- sealed class CognitoConfirmSignInResult { @@ -1423,32 +1734,35 @@ sealed class CognitoConfirmSignInResult { Map toJson(); static CognitoConfirmSignInResult fromJson(Map json) { switch (json['status'] as String) { - case 'continueSignIn': return ContinueSignInCognitoConfirmSignInResult.fromJson(json); - case 'signedIn': return SignedInCognitoConfirmSignInResult.fromJson(json); - default: throw ArgumentError('Unknown status: ${json['status']}'); + case 'continueSignIn': + return ContinueSignInCognitoConfirmSignInResult.fromJson(json); + case 'signedIn': + return SignedInCognitoConfirmSignInResult.fromJson(json); + default: + throw ArgumentError('Unknown status: ${json['status']}'); } } } -class ContinueSignInCognitoConfirmSignInResult extends CognitoConfirmSignInResult { +class ContinueSignInCognitoConfirmSignInResult + extends CognitoConfirmSignInResult { final ContinueSignInCognitoConfirmSignInResultNextStep nextStep; - const ContinueSignInCognitoConfirmSignInResult({ - required this.nextStep, - }); + const ContinueSignInCognitoConfirmSignInResult({required this.nextStep}); - factory ContinueSignInCognitoConfirmSignInResult.fromJson(Map json) { + factory ContinueSignInCognitoConfirmSignInResult.fromJson( + Map json, + ) { return ContinueSignInCognitoConfirmSignInResult( - nextStep: ContinueSignInCognitoConfirmSignInResultNextStep.fromJson(json['nextStep'] as Map), + nextStep: ContinueSignInCognitoConfirmSignInResultNextStep.fromJson( + json['nextStep'] as Map, + ), ); } @override Map toJson() { - return { - 'status': 'continueSignIn', - 'nextStep': nextStep.toJson(), - }; + return {'status': 'continueSignIn', 'nextStep': nextStep.toJson()}; } @override @@ -1461,17 +1775,18 @@ class ContinueSignInCognitoConfirmSignInResult extends CognitoConfirmSignInResul int get hashCode => nextStep.hashCode; @override - String toString() => 'ContinueSignInCognitoConfirmSignInResult(nextStep: $nextStep)'; + String toString() => + 'ContinueSignInCognitoConfirmSignInResult(nextStep: $nextStep)'; } class SignedInCognitoConfirmSignInResult extends CognitoConfirmSignInResult { final AuthenticatedUser user; - const SignedInCognitoConfirmSignInResult({ - required this.user, - }); + const SignedInCognitoConfirmSignInResult({required this.user}); - factory SignedInCognitoConfirmSignInResult.fromJson(Map json) { + factory SignedInCognitoConfirmSignInResult.fromJson( + Map json, + ) { return SignedInCognitoConfirmSignInResult( user: AuthenticatedUser.fromJson(json['user'] as Map), ); @@ -1479,17 +1794,13 @@ class SignedInCognitoConfirmSignInResult extends CognitoConfirmSignInResult { @override Map toJson() { - return { - 'status': 'signedIn', - 'user': user.toJson(), - }; + return {'status': 'signedIn', 'user': user.toJson()}; } @override bool operator ==(Object other) => identical(this, other) || - other is SignedInCognitoConfirmSignInResult && - user == other.user; + other is SignedInCognitoConfirmSignInResult && user == other.user; @override int get hashCode => user.hashCode; @@ -1498,16 +1809,17 @@ class SignedInCognitoConfirmSignInResult extends CognitoConfirmSignInResult { String toString() => 'SignedInCognitoConfirmSignInResult(user: $user)'; } - - sealed class CognitoSignInResult { const CognitoSignInResult(); Map toJson(); static CognitoSignInResult fromJson(Map json) { switch (json['status'] as String) { - case 'continueSignIn': return ContinueSignInCognitoSignInResult.fromJson(json); - case 'signedIn': return SignedInCognitoSignInResult.fromJson(json); - default: throw ArgumentError('Unknown status: ${json['status']}'); + case 'continueSignIn': + return ContinueSignInCognitoSignInResult.fromJson(json); + case 'signedIn': + return SignedInCognitoSignInResult.fromJson(json); + default: + throw ArgumentError('Unknown status: ${json['status']}'); } } } @@ -1515,29 +1827,27 @@ sealed class CognitoSignInResult { class ContinueSignInCognitoSignInResult extends CognitoSignInResult { final ContinueSignInCognitoSignInResultNextStep nextStep; - const ContinueSignInCognitoSignInResult({ - required this.nextStep, - }); + const ContinueSignInCognitoSignInResult({required this.nextStep}); - factory ContinueSignInCognitoSignInResult.fromJson(Map json) { + factory ContinueSignInCognitoSignInResult.fromJson( + Map json, + ) { return ContinueSignInCognitoSignInResult( - nextStep: ContinueSignInCognitoSignInResultNextStep.fromJson(json['nextStep'] as Map), + nextStep: ContinueSignInCognitoSignInResultNextStep.fromJson( + json['nextStep'] as Map, + ), ); } @override Map toJson() { - return { - 'status': 'continueSignIn', - 'nextStep': nextStep.toJson(), - }; + return {'status': 'continueSignIn', 'nextStep': nextStep.toJson()}; } @override bool operator ==(Object other) => identical(this, other) || - other is ContinueSignInCognitoSignInResult && - nextStep == other.nextStep; + other is ContinueSignInCognitoSignInResult && nextStep == other.nextStep; @override int get hashCode => nextStep.hashCode; @@ -1549,9 +1859,7 @@ class ContinueSignInCognitoSignInResult extends CognitoSignInResult { class SignedInCognitoSignInResult extends CognitoSignInResult { final AuthenticatedUser user; - const SignedInCognitoSignInResult({ - required this.user, - }); + const SignedInCognitoSignInResult({required this.user}); factory SignedInCognitoSignInResult.fromJson(Map json) { return SignedInCognitoSignInResult( @@ -1561,17 +1869,13 @@ class SignedInCognitoSignInResult extends CognitoSignInResult { @override Map toJson() { - return { - 'status': 'signedIn', - 'user': user.toJson(), - }; + return {'status': 'signedIn', 'user': user.toJson()}; } @override bool operator ==(Object other) => identical(this, other) || - other is SignedInCognitoSignInResult && - user == other.user; + other is SignedInCognitoSignInResult && user == other.user; @override int get hashCode => user.hashCode; @@ -1580,32 +1884,29 @@ class SignedInCognitoSignInResult extends CognitoSignInResult { String toString() => 'SignedInCognitoSignInResult(user: $user)'; } - - class Api { final BlocksClient _client; Api(this._client); - Future cognitoConfirmSignIn({required String session, required String challengeResponse}) async { - final params = [ - session, - challengeResponse, - ]; + Future cognitoConfirmSignIn({ + required String session, + required String challengeResponse, + }) async { + final params = [session, challengeResponse]; final result = await _client.call('api.cognitoConfirmSignIn', params); return CognitoConfirmSignInResult.fromJson(result as Map); } - Future cognitoSignIn({required String username, required String password}) async { - final params = [ - username, - password, - ]; + Future cognitoSignIn({ + required String username, + required String password, + }) async { + final params = [username, password]; final result = await _client.call('api.cognitoSignIn', params); return CognitoSignInResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -1616,4 +1917,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/24-nullable-discriminated-union/dart/client.dart b/native/codegen-fixtures/24-nullable-discriminated-union/dart/client.dart index 0af4438fe2..e00ea986ea 100644 --- a/native/codegen-fixtures/24-nullable-discriminated-union/dart/client.dart +++ b/native/codegen-fixtures/24-nullable-discriminated-union/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -13,10 +15,7 @@ class IsUpdatedFalseNextStep { final String name; final String destination; - const IsUpdatedFalseNextStep({ - required this.name, - required this.destination, - }); + const IsUpdatedFalseNextStep({required this.name, required this.destination}); factory IsUpdatedFalseNextStep.fromJson(Map json) { return IsUpdatedFalseNextStep( @@ -26,10 +25,7 @@ class IsUpdatedFalseNextStep { } Map toJson() { - return { - 'name': name, - 'destination': destination, - }; + return {'name': name, 'destination': destination}; } @override @@ -43,10 +39,10 @@ class IsUpdatedFalseNextStep { int get hashCode => Object.hash(name, destination); @override - String toString() => 'IsUpdatedFalseNextStep(name: $name, destination: $destination)'; + String toString() => + 'IsUpdatedFalseNextStep(name: $name, destination: $destination)'; } - // --- API Namespaces --- sealed class UpdateAttributesResult { @@ -54,32 +50,29 @@ sealed class UpdateAttributesResult { Map toJson(); static UpdateAttributesResult fromJson(Map json) { switch (json['isUpdated'] as bool) { - case true: return IsUpdatedTrue.fromJson(json); - case false: return IsUpdatedFalse.fromJson(json); + case true: + return IsUpdatedTrue.fromJson(json); + case false: + return IsUpdatedFalse.fromJson(json); } } } class IsUpdatedTrue extends UpdateAttributesResult { - const IsUpdatedTrue(); factory IsUpdatedTrue.fromJson(Map json) { - return IsUpdatedTrue( - ); + return IsUpdatedTrue(); } @override Map toJson() { - return { - 'isUpdated': true, - }; + return {'isUpdated': true}; } @override bool operator ==(Object other) => - identical(this, other) || - other is IsUpdatedTrue; + identical(this, other) || other is IsUpdatedTrue; @override int get hashCode => runtimeType.hashCode; @@ -91,29 +84,25 @@ class IsUpdatedTrue extends UpdateAttributesResult { class IsUpdatedFalse extends UpdateAttributesResult { final IsUpdatedFalseNextStep nextStep; - const IsUpdatedFalse({ - required this.nextStep, - }); + const IsUpdatedFalse({required this.nextStep}); factory IsUpdatedFalse.fromJson(Map json) { return IsUpdatedFalse( - nextStep: IsUpdatedFalseNextStep.fromJson(json['nextStep'] as Map), + nextStep: IsUpdatedFalseNextStep.fromJson( + json['nextStep'] as Map, + ), ); } @override Map toJson() { - return { - 'isUpdated': false, - 'nextStep': nextStep.toJson(), - }; + return {'isUpdated': false, 'nextStep': nextStep.toJson()}; } @override bool operator ==(Object other) => identical(this, other) || - other is IsUpdatedFalse && - nextStep == other.nextStep; + other is IsUpdatedFalse && nextStep == other.nextStep; @override int get hashCode => nextStep.hashCode; @@ -122,16 +111,17 @@ class IsUpdatedFalse extends UpdateAttributesResult { String toString() => 'IsUpdatedFalse(nextStep: $nextStep)'; } - - sealed class GetNotificationResult { const GetNotificationResult(); Map toJson(); static GetNotificationResult fromJson(Map json) { switch (json['type'] as String) { - case 'email': return EmailGetNotificationResult.fromJson(json); - case 'sms': return SmsGetNotificationResult.fromJson(json); - default: throw ArgumentError('Unknown type: ${json['type']}'); + case 'email': + return EmailGetNotificationResult.fromJson(json); + case 'sms': + return SmsGetNotificationResult.fromJson(json); + default: + throw ArgumentError('Unknown type: ${json['type']}'); } } } @@ -140,10 +130,7 @@ class EmailGetNotificationResult extends GetNotificationResult { final String subject; final String body; - const EmailGetNotificationResult({ - required this.subject, - required this.body, - }); + const EmailGetNotificationResult({required this.subject, required this.body}); factory EmailGetNotificationResult.fromJson(Map json) { return EmailGetNotificationResult( @@ -154,11 +141,7 @@ class EmailGetNotificationResult extends GetNotificationResult { @override Map toJson() { - return { - 'type': 'email', - 'subject': subject, - 'body': body, - }; + return {'type': 'email', 'subject': subject, 'body': body}; } @override @@ -172,35 +155,28 @@ class EmailGetNotificationResult extends GetNotificationResult { int get hashCode => Object.hash(subject, body); @override - String toString() => 'EmailGetNotificationResult(subject: $subject, body: $body)'; + String toString() => + 'EmailGetNotificationResult(subject: $subject, body: $body)'; } class SmsGetNotificationResult extends GetNotificationResult { final String message; - const SmsGetNotificationResult({ - required this.message, - }); + const SmsGetNotificationResult({required this.message}); factory SmsGetNotificationResult.fromJson(Map json) { - return SmsGetNotificationResult( - message: json['message'] as String, - ); + return SmsGetNotificationResult(message: json['message'] as String); } @override Map toJson() { - return { - 'type': 'sms', - 'message': message, - }; + return {'type': 'sms', 'message': message}; } @override bool operator ==(Object other) => identical(this, other) || - other is SmsGetNotificationResult && - message == other.message; + other is SmsGetNotificationResult && message == other.message; @override int get hashCode => message.hashCode; @@ -209,30 +185,34 @@ class SmsGetNotificationResult extends GetNotificationResult { String toString() => 'SmsGetNotificationResult(message: $message)'; } - - class Api { final BlocksClient _client; Api(this._client); - Future> updateAttributes({required Map attributes}) async { - final params = [ - attributes, - ]; + Future> updateAttributes({ + required Map attributes, + }) async { + final params = [attributes]; final result = await _client.call('api.updateAttributes', params); - return (result as Map).map((k, v) => MapEntry(k, v == null ? null : UpdateAttributesResult.fromJson(v as Map))); + return (result as Map).map( + (k, v) => MapEntry( + k, + v == null + ? null + : UpdateAttributesResult.fromJson(v as Map), + ), + ); } Future getNotification({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.getNotification', params); - return result == null ? null : GetNotificationResult.fromJson(result as Map); + return result == null + ? null + : GetNotificationResult.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -243,4 +223,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/25-nested-transferable-operation-result/dart/client.dart b/native/codegen-fixtures/25-nested-transferable-operation-result/dart/client.dart index 01553d8809..20dd670f99 100644 --- a/native/codegen-fixtures/25-nested-transferable-operation-result/dart/client.dart +++ b/native/codegen-fixtures/25-nested-transferable-operation-result/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,35 +6,30 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; // --- Models --- class GetSessionResultChannelMessage { final String text; - const GetSessionResultChannelMessage({ - required this.text, - }); + const GetSessionResultChannelMessage({required this.text}); factory GetSessionResultChannelMessage.fromJson(Map json) { - return GetSessionResultChannelMessage( - text: json['text'] as String, - ); + return GetSessionResultChannelMessage(text: json['text'] as String); } Map toJson() { - return { - 'text': text, - }; + return {'text': text}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetSessionResultChannelMessage && - text == other.text; + other is GetSessionResultChannelMessage && text == other.text; @override int get hashCode => text.hashCode; @@ -42,31 +38,22 @@ class GetSessionResultChannelMessage { String toString() => 'GetSessionResultChannelMessage(text: $text)'; } - class CountResult { final int count; - const CountResult({ - required this.count, - }); + const CountResult({required this.count}); factory CountResult.fromJson(Map json) { - return CountResult( - count: (json['count'] as num).toInt(), - ); + return CountResult(count: (json['count'] as num).toInt()); } Map toJson() { - return { - 'count': count, - }; + return {'count': count}; } @override bool operator ==(Object other) => - identical(this, other) || - other is CountResult && - count == other.count; + identical(this, other) || other is CountResult && count == other.count; @override int get hashCode => count.hashCode; @@ -75,57 +62,51 @@ class CountResult { String toString() => 'CountResult(count: $count)'; } - class MessageGetSessionResultEventChannelMessage { final String body; - const MessageGetSessionResultEventChannelMessage({ - required this.body, - }); + const MessageGetSessionResultEventChannelMessage({required this.body}); - factory MessageGetSessionResultEventChannelMessage.fromJson(Map json) { + factory MessageGetSessionResultEventChannelMessage.fromJson( + Map json, + ) { return MessageGetSessionResultEventChannelMessage( body: json['body'] as String, ); } Map toJson() { - return { - 'body': body, - }; + return {'body': body}; } @override bool operator ==(Object other) => identical(this, other) || - other is MessageGetSessionResultEventChannelMessage && - body == other.body; + other is MessageGetSessionResultEventChannelMessage && body == other.body; @override int get hashCode => body.hashCode; @override - String toString() => 'MessageGetSessionResultEventChannelMessage(body: $body)'; + String toString() => + 'MessageGetSessionResultEventChannelMessage(body: $body)'; } - class PresenceGetSessionResultEventChannelMessage { final bool online; - const PresenceGetSessionResultEventChannelMessage({ - required this.online, - }); + const PresenceGetSessionResultEventChannelMessage({required this.online}); - factory PresenceGetSessionResultEventChannelMessage.fromJson(Map json) { + factory PresenceGetSessionResultEventChannelMessage.fromJson( + Map json, + ) { return PresenceGetSessionResultEventChannelMessage( online: json['online'] as bool, ); } Map toJson() { - return { - 'online': online, - }; + return {'online': online}; } @override @@ -138,18 +119,21 @@ class PresenceGetSessionResultEventChannelMessage { int get hashCode => online.hashCode; @override - String toString() => 'PresenceGetSessionResultEventChannelMessage(online: $online)'; + String toString() => + 'PresenceGetSessionResultEventChannelMessage(online: $online)'; } - sealed class GetSessionResultEvent { const GetSessionResultEvent(); Map toJson(); static GetSessionResultEvent fromJson(Map json) { switch (json['kind'] as String) { - case 'message': return MessageGetSessionResultEvent.fromJson(json); - case 'presence': return PresenceGetSessionResultEvent.fromJson(json); - default: throw ArgumentError('Unknown kind: ${json['kind']}'); + case 'message': + return MessageGetSessionResultEvent.fromJson(json); + case 'presence': + return PresenceGetSessionResultEvent.fromJson(json); + default: + throw ArgumentError('Unknown kind: ${json['kind']}'); } } } @@ -157,29 +141,26 @@ sealed class GetSessionResultEvent { class MessageGetSessionResultEvent extends GetSessionResultEvent { final RealtimeChannel channel; - const MessageGetSessionResultEvent({ - required this.channel, - }); + const MessageGetSessionResultEvent({required this.channel}); factory MessageGetSessionResultEvent.fromJson(Map json) { return MessageGetSessionResultEvent( - channel: RealtimeChannel.fromJson(json['channel'] as Map, (json) => MessageGetSessionResultEventChannelMessage.fromJson(json)), + channel: RealtimeChannel.fromJson( + json['channel'] as Map, + (json) => MessageGetSessionResultEventChannelMessage.fromJson(json), + ), ); } @override Map toJson() { - return { - 'kind': 'message', - 'channel': channel, - }; + return {'kind': 'message', 'channel': channel}; } @override bool operator ==(Object other) => identical(this, other) || - other is MessageGetSessionResultEvent && - channel == other.channel; + other is MessageGetSessionResultEvent && channel == other.channel; @override int get hashCode => channel.hashCode; @@ -191,29 +172,26 @@ class MessageGetSessionResultEvent extends GetSessionResultEvent { class PresenceGetSessionResultEvent extends GetSessionResultEvent { final RealtimeChannel channel; - const PresenceGetSessionResultEvent({ - required this.channel, - }); + const PresenceGetSessionResultEvent({required this.channel}); factory PresenceGetSessionResultEvent.fromJson(Map json) { return PresenceGetSessionResultEvent( - channel: RealtimeChannel.fromJson(json['channel'] as Map, (json) => PresenceGetSessionResultEventChannelMessage.fromJson(json)), + channel: RealtimeChannel.fromJson( + json['channel'] as Map, + (json) => PresenceGetSessionResultEventChannelMessage.fromJson(json), + ), ); } @override Map toJson() { - return { - 'kind': 'presence', - 'channel': channel, - }; + return {'kind': 'presence', 'channel': channel}; } @override bool operator ==(Object other) => identical(this, other) || - other is PresenceGetSessionResultEvent && - channel == other.channel; + other is PresenceGetSessionResultEvent && channel == other.channel; @override int get hashCode => channel.hashCode; @@ -222,34 +200,30 @@ class PresenceGetSessionResultEvent extends GetSessionResultEvent { String toString() => 'PresenceGetSessionResultEvent(channel: $channel)'; } - - // --- API Namespaces --- class GetSessionResultInner { final RealtimeChannel channel; - const GetSessionResultInner({ - required this.channel, - }); + const GetSessionResultInner({required this.channel}); factory GetSessionResultInner.fromJson(Map json) { return GetSessionResultInner( - channel: RealtimeChannel.fromJson(json['channel'] as Map, (json) => CountResult.fromJson(json)), + channel: RealtimeChannel.fromJson( + json['channel'] as Map, + (json) => CountResult.fromJson(json), + ), ); } Map toJson() { - return { - 'channel': channel, - }; + return {'channel': channel}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetSessionResultInner && - channel == other.channel; + other is GetSessionResultInner && channel == other.channel; @override int get hashCode => channel.hashCode; @@ -258,7 +232,6 @@ class GetSessionResultInner { String toString() => 'GetSessionResultInner(channel: $channel)'; } - class GetSessionResult { final String sessionId; final RealtimeChannel channel; @@ -279,11 +252,24 @@ class GetSessionResult { factory GetSessionResult.fromJson(Map json) { return GetSessionResult( sessionId: json['sessionId'] as String, - channel: RealtimeChannel.fromJson(json['channel'] as Map, (json) => GetSessionResultChannelMessage.fromJson(json)), - inner: GetSessionResultInner.fromJson(json['inner'] as Map), - event: GetSessionResultEvent.fromJson(json['event'] as Map), - stringValues: RealtimeChannel.fromJsonValue(json['stringValues'] as Map, (payload) => (payload as List).cast()), - integerValues: RealtimeChannel.fromJsonValue(json['integerValues'] as Map, (payload) => (payload as List).cast()), + channel: RealtimeChannel.fromJson( + json['channel'] as Map, + (json) => GetSessionResultChannelMessage.fromJson(json), + ), + inner: GetSessionResultInner.fromJson( + json['inner'] as Map, + ), + event: GetSessionResultEvent.fromJson( + json['event'] as Map, + ), + stringValues: RealtimeChannel.fromJsonValue( + json['stringValues'] as Map, + (payload) => (payload as List).cast(), + ), + integerValues: RealtimeChannel.fromJsonValue( + json['integerValues'] as Map, + (payload) => (payload as List).cast(), + ), ); } @@ -310,13 +296,20 @@ class GetSessionResult { integerValues == other.integerValues; @override - int get hashCode => Object.hash(sessionId, channel, inner, event, stringValues, integerValues); + int get hashCode => Object.hash( + sessionId, + channel, + inner, + event, + stringValues, + integerValues, + ); @override - String toString() => 'GetSessionResult(sessionId: $sessionId, channel: $channel, inner: $inner, event: $event, stringValues: $stringValues, integerValues: $integerValues)'; + String toString() => + 'GetSessionResult(sessionId: $sessionId, channel: $channel, inner: $inner, event: $event, stringValues: $stringValues, integerValues: $integerValues)'; } - class Api { final BlocksClient _client; Api(this._client); @@ -332,7 +325,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -343,4 +335,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/26-unknown-transferable/dart/client.dart b/native/codegen-fixtures/26-unknown-transferable/dart/client.dart index b2c41edb48..0c2067380f 100644 --- a/native/codegen-fixtures/26-unknown-transferable/dart/client.dart +++ b/native/codegen-fixtures/26-unknown-transferable/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,8 +6,10 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; export 'package:blocks_runtime/blocks_runtime.dart' show UnknownTransferable; // --- Models --- @@ -28,10 +31,7 @@ class ConnectDeviceResultMessage { } Map toJson() { - return { - 'temperature': temperature, - 'humidity': humidity, - }; + return {'temperature': temperature, 'humidity': humidity}; } @override @@ -45,34 +45,37 @@ class ConnectDeviceResultMessage { int get hashCode => Object.hash(temperature, humidity); @override - String toString() => 'ConnectDeviceResultMessage(temperature: $temperature, humidity: $humidity)'; + String toString() => + 'ConnectDeviceResultMessage(temperature: $temperature, humidity: $humidity)'; } - // --- API Namespaces --- class Api { final BlocksClient _client; Api(this._client); - Future getDeviceHandle({required String deviceId}) async { - final params = [ - deviceId, - ]; + Future getDeviceHandle({ + required String deviceId, + }) async { + final params = [deviceId]; final result = await _client.call('api.getDeviceHandle', params); - return UnknownTransferable.fromJson(result, expectedTag: 'example-iot/device-handle'); + return UnknownTransferable.fromJson( + result, + expectedTag: 'example-iot/device-handle', + ); } Future connectDevice({required String deviceId}) async { - final params = [ - deviceId, - ]; + final params = [deviceId]; final result = await _client.call('api.connectDevice', params); - return UnknownTransferable.fromJson(result, expectedTag: 'example-iot/device-link'); + return UnknownTransferable.fromJson( + result, + expectedTag: 'example-iot/device-link', + ); } } - // --- Blocks Client --- class Blocks { @@ -83,4 +86,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/27-declared-transferable-bindings/dart/client.dart b/native/codegen-fixtures/27-declared-transferable-bindings/dart/client.dart index 3a0fc25770..af234b22b1 100644 --- a/native/codegen-fixtures/27-declared-transferable-bindings/dart/client.dart +++ b/native/codegen-fixtures/27-declared-transferable-bindings/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,10 +6,14 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -import 'package:example_iot_native/example_iot_native.dart' show APILink, DeviceHandle; -import 'package:example_sensor_native/example_sensor_native.dart' show SensorStream; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +import 'package:example_iot_native/example_iot_native.dart' + show APILink, DeviceHandle; +import 'package:example_sensor_native/example_sensor_native.dart' + show SensorStream; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; export 'package:blocks_runtime/blocks_runtime.dart' show UnknownTransferable; // --- Models --- @@ -16,29 +21,22 @@ export 'package:blocks_runtime/blocks_runtime.dart' show UnknownTransferable; class DeviceLabel { final String name; - DeviceLabel({ - required this.name, - }) { - if (!(name.length >= 1)) throw ArgumentError('name must be at least 1 characters'); + DeviceLabel({required this.name}) { + if (!(name.length >= 1)) + throw ArgumentError('name must be at least 1 characters'); } factory DeviceLabel.fromJson(Map json) { - return DeviceLabel( - name: json['name'] as String, - ); + return DeviceLabel(name: json['name'] as String); } Map toJson() { - return { - 'name': name, - }; + return {'name': name}; } @override bool operator ==(Object other) => - identical(this, other) || - other is DeviceLabel && - name == other.name; + identical(this, other) || other is DeviceLabel && name == other.name; @override int get hashCode => name.hashCode; @@ -47,7 +45,6 @@ class DeviceLabel { String toString() => 'DeviceLabel(name: $name)'; } - class ConnectDeviceResultMessage { final num temperature; final num humidity; @@ -65,10 +62,7 @@ class ConnectDeviceResultMessage { } Map toJson() { - return { - 'temperature': temperature, - 'humidity': humidity, - }; + return {'temperature': temperature, 'humidity': humidity}; } @override @@ -82,10 +76,10 @@ class ConnectDeviceResultMessage { int get hashCode => Object.hash(temperature, humidity); @override - String toString() => 'ConnectDeviceResultMessage(temperature: $temperature, humidity: $humidity)'; + String toString() => + 'ConnectDeviceResultMessage(temperature: $temperature, humidity: $humidity)'; } - // --- API Namespaces --- class Api { @@ -93,55 +87,75 @@ class Api { Api(this._client); Future getDeviceHandle({required String deviceId}) async { - final params = [ - deviceId, - ]; + final params = [deviceId]; final result = await _client.call('api.getDeviceHandle', params); - return DeviceHandle.fromBlocksDescriptor(validateTransferableDescriptor(result, expectedTag: 'example-iot/device-handle')); + return DeviceHandle.fromBlocksDescriptor( + validateTransferableDescriptor( + result, + expectedTag: 'example-iot/device-handle', + ), + ); } - Future> connectDevice({required String deviceId}) async { - final params = [ - deviceId, - ]; + Future> connectDevice({ + required String deviceId, + }) async { + final params = [deviceId]; final result = await _client.call('api.connectDevice', params); - return APILink.fromBlocksDescriptor(validateTransferableDescriptor(result, expectedTag: 'example-iot/device-link'), (json) => ConnectDeviceResultMessage.fromJson(json)); + return APILink.fromBlocksDescriptor( + validateTransferableDescriptor( + result, + expectedTag: 'example-iot/device-link', + ), + (json) => ConnectDeviceResultMessage.fromJson(json), + ); } Future findDeviceHandle({required String serialNumber}) async { - final params = [ - serialNumber, - ]; + final params = [serialNumber]; final result = await _client.call('api.findDeviceHandle', params); - return DeviceHandle.fromBlocksDescriptor(validateTransferableDescriptor(result, expectedTag: 'example-iot/device-handle')); + return DeviceHandle.fromBlocksDescriptor( + validateTransferableDescriptor( + result, + expectedTag: 'example-iot/device-handle', + ), + ); } Future openSensorStream({required String sensorId}) async { - final params = [ - sensorId, - ]; + final params = [sensorId]; final result = await _client.call('api.openSensorStream', params); - return SensorStream.fromBlocksDescriptor(validateTransferableDescriptor(result, expectedTag: 'example-sensor/stream')); + return SensorStream.fromBlocksDescriptor( + validateTransferableDescriptor( + result, + expectedTag: 'example-sensor/stream', + ), + ); } - Future openGatewayLink({required String gatewayId}) async { - final params = [ - gatewayId, - ]; + Future openGatewayLink({ + required String gatewayId, + }) async { + final params = [gatewayId]; final result = await _client.call('api.openGatewayLink', params); - return UnknownTransferable.fromJson(result, expectedTag: 'example-gateway/link'); + return UnknownTransferable.fromJson( + result, + expectedTag: 'example-gateway/link', + ); } - Future getFirmwareSession({required String deviceId}) async { - final params = [ - deviceId, - ]; + Future getFirmwareSession({ + required String deviceId, + }) async { + final params = [deviceId]; final result = await _client.call('api.getFirmwareSession', params); - return UnknownTransferable.fromJson(result, expectedTag: 'example-iot/firmware-session'); + return UnknownTransferable.fromJson( + result, + expectedTag: 'example-iot/firmware-session', + ); } } - // --- Blocks Client --- class Blocks { @@ -152,4 +166,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/28-escaping/dart/client.dart b/native/codegen-fixtures/28-escaping/dart/client.dart index 7852809553..2e013abfb0 100644 --- a/native/codegen-fixtures/28-escaping/dart/client.dart +++ b/native/codegen-fixtures/28-escaping/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -14,8 +16,7 @@ enum WidgetKind { a$b, x$$y, b$c, - d_$e -; + d_$e; static const _jsonMap = { 'cost\$': cost$, @@ -35,7 +36,6 @@ enum WidgetKind { static WidgetKind fromJson(String json) => _jsonMap[json]!; } - // --- API Namespaces --- class Widget { @@ -60,7 +60,8 @@ class Widget { this.scale, this.flag, }) { - if (!(RegExp('^a\'b"c\\\$d[\${x}]+\$').hasMatch(code))) throw ArgumentError('code must match pattern'); + if (!(RegExp('^a\'b"c\\\$d[\${x}]+\$').hasMatch(code))) + throw ArgumentError('code must match pattern'); } factory Widget.fromJson(Map json) { @@ -106,21 +107,25 @@ class Widget { flag == other.flag; @override - int get hashCode => Object.hash(id, code, kind, note$, count, limit, ratio, scale, flag); + int get hashCode => + Object.hash(id, code, kind, note$, count, limit, ratio, scale, flag); @override - String toString() => 'Widget(id: $id, code: $code, kind: $kind, note\$: ${note$}, count: $count, limit: $limit, ratio: $ratio, scale: $scale, flag: $flag)'; + String toString() => + 'Widget(id: $id, code: $code, kind: $kind, note\$: ${note$}, count: $count, limit: $limit, ratio: $ratio, scale: $scale, flag: $flag)'; } - sealed class ApiDoActionInput { const ApiDoActionInput(); Map toJson(); static ApiDoActionInput fromJson(Map json) { switch (json['action'] as String) { - case 'create\$': return Create$Input.fromJson(json); - case 're\$move': return Re$moveInput.fromJson(json); - default: throw ArgumentError('Unknown action: ${json['action']}'); + case 'create\$': + return Create$Input.fromJson(json); + case 're\$move': + return Re$moveInput.fromJson(json); + default: + throw ArgumentError('Unknown action: ${json['action']}'); } } } @@ -128,29 +133,20 @@ sealed class ApiDoActionInput { class Create$Input extends ApiDoActionInput { final String title; - const Create$Input({ - required this.title, - }); + const Create$Input({required this.title}); factory Create$Input.fromJson(Map json) { - return Create$Input( - title: json['title'] as String, - ); + return Create$Input(title: json['title'] as String); } @override Map toJson() { - return { - 'action': 'create\$', - 'title': title, - }; + return {'action': 'create\$', 'title': title}; } @override bool operator ==(Object other) => - identical(this, other) || - other is Create$Input && - title == other.title; + identical(this, other) || other is Create$Input && title == other.title; @override int get hashCode => title.hashCode; @@ -162,29 +158,20 @@ class Create$Input extends ApiDoActionInput { class Re$moveInput extends ApiDoActionInput { final String id; - const Re$moveInput({ - required this.id, - }); + const Re$moveInput({required this.id}); factory Re$moveInput.fromJson(Map json) { - return Re$moveInput( - id: json['id'] as String, - ); + return Re$moveInput(id: json['id'] as String); } @override Map toJson() { - return { - 'action': 're\$move', - 'id': id, - }; + return {'action': 're\$move', 'id': id}; } @override bool operator ==(Object other) => - identical(this, other) || - other is Re$moveInput && - id == other.id; + identical(this, other) || other is Re$moveInput && id == other.id; @override int get hashCode => id.hashCode; @@ -193,32 +180,22 @@ class Re$moveInput extends ApiDoActionInput { String toString() => 'Re\$moveInput(id: $id)'; } - - class DoActionResult { final bool ok; - const DoActionResult({ - required this.ok, - }); + const DoActionResult({required this.ok}); factory DoActionResult.fromJson(Map json) { - return DoActionResult( - ok: json['ok'] as bool, - ); + return DoActionResult(ok: json['ok'] as bool); } Map toJson() { - return { - 'ok': ok, - }; + return {'ok': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is DoActionResult && - ok == other.ok; + identical(this, other) || other is DoActionResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -227,44 +204,39 @@ class DoActionResult { String toString() => 'DoActionResult(ok: $ok)'; } - class Api { final BlocksClient _client; Api(this._client); Future get$x({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.get\$x', params); return Widget.fromJson(result as Map); } Future doAction({required ApiDoActionInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('api.doAction', params); return DoActionResult.fromJson(result as Map); } } - // --- Servers --- class Servers { static const String primary = 'https://example.com/a\'b\$c\${x}"d\\e'; } - // --- Blocks Client --- class Blocks { late final Api api; Blocks({String? baseUrl, SessionStore? sessionStore}) { - final client = BlocksClient(baseUrl: baseUrl ?? Servers.primary, sessionStore: sessionStore); + final client = BlocksClient( + baseUrl: baseUrl ?? Servers.primary, + sessionStore: sessionStore, + ); api = Api(client); } } - diff --git a/native/codegen-fixtures/29-unknown-values/dart/client.dart b/native/codegen-fixtures/29-unknown-values/dart/client.dart index ba1be2a551..56e81ad4d1 100644 --- a/native/codegen-fixtures/29-unknown-values/dart/client.dart +++ b/native/codegen-fixtures/29-unknown-values/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -35,10 +37,16 @@ class Entry { payload: json['payload'] as dynamic, optionalPayload: json['optionalPayload'] as dynamic, nullablePayload: json['nullablePayload'] as dynamic, - metadata: (json['metadata'] as Map).map((k, v) => MapEntry(k, v as dynamic)), + metadata: (json['metadata'] as Map).map( + (k, v) => MapEntry(k, v as dynamic), + ), tags: (json['tags'] as List).cast(), - sparse: (json['sparse'] as Map).map((k, v) => MapEntry(k, v as dynamic)), - claims: (json['claims'] as Map?)?.map((k, v) => MapEntry(k, v as dynamic)), + sparse: (json['sparse'] as Map).map( + (k, v) => MapEntry(k, v as dynamic), + ), + claims: (json['claims'] as Map?)?.map( + (k, v) => MapEntry(k, v as dynamic), + ), ); } @@ -67,34 +75,45 @@ class Entry { blocksDeepEquals(claims, other.claims); @override - int get hashCode => Object.hash(blocksDeepHash(payload), blocksDeepHash(optionalPayload), blocksDeepHash(nullablePayload), blocksDeepHash(metadata), blocksDeepHash(tags), blocksDeepHash(sparse), blocksDeepHash(claims)); + int get hashCode => Object.hash( + blocksDeepHash(payload), + blocksDeepHash(optionalPayload), + blocksDeepHash(nullablePayload), + blocksDeepHash(metadata), + blocksDeepHash(tags), + blocksDeepHash(sparse), + blocksDeepHash(claims), + ); @override - String toString() => 'Entry(payload: $payload, optionalPayload: $optionalPayload, nullablePayload: $nullablePayload, metadata: $metadata, tags: $tags, sparse: $sparse, claims: $claims)'; + String toString() => + 'Entry(payload: $payload, optionalPayload: $optionalPayload, nullablePayload: $nullablePayload, metadata: $metadata, tags: $tags, sparse: $sparse, claims: $claims)'; } - class Api { final BlocksClient _client; Api(this._client); Future echo({required dynamic payload}) async { - final params = [ - payload, - ]; + final params = [payload]; final result = await _client.call('api.echo', params); return result as dynamic; } Future store({required Entry entry}) async { - final params = [ - entry.toJson(), - ]; + final params = [entry.toJson()]; final result = await _client.call('api.store', params); return Entry.fromJson(result as Map); } - Future> collect({required List items, required Map metadata, required dynamic maybe, required List holes, required Map sparse, dynamic extra}) async { + Future> collect({ + required List items, + required Map metadata, + required dynamic maybe, + required List holes, + required Map sparse, + dynamic extra, + }) async { final params = [ items, metadata, @@ -108,7 +127,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -119,4 +137,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/30-inline-object-properties/dart/client.dart b/native/codegen-fixtures/30-inline-object-properties/dart/client.dart index 9c5f537a18..876e773d0e 100644 --- a/native/codegen-fixtures/30-inline-object-properties/dart/client.dart +++ b/native/codegen-fixtures/30-inline-object-properties/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,20 +6,20 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- enum ShipmentDestinationGeoAccuracySource { gps, - cell -; + cell; String toJson() => name; - static ShipmentDestinationGeoAccuracySource fromJson(String json) => values.byName(json); + static ShipmentDestinationGeoAccuracySource fromJson(String json) => + values.byName(json); } - class ShipmentDestinationGeoAccuracy { final num meters; final ShipmentDestinationGeoAccuracySource source; @@ -31,15 +32,14 @@ class ShipmentDestinationGeoAccuracy { factory ShipmentDestinationGeoAccuracy.fromJson(Map json) { return ShipmentDestinationGeoAccuracy( meters: json['meters'] as num, - source: ShipmentDestinationGeoAccuracySource.fromJson(json['source'] as String), + source: ShipmentDestinationGeoAccuracySource.fromJson( + json['source'] as String, + ), ); } Map toJson() { - return { - 'meters': meters, - 'source': source.toJson(), - }; + return {'meters': meters, 'source': source.toJson()}; } @override @@ -53,10 +53,10 @@ class ShipmentDestinationGeoAccuracy { int get hashCode => Object.hash(meters, source); @override - String toString() => 'ShipmentDestinationGeoAccuracy(meters: $meters, source: $source)'; + String toString() => + 'ShipmentDestinationGeoAccuracy(meters: $meters, source: $source)'; } - class ShipmentDestinationGeo { final num lat; final num lng; @@ -72,7 +72,11 @@ class ShipmentDestinationGeo { return ShipmentDestinationGeo( lat: json['lat'] as num, lng: json['lng'] as num, - accuracy: json['accuracy'] != null ? ShipmentDestinationGeoAccuracy.fromJson(json['accuracy'] as Map) : null, + accuracy: json['accuracy'] != null + ? ShipmentDestinationGeoAccuracy.fromJson( + json['accuracy'] as Map, + ) + : null, ); } @@ -96,18 +100,15 @@ class ShipmentDestinationGeo { int get hashCode => Object.hash(lat, lng, accuracy); @override - String toString() => 'ShipmentDestinationGeo(lat: $lat, lng: $lng, accuracy: $accuracy)'; + String toString() => + 'ShipmentDestinationGeo(lat: $lat, lng: $lng, accuracy: $accuracy)'; } - class ShipmentDestination { final String city; final ShipmentDestinationGeo geo; - const ShipmentDestination({ - required this.city, - required this.geo, - }); + const ShipmentDestination({required this.city, required this.geo}); factory ShipmentDestination.fromJson(Map json) { return ShipmentDestination( @@ -117,18 +118,13 @@ class ShipmentDestination { } Map toJson() { - return { - 'city': city, - 'geo': geo.toJson(), - }; + return {'city': city, 'geo': geo.toJson()}; } @override bool operator ==(Object other) => identical(this, other) || - other is ShipmentDestination && - city == other.city && - geo == other.geo; + other is ShipmentDestination && city == other.city && geo == other.geo; @override int get hashCode => Object.hash(city, geo); @@ -137,15 +133,11 @@ class ShipmentDestination { String toString() => 'ShipmentDestination(city: $city, geo: $geo)'; } - class ShipmentInsurance { final String provider; final num? amount; - const ShipmentInsurance({ - required this.provider, - this.amount, - }); + const ShipmentInsurance({required this.provider, this.amount}); factory ShipmentInsurance.fromJson(Map json) { return ShipmentInsurance( @@ -155,10 +147,7 @@ class ShipmentInsurance { } Map toJson() { - return { - 'provider': provider, - if (amount != null) 'amount': amount, - }; + return {'provider': provider, if (amount != null) 'amount': amount}; } @override @@ -172,18 +161,15 @@ class ShipmentInsurance { int get hashCode => Object.hash(provider, amount); @override - String toString() => 'ShipmentInsurance(provider: $provider, amount: $amount)'; + String toString() => + 'ShipmentInsurance(provider: $provider, amount: $amount)'; } - class ShipmentSignature { final String signedBy; final String signedAt; - const ShipmentSignature({ - required this.signedBy, - required this.signedAt, - }); + const ShipmentSignature({required this.signedBy, required this.signedAt}); factory ShipmentSignature.fromJson(Map json) { return ShipmentSignature( @@ -193,10 +179,7 @@ class ShipmentSignature { } Map toJson() { - return { - 'signedBy': signedBy, - 'signedAt': signedAt, - }; + return {'signedBy': signedBy, 'signedAt': signedAt}; } @override @@ -210,18 +193,15 @@ class ShipmentSignature { int get hashCode => Object.hash(signedBy, signedAt); @override - String toString() => 'ShipmentSignature(signedBy: $signedBy, signedAt: $signedAt)'; + String toString() => + 'ShipmentSignature(signedBy: $signedBy, signedAt: $signedAt)'; } - class ShipmentParcels { final String sku; final num weightKg; - const ShipmentParcels({ - required this.sku, - required this.weightKg, - }); + const ShipmentParcels({required this.sku, required this.weightKg}); factory ShipmentParcels.fromJson(Map json) { return ShipmentParcels( @@ -231,10 +211,7 @@ class ShipmentParcels { } Map toJson() { - return { - 'sku': sku, - 'weightKg': weightKg, - }; + return {'sku': sku, 'weightKg': weightKg}; } @override @@ -251,15 +228,11 @@ class ShipmentParcels { String toString() => 'ShipmentParcels(sku: $sku, weightKg: $weightKg)'; } - class ShipmentCustoms { final String code; final num value; - const ShipmentCustoms({ - required this.code, - required this.value, - }); + const ShipmentCustoms({required this.code, required this.value}); factory ShipmentCustoms.fromJson(Map json) { return ShipmentCustoms( @@ -269,18 +242,13 @@ class ShipmentCustoms { } Map toJson() { - return { - 'code': code, - 'value': value, - }; + return {'code': code, 'value': value}; } @override bool operator ==(Object other) => identical(this, other) || - other is ShipmentCustoms && - code == other.code && - value == other.value; + other is ShipmentCustoms && code == other.code && value == other.value; @override int get hashCode => Object.hash(code, value); @@ -289,31 +257,22 @@ class ShipmentCustoms { String toString() => 'ShipmentCustoms(code: $code, value: $value)'; } - class ValueResult { final int value; - const ValueResult({ - required this.value, - }); + const ValueResult({required this.value}); factory ValueResult.fromJson(Map json) { - return ValueResult( - value: (json['value'] as num).toInt(), - ); + return ValueResult(value: (json['value'] as num).toInt()); } Map toJson() { - return { - 'value': value, - }; + return {'value': value}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ValueResult && - value == other.value; + identical(this, other) || other is ValueResult && value == other.value; @override int get hashCode => value.hashCode; @@ -322,31 +281,22 @@ class ValueResult { String toString() => 'ValueResult(value: $value)'; } - class ReceiptMeta { final String value; - const ReceiptMeta({ - required this.value, - }); + const ReceiptMeta({required this.value}); factory ReceiptMeta.fromJson(Map json) { - return ReceiptMeta( - value: json['value'] as String, - ); + return ReceiptMeta(value: json['value'] as String); } Map toJson() { - return { - 'value': value, - }; + return {'value': value}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ReceiptMeta && - value == other.value; + identical(this, other) || other is ReceiptMeta && value == other.value; @override int get hashCode => value.hashCode; @@ -355,7 +305,6 @@ class ReceiptMeta { String toString() => 'ReceiptMeta(value: $value)'; } - // --- API Namespaces --- class Shipment { @@ -378,11 +327,26 @@ class Shipment { factory Shipment.fromJson(Map json) { return Shipment( id: json['id'] as String, - destination: ShipmentDestination.fromJson(json['destination'] as Map), - insurance: json['insurance'] != null ? ShipmentInsurance.fromJson(json['insurance'] as Map) : null, - signature: json['signature'] != null ? ShipmentSignature.fromJson(json['signature'] as Map) : null, - parcels: (json['parcels'] as List).map((e) => ShipmentParcels.fromJson(e as Map)).toList(), - customs: (json['customs'] as Map?)?.map((k, v) => MapEntry(k, ShipmentCustoms.fromJson(v as Map))), + destination: ShipmentDestination.fromJson( + json['destination'] as Map, + ), + insurance: json['insurance'] != null + ? ShipmentInsurance.fromJson( + json['insurance'] as Map, + ) + : null, + signature: json['signature'] != null + ? ShipmentSignature.fromJson( + json['signature'] as Map, + ) + : null, + parcels: (json['parcels'] as List) + .map((e) => ShipmentParcels.fromJson(e as Map)) + .toList(), + customs: (json['customs'] as Map?)?.map( + (k, v) => + MapEntry(k, ShipmentCustoms.fromJson(v as Map)), + ), ); } @@ -393,7 +357,8 @@ class Shipment { if (insurance != null) 'insurance': insurance?.toJson(), 'signature': signature?.toJson(), 'parcels': parcels.map((e) => e.toJson()).toList(), - if (customs != null) 'customs': customs?.map((k, v) => MapEntry(k, v.toJson())), + if (customs != null) + 'customs': customs?.map((k, v) => MapEntry(k, v.toJson())), }; } @@ -409,21 +374,25 @@ class Shipment { blocksDeepEquals(customs, other.customs); @override - int get hashCode => Object.hash(id, destination, insurance, signature, blocksDeepHash(parcels), blocksDeepHash(customs)); + int get hashCode => Object.hash( + id, + destination, + insurance, + signature, + blocksDeepHash(parcels), + blocksDeepHash(customs), + ); @override - String toString() => 'Shipment(id: $id, destination: $destination, insurance: $insurance, signature: $signature, parcels: $parcels, customs: $customs)'; + String toString() => + 'Shipment(id: $id, destination: $destination, insurance: $insurance, signature: $signature, parcels: $parcels, customs: $customs)'; } - class Invoice { final String id; final ValueResult meta; - const Invoice({ - required this.id, - required this.meta, - }); + const Invoice({required this.id, required this.meta}); factory Invoice.fromJson(Map json) { return Invoice( @@ -433,18 +402,13 @@ class Invoice { } Map toJson() { - return { - 'id': id, - 'meta': meta.toJson(), - }; + return {'id': id, 'meta': meta.toJson()}; } @override bool operator ==(Object other) => identical(this, other) || - other is Invoice && - id == other.id && - meta == other.meta; + other is Invoice && id == other.id && meta == other.meta; @override int get hashCode => Object.hash(id, meta); @@ -453,15 +417,11 @@ class Invoice { String toString() => 'Invoice(id: $id, meta: $meta)'; } - class Receipt { final String id; final ReceiptMeta meta; - const Receipt({ - required this.id, - required this.meta, - }); + const Receipt({required this.id, required this.meta}); factory Receipt.fromJson(Map json) { return Receipt( @@ -471,18 +431,13 @@ class Receipt { } Map toJson() { - return { - 'id': id, - 'meta': meta.toJson(), - }; + return {'id': id, 'meta': meta.toJson()}; } @override bool operator ==(Object other) => identical(this, other) || - other is Receipt && - id == other.id && - meta == other.meta; + other is Receipt && id == other.id && meta == other.meta; @override int get hashCode => Object.hash(id, meta); @@ -491,23 +446,18 @@ class Receipt { String toString() => 'Receipt(id: $id, meta: $meta)'; } - class Api { final BlocksClient _client; Api(this._client); Future getShipment({required String id}) async { - final params = [ - id, - ]; + final params = [id]; final result = await _client.call('api.getShipment', params); return Shipment.fromJson(result as Map); } Future saveShipment({required Shipment shipment}) async { - final params = [ - shipment.toJson(), - ]; + final params = [shipment.toJson()]; final result = await _client.call('api.saveShipment', params); return Shipment.fromJson(result as Map); } @@ -523,7 +473,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -534,4 +483,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/31-nested-container-decoding/dart/client.dart b/native/codegen-fixtures/31-nested-container-decoding/dart/client.dart index 12669cc459..c002912be2 100644 --- a/native/codegen-fixtures/31-nested-container-decoding/dart/client.dart +++ b/native/codegen-fixtures/31-nested-container-decoding/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,9 +6,23 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; -export 'package:blocks_runtime/blocks_runtime.dart' show OidcClient, OidcAuthState, OidcSignedIn, OidcSignedOut, OidcLoading, OidcUser, TokenStore, InMemoryTokenStore, AuthProvider, BrowserLauncher, ProviderConfig; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +export 'package:blocks_runtime/blocks_runtime.dart' + show + OidcClient, + OidcAuthState, + OidcSignedIn, + OidcSignedOut, + OidcLoading, + OidcUser, + TokenStore, + InMemoryTokenStore, + AuthProvider, + BrowserLauncher, + ProviderConfig; // --- Models --- @@ -15,31 +30,31 @@ class SignInOption { final String label; final OidcClient client; - const SignInOption({ - required this.label, - required this.client, - }); + const SignInOption({required this.label, required this.client}); - factory SignInOption.fromJson(Map json, BlocksClient client) { + factory SignInOption.fromJson( + Map json, + BlocksClient client, + ) { return SignInOption( label: json['label'] as String, - client: OidcClient.fromJson(json['client'] as Map, baseUrl: client.baseUrl, tokenStore: client.tokenStore, sessionStore: client.sessionStore), + client: OidcClient.fromJson( + json['client'] as Map, + baseUrl: client.baseUrl, + tokenStore: client.tokenStore, + sessionStore: client.sessionStore, + ), ); } Map toJson() { - return { - 'label': label, - 'client': client, - }; + return {'label': label, 'client': client}; } @override bool operator ==(Object other) => identical(this, other) || - other is SignInOption && - label == other.label && - client == other.client; + other is SignInOption && label == other.label && client == other.client; @override int get hashCode => Object.hash(label, client); @@ -48,48 +63,34 @@ class SignInOption { String toString() => 'SignInOption(label: $label, client: $client)'; } - // --- API Namespaces --- enum Level { low, - high -; + high; String toJson() => name; static Level fromJson(String json) => values.byName(json); } - class Note { final String id; final String body; - const Note({ - required this.id, - required this.body, - }); + const Note({required this.id, required this.body}); factory Note.fromJson(Map json) { - return Note( - id: json['id'] as String, - body: json['body'] as String, - ); + return Note(id: json['id'] as String, body: json['body'] as String); } Map toJson() { - return { - 'id': id, - 'body': body, - }; + return {'id': id, 'body': body}; } @override bool operator ==(Object other) => identical(this, other) || - other is Note && - id == other.id && - body == other.body; + other is Note && id == other.id && body == other.body; @override int get hashCode => Object.hash(id, body); @@ -98,7 +99,6 @@ class Note { String toString() => 'Note(id: $id, body: $body)'; } - class Layout { final Map> tagsByUser; final Map>? scoresByUser; @@ -126,16 +126,62 @@ class Layout { factory Layout.fromJson(Map json) { return Layout( - tagsByUser: (json['tagsByUser'] as Map).map((k, v) => MapEntry(k, (v as List).cast())), - scoresByUser: (json['scoresByUser'] as Map?)?.map((k, v) => MapEntry(k, (v as List).cast())), - notesByTag: (json['notesByTag'] as Map).map((k, v) => MapEntry(k, (v as List).map((e1) => Note.fromJson(e1 as Map)).toList())), - pages: (json['pages'] as List).map((e) => (e as Map).map((k1, v1) => MapEntry(k1, Note.fromJson(v1 as Map)))).toList(), - grid: (json['grid'] as List).map((e) => (e as List).map((e1) => Note.fromJson(e1 as Map)).toList()).toList(), - matrix: (json['matrix'] as List).map((e) => (e as List).cast()).toList(), - levels: (json['levels'] as List).map((e) => Level.fromJson(e as String)).toList(), - levelsByUser: (json['levelsByUser'] as Map?)?.map((k, v) => MapEntry(k, (v as List).map((e1) => Level.fromJson(e1 as String)).toList())), - nestedLevels: (json['nestedLevels'] as Map).map((k, v) => MapEntry(k, (v as Map).map((k1, v1) => MapEntry(k1, Level.fromJson(v1 as String))))), - maybeNotes: (json['maybeNotes'] as List).map((e) => e == null ? null : Note.fromJson(e as Map)).toList(), + tagsByUser: (json['tagsByUser'] as Map).map( + (k, v) => MapEntry(k, (v as List).cast()), + ), + scoresByUser: (json['scoresByUser'] as Map?)?.map( + (k, v) => MapEntry(k, (v as List).cast()), + ), + notesByTag: (json['notesByTag'] as Map).map( + (k, v) => MapEntry( + k, + (v as List) + .map((e1) => Note.fromJson(e1 as Map)) + .toList(), + ), + ), + pages: (json['pages'] as List) + .map( + (e) => (e as Map).map( + (k1, v1) => + MapEntry(k1, Note.fromJson(v1 as Map)), + ), + ) + .toList(), + grid: (json['grid'] as List) + .map( + (e) => (e as List) + .map((e1) => Note.fromJson(e1 as Map)) + .toList(), + ) + .toList(), + matrix: (json['matrix'] as List) + .map((e) => (e as List).cast()) + .toList(), + levels: (json['levels'] as List) + .map((e) => Level.fromJson(e as String)) + .toList(), + levelsByUser: (json['levelsByUser'] as Map?)?.map( + (k, v) => MapEntry( + k, + (v as List) + .map((e1) => Level.fromJson(e1 as String)) + .toList(), + ), + ), + nestedLevels: (json['nestedLevels'] as Map).map( + (k, v) => MapEntry( + k, + (v as Map).map( + (k1, v1) => MapEntry(k1, Level.fromJson(v1 as String)), + ), + ), + ), + maybeNotes: (json['maybeNotes'] as List) + .map( + (e) => e == null ? null : Note.fromJson(e as Map), + ) + .toList(), ); } @@ -143,13 +189,22 @@ class Layout { return { 'tagsByUser': tagsByUser, if (scoresByUser != null) 'scoresByUser': scoresByUser, - 'notesByTag': notesByTag.map((k, v) => MapEntry(k, v.map((e1) => e1.toJson()).toList())), - 'pages': pages.map((e) => e.map((k1, v1) => MapEntry(k1, v1.toJson()))).toList(), + 'notesByTag': notesByTag.map( + (k, v) => MapEntry(k, v.map((e1) => e1.toJson()).toList()), + ), + 'pages': pages + .map((e) => e.map((k1, v1) => MapEntry(k1, v1.toJson()))) + .toList(), 'grid': grid.map((e) => e.map((e1) => e1.toJson()).toList()).toList(), 'matrix': matrix, 'levels': levels.map((e) => e.toJson()).toList(), - if (levelsByUser != null) 'levelsByUser': levelsByUser?.map((k, v) => MapEntry(k, v.map((e1) => e1.toJson()).toList())), - 'nestedLevels': nestedLevels.map((k, v) => MapEntry(k, v.map((k1, v1) => MapEntry(k1, v1.toJson())))), + if (levelsByUser != null) + 'levelsByUser': levelsByUser?.map( + (k, v) => MapEntry(k, v.map((e1) => e1.toJson()).toList()), + ), + 'nestedLevels': nestedLevels.map( + (k, v) => MapEntry(k, v.map((k1, v1) => MapEntry(k1, v1.toJson()))), + ), 'maybeNotes': maybeNotes.map((e) => e?.toJson()).toList(), }; } @@ -170,13 +225,24 @@ class Layout { blocksDeepEquals(maybeNotes, other.maybeNotes); @override - int get hashCode => Object.hash(blocksDeepHash(tagsByUser), blocksDeepHash(scoresByUser), blocksDeepHash(notesByTag), blocksDeepHash(pages), blocksDeepHash(grid), blocksDeepHash(matrix), blocksDeepHash(levels), blocksDeepHash(levelsByUser), blocksDeepHash(nestedLevels), blocksDeepHash(maybeNotes)); + int get hashCode => Object.hash( + blocksDeepHash(tagsByUser), + blocksDeepHash(scoresByUser), + blocksDeepHash(notesByTag), + blocksDeepHash(pages), + blocksDeepHash(grid), + blocksDeepHash(matrix), + blocksDeepHash(levels), + blocksDeepHash(levelsByUser), + blocksDeepHash(nestedLevels), + blocksDeepHash(maybeNotes), + ); @override - String toString() => 'Layout(tagsByUser: $tagsByUser, scoresByUser: $scoresByUser, notesByTag: $notesByTag, pages: $pages, grid: $grid, matrix: $matrix, levels: $levels, levelsByUser: $levelsByUser, nestedLevels: $nestedLevels, maybeNotes: $maybeNotes)'; + String toString() => + 'Layout(tagsByUser: $tagsByUser, scoresByUser: $scoresByUser, notesByTag: $notesByTag, pages: $pages, grid: $grid, matrix: $matrix, levels: $levels, levelsByUser: $levelsByUser, nestedLevels: $nestedLevels, maybeNotes: $maybeNotes)'; } - class Board { final String title; final List> channels; @@ -197,10 +263,34 @@ class Board { factory Board.fromJson(Map json) { return Board( title: json['title'] as String, - channels: (json['channels'] as List).map((e) => RealtimeChannel.fromJson(e as Map, (json) => Note.fromJson(json))).toList(), - tagFeeds: (json['tagFeeds'] as List?)?.map((e) => RealtimeChannel.fromJsonValue(e as Map, (payload) => (payload as List).cast())).toList(), - feedsByRoom: (json['feedsByRoom'] as Map).map((k, v) => MapEntry(k, RealtimeChannel.fromJson(v as Map, (json) => Note.fromJson(json)))), - downloads: (json['downloads'] as List).map((e) => FileDownloadHandle.fromJson(e as Map)).toList(), + channels: (json['channels'] as List) + .map( + (e) => RealtimeChannel.fromJson( + e as Map, + (json) => Note.fromJson(json), + ), + ) + .toList(), + tagFeeds: (json['tagFeeds'] as List?) + ?.map( + (e) => RealtimeChannel.fromJsonValue( + e as Map, + (payload) => (payload as List).cast(), + ), + ) + .toList(), + feedsByRoom: (json['feedsByRoom'] as Map).map( + (k, v) => MapEntry( + k, + RealtimeChannel.fromJson( + v as Map, + (json) => Note.fromJson(json), + ), + ), + ), + downloads: (json['downloads'] as List) + .map((e) => FileDownloadHandle.fromJson(e as Map)) + .toList(), layout: Layout.fromJson(json['layout'] as Map), ); } @@ -228,13 +318,20 @@ class Board { layout == other.layout; @override - int get hashCode => Object.hash(title, blocksDeepHash(channels), blocksDeepHash(tagFeeds), blocksDeepHash(feedsByRoom), blocksDeepHash(downloads), layout); + int get hashCode => Object.hash( + title, + blocksDeepHash(channels), + blocksDeepHash(tagFeeds), + blocksDeepHash(feedsByRoom), + blocksDeepHash(downloads), + layout, + ); @override - String toString() => 'Board(title: $title, channels: $channels, tagFeeds: $tagFeeds, feedsByRoom: $feedsByRoom, downloads: $downloads, layout: $layout)'; + String toString() => + 'Board(title: $title, channels: $channels, tagFeeds: $tagFeeds, feedsByRoom: $feedsByRoom, downloads: $downloads, layout: $layout)'; } - class LoginMenu { final SignInOption primary; final List options; @@ -248,9 +345,21 @@ class LoginMenu { factory LoginMenu.fromJson(Map json, BlocksClient client) { return LoginMenu( - primary: SignInOption.fromJson(json['primary'] as Map, client), - options: (json['options'] as List).map((e) => SignInOption.fromJson(e as Map, client)).toList(), - fallback: json['fallback'] != null ? OidcClient.fromJson(json['fallback'] as Map, baseUrl: client.baseUrl, tokenStore: client.tokenStore, sessionStore: client.sessionStore) : null, + primary: SignInOption.fromJson( + json['primary'] as Map, + client, + ), + options: (json['options'] as List) + .map((e) => SignInOption.fromJson(e as Map, client)) + .toList(), + fallback: json['fallback'] != null + ? OidcClient.fromJson( + json['fallback'] as Map, + baseUrl: client.baseUrl, + tokenStore: client.tokenStore, + sessionStore: client.sessionStore, + ) + : null, ); } @@ -274,10 +383,10 @@ class LoginMenu { int get hashCode => Object.hash(primary, blocksDeepHash(options), fallback); @override - String toString() => 'LoginMenu(primary: $primary, options: $options, fallback: $fallback)'; + String toString() => + 'LoginMenu(primary: $primary, options: $options, fallback: $fallback)'; } - class Api { final BlocksClient _client; Api(this._client); @@ -288,25 +397,40 @@ class Api { } Future saveLayout({required Layout layout}) async { - final params = [ - layout.toJson(), - ]; + final params = [layout.toJson()]; final result = await _client.call('api.saveLayout', params); return Layout.fromJson(result as Map); } - Future>> groupNotes({required Map> groups, List? levels}) async { + Future>> groupNotes({ + required Map> groups, + List? levels, + }) async { final params = [ groups.map((k, v) => MapEntry(k, v.map((e1) => e1.toJson()).toList())), if (levels != null) levels.map((e) => e.toJson()).toList(), ]; final result = await _client.call('api.groupNotes', params); - return (result as Map).map((k, v) => MapEntry(k, (v as List).map((e1) => Note.fromJson(e1 as Map)).toList())); + return (result as Map).map( + (k, v) => MapEntry( + k, + (v as List) + .map((e1) => Note.fromJson(e1 as Map)) + .toList(), + ), + ); } Future>> listFeeds() async { final result = await _client.call('api.listFeeds', const []); - return (result as List).map((e) => RealtimeChannel.fromJson(e as Map, (json) => Note.fromJson(json))).toList(); + return (result as List) + .map( + (e) => RealtimeChannel.fromJson( + e as Map, + (json) => Note.fromJson(json), + ), + ) + .toList(); } Future getLoginMenu() async { @@ -315,7 +439,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -326,4 +449,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/32-name-collisions/dart/client.dart b/native/codegen-fixtures/32-name-collisions/dart/client.dart index f1375d6bf6..966f300b48 100644 --- a/native/codegen-fixtures/32-name-collisions/dart/client.dart +++ b/native/codegen-fixtures/32-name-collisions/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,35 +6,29 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; // --- Models --- class CartTags { final String label; - const CartTags({ - required this.label, - }); + const CartTags({required this.label}); factory CartTags.fromJson(Map json) { - return CartTags( - label: json['label'] as String, - ); + return CartTags(label: json['label'] as String); } Map toJson() { - return { - 'label': label, - }; + return {'label': label}; } @override bool operator ==(Object other) => - identical(this, other) || - other is CartTags && - label == other.label; + identical(this, other) || other is CartTags && label == other.label; @override int get hashCode => label.hashCode; @@ -42,31 +37,23 @@ class CartTags { String toString() => 'CartTags(label: $label)'; } - class CartTagsValue { final num weight; - const CartTagsValue({ - required this.weight, - }); + const CartTagsValue({required this.weight}); factory CartTagsValue.fromJson(Map json) { - return CartTagsValue( - weight: json['weight'] as num, - ); + return CartTagsValue(weight: json['weight'] as num); } Map toJson() { - return { - 'weight': weight, - }; + return {'weight': weight}; } @override bool operator ==(Object other) => identical(this, other) || - other is CartTagsValue && - weight == other.weight; + other is CartTagsValue && weight == other.weight; @override int get hashCode => weight.hashCode; @@ -75,55 +62,49 @@ class CartTagsValue { String toString() => 'CartTagsValue(weight: $weight)'; } - enum OrderStatus { pending, - shipped -; + shipped; String toJson() => name; static OrderStatus fromJson(String json) => values.byName(json); } - enum TicketStatus { open, - closed -; + closed; String toJson() => name; static TicketStatus fromJson(String json) => values.byName(json); } - enum TicketKind { bug, - task -; + task; String toJson() => name; static TicketKind fromJson(String json) => values.byName(json); } - enum TicketKinds { urgent, - later -; + later; String toJson() => name; static TicketKinds fromJson(String json) => values.byName(json); } - sealed class TicketPayload { const TicketPayload(); Map toJson(); static TicketPayload fromJson(Map json) { switch (json['type'] as String) { - case 'text': return TextTicketPayload.fromJson(json); - case 'count': return CountTicketPayload.fromJson(json); - default: throw ArgumentError('Unknown type: ${json['type']}'); + case 'text': + return TextTicketPayload.fromJson(json); + case 'count': + return CountTicketPayload.fromJson(json); + default: + throw ArgumentError('Unknown type: ${json['type']}'); } } } @@ -131,29 +112,21 @@ sealed class TicketPayload { class TextTicketPayload extends TicketPayload { final String body; - const TextTicketPayload({ - required this.body, - }); + const TextTicketPayload({required this.body}); factory TextTicketPayload.fromJson(Map json) { - return TextTicketPayload( - body: json['body'] as String, - ); + return TextTicketPayload(body: json['body'] as String); } @override Map toJson() { - return { - 'type': 'text', - 'body': body, - }; + return {'type': 'text', 'body': body}; } @override bool operator ==(Object other) => identical(this, other) || - other is TextTicketPayload && - body == other.body; + other is TextTicketPayload && body == other.body; @override int get hashCode => body.hashCode; @@ -165,29 +138,21 @@ class TextTicketPayload extends TicketPayload { class CountTicketPayload extends TicketPayload { final num total; - const CountTicketPayload({ - required this.total, - }); + const CountTicketPayload({required this.total}); factory CountTicketPayload.fromJson(Map json) { - return CountTicketPayload( - total: json['total'] as num, - ); + return CountTicketPayload(total: json['total'] as num); } @override Map toJson() { - return { - 'type': 'count', - 'total': total, - }; + return {'type': 'count', 'total': total}; } @override bool operator ==(Object other) => identical(this, other) || - other is CountTicketPayload && - total == other.total; + other is CountTicketPayload && total == other.total; @override int get hashCode => total.hashCode; @@ -196,16 +161,17 @@ class CountTicketPayload extends TicketPayload { String toString() => 'CountTicketPayload(total: $total)'; } - - sealed class TicketPayloads { const TicketPayloads(); Map toJson(); static TicketPayloads fromJson(Map json) { switch (json['format'] as String) { - case 'plain': return PlainTicketPayloads.fromJson(json); - case 'rich': return RichTicketPayloads.fromJson(json); - default: throw ArgumentError('Unknown format: ${json['format']}'); + case 'plain': + return PlainTicketPayloads.fromJson(json); + case 'rich': + return RichTicketPayloads.fromJson(json); + default: + throw ArgumentError('Unknown format: ${json['format']}'); } } } @@ -213,29 +179,21 @@ sealed class TicketPayloads { class PlainTicketPayloads extends TicketPayloads { final String raw; - const PlainTicketPayloads({ - required this.raw, - }); + const PlainTicketPayloads({required this.raw}); factory PlainTicketPayloads.fromJson(Map json) { - return PlainTicketPayloads( - raw: json['raw'] as String, - ); + return PlainTicketPayloads(raw: json['raw'] as String); } @override Map toJson() { - return { - 'format': 'plain', - 'raw': raw, - }; + return {'format': 'plain', 'raw': raw}; } @override bool operator ==(Object other) => identical(this, other) || - other is PlainTicketPayloads && - raw == other.raw; + other is PlainTicketPayloads && raw == other.raw; @override int get hashCode => raw.hashCode; @@ -247,29 +205,21 @@ class PlainTicketPayloads extends TicketPayloads { class RichTicketPayloads extends TicketPayloads { final String html; - const RichTicketPayloads({ - required this.html, - }); + const RichTicketPayloads({required this.html}); factory RichTicketPayloads.fromJson(Map json) { - return RichTicketPayloads( - html: json['html'] as String, - ); + return RichTicketPayloads(html: json['html'] as String); } @override Map toJson() { - return { - 'format': 'rich', - 'html': html, - }; + return {'format': 'rich', 'html': html}; } @override bool operator ==(Object other) => identical(this, other) || - other is RichTicketPayloads && - html == other.html; + other is RichTicketPayloads && html == other.html; @override int get hashCode => html.hashCode; @@ -278,32 +228,23 @@ class RichTicketPayloads extends TicketPayloads { String toString() => 'RichTicketPayloads(html: $html)'; } - - class PutItemsResultItem { final num count; - const PutItemsResultItem({ - required this.count, - }); + const PutItemsResultItem({required this.count}); factory PutItemsResultItem.fromJson(Map json) { - return PutItemsResultItem( - count: json['count'] as num, - ); + return PutItemsResultItem(count: json['count'] as num); } Map toJson() { - return { - 'count': count, - }; + return {'count': count}; } @override bool operator ==(Object other) => identical(this, other) || - other is PutItemsResultItem && - count == other.count; + other is PutItemsResultItem && count == other.count; @override int get hashCode => count.hashCode; @@ -312,31 +253,23 @@ class PutItemsResultItem { String toString() => 'PutItemsResultItem(count: $count)'; } - class GetFeedsResultFeedMessage { final String text; - const GetFeedsResultFeedMessage({ - required this.text, - }); + const GetFeedsResultFeedMessage({required this.text}); factory GetFeedsResultFeedMessage.fromJson(Map json) { - return GetFeedsResultFeedMessage( - text: json['text'] as String, - ); + return GetFeedsResultFeedMessage(text: json['text'] as String); } Map toJson() { - return { - 'text': text, - }; + return {'text': text}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetFeedsResultFeedMessage && - text == other.text; + other is GetFeedsResultFeedMessage && text == other.text; @override int get hashCode => text.hashCode; @@ -345,31 +278,22 @@ class GetFeedsResultFeedMessage { String toString() => 'GetFeedsResultFeedMessage(text: $text)'; } - class PickActResultItems { final num qty; - const PickActResultItems({ - required this.qty, - }); + const PickActResultItems({required this.qty}); factory PickActResultItems.fromJson(Map json) { - return PickActResultItems( - qty: json['qty'] as num, - ); + return PickActResultItems(qty: json['qty'] as num); } Map toJson() { - return { - 'qty': qty, - }; + return {'qty': qty}; } @override bool operator ==(Object other) => - identical(this, other) || - other is PickActResultItems && - qty == other.qty; + identical(this, other) || other is PickActResultItems && qty == other.qty; @override int get hashCode => qty.hashCode; @@ -378,33 +302,24 @@ class PickActResultItems { String toString() => 'PickActResultItems(qty: $qty)'; } - // --- API Namespaces --- class CartItem { final String sku; - const CartItem({ - required this.sku, - }); + const CartItem({required this.sku}); factory CartItem.fromJson(Map json) { - return CartItem( - sku: json['sku'] as String, - ); + return CartItem(sku: json['sku'] as String); } Map toJson() { - return { - 'sku': sku, - }; + return {'sku': sku}; } @override bool operator ==(Object other) => - identical(this, other) || - other is CartItem && - sku == other.sku; + identical(this, other) || other is CartItem && sku == other.sku; @override int get hashCode => sku.hashCode; @@ -413,36 +328,24 @@ class CartItem { String toString() => 'CartItem(sku: $sku)'; } - class CartItems { final String sku; final num qty; - const CartItems({ - required this.sku, - required this.qty, - }); + const CartItems({required this.sku, required this.qty}); factory CartItems.fromJson(Map json) { - return CartItems( - sku: json['sku'] as String, - qty: json['qty'] as num, - ); + return CartItems(sku: json['sku'] as String, qty: json['qty'] as num); } Map toJson() { - return { - 'sku': sku, - 'qty': qty, - }; + return {'sku': sku, 'qty': qty}; } @override bool operator ==(Object other) => identical(this, other) || - other is CartItems && - sku == other.sku && - qty == other.qty; + other is CartItems && sku == other.sku && qty == other.qty; @override int get hashCode => Object.hash(sku, qty); @@ -451,7 +354,6 @@ class CartItems { String toString() => 'CartItems(sku: $sku, qty: $qty)'; } - class Cart { final String id; final CartItem item; @@ -471,9 +373,15 @@ class Cart { return Cart( id: json['id'] as String, item: CartItem.fromJson(json['item'] as Map), - items: (json['items'] as List).map((e) => CartItems.fromJson(e as Map)).toList(), - tags: (json['tags'] as Map).map((k, v) => MapEntry(k, CartTags.fromJson(v as Map))), - tagsValue: CartTagsValue.fromJson(json['tagsValue'] as Map), + items: (json['items'] as List) + .map((e) => CartItems.fromJson(e as Map)) + .toList(), + tags: (json['tags'] as Map).map( + (k, v) => MapEntry(k, CartTags.fromJson(v as Map)), + ), + tagsValue: CartTagsValue.fromJson( + json['tagsValue'] as Map, + ), ); } @@ -498,47 +406,43 @@ class Cart { tagsValue == other.tagsValue; @override - int get hashCode => Object.hash(id, item, blocksDeepHash(items), blocksDeepHash(tags), tagsValue); + int get hashCode => Object.hash( + id, + item, + blocksDeepHash(items), + blocksDeepHash(tags), + tagsValue, + ); @override - String toString() => 'Cart(id: $id, item: $item, items: $items, tags: $tags, tagsValue: $tagsValue)'; + String toString() => + 'Cart(id: $id, item: $item, items: $items, tags: $tags, tagsValue: $tagsValue)'; } - enum Kind { x, - y -; + y; String toJson() => name; static Kind fromJson(String json) => values.byName(json); } - class Order { final OrderStatus status; - const Order({ - required this.status, - }); + const Order({required this.status}); factory Order.fromJson(Map json) { - return Order( - status: OrderStatus.fromJson(json['status'] as String), - ); + return Order(status: OrderStatus.fromJson(json['status'] as String)); } Map toJson() { - return { - 'status': status.toJson(), - }; + return {'status': status.toJson()}; } @override bool operator ==(Object other) => - identical(this, other) || - other is Order && - status == other.status; + identical(this, other) || other is Order && status == other.status; @override int get hashCode => status.hashCode; @@ -547,7 +451,6 @@ class Order { String toString() => 'Order(status: $status)'; } - class Ticket { final TicketStatus status; final TicketKind kind; @@ -567,9 +470,13 @@ class Ticket { return Ticket( status: TicketStatus.fromJson(json['status'] as String), kind: TicketKind.fromJson(json['kind'] as String), - kinds: (json['kinds'] as List).map((e) => TicketKinds.fromJson(e as String)).toList(), + kinds: (json['kinds'] as List) + .map((e) => TicketKinds.fromJson(e as String)) + .toList(), payload: TicketPayload.fromJson(json['payload'] as Map), - payloads: (json['payloads'] as List).map((e) => TicketPayloads.fromJson(e as Map)).toList(), + payloads: (json['payloads'] as List) + .map((e) => TicketPayloads.fromJson(e as Map)) + .toList(), ); } @@ -594,26 +501,31 @@ class Ticket { blocksDeepEquals(payloads, other.payloads); @override - int get hashCode => Object.hash(status, kind, blocksDeepHash(kinds), payload, blocksDeepHash(payloads)); + int get hashCode => Object.hash( + status, + kind, + blocksDeepHash(kinds), + payload, + blocksDeepHash(payloads), + ); @override - String toString() => 'Ticket(status: $status, kind: $kind, kinds: $kinds, payload: $payload, payloads: $payloads)'; + String toString() => + 'Ticket(status: $status, kind: $kind, kinds: $kinds, payload: $payload, payloads: $payloads)'; } - class PutItemsResult { final PutItemsResultItem item; final List items; - const PutItemsResult({ - required this.item, - required this.items, - }); + const PutItemsResult({required this.item, required this.items}); factory PutItemsResult.fromJson(Map json) { return PutItemsResult( item: PutItemsResultItem.fromJson(json['item'] as Map), - items: (json['items'] as List).map((e) => CartItem.fromJson(e as Map)).toList(), + items: (json['items'] as List) + .map((e) => CartItem.fromJson(e as Map)) + .toList(), ); } @@ -638,28 +550,31 @@ class PutItemsResult { String toString() => 'PutItemsResult(item: $item, items: $items)'; } - class GetFeedsResult { final RealtimeChannel feed; final List> feeds; - const GetFeedsResult({ - required this.feed, - required this.feeds, - }); + const GetFeedsResult({required this.feed, required this.feeds}); factory GetFeedsResult.fromJson(Map json) { return GetFeedsResult( - feed: RealtimeChannel.fromJson(json['feed'] as Map, (json) => GetFeedsResultFeedMessage.fromJson(json)), - feeds: (json['feeds'] as List).map((e) => RealtimeChannel.fromJson(e as Map, (json) => PutItemsResultItem.fromJson(json))).toList(), + feed: RealtimeChannel.fromJson( + json['feed'] as Map, + (json) => GetFeedsResultFeedMessage.fromJson(json), + ), + feeds: (json['feeds'] as List) + .map( + (e) => RealtimeChannel.fromJson( + e as Map, + (json) => PutItemsResultItem.fromJson(json), + ), + ) + .toList(), ); } Map toJson() { - return { - 'feed': feed, - 'feeds': feeds, - }; + return {'feed': feed, 'feeds': feeds}; } @override @@ -676,15 +591,17 @@ class GetFeedsResult { String toString() => 'GetFeedsResult(feed: $feed, feeds: $feeds)'; } - sealed class ActResult { const ActResult(); Map toJson(); static ActResult fromJson(Map json) { switch (json['action'] as String) { - case 'pick': return PickActResult.fromJson(json); - case 'skip': return SkipActResult.fromJson(json); - default: throw ArgumentError('Unknown action: ${json['action']}'); + case 'pick': + return PickActResult.fromJson(json); + case 'skip': + return SkipActResult.fromJson(json); + default: + throw ArgumentError('Unknown action: ${json['action']}'); } } } @@ -693,15 +610,14 @@ class PickActResult extends ActResult { final CartItem item; final List items; - const PickActResult({ - required this.item, - required this.items, - }); + const PickActResult({required this.item, required this.items}); factory PickActResult.fromJson(Map json) { return PickActResult( item: CartItem.fromJson(json['item'] as Map), - items: (json['items'] as List).map((e) => PickActResultItems.fromJson(e as Map)).toList(), + items: (json['items'] as List) + .map((e) => PickActResultItems.fromJson(e as Map)) + .toList(), ); } @@ -731,29 +647,21 @@ class PickActResult extends ActResult { class SkipActResult extends ActResult { final String reason; - const SkipActResult({ - required this.reason, - }); + const SkipActResult({required this.reason}); factory SkipActResult.fromJson(Map json) { - return SkipActResult( - reason: json['reason'] as String, - ); + return SkipActResult(reason: json['reason'] as String); } @override Map toJson() { - return { - 'action': 'skip', - 'reason': reason, - }; + return {'action': 'skip', 'reason': reason}; } @override bool operator ==(Object other) => identical(this, other) || - other is SkipActResult && - reason == other.reason; + other is SkipActResult && reason == other.reason; @override int get hashCode => reason.hashCode; @@ -762,32 +670,22 @@ class SkipActResult extends ActResult { String toString() => 'SkipActResult(reason: $reason)'; } - - class ApiCheckResult { final String input; - const ApiCheckResult({ - required this.input, - }); + const ApiCheckResult({required this.input}); factory ApiCheckResult.fromJson(Map json) { - return ApiCheckResult( - input: json['input'] as String, - ); + return ApiCheckResult(input: json['input'] as String); } Map toJson() { - return { - 'input': input, - }; + return {'input': input}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ApiCheckResult && - input == other.input; + identical(this, other) || other is ApiCheckResult && input == other.input; @override int get hashCode => input.hashCode; @@ -796,31 +694,22 @@ class ApiCheckResult { String toString() => 'ApiCheckResult(input: $input)'; } - class CheckResult { final bool passed; - const CheckResult({ - required this.passed, - }); + const CheckResult({required this.passed}); factory CheckResult.fromJson(Map json) { - return CheckResult( - passed: json['passed'] as bool, - ); + return CheckResult(passed: json['passed'] as bool); } Map toJson() { - return { - 'passed': passed, - }; + return {'passed': passed}; } @override bool operator ==(Object other) => - identical(this, other) || - other is CheckResult && - passed == other.passed; + identical(this, other) || other is CheckResult && passed == other.passed; @override int get hashCode => passed.hashCode; @@ -829,7 +718,6 @@ class CheckResult { String toString() => 'CheckResult(passed: $passed)'; } - class Api { final BlocksClient _client; Api(this._client); @@ -854,7 +742,10 @@ class Api { return Kind.fromJson(result as String); } - Future putItems({required CartItem item, required List items}) async { + Future putItems({ + required CartItem item, + required List items, + }) async { final params = [ item.toJson(), items.map((e) => e.toJson()).toList(), @@ -874,15 +765,12 @@ class Api { } Future check({required ApiCheckResult result}) async { - final params = [ - result.toJson(), - ]; + final params = [result.toJson()]; final $result = await _client.call('api.check', params); return CheckResult.fromJson($result as Map); } } - // --- Blocks Client --- class Blocks { @@ -893,4 +781,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/33-channel-payload-transferables/dart/client.dart b/native/codegen-fixtures/33-channel-payload-transferables/dart/client.dart index 7e75767ed1..f767c01755 100644 --- a/native/codegen-fixtures/33-channel-payload-transferables/dart/client.dart +++ b/native/codegen-fixtures/33-channel-payload-transferables/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,9 +6,23 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; -export 'package:blocks_runtime/blocks_runtime.dart' show OidcClient, OidcAuthState, OidcSignedIn, OidcSignedOut, OidcLoading, OidcUser, TokenStore, InMemoryTokenStore, AuthProvider, BrowserLauncher, ProviderConfig; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +export 'package:blocks_runtime/blocks_runtime.dart' + show + OidcClient, + OidcAuthState, + OidcSignedIn, + OidcSignedOut, + OidcLoading, + OidcUser, + TokenStore, + InMemoryTokenStore, + AuthProvider, + BrowserLauncher, + ProviderConfig; // --- Models --- @@ -15,31 +30,20 @@ class Note { final String id; final String text; - const Note({ - required this.id, - required this.text, - }); + const Note({required this.id, required this.text}); factory Note.fromJson(Map json) { - return Note( - id: json['id'] as String, - text: json['text'] as String, - ); + return Note(id: json['id'] as String, text: json['text'] as String); } Map toJson() { - return { - 'id': id, - 'text': text, - }; + return {'id': id, 'text': text}; } @override bool operator ==(Object other) => identical(this, other) || - other is Note && - id == other.id && - text == other.text; + other is Note && id == other.id && text == other.text; @override int get hashCode => Object.hash(id, text); @@ -48,7 +52,6 @@ class Note { String toString() => 'Note(id: $id, text: $text)'; } - class Attachment { final String name; final FileDownloadHandle file; @@ -64,16 +67,14 @@ class Attachment { return Attachment( name: json['name'] as String, file: FileDownloadHandle.fromJson(json['file'] as Map), - previews: (json['previews'] as List).map((e) => FileDownloadHandle.fromJson(e as Map)).toList(), + previews: (json['previews'] as List) + .map((e) => FileDownloadHandle.fromJson(e as Map)) + .toList(), ); } Map toJson() { - return { - 'name': name, - 'file': file, - 'previews': previews, - }; + return {'name': name, 'file': file, 'previews': previews}; } @override @@ -88,39 +89,39 @@ class Attachment { int get hashCode => Object.hash(name, file, blocksDeepHash(previews)); @override - String toString() => 'Attachment(name: $name, file: $file, previews: $previews)'; + String toString() => + 'Attachment(name: $name, file: $file, previews: $previews)'; } - class SignInOption { final String label; final OidcClient client; - const SignInOption({ - required this.label, - required this.client, - }); + const SignInOption({required this.label, required this.client}); - factory SignInOption.fromJson(Map json, BlocksClient client) { + factory SignInOption.fromJson( + Map json, + BlocksClient client, + ) { return SignInOption( label: json['label'] as String, - client: OidcClient.fromJson(json['client'] as Map, baseUrl: client.baseUrl, tokenStore: client.tokenStore, sessionStore: client.sessionStore), + client: OidcClient.fromJson( + json['client'] as Map, + baseUrl: client.baseUrl, + tokenStore: client.tokenStore, + sessionStore: client.sessionStore, + ), ); } Map toJson() { - return { - 'label': label, - 'client': client, - }; + return {'label': label, 'client': client}; } @override bool operator ==(Object other) => identical(this, other) || - other is SignInOption && - label == other.label && - client == other.client; + other is SignInOption && label == other.label && client == other.client; @override int get hashCode => Object.hash(label, client); @@ -129,31 +130,23 @@ class SignInOption { String toString() => 'SignInOption(label: $label, client: $client)'; } - class GetChatFeedResultChannelMessage { final String text; - const GetChatFeedResultChannelMessage({ - required this.text, - }); + const GetChatFeedResultChannelMessage({required this.text}); factory GetChatFeedResultChannelMessage.fromJson(Map json) { - return GetChatFeedResultChannelMessage( - text: json['text'] as String, - ); + return GetChatFeedResultChannelMessage(text: json['text'] as String); } Map toJson() { - return { - 'text': text, - }; + return {'text': text}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetChatFeedResultChannelMessage && - text == other.text; + other is GetChatFeedResultChannelMessage && text == other.text; @override int get hashCode => text.hashCode; @@ -162,31 +155,25 @@ class GetChatFeedResultChannelMessage { String toString() => 'GetChatFeedResultChannelMessage(text: $text)'; } - class GetCounterFeedResultChannelMessage { final num count; - const GetCounterFeedResultChannelMessage({ - required this.count, - }); + const GetCounterFeedResultChannelMessage({required this.count}); - factory GetCounterFeedResultChannelMessage.fromJson(Map json) { - return GetCounterFeedResultChannelMessage( - count: json['count'] as num, - ); + factory GetCounterFeedResultChannelMessage.fromJson( + Map json, + ) { + return GetCounterFeedResultChannelMessage(count: json['count'] as num); } Map toJson() { - return { - 'count': count, - }; + return {'count': count}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetCounterFeedResultChannelMessage && - count == other.count; + other is GetCounterFeedResultChannelMessage && count == other.count; @override int get hashCode => count.hashCode; @@ -195,7 +182,6 @@ class GetCounterFeedResultChannelMessage { String toString() => 'GetCounterFeedResultChannelMessage(count: $count)'; } - // --- API Namespaces --- class Lobby { @@ -211,9 +197,42 @@ class Lobby { factory Lobby.fromJson(Map json) { return Lobby( - rooms: RealtimeChannel.fromJsonValue(json['rooms'] as Map, (payload) => (payload as List).map((e1) => RealtimeChannel.fromJson(e1 as Map, (json) => Note.fromJson(json))).toList()), - roomGroups: (json['roomGroups'] as List).map((e) => RealtimeChannel.fromJsonValue(e as Map, (payload) => (payload as List).map((e2) => RealtimeChannel.fromJson(e2 as Map, (json) => Note.fromJson(json))).toList())).toList(), - uploadsByRoom: (json['uploadsByRoom'] as Map).map((k, v) => MapEntry(k, RealtimeChannel.fromJsonValue(v as Map, (payload) => FileUploadHandle.fromJson(payload as Map)))), + rooms: RealtimeChannel.fromJsonValue( + json['rooms'] as Map, + (payload) => (payload as List) + .map( + (e1) => RealtimeChannel.fromJson( + e1 as Map, + (json) => Note.fromJson(json), + ), + ) + .toList(), + ), + roomGroups: (json['roomGroups'] as List) + .map( + (e) => RealtimeChannel.fromJsonValue( + e as Map, + (payload) => (payload as List) + .map( + (e2) => RealtimeChannel.fromJson( + e2 as Map, + (json) => Note.fromJson(json), + ), + ) + .toList(), + ), + ) + .toList(), + uploadsByRoom: (json['uploadsByRoom'] as Map).map( + (k, v) => MapEntry( + k, + RealtimeChannel.fromJsonValue( + v as Map, + (payload) => + FileUploadHandle.fromJson(payload as Map), + ), + ), + ), ); } @@ -234,34 +253,56 @@ class Lobby { blocksDeepEquals(uploadsByRoom, other.uploadsByRoom); @override - int get hashCode => Object.hash(rooms, blocksDeepHash(roomGroups), blocksDeepHash(uploadsByRoom)); + int get hashCode => Object.hash( + rooms, + blocksDeepHash(roomGroups), + blocksDeepHash(uploadsByRoom), + ); @override - String toString() => 'Lobby(rooms: $rooms, roomGroups: $roomGroups, uploadsByRoom: $uploadsByRoom)'; + String toString() => + 'Lobby(rooms: $rooms, roomGroups: $roomGroups, uploadsByRoom: $uploadsByRoom)'; } - class SignInBoard { final List> feeds; final Map>> clientsByTenant; - const SignInBoard({ - required this.feeds, - required this.clientsByTenant, - }); + const SignInBoard({required this.feeds, required this.clientsByTenant}); factory SignInBoard.fromJson(Map json, BlocksClient client) { return SignInBoard( - feeds: (json['feeds'] as List).map((e) => RealtimeChannel.fromJson(e as Map, (json) => SignInOption.fromJson(json, client))).toList(), - clientsByTenant: (json['clientsByTenant'] as Map).map((k, v) => MapEntry(k, RealtimeChannel.fromJsonValue(v as Map, (payload) => (payload as List).map((e2) => OidcClient.fromJson(e2 as Map, baseUrl: client.baseUrl, tokenStore: client.tokenStore, sessionStore: client.sessionStore)).toList()))), + feeds: (json['feeds'] as List) + .map( + (e) => RealtimeChannel.fromJson( + e as Map, + (json) => SignInOption.fromJson(json, client), + ), + ) + .toList(), + clientsByTenant: (json['clientsByTenant'] as Map).map( + (k, v) => MapEntry( + k, + RealtimeChannel.fromJsonValue( + v as Map, + (payload) => (payload as List) + .map( + (e2) => OidcClient.fromJson( + e2 as Map, + baseUrl: client.baseUrl, + tokenStore: client.tokenStore, + sessionStore: client.sessionStore, + ), + ) + .toList(), + ), + ), + ), ); } Map toJson() { - return { - 'feeds': feeds, - 'clientsByTenant': clientsByTenant, - }; + return {'feeds': feeds, 'clientsByTenant': clientsByTenant}; } @override @@ -272,13 +313,14 @@ class SignInBoard { blocksDeepEquals(clientsByTenant, other.clientsByTenant); @override - int get hashCode => Object.hash(blocksDeepHash(feeds), blocksDeepHash(clientsByTenant)); + int get hashCode => + Object.hash(blocksDeepHash(feeds), blocksDeepHash(clientsByTenant)); @override - String toString() => 'SignInBoard(feeds: $feeds, clientsByTenant: $clientsByTenant)'; + String toString() => + 'SignInBoard(feeds: $feeds, clientsByTenant: $clientsByTenant)'; } - class ProviderDirectory { final String title; final Map additionalProperties; @@ -288,13 +330,27 @@ class ProviderDirectory { this.additionalProperties = const {}, }); - factory ProviderDirectory.fromJson(Map json, BlocksClient client) { + factory ProviderDirectory.fromJson( + Map json, + BlocksClient client, + ) { const knownKeys = {'title'}; return ProviderDirectory( title: json['title'] as String, additionalProperties: Map.fromEntries( - json.entries.where((e) => !knownKeys.contains(e.key)) - .map((e) => MapEntry(e.key, OidcClient.fromJson(e.value as Map, baseUrl: client.baseUrl, tokenStore: client.tokenStore, sessionStore: client.sessionStore))), + json.entries + .where((e) => !knownKeys.contains(e.key)) + .map( + (e) => MapEntry( + e.key, + OidcClient.fromJson( + e.value as Map, + baseUrl: client.baseUrl, + tokenStore: client.tokenStore, + sessionStore: client.sessionStore, + ), + ), + ), ), ); } @@ -318,34 +374,32 @@ class ProviderDirectory { int get hashCode => Object.hash(title, blocksDeepHash(additionalProperties)); @override - String toString() => 'ProviderDirectory(title: $title, additionalProperties: $additionalProperties)'; + String toString() => + 'ProviderDirectory(title: $title, additionalProperties: $additionalProperties)'; } - class GetChatFeedResult { final RealtimeChannel channel; - const GetChatFeedResult({ - required this.channel, - }); + const GetChatFeedResult({required this.channel}); factory GetChatFeedResult.fromJson(Map json) { return GetChatFeedResult( - channel: RealtimeChannel.fromJson(json['channel'] as Map, (json) => GetChatFeedResultChannelMessage.fromJson(json)), + channel: RealtimeChannel.fromJson( + json['channel'] as Map, + (json) => GetChatFeedResultChannelMessage.fromJson(json), + ), ); } Map toJson() { - return { - 'channel': channel, - }; + return {'channel': channel}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetChatFeedResult && - channel == other.channel; + other is GetChatFeedResult && channel == other.channel; @override int get hashCode => channel.hashCode; @@ -354,31 +408,28 @@ class GetChatFeedResult { String toString() => 'GetChatFeedResult(channel: $channel)'; } - class GetCounterFeedResult { final RealtimeChannel channel; - const GetCounterFeedResult({ - required this.channel, - }); + const GetCounterFeedResult({required this.channel}); factory GetCounterFeedResult.fromJson(Map json) { return GetCounterFeedResult( - channel: RealtimeChannel.fromJson(json['channel'] as Map, (json) => GetCounterFeedResultChannelMessage.fromJson(json)), + channel: RealtimeChannel.fromJson( + json['channel'] as Map, + (json) => GetCounterFeedResultChannelMessage.fromJson(json), + ), ); } Map toJson() { - return { - 'channel': channel, - }; + return {'channel': channel}; } @override bool operator ==(Object other) => identical(this, other) || - other is GetCounterFeedResult && - channel == other.channel; + other is GetCounterFeedResult && channel == other.channel; @override int get hashCode => channel.hashCode; @@ -387,19 +438,29 @@ class GetCounterFeedResult { String toString() => 'GetCounterFeedResult(channel: $channel)'; } - class Api { final BlocksClient _client; Api(this._client); Future> getAttachmentFeed() async { - final result = await _client.call('api.getAttachmentFeed', const []); - return RealtimeChannel.fromJson(result as Map, (json) => Attachment.fromJson(json)); + final result = await _client.call( + 'api.getAttachmentFeed', + const [], + ); + return RealtimeChannel.fromJson( + result as Map, + (json) => Attachment.fromJson(json), + ); } Future>> getDownloadFeed() async { final result = await _client.call('api.getDownloadFeed', const []); - return RealtimeChannel.fromJsonValue(result as Map, (payload) => (payload as List).map((e1) => FileDownloadHandle.fromJson(e1 as Map)).toList()); + return RealtimeChannel.fromJsonValue( + result as Map, + (payload) => (payload as List) + .map((e1) => FileDownloadHandle.fromJson(e1 as Map)) + .toList(), + ); } Future getChatFeed() async { @@ -419,7 +480,10 @@ class Api { Future> getSignInFeed() async { final result = await _client.call('api.getSignInFeed', const []); - return RealtimeChannel.fromJson(result as Map, (json) => SignInOption.fromJson(json, _client)); + return RealtimeChannel.fromJson( + result as Map, + (json) => SignInOption.fromJson(json, _client), + ); } Future getSignInBoard() async { @@ -428,12 +492,14 @@ class Api { } Future getProviderDirectory() async { - final result = await _client.call('api.getProviderDirectory', const []); + final result = await _client.call( + 'api.getProviderDirectory', + const [], + ); return ProviderDirectory.fromJson(result as Map, _client); } } - // --- Blocks Client --- class Blocks { @@ -444,4 +510,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/34-reserved-member-names/dart/client.dart b/native/codegen-fixtures/34-reserved-member-names/dart/client.dart index 73da91236c..7c90f53f26 100644 --- a/native/codegen-fixtures/34-reserved-member-names/dart/client.dart +++ b/native/codegen-fixtures/34-reserved-member-names/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -77,13 +79,23 @@ class Doc { level == other.level; @override - int get hashCode => Object.hash($id, $$v, toJson$, fromJson$, hashCode$, toString$, int$, String$, level); + int get hashCode => Object.hash( + $id, + $$v, + toJson$, + fromJson$, + hashCode$, + toString$, + int$, + String$, + level, + ); @override - String toString() => 'Doc(\$id: ${$id}, \$\$v: ${$$v}, toJson\$: ${toJson$}, fromJson\$: ${fromJson$}, hashCode\$: ${hashCode$}, toString\$: ${toString$}, int\$: ${int$}, String\$: ${String$}, level: $level)'; + String toString() => + 'Doc(\$id: ${$id}, \$\$v: ${$$v}, toJson\$: ${toJson$}, fromJson\$: ${fromJson$}, hashCode\$: ${hashCode$}, toString\$: ${toString$}, int\$: ${int$}, String\$: ${String$}, level: $level)'; } - class Extras { final String additionalProperties$; final String id; @@ -101,7 +113,8 @@ class Extras { additionalProperties$: json['additionalProperties'] as String, id: json['id'] as String, additionalProperties: Map.fromEntries( - json.entries.where((e) => !knownKeys.contains(e.key)) + json.entries + .where((e) => !knownKeys.contains(e.key)) .map((e) => MapEntry(e.key, e.value as int)), ), ); @@ -112,7 +125,8 @@ class Extras { 'additionalProperties': additionalProperties$, 'id': id, for (final e in additionalProperties.entries) - if (!const {'additionalProperties', 'id'}.contains(e.key)) e.key: e.value, + if (!const {'additionalProperties', 'id'}.contains(e.key)) + e.key: e.value, }; } @@ -125,20 +139,23 @@ class Extras { blocksDeepEquals(additionalProperties, other.additionalProperties); @override - int get hashCode => Object.hash(additionalProperties$, id, blocksDeepHash(additionalProperties)); + int get hashCode => Object.hash( + additionalProperties$, + id, + blocksDeepHash(additionalProperties), + ); @override - String toString() => 'Extras(additionalProperties\$: ${additionalProperties$}, id: $id, additionalProperties: $additionalProperties)'; + String toString() => + 'Extras(additionalProperties\$: ${additionalProperties$}, id: $id, additionalProperties: $additionalProperties)'; } - enum Level { values$, index$, name$, $hidden, - ok -; + ok; static const _jsonMap = { 'values': values$, @@ -158,24 +175,18 @@ enum Level { static Level fromJson(String json) => _jsonMap[json]!; } - class Api { final BlocksClient _client; Api(this._client); Future getDoc({required String $id, int? int$}) async { - final params = [ - $id, - if (int$ != null) int$, - ]; + final params = [$id, if (int$ != null) int$]; final result = await _client.call('api.getDoc', params); return Doc.fromJson(result as Map); } Future putExtras({required Extras extras}) async { - final params = [ - extras.toJson(), - ]; + final params = [extras.toJson()]; final result = await _client.call('api.putExtras', params); return Extras.fromJson(result as Map); } @@ -186,7 +197,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -197,4 +207,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/36-union-value-arms/dart/client.dart b/native/codegen-fixtures/36-union-value-arms/dart/client.dart index b405a70924..2882bece50 100644 --- a/native/codegen-fixtures/36-union-value-arms/dart/client.dart +++ b/native/codegen-fixtures/36-union-value-arms/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -13,31 +15,19 @@ class Point { final num x; final num y; - const Point({ - required this.x, - required this.y, - }); + const Point({required this.x, required this.y}); factory Point.fromJson(Map json) { - return Point( - x: json['x'] as num, - y: json['y'] as num, - ); + return Point(x: json['x'] as num, y: json['y'] as num); } Map toJson() { - return { - 'x': x, - 'y': y, - }; + return {'x': x, 'y': y}; } @override bool operator ==(Object other) => - identical(this, other) || - other is Point && - x == other.x && - y == other.y; + identical(this, other) || other is Point && x == other.x && y == other.y; @override int get hashCode => Object.hash(x, y); @@ -46,7 +36,6 @@ class Point { String toString() => 'Point(x: $x, y: $y)'; } - // --- API Namespaces --- class Api { @@ -54,49 +43,37 @@ class Api { Api(this._client); Future echoPrimitive({required dynamic value}) async { - final params = [ - value, - ]; + final params = [value]; final result = await _client.call('api.echoPrimitive', params); return result as dynamic; } Future echoCollection({required dynamic value}) async { - final params = [ - value, - ]; + final params = [value]; final result = await _client.call('api.echoCollection', params); return result as dynamic; } Future echoShape({required dynamic value}) async { - final params = [ - value, - ]; + final params = [value]; final result = await _client.call('api.echoShape', params); return result as dynamic; } Future echoLiteral({required dynamic value}) async { - final params = [ - value, - ]; + final params = [value]; final result = await _client.call('api.echoLiteral', params); return result as dynamic; } Future echoTagged({required dynamic value}) async { - final params = [ - value, - ]; + final params = [value]; final result = await _client.call('api.echoTagged', params); return result as dynamic; } Future echoMoment({required dynamic value}) async { - final params = [ - value, - ]; + final params = [value]; final result = await _client.call('api.echoMoment', params); return result as dynamic; } @@ -107,7 +84,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -118,4 +94,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/37-oidc-provider-enum/dart/client.dart b/native/codegen-fixtures/37-oidc-provider-enum/dart/client.dart index 87a8259945..e85258df2c 100644 --- a/native/codegen-fixtures/37-oidc-provider-enum/dart/client.dart +++ b/native/codegen-fixtures/37-oidc-provider-enum/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,10 +6,25 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; -export 'package:blocks_runtime/blocks_runtime.dart' show RealtimeChannel, FileDownloadHandle, FileUploadHandle; -export 'package:blocks_runtime/blocks_runtime.dart' show OidcClient, OidcAuthState, OidcSignedIn, OidcSignedOut, OidcLoading, OidcUser, TokenStore, InMemoryTokenStore, AuthProvider, BrowserLauncher, ProviderConfig; -export 'package:blocks_runtime/blocks_runtime.dart' show TypedOidcClient, OidcProvider; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show RealtimeChannel, FileDownloadHandle, FileUploadHandle; +export 'package:blocks_runtime/blocks_runtime.dart' + show + OidcClient, + OidcAuthState, + OidcSignedIn, + OidcSignedOut, + OidcLoading, + OidcUser, + TokenStore, + InMemoryTokenStore, + AuthProvider, + BrowserLauncher, + ProviderConfig; +export 'package:blocks_runtime/blocks_runtime.dart' + show TypedOidcClient, OidcProvider; // --- Models --- @@ -19,8 +35,7 @@ enum AuthApiGetClientProvider implements OidcProvider { google('google'), github('github'), mySso('my-sso'), - loginGov('login.gov') -; + loginGov('login.gov'); const AuthApiGetClientProvider(this.providerName); @@ -36,29 +51,41 @@ enum AuthApiGetClientProvider implements OidcProvider { } } - class AuthApi { final BlocksClient _client; AuthApi(this._client); Future> getClient() async { final result = await _client.call('auth.getClient', const []); - return TypedOidcClient(OidcClient.fromJson(result as Map, baseUrl: _client.baseUrl, tokenStore: _client.tokenStore, sessionStore: _client.sessionStore)); + return TypedOidcClient( + OidcClient.fromJson( + result as Map, + baseUrl: _client.baseUrl, + tokenStore: _client.tokenStore, + sessionStore: _client.sessionStore, + ), + ); } } - class LegacyAuthApi { final BlocksClient _client; LegacyAuthApi(this._client); Future getClient() async { - final result = await _client.call('legacyAuth.getClient', const []); - return OidcClient.fromJson(result as Map, baseUrl: _client.baseUrl, tokenStore: _client.tokenStore, sessionStore: _client.sessionStore); + final result = await _client.call( + 'legacyAuth.getClient', + const [], + ); + return OidcClient.fromJson( + result as Map, + baseUrl: _client.baseUrl, + tokenStore: _client.tokenStore, + sessionStore: _client.sessionStore, + ); } } - // --- Blocks Client --- class Blocks { @@ -71,4 +98,3 @@ class Blocks { legacyAuth = LegacyAuthApi(client); } } - diff --git a/native/codegen-fixtures/38-generated-name-collisions/dart/client.dart b/native/codegen-fixtures/38-generated-name-collisions/dart/client.dart index 1c58ee681f..187e4123b8 100644 --- a/native/codegen-fixtures/38-generated-name-collisions/dart/client.dart +++ b/native/codegen-fixtures/38-generated-name-collisions/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,34 +6,28 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- class ProfileUser_name { final String first; - const ProfileUser_name({ - required this.first, - }); + const ProfileUser_name({required this.first}); factory ProfileUser_name.fromJson(Map json) { - return ProfileUser_name( - first: json['first'] as String, - ); + return ProfileUser_name(first: json['first'] as String); } Map toJson() { - return { - 'first': first, - }; + return {'first': first}; } @override bool operator ==(Object other) => identical(this, other) || - other is ProfileUser_name && - first == other.first; + other is ProfileUser_name && first == other.first; @override int get hashCode => first.hashCode; @@ -41,31 +36,22 @@ class ProfileUser_name { String toString() => 'ProfileUser_name(first: $first)'; } - class ProfileUserName { final String last; - const ProfileUserName({ - required this.last, - }); + const ProfileUserName({required this.last}); factory ProfileUserName.fromJson(Map json) { - return ProfileUserName( - last: json['last'] as String, - ); + return ProfileUserName(last: json['last'] as String); } Map toJson() { - return { - 'last': last, - }; + return {'last': last}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ProfileUserName && - last == other.last; + identical(this, other) || other is ProfileUserName && last == other.last; @override int get hashCode => last.hashCode; @@ -74,31 +60,22 @@ class ProfileUserName { String toString() => 'ProfileUserName(last: $last)'; } - class ProfileMeta { final String x; - const ProfileMeta({ - required this.x, - }); + const ProfileMeta({required this.x}); factory ProfileMeta.fromJson(Map json) { - return ProfileMeta( - x: json['x'] as String, - ); + return ProfileMeta(x: json['x'] as String); } Map toJson() { - return { - 'x': x, - }; + return {'x': x}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ProfileMeta && - x == other.x; + identical(this, other) || other is ProfileMeta && x == other.x; @override int get hashCode => x.hashCode; @@ -107,11 +84,9 @@ class ProfileMeta { String toString() => 'ProfileMeta(x: $x)'; } - enum ProfileState { inProgress, - in_progress -; + in_progress; static const _jsonMap = { 'in-progress': inProgress, @@ -125,7 +100,6 @@ enum ProfileState { static ProfileState fromJson(String json) => _jsonMap[json]!; } - // --- API Namespaces --- class Profile { @@ -143,8 +117,12 @@ class Profile { factory Profile.fromJson(Map json) { return Profile( - user_name: ProfileUser_name.fromJson(json['user_name'] as Map), - userName: ProfileUserName.fromJson(json['userName'] as Map), + user_name: ProfileUser_name.fromJson( + json['user_name'] as Map, + ), + userName: ProfileUserName.fromJson( + json['userName'] as Map, + ), Meta: ProfileMeta.fromJson(json['Meta'] as Map), state: ProfileState.fromJson(json['state'] as String), ); @@ -172,25 +150,23 @@ class Profile { int get hashCode => Object.hash(user_name, userName, Meta, state); @override - String toString() => 'Profile(user_name: $user_name, userName: $userName, Meta: $Meta, state: $state)'; + String toString() => + 'Profile(user_name: $user_name, userName: $userName, Meta: $Meta, state: $state)'; } - class Bag { final String attributes; final Map additionalProperties; - const Bag({ - required this.attributes, - this.additionalProperties = const {}, - }); + const Bag({required this.attributes, this.additionalProperties = const {}}); factory Bag.fromJson(Map json) { const knownKeys = {'attributes'}; return Bag( attributes: json['attributes'] as String, additionalProperties: Map.fromEntries( - json.entries.where((e) => !knownKeys.contains(e.key)) + json.entries + .where((e) => !knownKeys.contains(e.key)) .map((e) => MapEntry(e.key, e.value as String)), ), ); @@ -212,37 +188,30 @@ class Bag { blocksDeepEquals(additionalProperties, other.additionalProperties); @override - int get hashCode => Object.hash(attributes, blocksDeepHash(additionalProperties)); + int get hashCode => + Object.hash(attributes, blocksDeepHash(additionalProperties)); @override - String toString() => 'Bag(attributes: $attributes, additionalProperties: $additionalProperties)'; + String toString() => + 'Bag(attributes: $attributes, additionalProperties: $additionalProperties)'; } - class Weird { final String backSlash; - const Weird({ - required this.backSlash, - }); + const Weird({required this.backSlash}); factory Weird.fromJson(Map json) { - return Weird( - backSlash: json['back\\slash'] as String, - ); + return Weird(backSlash: json['back\\slash'] as String); } Map toJson() { - return { - 'back\\slash': backSlash, - }; + return {'back\\slash': backSlash}; } @override bool operator ==(Object other) => - identical(this, other) || - other is Weird && - backSlash == other.backSlash; + identical(this, other) || other is Weird && backSlash == other.backSlash; @override int get hashCode => backSlash.hashCode; @@ -251,31 +220,22 @@ class Weird { String toString() => 'Weird(backSlash: $backSlash)'; } - class ApiSendResult { final String sent; - const ApiSendResult({ - required this.sent, - }); + const ApiSendResult({required this.sent}); factory ApiSendResult.fromJson(Map json) { - return ApiSendResult( - sent: json['sent'] as String, - ); + return ApiSendResult(sent: json['sent'] as String); } Map toJson() { - return { - 'sent': sent, - }; + return {'sent': sent}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ApiSendResult && - sent == other.sent; + identical(this, other) || other is ApiSendResult && sent == other.sent; @override int get hashCode => sent.hashCode; @@ -284,31 +244,22 @@ class ApiSendResult { String toString() => 'ApiSendResult(sent: $sent)'; } - class Same { final String a; - const Same({ - required this.a, - }); + const Same({required this.a}); factory Same.fromJson(Map json) { - return Same( - a: json['a'] as String, - ); + return Same(a: json['a'] as String); } Map toJson() { - return { - 'a': a, - }; + return {'a': a}; } @override bool operator ==(Object other) => - identical(this, other) || - other is Same && - a == other.a; + identical(this, other) || other is Same && a == other.a; @override int get hashCode => a.hashCode; @@ -317,31 +268,22 @@ class Same { String toString() => 'Same(a: $a)'; } - class Same2 { final num b; - const Same2({ - required this.b, - }); + const Same2({required this.b}); factory Same2.fromJson(Map json) { - return Same2( - b: json['b'] as num, - ); + return Same2(b: json['b'] as num); } Map toJson() { - return { - 'b': b, - }; + return {'b': b}; } @override bool operator ==(Object other) => - identical(this, other) || - other is Same2 && - b == other.b; + identical(this, other) || other is Same2 && b == other.b; @override int get hashCode => b.hashCode; @@ -350,12 +292,16 @@ class Same2 { String toString() => 'Same2(b: $b)'; } - class Api { final BlocksClient _client; Api(this._client); - Future send({required String request, required String class$, String? args, String? json}) async { + Future send({ + required String request, + required String class$, + String? args, + String? json, + }) async { final params = [ request, class$, @@ -367,9 +313,7 @@ class Api { } Future getProfile({required Profile profile}) async { - final params = [ - profile.toJson(), - ]; + final params = [profile.toJson()]; final result = await _client.call('api.getProfile', params); return Profile.fromJson(result as Map); } @@ -385,31 +329,24 @@ class Api { } Future relay({required String client}) async { - final params = [ - client, - ]; + final params = [client]; final result = await _client.call('api.relay', params); return result as String; } Future putBag({required Bag bag}) async { - final params = [ - bag.toJson(), - ]; + final params = [bag.toJson()]; final result = await _client.call('api.putBag', params); return Bag.fromJson(result as Map); } Future getWeird({required Weird weird}) async { - final params = [ - weird.toJson(), - ]; + final params = [weird.toJson()]; final result = await _client.call('api.getWeird', params); return Weird.fromJson(result as Map); } } - class ABApi { final BlocksClient _client; ABApi(this._client); @@ -420,7 +357,6 @@ class ABApi { } } - // --- Blocks Client --- class Blocks { @@ -433,4 +369,3 @@ class Blocks { aB = ABApi(client); } } - diff --git a/native/codegen-fixtures/39-self-referencing-types/dart/client.dart b/native/codegen-fixtures/39-self-referencing-types/dart/client.dart index eed3695233..68559c059f 100644 --- a/native/codegen-fixtures/39-self-referencing-types/dart/client.dart +++ b/native/codegen-fixtures/39-self-referencing-types/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -13,15 +15,14 @@ class Product { final String sku; final List categories; - const Product({ - required this.sku, - required this.categories, - }); + const Product({required this.sku, required this.categories}); factory Product.fromJson(Map json) { return Product( sku: json['sku'] as String, - categories: (json['categories'] as List).map((e) => Category.fromJson(e as Map)).toList(), + categories: (json['categories'] as List) + .map((e) => Category.fromJson(e as Map)) + .toList(), ); } @@ -46,7 +47,6 @@ class Product { String toString() => 'Product(sku: $sku, categories: $categories)'; } - // --- API Namespaces --- class TreeNode { @@ -54,17 +54,17 @@ class TreeNode { final List children; final Map? byName; - const TreeNode({ - required this.label, - required this.children, - this.byName, - }); + const TreeNode({required this.label, required this.children, this.byName}); factory TreeNode.fromJson(Map json) { return TreeNode( label: json['label'] as String, - children: (json['children'] as List).map((e) => TreeNode.fromJson(e as Map)).toList(), - byName: (json['byName'] as Map?)?.map((k, v) => MapEntry(k, TreeNode.fromJson(v as Map))), + children: (json['children'] as List) + .map((e) => TreeNode.fromJson(e as Map)) + .toList(), + byName: (json['byName'] as Map?)?.map( + (k, v) => MapEntry(k, TreeNode.fromJson(v as Map)), + ), ); } @@ -72,7 +72,8 @@ class TreeNode { return { 'label': label, 'children': children.map((e) => e.toJson()).toList(), - if (byName != null) 'byName': byName?.map((k, v) => MapEntry(k, v.toJson())), + if (byName != null) + 'byName': byName?.map((k, v) => MapEntry(k, v.toJson())), }; } @@ -85,34 +86,31 @@ class TreeNode { blocksDeepEquals(byName, other.byName); @override - int get hashCode => Object.hash(label, blocksDeepHash(children), blocksDeepHash(byName)); + int get hashCode => + Object.hash(label, blocksDeepHash(children), blocksDeepHash(byName)); @override - String toString() => 'TreeNode(label: $label, children: $children, byName: $byName)'; + String toString() => + 'TreeNode(label: $label, children: $children, byName: $byName)'; } - class Comment { final String text; final List? replies; - const Comment({ - required this.text, - required this.replies, - }); + const Comment({required this.text, required this.replies}); factory Comment.fromJson(Map json) { return Comment( text: json['text'] as String, - replies: (json['replies'] as List?)?.map((e) => Comment.fromJson(e as Map)).toList(), + replies: (json['replies'] as List?) + ?.map((e) => Comment.fromJson(e as Map)) + .toList(), ); } Map toJson() { - return { - 'text': text, - 'replies': replies?.map((e) => e.toJson()).toList(), - }; + return {'text': text, 'replies': replies?.map((e) => e.toJson()).toList()}; } @override @@ -129,28 +127,23 @@ class Comment { String toString() => 'Comment(text: $text, replies: $replies)'; } - class Category { final String name; final List products; - const Category({ - required this.name, - required this.products, - }); + const Category({required this.name, required this.products}); factory Category.fromJson(Map json) { return Category( name: json['name'] as String, - products: (json['products'] as List).map((e) => Product.fromJson(e as Map)).toList(), + products: (json['products'] as List) + .map((e) => Product.fromJson(e as Map)) + .toList(), ); } Map toJson() { - return { - 'name': name, - 'products': products.map((e) => e.toJson()).toList(), - }; + return {'name': name, 'products': products.map((e) => e.toJson()).toList()}; } @override @@ -167,15 +160,12 @@ class Category { String toString() => 'Category(name: $name, products: $products)'; } - class Api { final BlocksClient _client; Api(this._client); Future getTree({required TreeNode root}) async { - final params = [ - root.toJson(), - ]; + final params = [root.toJson()]; final result = await _client.call('api.getTree', params); return TreeNode.fromJson(result as Map); } @@ -187,11 +177,12 @@ class Api { Future getCategory() async { final result = await _client.call('api.getCategory', const []); - return result == null ? null : Category.fromJson(result as Map); + return result == null + ? null + : Category.fromJson(result as Map); } } - // --- Blocks Client --- class Blocks { @@ -202,4 +193,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/40-empty-object-schemas/dart/client.dart b/native/codegen-fixtures/40-empty-object-schemas/dart/client.dart index da5872a3e4..13ad74f2a7 100644 --- a/native/codegen-fixtures/40-empty-object-schemas/dart/client.dart +++ b/native/codegen-fixtures/40-empty-object-schemas/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -52,30 +54,30 @@ class GetEnvelopeResult { blocksDeepEquals(settings, other.settings); @override - int get hashCode => Object.hash(id, blocksDeepHash(meta), blocksDeepHash(attachments), blocksDeepHash(settings)); + int get hashCode => Object.hash( + id, + blocksDeepHash(meta), + blocksDeepHash(attachments), + blocksDeepHash(settings), + ); @override - String toString() => 'GetEnvelopeResult(id: $id, meta: $meta, attachments: $attachments, settings: $settings)'; + String toString() => + 'GetEnvelopeResult(id: $id, meta: $meta, attachments: $attachments, settings: $settings)'; } - class Api { final BlocksClient _client; Api(this._client); Future getOptions({required dynamic options, dynamic extra}) async { - final params = [ - options, - if (extra != null) extra, - ]; + final params = [options, if (extra != null) extra]; final result = await _client.call('api.getOptions', params); return result as dynamic; } Future getSettings({required dynamic settings}) async { - final params = [ - settings, - ]; + final params = [settings]; final result = await _client.call('api.getSettings', params); return result as dynamic; } @@ -86,7 +88,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -97,4 +98,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/41-void-methods/dart/client.dart b/native/codegen-fixtures/41-void-methods/dart/client.dart index f33b57b9cc..6bae113530 100644 --- a/native/codegen-fixtures/41-void-methods/dart/client.dart +++ b/native/codegen-fixtures/41-void-methods/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -20,10 +22,7 @@ class Api { } Future remember({required String note, String? tag}) async { - final params = [ - note, - if (tag != null) tag, - ]; + final params = [note, if (tag != null) tag]; await _client.call('api.remember', params); } @@ -33,7 +32,6 @@ class Api { } } - // --- Blocks Client --- class Blocks { @@ -44,4 +42,3 @@ class Blocks { api = Api(client); } } - diff --git a/native/codegen-fixtures/42-deduplicated-embedded-union/dart/client.dart b/native/codegen-fixtures/42-deduplicated-embedded-union/dart/client.dart index 816be641eb..a9711980fc 100644 --- a/native/codegen-fixtures/42-deduplicated-embedded-union/dart/client.dart +++ b/native/codegen-fixtures/42-deduplicated-embedded-union/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -14,9 +16,12 @@ sealed class ConfirmSignInInputChallenge { Map toJson(); static ConfirmSignInInputChallenge fromJson(Map json) { switch (json['challenge'] as String) { - case 'code': return CodeConfirmSignInInputChallenge.fromJson(json); - case 'newPassword': return NewPasswordConfirmSignInInputChallenge.fromJson(json); - default: throw ArgumentError('Unknown challenge: ${json['challenge']}'); + case 'code': + return CodeConfirmSignInInputChallenge.fromJson(json); + case 'newPassword': + return NewPasswordConfirmSignInInputChallenge.fromJson(json); + default: + throw ArgumentError('Unknown challenge: ${json['challenge']}'); } } } @@ -24,29 +29,21 @@ sealed class ConfirmSignInInputChallenge { class CodeConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { final String code; - const CodeConfirmSignInInputChallenge({ - required this.code, - }); + const CodeConfirmSignInInputChallenge({required this.code}); factory CodeConfirmSignInInputChallenge.fromJson(Map json) { - return CodeConfirmSignInInputChallenge( - code: json['code'] as String, - ); + return CodeConfirmSignInInputChallenge(code: json['code'] as String); } @override Map toJson() { - return { - 'challenge': 'code', - 'code': code, - }; + return {'challenge': 'code', 'code': code}; } @override bool operator ==(Object other) => identical(this, other) || - other is CodeConfirmSignInInputChallenge && - code == other.code; + other is CodeConfirmSignInInputChallenge && code == other.code; @override int get hashCode => code.hashCode; @@ -55,14 +52,15 @@ class CodeConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { String toString() => 'CodeConfirmSignInInputChallenge(code: $code)'; } -class NewPasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge { +class NewPasswordConfirmSignInInputChallenge + extends ConfirmSignInInputChallenge { final String newPassword; - const NewPasswordConfirmSignInInputChallenge({ - required this.newPassword, - }); + const NewPasswordConfirmSignInInputChallenge({required this.newPassword}); - factory NewPasswordConfirmSignInInputChallenge.fromJson(Map json) { + factory NewPasswordConfirmSignInInputChallenge.fromJson( + Map json, + ) { return NewPasswordConfirmSignInInputChallenge( newPassword: json['newPassword'] as String, ); @@ -70,10 +68,7 @@ class NewPasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge @override Map toJson() { - return { - 'challenge': 'newPassword', - 'newPassword': newPassword, - }; + return {'challenge': 'newPassword', 'newPassword': newPassword}; } @override @@ -86,19 +81,21 @@ class NewPasswordConfirmSignInInputChallenge extends ConfirmSignInInputChallenge int get hashCode => newPassword.hashCode; @override - String toString() => 'NewPasswordConfirmSignInInputChallenge(newPassword: $newPassword)'; + String toString() => + 'NewPasswordConfirmSignInInputChallenge(newPassword: $newPassword)'; } - - sealed class AlphaApiSetStateInput { const AlphaApiSetStateInput(); Map toJson(); static AlphaApiSetStateInput fromJson(Map json) { switch (json['action'] as String) { - case 'signIn': return SignInInput.fromJson(json); - case 'confirmSignIn': return ConfirmSignInInput.fromJson(json); - default: throw ArgumentError('Unknown action: ${json['action']}'); + case 'signIn': + return SignInInput.fromJson(json); + case 'confirmSignIn': + return ConfirmSignInInput.fromJson(json); + default: + throw ArgumentError('Unknown action: ${json['action']}'); } } } @@ -106,29 +103,21 @@ sealed class AlphaApiSetStateInput { class SignInInput extends AlphaApiSetStateInput { final String username; - const SignInInput({ - required this.username, - }); + const SignInInput({required this.username}); factory SignInInput.fromJson(Map json) { - return SignInInput( - username: json['username'] as String, - ); + return SignInInput(username: json['username'] as String); } @override Map toJson() { - return { - 'action': 'signIn', - 'username': username, - }; + return {'action': 'signIn', 'username': username}; } @override bool operator ==(Object other) => identical(this, other) || - other is SignInInput && - username == other.username; + other is SignInInput && username == other.username; @override int get hashCode => username.hashCode; @@ -137,16 +126,11 @@ class SignInInput extends AlphaApiSetStateInput { String toString() => 'SignInInput(username: $username)'; } - - class ConfirmSignInInput extends AlphaApiSetStateInput { final String session; final ConfirmSignInInputChallenge challenge; - const ConfirmSignInInput({ - required this.session, - required this.challenge, - }); + const ConfirmSignInInput({required this.session, required this.challenge}); factory ConfirmSignInInput.fromJson(Map json) { return ConfirmSignInInput( @@ -175,11 +159,10 @@ class ConfirmSignInInput extends AlphaApiSetStateInput { int get hashCode => Object.hash(session, challenge); @override - String toString() => 'ConfirmSignInInput(session: $session, challenge: $challenge)'; + String toString() => + 'ConfirmSignInInput(session: $session, challenge: $challenge)'; } - - // --- API Namespaces --- class AlphaApi { @@ -187,29 +170,23 @@ class AlphaApi { AlphaApi(this._client); Future setState({required AlphaApiSetStateInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('alphaApi.setState', params); return result as bool; } } - class BetaApi { final BlocksClient _client; BetaApi(this._client); Future setState({required AlphaApiSetStateInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('betaApi.setState', params); return result as bool; } } - // --- Blocks Client --- class Blocks { @@ -222,4 +199,3 @@ class Blocks { betaApi = BetaApi(client); } } - diff --git a/native/codegen-fixtures/43-non-identifier-names/dart/client.dart b/native/codegen-fixtures/43-non-identifier-names/dart/client.dart index 29dbcc9f11..674e92f557 100644 --- a/native/codegen-fixtures/43-non-identifier-names/dart/client.dart +++ b/native/codegen-fixtures/43-non-identifier-names/dart/client.dart @@ -1,3 +1,4 @@ +// dart format width=80 // GENERATED CODE — DO NOT MODIFY BY HAND // Generator: blocks-codegen // Source: test v1.0.0 @@ -5,7 +6,8 @@ // ignore_for_file: constant_identifier_names import 'package:blocks_runtime/blocks_runtime.dart'; -export 'package:blocks_runtime/blocks_runtime.dart' show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; +export 'package:blocks_runtime/blocks_runtime.dart' + show BlocksClient, BlocksRpcException, SessionStore, InMemorySessionStore; // --- Models --- @@ -18,8 +20,7 @@ enum SampleType$XKind { Z, $, $1st, - SpAce -; + SpAce; static const _jsonMap = { 'a"b': aB, @@ -47,7 +48,6 @@ enum SampleType$XKind { static SampleType$XKind fromJson(String json) => _jsonMap[json]!; } - // --- API Namespaces --- class SampleType$X { @@ -80,8 +80,10 @@ class SampleType$X { this.$9lives, this.kind, }) { - if (!(runErrorXId.length >= 2)) throw ArgumentError('runErrorXId must be at least 2 characters'); - if (!(semiColon.length <= 10)) throw ArgumentError('semiColon must be at most 10 characters'); + if (!(runErrorXId.length >= 2)) + throw ArgumentError('runErrorXId must be at least 2 characters'); + if (!(semiColon.length <= 10)) + throw ArgumentError('semiColon must be at most 10 characters'); if (!(withSpace >= 1)) throw ArgumentError('withSpace must be >= 1'); } @@ -99,7 +101,9 @@ class SampleType$X { newLine: json['new\nline'] as String?, withSpace: (json['with space'] as num).toInt(), $9lives: json['9lives'] as bool?, - kind: json['kind'] != null ? SampleType$XKind.fromJson(json['kind'] as String) : null, + kind: json['kind'] != null + ? SampleType$XKind.fromJson(json['kind'] as String) + : null, ); } @@ -140,18 +144,36 @@ class SampleType$X { kind == other.kind; @override - int get hashCode => Object.hash(runErrorXId, $, $X, Y, $$, qUote, sIngle, semiColon, backTick, newLine, withSpace, $9lives, kind); + int get hashCode => Object.hash( + runErrorXId, + $, + $X, + Y, + $$, + qUote, + sIngle, + semiColon, + backTick, + newLine, + withSpace, + $9lives, + kind, + ); @override - String toString() => 'SampleType\$X(runErrorXId: $runErrorXId, \$: ${$}, \$X: ${$X}, Y: $Y, \$\$: ${$$}, qUote: $qUote, sIngle: $sIngle, semiColon: $semiColon, backTick: $backTick, newLine: $newLine, withSpace: $withSpace, \$9lives: ${$9lives}, kind: $kind)'; + String toString() => + 'SampleType\$X(runErrorXId: $runErrorXId, \$: ${$}, \$X: ${$X}, Y: $Y, \$\$: ${$$}, qUote: $qUote, sIngle: $sIngle, semiColon: $semiColon, backTick: $backTick, newLine: $newLine, withSpace: $withSpace, \$9lives: ${$9lives}, kind: $kind)'; } - class Api { final BlocksClient _client; Api(this._client); - Future getSampleX({required String runErrorXParamP, required SampleType$X item, int? optIonal}) async { + Future getSampleX({ + required String runErrorXParamP, + required SampleType$X item, + int? optIonal, + }) async { final params = [ runErrorXParamP, item.toJson(), @@ -162,15 +184,17 @@ class Api { } } - sealed class NsDoActionInput { const NsDoActionInput(); Map toJson(); static NsDoActionInput fromJson(Map json) { switch (json['ty pe'] as String) { - case 'cre"ate': return CreAteInput.fromJson(json); - case 're`move': return ReMoveInput.fromJson(json); - default: throw ArgumentError('Unknown ty pe: ${json['ty pe']}'); + case 'cre"ate': + return CreAteInput.fromJson(json); + case 're`move': + return ReMoveInput.fromJson(json); + default: + throw ArgumentError('Unknown ty pe: ${json['ty pe']}'); } } } @@ -178,29 +202,20 @@ sealed class NsDoActionInput { class CreAteInput extends NsDoActionInput { final String tiTle; - const CreAteInput({ - required this.tiTle, - }); + const CreAteInput({required this.tiTle}); factory CreAteInput.fromJson(Map json) { - return CreAteInput( - tiTle: json['ti;tle'] as String, - ); + return CreAteInput(tiTle: json['ti;tle'] as String); } @override Map toJson() { - return { - 'ty pe': 'cre"ate', - 'ti;tle': tiTle, - }; + return {'ty pe': 'cre"ate', 'ti;tle': tiTle}; } @override bool operator ==(Object other) => - identical(this, other) || - other is CreAteInput && - tiTle == other.tiTle; + identical(this, other) || other is CreAteInput && tiTle == other.tiTle; @override int get hashCode => tiTle.hashCode; @@ -212,29 +227,20 @@ class CreAteInput extends NsDoActionInput { class ReMoveInput extends NsDoActionInput { final String $Id; - const ReMoveInput({ - required this.$Id, - }); + const ReMoveInput({required this.$Id}); factory ReMoveInput.fromJson(Map json) { - return ReMoveInput( - $Id: json['\${id}'] as String, - ); + return ReMoveInput($Id: json['\${id}'] as String); } @override Map toJson() { - return { - 'ty pe': 're`move', - '\${id}': $Id, - }; + return {'ty pe': 're`move', '\${id}': $Id}; } @override bool operator ==(Object other) => - identical(this, other) || - other is ReMoveInput && - $Id == other.$Id; + identical(this, other) || other is ReMoveInput && $Id == other.$Id; @override int get hashCode => $Id.hashCode; @@ -243,32 +249,22 @@ class ReMoveInput extends NsDoActionInput { String toString() => 'ReMoveInput(\$Id: ${$Id})'; } - - class DoActionResult { final bool ok; - const DoActionResult({ - required this.ok, - }); + const DoActionResult({required this.ok}); factory DoActionResult.fromJson(Map json) { - return DoActionResult( - ok: json['ok`'] as bool, - ); + return DoActionResult(ok: json['ok`'] as bool); } Map toJson() { - return { - 'ok`': ok, - }; + return {'ok`': ok}; } @override bool operator ==(Object other) => - identical(this, other) || - other is DoActionResult && - ok == other.ok; + identical(this, other) || other is DoActionResult && ok == other.ok; @override int get hashCode => ok.hashCode; @@ -277,28 +273,23 @@ class DoActionResult { String toString() => 'DoActionResult(ok: $ok)'; } - class NsApi { final BlocksClient _client; NsApi(this._client); Future doAction({required NsDoActionInput input}) async { - final params = [ - input.toJson(), - ]; + final params = [input.toJson()]; final result = await _client.call('ns.do`Action', params); return DoActionResult.fromJson(result as Map); } } - // --- Servers --- class Servers { static const String mainValX1 = 'https://example.com'; } - // --- Blocks Client --- class Blocks { @@ -306,9 +297,11 @@ class Blocks { late final NsApi ns; Blocks({String? baseUrl, SessionStore? sessionStore}) { - final client = BlocksClient(baseUrl: baseUrl ?? Servers.mainValX1, sessionStore: sessionStore); + final client = BlocksClient( + baseUrl: baseUrl ?? Servers.mainValX1, + sessionStore: sessionStore, + ); api = Api(client); ns = NsApi(client); } } - diff --git a/native/dart/packages/blocks_codegen/CHANGELOG.md b/native/dart/packages/blocks_codegen/CHANGELOG.md index 5c3e1f178b..a82abd28f1 100644 --- a/native/dart/packages/blocks_codegen/CHANGELOG.md +++ b/native/dart/packages/blocks_codegen/CHANGELOG.md @@ -62,6 +62,9 @@ ### Other changes +- Format every generated Dart client at width 80, using the target package's + Dart language version when available, so output passes `dart format` without + a separate consumer-side formatting step. - **Requires the `blocks_runtime` release with this change.** - A spec that names no providers, and an OIDC client inside a model, list, map or parameter, are still a plain `OidcClient`, unchanged. diff --git a/native/dart/packages/blocks_codegen/README.md b/native/dart/packages/blocks_codegen/README.md index 4ac354b615..e678c8edf7 100644 --- a/native/dart/packages/blocks_codegen/README.md +++ b/native/dart/packages/blocks_codegen/README.md @@ -18,6 +18,12 @@ Add to `build.yaml` and place your `.spec.json` in `lib/`. Run: dart run build_runner build ``` +Generated clients are formatted at width 80 and start with +`// dart format width=80`, so checked-in output passes `dart format` without a +separate formatting step. The CLI and build_runner use the target package's +Dart language version when available; direct generator calls default to Dart +3.11 unless they pass `languageVersion`. + ## Generated names Dart declares a union's arm classes at the top level, named `` diff --git a/native/dart/packages/blocks_codegen/bin/blocks_codegen.dart b/native/dart/packages/blocks_codegen/bin/blocks_codegen.dart index cf70347925..150595ca83 100644 --- a/native/dart/packages/blocks_codegen/bin/blocks_codegen.dart +++ b/native/dart/packages/blocks_codegen/bin/blocks_codegen.dart @@ -1,11 +1,15 @@ import 'dart:io'; import 'package:args/args.dart'; -import 'package:blocks_codegen/src/parser.dart'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; +import 'package:blocks_codegen/src/language_version.dart'; +import 'package:blocks_codegen/src/parser.dart'; +import 'package:dart_style/dart_style.dart'; +import 'package:package_config/package_config.dart'; +import 'package:pub_semver/pub_semver.dart'; -void main(List args) { +Future main(List args) async { final parser = ArgParser() ..addOption('spec', abbr: 's', help: 'Path to the OpenRPC spec file') ..addOption( @@ -84,6 +88,7 @@ void main(List args) { } final String output; try { + final languageVersion = await _resolveTargetLanguageVersion(outputPath); final rpcModel = const OpenRpcParser().parse(contents); final codegenModel = CodegenModelBuilder( failOnCollision: failOnCollision, @@ -92,7 +97,13 @@ void main(List args) { for (final w in codegenModel.warnings) { stderr.writeln('Warning: $w'); } - output = const DartCodeGenerator().generate(codegenModel); + output = const DartCodeGenerator().generate( + codegenModel, + languageVersion: languageVersion, + ); + } on FormatterException catch (e) { + stderr.writeln('Error: ${e.message(color: false)}'); + exit(1); } on FormatException catch (e) { stderr.writeln('Error: ${e.message}'); exit(1); @@ -110,3 +121,38 @@ void main(List args) { stdout.write(output); } } + +Future _resolveTargetLanguageVersion(String? outputPath) async { + if (outputPath == null) { + final packageConfig = await findPackageConfig(Directory.current); + if (packageConfig == null) return null; + return languageVersionForUri( + packageConfig, + Directory.current.absolute.uri, + ).version; + } + + final outputFile = File(outputPath).absolute; + final outputConfig = await findPackageConfig( + _nearestExistingDirectory(outputFile.parent), + ); + if (outputConfig != null) { + final target = languageVersionForUri(outputConfig, outputFile.uri); + if (target.found) return target.version; + } + + final cwdConfig = await findPackageConfig(Directory.current); + if (cwdConfig == null) return null; + final target = languageVersionForUri(cwdConfig, outputFile.uri); + return target.found ? target.version : null; +} + +Directory _nearestExistingDirectory(Directory directory) { + var current = directory.absolute; + while (!current.existsSync()) { + final parent = current.parent; + if (parent.path == current.path) return current; + current = parent; + } + return current; +} diff --git a/native/dart/packages/blocks_codegen/lib/builder.dart b/native/dart/packages/blocks_codegen/lib/builder.dart index 0baa7b9205..b49b63fbbc 100644 --- a/native/dart/packages/blocks_codegen/lib/builder.dart +++ b/native/dart/packages/blocks_codegen/lib/builder.dart @@ -1,9 +1,9 @@ +import 'package:blocks_codegen/src/builder.dart' as codegen_builder; +import 'package:blocks_codegen/src/generator.dart'; +import 'package:blocks_codegen/src/language_version.dart'; +import 'package:blocks_codegen/src/parser.dart'; import 'package:build/build.dart'; -import 'src/parser.dart'; -import 'src/builder.dart' as codegen_builder; -import 'src/generator.dart'; - /// Factory for the build_runner builder. Builder blocksCodegenBuilder(BuilderOptions options) => _BlocksCodegenBuilder( options.config['fail_on_collision'] as bool? ?? false, @@ -33,6 +33,11 @@ class _BlocksCodegenBuilder extends Builder { Future build(BuildStep buildStep) async { final inputId = buildStep.inputId; final contents = await buildStep.readAsString(inputId); + final packageConfig = await buildStep.packageConfig; + final languageVersion = languageVersionForPackage( + packageConfig, + inputId.package, + ); final rpcModel = const OpenRpcParser().parse(contents); final codegenModel = codegen_builder.CodegenModelBuilder( @@ -42,7 +47,10 @@ class _BlocksCodegenBuilder extends Builder { for (final w in codegenModel.warnings) { log.warning(w); } - final output = const DartCodeGenerator().generate(codegenModel); + final output = const DartCodeGenerator().generate( + codegenModel, + languageVersion: languageVersion, + ); // .spec.json → .blocks.dart (strip both extensions) final path = inputId.path; diff --git a/native/dart/packages/blocks_codegen/lib/src/generator.dart b/native/dart/packages/blocks_codegen/lib/src/generator.dart index a6c090dafc..b3b4aa5106 100644 --- a/native/dart/packages/blocks_codegen/lib/src/generator.dart +++ b/native/dart/packages/blocks_codegen/lib/src/generator.dart @@ -1,8 +1,10 @@ -import 'builder.dart'; -import 'dart_source.dart'; -import 'diagnostics.dart'; -import 'identifiers.dart'; -import 'model.dart'; +import 'package:blocks_codegen/src/builder.dart'; +import 'package:blocks_codegen/src/dart_source.dart'; +import 'package:blocks_codegen/src/diagnostics.dart'; +import 'package:blocks_codegen/src/identifiers.dart'; +import 'package:blocks_codegen/src/model.dart'; +import 'package:dart_style/dart_style.dart'; +import 'package:pub_semver/pub_semver.dart'; /// The oldest `blocks_runtime` that has every API generated code calls /// (`blocksDeepEquals`, `RealtimeChannel.fromJsonValue`, a list-typed @@ -17,9 +19,12 @@ class DartCodeGenerator { /// Emits the complete contents of one generated `.blocks.dart` library. /// - /// Output is deterministic for a given [model], so it is safe to check in - /// and diff. - String generate(CodegenModel model) { + /// Output is formatted at 80 columns and deterministic for a given [model] + /// and [languageVersion], so it is safe to check in and diff. + /// + /// Pass the target package's [languageVersion] when known. When omitted, + /// Dart 3.11 is used, matching this package's minimum SDK version. + String generate(CodegenModel model, {Version? languageVersion}) { _checkNoTransferableParams(model); final buf = StringBuffer(); buf.writeln('// GENERATED CODE — DO NOT MODIFY BY HAND'); @@ -168,9 +173,11 @@ class DartCodeGenerator { _emitBlocksFacade(model.namespaces, apiClasses, model.servers, declared), ); - final output = buf.toString(); - _checkBoundTypesNotShadowed(model, output); - return output; + final rawOutput = buf.toString(); + _checkBoundTypesNotShadowed(model, rawOutput); + return DartFormatter( + languageVersion: languageVersion ?? Version(3, 11, 0), + ).format('// dart format width=80\n$rawOutput'); } String _emitType( diff --git a/native/dart/packages/blocks_codegen/lib/src/language_version.dart b/native/dart/packages/blocks_codegen/lib/src/language_version.dart new file mode 100644 index 0000000000..86c06ad351 --- /dev/null +++ b/native/dart/packages/blocks_codegen/lib/src/language_version.dart @@ -0,0 +1,22 @@ +import 'package:package_config/package_config.dart'; +import 'package:pub_semver/pub_semver.dart'; + +Version? languageVersionForPackage( + PackageConfig packageConfig, + String packageName, +) => _toVersion(packageConfig[packageName]?.languageVersion); + +({bool found, Version? version}) languageVersionForUri( + PackageConfig packageConfig, + Uri target, +) { + final package = packageConfig.packageOf(target); + return ( + found: package != null, + version: _toVersion(package?.languageVersion), + ); +} + +Version? _toVersion(LanguageVersion? languageVersion) => languageVersion == null + ? null + : Version(languageVersion.major, languageVersion.minor, 0); diff --git a/native/dart/packages/blocks_codegen/pubspec.yaml b/native/dart/packages/blocks_codegen/pubspec.yaml index a1981b4f34..9d795ed991 100644 --- a/native/dart/packages/blocks_codegen/pubspec.yaml +++ b/native/dart/packages/blocks_codegen/pubspec.yaml @@ -10,13 +10,16 @@ environment: dependencies: args: ^2.4.0 + # Generated clients need blocks_runtime 0.2.0 (`minimumRuntimeVersion` in + # lib/src/generator.dart); test/generator_test.dart checks the two agree. + blocks_runtime: ^0.2.0 # build_runner 2.17.1 requires build 5, while mockito and other builders # still pin build <5. build 5.0.0 only breaks BuildStep implementers; # this package extends Builder, which is unchanged. build: '>=4.0.0 <6.0.0' - # Generated clients need blocks_runtime 0.2.0 (`minimumRuntimeVersion` in - # lib/src/generator.dart); test/generator_test.dart checks the two agree. - blocks_runtime: ^0.2.0 + dart_style: ^3.1.11 + package_config: '>=2.1.0 <4.0.0' + pub_semver: ^2.1.4 dev_dependencies: # build_runner 2.16.2 is the first release that compiles against analyzer diff --git a/native/dart/packages/blocks_codegen/test/cli_test.dart b/native/dart/packages/blocks_codegen/test/cli_test.dart index 185ec3c3ff..04366e7696 100644 --- a/native/dart/packages/blocks_codegen/test/cli_test.dart +++ b/native/dart/packages/blocks_codegen/test/cli_test.dart @@ -3,11 +3,14 @@ import 'dart:io'; import 'package:test/test.dart'; -ProcessResult _run(List args) => Process.runSync( - Platform.resolvedExecutable, - ['run', 'bin/blocks_codegen.dart', ...args], - workingDirectory: Directory.current.path, -); +final _packageRoot = Directory.current.absolute.path; + +ProcessResult _run(List args, {String? workingDirectory}) => + Process.runSync(Platform.resolvedExecutable, [ + 'run', + '$_packageRoot/bin/blocks_codegen.dart', + ...args, + ], workingDirectory: workingDirectory ?? _packageRoot); const _tag = 'example-iot/device-link'; @@ -63,6 +66,54 @@ String _spec({String? pattern}) => jsonEncode({ }, }); +String _tupleSpec() => jsonEncode({ + 'openrpc': '1.3.2', + 'info': {'title': 'tuple', 'version': '1.0.0'}, + 'methods': [ + { + 'name': 'api.getPair', + 'params': [], + 'result': { + 'name': 'GetPairResult', + 'schema': { + 'type': 'array', + 'prefixItems': [ + {'type': 'string'}, + {'type': 'integer'}, + ], + }, + }, + }, + ], +}); + +typedef _ConfigPackage = ({ + String name, + Directory root, + String? languageVersion, +}); + +void _writePackageConfig( + Directory discoveryRoot, + List<_ConfigPackage> packages, +) { + final dartTool = Directory('${discoveryRoot.path}/.dart_tool')..createSync(); + File('${dartTool.path}/package_config.json').writeAsStringSync( + jsonEncode({ + 'configVersion': 2, + 'packages': [ + for (final package in packages) + { + 'name': package.name, + 'rootUri': package.root.absolute.uri.toString(), + 'packageUri': 'lib/', + 'languageVersion': ?package.languageVersion, + }, + ], + }), + ); +} + void main() { late Directory tmp; @@ -120,6 +171,167 @@ void main() { } }); + test('resolves output below nonexistent directories', () { + final target = Directory('${tmp.path}/target')..createSync(); + _writePackageConfig(target, [ + (name: 'target', root: target, languageVersion: '3.11'), + ]); + final outputPath = '${target.path}/missing/nested/client.dart'; + + final result = _run([ + '--spec', + writeSpec(_tupleSpec()), + '--output', + outputPath, + ], workingDirectory: tmp.path); + + expect(result.exitCode, 0, reason: result.stderr.toString()); + expect( + File(outputPath).readAsStringSync(), + startsWith('// dart format width=80\n'), + ); + }); + + test('prefers the output package language version over cwd', () { + final cwd = Directory('${tmp.path}/cwd')..createSync(); + final target = Directory('${tmp.path}/target')..createSync(); + _writePackageConfig(cwd, [ + (name: 'cwd', root: cwd, languageVersion: '2.19'), + ]); + _writePackageConfig(target, [ + (name: 'target', root: target, languageVersion: '3.11'), + ]); + final outputPath = '${target.path}/lib/client.dart'; + + final result = _run([ + '--spec', + writeSpec(_tupleSpec()), + '--output', + outputPath, + ], workingDirectory: cwd.path); + + expect(result.exitCode, 0, reason: result.stderr.toString()); + expect(File(outputPath).existsSync(), isTrue); + }); + + test( + 'falls back to cwd config only when output config cannot map target', + () { + final cwd = Directory('${tmp.path}/cwd')..createSync(); + final target = Directory('${tmp.path}/target')..createSync(); + final unrelated = Directory('${tmp.path}/unrelated')..createSync(); + _writePackageConfig(target, [ + (name: 'unrelated', root: unrelated, languageVersion: '2.19'), + ]); + _writePackageConfig(cwd, [ + (name: 'cwd', root: cwd, languageVersion: '2.19'), + (name: 'target', root: target, languageVersion: '3.11'), + ]); + final outputPath = '${target.path}/lib/client.dart'; + + final result = _run([ + '--spec', + writeSpec(_tupleSpec()), + '--output', + outputPath, + ], workingDirectory: cwd.path); + + expect(result.exitCode, 0, reason: result.stderr.toString()); + expect(File(outputPath).existsSync(), isTrue); + }, + ); + + test('uses the cwd package language version for stdout', () { + final cwd = Directory('${tmp.path}/cwd')..createSync(); + _writePackageConfig(cwd, [ + (name: 'cwd', root: cwd, languageVersion: '3.11'), + ]); + + final result = _run([ + '--spec', + writeSpec(_tupleSpec()), + ], workingDirectory: cwd.path); + + expect(result.exitCode, 0, reason: result.stderr.toString()); + expect(result.stdout, startsWith('// dart format width=80\n')); + }); + + test('uses Dart 3.11 when a mapped target has no language version', () { + final cwd = Directory('${tmp.path}/cwd')..createSync(); + final target = Directory('${tmp.path}/target')..createSync(); + _writePackageConfig(target, [ + (name: 'target', root: target, languageVersion: null), + ]); + _writePackageConfig(cwd, [ + (name: 'cwd', root: cwd, languageVersion: '3.11'), + (name: 'target', root: target, languageVersion: '2.19'), + ]); + final outputPath = '${target.path}/lib/client.dart'; + + final result = _run([ + '--spec', + writeSpec(_tupleSpec()), + '--output', + outputPath, + ], workingDirectory: cwd.path); + + expect(result.exitCode, 0, reason: result.stderr.toString()); + expect(File(outputPath).existsSync(), isTrue); + }); + + test('uses Dart 3.11 when no package config exists', () { + final cwd = Directory('${tmp.path}/no_config')..createSync(); + + final result = _run([ + '--spec', + writeSpec(_tupleSpec()), + ], workingDirectory: cwd.path); + + expect(result.exitCode, 0, reason: result.stderr.toString()); + expect(result.stdout, startsWith('// dart format width=80\n')); + }); + + test('formatter failure leaves an existing output unchanged', () { + final target = Directory('${tmp.path}/target')..createSync(); + _writePackageConfig(target, [ + (name: 'target', root: target, languageVersion: '2.19'), + ]); + final output = File('${target.path}/client.dart') + ..writeAsStringSync('sentinel'); + + final result = _run([ + '--spec', + writeSpec(_tupleSpec()), + '--output', + output.path, + ], workingDirectory: tmp.path); + + expect(result.exitCode, 1); + expect(result.stderr, startsWith('Error:')); + expect(result.stdout, isEmpty); + expect(output.readAsStringSync(), 'sentinel'); + }); + + test('malformed output package config is reported without writing', () { + final target = Directory('${tmp.path}/target')..createSync(); + final dartTool = Directory('${target.path}/.dart_tool')..createSync(); + File('${dartTool.path}/package_config.json').writeAsStringSync('{'); + final output = File('${target.path}/client.dart') + ..writeAsStringSync('sentinel'); + + final result = _run([ + '--spec', + writeSpec(_spec()), + '--output', + output.path, + ], workingDirectory: tmp.path); + + expect(result.exitCode, 1); + expect(result.stderr, startsWith('Error:')); + expect(result.stdout, isEmpty); + expect(output.readAsStringSync(), 'sentinel'); + }); + test('a spec the parser rejects exits 1 with the message', () { final result = _run(['--spec', writeSpec(_spec(pattern: r'abc\'))]); diff --git a/native/dart/packages/blocks_codegen/test/collision_test.dart b/native/dart/packages/blocks_codegen/test/collision_test.dart index 4b2c8d8051..f302856e4b 100644 --- a/native/dart/packages/blocks_codegen/test/collision_test.dart +++ b/native/dart/packages/blocks_codegen/test/collision_test.dart @@ -1,7 +1,9 @@ import 'package:blocks_codegen/src/model.dart'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; /// Irreducible collision: even full namespace+method+param qualification /// collapses to the same string. diff --git a/native/dart/packages/blocks_codegen/test/dart_source_matchers.dart b/native/dart/packages/blocks_codegen/test/dart_source_matchers.dart new file mode 100644 index 0000000000..7db37f04ea --- /dev/null +++ b/native/dart/packages/blocks_codegen/test/dart_source_matchers.dart @@ -0,0 +1,307 @@ +import 'package:test/test.dart' as test; + +/// Matches exact values, or Dart source strings that differ only in whitespace +/// and context-proven optional trailing commas. +test.Matcher contains(Object? expected) => _DartSourceContains(expected); + +final class _DartSourceContains extends test.Matcher { + _DartSourceContains(this.expected) : _exact = test.contains(expected); + + final Object? expected; + final test.Matcher _exact; + + @override + test.Description describe(test.Description description) => + _exact.describe(description); + + @override + bool matches(Object? item, Map matchState) { + if (_exact.matches(item, matchState)) return true; + if (item is! String || expected is! String) return false; + final source = item; + final expectedSource = expected! as String; + final normalizedExpected = _normalizeDart(expectedSource); + if (normalizedExpected.isEmpty) return false; + if (_normalizeDart(source).contains(normalizedExpected)) return true; + return _normalizeDart( + source, + removeOptionalCommas: true, + ).contains(_normalizeDart(expectedSource, removeOptionalCommas: true)); + } +} + +String _normalizeDart(String source, {bool removeOptionalCommas = false}) { + final output = StringBuffer(); + final delimiters = <({bool callLike, int opener})>[]; + int? lastCodeUnit; + void writeCodeUnit(int codeUnit) { + output.writeCharCode(codeUnit); + lastCodeUnit = codeUnit; + } + + var index = 0; + while (index < source.length) { + final codeUnit = source.codeUnitAt(index); + if (removeOptionalCommas && + codeUnit == 0x2c && + _isOptionalTrailingComma(source, index, delimiters)) { + index++; + continue; + } + if (_isWhitespace(codeUnit)) { + final previous = lastCodeUnit; + while (index < source.length && _isWhitespace(source.codeUnitAt(index))) { + index++; + } + if (previous != null && + index < source.length && + _needsSeparator(previous, source.codeUnitAt(index))) { + writeCodeUnit(0x20); + } + continue; + } + + if (codeUnit == 0x2f && index + 1 < source.length) { + final next = source.codeUnitAt(index + 1); + if (next == 0x2f) { + while (index < source.length) { + final commentCodeUnit = source.codeUnitAt(index++); + writeCodeUnit(commentCodeUnit); + if (commentCodeUnit == 0x0a) break; + } + continue; + } + if (next == 0x2a) { + var depth = 0; + while (index < source.length) { + final commentCodeUnit = source.codeUnitAt(index); + final following = index + 1 < source.length + ? source.codeUnitAt(index + 1) + : null; + if (commentCodeUnit == 0x2f && following == 0x2a) depth++; + if (commentCodeUnit == 0x2a && following == 0x2f) depth--; + writeCodeUnit(commentCodeUnit); + index++; + if (depth == 0) { + writeCodeUnit(source.codeUnitAt(index)); + index++; + break; + } + } + continue; + } + } + + final raw = + (codeUnit == 0x72 || codeUnit == 0x52) && + index + 1 < source.length && + _isQuote(source.codeUnitAt(index + 1)); + if (_isQuote(codeUnit) || raw) { + if (raw) { + writeCodeUnit(codeUnit); + index++; + } + final quote = source.codeUnitAt(index); + final triple = + index + 2 < source.length && + source.codeUnitAt(index + 1) == quote && + source.codeUnitAt(index + 2) == quote; + final quoteLength = triple ? 3 : 1; + for (var count = 0; count < quoteLength; count++) { + writeCodeUnit(source.codeUnitAt(index++)); + } + while (index < source.length) { + final stringCodeUnit = source.codeUnitAt(index); + if (!raw && stringCodeUnit == 0x5c && index + 1 < source.length) { + writeCodeUnit(stringCodeUnit); + writeCodeUnit(source.codeUnitAt(index + 1)); + index += 2; + continue; + } + if (stringCodeUnit == quote && + (!triple || + (index + 2 < source.length && + source.codeUnitAt(index + 1) == quote && + source.codeUnitAt(index + 2) == quote))) { + for (var count = 0; count < quoteLength; count++) { + writeCodeUnit(source.codeUnitAt(index++)); + } + break; + } + writeCodeUnit(stringCodeUnit); + index++; + } + continue; + } + + if (_isOpeningDelimiter(codeUnit)) { + delimiters.add(( + callLike: codeUnit == 0x28 && _isCallLikeParenthesis(source, index), + opener: codeUnit, + )); + } else if (_isClosingDelimiter(codeUnit) && delimiters.isNotEmpty) { + delimiters.removeLast(); + } + writeCodeUnit(codeUnit); + index++; + } + return output.toString(); +} + +bool _isOptionalTrailingComma( + String source, + int commaIndex, + List<({bool callLike, int opener})> delimiters, +) { + if (delimiters.isEmpty) return false; + var index = commaIndex + 1; + while (index < source.length && _isWhitespace(source.codeUnitAt(index))) { + index++; + } + if (index == source.length) return false; + + final delimiter = delimiters.last; + final closer = source.codeUnitAt(index); + if (delimiter.opener == 0x5b && closer == 0x5d) return true; + if (delimiter.opener == 0x7b && closer == 0x7d) return true; + if (delimiter.opener != 0x28 || closer != 0x29) return false; + + if (delimiter.callLike) return true; + + index++; + while (index < source.length && _isWhitespace(source.codeUnitAt(index))) { + index++; + } + return index < source.length && + (source.codeUnitAt(index) == 0x7b || source.startsWith('=>', index)); +} + +bool _isOpeningDelimiter(int codeUnit) => + codeUnit == 0x28 || codeUnit == 0x5b || codeUnit == 0x7b; + +bool _isClosingDelimiter(int codeUnit) => + codeUnit == 0x29 || codeUnit == 0x5d || codeUnit == 0x7d; + +bool _isCallLikeParenthesis(String source, int openerIndex) { + var index = openerIndex - 1; + while (index >= 0 && _isWhitespace(source.codeUnitAt(index))) { + index--; + } + if (index < 0) return false; + + final previous = source.codeUnitAt(index); + if (previous == 0x29 || previous == 0x5d || previous == 0x3e) return true; + if (!_isIdentifierPart(previous)) return false; + + final end = index + 1; + while (index >= 0 && _isIdentifierPart(source.codeUnitAt(index))) { + index--; + } + final identifier = source.substring(index + 1, end); + return !const { + 'abstract', + 'as', + 'assert', + 'async', + 'augment', + 'await', + 'base', + 'break', + 'case', + 'catch', + 'class', + 'const', + 'continue', + 'covariant', + 'default', + 'deferred', + 'do', + 'dynamic', + 'else', + 'enum', + 'export', + 'extends', + 'extension', + 'external', + 'factory', + 'false', + 'final', + 'finally', + 'for', + 'get', + 'hide', + 'if', + 'implements', + 'import', + 'in', + 'interface', + 'is', + 'late', + 'library', + 'mixin', + 'new', + 'null', + 'of', + 'on', + 'operator', + 'part', + 'required', + 'rethrow', + 'return', + 'sealed', + 'set', + 'show', + 'static', + 'switch', + 'sync', + 'throw', + 'true', + 'try', + 'typedef', + 'var', + 'void', + 'when', + 'while', + 'with', + 'yield', + }.contains(identifier); +} + +bool _isWhitespace(int codeUnit) => + codeUnit == 0x20 || + codeUnit == 0x09 || + codeUnit == 0x0a || + codeUnit == 0x0d || + codeUnit == 0x0b || + codeUnit == 0x0c; + +bool _isQuote(int codeUnit) => codeUnit == 0x22 || codeUnit == 0x27; + +bool _isIdentifierPart(int codeUnit) => + codeUnit == 0x24 || + codeUnit == 0x5f || + (codeUnit >= 0x30 && codeUnit <= 0x39) || + (codeUnit >= 0x41 && codeUnit <= 0x5a) || + (codeUnit >= 0x61 && codeUnit <= 0x7a); + +bool _isOperator(int codeUnit) => const { + 0x21, + 0x25, + 0x26, + 0x2a, + 0x2b, + 0x2d, + 0x2f, + 0x3c, + 0x3d, + 0x3e, + 0x3f, + 0x5e, + 0x7c, + 0x7e, +}.contains(codeUnit); + +bool _needsSeparator(int before, int after) => + (_isIdentifierPart(before) && _isIdentifierPart(after)) || + (_isOperator(before) && _isOperator(after)) || + (_isQuote(before) && _isQuote(after)); diff --git a/native/dart/packages/blocks_codegen/test/dart_source_matchers_test.dart b/native/dart/packages/blocks_codegen/test/dart_source_matchers_test.dart new file mode 100644 index 0000000000..7ac24df1b1 --- /dev/null +++ b/native/dart/packages/blocks_codegen/test/dart_source_matchers_test.dart @@ -0,0 +1,36 @@ +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; + +void main() { + test('accepts formatter whitespace and optional call commas', () { + expect( + "call(\n value: 'wire value',\n);", + contains("call(value: 'wire value')"), + ); + }); + + test('preserves semantic record commas', () { + expect('(value,)', isNot(contains('(value)'))); + expect('(value)', isNot(contains('(value,)'))); + expect('return(value,);', isNot(contains('return(value);'))); + expect('return (value,);', isNot(contains('return (value);'))); + expect('required (int,) field', isNot(contains('required (int) field'))); + expect('var(value,) = record', isNot(contains('var(value) = record'))); + }); + + test('rejects different tokens and reordered arguments', () { + expect('call(first, second)', isNot(contains('call(first, third)'))); + expect('call(first, second)', isNot(contains('call(second, first)'))); + }); + + test('preserves string contents and token boundaries', () { + expect("call('wire value')", isNot(contains("call('wire value')"))); + expect('intValue', isNot(contains('int Value'))); + }); + + test('keeps whitespace-only checks exact', () { + expect(r'escaped\nnewline', isNot(contains('\n'))); + expect('physical\nnewline', contains('\n')); + }); +} diff --git a/native/dart/packages/blocks_codegen/test/formatting_test.dart b/native/dart/packages/blocks_codegen/test/formatting_test.dart new file mode 100644 index 0000000000..f2d66973cd --- /dev/null +++ b/native/dart/packages/blocks_codegen/test/formatting_test.dart @@ -0,0 +1,37 @@ +import 'dart:convert'; + +import 'package:blocks_codegen/blocks_codegen.dart'; +import 'package:dart_style/dart_style.dart'; +import 'package:pub_semver/pub_semver.dart'; +import 'package:test/test.dart'; + +void main() { + final model = CodegenModelBuilder().build( + const OpenRpcParser().parse( + jsonEncode({ + 'openrpc': '1.3.2', + 'info': {'title': 'formatting', 'version': '1.0.0'}, + 'methods': [], + }), + ), + ); + + test('generate returns deterministic formatted source', () { + const generator = DartCodeGenerator(); + final output = generator.generate(model); + final explicitOutput = generator.generate( + model, + languageVersion: Version(3, 11, 0), + ); + + expect(output.split('\n').take(2), [ + '// dart format width=80', + '// GENERATED CODE \u2014 DO NOT MODIFY BY HAND', + ]); + expect(output, explicitOutput); + expect( + DartFormatter(languageVersion: Version(3, 11, 0)).format(output), + output, + ); + }); +} diff --git a/native/dart/packages/blocks_codegen/test/generated_code_compiles_test.dart b/native/dart/packages/blocks_codegen/test/generated_code_compiles_test.dart index e091eb9438..51e12203ea 100644 --- a/native/dart/packages/blocks_codegen/test/generated_code_compiles_test.dart +++ b/native/dart/packages/blocks_codegen/test/generated_code_compiles_test.dart @@ -140,6 +140,18 @@ dependencies: if (scratch.existsSync()) scratch.deleteSync(recursive: true); }); + test('generated clients are already formatted', () async { + _expectSuccess( + await _dart([ + 'format', + '--output=none', + '--set-exit-if-changed', + 'lib', + ], scratch.path), + 'dart format', + ); + }); + test('generated clients analyze without errors or warnings', () async { _expectSuccess( await _dart(['analyze', '--fatal-warnings', 'lib', 'bin'], scratch.path), diff --git a/native/dart/packages/blocks_codegen/test/generator_test.dart b/native/dart/packages/blocks_codegen/test/generator_test.dart index b248c83b1e..08c7532e03 100644 --- a/native/dart/packages/blocks_codegen/test/generator_test.dart +++ b/native/dart/packages/blocks_codegen/test/generator_test.dart @@ -4,7 +4,9 @@ import 'dart:io'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; void main() { const gen = DartCodeGenerator(); @@ -831,7 +833,9 @@ void main() { // `_client.call('', ...)` that precedes the return. final rawOps = {}; final allOps = {}; - final re = RegExp(r"_client\.call\('([^']+)'[^;]*\);\s*return ([^\n]*);"); + final re = RegExp( + r"_client\.call\('([^']+)'[^;]*\);\s*return ([\s\S]*?);", + ); for (final m in re.allMatches(output)) { final fullName = m.group(1)!; allOps.add(fullName); @@ -1753,10 +1757,8 @@ void main() { test('inline enum values decode through fromJson', () { expect( output, - matches( - RegExp( - r" moods: \(json\['moods'\] as Map\)\.map\(\(k, v\) => MapEntry\(k, \w+\.fromJson\(v as String\)\)\),", - ), + contains( + "moods: (json['moods'] as Map).map((k, v) => MapEntry(k, HolderMoods.fromJson(v as String)))", ), ); }); diff --git a/native/dart/packages/blocks_codegen/test/golden_file_test.dart b/native/dart/packages/blocks_codegen/test/golden_file_test.dart index 43589faa9d..e342f55ccd 100644 --- a/native/dart/packages/blocks_codegen/test/golden_file_test.dart +++ b/native/dart/packages/blocks_codegen/test/golden_file_test.dart @@ -1,6 +1,8 @@ import 'dart:io'; import 'package:blocks_codegen/blocks_codegen.dart'; +import 'package:dart_style/dart_style.dart'; +import 'package:pub_semver/pub_semver.dart'; import 'package:test/test.dart'; /// The golden of a fixture whose spec the generator refuses: its message. @@ -63,6 +65,11 @@ void main() { } return; } + expect( + DartFormatter(languageVersion: Version(3, 11, 0)).format(output), + output, + reason: '$name output must already be formatted', + ); if (regenerate) { goldenDir.createSync(recursive: true); diff --git a/native/dart/packages/blocks_codegen/test/language_version_test.dart b/native/dart/packages/blocks_codegen/test/language_version_test.dart new file mode 100644 index 0000000000..69e70abf31 --- /dev/null +++ b/native/dart/packages/blocks_codegen/test/language_version_test.dart @@ -0,0 +1,46 @@ +import 'package:blocks_codegen/src/language_version.dart'; +import 'package:package_config/package_config.dart'; +import 'package:pub_semver/pub_semver.dart'; +import 'package:test/test.dart'; + +void main() { + final config = PackageConfig([ + Package( + 'blocks_codegen', + Uri.parse('file:///workspace/blocks_codegen/'), + languageVersion: LanguageVersion(3, 11), + ), + Package( + 'input_package', + Uri.parse('file:///workspace/input_package/'), + languageVersion: LanguageVersion(3, 13), + ), + Package('no_version', Uri.parse('file:///workspace/no_version/')), + ]); + + test('selects and converts the requested package language version', () { + expect( + languageVersionForPackage(config, 'input_package'), + Version(3, 13, 0), + ); + }); + + test('returns null for an absent package or language version', () { + expect(languageVersionForPackage(config, 'absent'), isNull); + expect(languageVersionForPackage(config, 'no_version'), isNull); + }); + + test('maps a target URI and distinguishes an absent target', () { + expect( + languageVersionForUri( + config, + Uri.file('/workspace/input_package/lib/client.dart'), + ), + (found: true, version: Version(3, 13, 0)), + ); + expect(languageVersionForUri(config, Uri.file('/outside/client.dart')), ( + found: false, + version: null, + )); + }); +} diff --git a/native/dart/packages/blocks_codegen/test/local_name_collision_test.dart b/native/dart/packages/blocks_codegen/test/local_name_collision_test.dart index e00fb7dc0e..14b5cb83ea 100644 --- a/native/dart/packages/blocks_codegen/test/local_name_collision_test.dart +++ b/native/dart/packages/blocks_codegen/test/local_name_collision_test.dart @@ -1,6 +1,8 @@ import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; /// The generated code declares its own names next to user-chosen ones: an /// operation's `params` array and `result`, the `==` parameter `other`, the @@ -77,7 +79,7 @@ void main() { test('a parameter named `result` keeps its name; the local yields', () { final body = runBody(gen.generate(model(params: [param('result')]))); expect(body, contains('Future run({required String result})')); - expect(body, contains(' result,\n')); + expect(body, contains('final params = [result];')); expect( body, contains(r" final $result = await _client.call('api.run', params);"), @@ -90,7 +92,7 @@ void main() { final body = runBody(gen.generate(model(params: [param('params')]))); expect(body, contains('Future run({required String params})')); expect(body, contains(r' final $params = [')); - expect(body, contains(' params,\n')); + expect(body, contains(r'final $params = [params];')); expect(body, contains(r"await _client.call('api.run', $params);")); expect(body, contains(' return result as String;')); }); @@ -134,14 +136,7 @@ void main() { final body = runBody( gen.generate(model(params: [param('result'), param(r'$result')])), ); - expect( - body, - contains( - ' result,\n' - r' $result,' - '\n', - ), - ); + expect(body, contains(r'final params = [result, $result];')); expect(body, contains(r' final $result2 = await _client.call(')); expect(body, contains(r' return $result2 as String;')); }); @@ -196,10 +191,7 @@ void main() { expect( body, ' Future run({required String id, required String name}) async {\n' - ' final params = [\n' - ' id,\n' - ' name,\n' - ' ];\n' + ' final params = [id, name];\n' " final result = await _client.call('api.run', params);\n" ' return result as String;', ); diff --git a/native/dart/packages/blocks_codegen/test/model_equality_test.dart b/native/dart/packages/blocks_codegen/test/model_equality_test.dart index 28c28a3df5..b411a07ad9 100644 --- a/native/dart/packages/blocks_codegen/test/model_equality_test.dart +++ b/native/dart/packages/blocks_codegen/test/model_equality_test.dart @@ -3,7 +3,9 @@ import 'dart:convert'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // A generated model's `==` and `hashCode` used to compare list and map fields // with `==` and `hashCode`, which Dart's `List` and `Map` implement by diff --git a/native/dart/packages/blocks_codegen/test/native_bindings_test.dart b/native/dart/packages/blocks_codegen/test/native_bindings_test.dart index 2cbdc91151..464cf315b7 100644 --- a/native/dart/packages/blocks_codegen/test/native_bindings_test.dart +++ b/native/dart/packages/blocks_codegen/test/native_bindings_test.dart @@ -5,7 +5,9 @@ import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/dart_source.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; /// The third-party tag the probes bind. A built-in tag short-circuits binding /// resolution, so a probe using one cannot reach the rule under test. @@ -62,10 +64,7 @@ void main() { test('the runtime import is kept and declared imports are sorted', () { final output = _generate(_build(_specJson(extras: _catalogs()))); - final directives = const LineSplitter() - .convert(output) - .where((l) => l.startsWith('import ') || l.startsWith('export ')) - .toList(); + final directives = _allDirectives(output); expect(directives, [ "import 'package:blocks_runtime/blocks_runtime.dart';", @@ -250,9 +249,17 @@ void main() { .replaceAll(RegExp(r"'(?:[^'\\\n]|\\.)*'"), "''") .replaceAll(RegExp(r'"(?:[^"\\\n]|\\.)*"'), "''"); - final shown = RegExp(r"^import '[^']+' show ([^;]+);", multiLine: true) - .allMatches(output) - .expand((m) => m.group(1)!.split(',').map((n) => n.trim())) + final shown = _allDirectives(output) + .where((directive) => directive.startsWith('import ')) + .where((directive) => directive.contains(' show ')) + .expand( + (directive) => directive + .split(' show ') + .last + .replaceFirst(RegExp(r';$'), '') + .split(',') + .map((name) => name.trim()), + ) .toSet(); // Every position a type can occupy: call, generic open, member access, // generic close, generic comma, statement end, index close, nullable, @@ -1017,7 +1024,7 @@ void main() { }), ), ); - final header = const LineSplitter().convert(output)[2]; + final header = const LineSplitter().convert(output)[3]; expect(header, startsWith('// Source: ')); expect(header, contains(r'\nvoid pwnedViaTitle() {}')); @@ -1406,8 +1413,16 @@ void main() { }); } +List _allDirectives(String output) => + RegExp( + r'^(?:import|export) [^;]+;', + multiLine: true, + ).allMatches(output).map((match) { + return match.group(0)!.replaceAll(RegExp(r'\s+'), ' '); + }).toList(); + List _directives(String output) => - output.split('\n').where((line) => line.startsWith('import ')).toList(); + _allDirectives(output).where((line) => line.startsWith('import ')).toList(); /// A spec whose arity-one type-arg `$ref` target is renamed by the collision /// pass, so the decoder it named no longer exists under that name. diff --git a/native/dart/packages/blocks_codegen/test/nested_container_test.dart b/native/dart/packages/blocks_codegen/test/nested_container_test.dart index b10a465f7f..ae4ca96202 100644 --- a/native/dart/packages/blocks_codegen/test/nested_container_test.dart +++ b/native/dart/packages/blocks_codegen/test/nested_container_test.dart @@ -3,7 +3,9 @@ import 'dart:convert'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // Containers (lists, maps, nullables, tuples, and any nesting of them) whose // elements need converting used to decode with a bare cast: `v as List`, @@ -288,7 +290,7 @@ void main() { expect( output, contains( - ' .map((e) => MapEntry(e.key, Note.fromJson(e.value as Map))),', + ' .map((e) => MapEntry(e.key, Note.fromJson(e.value as Map)))', ), ); }); @@ -340,7 +342,7 @@ void main() { expect( output, contains( - " client: OidcClient.fromJson(json['client'] as Map, baseUrl: client.baseUrl, tokenStore: client.tokenStore, sessionStore: client.sessionStore),", + " client: OidcClient.fromJson(json['client'] as Map, baseUrl: client.baseUrl, tokenStore: client.tokenStore, sessionStore: client.sessionStore)", ), ); }); @@ -504,7 +506,7 @@ void main() { expect( output, contains( - " if (pair != null) 'pair': switch (pair) { final value? => [value.\$1, value.\$2.toJson()], _ => null },", + " if (pair != null) 'pair': switch (pair) { final value? => [value.\$1, value.\$2.toJson()], _ => null }", ), ); }); diff --git a/native/dart/packages/blocks_codegen/test/oidc_provider_enum_test.dart b/native/dart/packages/blocks_codegen/test/oidc_provider_enum_test.dart index 8b5d5b6a34..02e124759f 100644 --- a/native/dart/packages/blocks_codegen/test/oidc_provider_enum_test.dart +++ b/native/dart/packages/blocks_codegen/test/oidc_provider_enum_test.dart @@ -3,7 +3,9 @@ import 'dart:convert'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // An `oidc/client` whose `x-blocks-type-args[0]` is a string enum names the // providers its client signs in with. A direct or optional result generates diff --git a/native/dart/packages/blocks_codegen/test/open_record_test.dart b/native/dart/packages/blocks_codegen/test/open_record_test.dart index 926c568908..9a7315f667 100644 --- a/native/dart/packages/blocks_codegen/test/open_record_test.dart +++ b/native/dart/packages/blocks_codegen/test/open_record_test.dart @@ -4,7 +4,9 @@ import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/model.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // An open record is an object schema with `properties` and // `additionalProperties` (TS `T & Record`). Its extra keys sit flat @@ -247,7 +249,7 @@ void main() { notes, contains( '.map((e) => MapEntry(e.key, ' - 'Note.fromJson(e.value as Map))),', + 'Note.fromJson(e.value as Map)))', ), ); expect(notes, contains('.contains(e.key)) e.key: e.value.toJson(),')); diff --git a/native/dart/packages/blocks_codegen/test/positional_params_test.dart b/native/dart/packages/blocks_codegen/test/positional_params_test.dart index 81e4c8cc14..b81232c7cb 100644 --- a/native/dart/packages/blocks_codegen/test/positional_params_test.dart +++ b/native/dart/packages/blocks_codegen/test/positional_params_test.dart @@ -1,6 +1,8 @@ import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; /// JSON-RPC params are positional on an AWS Blocks server: `parseRpcRequest` /// (`packages/core`) passes an array as the method's argument list, and reads diff --git a/native/dart/packages/blocks_codegen/test/reserved_name_test.dart b/native/dart/packages/blocks_codegen/test/reserved_name_test.dart index e6b40b125c..4ec7cd11fb 100644 --- a/native/dart/packages/blocks_codegen/test/reserved_name_test.dart +++ b/native/dart/packages/blocks_codegen/test/reserved_name_test.dart @@ -3,7 +3,9 @@ import 'dart:convert'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // A name from the spec becomes a Dart identifier: a field, a named parameter, // a method, a `Blocks` field, an enum value or a `Servers` constant. Some @@ -158,15 +160,7 @@ void main() { ), ); // Params are positional, so the wire name isn't sent. - expect( - output, - contains( - r' $id,' - '\n' - r' $$v,' - '\n name,\n', - ), - ); + expect(output, contains(r'final params = [$id, $$v, name];')); }); test('is a public method that calls the original operation', () { @@ -370,7 +364,7 @@ void main() { ); expect(level, contains(' aB\$,\n aB\n;')); expect(level, contains(r" 'a-b': aB$,")); - expect(level, contains(" 'aB': aB,")); + expect(level, contains(" 'aB': aB")); }); }); @@ -437,14 +431,7 @@ void main() { expect( output, contains( - r' String$,' - '\n' - r' int$,' - '\n' - r' Map$,' - '\n' - r' Doc$.toJson(),' - '\n', + r'final params = [String$, int$, Map$, Doc$.toJson()];', ), ); }); @@ -575,14 +562,7 @@ void main() { r'required int $result}) async {', ), ); - expect( - output, - contains( - ' result,\n' - r' $result,' - '\n', - ), - ); + expect(output, contains(r'final params = [result, $result];')); expect(output, contains(r' final $result2 = await _client.call(')); expect(output, contains(r' return $result2 as String;')); }); diff --git a/native/dart/packages/blocks_codegen/test/schema_alias_ref_test.dart b/native/dart/packages/blocks_codegen/test/schema_alias_ref_test.dart index a0ad982686..5fc79fe1a4 100644 --- a/native/dart/packages/blocks_codegen/test/schema_alias_ref_test.dart +++ b/native/dart/packages/blocks_codegen/test/schema_alias_ref_test.dart @@ -3,7 +3,9 @@ import 'dart:convert'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // A component schema that isn't a model, an enum or a discriminated union — // a string, an array, a map, a nullable, or a union the generator types as @@ -165,7 +167,7 @@ void main() { " one: json['one'] as dynamic,\n" " many: (json['many'] as List).cast(),\n" " kind: Kind.fromJson(json['kind'] as Map),\n" - " loop: json['loop'] as dynamic,\n", + " loop: json['loop'] as dynamic\n", ), ); }); diff --git a/native/dart/packages/blocks_codegen/test/schema_rename_ref_test.dart b/native/dart/packages/blocks_codegen/test/schema_rename_ref_test.dart index 843a186eb4..74c5f3b13a 100644 --- a/native/dart/packages/blocks_codegen/test/schema_rename_ref_test.dart +++ b/native/dart/packages/blocks_codegen/test/schema_rename_ref_test.dart @@ -3,7 +3,9 @@ import 'dart:convert'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // The builder renames types after it resolves them: a schema whose one field // has a generic shape (`{value}`) takes a generic name (`ValueResult`), Pass 3 @@ -158,9 +160,12 @@ List _refs(CodegenModel model) { } String _signature(String output) { - final i = output.indexOf('Future make('); - expect(i, isNot(-1)); - return output.substring(i, output.indexOf('\n', i)); + final start = output.indexOf('Future make('); + expect(start, isNot(-1)); + const suffix = ') async {'; + final end = output.indexOf(suffix, start); + expect(end, isNot(-1)); + return output.substring(start, end + suffix.length); } void main() { diff --git a/native/dart/packages/blocks_codegen/test/spec_string_identifier_test.dart b/native/dart/packages/blocks_codegen/test/spec_string_identifier_test.dart index 56cfc86a59..4f53e6889c 100644 --- a/native/dart/packages/blocks_codegen/test/spec_string_identifier_test.dart +++ b/native/dart/packages/blocks_codegen/test/spec_string_identifier_test.dart @@ -3,7 +3,9 @@ import 'dart:convert'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // Names and values from the spec reach the generated library in two forms: // @@ -142,10 +144,7 @@ void main() { // Params are positional, so the spec name isn't sent. expect( output, - contains( - r' a$b,' - '\n itS,\n backSlash,\n', - ), + contains(r'final params = [a$b, itS, backSlash];'), ); expect( output, @@ -264,7 +263,7 @@ void main() { test('writes the escaped discriminant and value', () { expect(_decl(output, 'ItSEvent'), contains(r" 'k\$ind': 'it\'s',")); - expect(_decl(output, r'A$bEvent'), contains(r" 'k\$ind': 'a\$b',")); + expect(_decl(output, r'A$bEvent'), contains(r" 'k\$ind': 'a\$b'")); }); test("prints a variant whose class name holds `\$`", () { @@ -338,7 +337,7 @@ void main() { test('keeps a newline in the title out of the header comment', () { // Escaped (`\n` shown literally), so the header stays one comment line. expect(output, contains(r'// Source: My\nAPI v1')); - expect(output, isNot(contains('\nAPI v1'))); + expect(output.contains('\nAPI v1'), isFalse); }); }); @@ -411,7 +410,7 @@ void main() { 'required String xYZ}) async {', ), ); - expect(output, contains(' contentType,\n xYZ,\n')); + expect(output, contains('final params = [contentType, xYZ];')); }); test('a dotted namespace is a camel-cased field of a valid class', () { @@ -562,7 +561,7 @@ void main() { expect(output, contains(r' final $Doc d;')); expect( output, - contains(r" d: $Doc.fromJson(json['d'] as Map),"), + contains(r" d: $Doc.fromJson(json['d'] as Map)"), ); expect( output, @@ -685,7 +684,7 @@ void main() { test('is escaped in the literal; the identifier is camel-cased', () { final doc = _decl(output, 'Doc'); expect(doc, contains(r" aB: json['a\tb'] as String,")); - expect(doc, contains(r" 'c\u{1}d': cD,")); + expect(doc, contains(r" 'c\u{1}d': cD")); expect(output, isNot(contains('\t'))); expect(output, isNot(contains('\u0001'))); }); From b24493749a21780840dbc0f8c1ceea92fd269145 Mon Sep 17 00:00:00 2001 From: Ekjot <43255916+ekjotmultani@users.noreply.github.com> Date: Thu, 19 Nov 2026 01:07:12 -0800 Subject: [PATCH 2/4] test(sink-guards): move the Dart toString pin to its line after formatting --- scripts/sink-guards/codegen.test.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sink-guards/codegen.test.mjs b/scripts/sink-guards/codegen.test.mjs index f73394d89b..f2e1749a04 100644 --- a/scripts/sink-guards/codegen.test.mjs +++ b/scripts/sink-guards/codegen.test.mjs @@ -34,7 +34,7 @@ const SWIFT_CONTENT_LOCAL = (v) => const ALLOWLIST = [ { - at: 'native/dart/packages/blocks_codegen/lib/src/generator.dart:2168', + at: 'native/dart/packages/blocks_codegen/lib/src/generator.dart:2175', reason: "label is the generated class name, a Dart identifier, with its `$` escaped on the line above, so it holds no quote or interpolation.", }, ...[583, 678].map((l) => ({ at: `native/swift/Sources/BlocksCodegen/SwiftCodeGenerator.swift:${l}`, reason: SWIFT_TYPE_NAME })), From 8b1ddeacc8b57defa90d0df353c927b14cbf03f7 Mon Sep 17 00:00:00 2001 From: Ekjot <43255916+ekjotmultani@users.noreply.github.com> Date: Thu, 19 Nov 2026 01:07:30 -0800 Subject: [PATCH 3/4] test(native-dart): match formatted output in the open enum and union tests --- native/dart/packages/blocks_codegen/test/open_enum_test.dart | 4 +++- native/dart/packages/blocks_codegen/test/open_union_test.dart | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/native/dart/packages/blocks_codegen/test/open_enum_test.dart b/native/dart/packages/blocks_codegen/test/open_enum_test.dart index 35697baa8a..b731f8d2eb 100644 --- a/native/dart/packages/blocks_codegen/test/open_enum_test.dart +++ b/native/dart/packages/blocks_codegen/test/open_enum_test.dart @@ -3,7 +3,9 @@ import 'dart:io'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // A string enum a response carries is generated open: a value the client was // generated without decodes to `XUnknown` holding the string, instead of diff --git a/native/dart/packages/blocks_codegen/test/open_union_test.dart b/native/dart/packages/blocks_codegen/test/open_union_test.dart index 57ced84285..886d7f244f 100644 --- a/native/dart/packages/blocks_codegen/test/open_union_test.dart +++ b/native/dart/packages/blocks_codegen/test/open_union_test.dart @@ -3,7 +3,9 @@ import 'dart:io'; import 'package:blocks_codegen/src/builder.dart'; import 'package:blocks_codegen/src/generator.dart'; import 'package:blocks_codegen/src/parser.dart'; -import 'package:test/test.dart'; +import 'package:test/test.dart' hide contains; + +import 'dart_source_matchers.dart'; // A union with a string discriminator that a response carries is generated // open: an object whose discriminator names no arm decodes to `XUnknown`, From 4027e1de7a9619df40a1be2453508608a6b41cdd Mon Sep 17 00:00:00 2001 From: Ekjot <43255916+ekjotmultani@users.noreply.github.com> Date: Thu, 19 Nov 2026 01:09:30 -0800 Subject: [PATCH 4/4] ci(deps): allow dart_style's and pub_semver's lowercase license in dependency review --- .github/dependency-review-config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependency-review-config.yml b/.github/dependency-review-config.yml index a9fdf480b6..13ec757209 100644 --- a/.github/dependency-review-config.yml +++ b/.github/dependency-review-config.yml @@ -41,11 +41,17 @@ allow_licenses: # build is verifiably BSD-3-Clause: # https://pub.dev/packages/build/license # +# dart_style and pub_semver are verifiably BSD-3-Clause: +# https://pub.dev/packages/dart_style/license +# https://pub.dev/packages/pub_semver/license +# # Remove once the upstream parser normalizes license casing: # https://github.com/actions/dependency-review-action allow_dependencies_licenses: - "pkg:pub/flutter_secure_storage" - "pkg:pub/build" + - "pkg:pub/dart_style" + - "pkg:pub/pub_semver" # sharp's prebuilt libvips binaries (LGPL-3.0-or-later). They reach the # lockfile only through the hosting test apps (next in test-apps/hosting-ssr,