Merge remote-tracking branch 'google/master' into #780

Author: hacker1024

.github/workflows/dart.yml

@@ -1,4 +1,4 @@
-# Created with package:mono_repo v3.4.6
+# Created with package:mono_repo v3.4.7
 name: Dart CI
 on:
   push:
@@ -27,32 +27,32 @@ jobs:
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v2
       - name: mono_repo self validate
-        run: pub global activate mono_repo 3.4.6
+        run: pub global activate mono_repo 3.4.7
       - name: mono_repo self validate
         run: pub global run mono_repo generate --validate
   job_002:
-    name: "analyzer_and_format; Dart beta; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
+    name: "analyzer_and_format; Dart 2.12.0; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v2
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:dartfmt-dartanalyzer"
+          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:dartfmt-dartanalyzer"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:beta
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
-          sdk: beta
+          sdk: "2.12.0"
       - id: checkout
         uses: actions/checkout@v2
       - id: _test_yaml_pub_upgrade
@@ -134,7 +134,7 @@ jobs:
             os:ubuntu-latest;pub-cache-hosted;dart:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
           sdk: dev
       - id: checkout
@@ -205,22 +205,22 @@ jobs:
         working-directory: json_serializable
         run: dartanalyzer --fatal-infos .
   job_004:
-    name: "unit_test; Dart beta; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test`"
+    name: "unit_test; Dart 2.12.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v2
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:beta
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
-          sdk: beta
+          sdk: "2.12.0"
       - id: checkout
         uses: actions/checkout@v2
       - id: _test_yaml_pub_upgrade
@@ -277,7 +277,7 @@ jobs:
             os:ubuntu-latest;pub-cache-hosted;dart:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
           sdk: dev
       - id: checkout
@@ -323,22 +323,22 @@ jobs:
       - job_002
       - job_003
   job_006:
-    name: "unit_test; Dart beta; PKG: json_serializable; `pub run test -p chrome`"
+    name: "unit_test; Dart 2.12.0; PKG: json_serializable; `pub run test -p chrome`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v2
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:json_serializable;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:json_serializable;commands:test_2"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:beta
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:json_serializable
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
-          sdk: beta
+          sdk: "2.12.0"
       - id: checkout
         uses: actions/checkout@v2
       - id: json_serializable_pub_upgrade
@@ -368,7 +368,7 @@ jobs:
             os:ubuntu-latest;pub-cache-hosted;dart:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
           sdk: dev
       - id: checkout
@@ -387,22 +387,22 @@ jobs:
       - job_002
       - job_003
   job_008:
-    name: "ensure_build; Dart beta; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
+    name: "ensure_build; Dart 2.12.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@v2
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:beta;packages:_test_yaml-checked_yaml-example-json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:beta
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable
+            os:ubuntu-latest;pub-cache-hosted;dart:2.12.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
-          sdk: beta
+          sdk: "2.12.0"
       - id: checkout
         uses: actions/checkout@v2
       - id: _test_yaml_pub_upgrade
@@ -463,7 +463,7 @@ jobs:
             os:ubuntu-latest;pub-cache-hosted;dart:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v0.3
+      - uses: dart-lang/setup-dart@v1.0
         with:
           sdk: dev
       - id: checkout

_test_yaml/mono_pkg.yaml

@@ -1,6 +1,6 @@
 # See https://github.com/google/mono_repo.dart for details on this file
 dart:
-- beta # change this to 1.12.0 when it's released!
+- 2.12.0
 - dev
 
 stages:

_test_yaml/pubspec.yaml

@@ -2,7 +2,7 @@ name: _test_yaml
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 
 dev_dependencies:
   build_runner: ^1.0.0

_test_yaml/test/yaml_test.dart

@@ -160,9 +160,6 @@ line 4, column 21 of file.yaml: Unsupported value for "configLocation". Illegal
   ╵'''
 };
 
-// ignore: deprecated_member_use
-final throwsCastError = throwsA(isA<CastError>());
-
 T roundTripObject<T>(
   T object,
   T Function(Map<String, dynamic> json) factory, {

analysis_options.yaml

@@ -8,6 +8,7 @@ linter:
     - always_require_non_null_named_parameters
     - annotate_overrides
     - avoid_catching_errors
+    - avoid_dynamic_calls
     - avoid_empty_else
     - avoid_function_literals_in_foreach_calls
     - avoid_init_to_null
@@ -20,6 +21,7 @@ linter:
     - avoid_returning_null
     - avoid_returning_null_for_void
     - avoid_shadowing_type_parameters
+    - avoid_single_cascade_in_expression_statements
     - avoid_types_as_parameter_names
     - avoid_unused_constructor_parameters
     - avoid_void_async
@@ -87,6 +89,7 @@ linter:
     - provide_deprecation_message
     - recursive_getters
     - slash_for_doc_comments
+    - sort_child_properties_last
     - sort_pub_dependencies
     - test_types_in_equals
     - throw_in_finally
@@ -105,7 +108,10 @@ linter:
     - unnecessary_string_interpolations
     - unnecessary_this
     - unrelated_type_equality_checks
+    - unsafe_html
+    - use_full_hex_values_for_flutter_colors
     - use_function_type_syntax_for_parameters
+    - use_is_even_rather_than_modulo
     - use_rethrow_when_possible
     - use_string_buffers
     - valid_regexps

checked_yaml/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 2.0.0-dev
+## 2.0.1
+
+- If `CheckedFromJsonException` is caught for a key missing in the source map,
+  include those details in the thrown `ParsedYamlException`.
+
+- Correctly handle the case where `CheckedFromJsonException.message` is `null`.
+
+## 2.0.0
 
 - *BREAKING* `checkedYamlDecode` `sourceUrl` parameter is now a `Uri`.
 - Require at least Dart `2.12.0-0`.

checked_yaml/README.md

@@ -18,7 +18,6 @@ for the class annotation.
 class Configuration {
   @JsonKey(required: true)
   final String name;
-  @JsonKey(required: true)
   final int count;
 
   Configuration({required this.name, required this.count}) {

checked_yaml/example/example.dart

@@ -17,7 +17,6 @@ part 'example.g.dart';
 class Configuration {
   @JsonKey(required: true)
   final String name;
-  @JsonKey(required: true)
   final int count;
 
   Configuration({required this.name, required this.count}) {

checked_yaml/example/example.g.dart

@@ -75,12 +75,18 @@ ParsedYamlException toParsedYamlException(
       innerError: exception,
     );
   } else {
-    final yamlValue = yamlMap.nodes[exception.key];
-
-    if (yamlValue == null) {
-      // TODO: test this case!
+    if (exception.key == null) {
+      return ParsedYamlException(
+        exception.message ?? 'There was an error parsing the map.',
+        yamlMap,
+        innerError: exception,
+      );
+    } else if (!yamlMap.containsKey(exception.key)) {
       return ParsedYamlException(
-        exception.message!,
+        [
+          'Missing key "${exception.key}".',
+          if (exception.message != null) exception.message!,
+        ].join(' '),
         yamlMap,
         innerError: exception,
       );
@@ -91,7 +97,7 @@ ParsedYamlException toParsedYamlException(
       }
       return ParsedYamlException(
         message,
-        yamlValue,
+        yamlMap.nodes[exception.key] ?? yamlMap,
         innerError: exception,
       );
     }