diff --git a/analysis_options.yaml b/analysis_options.yaml index ec0dfc9..0a92642 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,7 +1,7 @@ -# Defines a default set of lint rules enforced for -# projects at Google. For details and rationale, -# see https://github.com/dart-lang/pedantic#enabled-lints. -include: package:pedantic/analysis_options.yaml +# I kind of prefer the flutter lints, so use it for now, +# instead of manually copying it over 🤷️ + +include: package:flutter_lints/flutter.yaml analyzer: strong-mode: @@ -17,156 +17,36 @@ analyzer: linter: rules: - # these rules are documented on and in the same order as - # the Dart Lint rules page to make maintenance easier - # http://dart-lang.github.io/linter/lints/ + avoid_print: false + + # TODO: rename constants. + constant_identifier_names: false - # HP mostly in sync with https://github.com/flutter/flutter/blob/master/analysis_options.yaml + always_declare_return_types: true + prefer_single_quotes: true + unawaited_futures: true + unsafe_html: true - - always_declare_return_types - - always_put_control_body_on_new_line - # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219 - - always_require_non_null_named_parameters - #- always_specify_types - - annotate_overrides - # - avoid_annotating_with_dynamic # not yet tested - # - avoid_as - - avoid_bool_literals_in_conditional_expressions - # - avoid_catches_without_on_clauses # not yet tested - # - avoid_catching_errors # not yet tested - # - avoid_classes_with_only_static_members # not yet tested - # - avoid_double_and_int_checks # only useful when targeting JS runtime - - avoid_empty_else - - avoid_field_initializers_in_const_classes - - avoid_function_literals_in_foreach_calls - # - avoid_implementing_value_types # not yet tested - - avoid_init_to_null - # - avoid_js_rounded_ints # only useful when targeting JS runtime - - avoid_null_checks_in_equality_operators - # - avoid_positional_boolean_parameters # not yet tested - # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356) - - avoid_relative_lib_imports - - avoid_renaming_method_parameters - - avoid_return_types_on_setters - # - avoid_returning_null # not yet tested - # - avoid_returning_null_for_future # not yet tested - - avoid_returning_null_for_void - # - avoid_returning_this # not yet tested - # - avoid_setters_without_getters # not yet tested - # - avoid_shadowing_type_parameters # not yet tested - # - avoid_single_cascade_in_expression_statements # not yet tested - - avoid_slow_async_io - - avoid_types_as_parameter_names - # - avoid_types_on_closure_parameters # not yet tested - - avoid_unused_constructor_parameters - - avoid_void_async - - await_only_futures - - camel_case_types - - cancel_subscriptions - # - cascade_invocations # not yet tested - # - close_sinks # not reliable enough - # - comment_references # blocked on https://github.com/flutter/flutter/issues/20765 - # - constant_identifier_names # https://github.com/dart-lang/linter/issues/204 - - control_flow_in_finally - - curly_braces_in_flow_control_structures - # - diagnostic_describe_all_properties # not yet tested - - directives_ordering - - empty_catches - - empty_constructor_bodies - - empty_statements - # - file_names # not yet tested - # - flutter_style_todos TODO(HP) - - hash_and_equals - - implementation_imports - # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811 - - iterable_contains_unrelated_type - # - join_return_with_assignment # not yet tested - - library_names - - library_prefixes - # - lines_longer_than_80_chars # not yet tested - - list_remove_unrelated_type - # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181 - - no_adjacent_strings_in_list - - no_duplicate_case_values - - non_constant_identifier_names - # - null_closures # not yet tested - # - omit_local_variable_types # opposite of always_specify_types - # - one_member_abstracts # too many false positives - # - only_throw_errors # https://github.com/flutter/flutter/issues/5792 - - overridden_fields - - package_api_docs - - package_names - - package_prefixed_library_names - # - parameter_assignments # we do this commonly - - prefer_adjacent_string_concatenation - - prefer_asserts_in_initializer_lists - # - prefer_asserts_with_message # not yet tested - - prefer_collection_literals - - prefer_conditional_assignment - - prefer_const_constructors - - prefer_const_constructors_in_immutables - - prefer_const_declarations - - prefer_const_literals_to_create_immutables - # - prefer_constructors_over_static_methods # not yet tested - - prefer_contains - # - prefer_double_quotes # opposite of prefer_single_quotes - - prefer_equal_for_default_values - # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods - - prefer_final_fields - # - prefer_final_in_for_each # not yet tested - - prefer_final_locals - # - prefer_for_elements_to_map_fromIterable # not yet tested - - prefer_foreach - # - prefer_function_declarations_over_variables # not yet tested - - prefer_generic_function_type_aliases - # - prefer_if_elements_to_conditional_expressions # not yet tested - - prefer_if_null_operators - - prefer_initializing_formals - - prefer_inlined_adds - # - prefer_int_literals # not yet tested - # - prefer_interpolation_to_compose_strings # not yet tested - - prefer_is_empty - - prefer_is_not_empty - - prefer_iterable_whereType - # - prefer_mixin # https://github.com/dart-lang/language/issues/32 - # - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932 - - prefer_single_quotes - - prefer_spread_collections - - prefer_typing_uninitialized_variables - - prefer_void_to_null - # - provide_deprecation_message # not yet tested - # - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml - - recursive_getters - - slash_for_doc_comments - # - sort_child_properties_last # not yet tested - - sort_constructors_first - #- sort_pub_dependencies - - sort_unnamed_constructors_first - - test_types_in_equals - - throw_in_finally - # - type_annotate_public_apis # subset of always_specify_types - - type_init_formals - # - unawaited_futures # https://github.com/flutter/flutter/issues/5793 - # - unnecessary_await_in_return # not yet tested - - unnecessary_brace_in_string_interps - - unnecessary_const - - unnecessary_getters_setters - # - unnecessary_lambdas # https://github.com/dart-lang/linter/issues/498 - - unnecessary_new - - unnecessary_null_aware_assignments - - unnecessary_null_in_if_null_operators - - unnecessary_overrides - #- unnecessary_parenthesis HP: I like parenthesis :-) - - unnecessary_statements - - unnecessary_this - - unrelated_type_equality_checks - # - unsafe_html # not yet tested - - use_full_hex_values_for_flutter_colors - # - use_function_type_syntax_for_parameters # not yet tested - - use_rethrow_when_possible - # - use_setters_to_change_properties # not yet tested - # - use_string_buffers # https://github.com/dart-lang/linter/pull/664 - # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review - - valid_regexps - # - void_checks # not yet tested + always_put_control_body_on_new_line: true + avoid_bool_literals_in_conditional_expressions: true + avoid_field_initializers_in_const_classes: true + avoid_function_literals_in_foreach_calls: true + avoid_slow_async_io: true + avoid_unused_constructor_parameters: true + avoid_void_async: true + cancel_subscriptions: true + directives_ordering: true + no_adjacent_strings_in_list: true + package_api_docs: true + prefer_asserts_in_initializer_lists: true + prefer_final_in_for_each: true + prefer_final_locals: true + prefer_foreach: true + sort_constructors_first: true + sort_unnamed_constructors_first: true + test_types_in_equals: true + throw_in_finally: true + unnecessary_null_aware_assignments: true + unnecessary_statements: true + unrelated_type_equality_checks: true diff --git a/example/pubspec.lock b/example/pubspec.lock index dfb70a9..0df396f 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -14,21 +14,21 @@ packages: name: argon2_ffi_base url: "https://pub.dartlang.org" source: hosted - version: "1.0.0+2" + version: "1.1.0+1" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -49,7 +49,7 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" crypto: dependency: transitive description: @@ -70,7 +70,14 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.2" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" http_parser: dependency: transitive description: @@ -92,13 +99,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.3+8" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" kdbx: dependency: "direct main" description: path: ".." relative: true source: path - version: "2.0.0" + version: "2.2.0" + lints: + dependency: transitive + description: + name: lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" logging: dependency: transitive description: @@ -119,14 +140,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: @@ -134,27 +155,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0" - pedantic: - dependency: "direct dev" - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.0" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.2.0" pointycastle: dependency: transitive description: name: pointycastle url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.3.4" quiver: dependency: transitive description: @@ -224,6 +238,6 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.1.1" + version: "5.2.0" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.13.0 <3.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 1c829a4..1a0cc2e 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -12,4 +12,4 @@ dependencies: path: ../ dev_dependencies: - pedantic: '>=1.7.0 <2.0.0' + flutter_lints: ">=1.0.4 <2.0.0" diff --git a/lib/src/kdbx_file.dart b/lib/src/kdbx_file.dart index 02022b1..c16c800 100644 --- a/lib/src/kdbx_file.dart +++ b/lib/src/kdbx_file.dart @@ -68,8 +68,10 @@ class KdbxFile { Stream> get dirtyObjectsChanged => _dirtyObjectsChanged.stream; - static final FileSaveCallback _saveToBytes = - (bytes) async => bytes; + // ignore: prefer_function_declarations_over_variables + static final FileSaveCallback _saveToBytes = (bytes) async { + return bytes; + }; // @Deprecated('Use [saveTo] instead.') Future save() async { diff --git a/lib/src/utils/print_utils.dart b/lib/src/utils/print_utils.dart index 3b0d00f..eda783d 100644 --- a/lib/src/utils/print_utils.dart +++ b/lib/src/utils/print_utils.dart @@ -20,8 +20,9 @@ class KdbxPrintUtils { for (final group in group.groups) { catGroup(buf, group, depth: depth + 1); } - final valueToSting = (StringValue? value) => - forceDecrypt! ? value?.getText() : value?.toString(); + String? valueToSting(StringValue? value) { + return forceDecrypt! ? value?.getText() : value?.toString(); + } for (final entry in group.entries) { final value = entry.getString(KdbxKeyCommon.PASSWORD); diff --git a/pubspec.yaml b/pubspec.yaml index d39621a..246b175 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -30,6 +30,6 @@ dependencies: argon2_ffi_base: ^1.1.0+1 dev_dependencies: - pedantic: '>=1.7.0 <2.0.0' + flutter_lints: ">=1.0.4 <2.0.0" test: '>=1.6.0 <2.0.0' fake_async: ^1.2.0 diff --git a/test/kdbx_binaries_test.dart b/test/kdbx_binaries_test.dart index cd3decf..1909c2f 100644 --- a/test/kdbx_binaries_test.dart +++ b/test/kdbx_binaries_test.dart @@ -85,10 +85,11 @@ void main() { test('modify file with binary in history', () async { final fileRead = await testUtil.readKdbxFile('test/keepass2binaries.kdbx'); - final updateEntry = (KdbxFile file) { + void updateEntry(KdbxFile file) { final entry = fileRead.body.rootGroup.entries.first; entry.setString(KdbxKeyCommon.TITLE, PlainValue('example')); - }; + } + updateEntry(fileRead); final saved = await fileRead.save(); final file = await testUtil.readKdbxFileBytes(saved);