Correctly decode Map<String,double> when the input has int literals (google#894)

Prepare to release v4.1.2

Also fix directive ordering, which is now enforced
Also add stable branch (v4_x) to test on CI
Also update generated CI code with latest mono_repo

Author: kevmoo

.github/workflows/dart.yml

@@ -1,10 +1,10 @@
-# Created with package:mono_repo v3.4.7
+# Created with package:mono_repo v4.0.0
 name: Dart CI
 on:
   push:
     branches:
       - master
-      - "3_x"
+      - "4_x"
   pull_request:
   schedule:
     - cron: "0 0 * * 0"
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:stable"
@@ -31,17 +31,17 @@ jobs:
         with:
           sdk: stable
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - name: mono_repo self validate
-        run: pub global activate mono_repo 3.4.7
+        run: pub global activate mono_repo 4.0.0
       - name: mono_repo self validate
         run: pub global run mono_repo generate --validate
   job_002:
     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
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:dartfmt-dartanalyzer"
@@ -54,7 +54,7 @@ jobs:
         with:
           sdk: "2.12.0"
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: _test_yaml_pub_upgrade
         name: "_test_yaml; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"
@@ -125,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:dartfmt-dartanalyzer"
@@ -138,7 +138,7 @@ jobs:
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: _test_yaml_pub_upgrade
         name: "_test_yaml; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"
@@ -209,7 +209,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
@@ -222,7 +222,7 @@ jobs:
         with:
           sdk: "2.12.0"
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: _test_yaml_pub_upgrade
         name: "_test_yaml; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"
@@ -268,7 +268,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
@@ -281,7 +281,7 @@ jobs:
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: _test_yaml_pub_upgrade
         name: "_test_yaml; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"
@@ -327,7 +327,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:json_serializable;commands:test_2"
@@ -340,7 +340,7 @@ jobs:
         with:
           sdk: "2.12.0"
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: json_serializable_pub_upgrade
         name: "json_serializable; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"
@@ -359,7 +359,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:json_serializable;commands:test_2"
@@ -372,7 +372,7 @@ jobs:
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: json_serializable_pub_upgrade
         name: "json_serializable; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"
@@ -391,7 +391,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:2.12.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_1"
@@ -404,7 +404,7 @@ jobs:
         with:
           sdk: "2.12.0"
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: _test_yaml_pub_upgrade
         name: "_test_yaml; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"
@@ -454,7 +454,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
         with:
           path: "~/.pub-cache/hosted"
           key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_1"
@@ -467,7 +467,7 @@ jobs:
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - id: _test_yaml_pub_upgrade
         name: "_test_yaml; pub upgrade --no-precompile"
         if: "always() && steps.checkout.conclusion == 'success'"

json_serializable/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.1.2
+
+- Correctly decode `Map<String, double>` when the input has `int` literals.
+
 ## 4.1.1
 
 - Allow the latest `package:build_config`.

json_serializable/lib/src/type_helpers/map_helper.dart

@@ -90,7 +90,9 @@ class MapHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
       if (!targetTypeIsNullable &&
           (valueArgIsAny ||
-              simpleJsonTypeChecker.isAssignableFromType(valueArg))) {
+              // explicitly exclude double since we need to do an explicit
+              // `toDouble` on input values
+              valueArg.isSimpleJsonTypeNotDouble)) {
         // No mapping of the values or null check required!
         final valueString = valueArg.getDisplayString(withNullability: false);
         return 'Map<String, $valueString>.from($expression as Map)';
@@ -179,3 +181,8 @@ Iterable<String> get _allowedTypeNames => const [
       'enum',
       'String',
     ].followedBy(_instances.map((i) => i.coreTypeName));
+
+extension on DartType {
+  bool get isSimpleJsonTypeNotDouble =>
+      !isDartCoreDouble && simpleJsonTypeChecker.isAssignableFromType(this);
+}

json_serializable/pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_serializable
-version: 4.1.1
+version: 4.1.2
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.

json_serializable/test/enum_helper_test.dart

@@ -3,9 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
-
-import 'package:test/test.dart';
 import 'package:json_serializable/src/type_helpers/enum_helper.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('expression test', () {

json_serializable/test/supported_types/input.type_map.g.dart

@@ -0,0 +1,77 @@
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:convert';
+
+import 'package:test/test.dart';
+
+import '../test_utils.dart';
+import 'input.type_map.dart';
+
+void main() {
+  test('SimpleClassOfStringToDouble', () {
+    const value = {
+      'value': {
+        'double': 1.0,
+        'int': 1,
+      }
+    };
+
+    final object = SimpleClassOfStringToDouble.fromJson(value);
+    final encoded = loudEncode(object);
+
+    expect(
+      encoded,
+      loudEncode({
+        'value': {
+          'double': 1.0,
+          // Note! Encoded as a double on output!
+          'int': 1.0,
+        }
+      }),
+    );
+
+    final object2 = SimpleClassOfStringToDouble.fromJson(
+      jsonDecode(encoded) as Map<String, Object?>,
+    );
+    expect(loudEncode(object2), encoded);
+  });
+
+  test('SimpleClassOfStringToInt', () {
+    const value = {
+      'value': {
+        'int': 1,
+      }
+    };
+
+    final object = SimpleClassOfStringToInt.fromJson(value);
+    final encoded = loudEncode(object);
+
+    expect(encoded, loudEncode(value));
+
+    final object2 = SimpleClassOfStringToInt.fromJson(
+      jsonDecode(encoded) as Map<String, Object?>,
+    );
+    expect(loudEncode(object2), encoded);
+  });
+
+  test('SimpleClassOfStringToNum', () {
+    const value = {
+      'value': {
+        'double': 1.0,
+        'int': 1,
+      }
+    };
+
+    final object = SimpleClassOfStringToNum.fromJson(value);
+    final encoded = loudEncode(object);
+
+    expect(encoded, loudEncode(value));
+
+    final object2 = SimpleClassOfStringToNum.fromJson(
+      jsonDecode(encoded) as Map<String, Object?>,
+    );
+    expect(loudEncode(object2), encoded);
+  });
+}

json_serializable/test/supported_types/support_types_extra_tests.dart

@@ -3,10 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
-
-import 'package:test/test.dart';
-
 import 'package:json_serializable/src/utils.dart';
+import 'package:test/test.dart';
 
 const _kebabItems = {
   'simple': 'simple',

json_serializable/test/utils_test.dart

@@ -6,7 +6,7 @@ github:
     push:
       branches:
       - master
-      - 3_x
+      - 4_x
     pull_request:
     schedule:
     - cron: "0 0 * * 0"

mono_repo.yaml

@@ -1,12 +1,23 @@
 #!/bin/bash
-# Created with package:mono_repo v3.4.7
+# Created with package:mono_repo v4.0.0
 
 # Support built in commands on windows out of the box.
+# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
+# then "flutter" is called instead of "pub".
+# This assumes that the Flutter SDK has been installed in a previous step.
 function pub() {
-  if [[ $TRAVIS_OS_NAME == "windows" ]]; then
-    command pub.bat "$@"
+  if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
+    if [[ $TRAVIS_OS_NAME == "windows" ]]; then
+      command flutter.bat pub "$@"
+    else
+      command flutter pub "$@"
+    fi
   else
-    command pub "$@"
+    if [[ $TRAVIS_OS_NAME == "windows" ]]; then
+      command pub.bat "$@"
+    else
+      command pub "$@"
+    fi
   fi
 }
 function dartfmt() {