diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b13533755..912e13757 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,9 +4,5 @@ In order to route, prioritize, and act on this, please include the entire output
 of either `dart --version` or `flutter --version`, depending on what
 you're using.
 
-Is it really an issue? For general questions consider starting with Stack
-Overflow:
-https://stackoverflow.com/questions/tagged/dart
-
-Also consider our Gitter channel for light-weight/quick discussions:
-https://gitter.im/dart-lang/build
+Is it really an issue? For general questions consider starting with community
+resources: https://dart.dev/community
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 655f40367..5524d4ed5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,8 +4,13 @@
 version: 2
 updates:
 
-- package-ecosystem: "github-actions"
-  directory: "/"
+- package-ecosystem: github-actions
+  directory: /
   schedule:
-    # Check for updates to GitHub Actions weekly
-    interval: "weekly"
+    interval: monthly
+  labels:
+    - autosubmit
+  groups:
+    dependencies:
+      patterns:
+        - "*"
diff --git a/.github/no-response.yml b/.github/no-response.yml
deleted file mode 100644
index b5567e94c..000000000
--- a/.github/no-response.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-
-# Number of days of inactivity before an issue is closed for lack of response.
-daysUntilClose: 21
-
-# Label requiring a response.
-responseRequiredLabel: "State: needs info"
-
-# Comment to post when closing an Issue for lack of response.
-closeComment: >-
-  Without additional information, we are unfortunately not sure how to
-  resolve this issue. We are therefore reluctantly going to close this
-  bug for now. Please don't hesitate to comment on the bug if you have
-  any more information for us; we will reopen it right away!
-
-  Thanks for your contribution.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index e1fbc4f68..db6794a07 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -1,4 +1,4 @@
-# Created with package:mono_repo v5.0.4
+# Created with package:mono_repo v6.6.3
 name: Dart CI
 on:
   push:
@@ -13,6 +13,7 @@ defaults:
     shell: bash
 env:
   PUB_ENVIRONMENT: bot.github
+permissions: read-all
 
 jobs:
   job_001:
@@ -20,341 +21,335 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:stable"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: stable
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: mono_repo self validate
-        run: dart pub global activate mono_repo 5.0.4
+        run: dart pub global activate mono_repo 6.6.3
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyzer_and_format; Dart 2.14.0; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    name: "analyzer_and_format; Dart 3.8.0; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dart analyze`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:format-analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:analyze_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "2.14.0"
+          sdk: "3.8.0"
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: _test_yaml_pub_upgrade
         name: _test_yaml; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: _test_yaml
         run: dart pub upgrade
-      - name: "_test_yaml; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
+        if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_yaml
-        run: "dart format --output=none --set-exit-if-changed ."
-      - name: "_test_yaml; dart analyze --fatal-infos ."
+      - name: _test_yaml; dart analyze
+        run: dart analyze
         if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart analyze --fatal-infos .
       - id: checked_yaml_pub_upgrade
         name: checked_yaml; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: checked_yaml
         run: dart pub upgrade
-      - name: "checked_yaml; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
+        if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: checked_yaml
-        run: "dart format --output=none --set-exit-if-changed ."
-      - name: "checked_yaml; dart analyze --fatal-infos ."
+      - name: checked_yaml; dart analyze
+        run: dart analyze
         if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart analyze --fatal-infos .
       - id: example_pub_upgrade
         name: example; dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: example
         run: dart pub upgrade
-      - name: "example; dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
+        if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: example
-        run: "dart format --output=none --set-exit-if-changed ."
-      - name: "example; dart analyze --fatal-infos ."
+      - name: example; dart analyze
+        run: dart analyze
         if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
         working-directory: example
-        run: dart analyze --fatal-infos .
       - id: json_annotation_pub_upgrade
         name: json_annotation; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_annotation
-        run: dart pub upgrade
-      - name: "json_annotation; dart format --output=none --set-exit-if-changed ."
+      - name: json_annotation; dart analyze
+        run: dart analyze
         if: "always() && steps.json_annotation_pub_upgrade.conclusion == 'success'"
         working-directory: json_annotation
-        run: "dart format --output=none --set-exit-if-changed ."
-      - name: "json_annotation; dart analyze --fatal-infos ."
-        if: "always() && steps.json_annotation_pub_upgrade.conclusion == 'success'"
-        working-directory: json_annotation
-        run: dart analyze --fatal-infos .
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
-      - name: "json_serializable; dart format --output=none --set-exit-if-changed ."
+      - name: json_serializable; dart analyze
+        run: dart analyze
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: "dart format --output=none --set-exit-if-changed ."
-      - name: "json_serializable; dart analyze --fatal-infos ."
-        if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
-        working-directory: json_serializable
-        run: dart analyze --fatal-infos .
   job_003:
     name: "analyzer_and_format; Dart dev; PKGS: _test_yaml, checked_yaml, example, json_annotation, json_serializable; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         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:format-analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable;commands:format-analyze_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:dev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_test_yaml-checked_yaml-example-json_annotation-json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: _test_yaml_pub_upgrade
         name: _test_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart pub upgrade
       - name: "_test_yaml; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
         if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: _test_yaml
-        run: "dart format --output=none --set-exit-if-changed ."
       - name: "_test_yaml; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
         if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart analyze --fatal-infos .
       - id: checked_yaml_pub_upgrade
         name: checked_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart pub upgrade
       - name: "checked_yaml; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
         if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: checked_yaml
-        run: "dart format --output=none --set-exit-if-changed ."
       - name: "checked_yaml; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
         if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart analyze --fatal-infos .
       - id: example_pub_upgrade
         name: example; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: example
-        run: dart pub upgrade
       - name: "example; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
         if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
         working-directory: example
-        run: "dart format --output=none --set-exit-if-changed ."
       - name: "example; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
         if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
         working-directory: example
-        run: dart analyze --fatal-infos .
       - id: json_annotation_pub_upgrade
         name: json_annotation; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_annotation
-        run: dart pub upgrade
       - name: "json_annotation; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
         if: "always() && steps.json_annotation_pub_upgrade.conclusion == 'success'"
         working-directory: json_annotation
-        run: "dart format --output=none --set-exit-if-changed ."
       - name: "json_annotation; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
         if: "always() && steps.json_annotation_pub_upgrade.conclusion == 'success'"
         working-directory: json_annotation
-        run: dart analyze --fatal-infos .
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: "json_serializable; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: "dart format --output=none --set-exit-if-changed ."
       - name: "json_serializable; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart analyze --fatal-infos .
   job_004:
-    name: "unit_test; Dart 2.14.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `dart test`"
+    name: "unit_test; Dart 3.8.0; PKGS: _test_yaml, checked_yaml, example, json_serializable; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:_test_yaml-checked_yaml-example-json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:_test_yaml-checked_yaml-example-json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "2.14.0"
+          sdk: "3.8.0"
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: _test_yaml_pub_upgrade
         name: _test_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart pub upgrade
       - name: _test_yaml; dart test
+        run: dart test
         if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart test
       - id: checked_yaml_pub_upgrade
         name: checked_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart pub upgrade
       - name: checked_yaml; dart test
+        run: dart test
         if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart test
       - id: example_pub_upgrade
         name: example; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: example
-        run: dart pub upgrade
       - name: example; dart test
+        run: dart test
         if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
         working-directory: example
-        run: dart test
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: json_serializable; dart test
+        run: dart test
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test
     needs:
       - job_001
       - job_002
       - job_003
   job_005:
-    name: "unit_test; Dart 2.14.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/annotation_version_test.dart`"
+    name: "unit_test; Dart 3.8.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/annotation_version_test.dart`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:json_serializable;commands:test_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:json_serializable;commands:test_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "2.14.0"
+          sdk: "3.8.0"
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: "json_serializable; dart test --run-skipped -t presubmit-only test/annotation_version_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/annotation_version_test.dart
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test --run-skipped -t presubmit-only test/annotation_version_test.dart
     needs:
       - job_001
       - job_002
       - job_003
   job_006:
-    name: "unit_test; Dart 2.14.0; PKG: json_serializable; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
+    name: "unit_test; Dart 3.8.0; PKG: json_serializable; `dart 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.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:json_serializable;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:json_serializable;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "2.14.0"
+          sdk: "3.8.0"
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: "json_serializable; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
     needs:
       - job_001
       - job_002
       - job_003
   job_007:
-    name: "unit_test; Dart 2.14.0; PKG: json_serializable; `dart test -p chrome`"
+    name: "unit_test; Dart 3.8.0; PKG: json_serializable; `dart test -p chrome`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:json_serializable;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:json_serializable;commands:test_2"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "2.14.0"
+          sdk: "3.8.0"
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: "json_serializable; dart test -p chrome"
+        run: dart test -p chrome
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test -p chrome
     needs:
       - job_001
       - job_002
@@ -364,56 +359,58 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         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"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_test_yaml-checked_yaml-example-json_serializable;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:_test_yaml-checked_yaml-example-json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:dev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_test_yaml-checked_yaml-example-json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: _test_yaml_pub_upgrade
         name: _test_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart pub upgrade
       - name: _test_yaml; dart test
+        run: dart test
         if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart test
       - id: checked_yaml_pub_upgrade
         name: checked_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart pub upgrade
       - name: checked_yaml; dart test
+        run: dart test
         if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart test
       - id: example_pub_upgrade
         name: example; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: example
-        run: dart pub upgrade
       - name: example; dart test
+        run: dart test
         if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
         working-directory: example
-        run: dart test
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: json_serializable; dart test
+        run: dart test
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test
     needs:
       - job_001
       - job_002
@@ -423,29 +420,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:json_serializable;commands:test_3"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:json_serializable;commands:test_3"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:dev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: "json_serializable; dart test --run-skipped -t presubmit-only test/annotation_version_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/annotation_version_test.dart
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test --run-skipped -t presubmit-only test/annotation_version_test.dart
     needs:
       - job_001
       - job_002
@@ -455,29 +454,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:json_serializable;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:json_serializable;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:dev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: "json_serializable; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
     needs:
       - job_001
       - job_002
@@ -487,79 +488,83 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:json_serializable;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:json_serializable;commands:test_2"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:json_serializable
-            os:ubuntu-latest;pub-cache-hosted;dart:dev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:json_serializable
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: json_serializable_pub_upgrade
         name: json_serializable; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart pub upgrade
       - name: "json_serializable; dart test -p chrome"
+        run: dart test -p chrome
         if: "always() && steps.json_serializable_pub_upgrade.conclusion == 'success'"
         working-directory: json_serializable
-        run: dart test -p chrome
     needs:
       - job_001
       - job_002
       - job_003
   job_012:
-    name: "ensure_build; Dart 2.14.0; PKGS: _test_yaml, checked_yaml, example; `dart test --run-skipped -t presubmit-only test/ensure_build_test.dart`"
+    name: "ensure_build; Dart 3.8.0; PKGS: _test_yaml, checked_yaml, example; `dart 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.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:_test_yaml-checked_yaml-example;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:_test_yaml-checked_yaml-example;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0;packages:_test_yaml-checked_yaml-example
-            os:ubuntu-latest;pub-cache-hosted;dart:2.14.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:_test_yaml-checked_yaml-example
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "2.14.0"
+          sdk: "3.8.0"
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: _test_yaml_pub_upgrade
         name: _test_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart pub upgrade
       - name: "_test_yaml; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
       - id: checked_yaml_pub_upgrade
         name: checked_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart pub upgrade
       - name: "checked_yaml; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
       - id: example_pub_upgrade
         name: example; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: example
-        run: dart pub upgrade
       - name: "example; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
         working-directory: example
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
     needs:
       - job_001
       - job_002
@@ -577,47 +582,49 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:_test_yaml-checked_yaml-example;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_test_yaml-checked_yaml-example;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;dart:dev;packages:_test_yaml-checked_yaml-example
-            os:ubuntu-latest;pub-cache-hosted;dart:dev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_test_yaml-checked_yaml-example
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - uses: dart-lang/setup-dart@v1.3
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
           sdk: dev
       - id: checkout
-        uses: actions/checkout@v2.3.5
+        name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - id: _test_yaml_pub_upgrade
         name: _test_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart pub upgrade
       - name: "_test_yaml; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps._test_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: _test_yaml
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
       - id: checked_yaml_pub_upgrade
         name: checked_yaml; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart pub upgrade
       - name: "checked_yaml; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps.checked_yaml_pub_upgrade.conclusion == 'success'"
         working-directory: checked_yaml
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
       - id: example_pub_upgrade
         name: example; dart pub upgrade
+        run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: example
-        run: dart pub upgrade
       - name: "example; dart test --run-skipped -t presubmit-only test/ensure_build_test.dart"
+        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
         if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
         working-directory: example
-        run: dart test --run-skipped -t presubmit-only test/ensure_build_test.dart
     needs:
       - job_001
       - job_002
diff --git a/.github/workflows/markdown_linter.yml b/.github/workflows/markdown_linter.yml
index f5ac406d6..840a93d4d 100644
--- a/.github/workflows/markdown_linter.yml
+++ b/.github/workflows/markdown_linter.yml
@@ -11,20 +11,10 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.5
-      - uses: gaurav-nelson/github-action-markdown-link-check@v1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368
   markdown_lint:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [ 14.x ]
     steps:
-      - uses: actions/checkout@v2.3.5
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.4.1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Install dependencies
-        run: npm install --global markdownlint-cli2
-      - name: Run lint check
-        run: markdownlint-cli2-fix "**/*.md"
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e
diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
new file mode 100644
index 000000000..7a9d48f4c
--- /dev/null
+++ b/.github/workflows/no-response.yml
@@ -0,0 +1,37 @@
+# A workflow to close issues where the author hasn't responded to a request for
+# more information; see https://github.com/actions/stale.
+
+name: No Response
+
+# Run as a daily cron.
+on:
+  schedule:
+    # Every day at 8am
+    - cron: '0 8 * * *'
+
+# All permissions not specified are set to 'none'.
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  no-response:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'google' }}
+    steps:
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639
+        with:
+          # Don't automatically mark inactive issues+PRs as stale.
+          days-before-stale: -1
+          # Close needs-info issues and PRs after 14 days of inactivity.
+          days-before-close: 14
+          stale-issue-label: "State: needs info"
+          close-issue-message: >
+            Without additional information we're not able to resolve this issue.
+            Feel free to add more info or respond to any questions above and we
+            can reopen the case. Thanks for your contribution!
+          stale-pr-label: "State: needs info"
+          close-pr-message: >
+            Without additional information we're not able to resolve this PR.
+            Feel free to add more info or respond to any questions above.
+            Thanks for your contribution!
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
new file mode 100644
index 000000000..afff618d2
--- /dev/null
+++ b/.github/workflows/publish.yaml
@@ -0,0 +1,17 @@
+# A CI configuration to auto-publish pub packages.
+
+name: Publish
+
+on:
+  pull_request:
+    branches: [ master ]
+  push:
+    tags: [ '[A-z]+-v[0-9]+.[0-9]+.[0-9]+' ]
+
+jobs:
+  publish:
+    if: ${{ github.repository_owner == 'google' }}
+    uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main
+    permissions:
+      id-token: write # Required for authentication using OIDC
+      pull-requests: write # Required for writing the pull request note
diff --git a/.gitignore b/.gitignore
index 43dbe764a..c5a0d2502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
+# https://dart.dev/guides/libraries/private-files
 .dart_tool
-.packages
-.pub
-packages
 pubspec.lock
diff --git a/_test_yaml/mono_pkg.yaml b/_test_yaml/mono_pkg.yaml
index f508952d2..840b0b117 100644
--- a/_test_yaml/mono_pkg.yaml
+++ b/_test_yaml/mono_pkg.yaml
@@ -1,6 +1,6 @@
 # See https://github.com/google/mono_repo.dart for details on this file
-dart:
-- 2.14.0
+sdk:
+- pubspec
 - dev
 
 stages:
@@ -8,6 +8,10 @@ stages:
   - group:
     - format
     - analyze: --fatal-infos .
+    sdk: dev
+  - group:
+      - analyze
+    sdk: pubspec
 - unit_test:
   - test
 - ensure_build:
diff --git a/_test_yaml/pubspec.yaml b/_test_yaml/pubspec.yaml
index 39171e628..a2496e7ce 100644
--- a/_test_yaml/pubspec.yaml
+++ b/_test_yaml/pubspec.yaml
@@ -2,21 +2,18 @@ name: _test_yaml
 publish_to: none
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: ^3.8.0
+
+resolution: workspace
 
 dev_dependencies:
-  build_runner: ^2.0.0
-  build_verify: ^2.0.0
-  checked_yaml: any
-  json_annotation: ^4.3.0
-  json_serializable: any
-  test: ^1.6.0
+  _json_serial_shared_test:
+    path: ../shared_test
+  build_runner: ^2.2.1
+  build_verify: ^3.0.0
+  checked_yaml: ^2.0.4-wip
+  json_annotation: ^4.9.0
+  json_serializable: ^6.8.0
+  path: ^1.8.2
+  test: ^1.21.6
   yaml: ^3.0.0
-
-dependency_overrides:
-  checked_yaml:
-    path: ../checked_yaml
-  json_annotation:
-    path: ../json_annotation
-  json_serializable:
-    path: ../json_serializable
diff --git a/_test_yaml/test/ensure_build_test.dart b/_test_yaml/test/ensure_build_test.dart
index acd110e44..406a1aa77 100644
--- a/_test_yaml/test/ensure_build_test.dart
+++ b/_test_yaml/test/ensure_build_test.dart
@@ -4,10 +4,15 @@
 
 @TestOn('vm')
 @Tags(['presubmit-only'])
+library;
+
 import 'package:build_verify/build_verify.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test('ensure_build',
-      () => expectBuildClean(packageRelativeDirectory: '_test_yaml'));
+  test(
+    'ensure_build',
+    () => expectBuildClean(packageRelativeDirectory: '_test_yaml'),
+    timeout: const Timeout.factor(2),
+  );
 }
diff --git a/_test_yaml/test/src/build_config.dart b/_test_yaml/test/src/build_config.dart
index a749d442a..958329f8d 100644
--- a/_test_yaml/test/src/build_config.dart
+++ b/_test_yaml/test/src/build_config.dart
@@ -12,7 +12,7 @@ class Config {
   final Map<String, Builder> builders;
 
   // Verifying enum keys in map
-  Map<AutoApply, int>? weights;
+  Map<AutoApply, int?>? weights;
 
   Config({required this.builders});
 
@@ -22,14 +22,15 @@ class Config {
 }
 
 @JsonSerializable(
-    includeIfNull: false,
-    disallowUnrecognizedKeys: true,
-    checked: true,
-    anyMap: true)
+  includeIfNull: false,
+  disallowUnrecognizedKeys: true,
+  checked: true,
+  anyMap: true,
+)
 class Builder {
   final String? target;
 
-  final String import;
+  final String? import;
 
   @JsonKey(name: 'is_optional')
   final bool? isOptional;
@@ -58,7 +59,7 @@ class Builder {
   final Map<String, List<String>>? buildExtensions;
 
   Builder({
-    required this.import,
+    this.import,
     this.target,
     this.isOptional,
     this.autoApply,
@@ -71,8 +72,11 @@ class Builder {
     this.configLocation,
   }) {
     if (builderFactories.isEmpty) {
-      throw ArgumentError.value(builderFactories, 'builderFactories',
-          'Must have at least one value.');
+      throw ArgumentError.value(
+        builderFactories,
+        'builderFactories',
+        'Must have at least one value.',
+      );
     }
   }
 
@@ -82,11 +86,6 @@ class Builder {
 }
 
 @JsonEnum(fieldRename: FieldRename.snake)
-enum AutoApply {
-  none,
-  dependents,
-  allPackages,
-  rootPackage,
-}
+enum AutoApply { none, dependents, allPackages, rootPackage }
 
 enum BuildTo { cache, source }
diff --git a/_test_yaml/test/src/build_config.g.dart b/_test_yaml/test/src/build_config.g.dart
index f509e2eb6..e453d996c 100644
--- a/_test_yaml/test/src/build_config.g.dart
+++ b/_test_yaml/test/src/build_config.g.dart
@@ -6,36 +6,34 @@ part of 'build_config.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Config _$ConfigFromJson(Map json) => $checkedCreate(
-      'Config',
-      json,
-      ($checkedConvert) {
-        $checkKeys(
-          json,
-          requiredKeys: const ['builders'],
-        );
-        final val = Config(
-          builders: $checkedConvert(
-              'builders',
-              (v) => (v as Map).map(
-                    (k, e) => MapEntry(k as String, Builder.fromJson(e as Map)),
-                  )),
-        );
-        $checkedConvert(
-            'weights',
-            (v) => val.weights = (v as Map?)?.map(
-                  (k, e) =>
-                      MapEntry($enumDecode(_$AutoApplyEnumMap, k), e as int),
-                ));
-        return val;
-      },
-    );
+Config _$ConfigFromJson(Map json) => $checkedCreate('Config', json, (
+  $checkedConvert,
+) {
+  $checkKeys(json, requiredKeys: const ['builders']);
+  final val = Config(
+    builders: $checkedConvert(
+      'builders',
+      (v) => (v as Map).map(
+        (k, e) => MapEntry(k as String, Builder.fromJson(e as Map)),
+      ),
+    ),
+  );
+  $checkedConvert(
+    'weights',
+    (v) => val.weights = (v as Map?)?.map(
+      (k, e) =>
+          MapEntry($enumDecode(_$AutoApplyEnumMap, k), (e as num?)?.toInt()),
+    ),
+  );
+  return val;
+});
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
-      'builders': instance.builders,
-      'weights':
-          instance.weights?.map((k, e) => MapEntry(_$AutoApplyEnumMap[k], e)),
-    };
+  'builders': instance.builders,
+  'weights': instance.weights?.map(
+    (k, e) => MapEntry(_$AutoApplyEnumMap[k]!, e),
+  ),
+};
 
 const _$AutoApplyEnumMap = {
   AutoApply.none: 'none',
@@ -45,88 +43,93 @@ const _$AutoApplyEnumMap = {
 };
 
 Builder _$BuilderFromJson(Map json) => $checkedCreate(
-      'Builder',
+  'Builder',
+  json,
+  ($checkedConvert) {
+    $checkKeys(
       json,
-      ($checkedConvert) {
-        $checkKeys(
-          json,
-          allowedKeys: const [
-            'target',
-            'import',
-            'is_optional',
-            'configLocation',
-            'auto_apply',
-            'build_to',
-            'defaultEnumTest',
-            'builder_factories',
-            'applies_builders',
-            'required_inputs',
-            'build_extensions'
-          ],
-          disallowNullValues: const ['configLocation', 'auto_apply'],
-        );
-        final val = Builder(
-          import: $checkedConvert('import', (v) => v as String),
-          target: $checkedConvert('target', (v) => v as String?),
-          isOptional: $checkedConvert('is_optional', (v) => v as bool?),
-          autoApply: $checkedConvert(
-              'auto_apply', (v) => $enumDecodeNullable(_$AutoApplyEnumMap, v)),
-          buildTo: $checkedConvert(
-              'build_to', (v) => $enumDecodeNullable(_$BuildToEnumMap, v)),
-          defaultEnumTest: $checkedConvert('defaultEnumTest',
-              (v) => $enumDecodeNullable(_$AutoApplyEnumMap, v)),
-          builderFactories: $checkedConvert('builder_factories',
-              (v) => (v as List<dynamic>).map((e) => e as String).toList()),
-          appliesBuilders: $checkedConvert('applies_builders',
-              (v) => (v as List<dynamic>?)?.map((e) => e as String).toList()),
-          requiredInputs: $checkedConvert('required_inputs',
-              (v) => (v as List<dynamic>?)?.map((e) => e as String).toList()),
-          buildExtensions: $checkedConvert(
-              'build_extensions',
-              (v) => (v as Map?)?.map(
-                    (k, e) => MapEntry(k as String,
-                        (e as List<dynamic>).map((e) => e as String).toList()),
-                  )),
-          configLocation: $checkedConvert('configLocation',
-              (v) => v == null ? null : Uri.parse(v as String)),
-        );
-        return val;
-      },
-      fieldKeyMap: const {
-        'isOptional': 'is_optional',
-        'autoApply': 'auto_apply',
-        'buildTo': 'build_to',
-        'builderFactories': 'builder_factories',
-        'appliesBuilders': 'applies_builders',
-        'requiredInputs': 'required_inputs',
-        'buildExtensions': 'build_extensions'
-      },
+      allowedKeys: const [
+        'target',
+        'import',
+        'is_optional',
+        'configLocation',
+        'auto_apply',
+        'build_to',
+        'defaultEnumTest',
+        'builder_factories',
+        'applies_builders',
+        'required_inputs',
+        'build_extensions',
+      ],
+      disallowNullValues: const ['configLocation', 'auto_apply'],
     );
+    final val = Builder(
+      import: $checkedConvert('import', (v) => v as String?),
+      target: $checkedConvert('target', (v) => v as String?),
+      isOptional: $checkedConvert('is_optional', (v) => v as bool?),
+      autoApply: $checkedConvert(
+        'auto_apply',
+        (v) => $enumDecodeNullable(_$AutoApplyEnumMap, v),
+      ),
+      buildTo: $checkedConvert(
+        'build_to',
+        (v) => $enumDecodeNullable(_$BuildToEnumMap, v),
+      ),
+      defaultEnumTest: $checkedConvert(
+        'defaultEnumTest',
+        (v) => $enumDecodeNullable(_$AutoApplyEnumMap, v),
+      ),
+      builderFactories: $checkedConvert(
+        'builder_factories',
+        (v) => (v as List<dynamic>).map((e) => e as String).toList(),
+      ),
+      appliesBuilders: $checkedConvert(
+        'applies_builders',
+        (v) => (v as List<dynamic>?)?.map((e) => e as String).toList(),
+      ),
+      requiredInputs: $checkedConvert(
+        'required_inputs',
+        (v) => (v as List<dynamic>?)?.map((e) => e as String).toList(),
+      ),
+      buildExtensions: $checkedConvert(
+        'build_extensions',
+        (v) => (v as Map?)?.map(
+          (k, e) => MapEntry(
+            k as String,
+            (e as List<dynamic>).map((e) => e as String).toList(),
+          ),
+        ),
+      ),
+      configLocation: $checkedConvert(
+        'configLocation',
+        (v) => v == null ? null : Uri.parse(v as String),
+      ),
+    );
+    return val;
+  },
+  fieldKeyMap: const {
+    'isOptional': 'is_optional',
+    'autoApply': 'auto_apply',
+    'buildTo': 'build_to',
+    'builderFactories': 'builder_factories',
+    'appliesBuilders': 'applies_builders',
+    'requiredInputs': 'required_inputs',
+    'buildExtensions': 'build_extensions',
+  },
+);
 
-Map<String, dynamic> _$BuilderToJson(Builder instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('target', instance.target);
-  val['import'] = instance.import;
-  writeNotNull('is_optional', instance.isOptional);
-  writeNotNull('configLocation', instance.configLocation?.toString());
-  writeNotNull('auto_apply', _$AutoApplyEnumMap[instance.autoApply]);
-  writeNotNull('build_to', _$BuildToEnumMap[instance.buildTo]);
-  writeNotNull('defaultEnumTest', _$AutoApplyEnumMap[instance.defaultEnumTest]);
-  val['builder_factories'] = instance.builderFactories;
-  writeNotNull('applies_builders', instance.appliesBuilders);
-  writeNotNull('required_inputs', instance.requiredInputs);
-  writeNotNull('build_extensions', instance.buildExtensions);
-  return val;
-}
-
-const _$BuildToEnumMap = {
-  BuildTo.cache: 'cache',
-  BuildTo.source: 'source',
+Map<String, dynamic> _$BuilderToJson(Builder instance) => <String, dynamic>{
+  'target': ?instance.target,
+  'import': ?instance.import,
+  'is_optional': ?instance.isOptional,
+  'configLocation': ?instance.configLocation?.toString(),
+  'auto_apply': ?_$AutoApplyEnumMap[instance.autoApply],
+  'build_to': ?_$BuildToEnumMap[instance.buildTo],
+  'defaultEnumTest': ?_$AutoApplyEnumMap[instance.defaultEnumTest],
+  'builder_factories': instance.builderFactories,
+  'applies_builders': ?instance.appliesBuilders,
+  'required_inputs': ?instance.requiredInputs,
+  'build_extensions': ?instance.buildExtensions,
 };
+
+const _$BuildToEnumMap = {BuildTo.cache: 'cache', BuildTo.source: 'source'};
diff --git a/_test_yaml/test/yaml_test.dart b/_test_yaml/test/yaml_test.dart
index d696b6c7e..06a49a665 100644
--- a/_test_yaml/test/yaml_test.dart
+++ b/_test_yaml/test/yaml_test.dart
@@ -2,12 +2,12 @@
 // 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.
 
-// @dart=2.9
-
 @TestOn('vm')
-import 'dart:convert';
+library;
+
 import 'dart:io';
 
+import 'package:_json_serial_shared_test/shared_test.dart';
 import 'package:checked_yaml/checked_yaml.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:path/path.dart' as p;
@@ -27,10 +27,8 @@ void main() {
     for (final filePath in _tests) {
       test(p.basenameWithoutExtension(filePath), () {
         final content = File(filePath).readAsStringSync();
-        final yamlContent = loadYaml(
-          content,
-          sourceUrl: Uri.file(filePath),
-        ) as YamlMap;
+        final yamlContent =
+            loadYaml(content, sourceUrl: Uri.file(filePath)) as YamlMap;
 
         try {
           final config = Config.fromJson(yamlContent);
@@ -157,40 +155,5 @@ line 4, column 21 of file.yaml: Unsupported value for "configLocation". Illegal
   ╷
 4 │     configLocation: "user@host:invalid/uri"
   │                     ^^^^^^^^^^^^^^^^^^^^^^^
-  ╵'''
+  ╵''',
 };
-
-T roundTripObject<T>(
-  T object,
-  T Function(Map<String, dynamic> json) factory, {
-  bool skipObjectEquals = false,
-}) {
-  final data = loudEncode(object);
-
-  final object2 = factory(json.decode(data) as Map<String, dynamic>);
-
-  if (!skipObjectEquals) {
-    expect(object2, equals(object));
-  }
-
-  final json2 = loudEncode(object2);
-
-  expect(json2, equals(data));
-  return object2;
-}
-
-/// Prints out nested causes before throwing `JsonUnsupportedObjectError`.
-String loudEncode(Object object) {
-  try {
-    return const JsonEncoder.withIndent(' ').convert(object);
-  } on JsonUnsupportedObjectError catch (e) // ignore: avoid_catching_errors
-  {
-    var error = e;
-    do {
-      final cause = error.cause;
-      print(cause);
-      error = (cause is JsonUnsupportedObjectError) ? cause : null;
-    } while (error != null);
-    rethrow;
-  }
-}
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 611323ece..24ad09c26 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,123 +1,33 @@
+# See https://dart.dev/guides/language/analysis-options
+include: package:dart_flutter_team_lints/analysis_options.yaml
+
 analyzer:
-  strong-mode:
-    implicit-casts: false
+  language:
+    strict-casts: true
+  errors:
+    # Analyzer v7.4.0 crazy
+    deprecated_member_use: ignore
 
 linter:
   rules:
-    - always_declare_return_types
-    - 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
-    - avoid_null_checks_in_equality_operators
     - avoid_private_typedef_functions
     - avoid_redundant_argument_values
-    - avoid_relative_lib_imports
-    - avoid_renaming_method_parameters
-    - avoid_return_types_on_setters
     - 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
-    - await_only_futures
-    - camel_case_extensions
-    - camel_case_types
     - cancel_subscriptions
     - cascade_invocations
-    - comment_references
-    - constant_identifier_names
-    - control_flow_in_finally
-    - curly_braces_in_flow_control_structures
-    - directives_ordering
-    - empty_catches
-    - empty_constructor_bodies
-    - empty_statements
-    - exhaustive_cases
-    - file_names
-    - hash_and_equals
-    - implementation_imports
-    - invariant_booleans
-    - iterable_contains_unrelated_type
+    - invalid_case_patterns
     - join_return_with_assignment
-    - library_names
-    - library_prefixes
-    - lines_longer_than_80_chars
-    - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
-    - no_duplicate_case_values
     - no_runtimeType_toString
-    - non_constant_identifier_names
-    - null_closures
-    - omit_local_variable_types
-    - only_throw_errors
-    - overridden_fields
-    - package_api_docs
-    - package_names
-    - package_prefixed_library_names
-    - prefer_adjacent_string_concatenation
-    - prefer_asserts_in_initializer_lists
-    - prefer_collection_literals
-    - prefer_conditional_assignment
-    - prefer_const_constructors
     - prefer_const_declarations
-    - prefer_contains
-    - prefer_equal_for_default_values
     - prefer_expression_function_bodies
-    - prefer_final_fields
     - prefer_final_locals
-    - prefer_for_elements_to_map_fromIterable
-    - prefer_function_declarations_over_variables
-    - prefer_generic_function_type_aliases
-    - prefer_if_null_operators
-    - prefer_initializing_formals
-    - prefer_inlined_adds
-    - prefer_interpolation_to_compose_strings
-    - prefer_is_empty
-    - prefer_is_not_empty
-    - prefer_is_not_operator
-    - prefer_iterable_whereType
-    - prefer_null_aware_operators
-    - prefer_relative_imports
-    - prefer_single_quotes
-    - prefer_spread_collections
-    - prefer_typing_uninitialized_variables
-    - prefer_void_to_null
-    - provide_deprecation_message
-    - recursive_getters
-    - slash_for_doc_comments
     - sort_child_properties_last
-    - sort_pub_dependencies
-    - test_types_in_equals
-    - throw_in_finally
-    - type_annotate_public_apis
-    - type_init_formals
-    - unawaited_futures
-    - unnecessary_brace_in_string_interps
-    - unnecessary_const
-    - unnecessary_getters_setters
-    - unnecessary_lambdas
-    - unnecessary_new
-    - unnecessary_null_aware_assignments
-    - unnecessary_null_in_if_null_operators
-    - unnecessary_overrides
-    - unnecessary_parenthesis
-    - unnecessary_statements
-    - unnecessary_string_escapes
-    - unnecessary_string_interpolations
-    - unnecessary_this
-    - unrelated_type_equality_checks
-    - unsafe_html
+    - unnecessary_breaks
+    - unnecessary_ignore
     - use_full_hex_values_for_flutter_colors
-    - use_function_type_syntax_for_parameters
-    - use_is_even_rather_than_modulo
-    - use_rethrow_when_possible
+    - use_null_aware_elements
     - use_string_buffers
-    - valid_regexps
-    - void_checks
diff --git a/checked_yaml/CHANGELOG.md b/checked_yaml/CHANGELOG.md
index 019af44b4..567d14795 100644
--- a/checked_yaml/CHANGELOG.md
+++ b/checked_yaml/CHANGELOG.md
@@ -1,7 +1,17 @@
-## 2.0.2-dev
+## 2.0.4
+
+- Require Dart 3.8
+
+## 2.0.3
+
+- Require Dart 2.19
+- Add topics
+
+## 2.0.2
 
 - Require `json_annotation` `^4.3.0`
-- Require Dart SDK `>=2.14`
+- Require Dart SDK `>=2.18`
+- Work-around for [dart-lang/sdk#50756](https://github.com/dart-lang/sdk/issues/50756).
 
 ## 2.0.1
 
diff --git a/checked_yaml/README.md b/checked_yaml/README.md
index 1a56f1e23..d5f83e9d6 100644
--- a/checked_yaml/README.md
+++ b/checked_yaml/README.md
@@ -1,7 +1,7 @@
 [![Pub Package](https://img.shields.io/pub/v/checked_yaml.svg)](https://pub.dev/packages/checked_yaml)
 
 `package:checked_yaml` provides a `checkedYamlDecode` function that wraps the
-the creation of classes annotated for [`package:json_serializable`] it helps
+creation of classes annotated for [`package:json_serializable`] it helps
 provide more helpful exceptions when the provided YAML is not compatible with
 the target type.
 
@@ -10,11 +10,7 @@ the target type.
 for the class annotation.
 
 ```dart
-@JsonSerializable(
-  anyMap: true,
-  checked: true,
-  disallowUnrecognizedKeys: true,
-)
+@JsonSerializable(anyMap: true, checked: true, disallowUnrecognizedKeys: true)
 class Configuration {
   @JsonKey(required: true)
   final String name;
diff --git a/checked_yaml/example/example.dart b/checked_yaml/example/example.dart
index f89308843..416ca3a8b 100644
--- a/checked_yaml/example/example.dart
+++ b/checked_yaml/example/example.dart
@@ -9,11 +9,7 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'example.g.dart';
 
-@JsonSerializable(
-  anyMap: true,
-  checked: true,
-  disallowUnrecognizedKeys: true,
-)
+@JsonSerializable(anyMap: true, checked: true, disallowUnrecognizedKeys: true)
 class Configuration {
   @JsonKey(required: true)
   final String name;
diff --git a/checked_yaml/example/example.g.dart b/checked_yaml/example/example.g.dart
index c4d01aefb..b5547e94f 100644
--- a/checked_yaml/example/example.g.dart
+++ b/checked_yaml/example/example.g.dart
@@ -6,25 +6,19 @@ part of 'example.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Configuration _$ConfigurationFromJson(Map json) => $checkedCreate(
-      'Configuration',
-      json,
-      ($checkedConvert) {
-        $checkKeys(
-          json,
-          allowedKeys: const ['name', 'count'],
-          requiredKeys: const ['name'],
-        );
-        final val = Configuration(
-          name: $checkedConvert('name', (v) => v as String),
-          count: $checkedConvert('count', (v) => v as int),
-        );
-        return val;
-      },
-    );
+Configuration _$ConfigurationFromJson(Map json) =>
+    $checkedCreate('Configuration', json, ($checkedConvert) {
+      $checkKeys(
+        json,
+        allowedKeys: const ['name', 'count'],
+        requiredKeys: const ['name'],
+      );
+      final val = Configuration(
+        name: $checkedConvert('name', (v) => v as String),
+        count: $checkedConvert('count', (v) => (v as num).toInt()),
+      );
+      return val;
+    });
 
 Map<String, dynamic> _$ConfigurationToJson(Configuration instance) =>
-    <String, dynamic>{
-      'name': instance.name,
-      'count': instance.count,
-    };
+    <String, dynamic>{'name': instance.name, 'count': instance.count};
diff --git a/checked_yaml/lib/checked_yaml.dart b/checked_yaml/lib/checked_yaml.dart
index 154c59b02..1b6ad05df 100644
--- a/checked_yaml/lib/checked_yaml.dart
+++ b/checked_yaml/lib/checked_yaml.dart
@@ -36,7 +36,6 @@ T checkedYamlDecode<T>(
   if (yaml is YamlMap) {
     map = yaml;
   } else if (allowNull && yaml is YamlScalar && yaml.value == null) {
-    // TODO: test this case!
     map = null;
   } else {
     throw ParsedYamlException('Not a map', yaml);
@@ -66,42 +65,36 @@ ParsedYamlException toParsedYamlException(
         ? innerError.unrecognizedKeys.first
         : exception.key;
 
-    final node = yamlMap.nodes.keys.singleWhere(
-        (k) => (k as YamlScalar).value == key,
-        orElse: () => yamlMap) as YamlNode;
+    final node =
+        yamlMap.nodes.keys.singleWhere(
+              (k) => (k as YamlScalar).value == key,
+              orElse: () => yamlMap,
+            )
+            as YamlNode;
+    return ParsedYamlException(exception.message!, node, innerError: exception);
+  }
+
+  if (exception.key == null) {
     return ParsedYamlException(
-      exception.message!,
-      node,
+      exception.message ?? 'There was an error parsing the map.',
+      yamlMap,
+      innerError: exception,
+    );
+  }
+
+  if (!yamlMap.containsKey(exception.key)) {
+    return ParsedYamlException(
+      ['Missing key "${exception.key}".', ?exception.message].join(' '),
+      yamlMap,
       innerError: exception,
     );
-  } else {
-    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(
-        [
-          'Missing key "${exception.key}".',
-          if (exception.message != null) exception.message!,
-        ].join(' '),
-        yamlMap,
-        innerError: exception,
-      );
-    } else {
-      var message = 'Unsupported value for "${exception.key}".';
-      if (exception.message != null) {
-        message = '$message ${exception.message}';
-      }
-      return ParsedYamlException(
-        message,
-        yamlMap.nodes[exception.key] ?? yamlMap,
-        innerError: exception,
-      );
-    }
   }
+
+  return ParsedYamlException(
+    ['Unsupported value for "${exception.key}".', ?exception.message].join(' '),
+    yamlMap.nodes[exception.key] ?? yamlMap,
+    innerError: exception,
+  );
 }
 
 /// An exception thrown when parsing YAML that contains information about the
@@ -119,16 +112,10 @@ class ParsedYamlException implements Exception {
   /// contains the source error object.
   final Object? innerError;
 
-  ParsedYamlException(
-    this.message,
-    YamlNode yamlNode, {
-    this.innerError,
-  }) :
-        // ignore: prefer_initializing_formals
-        yamlNode = yamlNode;
+  ParsedYamlException(this.message, YamlNode this.yamlNode, {this.innerError});
 
-  factory ParsedYamlException.fromYamlException(YamlException exception) =>
-      _WrappedYamlException(exception);
+  factory ParsedYamlException.fromYamlException(YamlException exception) =
+      _WrappedYamlException;
 
   /// Returns [message] formatted with source information provided by
   /// [yamlNode].
@@ -152,7 +139,4 @@ class _WrappedYamlException implements ParsedYamlException {
 
   @override
   YamlNode? get yamlNode => null;
-
-  @override
-  String toString() => 'ParsedYamlException: $formattedMessage';
 }
diff --git a/checked_yaml/mono_pkg.yaml b/checked_yaml/mono_pkg.yaml
index 133bdf513..e31657400 100644
--- a/checked_yaml/mono_pkg.yaml
+++ b/checked_yaml/mono_pkg.yaml
@@ -1,6 +1,6 @@
 # See https://github.com/google/mono_repo.dart for details on this file
-dart:
-- 2.14.0
+sdk:
+- pubspec
 - dev
 
 stages:
@@ -8,7 +8,10 @@ stages:
   - group:
     - format
     - analyze: --fatal-infos .
-
+    sdk: dev
+  - group:
+      - analyze
+    sdk: pubspec
 - unit_test:
   - test
 - ensure_build:
diff --git a/checked_yaml/pubspec.yaml b/checked_yaml/pubspec.yaml
index f41bdc1d0..6195805df 100644
--- a/checked_yaml/pubspec.yaml
+++ b/checked_yaml/pubspec.yaml
@@ -1,12 +1,21 @@
 name: checked_yaml
-version: 2.0.2-dev
+version: 2.0.4
 
 description: >-
   Generate more helpful exceptions when decoding YAML documents using
   package:json_serializable and package:yaml.
 repository: https://github.com/google/json_serializable.dart/tree/master/checked_yaml
+topics:
+ - yaml
+ - json
+ - build-runner
+ - json-serializable
+ - codegen
+
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: ^3.8.0
+
+resolution: workspace
 
 dependencies:
   json_annotation: ^4.3.0
@@ -14,9 +23,9 @@ dependencies:
   yaml: ^3.0.0
 
 dev_dependencies:
-  build_runner: ^2.0.0
-  build_verify: ^2.0.0
+  build_runner: ^2.0.6
+  build_verify: ^3.0.0
   json_serializable: ^6.0.0
-  path: ^1.0.0
-  test: ^1.16.0
+  path: ^1.8.0
+  test: ^1.17.10
   test_process: ^2.0.0
diff --git a/checked_yaml/test/custom_error_test.dart b/checked_yaml/test/custom_error_test.dart
index 6ce0e42e1..b4d8826ca 100644
--- a/checked_yaml/test/custom_error_test.dart
+++ b/checked_yaml/test/custom_error_test.dart
@@ -4,19 +4,16 @@ import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';
 
 void main() {
-  test('bob', () {
+  test('simple test', () {
     expect(
-      () => checkedYamlDecode(
-        '{"innerMap": {}}',
-        (m) {
-          throw CheckedFromJsonException(
-            m!['innerMap'] as YamlMap,
-            null,
-            'nothing',
-            null,
-          );
-        },
-      ),
+      () => checkedYamlDecode('{"innerMap": {}}', (m) {
+        throw CheckedFromJsonException(
+          m!['innerMap'] as YamlMap,
+          null,
+          'nothing',
+          null,
+        );
+      }),
       throwsA(
         isA<ParsedYamlException>()
             .having(
@@ -39,4 +36,35 @@ line 1, column 14: There was an error parsing the map.
       ),
     );
   });
+
+  test('null map - allowed', () {
+    expect(
+      () => checkedYamlDecode(allowNull: true, 'null', (m) => Object()),
+      isA<Object>(),
+    );
+  });
+
+  test('null map - not allowed', () {
+    expect(
+      () => checkedYamlDecode('null', (m) {
+        throw TestFailure('should never get here!');
+      }),
+      throwsA(
+        isA<ParsedYamlException>()
+            .having((e) => e.message, 'message', 'Not a map')
+            .having(
+              (e) => e.yamlNode,
+              'yamlNode',
+              isA<YamlScalar>().having((s) => s.value, 'value', isNull),
+            )
+            .having((e) => e.innerError, 'innerError', isNull)
+            .having((e) => e.formattedMessage, 'formattedMessage', '''
+line 1, column 1: Not a map
+  ╷
+1 │ null
+  │ ^^^^
+  ╵'''),
+      ),
+    );
+  });
 }
diff --git a/checked_yaml/test/ensure_build_test.dart b/checked_yaml/test/ensure_build_test.dart
index bcb52649d..ec5871f3c 100644
--- a/checked_yaml/test/ensure_build_test.dart
+++ b/checked_yaml/test/ensure_build_test.dart
@@ -4,10 +4,15 @@
 
 @TestOn('vm')
 @Tags(['presubmit-only'])
+library;
+
 import 'package:build_verify/build_verify.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test('ensure_build',
-      () => expectBuildClean(packageRelativeDirectory: 'checked_yaml'));
+  test(
+    'ensure_build',
+    () => expectBuildClean(packageRelativeDirectory: 'checked_yaml'),
+    timeout: const Timeout.factor(2),
+  );
 }
diff --git a/checked_yaml/test/example_test.dart b/checked_yaml/test/example_test.dart
index a5d55786d..fe56b19ad 100644
--- a/checked_yaml/test/example_test.dart
+++ b/checked_yaml/test/example_test.dart
@@ -18,114 +18,90 @@ Configuration: {name: bob, count: 42}
   });
 
   test('empty map', () {
-    _expectThrows(
-      '{}',
-      r'''
+    _expectThrows('{}', r'''
 line 1, column 1: Required keys are missing: name.
   ╷
 1 │ {}
   │ ^^
-  ╵''',
-    );
+  ╵''');
   });
 
   test('missing count', () {
-    _expectThrows(
-      '{"name":"something"}',
-      r'''
-line 1, column 1: Missing key "count". type 'Null' is not a subtype of type 'int' in type cast
+    _expectThrows('{"name":"something"}', r'''
+line 1, column 1: Missing key "count". type 'Null' is not a subtype of type 'num' in type cast
   ╷
 1 │ {"name":"something"}
   │ ^^^^^^^^^^^^^^^^^^^^
-  ╵''',
-    );
+  ╵''');
   });
 
   test('not a map', () {
-    _expectThrows(
-      '42',
-      r'''
+    _expectThrows('42', r'''
 line 1, column 1: Not a map
   ╷
 1 │ 42
   │ ^^
-  ╵''',
-    );
+  ╵''');
   });
 
   test('invalid yaml', () {
-    _expectThrows(
-      '{',
-      r'''
+    _expectThrows('{', r'''
 line 1, column 2: Expected node content.
   ╷
 1 │ {
   │  ^
-  ╵''',
-    );
+  ╵''');
   });
 
   test('duplicate keys', () {
-    _expectThrows(
-      '{"a":null, "a":null}',
-      r'''
+    _expectThrows('{"a":null, "a":null}', r'''
 line 1, column 12: Duplicate mapping key.
   ╷
 1 │ {"a":null, "a":null}
   │            ^^^
-  ╵''',
-    );
+  ╵''');
   });
 
   test('unexpected key', () {
-    _expectThrows(
-      '{"bob": 42}',
-      r'''
+    _expectThrows('{"bob": 42}', r'''
 line 1, column 2: Unrecognized keys: [bob]; supported keys: [name, count]
   ╷
 1 │ {"bob": 42}
   │  ^^^^^
-  ╵''',
-    );
+  ╵''');
   });
 
   test('bad name type', () {
-    _expectThrows(
-      '{"name": 42, "count": 42}',
-      r'''
+    _expectThrows('{"name": 42, "count": 42}', r'''
 line 1, column 10: Unsupported value for "name". type 'int' is not a subtype of type 'String' in type cast
   ╷
 1 │ {"name": 42, "count": 42}
   │          ^^
-  ╵''',
-    );
+  ╵''');
   });
 
   test('bad name contents', () {
-    _expectThrows(
-      '{"name": "", "count": 42}',
-      r'''
+    _expectThrows('{"name": "", "count": 42}', r'''
 line 1, column 10: Unsupported value for "name". Cannot be empty.
   ╷
 1 │ {"name": "", "count": 42}
   │          ^^
-  ╵''',
-    );
+  ╵''');
   });
 }
 
-void _expectThrows(String yamlContent, matcher) => expect(
-      () => _run(yamlContent),
-      throwsA(
-        isA<ParsedYamlException>().having(
-          (e) {
-            printOnFailure("r'''\n${e.formattedMessage}'''");
-            return e.formattedMessage;
-          },
-          'formattedMessage',
-          matcher,
-        ),
-      ),
-    );
+void _expectThrows(String yamlContent, String matcher) => expect(
+  () => _run(yamlContent),
+  throwsA(
+    isA<ParsedYamlException>().having(
+      (e) {
+        printOnFailure("r'''\n${e.formattedMessage}'''");
+        return e.formattedMessage;
+      },
+      'formattedMessage',
+      matcher,
+    ),
+  ),
+);
 
 void _run(String yamlContent) => example.main([yamlContent]);
diff --git a/checked_yaml/test/readme_test.dart b/checked_yaml/test/readme_test.dart
index 21f530d06..813ed6f43 100644
--- a/checked_yaml/test/readme_test.dart
+++ b/checked_yaml/test/readme_test.dart
@@ -23,14 +23,18 @@ void _member(String startToken) {
   final classEnd = _exampleContent.indexOf(_memberEnd, start);
   expect(classEnd, greaterThan(start));
 
-  final content =
-      _exampleContent.substring(start, classEnd + _memberEnd.length).trim();
+  final content = _exampleContent
+      .substring(start, classEnd + _memberEnd.length)
+      .trim();
 
-  expect(_readmeContent, contains('''
+  expect(
+    _readmeContent,
+    contains('''
 ```dart
 $content
 ```
-'''));
+'''),
+  );
 }
 
 void main() {
@@ -52,16 +56,19 @@ ParsedYamlException: line 1, column 10: Unsupported value for "name". Cannot be
   │          ^^
   ╵''';
 
-    expect(_readmeContent, contains('''
+    expect(
+      _readmeContent,
+      contains('''
 ```console
 \$ dart example/example.dart '$inputContent'
 $errorContent
-```'''));
-
-    final proc = await TestProcess.start(
-      Platform.resolvedExecutable,
-      [_examplePath, inputContent],
+```'''),
     );
+
+    final proc = await TestProcess.start(Platform.resolvedExecutable, [
+      _examplePath,
+      inputContent,
+    ]);
     await expectLater(
       proc.stderr,
       emitsInOrder(LineSplitter.split(errorContent)),
diff --git a/example/README.md b/example/README.md
index b3228f743..7eff2e695 100644
--- a/example/README.md
+++ b/example/README.md
@@ -5,11 +5,11 @@ dependencies to your `pubspec.yaml`.
 
 ```yaml
 dependencies:
-  json_annotation: ^4.3.0
+  json_annotation: ^4.9.0
 
 dev_dependencies:
-  build_runner: ^2.0.0
-  json_serializable: ^6.0.0
+  build_runner: ^2.3.3
+  json_serializable: ^6.8.0
 ```
 
 Annotate your code with classes defined in
@@ -20,10 +20,10 @@ Annotate your code with classes defined in
 
 - See [`lib/example.g.dart`][example_g] for the generated file.
 
-Run `pub run build_runner build` to generate files into your source directory.
+Run `dart run build_runner build` to generate files into your source directory.
 
 ```console
-> pub run build_runner build
+> dart run build_runner build
 [INFO] ensureBuildScript: Generating build script completed, took 368ms
 [INFO] BuildDefinition: Reading cached asset graph completed, took 54ms
 [INFO] BuildDefinition: Checking for updates since last build completed, took 663ms
@@ -32,9 +32,6 @@ Run `pub run build_runner build` to generate files into your source directory.
 [INFO] Build: Succeeded after 4687ms with 1 outputs
 ```
 
-_NOTE_: If you're using Flutter, replace `pub run` with
-`flutter packages pub run`.
-
 [example]: lib/example.dart
 [example_g]: lib/example.g.dart
 [json_annotation]: https://pub.dev/packages/json_annotation
diff --git a/example/lib/example.dart b/example/lib/example.dart
index c928b5508..8fc8f5bc5 100644
--- a/example/lib/example.dart
+++ b/example/lib/example.dart
@@ -43,9 +43,10 @@ class Order {
   Item? item;
 
   @JsonKey(
-      name: 'prep-time',
-      fromJson: _durationFromMilliseconds,
-      toJson: _durationToMilliseconds)
+    name: 'prep-time',
+    fromJson: _durationFromMilliseconds,
+    toJson: _durationToMilliseconds,
+  )
   Duration? prepTime;
 
   @JsonKey(fromJson: _dateTimeFromEpochUs, toJson: _dateTimeToEpochUs)
diff --git a/example/lib/example.g.dart b/example/lib/example.g.dart
index 40e7e4e9c..6c1d3cb06 100644
--- a/example/lib/example.g.dart
+++ b/example/lib/example.g.dart
@@ -7,76 +7,58 @@ part of 'example.dart';
 // **************************************************************************
 
 Person _$PersonFromJson(Map<String, dynamic> json) => Person(
-      json['firstName'] as String,
-      json['lastName'] as String,
-      DateTime.parse(json['date-of-birth'] as String),
-      middleName: json['middleName'] as String?,
-      lastOrder: json['last-order'] == null
-          ? null
-          : DateTime.parse(json['last-order'] as String),
-      orders: (json['orders'] as List<dynamic>?)
-          ?.map((e) => Order.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$PersonToJson(Person instance) {
-  final val = <String, dynamic>{
-    'firstName': instance.firstName,
-  };
+  json['firstName'] as String,
+  json['lastName'] as String,
+  DateTime.parse(json['date-of-birth'] as String),
+  middleName: json['middleName'] as String?,
+  lastOrder: json['last-order'] == null
+      ? null
+      : DateTime.parse(json['last-order'] as String),
+  orders: (json['orders'] as List<dynamic>?)
+      ?.map((e) => Order.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
 
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('middleName', instance.middleName);
-  val['lastName'] = instance.lastName;
-  val['date-of-birth'] = instance.dateOfBirth.toIso8601String();
-  val['last-order'] = instance.lastOrder?.toIso8601String();
-  val['orders'] = instance.orders;
-  return val;
-}
+Map<String, dynamic> _$PersonToJson(Person instance) => <String, dynamic>{
+  'firstName': instance.firstName,
+  'middleName': ?instance.middleName,
+  'lastName': instance.lastName,
+  'date-of-birth': instance.dateOfBirth.toIso8601String(),
+  'last-order': instance.lastOrder?.toIso8601String(),
+  'orders': instance.orders,
+};
 
-Order _$OrderFromJson(Map<String, dynamic> json) => Order(
-      Order._dateTimeFromEpochUs(json['date'] as int),
-    )
-      ..count = json['count'] as int?
-      ..itemNumber = json['itemNumber'] as int?
+Order _$OrderFromJson(Map<String, dynamic> json) =>
+    Order(Order._dateTimeFromEpochUs((json['date'] as num).toInt()))
+      ..count = (json['count'] as num?)?.toInt()
+      ..itemNumber = (json['itemNumber'] as num?)?.toInt()
       ..isRushed = json['isRushed'] as bool?
       ..item = json['item'] == null
           ? null
           : Item.fromJson(json['item'] as Map<String, dynamic>)
-      ..prepTime = Order._durationFromMilliseconds(json['prep-time'] as int?);
+      ..prepTime = Order._durationFromMilliseconds(
+        (json['prep-time'] as num?)?.toInt(),
+      );
 
-Map<String, dynamic> _$OrderToJson(Order instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('count', instance.count);
-  writeNotNull('itemNumber', instance.itemNumber);
-  writeNotNull('isRushed', instance.isRushed);
-  writeNotNull('item', instance.item);
-  writeNotNull('prep-time', Order._durationToMilliseconds(instance.prepTime));
-  writeNotNull('date', Order._dateTimeToEpochUs(instance.date));
-  return val;
-}
+Map<String, dynamic> _$OrderToJson(Order instance) => <String, dynamic>{
+  'count': ?instance.count,
+  'itemNumber': ?instance.itemNumber,
+  'isRushed': ?instance.isRushed,
+  'item': ?instance.item,
+  'prep-time': ?Order._durationToMilliseconds(instance.prepTime),
+  'date': ?Order._dateTimeToEpochUs(instance.date),
+};
 
 Item _$ItemFromJson(Map<String, dynamic> json) => Item()
-  ..count = json['count'] as int?
-  ..itemNumber = json['itemNumber'] as int?
+  ..count = (json['count'] as num?)?.toInt()
+  ..itemNumber = (json['itemNumber'] as num?)?.toInt()
   ..isRushed = json['isRushed'] as bool?;
 
 Map<String, dynamic> _$ItemToJson(Item instance) => <String, dynamic>{
-      'count': instance.count,
-      'itemNumber': instance.itemNumber,
-      'isRushed': instance.isRushed,
-    };
+  'count': instance.count,
+  'itemNumber': instance.itemNumber,
+  'isRushed': instance.isRushed,
+};
 
 // **************************************************************************
 // JsonLiteralGenerator
@@ -96,11 +78,11 @@ final _$glossaryDataJsonLiteral = {
           'Abbrev': 'ISO 8879:1986',
           'GlossDef': {
             'para': 'A meta-markup language, used to create markup languages.',
-            'GlossSeeAlso': ['GML', 'XML']
+            'GlossSeeAlso': ['GML', 'XML'],
           },
-          'GlossSee': 'markup'
-        }
-      }
-    }
-  }
+          'GlossSee': 'markup',
+        },
+      },
+    },
+  },
 };
diff --git a/example/lib/generic_response_class_example.dart b/example/lib/generic_response_class_example.dart
index cde1e60eb..928957695 100644
--- a/example/lib/generic_response_class_example.dart
+++ b/example/lib/generic_response_class_example.dart
@@ -18,11 +18,7 @@ class BaseResponse<T> {
   @JsonKey(fromJson: _dataFromJson)
   final T? data;
 
-  const BaseResponse({
-    this.status,
-    this.msg,
-    this.data,
-  });
+  const BaseResponse({this.status, this.msg, this.data});
 
   factory BaseResponse.fromJson(Map<String, dynamic> json) =>
       _$BaseResponseFromJson(json);
@@ -40,11 +36,12 @@ class BaseResponse<T> {
     } else if (json is List) {
       // NOTE: this logic assumes the ONLY valid value for a `List` in this case
       // is a List<Author>. If that assumption changes, then it will be
-      // necessary to "peak" into non-empty lists to determine the type!
+      // necessary to "peek" into non-empty lists to determine the type!
 
       return json
-          .map((e) => Article.fromJson(e as Map<String, dynamic>))
-          .toList() as T;
+              .map((e) => Article.fromJson(e as Map<String, dynamic>))
+              .toList()
+          as T;
     }
 
     throw ArgumentError.value(
@@ -80,10 +77,7 @@ class User {
   final int? id;
   final String? email;
 
-  const User({
-    this.id,
-    this.email,
-  });
+  const User({this.id, this.email});
 
   factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
 }
@@ -93,10 +87,7 @@ class Comment {
   final String? content;
   final int? id;
 
-  const Comment({
-    this.id,
-    this.content,
-  });
+  const Comment({this.id, this.content});
 
   factory Comment.fromJson(Map<String, dynamic> json) =>
       _$CommentFromJson(json);
diff --git a/example/lib/generic_response_class_example.g.dart b/example/lib/generic_response_class_example.g.dart
index 6b2e9325a..4ee26fa88 100644
--- a/example/lib/generic_response_class_example.g.dart
+++ b/example/lib/generic_response_class_example.g.dart
@@ -8,28 +8,26 @@ part of 'generic_response_class_example.dart';
 
 BaseResponse<T> _$BaseResponseFromJson<T>(Map<String, dynamic> json) =>
     BaseResponse<T>(
-      status: json['status'] as int?,
+      status: (json['status'] as num?)?.toInt(),
       msg: json['msg'] as String?,
       data: BaseResponse._dataFromJson(json['data'] as Object),
     );
 
 Article _$ArticleFromJson(Map<String, dynamic> json) => Article(
-      id: json['id'] as int,
-      title: json['title'] as String,
-      author: json['author'] == null
-          ? null
-          : User.fromJson(json['author'] as Map<String, dynamic>),
-      comments: (json['comments'] as List<dynamic>?)
-          ?.map((e) => Comment.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
+  id: (json['id'] as num).toInt(),
+  title: json['title'] as String,
+  author: json['author'] == null
+      ? null
+      : User.fromJson(json['author'] as Map<String, dynamic>),
+  comments: (json['comments'] as List<dynamic>?)
+      ?.map((e) => Comment.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
 
-User _$UserFromJson(Map<String, dynamic> json) => User(
-      id: json['id'] as int?,
-      email: json['email'] as String?,
-    );
+User _$UserFromJson(Map<String, dynamic> json) =>
+    User(id: (json['id'] as num?)?.toInt(), email: json['email'] as String?);
 
 Comment _$CommentFromJson(Map<String, dynamic> json) => Comment(
-      id: json['id'] as int?,
-      content: json['content'] as String?,
-    );
+  id: (json['id'] as num?)?.toInt(),
+  content: json['content'] as String?,
+);
diff --git a/example/lib/json_converter_example.dart b/example/lib/json_converter_example.dart
index d408223c3..3ca92c6f1 100644
--- a/example/lib/json_converter_example.dart
+++ b/example/lib/json_converter_example.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// ignore_for_file: inference_failure_on_instance_creation
+
 import 'package:json_annotation/json_annotation.dart';
 
 part 'json_converter_example.g.dart';
diff --git a/example/lib/json_converter_example.g.dart b/example/lib/json_converter_example.g.dart
index 526177be7..ccea4f967 100644
--- a/example/lib/json_converter_example.g.dart
+++ b/example/lib/json_converter_example.g.dart
@@ -8,7 +8,7 @@ part of 'json_converter_example.dart';
 
 DateTimeExample _$DateTimeExampleFromJson(Map<String, dynamic> json) =>
     DateTimeExample(
-      const _DateTimeEpochConverter().fromJson(json['when'] as int),
+      const _DateTimeEpochConverter().fromJson((json['when'] as num).toInt()),
     );
 
 Map<String, dynamic> _$DateTimeExampleToJson(DateTimeExample instance) =>
@@ -17,32 +17,27 @@ Map<String, dynamic> _$DateTimeExampleToJson(DateTimeExample instance) =>
     };
 
 GenericCollection<T> _$GenericCollectionFromJson<T>(
-        Map<String, dynamic> json) =>
-    GenericCollection<T>(
-      page: json['page'] as int?,
-      totalResults: json['total_results'] as int?,
-      totalPages: json['total_pages'] as int?,
-      results: (json['results'] as List<dynamic>?)
-          ?.map(_Converter<T>().fromJson)
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => GenericCollection<T>(
+  page: (json['page'] as num?)?.toInt(),
+  totalResults: (json['total_results'] as num?)?.toInt(),
+  totalPages: (json['total_pages'] as num?)?.toInt(),
+  results: (json['results'] as List<dynamic>?)
+      ?.map(_Converter<T>().fromJson)
+      .toList(),
+);
 
 Map<String, dynamic> _$GenericCollectionToJson<T>(
-        GenericCollection<T> instance) =>
-    <String, dynamic>{
-      'page': instance.page,
-      'total_results': instance.totalResults,
-      'total_pages': instance.totalPages,
-      'results': instance.results?.map(_Converter<T>().toJson).toList(),
-    };
+  GenericCollection<T> instance,
+) => <String, dynamic>{
+  'page': instance.page,
+  'total_results': instance.totalResults,
+  'total_pages': instance.totalPages,
+  'results': instance.results?.map(_Converter<T>().toJson).toList(),
+};
 
-CustomResult _$CustomResultFromJson(Map<String, dynamic> json) => CustomResult(
-      json['name'] as String,
-      json['size'] as int,
-    );
+CustomResult _$CustomResultFromJson(Map<String, dynamic> json) =>
+    CustomResult(json['name'] as String, (json['size'] as num).toInt());
 
 Map<String, dynamic> _$CustomResultToJson(CustomResult instance) =>
-    <String, dynamic>{
-      'name': instance.name,
-      'size': instance.size,
-    };
+    <String, dynamic>{'name': instance.name, 'size': instance.size};
diff --git a/example/lib/nested_values_example.dart b/example/lib/nested_values_example.dart
new file mode 100644
index 000000000..79c54d0ee
--- /dev/null
+++ b/example/lib/nested_values_example.dart
@@ -0,0 +1,37 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'nested_values_example.g.dart';
+
+/// An example work-around for
+/// https://github.com/google/json_serializable.dart/issues/490
+@JsonSerializable()
+class NestedValueExample {
+  NestedValueExample(this.nestedValues);
+
+  factory NestedValueExample.fromJson(Map<String, dynamic> json) =>
+      _$NestedValueExampleFromJson(json);
+
+  @_NestedListConverter()
+  @JsonKey(name: 'root_items')
+  final List<String> nestedValues;
+
+  Map<String, dynamic> toJson() => _$NestedValueExampleToJson(this);
+}
+
+class _NestedListConverter
+    extends JsonConverter<List<String>, Map<String, dynamic>> {
+  const _NestedListConverter();
+
+  @override
+  List<String> fromJson(Map<String, dynamic> json) => [
+    for (var e in json['items'] as List)
+      (e as Map<String, dynamic>)['name'] as String,
+  ];
+
+  @override
+  Map<String, dynamic> toJson(List<String> object) => {
+    'items': [
+      for (var item in object) {'name': item},
+    ],
+  };
+}
diff --git a/example/lib/nested_values_example.g.dart b/example/lib/nested_values_example.g.dart
new file mode 100644
index 000000000..ee41d257d
--- /dev/null
+++ b/example/lib/nested_values_example.g.dart
@@ -0,0 +1,19 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'nested_values_example.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+NestedValueExample _$NestedValueExampleFromJson(Map<String, dynamic> json) =>
+    NestedValueExample(
+      const _NestedListConverter().fromJson(
+        json['root_items'] as Map<String, dynamic>,
+      ),
+    );
+
+Map<String, dynamic> _$NestedValueExampleToJson(NestedValueExample instance) =>
+    <String, dynamic>{
+      'root_items': const _NestedListConverter().toJson(instance.nestedValues),
+    };
diff --git a/example/lib/tuple_example.dart b/example/lib/tuple_example.dart
index 35bcbe6a7..806a49ae8 100644
--- a/example/lib/tuple_example.dart
+++ b/example/lib/tuple_example.dart
@@ -18,14 +18,12 @@ class Tuple<T, S> {
     Map<String, dynamic> json,
     T Function(Object? json) fromJsonT,
     S Function(Object? json) fromJsonS,
-  ) =>
-      _$TupleFromJson(json, fromJsonT, fromJsonS);
+  ) => _$TupleFromJson(json, fromJsonT, fromJsonS);
 
   Map<String, dynamic> toJson(
     Object Function(T value) toJsonT,
     Object Function(S value) toJsonS,
-  ) =>
-      _$TupleToJson(this, toJsonT, toJsonS);
+  ) => _$TupleToJson(this, toJsonT, toJsonS);
 }
 
 @JsonSerializable()
diff --git a/example/lib/tuple_example.g.dart b/example/lib/tuple_example.g.dart
index e90d91a1d..71aff0c6f 100644
--- a/example/lib/tuple_example.g.dart
+++ b/example/lib/tuple_example.g.dart
@@ -10,30 +10,29 @@ Tuple<T, S> _$TupleFromJson<T, S>(
   Map<String, dynamic> json,
   T Function(Object? json) fromJsonT,
   S Function(Object? json) fromJsonS,
-) =>
-    Tuple<T, S>(
-      fromJsonT(json['value1']),
-      fromJsonS(json['value2']),
-    );
+) => Tuple<T, S>(fromJsonT(json['value1']), fromJsonS(json['value2']));
 
 Map<String, dynamic> _$TupleToJson<T, S>(
   Tuple<T, S> instance,
   Object? Function(T value) toJsonT,
   Object? Function(S value) toJsonS,
-) =>
-    <String, dynamic>{
-      'value1': toJsonT(instance.value1),
-      'value2': toJsonS(instance.value2),
-    };
+) => <String, dynamic>{
+  'value1': toJsonT(instance.value1),
+  'value2': toJsonS(instance.value2),
+};
 
 ConcreteClass _$ConcreteClassFromJson(Map<String, dynamic> json) =>
     ConcreteClass(
-      Tuple<int, DateTime>.fromJson(json['tuple1'] as Map<String, dynamic>,
-          (value) => value as int, (value) => DateTime.parse(value as String)),
+      Tuple<int, DateTime>.fromJson(
+        json['tuple1'] as Map<String, dynamic>,
+        (value) => (value as num).toInt(),
+        (value) => DateTime.parse(value as String),
+      ),
       Tuple<Duration, BigInt>.fromJson(
-          json['tuple2'] as Map<String, dynamic>,
-          (value) => Duration(microseconds: value as int),
-          (value) => BigInt.parse(value as String)),
+        json['tuple2'] as Map<String, dynamic>,
+        (value) => Duration(microseconds: (value as num).toInt()),
+        (value) => BigInt.parse(value as String),
+      ),
     );
 
 Map<String, dynamic> _$ConcreteClassToJson(ConcreteClass instance) =>
diff --git a/example/mono_pkg.yaml b/example/mono_pkg.yaml
index 06efa807f..8ab9954ed 100644
--- a/example/mono_pkg.yaml
+++ b/example/mono_pkg.yaml
@@ -1,6 +1,6 @@
 # See https://github.com/google/mono_repo.dart for details on this file
-dart:
-- 2.14.0
+sdk:
+- pubspec
 - dev
 
 stages:
@@ -8,6 +8,10 @@ stages:
   - group:
     - format
     - analyze: --fatal-infos .
+    sdk: dev
+  - group:
+      - analyze
+    sdk: pubspec
 - unit_test:
   - test
 - ensure_build:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index fd2b789bf..392a1cd2f 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -2,20 +2,27 @@ name: example
 publish_to: none
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: ^3.8.0
+
+resolution: workspace
 
 dependencies:
-  json_annotation: ^4.3.0
+  json_annotation: ^4.9.0
 
 dev_dependencies:
-  build_runner: ^2.0.0
-
   # Used by tests. Not required to use `json_serializable`.
-  build_verify: ^2.0.0
+  _json_serial_shared_test:
+    path: ../shared_test
 
-  json_serializable: ^6.0.0
+  # REQUIRED!
+  build_runner: ^2.3.3
 
   # Used by tests. Not required to use `json_serializable`.
+  build_verify: ^3.0.0
+
+  # REQUIRED!
+  json_serializable: ^6.8.0
+
+  # Not required to use `json_serializable`.
   path: ^1.8.0
-  # Used by tests. Not required to use `json_serializable`.
-  test: ^1.16.0
+  test: ^1.21.6
diff --git a/example/test/ensure_build_test.dart b/example/test/ensure_build_test.dart
index a927b47a9..8d3d473e9 100644
--- a/example/test/ensure_build_test.dart
+++ b/example/test/ensure_build_test.dart
@@ -3,10 +3,15 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @Tags(['presubmit-only'])
+library;
+
 import 'package:build_verify/build_verify.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test('ensure_build',
-      () => expectBuildClean(packageRelativeDirectory: 'example'));
+  test(
+    'ensure_build',
+    () => expectBuildClean(packageRelativeDirectory: 'example'),
+    timeout: const Timeout.factor(2),
+  );
 }
diff --git a/example/test/example_test.dart b/example/test/example_test.dart
index 55020c06b..6a33c796c 100644
--- a/example/test/example_test.dart
+++ b/example/test/example_test.dart
@@ -4,18 +4,24 @@
 
 import 'dart:convert';
 
+import 'package:_json_serial_shared_test/shared_test.dart';
 import 'package:example/example.dart';
 import 'package:test/test.dart';
 
 void main() {
   test('JsonSerializable', () {
-    final person = Person('Inigo', 'Montoya', DateTime(1560, 5, 5))
-      ..orders = [Order(DateTime.now())..item = (Item()..count = 42)];
+    final person = Person(
+      'Inigo',
+      'Montoya',
+      DateTime(1560, 5, 5),
+      middleName: 'Bob',
+    )..orders = [Order(DateTime.now())..item = (Item()..count = 42)];
 
-    final personJson = _encode(person);
+    final personJson = loudEncode(person);
 
-    final person2 =
-        Person.fromJson(json.decode(personJson) as Map<String, dynamic>);
+    final person2 = Person.fromJson(
+      json.decode(personJson) as Map<String, dynamic>,
+    );
 
     expect(person.firstName, person2.firstName);
     expect(person.lastName, person2.lastName);
@@ -23,13 +29,10 @@ void main() {
     expect(person.orders.single.date, person2.orders.single.date);
     expect(person.orders.single.item!.count, 42);
 
-    expect(_encode(person2), equals(personJson));
+    expect(loudEncode(person2), equals(personJson));
   });
 
   test('JsonLiteral', () {
     expect(glossaryData, hasLength(1));
   });
 }
-
-String _encode(Object object) =>
-    const JsonEncoder.withIndent(' ').convert(object);
diff --git a/example/test/generic_response_class_test.dart b/example/test/generic_response_class_test.dart
index 8faaf39ec..d922938a2 100644
--- a/example/test/generic_response_class_test.dart
+++ b/example/test/generic_response_class_test.dart
@@ -8,7 +8,7 @@ import 'package:test/test.dart';
 const _jsonUser = {
   'status': 200,
   'msg': 'success',
-  'data': {'id': 1, 'email': 'test@test.com'}
+  'data': {'id': 1, 'email': 'test@test.com'},
 };
 
 final _jsonArticle = {
@@ -21,8 +21,8 @@ final _jsonArticle = {
     'comments': [
       {'content': 'comment context', 'id': 1},
       {'content': 'comment context', 'id': 2},
-    ]
-  }
+    ],
+  },
 };
 
 final _jsonArticleList = {
@@ -31,7 +31,7 @@ final _jsonArticleList = {
   'data': [
     {'id': 1, 'title': 'title1'},
     _jsonArticle['data'],
-  ]
+  ],
 };
 
 void _testResponse<T>(BaseResponse response, void Function(T) testFunction) {
diff --git a/example/test/json_convert_example_test.dart b/example/test/json_convert_example_test.dart
index 8345874b4..bd8a152d8 100644
--- a/example/test/json_convert_example_test.dart
+++ b/example/test/json_convert_example_test.dart
@@ -4,6 +4,7 @@
 
 import 'dart:convert';
 
+import 'package:_json_serial_shared_test/shared_test.dart';
 import 'package:example/json_converter_example.dart';
 import 'package:test/test.dart';
 
@@ -13,77 +14,93 @@ void main() {
 
     final epochDateTime = DateTime.fromMillisecondsSinceEpoch(value);
     final instance = DateTimeExample(epochDateTime);
-    final json = _encode(instance);
+    final json = loudEncode(instance);
     expect(json, '''{
  "when": $value
 }''');
 
-    final copy =
-        DateTimeExample.fromJson(jsonDecode(json) as Map<String, dynamic>);
+    final copy = DateTimeExample.fromJson(
+      jsonDecode(json) as Map<String, dynamic>,
+    );
     expect(copy.when, epochDateTime);
   });
 
   test('trivial case', () {
     final collection = GenericCollection<int>(
-        page: 0, totalPages: 3, totalResults: 10, results: [1, 2, 3]);
+      page: 0,
+      totalPages: 3,
+      totalResults: 10,
+      results: [1, 2, 3],
+    );
 
-    final encoded = _encode(collection);
+    final encoded = loudEncode(collection);
     final collection2 = GenericCollection<int>.fromJson(
-        jsonDecode(encoded) as Map<String, dynamic>);
+      jsonDecode(encoded) as Map<String, dynamic>,
+    );
 
     expect(collection2.results, [1, 2, 3]);
 
-    expect(_encode(collection2), encoded);
+    expect(loudEncode(collection2), encoded);
   });
 
   test('custom result', () {
     final collection = GenericCollection<CustomResult>(
-        page: 0,
-        totalPages: 3,
-        totalResults: 10,
-        results: [CustomResult('bob', 42)]);
+      page: 0,
+      totalPages: 3,
+      totalResults: 10,
+      results: [CustomResult('bob', 42)],
+    );
 
-    final encoded = _encode(collection);
+    final encoded = loudEncode(collection);
     final collection2 = GenericCollection<CustomResult>.fromJson(
-        jsonDecode(encoded) as Map<String, dynamic>);
+      jsonDecode(encoded) as Map<String, dynamic>,
+    );
 
     expect(collection2.results, [CustomResult('bob', 42)]);
 
-    expect(_encode(collection2), encoded);
+    expect(loudEncode(collection2), encoded);
   });
 
   test('mixed values in generic collection', () {
-    final collection =
-        GenericCollection(page: 0, totalPages: 3, totalResults: 10, results: [
-      1,
-      3.14,
-      null,
-      'bob',
-      ['list'],
-      {'map': 'map'},
-      CustomResult('bob', 42)
-    ]);
+    final collection = GenericCollection(
+      page: 0,
+      totalPages: 3,
+      totalResults: 10,
+      results: [
+        1,
+        3.14,
+        null,
+        'bob',
+        ['list'],
+        {'map': 'map'},
+        CustomResult('bob', 42),
+      ],
+    );
 
-    final encoded = _encode(collection);
+    final encoded = loudEncode(collection);
 
     expect(
       () => GenericCollection<CustomResult>.fromJson(
-          jsonDecode(encoded) as Map<String, dynamic>),
-      _throwsTypeError,
+        jsonDecode(encoded) as Map<String, dynamic>,
+      ),
+      throwsTypeError,
     );
     expect(
       () => GenericCollection<int>.fromJson(
-          jsonDecode(encoded) as Map<String, dynamic>),
-      _throwsTypeError,
+        jsonDecode(encoded) as Map<String, dynamic>,
+      ),
+      throwsTypeError,
     );
     expect(
       () => GenericCollection<String>.fromJson(
-          jsonDecode(encoded) as Map<String, dynamic>),
-      _throwsTypeError,
+        jsonDecode(encoded) as Map<String, dynamic>,
+      ),
+      throwsTypeError,
     );
 
-    final collection2 =
-        GenericCollection.fromJson(jsonDecode(encoded) as Map<String, dynamic>);
+    final collection2 = GenericCollection<dynamic>.fromJson(
+      jsonDecode(encoded) as Map<String, dynamic>,
+    );
 
     expect(collection2.results, [
       1,
@@ -92,14 +109,9 @@ void main() {
       'bob',
       ['list'],
       {'map': 'map'},
-      CustomResult('bob', 42)
+      CustomResult('bob', 42),
     ]);
 
-    expect(_encode(collection2), encoded);
+    expect(loudEncode(collection2), encoded);
   });
 }
-
-final _throwsTypeError = throwsA(isA<TypeError>());
-
-String _encode(Object object) =>
-    const JsonEncoder.withIndent(' ').convert(object);
diff --git a/example/test/nested_values_test.dart b/example/test/nested_values_test.dart
new file mode 100644
index 000000000..d244b71d2
--- /dev/null
+++ b/example/test/nested_values_test.dart
@@ -0,0 +1,35 @@
+// 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:_json_serial_shared_test/shared_test.dart';
+import 'package:example/nested_values_example.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('NestedValueExample', () {
+    final input = jsonDecode(_input) as Map<String, dynamic>;
+    final normalizedOutput = loudEncode(input);
+
+    final instance = NestedValueExample.fromJson(input);
+
+    expect(loudEncode(instance), normalizedOutput);
+  });
+}
+
+const _input = r'''
+{
+  "root_items": {
+      "items": [
+          {
+              "name": "first nested item"
+          },
+          {
+              "name": "second nested item"
+          }
+      ]
+  }
+}
+''';
diff --git a/example/test/readme_test.dart b/example/test/readme_test.dart
index f17ceaad2..9ab00e93b 100644
--- a/example/test/readme_test.dart
+++ b/example/test/readme_test.dart
@@ -25,9 +25,9 @@ void _expect(String fileName) {
 
 const _pubspecContent = r'''
 dependencies:
-  json_annotation: ^4.3.0
+  json_annotation: ^4.9.0
 
 dev_dependencies:
-  build_runner: ^2.0.0
-  json_serializable: ^6.0.0
+  build_runner: ^2.3.3
+  json_serializable: ^6.8.0
 ''';
diff --git a/example/test/tuple_example_test.dart b/example/test/tuple_example_test.dart
index 67dc4fb43..b5d03ab71 100644
--- a/example/test/tuple_example_test.dart
+++ b/example/test/tuple_example_test.dart
@@ -4,6 +4,7 @@
 
 import 'dart:convert';
 
+import 'package:_json_serial_shared_test/shared_test.dart';
 import 'package:example/tuple_example.dart';
 import 'package:test/test.dart';
 
@@ -14,7 +15,7 @@ void main() {
       Tuple(const Duration(seconds: 42), BigInt.two),
     );
 
-    final encoded = _encode(instance);
+    final encoded = loudEncode(instance);
 
     const expected = r'''
 {
@@ -32,10 +33,7 @@ void main() {
     final decoded = ConcreteClass.fromJson(
       jsonDecode(encoded) as Map<String, dynamic>,
     );
-    final encoded2 = _encode(decoded);
+    final encoded2 = loudEncode(decoded);
     expect(encoded2, encoded);
   });
 }
-
-String _encode(Object object) =>
-    const JsonEncoder.withIndent(' ').convert(object);
diff --git a/json_annotation/CHANGELOG.md b/json_annotation/CHANGELOG.md
index ee44417a1..ae0b4d43d 100644
--- a/json_annotation/CHANGELOG.md
+++ b/json_annotation/CHANGELOG.md
@@ -1,3 +1,54 @@
+## 4.9.1-wip
+
+- Require Dart 3.8
+
+## 4.9.0
+
+- Require Dart 3.0
+- Add `JsonSerializable(createJsonKeys: true)`.
+  ([#1401](https://github.com/google/json_serializable.dart/pull/1401))
+
+## 4.8.1
+
+- Require Dart 2.19
+- Add topics.
+
+## 4.8.0
+
+- DEPRECATED `JsonKey.ignore`. Replaced by...
+- Added `JsonKey.includeFromJson` and `JsonKey.includeToJson` to allow 
+  fine-grained control of if a field is encoded/decoded.  
+- Added `JsonSerializable.createPerFieldToJson` which allows generating
+  a `_$ModelPerFieldToJson`, enabling partial encoding of a model.
+- Update `JsonKey` documentation to align with new features in 
+  `package:json_serializable`.
+- Require Dart SDK `>=2.18.0`.
+
+## 4.7.0
+
+- Added `JsonEnum.valueField` which allows specifying a field in an 
+  "enhanced enum" to use for serialization instead of specifying each value
+  individually with `JsonValue`.
+- Require Dart SDK 2.17
+
+## 4.6.0
+
+- Added `JsonSerializable(createFieldMap: true)`.
+  ([#1164](https://github.com/google/json_serializable.dart/pull/1164))
+- Added `JsonSerializable(converters: <JsonConverter>[])`
+  ([#1072](https://github.com/google/json_serializable.dart/issues/1072))
+
+## 4.5.0
+
+- Added `FieldRename.screamingSnake`.
+
+## 4.4.0
+
+- Added `JsonKey.readValue`.
+- Non-breaking updates to `checkedCreate` and `checkedConvert` to support
+  `JsonKey.readValue`.
+- Improved `toString` in included exceptions.
+
 ## 4.3.0
 
 - Changed the type of `JsonKey.unknownEnumValue` from `Object?` to `Enum?`.
@@ -27,7 +78,7 @@
 
 ## 4.0.1
 
-- Fix a potential error with `checked: true` when `ArgumentError.message` is 
+- Fix a potential error with `checked: true` when `ArgumentError.message` is
   `null`.
 - Updated `JsonSerializable.fromJson` to handle `null` values.
 - Deprecate `JsonSerializable` `defaults` and `withDefaults()`.
diff --git a/json_annotation/lib/json_annotation.dart b/json_annotation/lib/json_annotation.dart
index 2dc5d00b1..05b3a8a8c 100644
--- a/json_annotation/lib/json_annotation.dart
+++ b/json_annotation/lib/json_annotation.dart
@@ -8,7 +8,7 @@
 /// Also contains helper functions and classes – prefixed with `$` used by
 /// `json_serializable` when the `use_wrappers` or `checked` options are
 /// enabled.
-library json_annotation;
+library;
 
 export 'src/allowed_keys_helpers.dart';
 export 'src/checked_helpers.dart';
diff --git a/json_annotation/lib/src/allowed_keys_helpers.dart b/json_annotation/lib/src/allowed_keys_helpers.dart
index 42d3e4ca9..5ea896a79 100644
--- a/json_annotation/lib/src/allowed_keys_helpers.dart
+++ b/json_annotation/lib/src/allowed_keys_helpers.dart
@@ -14,16 +14,19 @@ void $checkKeys(
   List<String>? disallowNullValues,
 }) {
   if (allowedKeys != null) {
-    final invalidKeys =
-        map.keys.cast<String>().where((k) => !allowedKeys.contains(k)).toList();
+    final invalidKeys = map.keys
+        .cast<String>()
+        .where((k) => !allowedKeys.contains(k))
+        .toList();
     if (invalidKeys.isNotEmpty) {
       throw UnrecognizedKeysException(invalidKeys, map, allowedKeys);
     }
   }
 
   if (requiredKeys != null) {
-    final missingKeys =
-        requiredKeys.where((k) => !map.keys.contains(k)).toList();
+    final missingKeys = requiredKeys
+        .where((k) => !map.keys.contains(k))
+        .toList();
     if (missingKeys.isNotEmpty) {
       throw MissingRequiredKeysException(missingKeys, map);
     }
@@ -53,6 +56,9 @@ abstract class BadKeyException implements Exception {
 
   /// A human-readable message corresponding to the error.
   String get message;
+
+  @override
+  String toString() => '$runtimeType: $message';
 }
 
 /// Exception thrown if there are unrecognized keys in a JSON map that was
@@ -70,10 +76,7 @@ class UnrecognizedKeysException extends BadKeyException {
       '[${allowedKeys.join(', ')}]';
 
   UnrecognizedKeysException(this.unrecognizedKeys, Map map, this.allowedKeys)
-      : super._(map);
-
-  @override
-  String toString() => message;
+    : super._(map);
 }
 
 /// Exception thrown if there are missing required keys in a JSON map that was
@@ -86,8 +89,8 @@ class MissingRequiredKeysException extends BadKeyException {
   String get message => 'Required keys are missing: ${missingKeys.join(', ')}.';
 
   MissingRequiredKeysException(this.missingKeys, Map map)
-      : assert(missingKeys.isNotEmpty),
-        super._(map);
+    : assert(missingKeys.isNotEmpty),
+      super._(map);
 }
 
 /// Exception thrown if there are keys with disallowed `null` values in a JSON
@@ -98,6 +101,7 @@ class DisallowedNullValueException extends BadKeyException {
   DisallowedNullValueException(this.keysWithNullValues, Map map) : super._(map);
 
   @override
-  String get message => 'These keys had `null` values, '
+  String get message =>
+      'These keys had `null` values, '
       'which is not allowed: $keysWithNullValues';
 }
diff --git a/json_annotation/lib/src/checked_helpers.dart b/json_annotation/lib/src/checked_helpers.dart
index 7a214f9ad..15d0e7b67 100644
--- a/json_annotation/lib/src/checked_helpers.dart
+++ b/json_annotation/lib/src/checked_helpers.dart
@@ -4,8 +4,6 @@
 
 import 'allowed_keys_helpers.dart';
 
-typedef _CastFunction<R> = R Function(Object?);
-
 /// Helper function used in generated code when
 /// `JsonSerializableGenerator.checked` is `true`.
 ///
@@ -13,16 +11,26 @@ typedef _CastFunction<R> = R Function(Object?);
 T $checkedCreate<T>(
   String className,
   Map map,
-  T Function(S Function<S>(String, _CastFunction<S>) converter) constructor, {
+  T Function(
+    S Function<S>(
+      String,
+      S Function(Object?), {
+      Object? Function(Map, String)? readValue,
+    }),
+  )
+  constructor, {
   Map<String, String> fieldKeyMap = const {},
 }) {
-  Q _checkedConvert<Q>(String key, _CastFunction<Q> convertFunction) =>
-      $checkedConvert<Q>(map, key, convertFunction);
+  Q checkedConvert<Q>(
+    String key,
+    Q Function(Object?) convertFunction, {
+    Object? Function(Map, String)? readValue,
+  }) => $checkedConvert<Q>(map, key, convertFunction, readValue: readValue);
 
   return $checkedNew(
     className,
     map,
-    () => constructor(_checkedConvert),
+    () => constructor(checkedConvert),
     fieldKeyMap: fieldKeyMap,
   );
 }
@@ -69,9 +77,14 @@ T $checkedNew<T>(
 /// `JsonSerializableGenerator.checked` is `true`.
 ///
 /// Should not be used directly.
-T $checkedConvert<T>(Map map, String key, T Function(dynamic) castFunc) {
+T $checkedConvert<T>(
+  Map map,
+  String key,
+  T Function(dynamic) castFunc, {
+  Object? Function(Map, String)? readValue,
+}) {
   try {
-    return castFunc(map[key]);
+    return castFunc(readValue == null ? map[key] : readValue(map, key));
   } on CheckedFromJsonException {
     rethrow;
   } catch (error, stack) {
@@ -122,9 +135,9 @@ class CheckedFromJsonException implements Exception {
     String className,
     this.message, {
     this.badKey = false,
-  })  : _className = className,
-        innerError = null,
-        innerStack = null;
+  }) : _className = className,
+       innerError = null,
+       innerStack = null;
 
   CheckedFromJsonException._(
     Object this.innerError,
@@ -132,9 +145,9 @@ class CheckedFromJsonException implements Exception {
     this.map,
     this.key, {
     String? className,
-  })  : _className = className,
-        badKey = innerError is BadKeyException,
-        message = _getMessage(innerError);
+  }) : _className = className,
+       badKey = innerError is BadKeyException,
+       message = _getMessage(innerError);
 
   static String _getMessage(Object error) {
     if (error is ArgumentError) {
@@ -158,12 +171,12 @@ class CheckedFromJsonException implements Exception {
 
   @override
   String toString() => <String>[
-        'CheckedFromJsonException',
-        if (_className != null) 'Could not create `$_className`.',
-        if (key != null) 'There is a problem with "$key".',
-        if (message != null)
-          message!
-        else if (innerError != null)
-          innerError.toString(),
-      ].join('\n');
+    'CheckedFromJsonException',
+    if (_className != null) 'Could not create `$_className`.',
+    if (key != null) 'There is a problem with "$key".',
+    if (message != null)
+      message!
+    else if (innerError != null)
+      innerError.toString(),
+  ].join('\n');
 }
diff --git a/json_annotation/lib/src/json_converter.dart b/json_annotation/lib/src/json_converter.dart
index ef98f3f27..d50db4f4b 100644
--- a/json_annotation/lib/src/json_converter.dart
+++ b/json_annotation/lib/src/json_converter.dart
@@ -7,7 +7,41 @@
 /// [T] is the data type you'd like to convert to and from.
 ///
 /// [S] is the type of the value stored in JSON. It must be a valid JSON type
-/// such as [String], [int], or [Map<String, dynamic>].
+/// such as [String], [int], or [Map]`<String, dynamic>`.
+///
+///
+/// [JsonConverter]s can be placed either on the class:
+///
+/// ```dart
+/// class MyJsonConverter extends JsonConverter<Value, JSON> {
+///   // TODO
+/// }
+///
+/// @JsonSerializable()
+/// @MyJsonConverter()
+/// class Example {
+///   final Value property;
+/// }
+/// ```
+///
+/// or on a property:
+///
+/// ```dart
+/// @JsonSerializable()
+/// class Example {
+///   @MyJsonConverter()
+///   final Value property;
+/// }
+/// ```
+///
+/// Or finally, passed to the `@JsonSerializable` annotation:
+///
+/// ```dart
+/// @JsonSerializable(converters: [MyJsonConverter()])
+/// class Example {
+///   final Value property;
+/// }
+/// ```
 abstract class JsonConverter<T, S> {
   const JsonConverter();
 
diff --git a/json_annotation/lib/src/json_enum.dart b/json_annotation/lib/src/json_enum.dart
index 0d186a184..27d1fb5bc 100644
--- a/json_annotation/lib/src/json_enum.dart
+++ b/json_annotation/lib/src/json_enum.dart
@@ -13,6 +13,7 @@ class JsonEnum {
   const JsonEnum({
     this.alwaysCreate = false,
     this.fieldRename = FieldRename.none,
+    this.valueField,
   });
 
   /// If `true`, `_$[enum name]EnumMap` is generated for in library containing
@@ -34,4 +35,11 @@ class JsonEnum {
   /// Note: the value for [JsonValue.value] takes precedence over this option
   /// for entries annotated with [JsonValue].
   final FieldRename fieldRename;
+
+  /// Specifies the field within an "enhanced enum" to use as the value
+  /// to use for serialization.
+  ///
+  /// If an individual `enum` element is annotated with `@JsonValue`
+  /// that value still takes precedence.
+  final String? valueField;
 }
diff --git a/json_annotation/lib/src/json_key.dart b/json_annotation/lib/src/json_key.dart
index 7a1c44b6f..1dc7653bc 100644
--- a/json_annotation/lib/src/json_key.dart
+++ b/json_annotation/lib/src/json_key.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2018, 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.
 
@@ -12,16 +12,20 @@ import 'json_serializable.dart';
 class JsonKey {
   /// The value to use if the source JSON does not contain this key or if the
   /// value is `null`.
+  ///
+  /// Also supported: a top-level or static [Function] or a constructor with no
+  /// required parameters and a return type compatible with the field being
+  /// assigned.
   final Object? defaultValue;
 
   /// If `true`, generated code will throw a [DisallowedNullValueException] if
-  /// the corresponding key exists, but the value is `null`.
+  /// the corresponding key exists, but its value is `null`.
   ///
   /// Note: this value does not affect the behavior of a JSON map *without* the
   /// associated key.
   ///
   /// If [disallowNullValue] is `true`, [includeIfNull] will be treated as
-  /// `false` to ensure compatibility between `toJson` and `fromJson`.
+  /// `false` to ensure consistency between `toJson` and `fromJson`.
   ///
   /// If both [includeIfNull] and [disallowNullValue] are set to `true` on the
   /// same field, an exception will be thrown during code generation.
@@ -30,25 +34,46 @@ class JsonKey {
   /// A [Function] to use when decoding the associated JSON value to the
   /// annotated field.
   ///
-  /// Must be a top-level or static [Function] that takes one argument mapping
-  /// a JSON literal to a value compatible with the type of the annotated field.
+  /// Must be a top-level or static [Function] or a constructor that accepts one
+  /// positional argument mapping a JSON literal to a value compatible with the
+  /// type of the annotated field.
   ///
   /// When creating a class that supports both `toJson` and `fromJson`
-  /// (the default), you should also set [toJson] if you set [fromJson].
-  /// Values returned by [toJson] should "round-trip" through [fromJson].
+  /// (the default behavior), it is recommended to also set [toJson] if
+  /// [fromJson] is set. Values returned by [toJson] should "round-trip"
+  /// through [fromJson].
   final Function? fromJson;
 
   /// `true` if the generator should ignore this field completely.
   ///
   /// If `null` (the default) or `false`, the field will be considered for
   /// serialization.
+  ///
+  /// This field is DEPRECATED; use [includeFromJson] and [includeToJson]
+  /// instead.
+  @Deprecated(
+    'Use `includeFromJson` and `includeToJson` with a value of `false` '
+    'instead.',
+  )
   final bool? ignore;
 
-  /// Whether the generator should include fields with `null` values in the
+  /// Determines whether a field should be included (or excluded) when decoding
+  /// an object from JSON.
+  ///
+  /// `null` (the default) means the field will be handled with default
+  /// semantics that consider whether it's private or if it can be cleanly
+  /// round-tripped to and from JSON.
+  ///
+  /// `true` forces the field to always be decoded, even if it's private.
+  ///
+  /// `false` prevents the field from being decoded.
+  final bool? includeFromJson;
+
+  /// Specifies whether fields with `null` values should be included in the
   /// serialized output.
   ///
-  /// If `true`, the generator should include the field in the serialized
-  /// output, even if the value is `null`.
+  /// If `true`, the field will be included in the serialized output even if its
+  /// value is `null`.
   ///
   /// The default value, `null`, indicates that the behavior should be
   /// acquired from the [JsonSerializable.includeIfNull] annotation on the
@@ -61,17 +86,43 @@ class JsonKey {
   /// same field, an exception will be thrown during code generation.
   final bool? includeIfNull;
 
-  /// The key in a JSON map to use when reading and writing values corresponding
-  /// to the annotated fields.
+  /// Determines whether a field should be included (or excluded) when encoding
+  /// an object to JSON.
+  ///
+  /// `null` (the default) means the field will be handled with the default
+  /// semantics that take into account if it's private or if it can be cleanly
+  /// round-tripped to-from JSON.
+  ///
+  /// `true` forces the field to always be encoded, even if it's private.
+  ///
+  /// `false` prevents the field from being encoded.
+  final bool? includeToJson;
+
+  /// The key to use in the JSON map when reading and writing values for the
+  /// annotated field.
   ///
-  /// If `null`, the field name is used.
+  /// If `null`, the field name will be used as the key.
   final String? name;
 
-  /// When `true`, generated code for `fromJson` will verify that the source
-  /// JSON map contains the associated key.
+  /// Customizes how a value is read from the source JSON map.
+  ///
+  /// Typically, the value corresponding to a given key is read directly from
+  /// the JSON map using `map[key]`. At times it's convenient to customize this
+  /// behavior to support alternative names or to support logic that requires
+  /// accessing multiple values at once.
+  ///
+  /// The provided [Function] must be either a top-level function or a static
+  /// method within the class.
+  ///
+  /// Note: using this feature does not change any of the subsequent decoding
+  /// logic for the field. For instance, if the field is of type [DateTime] we
+  /// expect the function provided here to return a [String].
+  final Object? Function(Map, String)? readValue;
+
+  /// If `true`, generated code for `fromJson` will verify that the source JSON
+  /// map contains the associated key.
   ///
-  /// If the key does not exist, a [MissingRequiredKeysException] exception is
-  /// thrown.
+  /// If the key is missing, a [MissingRequiredKeysException] will be thrown.
   ///
   /// Note: only the existence of the key is checked. A key with a `null` value
   /// is considered valid.
@@ -79,35 +130,43 @@ class JsonKey {
 
   /// A [Function] to use when encoding the annotated field to JSON.
   ///
-  /// Must be a top-level or static [Function] with one parameter compatible
-  /// with the field being serialized that returns a JSON-compatible value.
+  /// Must be a top-level or static [Function] or a constructor that accepts one
+  /// positional argument compatible with the field being serialized that
+  /// returns a JSON-compatible value.
   ///
   /// When creating a class that supports both `toJson` and `fromJson`
-  /// (the default), you should also set [fromJson] if you set [toJson].
-  /// Values returned by [toJson] should "round-trip" through [fromJson].
+  /// (the default behavior), it is recommended to also set [fromJson] if
+  /// [toJson] is set. Values returned by [toJson] should "round-trip" through
+  /// [fromJson].
   final Function? toJson;
 
-  /// The value to use for an enum field when the value provided is not in the
-  /// source enum.
+  /// The value to use for an enum field when the provided value does not match
+  /// any of the values in the source enum.
   ///
   /// Valid only on enum fields with a compatible enum value.
   ///
-  /// If you want to use the value `null` when encountering an unknown value,
-  /// use the value of [JsonKey.nullForUndefinedEnumValue] instead. This is only
-  /// valid on a nullable enum field.
+  /// To use `null` for unknown values, use [JsonKey.nullForUndefinedEnumValue].
+  /// This is only valid for nullable enum fields.
   final Enum? unknownEnumValue;
 
   /// Creates a new [JsonKey] instance.
   ///
-  /// Only required when the default behavior is not desired.
+  /// Use this constructor when the default behavior is not desired.
   const JsonKey({
     @Deprecated('Has no effect') bool? nullable,
     this.defaultValue,
     this.disallowNullValue,
     this.fromJson,
+    @Deprecated(
+      'Use `includeFromJson` and `includeToJson` with a value of `false` '
+      'instead.',
+    )
     this.ignore,
+    this.includeFromJson,
     this.includeIfNull,
+    this.includeToJson,
     this.name,
+    this.readValue,
     this.required,
     this.toJson,
     this.unknownEnumValue,
diff --git a/json_annotation/lib/src/json_serializable.dart b/json_annotation/lib/src/json_serializable.dart
index 5267277bb..7c82e2f2e 100644
--- a/json_annotation/lib/src/json_serializable.dart
+++ b/json_annotation/lib/src/json_serializable.dart
@@ -6,6 +6,8 @@ import 'package:meta/meta_meta.dart';
 
 import 'allowed_keys_helpers.dart';
 import 'checked_helpers.dart';
+import 'enum_helpers.dart';
+import 'json_converter.dart';
 import 'json_key.dart';
 
 part 'json_serializable.g.dart';
@@ -22,7 +24,11 @@ enum FieldRename {
   snake,
 
   /// Encodes a field named `pascalCase` with a JSON key `PascalCase`.
-  pascal
+  pascal,
+
+  /// Encodes a field named `screamingSnakeCase` with a JSON key
+  /// `SCREAMING_SNAKE_CASE`
+  screamingSnake,
 }
 
 /// An annotation used to specify a class to generate code for.
@@ -33,7 +39,7 @@ enum FieldRename {
 )
 @Target({TargetKind.classType})
 class JsonSerializable {
-  /// If `true`, [Map] types are *not* assumed to be [Map<String, dynamic>]
+  /// If `true`, [Map] types are *not* assumed to be [Map]`<String, dynamic>`
   /// – which is the default type of [Map] instances return by JSON decode in
   /// `dart:convert`.
   ///
@@ -74,6 +80,38 @@ class JsonSerializable {
   /// ```
   final bool? createFactory;
 
+  /// If `true` (defaults to false), a private, static `_$ExampleJsonMeta`
+  /// constant is created in the generated part file.
+  ///
+  /// This constant can be used by other code-generators to support features
+  /// such as [fieldRename].
+  final bool? createFieldMap;
+
+  /// If `true` (defaults to false), a private class `_$ExampleJsonKeys`
+  /// class is created in the generated part file.
+  ///
+  /// This class will contain every property as a [String] field with the JSON
+  /// key as the value.
+  ///
+  /// ```dart
+  /// @JsonSerializable(createJsonKeys: true)
+  /// class Example {
+  ///   @JsonKey(name: 'LAST_NAME')
+  ///   String? firstName;
+  ///
+  ///   // Will have the value `LAST_NAME`
+  ///   static const firstName = _$ExampleJsonKeys.firstName;
+  /// }
+  /// ```
+  final bool? createJsonKeys;
+
+  /// If `true` (defaults to false), a private, static `_$ExamplePerFieldToJson`
+  /// abstract class will be generated in the part file.
+  ///
+  /// This abstract class will contain one static function per property,
+  /// exposing a way to encode only this property instead of the entire object.
+  final bool? createPerFieldToJson;
+
   /// If `true` (the default), A top-level function is created that you can
   /// reference from your class.
   ///
@@ -146,7 +184,7 @@ class JsonSerializable {
   ///   T Function(Object json) fromJsonT,
   /// ) {
   ///   return Response<T>()
-  ///     ..status = json['status'] as int
+  ///     ..status = (json['status'] as num).toInt()
   ///     ..value = fromJsonT(json['value']);
   /// }
   ///
@@ -173,7 +211,7 @@ class JsonSerializable {
   /// generated.
   ///
   /// It will have the same effect as if those fields had been annotated with
-  /// `@JsonKey(ignore: true)`.
+  /// [JsonKey.includeToJson] and [JsonKey.includeFromJson] set to `false`
   final bool? ignoreUnannotated;
 
   /// Whether the generator should include fields with `null` values in the
@@ -186,12 +224,48 @@ class JsonSerializable {
   /// `includeIfNull`, that value takes precedent.
   final bool? includeIfNull;
 
+  /// A list of [JsonConverter] to apply to this class.
+  ///
+  /// Writing:
+  ///
+  /// ```dart
+  /// @JsonSerializable(converters: [MyJsonConverter()])
+  /// class Example {...}
+  /// ```
+  ///
+  /// is equivalent to writing:
+  ///
+  /// ```dart
+  /// @JsonSerializable()
+  /// @MyJsonConverter()
+  /// class Example {...}
+  /// ```
+  ///
+  /// The main difference is that this allows reusing a custom
+  /// [JsonSerializable] over multiple classes:
+  ///
+  /// ```dart
+  /// const myCustomAnnotation = JsonSerializable(
+  ///   converters: [MyJsonConverter()],
+  /// );
+  ///
+  /// @myCustomAnnotation
+  /// class Example {...}
+  ///
+  /// @myCustomAnnotation
+  /// class Another {...}
+  /// ```
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final List<JsonConverter>? converters;
+
   /// Creates a new [JsonSerializable] instance.
   const JsonSerializable({
     @Deprecated('Has no effect') bool? nullable,
     this.anyMap,
     this.checked,
     this.constructor,
+    this.createFieldMap,
+    this.createJsonKeys,
     this.createFactory,
     this.createToJson,
     this.disallowUnrecognizedKeys,
@@ -199,7 +273,9 @@ class JsonSerializable {
     this.fieldRename,
     this.ignoreUnannotated,
     this.includeIfNull,
+    this.converters,
     this.genericArgumentFactories,
+    this.createPerFieldToJson,
   });
 
   factory JsonSerializable.fromJson(Map<String, dynamic> json) =>
@@ -229,20 +305,20 @@ class JsonSerializable {
   /// [defaults].
   @Deprecated('Was only ever included to support builder infrastructure.')
   JsonSerializable withDefaults() => JsonSerializable(
-        anyMap: anyMap ?? defaults.anyMap,
-        checked: checked ?? defaults.checked,
-        constructor: constructor ?? defaults.constructor,
-        createFactory: createFactory ?? defaults.createFactory,
-        createToJson: createToJson ?? defaults.createToJson,
-        disallowUnrecognizedKeys:
-            disallowUnrecognizedKeys ?? defaults.disallowUnrecognizedKeys,
-        explicitToJson: explicitToJson ?? defaults.explicitToJson,
-        fieldRename: fieldRename ?? defaults.fieldRename,
-        ignoreUnannotated: ignoreUnannotated ?? defaults.ignoreUnannotated,
-        includeIfNull: includeIfNull ?? defaults.includeIfNull,
-        genericArgumentFactories:
-            genericArgumentFactories ?? defaults.genericArgumentFactories,
-      );
+    anyMap: anyMap ?? defaults.anyMap,
+    checked: checked ?? defaults.checked,
+    constructor: constructor ?? defaults.constructor,
+    createFactory: createFactory ?? defaults.createFactory,
+    createToJson: createToJson ?? defaults.createToJson,
+    disallowUnrecognizedKeys:
+        disallowUnrecognizedKeys ?? defaults.disallowUnrecognizedKeys,
+    explicitToJson: explicitToJson ?? defaults.explicitToJson,
+    fieldRename: fieldRename ?? defaults.fieldRename,
+    ignoreUnannotated: ignoreUnannotated ?? defaults.ignoreUnannotated,
+    includeIfNull: includeIfNull ?? defaults.includeIfNull,
+    genericArgumentFactories:
+        genericArgumentFactories ?? defaults.genericArgumentFactories,
+  );
 
   Map<String, dynamic> toJson() => _$JsonSerializableToJson(this);
 }
diff --git a/json_annotation/lib/src/json_serializable.g.dart b/json_annotation/lib/src/json_serializable.g.dart
index bab0898c6..80a3e4c86 100644
--- a/json_annotation/lib/src/json_serializable.g.dart
+++ b/json_annotation/lib/src/json_serializable.g.dart
@@ -6,59 +6,79 @@ part of 'json_serializable.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-JsonSerializable _$JsonSerializableFromJson(Map<String, dynamic> json) =>
-    $checkedCreate(
-      'JsonSerializable',
+JsonSerializable _$JsonSerializableFromJson(
+  Map<String, dynamic> json,
+) => $checkedCreate(
+  'JsonSerializable',
+  json,
+  ($checkedConvert) {
+    $checkKeys(
       json,
-      ($checkedConvert) {
-        $checkKeys(
-          json,
-          allowedKeys: const [
-            'any_map',
-            'checked',
-            'constructor',
-            'create_factory',
-            'create_to_json',
-            'disallow_unrecognized_keys',
-            'explicit_to_json',
-            'field_rename',
-            'generic_argument_factories',
-            'ignore_unannotated',
-            'include_if_null'
-          ],
-        );
-        final val = JsonSerializable(
-          anyMap: $checkedConvert('any_map', (v) => v as bool?),
-          checked: $checkedConvert('checked', (v) => v as bool?),
-          constructor: $checkedConvert('constructor', (v) => v as String?),
-          createFactory: $checkedConvert('create_factory', (v) => v as bool?),
-          createToJson: $checkedConvert('create_to_json', (v) => v as bool?),
-          disallowUnrecognizedKeys:
-              $checkedConvert('disallow_unrecognized_keys', (v) => v as bool?),
-          explicitToJson:
-              $checkedConvert('explicit_to_json', (v) => v as bool?),
-          fieldRename: $checkedConvert('field_rename',
-              (v) => _$enumDecodeNullable(_$FieldRenameEnumMap, v)),
-          ignoreUnannotated:
-              $checkedConvert('ignore_unannotated', (v) => v as bool?),
-          includeIfNull: $checkedConvert('include_if_null', (v) => v as bool?),
-          genericArgumentFactories:
-              $checkedConvert('generic_argument_factories', (v) => v as bool?),
-        );
-        return val;
-      },
-      fieldKeyMap: const {
-        'anyMap': 'any_map',
-        'createFactory': 'create_factory',
-        'createToJson': 'create_to_json',
-        'disallowUnrecognizedKeys': 'disallow_unrecognized_keys',
-        'explicitToJson': 'explicit_to_json',
-        'fieldRename': 'field_rename',
-        'ignoreUnannotated': 'ignore_unannotated',
-        'includeIfNull': 'include_if_null',
-        'genericArgumentFactories': 'generic_argument_factories'
-      },
+      allowedKeys: const [
+        'any_map',
+        'checked',
+        'constructor',
+        'create_factory',
+        'create_field_map',
+        'create_json_keys',
+        'create_per_field_to_json',
+        'create_to_json',
+        'disallow_unrecognized_keys',
+        'explicit_to_json',
+        'field_rename',
+        'generic_argument_factories',
+        'ignore_unannotated',
+        'include_if_null',
+      ],
     );
+    final val = JsonSerializable(
+      anyMap: $checkedConvert('any_map', (v) => v as bool?),
+      checked: $checkedConvert('checked', (v) => v as bool?),
+      constructor: $checkedConvert('constructor', (v) => v as String?),
+      createFieldMap: $checkedConvert('create_field_map', (v) => v as bool?),
+      createJsonKeys: $checkedConvert('create_json_keys', (v) => v as bool?),
+      createFactory: $checkedConvert('create_factory', (v) => v as bool?),
+      createToJson: $checkedConvert('create_to_json', (v) => v as bool?),
+      disallowUnrecognizedKeys: $checkedConvert(
+        'disallow_unrecognized_keys',
+        (v) => v as bool?,
+      ),
+      explicitToJson: $checkedConvert('explicit_to_json', (v) => v as bool?),
+      fieldRename: $checkedConvert(
+        'field_rename',
+        (v) => $enumDecodeNullable(_$FieldRenameEnumMap, v),
+      ),
+      ignoreUnannotated: $checkedConvert(
+        'ignore_unannotated',
+        (v) => v as bool?,
+      ),
+      includeIfNull: $checkedConvert('include_if_null', (v) => v as bool?),
+      genericArgumentFactories: $checkedConvert(
+        'generic_argument_factories',
+        (v) => v as bool?,
+      ),
+      createPerFieldToJson: $checkedConvert(
+        'create_per_field_to_json',
+        (v) => v as bool?,
+      ),
+    );
+    return val;
+  },
+  fieldKeyMap: const {
+    'anyMap': 'any_map',
+    'createFieldMap': 'create_field_map',
+    'createJsonKeys': 'create_json_keys',
+    'createFactory': 'create_factory',
+    'createToJson': 'create_to_json',
+    'disallowUnrecognizedKeys': 'disallow_unrecognized_keys',
+    'explicitToJson': 'explicit_to_json',
+    'fieldRename': 'field_rename',
+    'ignoreUnannotated': 'ignore_unannotated',
+    'includeIfNull': 'include_if_null',
+    'genericArgumentFactories': 'generic_argument_factories',
+    'createPerFieldToJson': 'create_per_field_to_json',
+  },
+);
 
 Map<String, dynamic> _$JsonSerializableToJson(JsonSerializable instance) =>
     <String, dynamic>{
@@ -66,6 +86,9 @@ Map<String, dynamic> _$JsonSerializableToJson(JsonSerializable instance) =>
       'checked': instance.checked,
       'constructor': instance.constructor,
       'create_factory': instance.createFactory,
+      'create_field_map': instance.createFieldMap,
+      'create_json_keys': instance.createJsonKeys,
+      'create_per_field_to_json': instance.createPerFieldToJson,
       'create_to_json': instance.createToJson,
       'disallow_unrecognized_keys': instance.disallowUnrecognizedKeys,
       'explicit_to_json': instance.explicitToJson,
@@ -75,46 +98,10 @@ Map<String, dynamic> _$JsonSerializableToJson(JsonSerializable instance) =>
       'include_if_null': instance.includeIfNull,
     };
 
-K _$enumDecode<K, V>(
-  Map<K, V> enumValues,
-  Object? source, {
-  K? unknownValue,
-}) {
-  if (source == null) {
-    throw ArgumentError(
-      'A value must be provided. Supported values: '
-      '${enumValues.values.join(', ')}',
-    );
-  }
-
-  return enumValues.entries.singleWhere(
-    (e) => e.value == source,
-    orElse: () {
-      if (unknownValue == null) {
-        throw ArgumentError(
-          '`$source` is not one of the supported values: '
-          '${enumValues.values.join(', ')}',
-        );
-      }
-      return MapEntry(unknownValue, enumValues.values.first);
-    },
-  ).key;
-}
-
-K? _$enumDecodeNullable<K, V>(
-  Map<K, V> enumValues,
-  dynamic source, {
-  K? unknownValue,
-}) {
-  if (source == null) {
-    return null;
-  }
-  return _$enumDecode<K, V>(enumValues, source, unknownValue: unknownValue);
-}
-
 const _$FieldRenameEnumMap = {
   FieldRename.none: 'none',
   FieldRename.kebab: 'kebab',
   FieldRename.snake: 'snake',
   FieldRename.pascal: 'pascal',
+  FieldRename.screamingSnake: 'screamingSnake',
 };
diff --git a/json_annotation/mono_pkg.yaml b/json_annotation/mono_pkg.yaml
index aa7c47dab..305682a97 100644
--- a/json_annotation/mono_pkg.yaml
+++ b/json_annotation/mono_pkg.yaml
@@ -1,10 +1,10 @@
 # See https://github.com/google/mono_repo.dart for details on this file
-dart:
-- 2.14.0
-- dev
-
 stages:
 - analyzer_and_format:
   - group:
     - format
     - analyze: --fatal-infos .
+    sdk: dev
+  - group:
+    - analyze
+    sdk: pubspec
diff --git a/json_annotation/pubspec.yaml b/json_annotation/pubspec.yaml
index 9eddca416..f1cd2c79b 100644
--- a/json_annotation/pubspec.yaml
+++ b/json_annotation/pubspec.yaml
@@ -1,16 +1,19 @@
 name: json_annotation
-version: 4.3.0
+version: 4.9.1-wip
 description: >-
   Classes and helper functions that support JSON code generation via the
   `json_serializable` package.
-repository: https://github.com/google/json_serializable.dart
+repository: https://github.com/google/json_serializable.dart/tree/master/json_annotation
+topics:
+ - json
+ - build-runner
+ - json-serializable
+ - codegen
+
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: ^3.8.0
+
+resolution: workspace
 
 dependencies:
   meta: ^1.4.0
-
-# When changing JsonSerializable class.
-# dev_dependencies:
-#  build_runner: ^2.0.0
-#  json_serializable: any
diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md
index 45200e39a..34b778c9f 100644
--- a/json_serializable/CHANGELOG.md
+++ b/json_serializable/CHANGELOG.md
@@ -1,18 +1,190 @@
+## 6.10.0-dev
+
+- Switch to analyzer element2 model and `build: ^3.0.0-dev`.
+- Move `package:collection` to a dev dependency.
+- Use new `null-aware element` feature in generated code.
+- Require Dart 3.8
+
+## 6.9.5
+
+- Support the `analyzer: '>=6.9.0 <8.0.0'`.
+- Fixed use of deprecated analyzer APIs.
+
+## 6.9.4
+
+- Fix extra line being generated when targeting Dart 3.7 package.
+
+## 6.9.3
+
+- Error out if the target package does not have a language version of `3.0` or 
+  greater.
+
+## 6.9.2
+
+- Support the latest `package:analyzer`.
+
+## 6.9.1
+
+- Support the latest `package:source_gen`.
+- Require Dart 3.6
+
+## 6.9.0
+
+- Use conditional map syntax to clean up `null` handling in `toJson` functions.
+- Fix core Dart type links in docs.
+- Require Dart 3.5
+
+## 6.8.0
+
+- Add type arguments to `Map` literals used for `Record` serialization.
+- Add support for `JsonSerializable(createJsonKeys: true)`.
+  ([#1401](https://github.com/google/json_serializable.dart/pull/1401))
+- Handle decoding an `int` value from a `double` literal. 
+  This now matches the behavior of `double` values being encoded as `int`.
+
+## 6.7.1
+
+- Support the latest `package:analyzer`.
+
+## 6.7.0
+
+- Support `Record` types.
+- Require Dart 3.0
+- Require `analyzer: ^5.12.0`
+
+## 6.6.2
+
+- Better handling of `Object?` or `dynamic` as `fromJson` constructor param.
+- Require Dart 2.19
+
+## 6.6.1
+
+- Fix bug when `JsonKey.includeToJson` is `false`.
+
+## 6.6.0
+
+- Support for `JsonKey.includeFromJson` and `JsonKey.includeToJson`.
+- Support `JsonEnum.valueField` being set with `'index'`.
+- Support `JsonSerializable.createPerFieldToJson`.
+- Require Dart SDK `>=2.18.0`.
+- Require `analyzer: ^5.2.0`
+- Require `json_annotation: '>=4.8.0 <4.9.0'`
+
+## 6.5.4
+
+- Fixed handling of nullable fields with converters which return non-nullable
+  values.
+
+## 6.5.3
+
+- Fixed handling of nullable `enum` fields with `includeIfNull: false`.
+
+## 6.5.2
+
+- Better handling of `null` when encoding `enum` values or values with
+  conversions.
+
+## 6.5.1
+
+- Fixed `BigInt`, `DateTime`, and `Uri` support for `JsonKey.defaultValue` with
+  a function value.
+
+## 6.5.0
+
+- Allow constructors to be passed to `JsonKey` parameters that support
+  `Function` types.
+- Accept `Function` values for `JsonKey.defaultValue`. The provided
+  `Function` will be invoked for the default value if the target JSON element is
+  missing or `null`.
+
+## 6.4.1
+
+- Fixed a bug when an `@JsonSerializable` class uses a mixin with fields.
+- Added more documentation `@JsonEnum`.
+
+## 6.4.0
+
+- Add support for `JsonEnum.valueField` which allows specifying a field in an
+  "enhanced enum" to use for serialization instead of specifying each value
+  individually with `JsonValue
+- Require `json_annotation: '>=4.7.0 <4.8.0'`
+
+## 6.3.2
+
+- Require `analyzer: '>=4.6.0 <6.0.0'`
+- Require `sdk: '>=2.17.0 <3.0.0'`
+
+## 6.3.1
+
+- Fixed support for `Duration` fields with default values.
+  ([#1170](https://github.com/google/json_serializable.dart/issues/1170))
+
+## 6.3.0
+
+- Added support for generating `_$ExampleFieldMap`, which can be used by other
+  code-generators that needs to interact with JSON serialization.
+  ([#1164](https://github.com/google/json_serializable.dart/pull/1164))
+- Added support for using a `JsonConverter<MyClass, Object>` on properties of
+  type `MyClass?`.
+  ([#822](https://github.com/google/json_serializable.dart/issues/822))
+- Added support for `JsonSerializable(converters: <JsonConverter>[])`
+  ([#1072](https://github.com/google/json_serializable.dart/issues/1072))
+- Fix issue with serialization of non-nullable enumerations emitting a nullable
+  type ([#1146](https://github.com/google/json_serializable.dart/pull/1146))
+
+## 6.2.0
+
+- Added support for the new `FieldRename.screamingSnake` field in
+  `package:json_annotation`.
+
+## 6.1.6
+
+- Allow latest `package:analyzer`.
+
+## 6.1.5
+
+- Fix enum support for upcoming enhanced enums in Dart 2.17.
+
+## 6.1.4
+
+- Fix issues with latest `package:analyzer` related to enums and annotations.
+
+## 6.1.3
+
+- Allow latest `package:analyzer`.
+
+## 6.1.2
+
+- Fix issue with nested generics and `genericArgumentFactories: true`.
+  ([#1047](https://github.com/google/json_serializable.dart/issues/1047))
+
+## 6.1.1
+
+- Fix `JsonKey.readValue` support to allow static functions.
+
+## 6.1.0
+
+- Support `JsonKey.readValue` to allow customized reading of values from source
+  JSON map objects.
+- The check to make sure there is a correctly constrained dependency on
+  `package:json_annotation` is now a warning and doesn't fail the build.
+- Require `json_annotation` `'>=4.4.0 <4.5.0'`.
+
 ## 6.0.1
 
 - Don't require `json_annotation` in `dependencies` if it's just used in tests.
 
 ## 6.0.0
 
-- Added support for `JsonSerializable.constructor` to allow specifying an 
+- Added support for `JsonSerializable.constructor` to allow specifying an
   alternative constructor to invoke when creating a `fromJson` helper.
 - Support the new `@JsonEnum` annotation in `package:json_annotation`.
 - Support `JsonKey.nullForUndefinedEnumValue` as a value for
   `JsonKey.unknownEnumValue` when you want to use `null` as the unknown value.
 - Use the new `$enumDecodeNullable` and `$enumDecode` in `json_annotation'
-  instead of generating these for each library.
-  **NOTE**: This is a potential breaking change if any user code relies on
-  the previously generated private functions.
+  instead of generating these for each library. **NOTE**: This is a potential
+  breaking change if any user code relies on the previously generated private
+  functions.
 - The builder now checks to make sure there is a correctly constrained
   dependency on `package:json_annotation`.
 - Require Dart SDK `>=2.14.0`.
@@ -20,8 +192,8 @@
 
 ## 5.0.2
 
-- Include type arguments when invoking `fromJson` on custom types.
-  This fixes an edge case where the generic arguments could not be inferred.
+- Include type arguments when invoking `fromJson` on custom types. This fixes an
+  edge case where the generic arguments could not be inferred.
 
 ## 5.0.1
 
@@ -95,6 +267,10 @@
 - **BREAKING** `bool defaultProvided` arg added to `TypeHelper.deserialize`.
   _Only applies to code using `TypeHelper` directly._
 
+## 3.5.2
+
+- Widen `package:analyzer` range to allow v1.x.
+
 ## 3.5.1
 
 - Improved error messages for unsupported types.
@@ -176,7 +352,7 @@
 
 ## 3.2.3
 
-- Bug fix for analyzer 0.38.5.
+- Fixed bug related to `package:analyzer` 0.38.5.
 
 ## 3.2.2
 
@@ -265,12 +441,12 @@ future feature work.
 ## 2.0.3
 
 - When invoking a `fromJson` constructor on a field type, generate a conversion
-  expression derived from the the constructor parameter type.
+  expression derived from the constructor parameter type.
 
 - Be more strict about the supported `List`, `Set`, or `Map` types. This may
-  causes errors to be raised in cases where invalid code was generated before.
-  It also allows implementations of these types to add a `fromJson` constructor
-  to support custom decoding.
+  cause errors to be raised in cases where invalid code was generated before. It
+  also allows implementations of these types to add a `fromJson` constructor to
+  support custom decoding.
 
 - Small change to the whitespace around converted maps to improve a very slow
   path when formatting generated code.
@@ -313,8 +489,7 @@ future feature work.
 
   - **BREAKING** `JsonSerializableGenerator` now exposes a `config` property of
     type `JsonSerializable` instead of individual properties for `checked`,
-    `anyMay`, etc. This will affect anyone creating or using this class via
-    code.
+    `anyMay`, etc. This will affect creating or using this class via code.
 
 - `type_helper.dart`
 
@@ -445,7 +620,7 @@ future feature work.
 - Added `JsonKey.disallowNullValue`.
 
   - When `true`, generated code throws a `DisallowedNullValueException` if the
-    corresponding keys exist in in the JSON map, but it's value is null.
+    corresponding keys exist in the JSON map, but its value is `null`.
   - Will be captured and wrapped in a `CheckedFromJsonException` if `checked` is
     enabled in `json_serializable`.
 
@@ -635,7 +810,7 @@ future feature work.
 - Moved the annotations in `annotations.dart` to `package:json_annotations`.
 
   - Allows package authors to release code that has the corresponding
-    annotations without requiring package users to inherit all of the transitive
+    annotations without requiring package users to inherit all the transitive
     dependencies.
 
 - Deprecated `annotations.dart`.
@@ -681,7 +856,7 @@ future feature work.
     and related helpers which allow custom generation for specific types.
 
 - **BREAKING** Generation fails for types that are not a JSON primitive or that
-  do not explicitly supports JSON serialization.
+  do not explicitly support JSON serialization.
 
 - **BREAKING** `TypeHelper`:
 
diff --git a/json_serializable/README.md b/json_serializable/README.md
index 4756a0760..47c0d0cbb 100644
--- a/json_serializable/README.md
+++ b/json_serializable/README.md
@@ -17,8 +17,8 @@ in [package:json_annotation].
 
 ## Setup
 
-To configure your project for the latest released version of,
-`json_serializable` see the [example].
+To configure your project for the latest released version of
+`json_serializable`, see the [example].
 
 ## Example
 
@@ -56,18 +56,18 @@ Building creates the corresponding part `example.g.dart`:
 part of 'example.dart';
 
 Person _$PersonFromJson(Map<String, dynamic> json) => Person(
-      firstName: json['firstName'] as String,
-      lastName: json['lastName'] as String,
-      dateOfBirth: json['dateOfBirth'] == null
-          ? null
-          : DateTime.parse(json['dateOfBirth'] as String),
-    );
+  firstName: json['firstName'] as String,
+  lastName: json['lastName'] as String,
+  dateOfBirth: json['dateOfBirth'] == null
+      ? null
+      : DateTime.parse(json['dateOfBirth'] as String),
+);
 
 Map<String, dynamic> _$PersonToJson(Person instance) => <String, dynamic>{
-      'firstName': instance.firstName,
-      'lastName': instance.lastName,
-      'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
-    };
+  'firstName': instance.firstName,
+  'lastName': instance.lastName,
+  'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
+};
 ```
 
 # Running the code generator
@@ -75,10 +75,7 @@ Map<String, dynamic> _$PersonToJson(Person instance) => <String, dynamic>{
 Once you have added the annotations to your code you then need to run the code
 generator to generate the missing `.g.dart` generated dart files.
 
-With a Dart package, run `dart run build_runner build` in the package directory.
-
-With a Flutter package, run `flutter pub run build_runner build` in your package
-directory.
+Run `dart run build_runner build` in the package directory.
 
 # Annotation values
 
@@ -115,28 +112,48 @@ Annotate `enum` types with [`JsonEnum`] (new in `json_annotation` 4.2.0) to:
 Annotate `enum` values with [`JsonValue`] to specify the encoded value to map
 to target `enum` entries. Values can be of type [`String`] or [`int`].
 
-<!-- TODO: hoist out to source code! -->
-
 ```dart
 enum StatusCode {
   @JsonValue(200)
   success,
-  @JsonValue('500')
-  weird,
+  @JsonValue(301)
+  movedPermanently,
+  @JsonValue(302)
+  found,
+  @JsonValue(500)
+  internalServerError,
+}
+```
+
+If you are annotating an
+[enhanced enum](https://dart.dev/guides/language/language-tour#declaring-enhanced-enums),
+you can use [`JsonEnum.valueField`] to specify the field to use for the
+serialized value.
+
+```dart
+@JsonEnum(valueField: 'code')
+enum StatusCodeEnhanced {
+  success(200),
+  movedPermanently(301),
+  found(302),
+  internalServerError(500);
+
+  const StatusCodeEnhanced(this.code);
+  final int code;
 }
 ```
 
 # Supported types
 
 Out of the box, `json_serializable` supports many common types in the
-[dart:core](https://api.dart.dev/stable/dart-core/dart-core-library.html)
+[dart:core](https://api.dart.dev/dart-core/dart-core-library.html)
 library: 
 [`BigInt`], [`bool`], [`DateTime`], [`double`], [`Duration`], [`Enum`], [`int`],
-[`Iterable`], [`List`], [`Map`], [`num`], [`Object`], [`Set`], [`String`],
-[`Uri`]
+[`Iterable`], [`List`], [`Map`], [`num`], [`Object`], [`Record`], [`Set`],
+[`String`], [`Uri`]
 
 The collection types –
-[`Iterable`], [`List`], [`Map`], [`Set`]
+[`Iterable`], [`List`], [`Map`], [`Record`], [`Set`]
 – can contain values of all the above types.
 
 For [`Map`], the key value must be one of
@@ -147,19 +164,95 @@ For [`Map`], the key value must be one of
 If you want to use types that are not supported out-of-the-box or if you want to
 customize the encoding/decoding of any type, you have a few options.
 
-1. If you own/cotrol the desired type, add a `fromJson` constructor and/or a
+1. If you own/control the desired type, add a `fromJson` constructor and/or a
    `toJson()` function to the type. Note: while you can use `json_serializable`
    for these types, you don't have to! The generator code only looks for these
    methods. It doesn't care how they were created.
+
+    ```dart
+    @JsonSerializable()
+    class Sample1 {
+      Sample1(this.value);
+
+      factory Sample1.fromJson(Map<String, dynamic> json) =>
+          _$Sample1FromJson(json);
+
+      // Sample2 is NOT annotated with @JsonSerializable(), but that's okay
+      // The class has a `fromJson` constructor and a `toJson` method, which is
+      // all that is required.
+      final Sample2 value;
+
+      Map<String, dynamic> toJson() => _$Sample1ToJson(this);
+    }
+
+    class Sample2 {
+      Sample2(this.value);
+
+      // The convention is for `fromJson` to take a single parameter of type
+      // `Map<String, dynamic>` but any JSON-compatible type is allowed.
+      factory Sample2.fromJson(int value) => Sample2(value);
+      final int value;
+
+      // The convention is for `toJson` to take return a type of
+      // `Map<String, dynamic>` but any JSON-compatible type is allowed.
+      int toJson() => value;
+    }
+    ```
+
 1. Use the [`JsonKey.toJson`] and [`JsonKey.fromJson`] properties to specify
    custom conversions on the annotated field. The functions specified must be
    top-level or static. See the documentation of these properties for details.
+
+    ```dart
+    @JsonSerializable()
+    class Sample3 {
+      Sample3(this.value);
+
+      factory Sample3.fromJson(Map<String, dynamic> json) =>
+          _$Sample3FromJson(json);
+
+      @JsonKey(toJson: _toJson, fromJson: _fromJson)
+      final DateTime value;
+
+      Map<String, dynamic> toJson() => _$Sample3ToJson(this);
+
+      static int _toJson(DateTime value) => value.millisecondsSinceEpoch;
+      static DateTime _fromJson(int value) =>
+          DateTime.fromMillisecondsSinceEpoch(value);
+    }
+    ```
+
 1. Create an implementation of [`JsonConverter`] and annotate either the
    corresponding field or the containing class. [`JsonConverter`] is convenient
    if you want to use the same conversion logic on many fields. It also allows
    you to support a type within collections. Check out
    [these examples](https://github.com/google/json_serializable.dart/blob/master/example/lib/json_converter_example.dart).
 
+    ```dart
+    @JsonSerializable()
+    class Sample4 {
+      Sample4(this.value);
+
+      factory Sample4.fromJson(Map<String, dynamic> json) =>
+          _$Sample4FromJson(json);
+
+      @EpochDateTimeConverter()
+      final DateTime value;
+
+      Map<String, dynamic> toJson() => _$Sample4ToJson(this);
+    }
+
+    class EpochDateTimeConverter implements JsonConverter<DateTime, int> {
+      const EpochDateTimeConverter();
+
+      @override
+      DateTime fromJson(int json) => DateTime.fromMillisecondsSinceEpoch(json);
+
+      @override
+      int toJson(DateTime object) => object.millisecondsSinceEpoch;
+    }
+    ```
+
 # Build configuration
 
 Aside from setting arguments on the associated annotation classes, you can also
@@ -179,6 +272,9 @@ targets:
           checked: false
           constructor: ""
           create_factory: true
+          create_field_map: false
+          create_json_keys: false
+          create_per_field_to_json: false
           create_to_json: true
           disallow_unrecognized_keys: false
           explicit_to_json: false
@@ -188,29 +284,43 @@ targets:
           include_if_null: true
 ```
 
+To exclude generated files from coverage, you can further configure `build.yaml`.
+
+```yaml
+targets:
+  $default:
+    builders:
+      source_gen:combining_builder:
+        options:
+          preamble: |
+            // coverage:ignore-file
+```
+
 [example]: https://github.com/google/json_serializable.dart/tree/master/example
 [dart build system]: https://github.com/dart-lang/build
 [package:json_annotation]: https://pub.dev/packages/json_annotation
-[`BigInt`]: https://api.dart.dev/stable/dart-core/BigInt-class.html
-[`bool`]: https://api.dart.dev/stable/dart-core/bool-class.html
-[`DateTime`]: https://api.dart.dev/stable/dart-core/DateTime-class.html
-[`double`]: https://api.dart.dev/stable/dart-core/double-class.html
-[`Duration`]: https://api.dart.dev/stable/dart-core/Duration-class.html
-[`Enum`]: https://api.dart.dev/stable/dart-core/Enum-class.html
-[`int`]: https://api.dart.dev/stable/dart-core/int-class.html
-[`Iterable`]: https://api.dart.dev/stable/dart-core/Iterable-class.html
-[`JsonConverter`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonConverter-class.html
-[`JsonEnum`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonEnum-class.html
-[`JsonKey.fromJson`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonKey/fromJson.html
-[`JsonKey.toJson`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonKey/toJson.html
-[`JsonKey`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonKey-class.html
-[`JsonLiteral`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonLiteral-class.html
-[`JsonSerializable`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonSerializable-class.html
-[`JsonValue`]: https://pub.dev/documentation/json_annotation/4.3.0/json_annotation/JsonValue-class.html
-[`List`]: https://api.dart.dev/stable/dart-core/List-class.html
-[`Map`]: https://api.dart.dev/stable/dart-core/Map-class.html
-[`num`]: https://api.dart.dev/stable/dart-core/num-class.html
-[`Object`]: https://api.dart.dev/stable/dart-core/Object-class.html
-[`Set`]: https://api.dart.dev/stable/dart-core/Set-class.html
-[`String`]: https://api.dart.dev/stable/dart-core/String-class.html
-[`Uri`]: https://api.dart.dev/stable/dart-core/Uri-class.html
+[`BigInt`]: https://api.dart.dev/dart-core/BigInt-class.html
+[`bool`]: https://api.dart.dev/dart-core/bool-class.html
+[`DateTime`]: https://api.dart.dev/dart-core/DateTime-class.html
+[`double`]: https://api.dart.dev/dart-core/double-class.html
+[`Duration`]: https://api.dart.dev/dart-core/Duration-class.html
+[`Enum`]: https://api.dart.dev/dart-core/Enum-class.html
+[`int`]: https://api.dart.dev/dart-core/int-class.html
+[`Iterable`]: https://api.dart.dev/dart-core/Iterable-class.html
+[`JsonConverter`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonConverter-class.html
+[`JsonEnum.valueField`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonEnum/valueField.html
+[`JsonEnum`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonEnum-class.html
+[`JsonKey.fromJson`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/fromJson.html
+[`JsonKey.toJson`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/toJson.html
+[`JsonKey`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey-class.html
+[`JsonLiteral`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonLiteral-class.html
+[`JsonSerializable`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonSerializable-class.html
+[`JsonValue`]: https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonValue-class.html
+[`List`]: https://api.dart.dev/dart-core/List-class.html
+[`Map`]: https://api.dart.dev/dart-core/Map-class.html
+[`num`]: https://api.dart.dev/dart-core/num-class.html
+[`Object`]: https://api.dart.dev/dart-core/Object-class.html
+[`Record`]: https://api.dart.dev/dart-core/Record-class.html
+[`Set`]: https://api.dart.dev/dart-core/Set-class.html
+[`String`]: https://api.dart.dev/dart-core/String-class.html
+[`Uri`]: https://api.dart.dev/dart-core/Uri-class.html
diff --git a/json_serializable/build.yaml b/json_serializable/build.yaml
index bc69e96d9..e52d7d814 100644
--- a/json_serializable/build.yaml
+++ b/json_serializable/build.yaml
@@ -6,16 +6,28 @@ targets:
         options:
           ignore_for_file:
           - lines_longer_than_80_chars
+          # Only for the JSON literal output file
+          - text_direction_code_point_in_literal
+          # Too much work in generated code
+          - inference_failure_on_function_invocation
+          # Need to update sourcegen_helper to generate List/Map with the right type params
+          - inference_failure_on_collection_literal
 
       json_serializable:
         generate_for:
         - example/*
         - test/default_value/*
+        - test/field_matrix_test.field_matrix.dart
         - test/generic_files/*
         - test/integration/*
         - test/kitchen_sink/*
         - test/literal/*
         - test/supported_types/*
+        - tool/readme/*
+
+      json_serializable|_field_matrix_builder:
+        generate_for:
+        - test/field_matrix_test.dart
 
       json_serializable|_test_builder:
         generate_for:
@@ -63,6 +75,7 @@ builders:
       - .type_map.dart
       - .type_num.dart
       - .type_object.dart
+      - .type_record.dart
       - .type_set.dart
       - .type_string.dart
       - .type_uri.dart
@@ -92,6 +105,14 @@ builders:
     build_to: source
     runs_before: ["json_serializable"]
 
+  _field_matrix_builder:
+    import: 'tool/field_matrix_builder.dart'
+    builder_factories: ['builder']
+    build_extensions:
+      .dart: [.field_matrix.dart]
+    build_to: source
+    runs_before: ["json_serializable"]
+
   _readme_builder:
     import: "tool/readme_builder.dart"
     builder_factories: ["readmeBuilder"]
diff --git a/json_serializable/example/example.g.dart b/json_serializable/example/example.g.dart
index 0db7c1d08..8dceaa3f8 100644
--- a/json_serializable/example/example.g.dart
+++ b/json_serializable/example/example.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'example.dart';
 
@@ -9,15 +9,15 @@ part of 'example.dart';
 // **************************************************************************
 
 Person _$PersonFromJson(Map<String, dynamic> json) => Person(
-      firstName: json['firstName'] as String,
-      lastName: json['lastName'] as String,
-      dateOfBirth: json['dateOfBirth'] == null
-          ? null
-          : DateTime.parse(json['dateOfBirth'] as String),
-    );
+  firstName: json['firstName'] as String,
+  lastName: json['lastName'] as String,
+  dateOfBirth: json['dateOfBirth'] == null
+      ? null
+      : DateTime.parse(json['dateOfBirth'] as String),
+);
 
 Map<String, dynamic> _$PersonToJson(Person instance) => <String, dynamic>{
-      'firstName': instance.firstName,
-      'lastName': instance.lastName,
-      'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
-    };
+  'firstName': instance.firstName,
+  'lastName': instance.lastName,
+  'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
+};
diff --git a/json_serializable/lib/builder.dart b/json_serializable/lib/builder.dart
index c66e3df21..9c90094ce 100644
--- a/json_serializable/lib/builder.dart
+++ b/json_serializable/lib/builder.dart
@@ -10,7 +10,7 @@
 /// This library is **not** intended to be imported by typical end-users unless
 /// you are creating a custom compilation pipeline. See documentation for
 /// details, and `build.yaml` for how these builders are configured by default.
-library json_serializable.builder;
+library;
 
 import 'package:build/build.dart';
 import 'package:json_annotation/json_annotation.dart';
@@ -27,7 +27,7 @@ Builder jsonSerializable(BuilderOptions options) {
     return jsonPartBuilder(config: config);
   } on CheckedFromJsonException catch (e) {
     final lines = <String>[
-      'Could not parse the options provided for `json_serializable`.'
+      'Could not parse the options provided for `json_serializable`.',
     ];
 
     if (e.key != null) {
diff --git a/json_serializable/lib/src/check_dependencies.dart b/json_serializable/lib/src/check_dependencies.dart
index f5b389ddc..21de3153c 100644
--- a/json_serializable/lib/src/check_dependencies.dart
+++ b/json_serializable/lib/src/check_dependencies.dart
@@ -8,16 +8,22 @@ import 'package:build/build.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:pubspec_parse/pubspec_parse.dart';
 
+import 'constants.dart';
+
 const _productionDirectories = {'lib', 'bin'};
 const _annotationPkgName = 'json_annotation';
-final requiredJsonAnnotationMinVersion = Version.parse('4.3.0');
+final _supportLanguageRange = VersionConstraint.parse(
+  supportedLanguageConstraint,
+);
+final requiredJsonAnnotationMinVersion = Version.parse('4.9.0');
 
 Future<void> pubspecHasRightVersion(BuildStep buildStep) async {
   final segments = buildStep.inputId.pathSegments;
   final productionDependency =
       segments.length > 1 && _productionDirectories.contains(segments.first);
-  final resource =
-      productionDependency ? _productionDependency : _developmentDependency;
+  final resource = productionDependency
+      ? _productionDependency
+      : _developmentDependency;
 
   await resource.run(buildStep);
 }
@@ -37,21 +43,36 @@ Future<void> _validatePubspec(bool production, BuildStep buildStep) async {
     return;
   }
 
-  Future<Pubspec> readPubspec(AssetId asset) async {
-    final string = await buildStep.readAsString(asset);
-    return Pubspec.parse(string, sourceUrl: asset.uri);
+  final string = await buildStep.readAsString(pubspecAssetId);
+  final pubspec = Pubspec.parse(string, sourceUrl: pubspecAssetId.uri);
+
+  if (_checkAnnotationConstraint(pubspec, !production)
+      case final errorMessage?) {
+    log.warning(errorMessage);
   }
 
-  final pubspec = await readPubspec(pubspecAssetId);
+  //
+  // Ensure the current package language version is at least the minimum.
+  //
+  final currentPackageName = pubspec.name;
+  final packageConfig = await buildStep.packageConfig;
+  final thisPackage = packageConfig[currentPackageName]!;
 
-  final errorMessage = _checkAnnotationConstraint(
-    pubspec,
-    !production,
-  );
+  // build_runner will error out without an SDK version - so assuming
+  // `languageVersion` is not null.
+  final thisPackageVersion = thisPackage.languageVersion!;
 
-  if (errorMessage == null) return;
+  final thisPackageVer = Version.parse('$thisPackageVersion.0');
+  if (!_supportLanguageRange.allows(thisPackageVer)) {
+    log.warning('''
+The language version ($thisPackageVer) of this package ($currentPackageName) does not match the required range `$supportedLanguageConstraint`.
 
-  throw BadPackageDependencyError(errorMessage);
+Edit pubspec.yaml to include an SDK constraint of at least $supportedLanguageConstraint.
+
+environment:
+  sdk: $supportedLanguageConstraint
+''');
+  }
 }
 
 String? _checkAnnotationConstraint(
@@ -124,13 +145,3 @@ class _OncePerBuild {
     }
   }
 }
-
-/// Thrown when a pubspec dependency is missing or incorrectly specified.
-class BadPackageDependencyError extends Error {
-  final String message;
-
-  BadPackageDependencyError(this.message);
-
-  @override
-  String toString() => message;
-}
diff --git a/json_serializable/lib/src/constants.dart b/json_serializable/lib/src/constants.dart
index 9949b77cc..f10fd8065 100644
--- a/json_serializable/lib/src/constants.dart
+++ b/json_serializable/lib/src/constants.dart
@@ -5,8 +5,7 @@
 /// Name used for closure argument when generating calls to `map`.
 const closureArg = 'e';
 
-const generatedLocalVarName = 'val';
-const toJsonMapHelperName = 'writeNotNull';
+const generatedLocalVarName = 'value';
 
 const converterOrKeyInstructions = r'''
 * Use `JsonConverter`
@@ -14,3 +13,7 @@ const converterOrKeyInstructions = r'''
 * Use `JsonKey` fields `fromJson` and `toJson`
   https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/fromJson.html
   https://pub.dev/documentation/json_annotation/latest/json_annotation/JsonKey/toJson.html''';
+
+/// This package generates code that uses null-aware elements, which were
+/// introduced in Dart 3.8.
+const supportedLanguageConstraint = '^3.8.0';
diff --git a/json_serializable/lib/src/decode_helper.dart b/json_serializable/lib/src/decode_helper.dart
index dc8e934be..2668b4243 100644
--- a/json_serializable/lib/src/decode_helper.dart
+++ b/json_serializable/lib/src/decode_helper.dart
@@ -2,7 +2,7 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
@@ -21,28 +21,30 @@ class CreateFactoryResult {
   CreateFactoryResult(this.output, this.usedFields);
 }
 
-abstract class DecodeHelper implements HelperCore {
+mixin DecodeHelper implements HelperCore {
   CreateFactoryResult createFactory(
-    Map<String, FieldElement> accessibleFields,
+    Map<String, FieldElement2> accessibleFields,
     Map<String, String> unavailableReasons,
   ) {
     assert(config.createFactory);
     final buffer = StringBuffer();
 
     final mapType = config.anyMap ? 'Map' : 'Map<String, dynamic>';
-    buffer.write('$targetClassReference '
-        '${prefix}FromJson${genericClassArgumentsImpl(true)}'
-        '($mapType json');
+    buffer.write(
+      '$targetClassReference '
+      '${prefix}FromJson${genericClassArgumentsImpl(withConstraints: true)}'
+      '($mapType json',
+    );
 
     if (config.genericArgumentFactories) {
-      for (var arg in element.typeParameters) {
+      for (var arg in element.typeParameters2) {
         final helperName = fromJsonForType(
           arg.instantiate(nullabilitySuffix: NullabilitySuffix.none),
         );
 
-        buffer.write(', ${arg.name} Function(Object? json) $helperName');
+        buffer.write(', ${arg.name3} Function(Object? json) $helperName');
       }
-      if (element.typeParameters.isNotEmpty) {
+      if (element.typeParameters2.isNotEmpty) {
         buffer.write(',');
       }
     }
@@ -51,30 +53,41 @@ abstract class DecodeHelper implements HelperCore {
 
     final fromJsonLines = <String>[];
 
-    String deserializeFun(String paramOrFieldName,
-            {ParameterElement? ctorParam}) =>
-        _deserializeForField(accessibleFields[paramOrFieldName]!,
-            ctorParam: ctorParam);
+    String deserializeFun(
+      String paramOrFieldName, {
+      FormalParameterElement? ctorParam,
+    }) => _deserializeForField(
+      accessibleFields[paramOrFieldName]!,
+      ctorParam: ctorParam,
+    );
 
     final data = _writeConstructorInvocation(
       element,
       config.constructor,
       accessibleFields.keys,
       accessibleFields.values
-          .where((fe) => element.lookUpSetter(fe.name, element.library) != null)
-          .map((fe) => fe.name)
+          .where(
+            (fe) =>
+                element.lookUpSetter2(
+                  name: fe.name3!,
+                  library: element.library2,
+                ) !=
+                null,
+          )
+          .map((fe) => fe.name3!)
           .toList(),
       unavailableReasons,
       deserializeFun,
     );
 
     final checks = _checkKeys(
-      accessibleFields.values
-          .where((fe) => data.usedCtorParamsAndFields.contains(fe.name)),
+      accessibleFields.values.where(
+        (fe) => data.usedCtorParamsAndFields.contains(fe.name3),
+      ),
     ).toList();
 
     if (config.checked) {
-      final classLiteral = escapeDartString(element.name);
+      final classLiteral = escapeDartString(element.name3!);
 
       final sectionBuffer = StringBuffer()
         ..write('''
@@ -86,24 +99,32 @@ abstract class DecodeHelper implements HelperCore {
         ..write('''
     final val = ${data.content};''');
 
-      for (final field in data.fieldsToSet) {
+      for (final fieldName in data.fieldsToSet) {
         sectionBuffer.writeln();
-        final safeName = safeNameAccess(accessibleFields[field]!);
+        final fieldValue = accessibleFields[fieldName]!;
+        final safeName = safeNameAccess(fieldValue);
         sectionBuffer
           ..write('''
     \$checkedConvert($safeName, (v) => ''')
-          ..write('val.$field = ')
-          ..write(_deserializeForField(accessibleFields[field]!,
-              checkedProperty: true))
-          ..write(');');
+          ..write('val.$fieldName = ')
+          ..write(_deserializeForField(fieldValue, checkedProperty: true));
+
+        final readValueFunc = jsonKeyFor(fieldValue).readValueFunctionName;
+        if (readValueFunc != null) {
+          sectionBuffer.writeln(',readValue: $readValueFunc,');
+        }
+
+        sectionBuffer.write(');');
       }
 
       sectionBuffer.write('''\n    return val;
   }''');
 
-      final fieldKeyMap = Map.fromEntries(data.usedCtorParamsAndFields
-          .map((k) => MapEntry(k, nameAccess(accessibleFields[k]!)))
-          .where((me) => me.key != me.value));
+      final fieldKeyMap = Map.fromEntries(
+        data.usedCtorParamsAndFields
+            .map((k) => MapEntry(k, nameAccess(accessibleFields[k]!)))
+            .where((me) => me.key != me.value),
+      );
 
       String fieldKeyMapArg;
       if (fieldKeyMap.isEmpty) {
@@ -120,7 +141,8 @@ abstract class DecodeHelper implements HelperCore {
     } else {
       fromJsonLines.addAll(checks);
 
-      final sectionBuffer = StringBuffer()..write('''
+      final sectionBuffer = StringBuffer()
+        ..write('''
   ${data.content}''');
       for (final field in data.fieldsToSet) {
         sectionBuffer
@@ -148,11 +170,11 @@ abstract class DecodeHelper implements HelperCore {
     return CreateFactoryResult(buffer.toString(), data.usedCtorParamsAndFields);
   }
 
-  Iterable<String> _checkKeys(Iterable<FieldElement> accessibleFields) sync* {
+  Iterable<String> _checkKeys(Iterable<FieldElement2> accessibleFields) sync* {
     final args = <String>[];
 
-    String constantList(Iterable<FieldElement> things) =>
-        'const ${jsonLiteralAsDart(things.map(nameAccess).toList())}';
+    String constantList(Iterable<FieldElement2> things) =>
+        'const ${jsonLiteralAsDart(things.map<String>(nameAccess).toList())}';
 
     if (config.disallowUnrecognizedKeys) {
       final allowKeysLiteral = constantList(accessibleFields);
@@ -160,8 +182,9 @@ abstract class DecodeHelper implements HelperCore {
       args.add('allowedKeys: $allowKeysLiteral');
     }
 
-    final requiredKeys =
-        accessibleFields.where((fe) => jsonKeyFor(fe).required).toList();
+    final requiredKeys = accessibleFields
+        .where((fe) => jsonKeyFor(fe).required)
+        .toList();
     if (requiredKeys.isNotEmpty) {
       final requiredKeyLiteral = constantList(requiredKeys);
 
@@ -182,9 +205,11 @@ abstract class DecodeHelper implements HelperCore {
     }
   }
 
+  /// If [checkedProperty] is `true`, we're using this function to write to a
+  /// setter.
   String _deserializeForField(
-    FieldElement field, {
-    ParameterElement? ctorParam,
+    FieldElement2 field, {
+    FormalParameterElement? ctorParam,
     bool checkedProperty = false,
   }) {
     final jsonKeyName = safeNameAccess(field);
@@ -192,13 +217,10 @@ abstract class DecodeHelper implements HelperCore {
     final contextHelper = getHelperContext(field);
     final jsonKey = jsonKeyFor(field);
     final defaultValue = jsonKey.defaultValue;
+    final readValueFunc = jsonKey.readValueFunctionName;
 
     String deserialize(String expression) => contextHelper
-        .deserialize(
-          targetType,
-          expression,
-          defaultValue: defaultValue,
-        )
+        .deserialize(targetType, expression, defaultValue: defaultValue)
         .toString();
 
     String value;
@@ -206,14 +228,22 @@ abstract class DecodeHelper implements HelperCore {
       if (config.checked) {
         value = deserialize('v');
         if (!checkedProperty) {
-          value = '\$checkedConvert($jsonKeyName, (v) => $value)';
+          final readValueBit = readValueFunc == null
+              ? ''
+              : ',readValue: $readValueFunc,';
+          value = '\$checkedConvert($jsonKeyName, (v) => $value$readValueBit)';
         }
       } else {
         assert(
           !checkedProperty,
           'should only be true if `_generator.checked` is true.',
         );
-        value = deserialize('json[$jsonKeyName]');
+
+        value = deserialize(
+          readValueFunc == null
+              ? 'json[$jsonKeyName]'
+              : '$readValueFunc(json, $jsonKeyName)',
+        );
       }
     } on UnsupportedTypeError catch (e) // ignore: avoid_catching_errors
     {
@@ -222,9 +252,11 @@ abstract class DecodeHelper implements HelperCore {
 
     if (defaultValue != null) {
       if (jsonKey.disallowNullValue && jsonKey.required) {
-        log.warning('The `defaultValue` on field `${field.name}` will have no '
-            'effect because both `disallowNullValue` and `required` are set to '
-            '`true`.');
+        log.warning(
+          'The `defaultValue` on field `${field.name3}` will have no '
+          'effect because both `disallowNullValue` and `required` are set to '
+          '`true`.',
+        );
       }
     }
     return value;
@@ -242,29 +274,30 @@ abstract class DecodeHelper implements HelperCore {
 /// [writableFields] are also populated, but only if they have not already
 /// been defined by a constructor parameter with the same name.
 _ConstructorData _writeConstructorInvocation(
-  ClassElement classElement,
+  ClassElement2 classElement,
   String constructorName,
   Iterable<String> availableConstructorParameters,
   Iterable<String> writableFields,
   Map<String, String> unavailableReasons,
-  String Function(String paramOrFieldName, {ParameterElement ctorParam})
-      deserializeForField,
+  String Function(String paramOrFieldName, {FormalParameterElement ctorParam})
+  deserializeForField,
 ) {
-  final className = classElement.name;
+  final className = classElement.name3;
 
   final ctor = constructorByName(classElement, constructorName);
 
   final usedCtorParamsAndFields = <String>{};
-  final constructorArguments = <ParameterElement>[];
-  final namedConstructorArguments = <ParameterElement>[];
+  final constructorArguments = <FormalParameterElement>[];
+  final namedConstructorArguments = <FormalParameterElement>[];
 
-  for (final arg in ctor.parameters) {
-    if (!availableConstructorParameters.contains(arg.name)) {
-      if (arg.isNotOptional) {
-        var msg = 'Cannot populate the required constructor '
-            'argument: ${arg.name}.';
+  for (final arg in ctor.formalParameters) {
+    if (!availableConstructorParameters.contains(arg.name3)) {
+      if (arg.isRequired) {
+        var msg =
+            'Cannot populate the required constructor '
+            'argument: ${arg.name3}.';
 
-        final additionalInfo = unavailableReasons[arg.name];
+        final additionalInfo = unavailableReasons[arg.name3];
 
         if (additionalInfo != null) {
           msg = '$msg $additionalInfo';
@@ -282,12 +315,13 @@ _ConstructorData _writeConstructorInvocation(
     } else {
       constructorArguments.add(arg);
     }
-    usedCtorParamsAndFields.add(arg.name);
+    usedCtorParamsAndFields.add(arg.name3!);
   }
 
   // fields that aren't already set by the constructor and that aren't final
-  final remainingFieldsForInvocationBody =
-      writableFields.toSet().difference(usedCtorParamsAndFields);
+  final remainingFieldsForInvocationBody = writableFields.toSet().difference(
+    usedCtorParamsAndFields,
+  );
 
   final constructorExtra = constructorName.isEmpty ? '' : '.$constructorName';
 
@@ -296,27 +330,26 @@ _ConstructorData _writeConstructorInvocation(
       '$className'
       '${genericClassArguments(classElement, false)}'
       '$constructorExtra(',
-    );
-  if (constructorArguments.isNotEmpty) {
-    buffer
-      ..writeln()
-      ..writeAll(constructorArguments.map((paramElement) {
-        final content =
-            deserializeForField(paramElement.name, ctorParam: paramElement);
+    )
+    ..writeAll(
+      constructorArguments.map((paramElement) {
+        final content = deserializeForField(
+          paramElement.name3!,
+          ctorParam: paramElement,
+        );
         return '      $content,\n';
-      }));
-  }
-  if (namedConstructorArguments.isNotEmpty) {
-    buffer
-      ..writeln()
-      ..writeAll(namedConstructorArguments.map((paramElement) {
-        final value =
-            deserializeForField(paramElement.name, ctorParam: paramElement);
-        return '      ${paramElement.name}: $value,\n';
-      }));
-  }
-
-  buffer.write(')');
+      }),
+    )
+    ..writeAll(
+      namedConstructorArguments.map((paramElement) {
+        final value = deserializeForField(
+          paramElement.name3!,
+          ctorParam: paramElement,
+        );
+        return '      ${paramElement.name3!}: $value,\n';
+      }),
+    )
+    ..write(')');
 
   usedCtorParamsAndFields.addAll(remainingFieldsForInvocationBody);
 
diff --git a/json_serializable/lib/src/default_container.dart b/json_serializable/lib/src/default_container.dart
index 752aa2bb5..ee2087947 100644
--- a/json_serializable/lib/src/default_container.dart
+++ b/json_serializable/lib/src/default_container.dart
@@ -9,7 +9,7 @@ import 'utils.dart';
 /// a default value available to replace it if `null`.
 class DefaultContainer {
   final String expression;
-  final String output;
+  final Object output;
 
   DefaultContainer(this.expression, this.output);
 
@@ -23,7 +23,7 @@ class DefaultContainer {
         return ifNullOrElse(
           value.expression,
           defaultValue ?? 'null',
-          value.output,
+          value.output.toString(),
         );
       }
       value = value.output;
diff --git a/json_serializable/lib/src/encoder_helper.dart b/json_serializable/lib/src/encoder_helper.dart
index fd963329d..6536cddda 100644
--- a/json_serializable/lib/src/encoder_helper.dart
+++ b/json_serializable/lib/src/encoder_helper.dart
@@ -2,135 +2,145 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:json_annotation/json_annotation.dart';
 import 'package:source_helper/source_helper.dart';
 
-import 'constants.dart';
+import 'enum_utils.dart';
 import 'helper_core.dart';
 import 'type_helpers/generic_factory_helper.dart';
 import 'type_helpers/json_converter_helper.dart';
 import 'unsupported_type_error.dart';
 
-abstract class EncodeHelper implements HelperCore {
-  String _fieldAccess(FieldElement field) => '$_toJsonParamName.${field.name}';
+mixin EncodeHelper implements HelperCore {
+  String _fieldAccess(FieldElement2 field) =>
+      '$_toJsonParamName.${field.name3!}';
+
+  String createPerFieldToJson(Set<FieldElement2> accessibleFieldSet) {
+    final buffer = StringBuffer()
+      ..writeln('// ignore: unused_element')
+      ..writeln(
+        'abstract class _\$${element.name3!.nonPrivate}PerFieldToJson {',
+      );
+
+    for (final field in accessibleFieldSet) {
+      buffer
+        ..writeln('  // ignore: unused_element')
+        ..write(
+          'static Object? ${field.name3!}'
+          '${genericClassArgumentsImpl(withConstraints: true)}'
+          '(${field.type} $_toJsonParamName',
+        );
 
-  Iterable<String> createToJson(Set<FieldElement> accessibleFields) sync* {
-    assert(config.createToJson);
+      if (config.genericArgumentFactories) {
+        _writeGenericArgumentFactories(buffer);
+      }
 
-    final buffer = StringBuffer();
+      buffer.writeln(') => ${_serializeField(field, _toJsonParamName)};');
+    }
 
-    final functionName = '${prefix}ToJson${genericClassArgumentsImpl(true)}';
-    buffer.write('Map<String, dynamic> '
-        '$functionName($targetClassReference $_toJsonParamName');
+    buffer.writeln('}');
 
-    if (config.genericArgumentFactories) {
-      for (var arg in element.typeParameters) {
-        final helperName = toJsonForType(
-          arg.instantiate(nullabilitySuffix: NullabilitySuffix.none),
-        );
-        buffer.write(',Object? Function(${arg.name} value) $helperName');
-      }
-      if (element.typeParameters.isNotEmpty) {
-        buffer.write(',');
-      }
+    return buffer.toString();
+  }
+
+  /// Generates an object containing metadatas related to the encoding,
+  /// destined to be used by other code-generators.
+  String createFieldMap(Set<FieldElement2> accessibleFieldSet) {
+    assert(config.createFieldMap);
+
+    final buffer = StringBuffer(
+      'const _\$${element.name3!.nonPrivate}FieldMap = <String, String> {',
+    );
+
+    for (final field in accessibleFieldSet) {
+      buffer.writeln(
+        '${escapeDartString(field.name3!)}: '
+        '${escapeDartString(nameAccess(field))},',
+      );
     }
-    buffer.write(') ');
 
-    final writeNaive = accessibleFields.every(_writeJsonValueNaive);
+    buffer.write('};');
 
-    if (writeNaive) {
-      // write simple `toJson` method that includes all keys...
-      _writeToJsonSimple(buffer, accessibleFields);
-    } else {
-      // At least one field should be excluded if null
-      _writeToJsonWithNullChecks(buffer, accessibleFields);
+    return buffer.toString();
+  }
+
+  /// Generates an object containing metadatas related to the encoding,
+  /// destined to be used by other code-generators.
+  String createJsonKeys(Set<FieldElement2> accessibleFieldSet) {
+    assert(config.createJsonKeys);
+
+    final buffer = StringBuffer(
+      'abstract final class _\$${element.name3!.nonPrivate}JsonKeys {',
+    );
+    // ..write('static const _\$${element.name.nonPrivate}JsonKeys();');
+
+    for (final field in accessibleFieldSet) {
+      buffer.writeln(
+        'static const String ${field.name3} = '
+        '${escapeDartString(nameAccess(field))};',
+      );
     }
 
-    yield buffer.toString();
+    buffer.write('}');
+
+    return buffer.toString();
   }
 
-  void _writeToJsonSimple(StringBuffer buffer, Iterable<FieldElement> fields) {
+  Iterable<String> createToJson(Set<FieldElement2> accessibleFields) sync* {
+    assert(config.createToJson);
+
+    final buffer = StringBuffer();
+
+    final functionName =
+        '${prefix}ToJson${genericClassArgumentsImpl(withConstraints: true)}';
+    buffer.write(
+      'Map<String, dynamic> '
+      '$functionName($targetClassReference $_toJsonParamName',
+    );
+
+    if (config.genericArgumentFactories) _writeGenericArgumentFactories(buffer);
+
     buffer
+      ..write(') ')
       ..writeln('=> <String, dynamic>{')
-      ..writeAll(fields.map((field) {
-        final access = _fieldAccess(field);
-        final value =
-            '${safeNameAccess(field)}: ${_serializeField(field, access)}';
-        return '        $value,\n';
-      }))
-      ..writeln('};');
-  }
+      ..writeAll(
+        accessibleFields.map((field) {
+          final access = _fieldAccess(field);
 
-  static const _toJsonParamName = 'instance';
+          final keyExpression = safeNameAccess(field);
+          final valueExpression = _serializeField(field, access);
 
-  void _writeToJsonWithNullChecks(
-    StringBuffer buffer,
-    Iterable<FieldElement> fields,
-  ) {
-    buffer
-      ..writeln('{')
-      ..writeln('    final $generatedLocalVarName = <String, dynamic>{');
-
-    // Note that the map literal is left open above. As long as target fields
-    // don't need to be intercepted by the `only if null` logic, write them
-    // to the map literal directly. In theory, should allow more efficient
-    // serialization.
-    var directWrite = true;
-
-    for (final field in fields) {
-      var safeFieldAccess = _fieldAccess(field);
-      final safeJsonKeyString = safeNameAccess(field);
-
-      // If `fieldName` collides with one of the local helpers, prefix
-      // access with `this.`.
-      if (safeFieldAccess == generatedLocalVarName ||
-          safeFieldAccess == toJsonMapHelperName) {
-        safeFieldAccess = 'this.$safeFieldAccess';
-      }
+          final maybeQuestion = _canWriteJsonWithoutNullCheck(field) ? '' : '?';
 
-      final expression = _serializeField(field, safeFieldAccess);
-      if (_writeJsonValueNaive(field)) {
-        if (directWrite) {
-          buffer.writeln('      $safeJsonKeyString: $expression,');
-        } else {
-          buffer.writeln(
-              '    $generatedLocalVarName[$safeJsonKeyString] = $expression;');
-        }
-      } else {
-        if (directWrite) {
-          // close the still-open map literal
-          buffer
-            ..writeln('    };')
-            ..writeln()
-
-            // write the helper to be used by all following null-excluding
-            // fields
-            ..writeln('''
-    void $toJsonMapHelperName(String key, dynamic value) {
-      if (value != null) {
-        $generatedLocalVarName[key] = value;
-      }
+          final keyValuePair = '$keyExpression: $maybeQuestion$valueExpression';
+          return '        $keyValuePair,\n';
+        }),
+      )
+      ..writeln('};');
+
+    yield buffer.toString();
+  }
+
+  void _writeGenericArgumentFactories(StringBuffer buffer) {
+    for (var arg in element.typeParameters2) {
+      final helperName = toJsonForType(
+        arg.instantiate(nullabilitySuffix: NullabilitySuffix.none),
+      );
+      buffer.write(',Object? Function(${arg.name3} value) $helperName');
     }
-''');
-          directWrite = false;
-        }
-        buffer.writeln(
-            '    $toJsonMapHelperName($safeJsonKeyString, $expression);');
-      }
+    if (element.typeParameters2.isNotEmpty) {
+      buffer.write(',');
     }
-
-    buffer
-      ..writeln('    return $generatedLocalVarName;')
-      ..writeln('  }');
   }
 
-  String _serializeField(FieldElement field, String accessExpression) {
+  static const _toJsonParamName = 'instance';
+
+  String _serializeField(FieldElement2 field, String accessExpression) {
     try {
-      return getHelperContext(field)
-          .serialize(field.type, accessExpression)
-          .toString();
+      return getHelperContext(
+        field,
+      ).serialize(field.type, accessExpression).toString();
     } on UnsupportedTypeError catch (e) // ignore: avoid_catching_errors
     {
       throw createInvalidGenerationError('toJson', field, e);
@@ -139,22 +149,37 @@ abstract class EncodeHelper implements HelperCore {
 
   /// Returns `true` if the field can be written to JSON 'naively' – meaning
   /// we can avoid checking for `null`.
-  bool _writeJsonValueNaive(FieldElement field) {
+  bool _canWriteJsonWithoutNullCheck(FieldElement2 field) {
     final jsonKey = jsonKeyFor(field);
 
-    return jsonKey.includeIfNull ||
-        (!field.type.isNullableType && !_fieldHasCustomEncoder(field));
-  }
+    if (jsonKey.includeIfNull) {
+      return true;
+    }
 
-  /// Returns `true` if [field] has a user-defined encoder.
-  ///
-  /// This can be either a `toJson` function in [JsonKey] or a [JsonConverter]
-  /// annotation.
-  bool _fieldHasCustomEncoder(FieldElement field) {
     final helperContext = getHelperContext(field);
-    return helperContext.serializeConvertData != null ||
-        const JsonConverterHelper()
-                .serialize(field.type, 'test', helperContext) !=
-            null;
+
+    final serializeConvertData = helperContext.serializeConvertData;
+    if (serializeConvertData != null) {
+      return !serializeConvertData.returnType.isNullableType;
+    }
+
+    final nullableEncodeConverter = hasConverterNullEncode(
+      field.type,
+      helperContext,
+    );
+
+    if (nullableEncodeConverter != null) {
+      return !nullableEncodeConverter && !field.type.isNullableType;
+    }
+
+    // We can consider enums as kinda like having custom converters
+    // same rules apply. If `null` is in the set of encoded values, we
+    // should not write naive
+    final enumWithNullValue = enumFieldWithNullInEncodeMap(field.type);
+    if (enumWithNullValue != null) {
+      return !enumWithNullValue;
+    }
+
+    return !field.type.isNullableType;
   }
 }
diff --git a/json_serializable/lib/src/enum_utils.dart b/json_serializable/lib/src/enum_utils.dart
index fe379d36a..c5d5d1b54 100644
--- a/json_serializable/lib/src/enum_utils.dart
+++ b/json_serializable/lib/src/enum_utils.dart
@@ -3,10 +3,11 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen/source_gen.dart';
+import 'package:source_helper/source_helper.dart';
 
 import 'json_literal_generator.dart';
 import 'utils.dart';
@@ -14,11 +15,51 @@ import 'utils.dart';
 String constMapName(DartType targetType) =>
     '_\$${targetType.element!.name}EnumMap';
 
+/// If [targetType] is not an enum, return `null`.
+///
+/// Otherwise, returns `true` if [targetType] is nullable OR if one of the
+/// encoded values of the enum is `null`.
+bool? enumFieldWithNullInEncodeMap(DartType targetType) {
+  final enumMap = _enumMap(targetType);
+
+  if (enumMap == null) return null;
+
+  if (targetType.isNullableType) {
+    return true;
+  }
+
+  return enumMap.values.contains(null);
+}
+
 String? enumValueMapFromType(
   DartType targetType, {
   bool nullWithNoAnnotation = false,
 }) {
-  final annotation = _jsonEnumChecker.firstAnnotationOf(targetType.element!);
+  final enumMap = _enumMap(
+    targetType,
+    nullWithNoAnnotation: nullWithNoAnnotation,
+  );
+
+  if (enumMap == null) return null;
+
+  final items = enumMap.entries
+      .map(
+        (e) =>
+            '  ${targetType.element!.name}.${e.key.name3}: '
+            '${jsonLiteralAsDart(e.value)},',
+      )
+      .join();
+
+  return 'const ${constMapName(targetType)} = {\n$items\n};';
+}
+
+Map<FieldElement2, Object?>? _enumMap(
+  DartType targetType, {
+  bool nullWithNoAnnotation = false,
+}) {
+  final targetTypeElement = targetType.element;
+  if (targetTypeElement == null) return null;
+  final annotation = _jsonEnumChecker.firstAnnotationOf(targetTypeElement);
   final jsonEnum = _fromAnnotation(annotation);
 
   final enumFields = iterateEnumFields(targetType);
@@ -27,43 +68,80 @@ String? enumValueMapFromType(
     return null;
   }
 
-  MapEntry<FieldElement, dynamic> _generateEntry(FieldElement fe) {
-    final annotation =
-        const TypeChecker.fromRuntime(JsonValue).firstAnnotationOfExact(fe);
+  return {
+    for (var field in enumFields)
+      field: _generateEntry(
+        field: field,
+        jsonEnum: jsonEnum,
+        targetType: targetType,
+      ),
+  };
+}
 
-    dynamic fieldValue;
-    if (annotation == null) {
-      fieldValue = encodedFieldName(jsonEnum.fieldRename, fe.name);
-    } else {
-      final reader = ConstantReader(annotation);
+Object? _generateEntry({
+  required FieldElement2 field,
+  required JsonEnum jsonEnum,
+  required DartType targetType,
+}) {
+  final annotation = const TypeChecker.fromRuntime(
+    JsonValue,
+  ).firstAnnotationOfExact(field);
+
+  if (annotation == null) {
+    final valueField = jsonEnum.valueField;
+    if (valueField != null) {
+      // TODO: fieldRename is pointless here!!! At least log a warning!
+
+      final fieldElementType = field.type.element3 as EnumElement2;
+
+      final e = fieldElementType.getField2(valueField);
+
+      if (e == null && valueField == 'index') {
+        return fieldElementType.fields2
+            .where((element) => element.isEnumConstant)
+            .toList(growable: false)
+            .indexOf(field);
+      }
 
-      final valueReader = reader.read('value');
+      if (e == null || e.isStatic) {
+        throw InvalidGenerationSourceError(
+          '`JsonEnum.valueField` was set to "$valueField", but '
+          'that is not a valid, instance field on '
+          '`${typeToCode(targetType)}`.',
+          element: targetType.element3,
+        );
+      }
 
-      if (valueReader.isString || valueReader.isNull || valueReader.isInt) {
-        fieldValue = valueReader.literalValue;
+      final reader = ConstantReader(field.computeConstantValue());
+      final valueReader = reader.read(valueField);
+      if (valueReader.validValueType) {
+        return valueReader.literalValue;
       } else {
-        final targetTypeCode = typeToCode(targetType);
         throw InvalidGenerationSourceError(
-            'The `JsonValue` annotation on `$targetTypeCode.${fe.name}` does '
-            'not have a value of type String, int, or null.',
-            element: fe);
+          '`JsonEnum.valueField` was set to "$valueField", but '
+          'that field does not have a type of String, int, or null.',
+          element: targetType.element3,
+        );
       }
+    } else {
+      return encodedFieldName(jsonEnum.fieldRename, field.name3!);
     }
+  } else {
+    final reader = ConstantReader(annotation);
 
-    final entry = MapEntry(fe, fieldValue);
+    final valueReader = reader.read('value');
 
-    return entry;
+    if (valueReader.validValueType) {
+      return valueReader.literalValue;
+    } else {
+      final targetTypeCode = typeToCode(targetType);
+      throw InvalidGenerationSourceError(
+        'The `JsonValue` annotation on `$targetTypeCode.${field.name3}` does '
+        'not have a value of type String, int, or null.',
+        element: field,
+      );
+    }
   }
-
-  final enumMap =
-      Map<FieldElement, dynamic>.fromEntries(enumFields.map(_generateEntry));
-
-  final items = enumMap.entries
-      .map((e) => '  ${targetType.element!.name}.${e.key.name}: '
-          '${jsonLiteralAsDart(e.value)},')
-      .join();
-
-  return 'const ${constMapName(targetType)} = {\n$items\n};';
 }
 
 const _jsonEnumChecker = TypeChecker.fromRuntime(JsonEnum);
@@ -74,10 +152,12 @@ JsonEnum _fromAnnotation(DartObject? dartObject) {
   }
   final reader = ConstantReader(dartObject);
   return JsonEnum(
-      alwaysCreate: reader.read('alwaysCreate').literalValue as bool,
-      fieldRename: enumValueForDartObject(
-        reader.read('fieldRename').objectValue,
-        FieldRename.values,
-        (f) => f.toString().split('.')[1],
-      ));
+    alwaysCreate: reader.read('alwaysCreate').literalValue as bool,
+    fieldRename: readEnum(reader.read('fieldRename'), FieldRename.values)!,
+    valueField: reader.read('valueField').literalValue as String?,
+  );
+}
+
+extension on ConstantReader {
+  bool get validValueType => isString || isNull || isInt;
 }
diff --git a/json_serializable/lib/src/field_helpers.dart b/json_serializable/lib/src/field_helpers.dart
index bfeff2e93..4539c7e53 100644
--- a/json_serializable/lib/src/field_helpers.dart
+++ b/json_serializable/lib/src/field_helpers.dart
@@ -2,32 +2,33 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart' // ignore: implementation_imports
-    show
-        InheritanceManager3;
+    show InheritanceManager3;
 import 'package:source_gen/source_gen.dart';
 
 import 'utils.dart';
 
 class _FieldSet implements Comparable<_FieldSet> {
-  final FieldElement field;
-  final FieldElement sortField;
+  final FieldElement2 field;
+  final FieldElement2 sortField;
 
   _FieldSet._(this.field, this.sortField)
-      : assert(field.name == sortField.name);
+    : assert(field.name3 == sortField.name3);
 
-  factory _FieldSet(FieldElement? classField, FieldElement? superField) {
+  factory _FieldSet(FieldElement2? classField, FieldElement2? superField) {
     // At least one of these will != null, perhaps both.
-    final fields = [classField, superField].whereType<FieldElement>().toList();
+    final fields = [classField, superField].whereType<FieldElement2>().toList();
 
     // Prefer the class field over the inherited field when sorting.
     final sortField = fields.first;
 
     // Prefer the field that's annotated with `JsonKey`, if any.
     // If not, use the class field.
-    final fieldHasJsonKey =
-        fields.firstWhere(hasJsonKeyAnnotation, orElse: () => fields.first);
+    final fieldHasJsonKey = fields.firstWhere(
+      hasJsonKeyAnnotation,
+      orElse: () => fields.first,
+    );
 
     return _FieldSet._(fieldHasJsonKey, sortField);
   }
@@ -35,75 +36,75 @@ class _FieldSet implements Comparable<_FieldSet> {
   @override
   int compareTo(_FieldSet other) => _sortByLocation(sortField, other.sortField);
 
-  static int _sortByLocation(FieldElement a, FieldElement b) {
-    final checkerA =
-        TypeChecker.fromStatic((a.enclosingElement as ClassElement).thisType);
+  static int _sortByLocation(FieldElement2 a, FieldElement2 b) {
+    final checkerA = TypeChecker.fromStatic(a.enclosingElement2.thisType);
 
-    if (!checkerA.isExactly(b.enclosingElement)) {
+    if (!checkerA.isExactly(b.enclosingElement2)) {
       // in this case, you want to prioritize the enclosingElement that is more
       // "super".
 
-      if (checkerA.isAssignableFrom(b.enclosingElement)) {
+      if (checkerA.isAssignableFrom(b.enclosingElement2)) {
         return -1;
       }
 
-      final checkerB =
-          TypeChecker.fromStatic((b.enclosingElement as ClassElement).thisType);
+      final checkerB = TypeChecker.fromStatic(b.enclosingElement2.thisType);
 
-      if (checkerB.isAssignableFrom(a.enclosingElement)) {
+      if (checkerB.isAssignableFrom(a.enclosingElement2)) {
         return 1;
       }
     }
 
     /// Returns the offset of given field/property in its source file – with a
     /// preference for the getter if it's defined.
-    int _offsetFor(FieldElement e) {
+    int offsetFor(FieldElement2 e) {
       if (e.isSynthetic) {
-        return (e.getter ?? e.setter)!.nameOffset;
+        return (e.getter2 ?? e.setter2)!.firstFragment.nameOffset2!;
       }
-      return e.nameOffset;
+      return e.firstFragment.nameOffset2!;
     }
 
-    return _offsetFor(a).compareTo(_offsetFor(b));
+    return offsetFor(a).compareTo(offsetFor(b));
   }
 }
 
-/// Returns a [Set] of all instance [FieldElement] items for [element] and
+/// Returns a [List] of all instance [FieldElement2] items for [element] and
 /// super classes, sorted first by their location in the inheritance hierarchy
 /// (super first) and then by their location in the source file.
-Iterable<FieldElement> createSortedFieldSet(ClassElement element) {
+List<FieldElement2> createSortedFieldSet(ClassElement2 element) {
   // Get all of the fields that need to be assigned
   // TODO: support overriding the field set with an annotation option
   final elementInstanceFields = Map.fromEntries(
-      element.fields.where((e) => !e.isStatic).map((e) => MapEntry(e.name, e)));
+    element.fields2.where((e) => !e.isStatic).map((e) => MapEntry(e.name3, e)),
+  );
 
-  final inheritedFields = <String, FieldElement>{};
+  final inheritedFields = <String, FieldElement2>{};
   final manager = InheritanceManager3();
 
-  for (final v in manager.getInheritedConcreteMap2(element).values) {
-    assert(v is! FieldElement);
-    if (_dartCoreObjectChecker.isExactly(v.enclosingElement)) {
+  for (final v in manager.getInheritedConcreteMap(element).values) {
+    assert(v is! FieldElement2);
+    if (_dartCoreObjectChecker.isExactly(v.enclosingElement2!)) {
       continue;
     }
 
-    if (v is PropertyAccessorElement && v.isGetter) {
-      assert(v.variable is FieldElement);
-      final variable = v.variable as FieldElement;
-      assert(!inheritedFields.containsKey(variable.name));
-      inheritedFields[variable.name] = variable;
+    if (v is GetterElement) {
+      final variable = v.variable3 as FieldElement2;
+      assert(!inheritedFields.containsKey(variable.name3));
+      inheritedFields[variable.name3!] = variable;
     }
   }
 
   // Get the list of all fields for `element`
-  final allFields =
-      elementInstanceFields.keys.toSet().union(inheritedFields.keys.toSet());
+  final allFields = elementInstanceFields.keys.toSet().union(
+    inheritedFields.keys.toSet(),
+  );
 
-  final fields = allFields
-      .map((e) => _FieldSet(elementInstanceFields[e], inheritedFields[e]))
-      .toList()
-    ..sort();
+  final fields =
+      allFields
+          .map((e) => _FieldSet(elementInstanceFields[e], inheritedFields[e]))
+          .toList()
+        ..sort();
 
-  return fields.map((fs) => fs.field).toList();
+  return fields.map((fs) => fs.field).toList(growable: false);
 }
 
 const _dartCoreObjectChecker = TypeChecker.fromRuntime(Object);
diff --git a/json_serializable/lib/src/generator_helper.dart b/json_serializable/lib/src/generator_helper.dart
index 011fd46d3..ff5577472 100644
--- a/json_serializable/lib/src/generator_helper.dart
+++ b/json_serializable/lib/src/generator_helper.dart
@@ -2,16 +2,16 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 
+import '../type_helper.dart';
 import 'decode_helper.dart';
 import 'encoder_helper.dart';
 import 'field_helpers.dart';
 import 'helper_core.dart';
 import 'settings.dart';
-import 'type_helper.dart';
 import 'utils.dart';
 
 class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
@@ -20,15 +20,12 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
 
   GeneratorHelper(
     this._generator,
-    ClassElement element,
+    ClassElement2 element,
     ConstantReader annotation,
   ) : super(
-            element,
-            mergeConfig(
-              _generator.config,
-              annotation,
-              classElement: element,
-            ));
+        element,
+        mergeConfig(_generator.config, annotation, classElement: element),
+      );
 
   @override
   void addMember(String memberContent) {
@@ -41,7 +38,7 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
   Iterable<String> generate() sync* {
     assert(_addedMembers.isEmpty);
 
-    if (config.genericArgumentFactories && element.typeParameters.isEmpty) {
+    if (config.genericArgumentFactories && element.typeParameters2.isEmpty) {
       log.warning(
         'The class `${element.displayName}` is annotated '
         'with `JsonSerializable` field `genericArgumentFactories: true`. '
@@ -58,22 +55,24 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
     // these fields.
     final unavailableReasons = <String, String>{};
 
-    final accessibleFields = sortedFields.fold<Map<String, FieldElement>>(
-      <String, FieldElement>{},
+    final accessibleFields = sortedFields.fold<Map<String, FieldElement2>>(
+      <String, FieldElement2>{},
       (map, field) {
-        if (!field.isPublic) {
-          unavailableReasons[field.name] = 'It is assigned to a private field.';
-        } else if (field.getter == null) {
-          assert(field.setter != null);
-          unavailableReasons[field.name] =
+        final jsonKey = jsonKeyFor(field);
+        if (!field.isPublic && !jsonKey.explicitYesFromJson) {
+          unavailableReasons[field.name3!] =
+              'It is assigned to a private field.';
+        } else if (field.getter2 == null) {
+          assert(field.setter2 != null);
+          unavailableReasons[field.name3!] =
               'Setter-only properties are not supported.';
-          log.warning('Setters are ignored: ${element.name}.${field.name}');
-        } else if (jsonKeyFor(field).ignore) {
-          unavailableReasons[field.name] =
-              'It is assigned to an ignored field.';
+          log.warning('Setters are ignored: ${element.name3!}.${field.name3!}');
+        } else if (jsonKey.explicitNoFromJson) {
+          unavailableReasons[field.name3!] =
+              'It is assigned to a field not meant to be used in fromJson.';
         } else {
-          assert(!map.containsKey(field.name));
-          map[field.name] = field;
+          assert(!map.containsKey(field.name3));
+          map[field.name3!] = field;
         }
 
         return map;
@@ -85,18 +84,35 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
       final createResult = createFactory(accessibleFields, unavailableReasons);
       yield createResult.output;
 
-      accessibleFieldSet = accessibleFields.entries
+      final fieldsToUse = accessibleFields.entries
           .where((e) => createResult.usedFields.contains(e.key))
           .map((e) => e.value)
-          .toSet();
+          .toList();
+
+      // Need to add candidates BACK even if they are not used in the factory if
+      // they are forced to be used for toJSON
+      for (var candidate in sortedFields.where(
+        (element) =>
+            jsonKeyFor(element).explicitYesToJson &&
+            !fieldsToUse.contains(element),
+      )) {
+        fieldsToUse.add(candidate);
+      }
+
+      // Need the fields to maintain the original source ordering
+      fieldsToUse.sort(
+        (a, b) => sortedFields.indexOf(a).compareTo(sortedFields.indexOf(b)),
+      );
+
+      accessibleFieldSet = fieldsToUse.toSet();
     }
 
-    // Check for duplicate JSON keys due to colliding annotations.
-    // We do this now, since we have a final field list after any pruning done
-    // by `_writeCtor`.
-    accessibleFieldSet.fold(
-      <String>{},
-      (Set<String> set, fe) {
+    accessibleFieldSet
+      ..removeWhere((element) => jsonKeyFor(element).explicitNoToJson)
+      // Check for duplicate JSON keys due to colliding annotations.
+      // We do this now, since we have a final field list after any pruning done
+      // by `_writeCtor`.
+      ..fold(<String>{}, (Set<String> set, fe) {
         final jsonKey = nameAccess(fe);
         if (!set.add(jsonKey)) {
           throw InvalidGenerationSourceError(
@@ -105,8 +121,19 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
           );
         }
         return set;
-      },
-    );
+      });
+
+    if (config.createFieldMap) {
+      yield createFieldMap(accessibleFieldSet);
+    }
+
+    if (config.createJsonKeys) {
+      yield createJsonKeys(accessibleFieldSet);
+    }
+
+    if (config.createPerFieldToJson) {
+      yield createPerFieldToJson(accessibleFieldSet);
+    }
 
     if (config.createToJson) {
       yield* createToJson(accessibleFieldSet);
@@ -115,3 +142,13 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
     yield* _addedMembers;
   }
 }
+
+extension on KeyConfig {
+  bool get explicitYesFromJson => includeFromJson == true;
+
+  bool get explicitNoFromJson => includeFromJson == false;
+
+  bool get explicitYesToJson => includeToJson == true;
+
+  bool get explicitNoToJson => includeToJson == false;
+}
diff --git a/json_serializable/lib/src/helper_core.dart b/json_serializable/lib/src/helper_core.dart
index 700cab2b3..b30bc36e0 100644
--- a/json_serializable/lib/src/helper_core.dart
+++ b/json_serializable/lib/src/helper_core.dart
@@ -2,7 +2,7 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:meta/meta.dart';
 import 'package:source_gen/source_gen.dart';
@@ -17,7 +17,7 @@ import 'unsupported_type_error.dart';
 import 'utils.dart';
 
 abstract class HelperCore {
-  final ClassElement element;
+  final ClassElement2 element;
   final ClassConfig config;
 
   HelperCore(this.element, this.config);
@@ -28,48 +28,50 @@ abstract class HelperCore {
 
   @protected
   String get targetClassReference =>
-      '${element.name}${genericClassArgumentsImpl(false)}';
+      '${element.name3}${genericClassArgumentsImpl(withConstraints: false)}';
 
   @protected
-  String nameAccess(FieldElement field) => jsonKeyFor(field).name;
+  String nameAccess(FieldElement2 field) => jsonKeyFor(field).name;
 
   @protected
-  String safeNameAccess(FieldElement field) =>
+  String safeNameAccess(FieldElement2 field) =>
       escapeDartString(nameAccess(field));
 
   @protected
-  String get prefix => '_\$${element.name.nonPrivate}';
+  String get prefix => '_\$${element.name3!.nonPrivate}';
 
   /// Returns a [String] representing the type arguments that exist on
   /// [element].
   ///
   /// Returns the output of calling [genericClassArguments] with [element].
   @protected
-  String genericClassArgumentsImpl(bool withConstraints) =>
+  String genericClassArgumentsImpl({required bool withConstraints}) =>
       genericClassArguments(element, withConstraints);
 
   @protected
-  KeyConfig jsonKeyFor(FieldElement field) => jsonKeyForField(field, config);
+  KeyConfig jsonKeyFor(FieldElement2 field) => jsonKeyForField(field, config);
 
   @protected
-  TypeHelperCtx getHelperContext(FieldElement field) =>
+  TypeHelperCtx getHelperContext(FieldElement2 field) =>
       typeHelperContext(this, field);
 }
 
 InvalidGenerationSourceError createInvalidGenerationError(
   String targetMember,
-  FieldElement field,
+  FieldElement2 field,
   UnsupportedTypeError error,
 ) {
-  var message = 'Could not generate `$targetMember` code for `${field.name}`';
+  var message = 'Could not generate `$targetMember` code for `${field.name3!}`';
 
   String? todo;
   if (error.type is TypeParameterType) {
-    message = '$message because of type '
-        '`${error.type.getDisplayString(withNullability: false)}` '
+    message =
+        '$message because of type '
+        '`${error.type.toStringNonNullable()}` '
         '(type parameter)';
 
-    todo = '''
+    todo =
+        '''
 To support type parameters (generic types) you can:
 $converterOrKeyInstructions
 * Set `JsonSerializable.genericArgumentFactories` to `true`
@@ -77,17 +79,15 @@ $converterOrKeyInstructions
   } else if (field.type != error.type) {
     message = '$message because of type `${typeToCode(error.type)}`';
   } else {
-    todo = '''
-To support the type `${error.type.element!.name}` you can:
+    final element = error.type.element?.name;
+    todo =
+        '''
+To support the type `${element ?? error.type}` you can:
 $converterOrKeyInstructions''';
   }
 
   return InvalidGenerationSourceError(
-    [
-      '$message.',
-      if (error.reason != null) error.reason,
-      if (todo != null) todo,
-    ].join('\n'),
+    ['$message.', if (error.reason != null) error.reason, ?todo].join('\n'),
     element: field,
   );
 }
@@ -114,17 +114,19 @@ $converterOrKeyInstructions''';
 /// ```
 /// "<T as num, S>"
 /// ```
-String genericClassArguments(ClassElement element, bool? withConstraints) {
-  if (withConstraints == null || element.typeParameters.isEmpty) {
+String genericClassArguments(ClassElement2 element, bool? withConstraints) {
+  if (withConstraints == null || element.typeParameters2.isEmpty) {
     return '';
   }
-  final values = element.typeParameters.map((t) {
-    if (withConstraints && t.bound != null) {
-      final boundCode = typeToCode(t.bound!);
-      return '${t.name} extends $boundCode';
-    } else {
-      return t.name;
-    }
-  }).join(', ');
+  final values = element.typeParameters2
+      .map((t) {
+        if (withConstraints && t.bound != null) {
+          final boundCode = typeToCode(t.bound!);
+          return '${t.name3!} extends $boundCode';
+        } else {
+          return t.name3!;
+        }
+      })
+      .join(', ');
   return '<$values>';
 }
diff --git a/json_serializable/lib/src/json_enum_generator.dart b/json_serializable/lib/src/json_enum_generator.dart
index 171df15b1..2c6fb3530 100644
--- a/json_serializable/lib/src/json_enum_generator.dart
+++ b/json_serializable/lib/src/json_enum_generator.dart
@@ -2,7 +2,7 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen/source_gen.dart';
@@ -14,22 +14,22 @@ class JsonEnumGenerator extends GeneratorForAnnotation<JsonEnum> {
 
   @override
   List<String> generateForAnnotatedElement(
-    Element element,
+    Element2 element,
     ConstantReader annotation,
     BuildStep buildStep,
   ) {
-    if (element is! ClassElement || !element.isEnum) {
+    if (element is! EnumElement2) {
       throw InvalidGenerationSourceError(
         '`@JsonEnum` can only be used on enum elements.',
         element: element,
       );
     }
 
-    final value =
-        enumValueMapFromType(element.thisType, nullWithNoAnnotation: true);
+    final value = enumValueMapFromType(
+      element.thisType,
+      nullWithNoAnnotation: true,
+    );
 
-    return [
-      if (value != null) value,
-    ];
+    return [?value];
   }
 }
diff --git a/json_serializable/lib/src/json_key_utils.dart b/json_serializable/lib/src/json_key_utils.dart
index 65ea585db..4ab7742be 100644
--- a/json_serializable/lib/src/json_key_utils.dart
+++ b/json_serializable/lib/src/json_key_utils.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:build/build.dart';
 import 'package:json_annotation/json_annotation.dart';
@@ -17,24 +17,27 @@ import 'utils.dart';
 
 final _jsonKeyExpando = Expando<Map<ClassConfig, KeyConfig>>();
 
-KeyConfig jsonKeyForField(FieldElement field, ClassConfig classAnnotation) =>
-    (_jsonKeyExpando[field] ??= Map.identity())[classAnnotation] ??=
-        _from(field, classAnnotation);
+KeyConfig jsonKeyForField(FieldElement2 field, ClassConfig classAnnotation) =>
+    (_jsonKeyExpando[field] ??= Map.identity())[classAnnotation] ??= _from(
+      field,
+      classAnnotation,
+    );
 
-KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
+KeyConfig _from(FieldElement2 element, ClassConfig classAnnotation) {
   // If an annotation exists on `element` the source is a 'real' field.
   // If the result is `null`, check the getter – it is a property.
   // TODO: setters: github.com/google/json_serializable.dart/issues/24
   final obj = jsonKeyAnnotation(element);
 
-  final ctorParamDefault = classAnnotation.ctorParamDefaults[element.name];
+  final ctorParamDefault = classAnnotation.ctorParamDefaults[element.name3];
 
   if (obj.isNull) {
     return _populateJsonKey(
       classAnnotation,
       element,
       defaultValue: ctorParamDefault,
-      ignore: classAnnotation.ignoreUnannotated,
+      includeFromJson: classAnnotation.ignoreUnannotated ? false : null,
+      includeToJson: classAnnotation.ignoreUnannotated ? false : null,
     );
   }
 
@@ -58,10 +61,12 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
     } else if (reader.isType) {
       badType = 'Type';
     } else if (dartObject.type is FunctionType) {
-      // TODO: Support calling function for the default value?
+      // Function types at the "root" are already handled. If they occur
+      // here, it's because the function is nested instead of a collection
+      // literal, which is NOT supported!
       badType = 'Function';
     } else if (!reader.isLiteral) {
-      badType = dartObject.type!.element!.name;
+      badType = dartObject.type!.element?.name;
     }
 
     if (badType != null) {
@@ -79,28 +84,19 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
     if (reader.isList) {
       return [
         for (var e in reader.listValue)
-          literalForObject(fieldName, e, [
-            ...typeInformation,
-            'List',
-          ])
+          literalForObject(fieldName, e, [...typeInformation, 'List']),
       ];
     }
 
     if (reader.isSet) {
       return {
         for (var e in reader.setValue)
-          literalForObject(fieldName, e, [
-            ...typeInformation,
-            'Set',
-          ])
+          literalForObject(fieldName, e, [...typeInformation, 'Set']),
       };
     }
 
     if (reader.isMap) {
-      final mapTypeInformation = [
-        ...typeInformation,
-        'Map',
-      ];
+      final mapTypeInformation = [...typeInformation, 'Map'];
       return reader.mapValue.map(
         (k, v) => MapEntry(
           literalForObject(fieldName, k!, mapTypeInformation),
@@ -124,13 +120,34 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
   /// If [mustBeEnum] is `true`, throws an [InvalidGenerationSourceError] if
   /// either the annotated field is not an `enum` or `List` or if the value in
   /// [fieldName] is not an `enum` value.
-  String? _annotationValue(String fieldName, {bool mustBeEnum = false}) {
+  String? createAnnotationValue(String fieldName, {bool mustBeEnum = false}) {
     final annotationValue = obj.read(fieldName);
-    late final DartType annotationType;
 
-    final enumFields = annotationValue.isNull
-        ? null
-        : iterateEnumFields(annotationType = annotationValue.objectValue.type!);
+    if (annotationValue.isNull) {
+      return null;
+    }
+
+    final objectValue = annotationValue.objectValue;
+    final annotationType = objectValue.type!;
+
+    if (annotationType is FunctionType) {
+      // TODO: we could be a LOT more careful here, checking the return type
+      // and the number of parameters. BUT! If any of those things are wrong
+      // the generated code will be invalid, so skipping until we're bored
+      // later
+
+      final functionValue = objectValue.toFunctionValue2()!;
+
+      final invokeConst =
+          functionValue is ConstructorElement2 && functionValue.isConst
+          ? 'const '
+          : '';
+
+      return '$invokeConst${functionValue.qualifiedName}()';
+    }
+
+    final enumFields = iterateEnumFields(annotationType);
+
     if (enumFields != null) {
       if (mustBeEnum) {
         late DartType targetEnumType;
@@ -152,9 +169,9 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
           throwUnsupported(
             element,
             '`$fieldName` has type '
-            '`${targetEnumType.getDisplayString(withNullability: false)}`, but '
+            '`${targetEnumType.toStringNonNullable()}`, but '
             'the provided unknownEnumValue is of type '
-            '`${annotationType.getDisplayString(withNullability: false)}`.',
+            '`${annotationType.toStringNonNullable()}`.',
           );
         }
       }
@@ -167,18 +184,19 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
         );
       }
 
-      final enumValueNames =
-          enumFields.map((p) => p.name).toList(growable: false);
+      final enumValueNames = enumFields
+          .map((p) => p.name3!)
+          .toList(growable: false);
 
       final enumValueName = enumValueForDartObject<String>(
-          annotationValue.objectValue, enumValueNames, (n) => n);
+        objectValue,
+        enumValueNames,
+        (n) => n,
+      );
 
-      return '${annotationType.element!.name}'
-          '.$enumValueName';
+      return '${annotationType.element!.name}.$enumValueName';
     } else {
-      final defaultValueLiteral = annotationValue.isNull
-          ? null
-          : literalForObject(fieldName, annotationValue.objectValue, []);
+      final defaultValueLiteral = literalForObject(fieldName, objectValue, []);
       if (defaultValueLiteral == null) {
         return null;
       }
@@ -192,14 +210,52 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
     }
   }
 
-  final defaultValue = _annotationValue('defaultValue');
+  final defaultValue = createAnnotationValue('defaultValue');
   if (defaultValue != null && ctorParamDefault != null) {
-    log.warning(
-      'The constructor parameter for `${element.name}` has a default value '
-      '`$ctorParamDefault`, but the `JsonKey.defaultValue` value '
-      '`$defaultValue` will be used for missing or `null` values in JSON '
-      'decoding.',
-    );
+    if (defaultValue == ctorParamDefault) {
+      log.info(
+        'The default value `$defaultValue` for `${element.name3!}` is defined '
+        'twice in the constructor and in the `JsonKey.defaultValue`.',
+      );
+    } else {
+      log.warning(
+        'The constructor parameter for `${element.name3!}` has a default value '
+        '`$ctorParamDefault`, but the `JsonKey.defaultValue` value '
+        '`$defaultValue` will be used for missing or `null` values in JSON '
+        'decoding.',
+      );
+    }
+  }
+
+  String? readValueFunctionName;
+  final readValue = obj.read('readValue');
+  if (!readValue.isNull) {
+    readValueFunctionName = readValue.objectValue
+        .toFunctionValue2()!
+        .qualifiedName;
+  }
+
+  final ignore = obj.read('ignore').literalValue as bool?;
+  var includeFromJson = obj.read('includeFromJson').literalValue as bool?;
+  var includeToJson = obj.read('includeToJson').literalValue as bool?;
+
+  if (ignore != null) {
+    if (includeFromJson != null) {
+      throwUnsupported(
+        element,
+        'Cannot use both `ignore` and `includeFromJson` on the same field. '
+        'Since `ignore` is deprecated, you should only use `includeFromJson`.',
+      );
+    }
+    if (includeToJson != null) {
+      throwUnsupported(
+        element,
+        'Cannot use both `ignore` and `includeToJson` on the same field. '
+        'Since `ignore` is deprecated, you should only use `includeToJson`.',
+      );
+    }
+    assert(includeFromJson == null && includeToJson == null);
+    includeToJson = includeFromJson = !ignore;
   }
 
   return _populateJsonKey(
@@ -207,43 +263,56 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
     element,
     defaultValue: defaultValue ?? ctorParamDefault,
     disallowNullValue: obj.read('disallowNullValue').literalValue as bool?,
-    ignore: obj.read('ignore').literalValue as bool?,
     includeIfNull: obj.read('includeIfNull').literalValue as bool?,
     name: obj.read('name').literalValue as String?,
+    readValueFunctionName: readValueFunctionName,
     required: obj.read('required').literalValue as bool?,
-    unknownEnumValue: _annotationValue('unknownEnumValue', mustBeEnum: true),
+    unknownEnumValue: createAnnotationValue(
+      'unknownEnumValue',
+      mustBeEnum: true,
+    ),
+    includeToJson: includeToJson,
+    includeFromJson: includeFromJson,
   );
 }
 
 KeyConfig _populateJsonKey(
   ClassConfig classAnnotation,
-  FieldElement element, {
+  FieldElement2 element, {
   required String? defaultValue,
   bool? disallowNullValue,
-  bool? ignore,
   bool? includeIfNull,
   String? name,
+  String? readValueFunctionName,
   bool? required,
   String? unknownEnumValue,
+  bool? includeToJson,
+  bool? includeFromJson,
 }) {
   if (disallowNullValue == true) {
     if (includeIfNull == true) {
       throwUnsupported(
-          element,
-          'Cannot set both `disallowNullValue` and `includeIfNull` to `true`. '
-          'This leads to incompatible `toJson` and `fromJson` behavior.');
+        element,
+        'Cannot set both `disallowNullValue` and `includeIfNull` to `true`. '
+        'This leads to incompatible `toJson` and `fromJson` behavior.',
+      );
     }
   }
 
   return KeyConfig(
     defaultValue: defaultValue,
     disallowNullValue: disallowNullValue ?? false,
-    ignore: ignore ?? false,
     includeIfNull: _includeIfNull(
-        includeIfNull, disallowNullValue, classAnnotation.includeIfNull),
-    name: name ?? encodedFieldName(classAnnotation.fieldRename, element.name),
+      includeIfNull,
+      disallowNullValue,
+      classAnnotation.includeIfNull,
+    ),
+    name: name ?? encodedFieldName(classAnnotation.fieldRename, element.name3!),
+    readValueFunctionName: readValueFunctionName,
     required: required ?? false,
     unknownEnumValue: unknownEnumValue,
+    includeFromJson: includeFromJson,
+    includeToJson: includeToJson,
   );
 }
 
@@ -270,5 +339,6 @@ bool _interfaceTypesEqual(DartType a, DartType b) {
 const jsonKeyNullForUndefinedEnumValueFieldName =
     'JsonKey.nullForUndefinedEnumValue';
 
-final _nullAsUnknownChecker =
-    TypeChecker.fromRuntime(JsonKey.nullForUndefinedEnumValue.runtimeType);
+final _nullAsUnknownChecker = TypeChecker.fromRuntime(
+  JsonKey.nullForUndefinedEnumValue.runtimeType,
+);
diff --git a/json_serializable/lib/src/json_literal_generator.dart b/json_serializable/lib/src/json_literal_generator.dart
index dd6189fa2..9ce34d13a 100644
--- a/json_serializable/lib/src/json_literal_generator.dart
+++ b/json_serializable/lib/src/json_literal_generator.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:path/path.dart' as p;
@@ -17,18 +17,21 @@ class JsonLiteralGenerator extends GeneratorForAnnotation<JsonLiteral> {
 
   @override
   Future<String> generateForAnnotatedElement(
-    Element element,
+    Element2 element,
     ConstantReader annotation,
     BuildStep buildStep,
   ) async {
     if (p.isAbsolute(annotation.read('path').stringValue)) {
       throw ArgumentError(
-          '`annotation.path` must be relative path to the source file.');
+        '`annotation.path` must be relative path to the source file.',
+      );
     }
 
     final sourcePathDir = p.dirname(buildStep.inputId.path);
-    final fileId = AssetId(buildStep.inputId.package,
-        p.join(sourcePathDir, annotation.read('path').stringValue));
+    final fileId = AssetId(
+      buildStep.inputId.package,
+      p.join(sourcePathDir, annotation.read('path').stringValue),
+    );
     final content = json.decode(await buildStep.readAsString(fileId));
 
     final asConst = annotation.read('asConst').boolValue;
@@ -36,7 +39,7 @@ class JsonLiteralGenerator extends GeneratorForAnnotation<JsonLiteral> {
     final thing = jsonLiteralAsDart(content).toString();
     final marked = asConst ? 'const' : 'final';
 
-    return '$marked _\$${element.name}JsonLiteral = $thing;';
+    return '$marked _\$${element.name3}JsonLiteral = $thing;';
   }
 }
 
diff --git a/json_serializable/lib/src/json_part_builder.dart b/json_serializable/lib/src/json_part_builder.dart
index 17e2c7fb6..53ad3f039 100644
--- a/json_serializable/lib/src/json_part_builder.dart
+++ b/json_serializable/lib/src/json_part_builder.dart
@@ -3,7 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:build/build.dart';
+import 'package:dart_style/dart_style.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:pub_semver/pub_semver.dart';
 import 'package:source_gen/source_gen.dart';
 
 import 'check_dependencies.dart';
@@ -18,7 +20,7 @@ import 'settings.dart';
 /// [formatOutput] is called to format the generated code. If not provided,
 /// the default Dart code formatter is used.
 Builder jsonPartBuilder({
-  String Function(String code)? formatOutput,
+  String Function(String code, Version languageVersion)? formatOutput,
   JsonSerializable? config,
 }) {
   final settings = Settings(config: config);
@@ -32,7 +34,7 @@ Builder jsonPartBuilder({
       const JsonLiteralGenerator(),
     ],
     'json_serializable',
-    formatOutput: formatOutput,
+    formatOutput: formatOutput ?? defaultFormatOutput,
   );
 }
 
@@ -55,12 +57,16 @@ class _UnifiedGenerator extends Generator {
     final values = <String>{};
 
     for (var generator in _generators) {
-      for (var annotatedElement
-          in library.annotatedWith(generator.typeChecker)) {
+      for (var annotatedElement in library.annotatedWith(
+        generator.typeChecker,
+      )) {
         await pubspecHasRightVersion(buildStep);
 
         final generatedValue = generator.generateForAnnotatedElement(
-            annotatedElement.element, annotatedElement.annotation, buildStep);
+          annotatedElement.element,
+          annotatedElement.annotation,
+          buildStep,
+        );
         for (var value in _normalizeGeneratorOutput(generatedValue)) {
           assert(value.length == value.trim().length);
           values.add(value);
@@ -84,18 +90,25 @@ Iterable<String> _normalizeGeneratorOutput(Object? value) {
   }
 
   if (value is Iterable) {
-    return value.where((e) => e != null).map((e) {
-      if (e is String) {
-        return e.trim();
-      }
+    return value
+        .where((e) => e != null)
+        .map((e) {
+          if (e is String) {
+            return e.trim();
+          }
 
-      throw _argError(e as Object);
-    }).where((e) => e.isNotEmpty);
+          throw _argError(e as Object);
+        })
+        .where((e) => e.isNotEmpty);
   }
   throw _argError(value);
 }
 
 // Borrowed from `package:source_gen`
 ArgumentError _argError(Object value) => ArgumentError(
-    'Must be a String or be an Iterable containing String values. '
-    'Found `${Error.safeToString(value)}` (${value.runtimeType}).');
+  'Must be a String or be an Iterable containing String values. '
+  'Found `${Error.safeToString(value)}` (${value.runtimeType}).',
+);
+
+String defaultFormatOutput(String code, Version languageVersion) =>
+    DartFormatter(languageVersion: languageVersion).format(code);
diff --git a/json_serializable/lib/src/json_serializable_generator.dart b/json_serializable/lib/src/json_serializable_generator.dart
index 13a4b16e4..32b2796b3 100644
--- a/json_serializable/lib/src/json_serializable_generator.dart
+++ b/json_serializable/lib/src/json_serializable_generator.dart
@@ -2,7 +2,7 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen/source_gen.dart';
@@ -20,7 +20,7 @@ class JsonSerializableGenerator
     extends GeneratorForAnnotation<JsonSerializable> {
   final Settings _settings;
 
-  JsonSerializable get config => _settings.config;
+  JsonSerializable get config => _settings.config.toJsonSerializable();
 
   JsonSerializableGenerator.fromSettings(this._settings);
 
@@ -32,11 +32,9 @@ class JsonSerializableGenerator
   factory JsonSerializableGenerator({
     JsonSerializable? config,
     List<TypeHelper>? typeHelpers,
-  }) =>
-      JsonSerializableGenerator.fromSettings(Settings(
-        config: config,
-        typeHelpers: typeHelpers,
-      ));
+  }) => JsonSerializableGenerator.fromSettings(
+    Settings(config: config, typeHelpers: typeHelpers),
+  );
 
   /// Creates an instance of [JsonSerializableGenerator].
   ///
@@ -47,29 +45,20 @@ class JsonSerializableGenerator
   factory JsonSerializableGenerator.withDefaultHelpers(
     Iterable<TypeHelper> typeHelpers, {
     JsonSerializable? config,
-  }) =>
-      JsonSerializableGenerator(
-        config: config,
-        typeHelpers: List.unmodifiable(
-          typeHelpers.followedBy(Settings.defaultHelpers),
-        ),
-      );
+  }) => JsonSerializableGenerator(
+    config: config,
+    typeHelpers: List.unmodifiable(
+      typeHelpers.followedBy(Settings.defaultHelpers),
+    ),
+  );
 
   @override
   Iterable<String> generateForAnnotatedElement(
-    Element element,
+    Element2 element,
     ConstantReader annotation,
     BuildStep buildStep,
   ) {
-    if (!element.library!.isNonNullableByDefault) {
-      throw InvalidGenerationSourceError(
-        'Generator cannot target libraries that have not been migrated to '
-        'null-safety.',
-        element: element,
-      );
-    }
-
-    if (element is! ClassElement || element.isEnum) {
+    if (element is! ClassElement2 || element is EnumElement2) {
       throw InvalidGenerationSourceError(
         '`@JsonSerializable` can only be used on classes.',
         element: element,
diff --git a/json_serializable/lib/src/lambda_result.dart b/json_serializable/lib/src/lambda_result.dart
index 05f07d7f3..9cc95e998 100644
--- a/json_serializable/lib/src/lambda_result.dart
+++ b/json_serializable/lib/src/lambda_result.dart
@@ -2,7 +2,12 @@
 // 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 'package:analyzer/dart/element/type.dart';
+import 'package:source_helper/source_helper.dart';
+
 import 'constants.dart' show closureArg;
+import 'shared_checkers.dart';
+import 'utils.dart';
 
 /// Represents a lambda that can be used as a tear-off depending on the context
 /// in which it is used.
@@ -13,9 +18,10 @@ import 'constants.dart' show closureArg;
 class LambdaResult {
   final String expression;
   final String lambda;
-  final String? asContent;
+  final DartType? asContent;
 
-  String get _fullExpression => '$expression${asContent ?? ''}';
+  String get _fullExpression =>
+      asContent != null ? _cast(expression, asContent!) : expression;
 
   LambdaResult(this.expression, this.lambda, {this.asContent});
 
@@ -24,6 +30,39 @@ class LambdaResult {
 
   static String process(Object subField) =>
       (subField is LambdaResult && closureArg == subField._fullExpression)
-          ? subField.lambda
-          : '($closureArg) => $subField';
+      ? subField.lambda
+      : '($closureArg) => $subField';
+}
+
+String _cast(String expression, DartType targetType) {
+  if (targetType.isLikeDynamic) {
+    return expression;
+  }
+
+  final nullableSuffix = targetType.isNullableType ? '?' : '';
+
+  if (coreIterableTypeChecker.isAssignableFromType(targetType)) {
+    final itemType = coreIterableGenericType(targetType);
+    if (itemType.isLikeDynamic) {
+      return '$expression as List$nullableSuffix';
+    }
+  }
+
+  if (coreMapTypeChecker.isAssignableFromType(targetType)) {
+    final args = targetType.typeArgumentsOf(coreMapTypeChecker)!;
+    assert(args.length == 2);
+
+    if (args.every((e) => e.isLikeDynamic)) {
+      return '$expression as Map$nullableSuffix';
+    }
+  }
+
+  final defaultDecodeValue = defaultDecodeLogic(targetType, expression);
+
+  if (defaultDecodeValue != null) {
+    return defaultDecodeValue;
+  }
+
+  final typeCode = typeToCode(targetType);
+  return '$expression as $typeCode';
 }
diff --git a/json_serializable/lib/src/settings.dart b/json_serializable/lib/src/settings.dart
index f9561ce65..e996f99a3 100644
--- a/json_serializable/lib/src/settings.dart
+++ b/json_serializable/lib/src/settings.dart
@@ -16,6 +16,7 @@ import 'type_helpers/iterable_helper.dart';
 import 'type_helpers/json_converter_helper.dart';
 import 'type_helpers/json_helper.dart';
 import 'type_helpers/map_helper.dart';
+import 'type_helpers/record_helper.dart';
 import 'type_helpers/uri_helper.dart';
 import 'type_helpers/value_helper.dart';
 
@@ -24,6 +25,7 @@ class Settings {
     IterableHelper(),
     MapHelper(),
     EnumHelper(),
+    RecordHelper(),
     ValueHelper(),
   ];
 
@@ -38,44 +40,23 @@ class Settings {
   final List<TypeHelper> _typeHelpers;
 
   Iterable<TypeHelper> get allHelpers => const <TypeHelper>[
-        ConvertHelper(),
-        JsonConverterHelper(),
-        GenericFactoryHelper(),
-      ].followedBy(_typeHelpers).followedBy(_coreHelpers);
+    ConvertHelper(),
+    JsonConverterHelper(),
+    GenericFactoryHelper(),
+  ].followedBy(_typeHelpers).followedBy(_coreHelpers);
 
-  final JsonSerializable _config;
-
-  // #CHANGE WHEN UPDATING json_annotation
-  ClassConfig get config => ClassConfig(
-        checked: _config.checked ?? ClassConfig.defaults.checked,
-        anyMap: _config.anyMap ?? ClassConfig.defaults.anyMap,
-        constructor: _config.constructor ?? ClassConfig.defaults.constructor,
-        createFactory:
-            _config.createFactory ?? ClassConfig.defaults.createFactory,
-        createToJson: _config.createToJson ?? ClassConfig.defaults.createToJson,
-        ignoreUnannotated:
-            _config.ignoreUnannotated ?? ClassConfig.defaults.ignoreUnannotated,
-        explicitToJson:
-            _config.explicitToJson ?? ClassConfig.defaults.explicitToJson,
-        includeIfNull:
-            _config.includeIfNull ?? ClassConfig.defaults.includeIfNull,
-        genericArgumentFactories: _config.genericArgumentFactories ??
-            ClassConfig.defaults.genericArgumentFactories,
-        fieldRename: _config.fieldRename ?? ClassConfig.defaults.fieldRename,
-        disallowUnrecognizedKeys: _config.disallowUnrecognizedKeys ??
-            ClassConfig.defaults.disallowUnrecognizedKeys,
-      );
+  final ClassConfig config;
 
   /// Creates an instance of [Settings].
   ///
   /// If [typeHelpers] is not provided, the built-in helpers are used:
   /// [BigIntHelper], [DateTimeHelper], [DurationHelper], [JsonHelper], and
   /// [UriHelper].
-  const Settings({
-    JsonSerializable? config,
-    List<TypeHelper>? typeHelpers,
-  })  : _config = config ?? ClassConfig.defaults,
-        _typeHelpers = typeHelpers ?? defaultHelpers;
+  Settings({JsonSerializable? config, List<TypeHelper>? typeHelpers})
+    : config = config != null
+          ? ClassConfig.fromJsonSerializable(config)
+          : ClassConfig.defaults,
+      _typeHelpers = typeHelpers ?? defaultHelpers;
 
   /// Creates an instance of [Settings].
   ///
@@ -86,9 +67,8 @@ class Settings {
   factory Settings.withDefaultHelpers(
     Iterable<TypeHelper> typeHelpers, {
     JsonSerializable? config,
-  }) =>
-      Settings(
-        config: config,
-        typeHelpers: List.unmodifiable(typeHelpers.followedBy(defaultHelpers)),
-      );
+  }) => Settings(
+    config: config,
+    typeHelpers: List.unmodifiable(typeHelpers.followedBy(defaultHelpers)),
+  );
 }
diff --git a/json_serializable/lib/src/shared_checkers.dart b/json_serializable/lib/src/shared_checkers.dart
index a8e0abcc6..0ac8b8d79 100644
--- a/json_serializable/lib/src/shared_checkers.dart
+++ b/json_serializable/lib/src/shared_checkers.dart
@@ -6,8 +6,6 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:source_gen/source_gen.dart' show TypeChecker;
 import 'package:source_helper/source_helper.dart';
 
-import 'utils.dart';
-
 /// A [TypeChecker] for [Iterable].
 const coreIterableTypeChecker = TypeChecker.fromUrl('dart:core#Iterable');
 
@@ -25,32 +23,5 @@ DartType coreIterableGenericType(DartType type) =>
 const simpleJsonTypeChecker = TypeChecker.any([
   coreStringTypeChecker,
   TypeChecker.fromUrl('dart:core#bool'),
-  TypeChecker.fromUrl('dart:core#num')
+  TypeChecker.fromUrl('dart:core#num'),
 ]);
-
-String asStatement(DartType type) {
-  if (type.isLikeDynamic) {
-    return '';
-  }
-
-  final nullableSuffix = type.isNullableType ? '?' : '';
-
-  if (coreIterableTypeChecker.isAssignableFromType(type)) {
-    final itemType = coreIterableGenericType(type);
-    if (itemType.isLikeDynamic) {
-      return ' as List$nullableSuffix';
-    }
-  }
-
-  if (coreMapTypeChecker.isAssignableFromType(type)) {
-    final args = type.typeArgumentsOf(coreMapTypeChecker)!;
-    assert(args.length == 2);
-
-    if (args.every((e) => e.isLikeDynamic)) {
-      return ' as Map$nullableSuffix';
-    }
-  }
-
-  final typeCode = typeToCode(type);
-  return ' as $typeCode';
-}
diff --git a/json_serializable/lib/src/type_helper.dart b/json_serializable/lib/src/type_helper.dart
index b01249334..868f3d9c5 100644
--- a/json_serializable/lib/src/type_helper.dart
+++ b/json_serializable/lib/src/type_helper.dart
@@ -2,20 +2,19 @@
 // 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 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 
 import 'type_helpers/config_types.dart';
-import 'utils.dart';
 
 /// Context information provided in calls to [TypeHelper.serialize] and
 /// [TypeHelper.deserialize].
 abstract class TypeHelperContext {
   /// The annotated class that code is being generated for.
-  ClassElement get classElement;
+  ClassElement2 get classElement;
 
   /// The field that code is being generated for.
-  FieldElement get fieldElement;
+  FieldElement2 get fieldElement;
 
   /// [expression] may be just the name of the field or it may an expression
   /// representing the serialization of a value.
@@ -85,12 +84,3 @@ abstract class TypeHelper<T extends TypeHelperContext> {
     bool defaultProvided,
   );
 }
-
-Object commonNullPrefix(
-  bool nullable,
-  String expression,
-  Object unsafeExpression,
-) =>
-    nullable
-        ? ifNullOrElse(expression, 'null', '$unsafeExpression')
-        : unsafeExpression;
diff --git a/json_serializable/lib/src/type_helper_ctx.dart b/json_serializable/lib/src/type_helper_ctx.dart
index a601f7bc3..f1433e05e 100644
--- a/json_serializable/lib/src/type_helper_ctx.dart
+++ b/json_serializable/lib/src/type_helper_ctx.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:source_helper/source_helper.dart';
 
@@ -17,19 +17,18 @@ import 'utils.dart';
 
 TypeHelperCtx typeHelperContext(
   HelperCore helperCore,
-  FieldElement fieldElement,
-) =>
-    TypeHelperCtx._(helperCore, fieldElement);
+  FieldElement2 fieldElement,
+) => TypeHelperCtx._(helperCore, fieldElement);
 
 class TypeHelperCtx
     implements TypeHelperContextWithConfig, TypeHelperContextWithConvert {
   final HelperCore _helperCore;
 
   @override
-  final FieldElement fieldElement;
+  final FieldElement2 fieldElement;
 
   @override
-  ClassElement get classElement => _helperCore.element;
+  ClassElement2 get classElement => _helperCore.element;
 
   @override
   ClassConfig get config => _helperCore.config;
@@ -51,10 +50,10 @@ class TypeHelperCtx
 
   @override
   Object? serialize(DartType targetType, String expression) => _run(
-        targetType,
-        expression,
-        (TypeHelper th) => th.serialize(targetType, expression, this),
-      );
+    targetType,
+    expression,
+    (TypeHelper th) => th.serialize(targetType, expression, this),
+  );
 
   @override
   Object deserialize(
@@ -65,12 +64,8 @@ class TypeHelperCtx
     final value = _run(
       targetType,
       expression,
-      (TypeHelper th) => th.deserialize(
-        targetType,
-        expression,
-        this,
-        defaultValue != null,
-      ),
+      (TypeHelper th) =>
+          th.deserialize(targetType, expression, this, defaultValue != null),
     );
 
     return DefaultContainer.deserialize(
@@ -85,10 +80,14 @@ class TypeHelperCtx
     String expression,
     Object? Function(TypeHelper) invoke,
   ) =>
-      _helperCore.allTypeHelpers.map(invoke).firstWhere(
-            (r) => r != null,
-            orElse: () => throw UnsupportedTypeError(targetType, expression),
-          ) as Object;
+      _helperCore.allTypeHelpers
+              .map(invoke)
+              .firstWhere(
+                (r) => r != null,
+                orElse: () =>
+                    throw UnsupportedTypeError(targetType, expression),
+              )
+          as Object;
 }
 
 class _ConvertPair {
@@ -98,7 +97,7 @@ class _ConvertPair {
 
   _ConvertPair._(this.fromJson, this.toJson);
 
-  factory _ConvertPair(FieldElement element) {
+  factory _ConvertPair(FieldElement2 element) {
     var pair = _expando[element];
 
     if (pair == null) {
@@ -116,7 +115,7 @@ class _ConvertPair {
   }
 }
 
-ConvertData? _convertData(DartObject obj, FieldElement element, bool isFrom) {
+ConvertData? _convertData(DartObject obj, FieldElement2 element, bool isFrom) {
   final paramName = isFrom ? 'fromJson' : 'toJson';
   final objectValue = obj.getField(paramName);
 
@@ -124,23 +123,25 @@ ConvertData? _convertData(DartObject obj, FieldElement element, bool isFrom) {
     return null;
   }
 
-  final executableElement = objectValue.toFunctionValue()!;
+  final executableElement = objectValue.toFunctionValue2()!;
 
-  if (executableElement.parameters.isEmpty ||
-      executableElement.parameters.first.isNamed ||
-      executableElement.parameters.where((pe) => !pe.isOptional).length > 1) {
+  if (executableElement.formalParameters.isEmpty ||
+      executableElement.formalParameters.first.isNamed ||
+      executableElement.formalParameters.where((pe) => !pe.isOptional).length >
+          1) {
     throwUnsupported(
-        element,
-        'The `$paramName` function `${executableElement.name}` must have one '
-        'positional parameter.');
+      element,
+      'The `$paramName` function `${executableElement.name3}` must have one '
+      'positional parameter.',
+    );
   }
 
-  final argType = executableElement.parameters.first.type;
+  final returnType = executableElement.returnType;
+  final argType = executableElement.formalParameters.first.type;
   if (isFrom) {
-    final hasDefaultValue =
-        !jsonKeyAnnotation(element).read('defaultValue').isNull;
-
-    final returnType = executableElement.returnType;
+    final hasDefaultValue = !jsonKeyAnnotation(
+      element,
+    ).read('defaultValue').isNull;
 
     if (returnType is TypeParameterType) {
       // We keep things simple in this case. We rely on inferred type arguments
@@ -154,10 +155,11 @@ ConvertData? _convertData(DartObject obj, FieldElement element, bool isFrom) {
         final returnTypeCode = typeToCode(returnType);
         final elementTypeCode = typeToCode(element.type);
         throwUnsupported(
-            element,
-            'The `$paramName` function `${executableElement.name}` return type '
-            '`$returnTypeCode` is not compatible with field type '
-            '`$elementTypeCode`.');
+          element,
+          'The `$paramName` function `${executableElement.name3}` return type '
+          '`$returnTypeCode` is not compatible with field type '
+          '`$elementTypeCode`.',
+        );
       }
     }
   } else {
@@ -169,18 +171,13 @@ ConvertData? _convertData(DartObject obj, FieldElement element, bool isFrom) {
       final argTypeCode = typeToCode(argType);
       final elementTypeCode = typeToCode(element.type);
       throwUnsupported(
-          element,
-          'The `$paramName` function `${executableElement.name}` argument type '
-          '`$argTypeCode` is not compatible with field type'
-          ' `$elementTypeCode`.');
+        element,
+        'The `$paramName` function `${executableElement.name3}` argument type '
+        '`$argTypeCode` is not compatible with field type'
+        ' `$elementTypeCode`.',
+      );
     }
   }
 
-  var name = executableElement.name;
-
-  if (executableElement is MethodElement) {
-    name = '${executableElement.enclosingElement.name}.$name';
-  }
-
-  return ConvertData(name, argType);
+  return ConvertData(executableElement.qualifiedName, argType, returnType);
 }
diff --git a/json_serializable/lib/src/type_helpers/big_int_helper.dart b/json_serializable/lib/src/type_helpers/big_int_helper.dart
index 935c75b77..b2634730f 100644
--- a/json_serializable/lib/src/type_helpers/big_int_helper.dart
+++ b/json_serializable/lib/src/type_helpers/big_int_helper.dart
@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/element/type.dart';
 import 'package:source_helper/source_helper.dart';
 
+import '../default_container.dart';
 import '../type_helper.dart';
 import 'to_from_string.dart';
 
@@ -17,23 +18,18 @@ class BigIntHelper extends TypeHelper {
     String expression,
     TypeHelperContext context,
   ) =>
-      bigIntString.serialize(
-        targetType,
-        expression,
-        targetType.isNullableType,
-      );
+      bigIntString.serialize(targetType, expression, targetType.isNullableType);
 
   @override
-  String? deserialize(
+  DefaultContainer? deserialize(
     DartType targetType,
     String expression,
     TypeHelperContext context,
     bool defaultProvided,
-  ) =>
-      bigIntString.deserialize(
-        targetType,
-        expression,
-        targetType.isNullableType,
-        false,
-      );
+  ) => bigIntString.deserialize(
+    targetType,
+    expression,
+    targetType.isNullableType,
+    false,
+  );
 }
diff --git a/json_serializable/lib/src/type_helpers/config_types.dart b/json_serializable/lib/src/type_helpers/config_types.dart
index 916894f91..80d258589 100644
--- a/json_serializable/lib/src/type_helpers/config_types.dart
+++ b/json_serializable/lib/src/type_helpers/config_types.dart
@@ -2,6 +2,7 @@
 // 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 'package:analyzer/dart/constant/value.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 /// Represents values from [JsonKey] when merged with local configuration.
@@ -10,22 +11,28 @@ class KeyConfig {
 
   final bool disallowNullValue;
 
-  final bool ignore;
+  final bool? includeFromJson;
 
   final bool includeIfNull;
 
+  final bool? includeToJson;
+
   final String name;
 
   final bool required;
 
   final String? unknownEnumValue;
 
+  final String? readValueFunctionName;
+
   KeyConfig({
     required this.defaultValue,
     required this.disallowNullValue,
-    required this.ignore,
+    required this.includeFromJson,
     required this.includeIfNull,
+    required this.includeToJson,
     required this.name,
+    required this.readValueFunctionName,
     required this.required,
     required this.unknownEnumValue,
   });
@@ -35,41 +42,23 @@ class KeyConfig {
 /// configuration.
 ///
 /// Values are all known, so types are non-nullable.
-class ClassConfig implements JsonSerializable {
-  @override
+class ClassConfig {
   final bool anyMap;
-
-  @override
   final bool checked;
-
-  @override
   final String constructor;
-
-  @override
   final bool createFactory;
-
-  @override
   final bool createToJson;
-
-  @override
+  final bool createFieldMap;
+  final bool createJsonKeys;
+  final bool createPerFieldToJson;
   final bool disallowUnrecognizedKeys;
-
-  @override
   final bool explicitToJson;
-
-  @override
   final FieldRename fieldRename;
-
-  @override
   final bool genericArgumentFactories;
-
-  @override
   final bool ignoreUnannotated;
-
-  @override
   final bool includeIfNull;
-
   final Map<String, String> ctorParamDefaults;
+  final List<DartObject> converters;
 
   const ClassConfig({
     required this.anyMap,
@@ -77,15 +66,51 @@ class ClassConfig implements JsonSerializable {
     required this.constructor,
     required this.createFactory,
     required this.createToJson,
+    required this.createFieldMap,
+    required this.createJsonKeys,
+    required this.createPerFieldToJson,
     required this.disallowUnrecognizedKeys,
     required this.explicitToJson,
     required this.fieldRename,
     required this.genericArgumentFactories,
     required this.ignoreUnannotated,
     required this.includeIfNull,
+    this.converters = const [],
     this.ctorParamDefaults = const {},
   });
 
+  factory ClassConfig.fromJsonSerializable(JsonSerializable config) =>
+      // #CHANGE WHEN UPDATING json_annotation
+      ClassConfig(
+        checked: config.checked ?? ClassConfig.defaults.checked,
+        anyMap: config.anyMap ?? ClassConfig.defaults.anyMap,
+        constructor: config.constructor ?? ClassConfig.defaults.constructor,
+        createFieldMap:
+            config.createFieldMap ?? ClassConfig.defaults.createFieldMap,
+        createJsonKeys:
+            config.createJsonKeys ?? ClassConfig.defaults.createJsonKeys,
+        createPerFieldToJson:
+            config.createPerFieldToJson ??
+            ClassConfig.defaults.createPerFieldToJson,
+        createFactory:
+            config.createFactory ?? ClassConfig.defaults.createFactory,
+        createToJson: config.createToJson ?? ClassConfig.defaults.createToJson,
+        ignoreUnannotated:
+            config.ignoreUnannotated ?? ClassConfig.defaults.ignoreUnannotated,
+        explicitToJson:
+            config.explicitToJson ?? ClassConfig.defaults.explicitToJson,
+        includeIfNull:
+            config.includeIfNull ?? ClassConfig.defaults.includeIfNull,
+        genericArgumentFactories:
+            config.genericArgumentFactories ??
+            ClassConfig.defaults.genericArgumentFactories,
+        fieldRename: config.fieldRename ?? ClassConfig.defaults.fieldRename,
+        disallowUnrecognizedKeys:
+            config.disallowUnrecognizedKeys ??
+            ClassConfig.defaults.disallowUnrecognizedKeys,
+        // TODO typeConverters = []
+      );
+
   /// An instance of [JsonSerializable] with all fields set to their default
   /// values.
   static const defaults = ClassConfig(
@@ -94,6 +119,9 @@ class ClassConfig implements JsonSerializable {
     constructor: '',
     createFactory: true,
     createToJson: true,
+    createFieldMap: false,
+    createJsonKeys: false,
+    createPerFieldToJson: false,
     disallowUnrecognizedKeys: false,
     explicitToJson: false,
     fieldRename: FieldRename.none,
@@ -102,32 +130,21 @@ class ClassConfig implements JsonSerializable {
     includeIfNull: true,
   );
 
-  @override
-  Map<String, dynamic> toJson() => _$JsonSerializableToJson(this);
-
-  @override
-  JsonSerializable withDefaults() => this;
+  JsonSerializable toJsonSerializable() => JsonSerializable(
+    checked: checked,
+    anyMap: anyMap,
+    constructor: constructor,
+    createFactory: createFactory,
+    createToJson: createToJson,
+    createFieldMap: createFieldMap,
+    createJsonKeys: createJsonKeys,
+    createPerFieldToJson: createPerFieldToJson,
+    ignoreUnannotated: ignoreUnannotated,
+    explicitToJson: explicitToJson,
+    includeIfNull: includeIfNull,
+    genericArgumentFactories: genericArgumentFactories,
+    fieldRename: fieldRename,
+    disallowUnrecognizedKeys: disallowUnrecognizedKeys,
+    // TODO typeConverters = []
+  );
 }
-
-const _$FieldRenameEnumMap = {
-  FieldRename.none: 'none',
-  FieldRename.kebab: 'kebab',
-  FieldRename.snake: 'snake',
-  FieldRename.pascal: 'pascal',
-};
-
-// #CHANGE WHEN UPDATING json_annotation
-Map<String, dynamic> _$JsonSerializableToJson(JsonSerializable instance) =>
-    <String, dynamic>{
-      'any_map': instance.anyMap,
-      'checked': instance.checked,
-      'constructor': instance.constructor,
-      'create_factory': instance.createFactory,
-      'create_to_json': instance.createToJson,
-      'disallow_unrecognized_keys': instance.disallowUnrecognizedKeys,
-      'explicit_to_json': instance.explicitToJson,
-      'field_rename': _$FieldRenameEnumMap[instance.fieldRename],
-      'generic_argument_factories': instance.genericArgumentFactories,
-      'ignore_unannotated': instance.ignoreUnannotated,
-      'include_if_null': instance.includeIfNull,
-    };
diff --git a/json_serializable/lib/src/type_helpers/convert_helper.dart b/json_serializable/lib/src/type_helpers/convert_helper.dart
index 051f2cb9b..45e969431 100644
--- a/json_serializable/lib/src/type_helpers/convert_helper.dart
+++ b/json_serializable/lib/src/type_helpers/convert_helper.dart
@@ -6,7 +6,6 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:source_helper/source_helper.dart';
 
 import '../lambda_result.dart';
-import '../shared_checkers.dart';
 import '../type_helper.dart';
 
 /// Information used by [ConvertHelper] when handling `JsonKey`-annotated
@@ -14,8 +13,9 @@ import '../type_helper.dart';
 class ConvertData {
   final String name;
   final DartType paramType;
+  final DartType returnType;
 
-  ConvertData(this.name, this.paramType);
+  ConvertData(this.name, this.paramType, this.returnType);
 }
 
 abstract class TypeHelperContextWithConvert extends TypeHelperContext {
@@ -39,8 +39,10 @@ class ConvertHelper extends TypeHelper<TypeHelperContextWithConvert> {
       return null;
     }
 
-    assert(toJsonData.paramType is TypeParameterType ||
-        targetType.isAssignableTo(toJsonData.paramType));
+    assert(
+      toJsonData.paramType is TypeParameterType ||
+          targetType.isAssignableTo(toJsonData.paramType),
+    );
     return LambdaResult(expression, toJsonData.name);
   }
 
@@ -56,7 +58,10 @@ class ConvertHelper extends TypeHelper<TypeHelperContextWithConvert> {
       return null;
     }
 
-    final asContent = asStatement(fromJsonData.paramType);
-    return LambdaResult(expression, fromJsonData.name, asContent: asContent);
+    return LambdaResult(
+      expression,
+      fromJsonData.name,
+      asContent: fromJsonData.paramType,
+    );
   }
 }
diff --git a/json_serializable/lib/src/type_helpers/date_time_helper.dart b/json_serializable/lib/src/type_helpers/date_time_helper.dart
index d67b4b2e9..64c582057 100644
--- a/json_serializable/lib/src/type_helpers/date_time_helper.dart
+++ b/json_serializable/lib/src/type_helpers/date_time_helper.dart
@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/element/type.dart';
 import 'package:source_helper/source_helper.dart';
 
+import '../default_container.dart';
 import '../type_helper.dart';
 import 'to_from_string.dart';
 
@@ -16,24 +17,22 @@ class DateTimeHelper extends TypeHelper {
     DartType targetType,
     String expression,
     TypeHelperContext context,
-  ) =>
-      dateTimeString.serialize(
-        targetType,
-        expression,
-        targetType.isNullableType,
-      );
+  ) => dateTimeString.serialize(
+    targetType,
+    expression,
+    targetType.isNullableType,
+  );
 
   @override
-  String? deserialize(
+  DefaultContainer? deserialize(
     DartType targetType,
     String expression,
     TypeHelperContext context,
     bool defaultProvided,
-  ) =>
-      dateTimeString.deserialize(
-        targetType,
-        expression,
-        targetType.isNullableType,
-        false,
-      );
+  ) => dateTimeString.deserialize(
+    targetType,
+    expression,
+    targetType.isNullableType,
+    false,
+  );
 }
diff --git a/json_serializable/lib/src/type_helpers/duration_helper.dart b/json_serializable/lib/src/type_helpers/duration_helper.dart
index 2a1c534fa..6cf4d6bdd 100644
--- a/json_serializable/lib/src/type_helpers/duration_helper.dart
+++ b/json_serializable/lib/src/type_helpers/duration_helper.dart
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:source_gen/source_gen.dart' show TypeChecker;
 import 'package:source_helper/source_helper.dart';
 
+import '../default_container.dart';
 import '../type_helper.dart';
 
 class DurationHelper extends TypeHelper {
@@ -33,7 +34,7 @@ class DurationHelper extends TypeHelper {
   }
 
   @override
-  String? deserialize(
+  Object? deserialize(
     DartType targetType,
     String expression,
     TypeHelperContext context,
@@ -43,11 +44,10 @@ class DurationHelper extends TypeHelper {
       return null;
     }
 
-    return commonNullPrefix(
-      targetType.isNullableType,
+    return DefaultContainer(
       expression,
-      'Duration(microseconds: $expression as int)',
-    ).toString();
+      'Duration(microseconds: ($expression as num).toInt())',
+    );
   }
 }
 
diff --git a/json_serializable/lib/src/type_helpers/enum_helper.dart b/json_serializable/lib/src/type_helpers/enum_helper.dart
index 40fb6997c..ce7641fdf 100644
--- a/json_serializable/lib/src/type_helpers/enum_helper.dart
+++ b/json_serializable/lib/src/type_helpers/enum_helper.dart
@@ -29,7 +29,12 @@ class EnumHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
     context.addMember(memberContent);
 
-    return '${constMapName(targetType)}[$expression]';
+    if (targetType.isNullableType ||
+        enumFieldWithNullInEncodeMap(targetType) == true) {
+      return '${constMapName(targetType)}[$expression]';
+    } else {
+      return '${constMapName(targetType)}[$expression]!';
+    }
   }
 
   @override
diff --git a/json_serializable/lib/src/type_helpers/generic_factory_helper.dart b/json_serializable/lib/src/type_helpers/generic_factory_helper.dart
index 3b807550c..5d2900998 100644
--- a/json_serializable/lib/src/type_helpers/generic_factory_helper.dart
+++ b/json_serializable/lib/src/type_helpers/generic_factory_helper.dart
@@ -7,6 +7,7 @@ import 'package:source_helper/source_helper.dart';
 
 import '../lambda_result.dart';
 import '../type_helper.dart';
+import '../utils.dart';
 
 class GenericFactoryHelper extends TypeHelper<TypeHelperContextWithConfig> {
   const GenericFactoryHelper();
@@ -56,7 +57,8 @@ class GenericFactoryHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
 const _fromJsonHelperName = r'_$nullableGenericFromJson';
 
-const _fromJsonHelper = '''
+const _fromJsonHelper =
+    '''
 T? $_fromJsonHelperName<T>(
   Object? input,
   T Function(Object? json) fromJson,
@@ -66,7 +68,8 @@ T? $_fromJsonHelperName<T>(
 
 const _toJsonHelperName = r'_$nullableGenericToJson';
 
-const _toJsonHelper = '''
+const _toJsonHelper =
+    '''
 Object? $_toJsonHelperName<T>(
   T? input,
   Object? Function(T value) toJson,
@@ -75,11 +78,11 @@ Object? $_toJsonHelperName<T>(
 ''';
 
 String toJsonForType(TypeParameterType type) =>
-    toJsonForName(type.getDisplayString(withNullability: false));
+    toJsonForName(type.toStringNonNullable());
 
 String toJsonForName(String genericType) => 'toJson$genericType';
 
 String fromJsonForType(TypeParameterType type) =>
-    fromJsonForName(type.getDisplayString(withNullability: false));
+    fromJsonForName(type.toStringNonNullable());
 
 String fromJsonForName(String genericType) => 'fromJson$genericType';
diff --git a/json_serializable/lib/src/type_helpers/json_converter_helper.dart b/json_serializable/lib/src/type_helpers/json_converter_helper.dart
index 8c0df9f3a..dc8a5c2ac 100644
--- a/json_serializable/lib/src/type_helpers/json_converter_helper.dart
+++ b/json_serializable/lib/src/type_helpers/json_converter_helper.dart
@@ -3,28 +3,26 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:collection/collection.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:source_helper/source_helper.dart';
 
 import '../lambda_result.dart';
-import '../shared_checkers.dart';
 import '../type_helper.dart';
 import '../utils.dart';
 
 /// A [TypeHelper] that supports classes annotated with implementations of
 /// [JsonConverter].
-class JsonConverterHelper extends TypeHelper {
+class JsonConverterHelper extends TypeHelper<TypeHelperContextWithConfig> {
   const JsonConverterHelper();
 
   @override
   Object? serialize(
     DartType targetType,
     String expression,
-    TypeHelperContext context,
+    TypeHelperContextWithConfig context,
   ) {
     final converter = _typeConverter(targetType, context);
 
@@ -32,6 +30,24 @@ class JsonConverterHelper extends TypeHelper {
       return null;
     }
 
+    if (!converter.fieldType.isNullableType && targetType.isNullableType) {
+      const converterToJsonName = r'_$JsonConverterToJson';
+      context.addMember('''
+Json? $converterToJsonName<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => ${ifNullOrElse('value', 'null', 'toJson(value)')};
+''');
+
+      return _nullableJsonConverterLambdaResult(
+        converter,
+        name: converterToJsonName,
+        targetType: targetType,
+        expression: expression,
+        callback: '${converter.accessString}.toJson',
+      );
+    }
+
     return LambdaResult(expression, '${converter.accessString}.toJson');
   }
 
@@ -39,7 +55,7 @@ class JsonConverterHelper extends TypeHelper {
   Object? deserialize(
     DartType targetType,
     String expression,
-    TypeHelperContext context,
+    TypeHelperContextWithConfig context,
     bool defaultProvided,
   ) {
     final converter = _typeConverter(targetType, context);
@@ -47,53 +63,134 @@ class JsonConverterHelper extends TypeHelper {
       return null;
     }
 
-    final asContent = asStatement(converter.jsonType);
+    if (!converter.jsonType.isNullableType && targetType.isNullableType) {
+      const converterFromJsonName = r'_$JsonConverterFromJson';
+      context.addMember('''
+Value? $converterFromJsonName<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => ${ifNullOrElse('json', 'null', 'fromJson(json as Json)')};
+''');
+
+      return _nullableJsonConverterLambdaResult(
+        converter,
+        name: converterFromJsonName,
+        targetType: targetType,
+        expression: expression,
+        callback: '${converter.accessString}.fromJson',
+      );
+    }
 
     return LambdaResult(
       expression,
       '${converter.accessString}.fromJson',
-      asContent: asContent,
+      asContent: converter.jsonType,
     );
   }
 }
 
+String _nullableJsonConverterLambdaResult(
+  _JsonConvertData converter, {
+  required String name,
+  required DartType targetType,
+  required String expression,
+  required String callback,
+}) {
+  final jsonDisplayString = typeToCode(converter.jsonType);
+  final fieldTypeDisplayString = converter.isGeneric
+      ? typeToCode(targetType)
+      : typeToCode(converter.fieldType);
+
+  return '$name<$jsonDisplayString, $fieldTypeDisplayString>('
+      '$expression, $callback)';
+}
+
 class _JsonConvertData {
   final String accessString;
   final DartType jsonType;
+  final DartType fieldType;
+  final bool isGeneric;
 
   _JsonConvertData.className(
     String className,
     String accessor,
     this.jsonType,
-  ) : accessString = 'const $className${_withAccessor(accessor)}()';
+    this.fieldType,
+  ) : accessString = 'const $className${_withAccessor(accessor)}()',
+      isGeneric = false;
 
   _JsonConvertData.genericClass(
     String className,
     String genericTypeArg,
     String accessor,
     this.jsonType,
-  ) : accessString = '$className<$genericTypeArg>${_withAccessor(accessor)}()';
+    this.fieldType,
+  ) : accessString = '$className<$genericTypeArg>${_withAccessor(accessor)}()',
+      isGeneric = true;
 
-  _JsonConvertData.propertyAccess(this.accessString, this.jsonType);
+  _JsonConvertData.propertyAccess(
+    this.accessString,
+    this.jsonType,
+    this.fieldType,
+  ) : isGeneric = false;
 
   static String _withAccessor(String accessor) =>
       accessor.isEmpty ? '' : '.$accessor';
 }
 
-_JsonConvertData? _typeConverter(DartType targetType, TypeHelperContext ctx) {
+/// If there is no converter for the params, return `null`.
+///
+/// Otherwise, returns `true` if the converter has a null return value.
+///
+/// Used to make sure we create a smart encoding function.
+bool? hasConverterNullEncode(
+  DartType targetType,
+  TypeHelperContextWithConfig ctx,
+) {
+  final data = _typeConverter(targetType, ctx);
+
+  if (data == null) {
+    return null;
+  }
+
+  return data.jsonType.isNullableType;
+}
+
+_JsonConvertData? _typeConverter(
+  DartType targetType,
+  TypeHelperContextWithConfig ctx,
+) {
   List<_ConverterMatch> converterMatches(List<ElementAnnotation> items) => items
-      .map((annotation) => _compatibleMatch(targetType, annotation))
+      .map(
+        (annotation) => _compatibleMatch(
+          targetType,
+          annotation,
+          annotation.computeConstantValue()!,
+        ),
+      )
       .whereType<_ConverterMatch>()
       .toList();
 
-  var matchingAnnotations = converterMatches(ctx.fieldElement.metadata);
+  var matchingAnnotations = converterMatches(
+    ctx.fieldElement.getter2?.metadata2.annotations ?? [],
+  );
 
   if (matchingAnnotations.isEmpty) {
-    matchingAnnotations =
-        converterMatches(ctx.fieldElement.getter?.metadata ?? []);
+    matchingAnnotations = converterMatches(
+      ctx.fieldElement.metadata2.annotations,
+    );
 
     if (matchingAnnotations.isEmpty) {
-      matchingAnnotations = converterMatches(ctx.classElement.metadata);
+      matchingAnnotations = converterMatches(
+        ctx.classElement.metadata2.annotations,
+      );
+
+      if (matchingAnnotations.isEmpty) {
+        matchingAnnotations = ctx.config.converters
+            .map((e) => _compatibleMatch(targetType, null, e))
+            .whereType<_ConverterMatch>()
+            .toList();
+      }
     }
   }
 
@@ -111,23 +208,28 @@ _JsonConvertData? _typeConverterFrom(
   if (matchingAnnotations.length > 1) {
     final targetTypeCode = typeToCode(targetType);
     throw InvalidGenerationSourceError(
-        'Found more than one matching converter for `$targetTypeCode`.',
-        element: matchingAnnotations[1].elementAnnotation.element);
+      'Found more than one matching converter for `$targetTypeCode`.',
+      element: matchingAnnotations[1].elementAnnotation?.element2,
+    );
   }
 
   final match = matchingAnnotations.single;
 
-  final annotationElement = match.elementAnnotation.element;
-  if (annotationElement is PropertyAccessorElement) {
-    final enclosing = annotationElement.enclosingElement;
+  final annotationElement = match.elementAnnotation?.element2;
+  if (annotationElement is PropertyAccessorElement2) {
+    final enclosing = annotationElement.enclosingElement2;
 
-    var accessString = annotationElement.name;
+    var accessString = annotationElement.name3!;
 
-    if (enclosing is ClassElement) {
-      accessString = '${enclosing.name}.$accessString';
+    if (enclosing is ClassElement2) {
+      accessString = '${enclosing.name3}.$accessString';
     }
 
-    return _JsonConvertData.propertyAccess(accessString, match.jsonType);
+    return _JsonConvertData.propertyAccess(
+      accessString,
+      match.jsonType,
+      match.fieldType,
+    );
   }
 
   final reviver = ConstantReader(match.annotation).revive();
@@ -135,8 +237,9 @@ _JsonConvertData? _typeConverterFrom(
   if (reviver.namedArguments.isNotEmpty ||
       reviver.positionalArguments.isNotEmpty) {
     throw InvalidGenerationSourceError(
-        'Generators with constructor arguments are not supported.',
-        element: match.elementAnnotation.element);
+      'Generators with constructor arguments are not supported.',
+      element: match.elementAnnotation?.element2,
+    );
   }
 
   if (match.genericTypeArg != null) {
@@ -145,6 +248,7 @@ _JsonConvertData? _typeConverterFrom(
       match.genericTypeArg!,
       reviver.accessor,
       match.jsonType,
+      match.fieldType,
     );
   }
 
@@ -152,13 +256,15 @@ _JsonConvertData? _typeConverterFrom(
     match.annotation.type!.element!.name!,
     reviver.accessor,
     match.jsonType,
+    match.fieldType,
   );
 }
 
 class _ConverterMatch {
   final DartObject annotation;
+  final DartType fieldType;
   final DartType jsonType;
-  final ElementAnnotation elementAnnotation;
+  final ElementAnnotation? elementAnnotation;
   final String? genericTypeArg;
 
   _ConverterMatch(
@@ -166,21 +272,20 @@ class _ConverterMatch {
     this.annotation,
     this.jsonType,
     this.genericTypeArg,
+    this.fieldType,
   );
 }
 
 _ConverterMatch? _compatibleMatch(
   DartType targetType,
-  ElementAnnotation annotation,
+  ElementAnnotation? annotation,
+  DartObject constantValue,
 ) {
-  final constantValue = annotation.computeConstantValue()!;
-
-  final converterClassElement = constantValue.type!.element as ClassElement;
+  final converterClassElement = constantValue.type!.element3 as ClassElement2;
 
-  final jsonConverterSuper =
-      converterClassElement.allSupertypes.singleWhereOrNull(
-    (e) => _jsonConverterChecker.isExactly(e.element),
-  );
+  final jsonConverterSuper = converterClassElement.allSupertypes
+      .where((e) => _jsonConverterChecker.isExactly(e.element3))
+      .singleOrNull;
 
   if (jsonConverterSuper == null) {
     return null;
@@ -191,20 +296,27 @@ _ConverterMatch? _compatibleMatch(
 
   final fieldType = jsonConverterSuper.typeArguments[0];
 
-  if (fieldType == targetType) {
+  // Allow assigning T to T?
+  if (fieldType == targetType || fieldType == targetType.promoteNonNullable()) {
     return _ConverterMatch(
-        annotation, constantValue, jsonConverterSuper.typeArguments[1], null);
+      annotation,
+      constantValue,
+      jsonConverterSuper.typeArguments[1],
+      null,
+      fieldType,
+    );
   }
 
   if (fieldType is TypeParameterType && targetType is TypeParameterType) {
-    assert(annotation.element is! PropertyAccessorElement);
-    assert(converterClassElement.typeParameters.isNotEmpty);
-    if (converterClassElement.typeParameters.length > 1) {
+    assert(annotation?.element is! PropertyAccessorElement2);
+    assert(converterClassElement.typeParameters2.isNotEmpty);
+    if (converterClassElement.typeParameters2.length > 1) {
       throw InvalidGenerationSourceError(
-          '`JsonConverter` implementations can have no more than one type '
-          'argument. `${converterClassElement.name}` has '
-          '${converterClassElement.typeParameters.length}.',
-          element: converterClassElement);
+        '`JsonConverter` implementations can have no more than one type '
+        'argument. `${converterClassElement.name3}` has '
+        '${converterClassElement.typeParameters2.length}.',
+        element: converterClassElement,
+      );
     }
 
     return _ConverterMatch(
@@ -212,6 +324,7 @@ _ConverterMatch? _compatibleMatch(
       constantValue,
       jsonConverterSuper.typeArguments[1],
       '${targetType.element.name}${targetType.isNullableType ? '?' : ''}',
+      fieldType,
     );
   }
 
diff --git a/json_serializable/lib/src/type_helpers/json_helper.dart b/json_serializable/lib/src/type_helpers/json_helper.dart
index e61ed9f90..4b9b2621b 100644
--- a/json_serializable/lib/src/type_helpers/json_helper.dart
+++ b/json_serializable/lib/src/type_helpers/json_helper.dart
@@ -2,15 +2,15 @@
 // 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 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/nullability_suffix.dart';
+// import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:collection/collection.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:source_helper/source_helper.dart';
 
 import '../default_container.dart';
+import '../lambda_result.dart';
 import '../type_helper.dart';
 import '../utils.dart';
 import 'config_types.dart';
@@ -43,16 +43,18 @@ class JsonHelper extends TypeHelper<TypeHelperContextWithConfig> {
     var toJson = _toJsonMethod(interfaceType);
 
     if (toJson != null) {
-      // Using the `declaration` here so we get the original definition –
+      // Using the `baseElement` here so we get the original definition –
       // and not one with the generics already populated.
-      toJson = toJson.declaration;
+      toJson = toJson.baseElement;
 
       toJsonArgs.addAll(
         _helperParams(
           context.serialize,
           _encodeHelper,
           interfaceType,
-          toJson.parameters.where((element) => element.isRequiredPositional),
+          toJson.formalParameters.where(
+            (element) => element.isRequiredPositional,
+          ),
           toJson,
         ),
       );
@@ -76,14 +78,15 @@ class JsonHelper extends TypeHelper<TypeHelperContextWithConfig> {
       return null;
     }
 
-    final classElement = targetType.element;
+    final classElement = targetType.element3;
 
-    final fromJsonCtor = classElement.constructors
-        .singleWhereOrNull((ce) => ce.name == 'fromJson');
+    final fromJsonCtor = classElement.constructors2
+        .where((ce) => ce.name3 == 'fromJson')
+        .singleOrNull;
 
     var output = expression;
     if (fromJsonCtor != null) {
-      final positionalParams = fromJsonCtor.parameters
+      final positionalParams = fromJsonCtor.formalParameters
           .where((element) => element.isPositional)
           .toList();
 
@@ -130,18 +133,21 @@ class JsonHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
     // TODO: the type could be imported from a library with a prefix!
     // https://github.com/google/json_serializable.dart/issues/19
-    output = '${typeToCode(targetType.promoteNonNullable())}.fromJson($output)';
+    final lambda = LambdaResult(
+      output,
+      '${typeToCode(targetType.promoteNonNullable())}.fromJson',
+    );
 
-    return DefaultContainer(expression, output);
+    return DefaultContainer(expression, lambda);
   }
 }
 
 List<String> _helperParams(
   Object? Function(DartType, String) execute,
-  TypeParameterType Function(ParameterElement, Element) paramMapper,
+  TypeParameterType Function(FormalParameterElement, Element2) paramMapper,
   InterfaceType type,
-  Iterable<ParameterElement> positionalParams,
-  Element targetElement,
+  Iterable<FormalParameterElement> positionalParams,
+  Element2 targetElement,
 ) {
   final rest = <TypeParameterType>[];
   for (var param in positionalParams) {
@@ -151,8 +157,9 @@ List<String> _helperParams(
   final args = <String>[];
 
   for (var helperArg in rest) {
-    final typeParamIndex =
-        type.element.typeParameters.indexOf(helperArg.element);
+    final typeParamIndex = type.element.typeParameters.indexOf(
+      helperArg.element,
+    );
 
     // TODO: throw here if `typeParamIndex` is -1 ?
     final typeArg = type.typeArguments[typeParamIndex];
@@ -164,8 +171,8 @@ List<String> _helperParams(
 }
 
 TypeParameterType _decodeHelper(
-  ParameterElement param,
-  Element targetElement,
+  FormalParameterElement param,
+  Element2 targetElement,
 ) {
   final type = param.type;
 
@@ -174,11 +181,11 @@ TypeParameterType _decodeHelper(
       type.normalParameterTypes.length == 1) {
     final funcReturnType = type.returnType;
 
-    if (param.name == fromJsonForName(funcReturnType.element!.name!)) {
+    if (param.name3 == fromJsonForName(funcReturnType.element!.name!)) {
       final funcParamType = type.normalParameterTypes.single;
 
       if ((funcParamType.isDartCoreObject && funcParamType.isNullableType) ||
-          funcParamType.isDynamic) {
+          funcParamType is DynamicType) {
         return funcReturnType as TypeParameterType;
       }
     }
@@ -195,17 +202,17 @@ TypeParameterType _decodeHelper(
 }
 
 TypeParameterType _encodeHelper(
-  ParameterElement param,
-  Element targetElement,
+  FormalParameterElement param,
+  Element2 targetElement,
 ) {
   final type = param.type;
 
   if (type is FunctionType &&
-      (type.returnType.isDartCoreObject || type.returnType.isDynamic) &&
+      (type.returnType.isDartCoreObject || type.returnType is DynamicType) &&
       type.normalParameterTypes.length == 1) {
     final funcParamType = type.normalParameterTypes.single;
 
-    if (param.name == toJsonForName(funcParamType.element!.name!)) {
+    if (param.name3 == toJsonForName(funcParamType.element!.name!)) {
       if (funcParamType is TypeParameterType) {
         return funcParamType;
       }
@@ -246,8 +253,9 @@ InterfaceType? _instantiate(
 ) {
   final argTypes = ctorParamType.typeArguments.map((arg) {
     final typeParamIndex = classType.element.typeParameters.indexWhere(
-        // TODO: not 100% sure `nullabilitySuffix` is right
-        (e) => e.instantiate(nullabilitySuffix: arg.nullabilitySuffix) == arg);
+      // TODO: not 100% sure `nullabilitySuffix` is right
+      (e) => e.instantiate(nullabilitySuffix: arg.nullabilitySuffix) == arg,
+    );
     if (typeParamIndex >= 0) {
       return classType.typeArguments[typeParamIndex];
     } else {
@@ -263,8 +271,7 @@ InterfaceType? _instantiate(
 
   return ctorParamType.element.instantiate(
     typeArguments: argTypes.cast<DartType>(),
-    // TODO: not 100% sure nullabilitySuffix is right... Works for now
-    nullabilitySuffix: NullabilitySuffix.none,
+    nullabilitySuffix: ctorParamType.nullabilitySuffix,
   );
 }
 
@@ -272,9 +279,9 @@ ClassConfig? _annotation(ClassConfig config, InterfaceType source) {
   if (source.isEnum) {
     return null;
   }
-  final annotations = const TypeChecker.fromRuntime(JsonSerializable)
-      .annotationsOfExact(source.element, throwOnUnresolved: false)
-      .toList();
+  final annotations = const TypeChecker.fromRuntime(
+    JsonSerializable,
+  ).annotationsOfExact(source.element3, throwOnUnresolved: false).toList();
 
   if (annotations.isEmpty) {
     return null;
@@ -283,10 +290,11 @@ ClassConfig? _annotation(ClassConfig config, InterfaceType source) {
   return mergeConfig(
     config,
     ConstantReader(annotations.single),
-    classElement: source.element,
+    classElement: source.element3 as ClassElement2,
   );
 }
 
-MethodElement? _toJsonMethod(DartType type) => type.typeImplementations
-    .map((dt) => dt is InterfaceType ? dt.getMethod('toJson') : null)
-    .firstWhereOrNull((me) => me != null);
+MethodElement2? _toJsonMethod(DartType type) => type.typeImplementations
+    .map((dt) => dt is InterfaceType ? dt.getMethod2('toJson') : null)
+    .where((me) => me != null)
+    .firstOrNull;
diff --git a/json_serializable/lib/src/type_helpers/map_helper.dart b/json_serializable/lib/src/type_helpers/map_helper.dart
index 8bff25263..9792faed0 100644
--- a/json_serializable/lib/src/type_helpers/map_helper.dart
+++ b/json_serializable/lib/src/type_helpers/map_helper.dart
@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/type.dart';
-import 'package:collection/collection.dart';
 import 'package:source_helper/source_helper.dart';
 
 import '../constants.dart';
@@ -37,7 +36,7 @@ class MapHelper extends TypeHelper<TypeHelperContextWithConfig> {
     final subFieldValue = context.serialize(valueType, closureArg);
     final subKeyValue =
         _forType(keyType)?.serialize(keyType, _keyParam, false) ??
-            context.serialize(keyType, _keyParam);
+        context.serialize(keyType, _keyParam);
 
     if (closureArg == subFieldValue && _keyParam == subKeyValue) {
       return expression;
@@ -68,7 +67,8 @@ class MapHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
     _checkSafeKeyType(expression, keyArg);
 
-    final valueArgIsAny = valueArg.isDynamic ||
+    final valueArgIsAny =
+        valueArg is DynamicType ||
         (valueArg.isDartCoreObject && valueArg.isNullableType);
     final isKeyStringable = _isKeyStringable(keyArg);
 
@@ -94,7 +94,7 @@ class MapHelper extends TypeHelper<TypeHelperContextWithConfig> {
               // `toDouble` on input values
               valueArg.isSimpleJsonTypeNotDouble)) {
         // No mapping of the values or null check required!
-        final valueString = valueArg.getDisplayString(withNullability: true);
+        final valueString = valueArg.getDisplayString();
         return 'Map<String, $valueString>.from($expression as Map)';
       }
     }
@@ -114,7 +114,7 @@ class MapHelper extends TypeHelper<TypeHelperContextWithConfig> {
     if (keyArg.isEnum) {
       keyUsage = context.deserialize(keyArg, _keyParam).toString();
     } else if (context.config.anyMap &&
-        !(keyArg.isDartCoreObject || keyArg.isDynamic)) {
+        !(keyArg.isDartCoreObject || keyArg is DynamicType)) {
       keyUsage = '$_keyParam as String';
     } else if (context.config.anyMap &&
         keyArg.isDartCoreObject &&
@@ -126,7 +126,9 @@ class MapHelper extends TypeHelper<TypeHelperContextWithConfig> {
 
     final toFromString = _forType(keyArg);
     if (toFromString != null) {
-      keyUsage = toFromString.deserialize(keyArg, keyUsage, false, true)!;
+      keyUsage = toFromString
+          .deserialize(keyArg, keyUsage, false, true)
+          .toString();
     }
 
     return '($expression $mapCast)$optionalQuestion.map( '
@@ -138,15 +140,10 @@ final _intString = ToFromStringHelper('int.parse', 'toString()', 'int');
 
 /// [ToFromStringHelper] instances representing non-String types that can
 /// be used as [Map] keys.
-final _instances = [
-  bigIntString,
-  dateTimeString,
-  _intString,
-  uriString,
-];
+final _instances = [bigIntString, dateTimeString, _intString, uriString];
 
 ToFromStringHelper? _forType(DartType type) =>
-    _instances.singleWhereOrNull((i) => i.matches(type));
+    _instances.where((i) => i.matches(type)).singleOrNull;
 
 /// Returns `true` if [keyType] can be automatically converted to/from String –
 /// and is therefor usable as a key in a [Map].
@@ -156,7 +153,7 @@ bool _isKeyStringable(DartType keyType) =>
 void _checkSafeKeyType(String expression, DartType keyArg) {
   // We're not going to handle converting key types at the moment
   // So the only safe types for key are dynamic/Object/String/enum
-  if (keyArg.isDynamic ||
+  if (keyArg is DynamicType ||
       (!keyArg.isNullableType &&
           (keyArg.isDartCoreObject ||
               coreStringTypeChecker.isExactlyType(keyArg) ||
@@ -167,7 +164,7 @@ void _checkSafeKeyType(String expression, DartType keyArg) {
   throw UnsupportedTypeError(
     keyArg,
     expression,
-    'Map keys must be one of: ${_allowedTypeNames.join(', ')}.',
+    'Map keys must be one of: ${allowedMapKeyTypes.join(', ')}.',
   );
 }
 
@@ -175,12 +172,13 @@ void _checkSafeKeyType(String expression, DartType keyArg) {
 ///
 /// Used in [_checkSafeKeyType] to provide a helpful error with unsupported
 /// types.
-Iterable<String> get _allowedTypeNames => const [
-      'Object',
-      'dynamic',
-      'enum',
-      'String',
-    ].followedBy(_instances.map((i) => i.coreTypeName));
+List<String> get allowedMapKeyTypes => [
+  'Object',
+  'dynamic',
+  'enum',
+  'String',
+  ..._instances.map((i) => i.coreTypeName),
+];
 
 extension on DartType {
   bool get isSimpleJsonTypeNotDouble =>
diff --git a/json_serializable/lib/src/type_helpers/record_helper.dart b/json_serializable/lib/src/type_helpers/record_helper.dart
new file mode 100644
index 000000000..8d0fab4df
--- /dev/null
+++ b/json_serializable/lib/src/type_helpers/record_helper.dart
@@ -0,0 +1,119 @@
+import 'package:analyzer/dart/element/type.dart';
+import 'package:source_helper/source_helper.dart';
+
+import '../type_helper.dart';
+import '../utils.dart';
+
+class RecordHelper extends TypeHelper<TypeHelperContextWithConfig> {
+  const RecordHelper();
+
+  @override
+  Object? deserialize(
+    DartType targetType,
+    String expression,
+    TypeHelperContextWithConfig context,
+    bool defaultProvided,
+  ) {
+    if (targetType is! RecordType) return null;
+
+    final items = <Object>[];
+
+    const paramName = r'$jsonValue';
+
+    var index = 1;
+    for (var field in targetType.positionalFields) {
+      final indexer = escapeDartString('\$$index');
+      items.add(context.deserialize(field.type, '$paramName[$indexer]')!);
+      index++;
+    }
+    for (var field in targetType.namedFields) {
+      final indexer = escapeDartString(field.name);
+      items.add(
+        '${field.name}:'
+        '${context.deserialize(field.type, '$paramName[$indexer]')!}',
+      );
+    }
+
+    if (items.isEmpty) {
+      return '()';
+    }
+
+    context.addMember(
+      _recordConvertImpl(
+        nullable: targetType.isNullableType,
+        anyMap: context.config.anyMap,
+      ),
+    );
+
+    final recordLiteral = '(${items.map((e) => '$e,').join()})';
+
+    final helperName = _recordConvertName(
+      nullable: targetType.isNullableType,
+      anyMap: context.config.anyMap,
+    );
+
+    return '''
+$helperName(
+  $expression,
+  ($paramName) => $recordLiteral,
+)''';
+  }
+
+  @override
+  Object? serialize(
+    DartType targetType,
+    String expression,
+    TypeHelperContextWithConfig context,
+  ) {
+    if (targetType is! RecordType) return null;
+
+    final maybeBang = targetType.isNullableType ? '!' : '';
+
+    final items = <Object>[];
+
+    var index = 1;
+    for (var field in targetType.positionalFields) {
+      final indexer = escapeDartString('\$$index');
+      items.add(
+        '$indexer:'
+        '${context.serialize(field.type, '$expression$maybeBang.\$$index')!}',
+      );
+      index++;
+    }
+    for (var field in targetType.namedFields) {
+      final indexer = escapeDartString(field.name);
+      final key = context.serialize(
+        field.type,
+        '$expression$maybeBang.${field.name}',
+      )!;
+      items.add('$indexer:$key');
+    }
+
+    final mapValue = '<String, dynamic>{${items.map((e) => '$e,').join()}}';
+
+    return targetType.isNullableType
+        ? ifNullOrElse(expression, 'null', mapValue)
+        : mapValue;
+  }
+}
+
+String _recordConvertName({required bool nullable, required bool anyMap}) =>
+    '_\$recordConvert${anyMap ? 'Any' : ''}${nullable ? 'Nullable' : ''}';
+
+String _recordConvertImpl({required bool nullable, required bool anyMap}) {
+  final name = _recordConvertName(nullable: nullable, anyMap: anyMap);
+
+  var expression =
+      'convert(value as ${anyMap ? 'Map' : 'Map<String, dynamic>'})';
+  if (nullable) {
+    expression = ifNullOrElse('value', 'null', expression);
+  }
+
+  return '''
+\$Rec${nullable ? '?' : ''} $name<\$Rec>(
+  Object? value,
+  \$Rec Function(Map) convert,
+) =>
+  $expression;
+''';
+}
diff --git a/json_serializable/lib/src/type_helpers/to_from_string.dart b/json_serializable/lib/src/type_helpers/to_from_string.dart
index 55f8aae7e..cb9a30d71 100644
--- a/json_serializable/lib/src/type_helpers/to_from_string.dart
+++ b/json_serializable/lib/src/type_helpers/to_from_string.dart
@@ -5,13 +5,9 @@
 import 'package:analyzer/dart/element/type.dart';
 import 'package:source_gen/source_gen.dart';
 
-import '../type_helper.dart';
+import '../default_container.dart';
 
-final bigIntString = ToFromStringHelper(
-  'BigInt.parse',
-  'toString()',
-  'BigInt',
-);
+final bigIntString = ToFromStringHelper('BigInt.parse', 'toString()', 'BigInt');
 
 final dateTimeString = ToFromStringHelper(
   'DateTime.parse',
@@ -19,11 +15,7 @@ final dateTimeString = ToFromStringHelper(
   'DateTime',
 );
 
-final uriString = ToFromStringHelper(
-  'Uri.parse',
-  'toString()',
-  'Uri',
-);
+final uriString = ToFromStringHelper('Uri.parse', 'toString()', 'Uri');
 
 /// Package-internal helper that unifies implementations of [Type]s that convert
 /// trivially to-from [String].
@@ -44,15 +36,11 @@ class ToFromStringHelper {
   final TypeChecker _checker;
 
   ToFromStringHelper(this._parse, this._toString, this.coreTypeName)
-      : _checker = TypeChecker.fromUrl('dart:core#$coreTypeName');
+    : _checker = TypeChecker.fromUrl('dart:core#$coreTypeName');
 
   bool matches(DartType type) => _checker.isExactlyType(type);
 
-  String? serialize(
-    DartType type,
-    String expression,
-    bool nullable,
-  ) {
+  String? serialize(DartType type, String expression, bool nullable) {
     if (!matches(type)) {
       return null;
     }
@@ -64,7 +52,7 @@ class ToFromStringHelper {
     return '$expression.$_toString';
   }
 
-  String? deserialize(
+  DefaultContainer? deserialize(
     DartType type,
     String expression,
     bool nullable,
@@ -76,7 +64,8 @@ class ToFromStringHelper {
 
     final parseParam = isString ? expression : '$expression as String';
 
-    return commonNullPrefix(nullable, expression, '$_parse($parseParam)')
-        .toString();
+    final output = '$_parse($parseParam)';
+
+    return DefaultContainer(expression, output);
   }
 }
diff --git a/json_serializable/lib/src/type_helpers/uri_helper.dart b/json_serializable/lib/src/type_helpers/uri_helper.dart
index cea9e285e..6c482f21e 100644
--- a/json_serializable/lib/src/type_helpers/uri_helper.dart
+++ b/json_serializable/lib/src/type_helpers/uri_helper.dart
@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/element/type.dart';
 import 'package:source_helper/source_helper.dart';
 
+import '../default_container.dart';
 import '../type_helper.dart';
 import 'to_from_string.dart';
 
@@ -16,20 +17,18 @@ class UriHelper extends TypeHelper {
     DartType targetType,
     String expression,
     TypeHelperContext context,
-  ) =>
-      uriString.serialize(
-        targetType,
-        expression,
-        targetType.isNullableType,
-      );
+  ) => uriString.serialize(targetType, expression, targetType.isNullableType);
 
   @override
-  String? deserialize(
+  DefaultContainer? deserialize(
     DartType targetType,
     String expression,
     TypeHelperContext context,
     bool defaultProvided,
-  ) =>
-      uriString.deserialize(
-          targetType, expression, targetType.isNullableType, false);
+  ) => uriString.deserialize(
+    targetType,
+    expression,
+    targetType.isNullableType,
+    false,
+  );
 }
diff --git a/json_serializable/lib/src/type_helpers/value_helper.dart b/json_serializable/lib/src/type_helpers/value_helper.dart
index f87e6cd03..0ed4d1923 100644
--- a/json_serializable/lib/src/type_helpers/value_helper.dart
+++ b/json_serializable/lib/src/type_helpers/value_helper.dart
@@ -3,12 +3,13 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/type.dart';
-import 'package:source_helper/source_helper.dart';
 
 import '../shared_checkers.dart';
 import '../type_helper.dart';
 import '../utils.dart';
 
+/// Handles the types corresponding to [simpleJsonTypeChecker], namely
+/// [String], [bool], [num], [int], [double].
 class ValueHelper extends TypeHelper {
   const ValueHelper();
 
@@ -19,7 +20,7 @@ class ValueHelper extends TypeHelper {
     TypeHelperContext context,
   ) {
     if (targetType.isDartCoreObject ||
-        targetType.isDynamic ||
+        targetType is DynamicType ||
         simpleJsonTypeChecker.isAssignableFromType(targetType)) {
       return expression;
     }
@@ -33,22 +34,9 @@ class ValueHelper extends TypeHelper {
     String expression,
     TypeHelperContext context,
     bool defaultProvided,
-  ) {
-    if (targetType.isDartCoreObject && !targetType.isNullableType) {
-      final question = defaultProvided ? '?' : '';
-      return '$expression as Object$question';
-    } else if (targetType.isDartCoreObject || targetType.isDynamic) {
-      // just return it as-is. We'll hope it's safe.
-      return expression;
-    } else if (targetType.isDartCoreDouble) {
-      final targetTypeNullable = defaultProvided || targetType.isNullableType;
-      final question = targetTypeNullable ? '?' : '';
-      return '($expression as num$question)$question.toDouble()';
-    } else if (simpleJsonTypeChecker.isAssignableFromType(targetType)) {
-      final typeCode = typeToCode(targetType, forceNullable: defaultProvided);
-      return '$expression as $typeCode';
-    }
-
-    return null;
-  }
+  ) => defaultDecodeLogic(
+    targetType,
+    expression,
+    defaultProvided: defaultProvided,
+  );
 }
diff --git a/json_serializable/lib/src/utils.dart b/json_serializable/lib/src/utils.dart
index 5614709ec..42dffb9bf 100644
--- a/json_serializable/lib/src/utils.dart
+++ b/json_serializable/lib/src/utils.dart
@@ -4,69 +4,71 @@
 
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:source_helper/source_helper.dart';
 
+import 'shared_checkers.dart';
 import 'type_helpers/config_types.dart';
 
 const _jsonKeyChecker = TypeChecker.fromRuntime(JsonKey);
 
-DartObject? _jsonKeyAnnotation(FieldElement element) =>
+DartObject? _jsonKeyAnnotation(FieldElement2 element) =>
     _jsonKeyChecker.firstAnnotationOf(element) ??
-    (element.getter == null
+    (element.getter2 == null
         ? null
-        : _jsonKeyChecker.firstAnnotationOf(element.getter!));
+        : _jsonKeyChecker.firstAnnotationOf(element.getter2!));
 
-ConstantReader jsonKeyAnnotation(FieldElement element) =>
+ConstantReader jsonKeyAnnotation(FieldElement2 element) =>
     ConstantReader(_jsonKeyAnnotation(element));
 
 /// Returns `true` if [element] is annotated with [JsonKey].
-bool hasJsonKeyAnnotation(FieldElement element) =>
+bool hasJsonKeyAnnotation(FieldElement2 element) =>
     _jsonKeyAnnotation(element) != null;
 
-Never throwUnsupported(FieldElement element, String message) =>
+Never throwUnsupported(FieldElement2 element, String message) =>
     throw InvalidGenerationSourceError(
-      'Error with `@JsonKey` on the `${element.name}` field. $message',
+      'Error with `@JsonKey` on the `${element.name3}` field. $message',
       element: element,
     );
 
-FieldRename? _fromDartObject(ConstantReader reader) => reader.isNull
+T? readEnum<T extends Enum>(ConstantReader reader, List<T> values) =>
+    reader.isNull
     ? null
-    : enumValueForDartObject(
-        reader.objectValue,
-        FieldRename.values,
-        (f) => f.toString().split('.')[1],
-      );
+    : enumValueForDartObject<T>(reader.objectValue, values, (f) => f.name);
 
 T enumValueForDartObject<T>(
   DartObject source,
   List<T> items,
   String Function(T) name,
-) =>
-    items.singleWhere((v) => source.getField(name(v)) != null);
+) => items[source.getField('index')!.toIntValue()!];
 
-/// Return an instance of [JsonSerializable] corresponding to a the provided
+/// Return an instance of [JsonSerializable] corresponding to the provided
 /// [reader].
 // #CHANGE WHEN UPDATING json_annotation
 JsonSerializable _valueForAnnotation(ConstantReader reader) => JsonSerializable(
-      anyMap: reader.read('anyMap').literalValue as bool?,
-      checked: reader.read('checked').literalValue as bool?,
-      constructor: reader.read('constructor').literalValue as String?,
-      createFactory: reader.read('createFactory').literalValue as bool?,
-      createToJson: reader.read('createToJson').literalValue as bool?,
-      disallowUnrecognizedKeys:
-          reader.read('disallowUnrecognizedKeys').literalValue as bool?,
-      explicitToJson: reader.read('explicitToJson').literalValue as bool?,
-      fieldRename: _fromDartObject(reader.read('fieldRename')),
-      genericArgumentFactories:
-          reader.read('genericArgumentFactories').literalValue as bool?,
-      ignoreUnannotated: reader.read('ignoreUnannotated').literalValue as bool?,
-      includeIfNull: reader.read('includeIfNull').literalValue as bool?,
-    );
+  anyMap: reader.read('anyMap').literalValue as bool?,
+  checked: reader.read('checked').literalValue as bool?,
+  constructor: reader.read('constructor').literalValue as String?,
+  createFactory: reader.read('createFactory').literalValue as bool?,
+  createToJson: reader.read('createToJson').literalValue as bool?,
+  createFieldMap: reader.read('createFieldMap').literalValue as bool?,
+  createJsonKeys: reader.read('createJsonKeys').literalValue as bool?,
+  createPerFieldToJson:
+      reader.read('createPerFieldToJson').literalValue as bool?,
+  disallowUnrecognizedKeys:
+      reader.read('disallowUnrecognizedKeys').literalValue as bool?,
+  explicitToJson: reader.read('explicitToJson').literalValue as bool?,
+  fieldRename: readEnum(reader.read('fieldRename'), FieldRename.values),
+  genericArgumentFactories:
+      reader.read('genericArgumentFactories').literalValue as bool?,
+  ignoreUnannotated: reader.read('ignoreUnannotated').literalValue as bool?,
+  includeIfNull: reader.read('includeIfNull').literalValue as bool?,
+);
 
-/// Returns a [JsonSerializable] with values from the [JsonSerializable]
+/// Returns a [ClassConfig] with values from the [JsonSerializable]
 /// instance represented by [reader].
 ///
 /// For fields that are not defined in [JsonSerializable] or `null` in [reader],
@@ -78,18 +80,26 @@ JsonSerializable _valueForAnnotation(ConstantReader reader) => JsonSerializable(
 ClassConfig mergeConfig(
   ClassConfig config,
   ConstantReader reader, {
-  required ClassElement classElement,
+  required ClassElement2 classElement,
 }) {
   final annotation = _valueForAnnotation(reader);
   assert(config.ctorParamDefaults.isEmpty);
 
   final constructor = annotation.constructor ?? config.constructor;
-  final constructorInstance = constructorByName(classElement, constructor);
+  final constructorInstance = _constructorByNameOrNull(
+    classElement,
+    constructor,
+  );
+
+  final paramDefaultValueMap = constructorInstance == null
+      ? <String, String>{}
+      : Map<String, String>.fromEntries(
+          constructorInstance.formalParameters
+              .where((element) => element.hasDefaultValue)
+              .map((e) => MapEntry(e.name3!, e.defaultValueCode!)),
+        );
 
-  final paramDefaultValueMap = Map<String, String>.fromEntries(
-      constructorInstance.parameters
-          .where((element) => element.hasDefaultValue)
-          .map((e) => MapEntry(e.name, e.defaultValueCode!)));
+  final converters = reader.read('converters');
 
   return ClassConfig(
     anyMap: annotation.anyMap ?? config.anyMap,
@@ -97,25 +107,42 @@ ClassConfig mergeConfig(
     constructor: constructor,
     createFactory: annotation.createFactory ?? config.createFactory,
     createToJson: annotation.createToJson ?? config.createToJson,
+    createFieldMap: annotation.createFieldMap ?? config.createFieldMap,
+    createJsonKeys: annotation.createJsonKeys ?? config.createJsonKeys,
+    createPerFieldToJson:
+        annotation.createPerFieldToJson ?? config.createPerFieldToJson,
     disallowUnrecognizedKeys:
         annotation.disallowUnrecognizedKeys ?? config.disallowUnrecognizedKeys,
     explicitToJson: annotation.explicitToJson ?? config.explicitToJson,
     fieldRename: annotation.fieldRename ?? config.fieldRename,
-    genericArgumentFactories: annotation.genericArgumentFactories ??
-        (classElement.typeParameters.isNotEmpty &&
+    genericArgumentFactories:
+        annotation.genericArgumentFactories ??
+        (classElement.typeParameters2.isNotEmpty &&
             config.genericArgumentFactories),
     ignoreUnannotated: annotation.ignoreUnannotated ?? config.ignoreUnannotated,
     includeIfNull: annotation.includeIfNull ?? config.includeIfNull,
     ctorParamDefaults: paramDefaultValueMap,
+    converters: converters.isNull ? const [] : converters.listValue,
   );
 }
 
-ConstructorElement constructorByName(ClassElement classElement, String name) {
-  final className = classElement.name;
+ConstructorElement2? _constructorByNameOrNull(
+  ClassElement2 classElement,
+  String name,
+) {
+  try {
+    return constructorByName(classElement, name);
+  } on InvalidGenerationSourceError {
+    return null;
+  }
+}
+
+ConstructorElement2 constructorByName(ClassElement2 classElement, String name) {
+  final className = classElement.name3;
 
-  ConstructorElement? ctor;
+  ConstructorElement2? ctor;
   if (name.isEmpty) {
-    ctor = classElement.unnamedConstructor;
+    ctor = classElement.unnamedConstructor2;
     if (ctor == null) {
       throw InvalidGenerationSourceError(
         'The class `$className` has no default constructor.',
@@ -123,7 +150,7 @@ ConstructorElement constructorByName(ClassElement classElement, String name) {
       );
     }
   } else {
-    ctor = classElement.getNamedConstructor(name);
+    ctor = classElement.getNamedConstructor2(name);
     if (ctor == null) {
       throw InvalidGenerationSourceError(
         'The class `$className` does not have a constructor with the name '
@@ -140,9 +167,10 @@ ConstructorElement constructorByName(ClassElement classElement, String name) {
 /// with its values.
 ///
 /// Otherwise, `null`.
-Iterable<FieldElement>? iterateEnumFields(DartType targetType) {
-  if (targetType is InterfaceType && targetType.element.isEnum) {
-    return targetType.element.fields.where((element) => !element.isSynthetic);
+Iterable<FieldElement2>? iterateEnumFields(DartType targetType) {
+  if ( /*targetType is InterfaceType && */ targetType.element3
+      is EnumElement2) {
+    return (targetType.element3 as EnumElement2).constants2;
   }
   return null;
 }
@@ -150,26 +178,25 @@ Iterable<FieldElement>? iterateEnumFields(DartType targetType) {
 extension DartTypeExtension on DartType {
   DartType promoteNonNullable() =>
       element?.library?.typeSystem.promoteToNonNull(this) ?? this;
+
+  String toStringNonNullable() {
+    final val = getDisplayString();
+    if (val.endsWith('?')) return val.substring(0, val.length - 1);
+    return val;
+  }
 }
 
 String ifNullOrElse(String test, String ifNull, String ifNotNull) =>
     '$test == null ? $ifNull : $ifNotNull';
 
-String encodedFieldName(
-  FieldRename fieldRename,
-  String declaredName,
-) {
-  switch (fieldRename) {
-    case FieldRename.none:
-      return declaredName;
-    case FieldRename.snake:
-      return declaredName.snake;
-    case FieldRename.kebab:
-      return declaredName.kebab;
-    case FieldRename.pascal:
-      return declaredName.pascal;
-  }
-}
+String encodedFieldName(FieldRename fieldRename, String declaredName) =>
+    switch (fieldRename) {
+      FieldRename.none => declaredName,
+      FieldRename.snake => declaredName.snake,
+      FieldRename.screamingSnake => declaredName.snake.toUpperCase(),
+      FieldRename.kebab => declaredName.kebab,
+      FieldRename.pascal => declaredName.pascal,
+    };
 
 /// Return the Dart code presentation for the given [type].
 ///
@@ -177,11 +204,8 @@ String encodedFieldName(
 /// types and locations of these files in code. Specifically, it supports
 /// only [InterfaceType]s, with optional type arguments that are also should
 /// be [InterfaceType]s.
-String typeToCode(
-  DartType type, {
-  bool forceNullable = false,
-}) {
-  if (type.isDynamic) {
+String typeToCode(DartType type, {bool forceNullable = false}) {
+  if (type is DynamicType) {
     return 'dynamic';
   } else if (type is InterfaceType) {
     return [
@@ -191,5 +215,60 @@ String typeToCode(
       (type.isNullableType || forceNullable) ? '?' : '',
     ].join();
   }
+
+  if (type is TypeParameterType) {
+    return type.toStringNonNullable();
+  }
   throw UnimplementedError('(${type.runtimeType}) $type');
 }
+
+String? defaultDecodeLogic(
+  DartType targetType,
+  String expression, {
+  bool defaultProvided = false,
+}) {
+  if (targetType.isDartCoreObject && !targetType.isNullableType) {
+    final question = defaultProvided ? '?' : '';
+    return '$expression as Object$question';
+  } else if (targetType.isDartCoreObject || targetType is DynamicType) {
+    // just return it as-is. We'll hope it's safe.
+    return expression;
+  } else if (targetType.isDartCoreDouble) {
+    final targetTypeNullable = defaultProvided || targetType.isNullableType;
+    final question = targetTypeNullable ? '?' : '';
+    return '($expression as num$question)$question.toDouble()';
+  } else if (targetType.isDartCoreInt) {
+    final targetTypeNullable = defaultProvided || targetType.isNullableType;
+    final question = targetTypeNullable ? '?' : '';
+    return '($expression as num$question)$question.toInt()';
+  } else if (simpleJsonTypeChecker.isAssignableFromType(targetType)) {
+    final typeCode = typeToCode(targetType, forceNullable: defaultProvided);
+    return '$expression as $typeCode';
+  }
+
+  return null;
+}
+
+extension ExecutableElementExtension on ExecutableElement2 {
+  /// Returns the name of `this` qualified with the class name if it's a
+  /// [MethodElement].
+  String get qualifiedName {
+    if (this is TopLevelFunctionElement) {
+      return name3!;
+    }
+
+    if (this is MethodElement2) {
+      return '${enclosingElement2!.name3!}.${name3!}';
+    }
+
+    if (this is ConstructorElement2) {
+      // The default constructor.
+      if (name3 == 'new') {
+        return enclosingElement2!.name3!;
+      }
+      return '${enclosingElement2!.name3!}.${name3!}';
+    }
+
+    throw UnsupportedError('Not sure how to support typeof $runtimeType');
+  }
+}
diff --git a/json_serializable/lib/type_helper.dart b/json_serializable/lib/type_helper.dart
index ab8a4c60a..4caa64137 100644
--- a/json_serializable/lib/type_helper.dart
+++ b/json_serializable/lib/type_helper.dart
@@ -4,7 +4,7 @@
 
 export 'src/shared_checkers.dart' show simpleJsonTypeChecker;
 export 'src/type_helper.dart'
-    show TypeHelperContext, TypeHelperContextWithConfig, TypeHelper;
+    show TypeHelper, TypeHelperContext, TypeHelperContextWithConfig;
 export 'src/type_helpers/big_int_helper.dart';
 export 'src/type_helpers/config_types.dart';
 export 'src/type_helpers/convert_helper.dart';
@@ -14,7 +14,7 @@ export 'src/type_helpers/enum_helper.dart';
 export 'src/type_helpers/iterable_helper.dart';
 export 'src/type_helpers/json_converter_helper.dart';
 export 'src/type_helpers/json_helper.dart';
-export 'src/type_helpers/map_helper.dart';
+export 'src/type_helpers/map_helper.dart' show MapHelper;
 export 'src/type_helpers/uri_helper.dart';
 export 'src/type_helpers/value_helper.dart';
 export 'src/unsupported_type_error.dart';
diff --git a/json_serializable/mono_pkg.yaml b/json_serializable/mono_pkg.yaml
index fbc055781..aed7819e8 100644
--- a/json_serializable/mono_pkg.yaml
+++ b/json_serializable/mono_pkg.yaml
@@ -1,6 +1,6 @@
 # See https://github.com/google/mono_repo.dart for details on this file
-dart:
-- 2.14.0
+sdk:
+- pubspec
 - dev
 
 stages:
@@ -8,6 +8,10 @@ stages:
   - group:
     - format
     - analyze: --fatal-infos .
+    sdk: dev
+  - group:
+      - analyze
+    sdk: pubspec
 - unit_test:
   - test:
   - test: -p chrome
diff --git a/json_serializable/pubspec.yaml b/json_serializable/pubspec.yaml
index 2e31342cb..c32d46ee8 100644
--- a/json_serializable/pubspec.yaml
+++ b/json_serializable/pubspec.yaml
@@ -1,37 +1,45 @@
 name: json_serializable
-version: 6.0.1
+version: 6.10.0-dev
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.
 repository: https://github.com/google/json_serializable.dart/tree/master/json_serializable
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: ^3.8.0
+topics:
+ - json
+ - build-runner
+ - json-serializable
+ - codegen
+
+resolution: workspace
 
 dependencies:
-  analyzer: ^2.0.0
-  async: ^2.8.0
-  build: ^2.0.0
-  build_config: '>=0.4.4 <2.0.0'
-  collection: ^1.14.0
+  analyzer: '>=6.9.0 <8.0.0'
+  async: ^2.10.0
+  build: ^3.0.0-dev
+  build_config: ^1.1.0
+  dart_style: '>=2.3.7 <4.0.0'
 
   # Use a tight version constraint to ensure that a constraint on
   # `json_annotation` properly constrains all features it provides.
-  json_annotation: '>=4.3.0 <4.4.0'
-  meta: ^1.3.0
-  path: ^1.8.0
-  pub_semver: ^2.0.0
+  json_annotation: '>=4.9.0 <4.10.0'
+  meta: ^1.14.0
+  path: ^1.9.0
+  pub_semver: ^2.1.4
   pubspec_parse: ^1.0.0
-  source_gen: ^1.0.0
-  source_helper: ^1.3.0
+  source_gen: ^3.0.0-dev
+  source_helper: ^1.3.4
 
 dev_dependencies:
-  build_runner: ^2.0.0
-  build_verify: ^2.0.0
-  dart_style: ^2.0.0
+  _json_serial_shared_test:
+    path: ../shared_test
+  build_runner: ^2.4.6
+  build_verify: ^3.0.0
+  collection: ^1.17.0
   logging: ^1.0.0
-  source_gen_test: ^1.0.0
-  stack_trace: ^1.10.0
-  test: ^1.16.0
+  source_gen_test: ^1.3.0-dev
+  test: ^1.24.4
   test_descriptor: ^2.0.0
   test_process: ^2.0.0
   yaml: ^3.0.0
diff --git a/json_serializable/test/annotation_version_test.dart b/json_serializable/test/annotation_version_test.dart
index 1ba895866..3bd7e989e 100644
--- a/json_serializable/test/annotation_version_test.dart
+++ b/json_serializable/test/annotation_version_test.dart
@@ -4,10 +4,14 @@
 
 @TestOn('vm')
 @Tags(['presubmit-only'])
+@Timeout.factor(2)
+library;
+
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:json_serializable/src/check_dependencies.dart';
+import 'package:json_serializable/src/constants.dart';
 import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
 import 'package:pubspec_parse/pubspec_parse.dart';
@@ -15,8 +19,10 @@ import 'package:test/test.dart';
 import 'package:test_descriptor/test_descriptor.dart' as d;
 import 'package:test_process/test_process.dart';
 
+import 'test_utils.dart';
+
 void main() {
-  test('validate pubspec constraint', () {
+  test('validate pubspec constraint', () async {
     final annotationConstraint =
         _jsonSerialPubspec.dependencies['json_annotation'] as HostedDependency;
     final versionRange = annotationConstraint.version as VersionRange;
@@ -25,12 +31,36 @@ void main() {
     expect(versionRange.min, requiredJsonAnnotationMinVersion);
   });
 
+  group('language version', () {
+    test('is less than required', () async {
+      const sdkLowerBound = '3.7.0';
+      await _structurePackage(
+        environment: const {'sdk': '^$sdkLowerBound'},
+        dependencies: {'json_annotation': _annotationLowerBound},
+        message:
+            '''
+The language version ($sdkLowerBound) of this package ($_testPkgName) does not match the required range `$supportedLanguageConstraint`.
+
+Edit pubspec.yaml to include an SDK constraint of at least $supportedLanguageConstraint.
+
+environment:
+  sdk: $supportedLanguageConstraint
+''',
+      );
+    });
+
+    test(
+      'is at least the required `$supportedLanguageConstraint`',
+      () async => await _structurePackage(
+        dependencies: {'json_annotation': _annotationLowerBound},
+        message: null,
+      ),
+    );
+  });
+
   test(
     'missing dependency in production code',
-    () => _structurePackage(
-      sourceDirectory: 'lib',
-      message: _missingProductionDep,
-    ),
+    () => _structurePackage(message: _missingProductionDep),
   );
 
   test(
@@ -46,7 +76,6 @@ void main() {
   test(
     'dev dependency with a production usage',
     () => _structurePackage(
-      sourceDirectory: 'lib',
       devDependencies: {'json_annotation': _annotationLowerBound},
       message: _missingProductionDep,
     ),
@@ -55,7 +84,6 @@ void main() {
   test(
     'dependency with `null` constraint',
     () => _structurePackage(
-      sourceDirectory: 'lib',
       dependencies: {'json_annotation': null},
       message:
           'The version constraint "any" on json_annotation allows versions '
@@ -66,7 +94,6 @@ void main() {
   test(
     'dependency with "any" constraint',
     () => _structurePackage(
-      sourceDirectory: 'lib',
       dependencies: {'json_annotation': 'any'},
       message:
           'The version constraint "any" on json_annotation allows versions '
@@ -77,7 +104,6 @@ void main() {
   test(
     'dependency with too low version range',
     () => _structurePackage(
-      sourceDirectory: 'lib',
       dependencies: {'json_annotation': '^4.0.0'},
       message:
           'The version constraint "^4.0.0" on json_annotation allows versions '
@@ -100,7 +126,7 @@ String _fixPath(String path) {
 final _jsonSerialPathDependencyOverrides = {
   for (var entry in _jsonSerialPubspec.dependencyOverrides.entries)
     if (entry.value is PathDependency)
-      entry.key: {'path': _fixPath((entry.value as PathDependency).path)}
+      entry.key: {'path': _fixPath((entry.value as PathDependency).path)},
 };
 
 final _annotationLowerBound = requiredJsonAnnotationMinVersion.toString();
@@ -110,60 +136,51 @@ final _missingProductionDep =
     '"dependencies" section of your pubspec with a lower bound of at least '
     '"$_annotationLowerBound".';
 
+const _testPkgName = '_test_pkg';
+
 Future<void> _structurePackage({
-  required String sourceDirectory,
-  required String message,
+  String sourceDirectory = 'lib',
+  required String? message,
+  Map<String, dynamic> environment = const {'sdk': supportedLanguageConstraint},
   Map<String, dynamic> dependencies = const {},
   Map<String, dynamic> devDependencies = const {},
 }) async {
-  final pubspec = const JsonEncoder.withIndent(' ').convert(
-    {
-      'name': '_test_pkg',
-      'environment': {'sdk': '>=2.14.0 <3.0.0'},
-      'dependencies': dependencies,
-      'dev_dependencies': {
-        ...devDependencies,
-        'build_runner': 'any',
-        'json_serializable': {'path': p.current},
-      },
-      'dependency_overrides': _jsonSerialPathDependencyOverrides,
+  final pubspec = loudEncode({
+    'name': _testPkgName,
+    'environment': environment,
+    'dependencies': dependencies,
+    'dev_dependencies': {
+      ...devDependencies,
+      'build_runner': 'any',
+      'json_serializable': {'path': p.current},
     },
-  );
+    'dependency_overrides': _jsonSerialPathDependencyOverrides,
+  });
 
   await d.file('pubspec.yaml', pubspec).create();
 
   /// A file in the lib directory without JsonSerializable should do nothing!
-  await d.dir(
-    'lib',
-    [
-      d.file('no_op.dart', '''
+  await d.dir('lib', [
+    d.file('no_op.dart', '''
 class NoOp {}
-''')
-    ],
-  ).create();
-
-  await d.dir(
-    sourceDirectory,
-    [
-      d.file(
-        'sample.dart',
-        '''
+'''),
+  ]).create();
+
+  await d.dir(sourceDirectory, [
+    d.file('sample.dart', '''
 import 'package:json_annotation/json_annotation.dart';
 
 part 'sample.g.dart';
 
 @JsonSerializable()
 class SomeClass{}
-''',
-      )
-    ],
-  ).create();
-
-  final proc = await TestProcess.start(
-    'dart',
-    ['run', 'build_runner', 'build'],
-    workingDirectory: d.sandbox,
-  );
+'''),
+  ]).create();
+  final proc = await TestProcess.start(Platform.resolvedExecutable, [
+    'run',
+    'build_runner',
+    'build',
+  ], workingDirectory: d.sandbox);
 
   final lines = StringBuffer();
   await for (var line in proc.stdoutStream()) {
@@ -171,11 +188,27 @@ class SomeClass{}
     print(line);
   }
 
-  expect(lines.toString(), contains('''
-[SEVERE] json_serializable:json_serializable on $sourceDirectory/sample.dart:
+  final output = lines.toString();
+  final expectedWarningCount = message == null ? 0 : 1;
+  final warningCount = _warningStartOfLine.allMatches(output).length;
+  expect(
+    warningCount,
+    expectedWarningCount,
+    reason:
+        'Expected the number of output warnings ($warningCount) to match the '
+        'number of expected warnings ($expectedWarningCount).',
+  );
 
-$message
-'''));
+  if (message != null) {
+    expect(
+      output,
+      contains('''
+W json_serializable on $sourceDirectory/sample.dart:
+${LineSplitter.split(message).map((line) => '  $line').join('\n')}'''),
+    );
+  }
 
-  await proc.shouldExit(1);
+  await proc.shouldExit(0);
 }
+
+final _warningStartOfLine = RegExp(r'^W ', multiLine: true);
diff --git a/json_serializable/test/config_test.dart b/json_serializable/test/config_test.dart
index e137b0bbc..b29ffac12 100644
--- a/json_serializable/test/config_test.dart
+++ b/json_serializable/test/config_test.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library;
+
 import 'dart:io';
 
 import 'package:build/build.dart';
@@ -16,8 +18,10 @@ import 'shared_config.dart';
 
 void main() {
   test('fields in JsonSerializable are sorted', () {
-    expect(generatorConfigDefaultJson.keys,
-        orderedEquals(generatorConfigDefaultJson.keys.toList()..sort()));
+    expect(
+      generatorConfigDefaultJson.keys,
+      orderedEquals(generatorConfigDefaultJson.keys.toList()..sort()),
+    );
   });
 
   test('empty', () async {
@@ -26,29 +30,36 @@ void main() {
   });
 
   test('valid default config', () async {
-    final builder =
-        jsonSerializable(BuilderOptions(generatorConfigDefaultJson));
+    final builder = jsonSerializable(
+      BuilderOptions(generatorConfigDefaultJson),
+    );
     expect(builder, isNotNull);
   });
 
   test('valid, non-default config', () {
-    expect(generatorConfigNonDefaultJson.keys,
-        unorderedEquals(generatorConfigDefaultJson.keys));
+    expect(
+      generatorConfigNonDefaultJson.keys,
+      unorderedEquals(generatorConfigDefaultJson.keys),
+    );
 
     for (var entry in generatorConfigDefaultJson.entries) {
-      expect(generatorConfigNonDefaultJson,
-          containsPair(entry.key, isNot(entry.value)),
-          reason: 'should have values that are different than the defaults');
+      expect(
+        generatorConfigNonDefaultJson,
+        containsPair(entry.key, isNot(entry.value)),
+        reason: 'should have values that are different than the defaults',
+      );
     }
 
-    final builder =
-        jsonSerializable(BuilderOptions(generatorConfigNonDefaultJson));
+    final builder = jsonSerializable(
+      BuilderOptions(generatorConfigNonDefaultJson),
+    );
     expect(builder, isNotNull);
   });
 
   test('config is null-protected when passed to JsonSerializableGenerator', () {
     final nullValueMap = Map.fromEntries(
-        generatorConfigDefaultJson.entries.map((e) => MapEntry(e.key, null)));
+      generatorConfigDefaultJson.entries.map((e) => MapEntry(e.key, null)),
+    );
     final config = JsonSerializable.fromJson(nullValueMap);
     final generator = JsonSerializableGenerator(config: config);
     expect(generator.config.toJson(), generatorConfigDefaultJson);
@@ -69,7 +80,7 @@ void main() {
       r'$default',
       'builders',
       'json_serializable',
-      'options'
+      'options',
     ]) {
       yaml = yaml[key] as YamlMap;
     }
@@ -79,7 +90,8 @@ void main() {
     expect(
       configMap.keys,
       unorderedEquals(generatorConfigDefaultJson.keys),
-      reason: 'All supported keys are documented. '
+      reason:
+          'All supported keys are documented. '
           'Did you forget to change README.md?',
     );
 
@@ -102,8 +114,9 @@ void main() {
     );
 
     expect(
-        () => jsonSerializable(const BuilderOptions({'unsupported': 'config'})),
-        throwsA(matcher));
+      () => jsonSerializable(const BuilderOptions({'unsupported': 'config'})),
+      throwsA(matcher),
+    );
   });
 
   group('invalid config', () {
@@ -116,20 +129,18 @@ void main() {
         config[entry.key] = entry.value;
 
         String lastLine;
-        switch (entry.key) {
-          case 'field_rename':
-            lastLine =
-                '`42` is not one of the supported values: none, kebab, snake, '
-                'pascal';
-            break;
-          case 'constructor':
-            lastLine = "type 'int' is not a subtype of type 'String?' in type "
-                'cast';
-            break;
-          default:
-            lastLine =
-                "type 'int' is not a subtype of type 'bool?' in type cast";
-        }
+        lastLine = switch (entry.key) {
+          'field_rename' =>
+            '`42` is not one of the supported values: none, kebab, snake, '
+                'pascal, screamingSnake',
+          'constructor' =>
+            "type 'int' is not a subtype of type 'String?' in type "
+                'cast',
+          'create_to_json' =>
+            "type 'int' is not a subtype of type 'bool?' in type "
+                'cast',
+          _ => "type 'int' is not a subtype of type 'bool?' in type cast",
+        };
 
         final matcher = isA<StateError>().having(
           (v) => v.message,
@@ -140,7 +151,9 @@ There is a problem with "${entry.key}".
 $lastLine''',
         );
         expect(
-            () => jsonSerializable(BuilderOptions(config)), throwsA(matcher));
+          () => jsonSerializable(BuilderOptions(config)),
+          throwsA(matcher),
+        );
       });
     }
   });
@@ -152,6 +165,9 @@ const _invalidConfig = {
   'checked': 42,
   'constructor': 42,
   'create_factory': 42,
+  'create_field_map': 42,
+  'create_json_keys': 42,
+  'create_per_field_to_json': 42,
   'create_to_json': 42,
   'disallow_unrecognized_keys': 42,
   'explicit_to_json': 42,
diff --git a/json_serializable/test/custom_configuration_test.dart b/json_serializable/test/custom_configuration_test.dart
index beb592648..4b70d8c9a 100644
--- a/json_serializable/test/custom_configuration_test.dart
+++ b/json_serializable/test/custom_configuration_test.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library;
+
 import 'dart:async';
 
 import 'package:analyzer/dart/element/type.dart';
@@ -32,17 +34,22 @@ Future<void> main() async {
   );
 
   group('without wrappers', () {
-    _registerTests(ClassConfig.defaults);
+    _registerTests(ClassConfig.defaults.toJsonSerializable());
   });
 
   group('configuration', () {
     Future<void> runWithConfigAndLogger(
-        JsonSerializable? config, String className) async {
+      JsonSerializable? config,
+      String className,
+    ) async {
       await generateForElement(
-          JsonSerializableGenerator(
-              config: config, typeHelpers: const [_ConfigLogger()]),
-          _libraryReader,
-          className);
+        JsonSerializableGenerator(
+          config: config,
+          typeHelpers: const [_ConfigLogger()],
+        ),
+        _libraryReader,
+        className,
+      );
     }
 
     setUp(_ConfigLogger.configurations.clear);
@@ -58,54 +65,72 @@ Future<void> main() async {
 
           test(testDescription, () async {
             await runWithConfigAndLogger(
-                nullConfig ? null : const JsonSerializable(), className);
+              nullConfig ? null : const JsonSerializable(),
+              className,
+            );
 
             expect(_ConfigLogger.configurations, hasLength(2));
-            expect(_ConfigLogger.configurations.first,
-                same(_ConfigLogger.configurations.last));
-            expect(_ConfigLogger.configurations.first.toJson(),
-                generatorConfigDefaultJson);
+            expect(
+              _ConfigLogger.configurations.first.toJson(),
+              _ConfigLogger.configurations.last.toJson(),
+            );
+            expect(
+              _ConfigLogger.configurations.first.toJson(),
+              generatorConfigDefaultJson,
+            );
           });
         }
       }
     });
 
     test(
-        'values in config override unconfigured (default) values in annotation',
-        () async {
-      await runWithConfigAndLogger(
+      'values in config override unconfigured (default) values in annotation',
+      () async {
+        await runWithConfigAndLogger(
           JsonSerializable.fromJson(generatorConfigNonDefaultJson),
-          'ConfigurationImplicitDefaults');
+          'ConfigurationImplicitDefaults',
+        );
 
-      expect(_ConfigLogger.configurations, isEmpty,
-          reason: 'all generation is disabled');
+        expect(
+          _ConfigLogger.configurations,
+          isEmpty,
+          reason: 'all generation is disabled',
+        );
 
-      // Create a configuration with just `create_to_json` set to true so we
-      // can validate the configuration that is run with
-      final configMap =
-          Map<String, dynamic>.from(generatorConfigNonDefaultJson);
-      configMap['create_to_json'] = true;
+        // Create a configuration with just `create_to_json` set to true so we
+        // can validate the configuration that is run with
+        final configMap = Map<String, dynamic>.from(
+          generatorConfigNonDefaultJson,
+        );
+        configMap['create_to_json'] = true;
 
-      await runWithConfigAndLogger(JsonSerializable.fromJson(configMap),
-          'ConfigurationImplicitDefaults');
-    });
+        await runWithConfigAndLogger(
+          JsonSerializable.fromJson(configMap),
+          'ConfigurationImplicitDefaults',
+        );
+      },
+    );
 
     test(
       'explicit values in annotation override corresponding settings in config',
       () async {
         await runWithConfigAndLogger(
-            JsonSerializable.fromJson(generatorConfigNonDefaultJson),
-            'ConfigurationExplicitDefaults');
+          JsonSerializable.fromJson(generatorConfigNonDefaultJson),
+          'ConfigurationExplicitDefaults',
+        );
 
         expect(_ConfigLogger.configurations, hasLength(2));
-        expect(_ConfigLogger.configurations.first,
-            same(_ConfigLogger.configurations.last));
+        expect(
+          _ConfigLogger.configurations.first.toJson(),
+          _ConfigLogger.configurations.last.toJson(),
+        );
 
         // The effective configuration should be non-Default configuration, but
         // with all fields set from JsonSerializable as the defaults
 
-        final expected =
-            Map<String, dynamic>.from(generatorConfigNonDefaultJson);
+        final expected = Map<String, dynamic>.from(
+          generatorConfigNonDefaultJson,
+        );
         for (var jsonSerialKey in jsonSerializableFields) {
           expected[jsonSerialKey] = generatorConfigDefaultJson[jsonSerialKey];
         }
@@ -132,30 +157,34 @@ void _registerTests(JsonSerializable generator) {
   group('explicit toJson', () {
     test('nullable', () async {
       final output = await _runForElementNamed(
-          const JsonSerializable(), 'TrivialNestedNullable');
+        const JsonSerializable(),
+        'TrivialNestedNullable',
+      );
 
       const expected = r'''
 Map<String, dynamic> _$TrivialNestedNullableToJson(
-        TrivialNestedNullable instance) =>
-    <String, dynamic>{
-      'child': instance.child?.toJson(),
-      'otherField': instance.otherField,
-    };
+  TrivialNestedNullable instance,
+) => <String, dynamic>{
+  'child': instance.child?.toJson(),
+  'otherField': instance.otherField,
+};
 ''';
 
       expect(output, expected);
     });
     test('non-nullable', () async {
       final output = await _runForElementNamed(
-          const JsonSerializable(), 'TrivialNestedNonNullable');
+        const JsonSerializable(),
+        'TrivialNestedNonNullable',
+      );
 
       const expected = r'''
 Map<String, dynamic> _$TrivialNestedNonNullableToJson(
-        TrivialNestedNonNullable instance) =>
-    <String, dynamic>{
-      'child': instance.child.toJson(),
-      'otherField': instance.otherField,
-    };
+  TrivialNestedNonNullable instance,
+) => <String, dynamic>{
+  'child': instance.child.toJson(),
+  'otherField': instance.otherField,
+};
 ''';
 
       expect(output, expected);
@@ -163,25 +192,32 @@ Map<String, dynamic> _$TrivialNestedNonNullableToJson(
   });
 
   group('valid inputs', () {
-    test('class with fromJson() constructor with optional parameters',
-        () async {
-      final output = await runForElementNamed('FromJsonOptionalParameters');
+    test(
+      'class with fromJson() constructor with optional parameters',
+      () async {
+        final output = await runForElementNamed('FromJsonOptionalParameters');
 
-      expect(output, contains('ChildWithFromJson.fromJson'));
-    });
+        expect(output, contains('ChildWithFromJson.fromJson'));
+      },
+    );
 
     test('class with child json-able object', () async {
       final output = await runForElementNamed('ParentObject');
 
       expect(
-          output,
-          contains("ChildObject.fromJson(json['child'] "
-              'as Map<String, dynamic>)'));
+        output,
+        contains(
+          "ChildObject.fromJson(json['child'] "
+          'as Map<String, dynamic>)',
+        ),
+      );
     });
 
     test('class with child json-able object - anyMap', () async {
       final output = await _runForElementNamed(
-          const JsonSerializable(anyMap: true), 'ParentObject');
+        const JsonSerializable(anyMap: true),
+        'ParentObject',
+      );
 
       expect(output, contains("ChildObject.fromJson(json['child'] as Map)"));
     });
@@ -194,8 +230,9 @@ Map<String, dynamic> _$TrivialNestedNonNullableToJson(
     });
 
     test('class with child list of dynamic objects is left alone', () async {
-      final output =
-          await runForElementNamed('ParentObjectWithDynamicChildren');
+      final output = await runForElementNamed(
+        'ParentObjectWithDynamicChildren',
+      );
 
       expect(
         output,
@@ -208,7 +245,6 @@ Map<String, dynamic> _$TrivialNestedNonNullableToJson(
     test('some', () async {
       final output = await runForElementNamed('IncludeIfNullAll');
       expect(output, isNot(contains(generatedLocalVarName)));
-      expect(output, isNot(contains(toJsonMapHelperName)));
     });
   });
 }
@@ -225,14 +261,17 @@ class _ConfigLogger implements TypeHelper<TypeHelperContextWithConfig> {
     TypeHelperContextWithConfig context,
     bool defaultProvided,
   ) {
-    configurations.add(context.config);
+    configurations.add(context.config.toJsonSerializable());
     return null;
   }
 
   @override
-  Object? serialize(DartType targetType, String expression,
-      TypeHelperContextWithConfig context) {
-    configurations.add(context.config);
+  Object? serialize(
+    DartType targetType,
+    String expression,
+    TypeHelperContextWithConfig context,
+  ) {
+    configurations.add(context.config.toJsonSerializable());
     return null;
   }
 }
diff --git a/json_serializable/test/default_value/default_value.dart b/json_serializable/test/default_value/default_value.dart
index a62894d2c..3fff09ab0 100644
--- a/json_serializable/test/default_value/default_value.dart
+++ b/json_serializable/test/default_value/default_value.dart
@@ -9,11 +9,12 @@ import 'package:json_annotation/json_annotation.dart';
 import 'default_value_interface.dart' as dvi hide Greek;
 import 'default_value_interface.dart'
     show
-        Greek,
         ConstClass,
         ConstClassConverter,
+        Greek,
         constClassFromJson,
-        constClassToJson;
+        constClassToJson,
+        intDefaultValueFunction;
 
 part 'default_value.g.dart';
 
@@ -54,11 +55,15 @@ class DefaultValue implements dvi.DefaultValue {
   @JsonKey(defaultValue: {'answer': 42})
   Map<String, int> fieldMapSimple;
 
-  @JsonKey(defaultValue: {
-    'root': ['child']
-  })
+  @JsonKey(
+    defaultValue: {
+      'root': ['child'],
+    },
+  )
   Map<String, List<String>> fieldMapListString;
 
+  Duration durationField;
+
   @JsonKey(defaultValue: Greek.beta)
   Greek fieldEnum;
 
@@ -70,6 +75,15 @@ class DefaultValue implements dvi.DefaultValue {
   @JsonKey(fromJson: constClassFromJson, toJson: constClassToJson)
   ConstClass valueFromFunction;
 
+  @JsonKey(defaultValue: intDefaultValueFunction)
+  int intDefaultValueFromFunction;
+
+  @JsonKey(defaultValue: ConstClass.new)
+  ConstClass valueFromDefaultValueDefaultConstructor;
+
+  @JsonKey(defaultValue: ConstClass.easy)
+  ConstClass valueFromDefaultValueNamedConstructor;
+
   DefaultValue(
     this.fieldBool,
     this.fieldString,
@@ -83,9 +97,13 @@ class DefaultValue implements dvi.DefaultValue {
     this.fieldMapSimple,
     this.fieldMapListString,
     this.fieldEnum, {
+    this.durationField = Duration.zero,
     this.constClass = const ConstClass('value'),
     this.valueFromConverter = const ConstClass('value'),
     this.valueFromFunction = const ConstClass('value'),
+    required this.intDefaultValueFromFunction,
+    required this.valueFromDefaultValueDefaultConstructor,
+    required this.valueFromDefaultValueNamedConstructor,
   });
 
   factory DefaultValue.fromJson(Map<String, dynamic> json) =>
diff --git a/json_serializable/test/default_value/default_value.g.dart b/json_serializable/test/default_value/default_value.g.dart
index 8dc932408..af6395178 100644
--- a/json_serializable/test/default_value/default_value.g.dart
+++ b/json_serializable/test/default_value/default_value.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'default_value.dart';
 
@@ -9,44 +9,62 @@ part of 'default_value.dart';
 // **************************************************************************
 
 DefaultValue _$DefaultValueFromJson(Map<String, dynamic> json) => DefaultValue(
-      json['fieldBool'] as bool? ?? true,
-      json['fieldString'] as String? ?? 'string',
-      json['fieldInt'] as int? ?? 42,
-      (json['fieldDouble'] as num?)?.toDouble() ?? 3.14,
-      json['fieldListEmpty'] as List<dynamic>? ?? [],
-      (json['fieldSetEmpty'] as List<dynamic>?)?.toSet() ?? {},
-      json['fieldMapEmpty'] as Map<String, dynamic>? ?? {},
-      (json['fieldListSimple'] as List<dynamic>?)
-              ?.map((e) => e as int)
-              .toList() ??
-          [1, 2, 3],
-      (json['fieldSetSimple'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toSet() ??
-          {'entry1', 'entry2'},
-      (json['fieldMapSimple'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as int),
-          ) ??
-          {'answer': 42},
-      (json['fieldMapListString'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                k, (e as List<dynamic>).map((e) => e as String).toList()),
-          ) ??
-          {
-            'root': ['child']
-          },
-      $enumDecodeNullable(_$GreekEnumMap, json['fieldEnum']) ?? Greek.beta,
-      constClass: json['constClass'] == null
-          ? const ConstClass('value')
-          : ConstClass.fromJson(json['constClass'] as Map<String, dynamic>),
-      valueFromConverter: json['valueFromConverter'] == null
-          ? const ConstClass('value')
-          : const ConstClassConverter()
-              .fromJson(json['valueFromConverter'] as String),
-      valueFromFunction: json['valueFromFunction'] == null
-          ? const ConstClass('value')
-          : constClassFromJson(json['valueFromFunction'] as String),
-    );
+  json['fieldBool'] as bool? ?? true,
+  json['fieldString'] as String? ?? 'string',
+  (json['fieldInt'] as num?)?.toInt() ?? 42,
+  (json['fieldDouble'] as num?)?.toDouble() ?? 3.14,
+  json['fieldListEmpty'] as List<dynamic>? ?? [],
+  (json['fieldSetEmpty'] as List<dynamic>?)?.toSet() ?? {},
+  json['fieldMapEmpty'] as Map<String, dynamic>? ?? {},
+  (json['fieldListSimple'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList() ??
+      [1, 2, 3],
+  (json['fieldSetSimple'] as List<dynamic>?)?.map((e) => e as String).toSet() ??
+      {'entry1', 'entry2'},
+  (json['fieldMapSimple'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ) ??
+      {'answer': 42},
+  (json['fieldMapListString'] as Map<String, dynamic>?)?.map(
+        (k, e) =>
+            MapEntry(k, (e as List<dynamic>).map((e) => e as String).toList()),
+      ) ??
+      {
+        'root': ['child'],
+      },
+  $enumDecodeNullable(_$GreekEnumMap, json['fieldEnum']) ?? Greek.beta,
+  durationField: json['durationField'] == null
+      ? Duration.zero
+      : Duration(microseconds: (json['durationField'] as num).toInt()),
+  constClass: json['constClass'] == null
+      ? const ConstClass('value')
+      : ConstClass.fromJson(json['constClass'] as Map<String, dynamic>),
+  valueFromConverter: json['valueFromConverter'] == null
+      ? const ConstClass('value')
+      : const ConstClassConverter().fromJson(
+          json['valueFromConverter'] as String,
+        ),
+  valueFromFunction: json['valueFromFunction'] == null
+      ? const ConstClass('value')
+      : constClassFromJson(json['valueFromFunction'] as String),
+  intDefaultValueFromFunction:
+      (json['intDefaultValueFromFunction'] as num?)?.toInt() ??
+      intDefaultValueFunction(),
+  valueFromDefaultValueDefaultConstructor:
+      json['valueFromDefaultValueDefaultConstructor'] == null
+      ? const ConstClass()
+      : ConstClass.fromJson(
+          json['valueFromDefaultValueDefaultConstructor']
+              as Map<String, dynamic>,
+        ),
+  valueFromDefaultValueNamedConstructor:
+      json['valueFromDefaultValueNamedConstructor'] == null
+      ? ConstClass.easy()
+      : ConstClass.fromJson(
+          json['valueFromDefaultValueNamedConstructor'] as Map<String, dynamic>,
+        ),
+);
 
 Map<String, dynamic> _$DefaultValueToJson(DefaultValue instance) =>
     <String, dynamic>{
@@ -61,11 +79,18 @@ Map<String, dynamic> _$DefaultValueToJson(DefaultValue instance) =>
       'fieldSetSimple': instance.fieldSetSimple.toList(),
       'fieldMapSimple': instance.fieldMapSimple,
       'fieldMapListString': instance.fieldMapListString,
-      'fieldEnum': _$GreekEnumMap[instance.fieldEnum],
+      'durationField': instance.durationField.inMicroseconds,
+      'fieldEnum': _$GreekEnumMap[instance.fieldEnum]!,
       'constClass': instance.constClass,
-      'valueFromConverter':
-          const ConstClassConverter().toJson(instance.valueFromConverter),
+      'valueFromConverter': const ConstClassConverter().toJson(
+        instance.valueFromConverter,
+      ),
       'valueFromFunction': constClassToJson(instance.valueFromFunction),
+      'intDefaultValueFromFunction': instance.intDefaultValueFromFunction,
+      'valueFromDefaultValueDefaultConstructor':
+          instance.valueFromDefaultValueDefaultConstructor,
+      'valueFromDefaultValueNamedConstructor':
+          instance.valueFromDefaultValueNamedConstructor,
     };
 
 const _$GreekEnumMap = {
diff --git a/json_serializable/test/default_value/default_value.g_any_map__checked.dart b/json_serializable/test/default_value/default_value.g_any_map__checked.dart
index 39eeb129a..40e559936 100644
--- a/json_serializable/test/default_value/default_value.g_any_map__checked.dart
+++ b/json_serializable/test/default_value/default_value.g_any_map__checked.dart
@@ -9,11 +9,12 @@ import 'package:json_annotation/json_annotation.dart';
 import 'default_value_interface.dart' as dvi hide Greek;
 import 'default_value_interface.dart'
     show
-        Greek,
         ConstClass,
         ConstClassConverter,
+        Greek,
         constClassFromJson,
-        constClassToJson;
+        constClassToJson,
+        intDefaultValueFunction;
 
 part 'default_value.g_any_map__checked.g.dart';
 
@@ -22,10 +23,7 @@ const _intValue = 42;
 dvi.DefaultValue fromJson(Map<String, dynamic> json) =>
     _$DefaultValueFromJson(json);
 
-@JsonSerializable(
-  checked: true,
-  anyMap: true,
-)
+@JsonSerializable(checked: true, anyMap: true)
 class DefaultValue implements dvi.DefaultValue {
   @JsonKey(defaultValue: true)
   bool fieldBool;
@@ -57,11 +55,15 @@ class DefaultValue implements dvi.DefaultValue {
   @JsonKey(defaultValue: {'answer': 42})
   Map<String, int> fieldMapSimple;
 
-  @JsonKey(defaultValue: {
-    'root': ['child']
-  })
+  @JsonKey(
+    defaultValue: {
+      'root': ['child'],
+    },
+  )
   Map<String, List<String>> fieldMapListString;
 
+  Duration durationField;
+
   @JsonKey(defaultValue: Greek.beta)
   Greek fieldEnum;
 
@@ -73,6 +75,15 @@ class DefaultValue implements dvi.DefaultValue {
   @JsonKey(fromJson: constClassFromJson, toJson: constClassToJson)
   ConstClass valueFromFunction;
 
+  @JsonKey(defaultValue: intDefaultValueFunction)
+  int intDefaultValueFromFunction;
+
+  @JsonKey(defaultValue: ConstClass.new)
+  ConstClass valueFromDefaultValueDefaultConstructor;
+
+  @JsonKey(defaultValue: ConstClass.easy)
+  ConstClass valueFromDefaultValueNamedConstructor;
+
   DefaultValue(
     this.fieldBool,
     this.fieldString,
@@ -86,9 +97,13 @@ class DefaultValue implements dvi.DefaultValue {
     this.fieldMapSimple,
     this.fieldMapListString,
     this.fieldEnum, {
+    this.durationField = Duration.zero,
     this.constClass = const ConstClass('value'),
     this.valueFromConverter = const ConstClass('value'),
     this.valueFromFunction = const ConstClass('value'),
+    required this.intDefaultValueFromFunction,
+    required this.valueFromDefaultValueDefaultConstructor,
+    required this.valueFromDefaultValueNamedConstructor,
   });
 
   factory DefaultValue.fromJson(Map<String, dynamic> json) =>
diff --git a/json_serializable/test/default_value/default_value.g_any_map__checked.g.dart b/json_serializable/test/default_value/default_value.g_any_map__checked.g.dart
index d1608ef2d..0462bd167 100644
--- a/json_serializable/test/default_value/default_value.g_any_map__checked.g.dart
+++ b/json_serializable/test/default_value/default_value.g_any_map__checked.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'default_value.g_any_map__checked.dart';
 
@@ -8,68 +8,99 @@ part of 'default_value.g_any_map__checked.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-DefaultValue _$DefaultValueFromJson(Map json) => $checkedCreate(
-      'DefaultValue',
-      json,
-      ($checkedConvert) {
-        final val = DefaultValue(
-          $checkedConvert('fieldBool', (v) => v as bool? ?? true),
-          $checkedConvert('fieldString', (v) => v as String? ?? 'string'),
-          $checkedConvert('fieldInt', (v) => v as int? ?? 42),
-          $checkedConvert(
-              'fieldDouble', (v) => (v as num?)?.toDouble() ?? 3.14),
-          $checkedConvert('fieldListEmpty', (v) => v as List<dynamic>? ?? []),
-          $checkedConvert(
-              'fieldSetEmpty', (v) => (v as List<dynamic>?)?.toSet() ?? {}),
-          $checkedConvert('fieldMapEmpty', (v) => v as Map? ?? {}),
-          $checkedConvert(
-              'fieldListSimple',
-              (v) =>
-                  (v as List<dynamic>?)?.map((e) => e as int).toList() ??
-                  [1, 2, 3]),
-          $checkedConvert(
-              'fieldSetSimple',
-              (v) =>
-                  (v as List<dynamic>?)?.map((e) => e as String).toSet() ??
-                  {'entry1', 'entry2'}),
-          $checkedConvert(
-              'fieldMapSimple',
-              (v) =>
-                  (v as Map?)?.map(
-                    (k, e) => MapEntry(k as String, e as int),
-                  ) ??
-                  {'answer': 42}),
-          $checkedConvert(
-              'fieldMapListString',
-              (v) =>
-                  (v as Map?)?.map(
-                    (k, e) => MapEntry(k as String,
-                        (e as List<dynamic>).map((e) => e as String).toList()),
-                  ) ??
-                  {
-                    'root': ['child']
-                  }),
-          $checkedConvert('fieldEnum',
-              (v) => $enumDecodeNullable(_$GreekEnumMap, v) ?? Greek.beta),
-          constClass: $checkedConvert(
-              'constClass',
-              (v) => v == null
-                  ? const ConstClass('value')
-                  : ConstClass.fromJson(Map<String, dynamic>.from(v as Map))),
-          valueFromConverter: $checkedConvert(
-              'valueFromConverter',
-              (v) => v == null
-                  ? const ConstClass('value')
-                  : const ConstClassConverter().fromJson(v as String)),
-          valueFromFunction: $checkedConvert(
-              'valueFromFunction',
-              (v) => v == null
-                  ? const ConstClass('value')
-                  : constClassFromJson(v as String)),
-        );
-        return val;
-      },
-    );
+DefaultValue _$DefaultValueFromJson(Map json) =>
+    $checkedCreate('DefaultValue', json, ($checkedConvert) {
+      final val = DefaultValue(
+        $checkedConvert('fieldBool', (v) => v as bool? ?? true),
+        $checkedConvert('fieldString', (v) => v as String? ?? 'string'),
+        $checkedConvert('fieldInt', (v) => (v as num?)?.toInt() ?? 42),
+        $checkedConvert('fieldDouble', (v) => (v as num?)?.toDouble() ?? 3.14),
+        $checkedConvert('fieldListEmpty', (v) => v as List<dynamic>? ?? []),
+        $checkedConvert(
+          'fieldSetEmpty',
+          (v) => (v as List<dynamic>?)?.toSet() ?? {},
+        ),
+        $checkedConvert('fieldMapEmpty', (v) => v as Map? ?? {}),
+        $checkedConvert(
+          'fieldListSimple',
+          (v) =>
+              (v as List<dynamic>?)?.map((e) => (e as num).toInt()).toList() ??
+              [1, 2, 3],
+        ),
+        $checkedConvert(
+          'fieldSetSimple',
+          (v) =>
+              (v as List<dynamic>?)?.map((e) => e as String).toSet() ??
+              {'entry1', 'entry2'},
+        ),
+        $checkedConvert(
+          'fieldMapSimple',
+          (v) =>
+              (v as Map?)?.map(
+                (k, e) => MapEntry(k as String, (e as num).toInt()),
+              ) ??
+              {'answer': 42},
+        ),
+        $checkedConvert(
+          'fieldMapListString',
+          (v) =>
+              (v as Map?)?.map(
+                (k, e) => MapEntry(
+                  k as String,
+                  (e as List<dynamic>).map((e) => e as String).toList(),
+                ),
+              ) ??
+              {
+                'root': ['child'],
+              },
+        ),
+        $checkedConvert(
+          'fieldEnum',
+          (v) => $enumDecodeNullable(_$GreekEnumMap, v) ?? Greek.beta,
+        ),
+        durationField: $checkedConvert(
+          'durationField',
+          (v) => v == null
+              ? Duration.zero
+              : Duration(microseconds: (v as num).toInt()),
+        ),
+        constClass: $checkedConvert(
+          'constClass',
+          (v) => v == null
+              ? const ConstClass('value')
+              : ConstClass.fromJson(Map<String, dynamic>.from(v as Map)),
+        ),
+        valueFromConverter: $checkedConvert(
+          'valueFromConverter',
+          (v) => v == null
+              ? const ConstClass('value')
+              : const ConstClassConverter().fromJson(v as String),
+        ),
+        valueFromFunction: $checkedConvert(
+          'valueFromFunction',
+          (v) => v == null
+              ? const ConstClass('value')
+              : constClassFromJson(v as String),
+        ),
+        intDefaultValueFromFunction: $checkedConvert(
+          'intDefaultValueFromFunction',
+          (v) => (v as num?)?.toInt() ?? intDefaultValueFunction(),
+        ),
+        valueFromDefaultValueDefaultConstructor: $checkedConvert(
+          'valueFromDefaultValueDefaultConstructor',
+          (v) => v == null
+              ? const ConstClass()
+              : ConstClass.fromJson(Map<String, dynamic>.from(v as Map)),
+        ),
+        valueFromDefaultValueNamedConstructor: $checkedConvert(
+          'valueFromDefaultValueNamedConstructor',
+          (v) => v == null
+              ? ConstClass.easy()
+              : ConstClass.fromJson(Map<String, dynamic>.from(v as Map)),
+        ),
+      );
+      return val;
+    });
 
 Map<String, dynamic> _$DefaultValueToJson(DefaultValue instance) =>
     <String, dynamic>{
@@ -84,11 +115,18 @@ Map<String, dynamic> _$DefaultValueToJson(DefaultValue instance) =>
       'fieldSetSimple': instance.fieldSetSimple.toList(),
       'fieldMapSimple': instance.fieldMapSimple,
       'fieldMapListString': instance.fieldMapListString,
-      'fieldEnum': _$GreekEnumMap[instance.fieldEnum],
+      'durationField': instance.durationField.inMicroseconds,
+      'fieldEnum': _$GreekEnumMap[instance.fieldEnum]!,
       'constClass': instance.constClass,
-      'valueFromConverter':
-          const ConstClassConverter().toJson(instance.valueFromConverter),
+      'valueFromConverter': const ConstClassConverter().toJson(
+        instance.valueFromConverter,
+      ),
       'valueFromFunction': constClassToJson(instance.valueFromFunction),
+      'intDefaultValueFromFunction': instance.intDefaultValueFromFunction,
+      'valueFromDefaultValueDefaultConstructor':
+          instance.valueFromDefaultValueDefaultConstructor,
+      'valueFromDefaultValueNamedConstructor':
+          instance.valueFromDefaultValueNamedConstructor,
     };
 
 const _$GreekEnumMap = {
diff --git a/json_serializable/test/default_value/default_value_interface.dart b/json_serializable/test/default_value/default_value_interface.dart
index 9becc6e6f..3fa93ed24 100644
--- a/json_serializable/test/default_value/default_value_interface.dart
+++ b/json_serializable/test/default_value/default_value_interface.dart
@@ -27,6 +27,8 @@ abstract class DefaultValue {
 
   Map<String, List<String>> get fieldMapListString;
 
+  Duration get durationField;
+
   Greek get fieldEnum;
 
   ConstClass get constClass;
@@ -34,6 +36,12 @@ abstract class DefaultValue {
   ConstClass get valueFromConverter;
 
   ConstClass get valueFromFunction;
+
+  int get intDefaultValueFromFunction;
+
+  ConstClass get valueFromDefaultValueDefaultConstructor;
+
+  ConstClass get valueFromDefaultValueNamedConstructor;
 }
 
 enum Greek { alpha, beta, gamma, delta }
@@ -42,15 +50,14 @@ enum Greek { alpha, beta, gamma, delta }
 class ConstClass {
   final String field;
 
-  const ConstClass(this.field);
+  const ConstClass([this.field = 'default']);
+
+  ConstClass.easy() : field = 'easy';
 
-  factory ConstClass.fromJson(Map<String, dynamic> json) => ConstClass(
-        json['field'] as String,
-      );
+  factory ConstClass.fromJson(Map<String, dynamic> json) =>
+      ConstClass(json['field'] as String);
 
-  Map<String, dynamic> toJson() => <String, dynamic>{
-        'field': field,
-      };
+  Map<String, dynamic> toJson() => <String, dynamic>{'field': field};
 }
 
 ConstClass constClassFromJson(String json) => ConstClass(json);
@@ -66,3 +73,5 @@ class ConstClassConverter extends JsonConverter<ConstClass, String> {
   @override
   String toJson(ConstClass object) => object.field;
 }
+
+int intDefaultValueFunction() => 43;
diff --git a/json_serializable/test/default_value/default_value_test.dart b/json_serializable/test/default_value/default_value_test.dart
index baee4b811..d53a4fb47 100644
--- a/json_serializable/test/default_value/default_value_test.dart
+++ b/json_serializable/test/default_value/default_value_test.dart
@@ -15,19 +15,23 @@ const _defaultInstance = {
   'fieldString': 'string',
   'fieldInt': 42,
   'fieldDouble': 3.14,
-  'fieldListEmpty': [],
-  'fieldSetEmpty': [],
+  'fieldListEmpty': <dynamic>[],
+  'fieldSetEmpty': <dynamic>[],
   'fieldMapEmpty': <String, dynamic>{},
   'fieldListSimple': [1, 2, 3],
   'fieldSetSimple': ['entry1', 'entry2'],
   'fieldMapSimple': <String, dynamic>{'answer': 42},
   'fieldMapListString': {
-    'root': ['child']
+    'root': ['child'],
   },
+  'durationField': 0,
   'fieldEnum': 'beta',
   'constClass': {'field': 'value'},
   'valueFromConverter': 'value',
   'valueFromFunction': 'value',
+  'intDefaultValueFromFunction': 43,
+  'valueFromDefaultValueDefaultConstructor': {'field': 'default'},
+  'valueFromDefaultValueNamedConstructor': {'field': 'easy'},
 };
 
 const _otherValues = {
@@ -42,12 +46,16 @@ const _otherValues = {
   'fieldSetSimple': ['entry3'],
   'fieldMapSimple': <String, dynamic>{},
   'fieldMapListString': {
-    'root2': ['alpha']
+    'root2': ['alpha'],
   },
+  'durationField': 1,
   'fieldEnum': 'delta',
   'constClass': {'field': 'otherValue'},
   'valueFromConverter': 'otherValue',
   'valueFromFunction': 'otherValue',
+  'intDefaultValueFromFunction': 44,
+  'valueFromDefaultValueDefaultConstructor': {'field': 'other'},
+  'valueFromDefaultValueNamedConstructor': {'field': 'other'},
 };
 
 void main() {
diff --git a/json_serializable/test/default_value/implicit_default_value.dart b/json_serializable/test/default_value/implicit_default_value.dart
index ad6c6c52b..8b7d3def5 100644
--- a/json_serializable/test/default_value/implicit_default_value.dart
+++ b/json_serializable/test/default_value/implicit_default_value.dart
@@ -34,6 +34,8 @@ class DefaultValueImplicit implements dvi.DefaultValue {
 
   final Map<String, List<String>> fieldMapListString;
 
+  final Duration durationField;
+
   final Greek fieldEnum;
 
   final ConstClass constClass;
@@ -44,6 +46,12 @@ class DefaultValueImplicit implements dvi.DefaultValue {
   @JsonKey(fromJson: constClassFromJson, toJson: constClassToJson)
   ConstClass valueFromFunction;
 
+  int intDefaultValueFromFunction;
+
+  ConstClass valueFromDefaultValueDefaultConstructor;
+
+  ConstClass valueFromDefaultValueNamedConstructor;
+
   DefaultValueImplicit({
     this.fieldBool = true,
     this.fieldString = 'string',
@@ -56,12 +64,16 @@ class DefaultValueImplicit implements dvi.DefaultValue {
     this.fieldSetSimple = const {'entry1', 'entry2'},
     this.fieldMapSimple = const {'answer': 42},
     this.fieldMapListString = const {
-      'root': ['child']
+      'root': ['child'],
     },
     this.fieldEnum = Greek.beta,
+    this.durationField = const Duration(),
     this.constClass = const ConstClass('value'),
     this.valueFromConverter = const ConstClass('value'),
     this.valueFromFunction = const ConstClass('value'),
+    this.intDefaultValueFromFunction = 43,
+    this.valueFromDefaultValueDefaultConstructor = const ConstClass(),
+    this.valueFromDefaultValueNamedConstructor = const ConstClass('easy'),
   });
 
   factory DefaultValueImplicit.fromJson(Map<String, dynamic> json) =>
diff --git a/json_serializable/test/default_value/implicit_default_value.g.dart b/json_serializable/test/default_value/implicit_default_value.g.dart
index fe5d17283..06cb4a462 100644
--- a/json_serializable/test/default_value/implicit_default_value.g.dart
+++ b/json_serializable/test/default_value/implicit_default_value.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'implicit_default_value.dart';
 
@@ -9,70 +9,98 @@ part of 'implicit_default_value.dart';
 // **************************************************************************
 
 DefaultValueImplicit _$DefaultValueImplicitFromJson(
-        Map<String, dynamic> json) =>
-    DefaultValueImplicit(
-      fieldBool: json['fieldBool'] as bool? ?? true,
-      fieldString: json['fieldString'] as String? ?? 'string',
-      fieldInt: json['fieldInt'] as int? ?? 42,
-      fieldDouble: (json['fieldDouble'] as num?)?.toDouble() ?? 3.14,
-      fieldListEmpty: json['fieldListEmpty'] as List<dynamic>? ?? const [],
-      fieldSetEmpty:
-          (json['fieldSetEmpty'] as List<dynamic>?)?.toSet() ?? const {},
-      fieldMapEmpty: json['fieldMapEmpty'] as Map<String, dynamic>? ?? const {},
-      fieldListSimple: (json['fieldListSimple'] as List<dynamic>?)
-              ?.map((e) => e as int)
-              .toList() ??
-          const [1, 2, 3],
-      fieldSetSimple: (json['fieldSetSimple'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toSet() ??
-          const {'entry1', 'entry2'},
-      fieldMapSimple: (json['fieldMapSimple'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as int),
-          ) ??
-          const {'answer': 42},
-      fieldMapListString:
-          (json['fieldMapListString'] as Map<String, dynamic>?)?.map(
-                (k, e) => MapEntry(
-                    k, (e as List<dynamic>).map((e) => e as String).toList()),
-              ) ??
-              const {
-                'root': ['child']
-              },
-      fieldEnum:
-          $enumDecodeNullable(_$GreekEnumMap, json['fieldEnum']) ?? Greek.beta,
-      constClass: json['constClass'] == null
-          ? const ConstClass('value')
-          : ConstClass.fromJson(json['constClass'] as Map<String, dynamic>),
-      valueFromConverter: json['valueFromConverter'] == null
-          ? const ConstClass('value')
-          : const ConstClassConverter()
-              .fromJson(json['valueFromConverter'] as String),
-      valueFromFunction: json['valueFromFunction'] == null
-          ? const ConstClass('value')
-          : constClassFromJson(json['valueFromFunction'] as String),
-    );
+  Map<String, dynamic> json,
+) => DefaultValueImplicit(
+  fieldBool: json['fieldBool'] as bool? ?? true,
+  fieldString: json['fieldString'] as String? ?? 'string',
+  fieldInt: (json['fieldInt'] as num?)?.toInt() ?? 42,
+  fieldDouble: (json['fieldDouble'] as num?)?.toDouble() ?? 3.14,
+  fieldListEmpty: json['fieldListEmpty'] as List<dynamic>? ?? const [],
+  fieldSetEmpty: (json['fieldSetEmpty'] as List<dynamic>?)?.toSet() ?? const {},
+  fieldMapEmpty: json['fieldMapEmpty'] as Map<String, dynamic>? ?? const {},
+  fieldListSimple:
+      (json['fieldListSimple'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList() ??
+      const [1, 2, 3],
+  fieldSetSimple:
+      (json['fieldSetSimple'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toSet() ??
+      const {'entry1', 'entry2'},
+  fieldMapSimple:
+      (json['fieldMapSimple'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ) ??
+      const {'answer': 42},
+  fieldMapListString:
+      (json['fieldMapListString'] as Map<String, dynamic>?)?.map(
+        (k, e) =>
+            MapEntry(k, (e as List<dynamic>).map((e) => e as String).toList()),
+      ) ??
+      const {
+        'root': ['child'],
+      },
+  fieldEnum:
+      $enumDecodeNullable(_$GreekEnumMap, json['fieldEnum']) ?? Greek.beta,
+  durationField: json['durationField'] == null
+      ? const Duration()
+      : Duration(microseconds: (json['durationField'] as num).toInt()),
+  constClass: json['constClass'] == null
+      ? const ConstClass('value')
+      : ConstClass.fromJson(json['constClass'] as Map<String, dynamic>),
+  valueFromConverter: json['valueFromConverter'] == null
+      ? const ConstClass('value')
+      : const ConstClassConverter().fromJson(
+          json['valueFromConverter'] as String,
+        ),
+  valueFromFunction: json['valueFromFunction'] == null
+      ? const ConstClass('value')
+      : constClassFromJson(json['valueFromFunction'] as String),
+  intDefaultValueFromFunction:
+      (json['intDefaultValueFromFunction'] as num?)?.toInt() ?? 43,
+  valueFromDefaultValueDefaultConstructor:
+      json['valueFromDefaultValueDefaultConstructor'] == null
+      ? const ConstClass()
+      : ConstClass.fromJson(
+          json['valueFromDefaultValueDefaultConstructor']
+              as Map<String, dynamic>,
+        ),
+  valueFromDefaultValueNamedConstructor:
+      json['valueFromDefaultValueNamedConstructor'] == null
+      ? const ConstClass('easy')
+      : ConstClass.fromJson(
+          json['valueFromDefaultValueNamedConstructor'] as Map<String, dynamic>,
+        ),
+);
 
 Map<String, dynamic> _$DefaultValueImplicitToJson(
-        DefaultValueImplicit instance) =>
-    <String, dynamic>{
-      'fieldBool': instance.fieldBool,
-      'fieldString': instance.fieldString,
-      'fieldInt': instance.fieldInt,
-      'fieldDouble': instance.fieldDouble,
-      'fieldListEmpty': instance.fieldListEmpty,
-      'fieldSetEmpty': instance.fieldSetEmpty.toList(),
-      'fieldMapEmpty': instance.fieldMapEmpty,
-      'fieldListSimple': instance.fieldListSimple,
-      'fieldSetSimple': instance.fieldSetSimple.toList(),
-      'fieldMapSimple': instance.fieldMapSimple,
-      'fieldMapListString': instance.fieldMapListString,
-      'fieldEnum': _$GreekEnumMap[instance.fieldEnum],
-      'constClass': instance.constClass,
-      'valueFromConverter':
-          const ConstClassConverter().toJson(instance.valueFromConverter),
-      'valueFromFunction': constClassToJson(instance.valueFromFunction),
-    };
+  DefaultValueImplicit instance,
+) => <String, dynamic>{
+  'fieldBool': instance.fieldBool,
+  'fieldString': instance.fieldString,
+  'fieldInt': instance.fieldInt,
+  'fieldDouble': instance.fieldDouble,
+  'fieldListEmpty': instance.fieldListEmpty,
+  'fieldSetEmpty': instance.fieldSetEmpty.toList(),
+  'fieldMapEmpty': instance.fieldMapEmpty,
+  'fieldListSimple': instance.fieldListSimple,
+  'fieldSetSimple': instance.fieldSetSimple.toList(),
+  'fieldMapSimple': instance.fieldMapSimple,
+  'fieldMapListString': instance.fieldMapListString,
+  'durationField': instance.durationField.inMicroseconds,
+  'fieldEnum': _$GreekEnumMap[instance.fieldEnum]!,
+  'constClass': instance.constClass,
+  'valueFromConverter': const ConstClassConverter().toJson(
+    instance.valueFromConverter,
+  ),
+  'valueFromFunction': constClassToJson(instance.valueFromFunction),
+  'intDefaultValueFromFunction': instance.intDefaultValueFromFunction,
+  'valueFromDefaultValueDefaultConstructor':
+      instance.valueFromDefaultValueDefaultConstructor,
+  'valueFromDefaultValueNamedConstructor':
+      instance.valueFromDefaultValueNamedConstructor,
+};
 
 const _$GreekEnumMap = {
   Greek.alpha: 'alpha',
diff --git a/json_serializable/test/ensure_build_test.dart b/json_serializable/test/ensure_build_test.dart
index 487646cb3..9dac5390d 100644
--- a/json_serializable/test/ensure_build_test.dart
+++ b/json_serializable/test/ensure_build_test.dart
@@ -4,10 +4,15 @@
 
 @TestOn('vm')
 @Tags(['presubmit-only'])
+library;
+
 import 'package:build_verify/build_verify.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test('ensure_build',
-      () => expectBuildClean(packageRelativeDirectory: 'json_serializable'));
+  test(
+    'ensure_build',
+    () => expectBuildClean(packageRelativeDirectory: 'json_serializable'),
+    timeout: const Timeout.factor(2),
+  );
 }
diff --git a/json_serializable/test/enum_helper_test.dart b/json_serializable/test/enum_helper_test.dart
index 4399dc843..2355b0aa4 100644
--- a/json_serializable/test/enum_helper_test.dart
+++ b/json_serializable/test/enum_helper_test.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library;
+
 import 'package:json_serializable/src/type_helpers/enum_helper.dart';
 import 'package:test/test.dart';
 
@@ -14,7 +16,7 @@ void main() {
         'HELLO',
         'hi_to',
         '_private',
-        'weird_'
+        'weird_',
       ]) {
         test(expression, () {
           expect(simpleExpression.hasMatch(expression), isTrue);
diff --git a/json_serializable/test/field_matrix_test.dart b/json_serializable/test/field_matrix_test.dart
new file mode 100644
index 000000000..dd4c68251
--- /dev/null
+++ b/json_serializable/test/field_matrix_test.dart
@@ -0,0 +1,96 @@
+import 'dart:convert';
+
+import 'package:test/test.dart';
+
+import 'field_matrix_test.field_matrix.dart';
+
+void main() {
+  test('test', () {
+    final result = Map.fromEntries(
+      fromJsonFactories.map((e) {
+        final instance = e({'field': 42});
+        return MapEntry(instance.toString(), {
+          'with': instance,
+          'without': e({}),
+        });
+      }),
+    );
+
+    expect(jsonDecode(jsonEncode(result)), _expectedResult);
+  });
+}
+
+const _expectedResult = {
+  'ToJsonNullFromJsonNullPublic: field: 42': {
+    'with': {'aField': null, 'field': 42, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonNullFromJsonTruePublic: field: 42': {
+    'with': {'aField': null, 'field': 42, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonNullFromJsonFalsePublic: field: null': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonTrueFromJsonNullPublic: field: 42': {
+    'with': {'aField': null, 'field': 42, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonTrueFromJsonTruePublic: field: 42': {
+    'with': {'aField': null, 'field': 42, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonTrueFromJsonFalsePublic: field: null': {
+    'with': {'aField': null, 'field': null, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonFalseFromJsonNullPublic: field: 42': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonFalseFromJsonTruePublic: field: 42': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonFalseFromJsonFalsePublic: field: null': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonNullFromJsonNullPrivate: _field: null': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonNullFromJsonTruePrivate: _field: 42': {
+    'with': {'aField': null, 'field': 42, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonNullFromJsonFalsePrivate: _field: null': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonTrueFromJsonNullPrivate: _field: null': {
+    'with': {'aField': null, 'field': null, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonTrueFromJsonTruePrivate: _field: 42': {
+    'with': {'aField': null, 'field': 42, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonTrueFromJsonFalsePrivate: _field: null': {
+    'with': {'aField': null, 'field': null, 'zField': null},
+    'without': {'aField': null, 'field': null, 'zField': null},
+  },
+  'ToJsonFalseFromJsonNullPrivate: _field: null': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonFalseFromJsonTruePrivate: _field: 42': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+  'ToJsonFalseFromJsonFalsePrivate: _field: null': {
+    'with': {'aField': null, 'zField': null},
+    'without': {'aField': null, 'zField': null},
+  },
+};
diff --git a/json_serializable/test/field_matrix_test.field_matrix.dart b/json_serializable/test/field_matrix_test.field_matrix.dart
new file mode 100644
index 000000000..8515129ff
--- /dev/null
+++ b/json_serializable/test/field_matrix_test.field_matrix.dart
@@ -0,0 +1,384 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'field_matrix_test.field_matrix.g.dart';
+
+@JsonSerializable()
+class ToJsonNullFromJsonNullPublic {
+  ToJsonNullFromJsonNullPublic();
+
+  int? aField;
+
+  int? field;
+
+  int? zField;
+
+  factory ToJsonNullFromJsonNullPublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonNullFromJsonNullPublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonNullFromJsonNullPublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonNullFromJsonNullPublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonNullFromJsonTruePublic {
+  ToJsonNullFromJsonTruePublic();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: true)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonNullFromJsonTruePublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonNullFromJsonTruePublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonNullFromJsonTruePublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonNullFromJsonTruePublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonNullFromJsonFalsePublic {
+  ToJsonNullFromJsonFalsePublic();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: false)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonNullFromJsonFalsePublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonNullFromJsonFalsePublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonNullFromJsonFalsePublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonNullFromJsonFalsePublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonTrueFromJsonNullPublic {
+  ToJsonTrueFromJsonNullPublic();
+
+  int? aField;
+
+  @JsonKey(includeToJson: true)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonTrueFromJsonNullPublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonTrueFromJsonNullPublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonTrueFromJsonNullPublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonTrueFromJsonNullPublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonTrueFromJsonTruePublic {
+  ToJsonTrueFromJsonTruePublic();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: true, includeToJson: true)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonTrueFromJsonTruePublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonTrueFromJsonTruePublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonTrueFromJsonTruePublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonTrueFromJsonTruePublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonTrueFromJsonFalsePublic {
+  ToJsonTrueFromJsonFalsePublic();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: false, includeToJson: true)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonTrueFromJsonFalsePublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonTrueFromJsonFalsePublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonTrueFromJsonFalsePublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonTrueFromJsonFalsePublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonFalseFromJsonNullPublic {
+  ToJsonFalseFromJsonNullPublic();
+
+  int? aField;
+
+  @JsonKey(includeToJson: false)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonFalseFromJsonNullPublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonFalseFromJsonNullPublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonFalseFromJsonNullPublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonFalseFromJsonNullPublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonFalseFromJsonTruePublic {
+  ToJsonFalseFromJsonTruePublic();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: true, includeToJson: false)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonFalseFromJsonTruePublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonFalseFromJsonTruePublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonFalseFromJsonTruePublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonFalseFromJsonTruePublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonFalseFromJsonFalsePublic {
+  ToJsonFalseFromJsonFalsePublic();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  int? field;
+
+  int? zField;
+
+  factory ToJsonFalseFromJsonFalsePublic.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonFalseFromJsonFalsePublicFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonFalseFromJsonFalsePublicToJson(this);
+
+  @override
+  String toString() => 'ToJsonFalseFromJsonFalsePublic: field: $field';
+}
+
+@JsonSerializable()
+class ToJsonNullFromJsonNullPrivate {
+  ToJsonNullFromJsonNullPrivate();
+
+  int? aField;
+
+  @JsonKey(name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonNullFromJsonNullPrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonNullFromJsonNullPrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonNullFromJsonNullPrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonNullFromJsonNullPrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonNullFromJsonTruePrivate {
+  ToJsonNullFromJsonTruePrivate();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: true, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonNullFromJsonTruePrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonNullFromJsonTruePrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonNullFromJsonTruePrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonNullFromJsonTruePrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonNullFromJsonFalsePrivate {
+  ToJsonNullFromJsonFalsePrivate();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: false, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonNullFromJsonFalsePrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonNullFromJsonFalsePrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonNullFromJsonFalsePrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonNullFromJsonFalsePrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonTrueFromJsonNullPrivate {
+  ToJsonTrueFromJsonNullPrivate();
+
+  int? aField;
+
+  @JsonKey(includeToJson: true, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonTrueFromJsonNullPrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonTrueFromJsonNullPrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonTrueFromJsonNullPrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonTrueFromJsonNullPrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonTrueFromJsonTruePrivate {
+  ToJsonTrueFromJsonTruePrivate();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: true, includeToJson: true, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonTrueFromJsonTruePrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonTrueFromJsonTruePrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonTrueFromJsonTruePrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonTrueFromJsonTruePrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonTrueFromJsonFalsePrivate {
+  ToJsonTrueFromJsonFalsePrivate();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: false, includeToJson: true, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonTrueFromJsonFalsePrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonTrueFromJsonFalsePrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonTrueFromJsonFalsePrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonTrueFromJsonFalsePrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonFalseFromJsonNullPrivate {
+  ToJsonFalseFromJsonNullPrivate();
+
+  int? aField;
+
+  @JsonKey(includeToJson: false, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonFalseFromJsonNullPrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonFalseFromJsonNullPrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonFalseFromJsonNullPrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonFalseFromJsonNullPrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonFalseFromJsonTruePrivate {
+  ToJsonFalseFromJsonTruePrivate();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: true, includeToJson: false, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonFalseFromJsonTruePrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonFalseFromJsonTruePrivateFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ToJsonFalseFromJsonTruePrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonFalseFromJsonTruePrivate: _field: $_field';
+}
+
+@JsonSerializable()
+class ToJsonFalseFromJsonFalsePrivate {
+  ToJsonFalseFromJsonFalsePrivate();
+
+  int? aField;
+
+  @JsonKey(includeFromJson: false, includeToJson: false, name: 'field')
+  int? _field;
+
+  int? zField;
+
+  factory ToJsonFalseFromJsonFalsePrivate.fromJson(Map<String, dynamic> json) =>
+      _$ToJsonFalseFromJsonFalsePrivateFromJson(json);
+
+  Map<String, dynamic> toJson() =>
+      _$ToJsonFalseFromJsonFalsePrivateToJson(this);
+
+  @override
+  String toString() => 'ToJsonFalseFromJsonFalsePrivate: _field: $_field';
+}
+
+const fromJsonFactories = <Object Function(Map<String, dynamic>)>{
+  ToJsonNullFromJsonNullPublic.fromJson,
+  ToJsonNullFromJsonTruePublic.fromJson,
+  ToJsonNullFromJsonFalsePublic.fromJson,
+  ToJsonTrueFromJsonNullPublic.fromJson,
+  ToJsonTrueFromJsonTruePublic.fromJson,
+  ToJsonTrueFromJsonFalsePublic.fromJson,
+  ToJsonFalseFromJsonNullPublic.fromJson,
+  ToJsonFalseFromJsonTruePublic.fromJson,
+  ToJsonFalseFromJsonFalsePublic.fromJson,
+  ToJsonNullFromJsonNullPrivate.fromJson,
+  ToJsonNullFromJsonTruePrivate.fromJson,
+  ToJsonNullFromJsonFalsePrivate.fromJson,
+  ToJsonTrueFromJsonNullPrivate.fromJson,
+  ToJsonTrueFromJsonTruePrivate.fromJson,
+  ToJsonTrueFromJsonFalsePrivate.fromJson,
+  ToJsonFalseFromJsonNullPrivate.fromJson,
+  ToJsonFalseFromJsonTruePrivate.fromJson,
+  ToJsonFalseFromJsonFalsePrivate.fromJson,
+};
diff --git a/json_serializable/test/field_matrix_test.field_matrix.g.dart b/json_serializable/test/field_matrix_test.field_matrix.g.dart
new file mode 100644
index 000000000..d61a2566d
--- /dev/null
+++ b/json_serializable/test/field_matrix_test.field_matrix.g.dart
@@ -0,0 +1,234 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
+
+part of 'field_matrix_test.field_matrix.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ToJsonNullFromJsonNullPublic _$ToJsonNullFromJsonNullPublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonNullFromJsonNullPublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonNullFromJsonNullPublicToJson(
+  ToJsonNullFromJsonNullPublic instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance.field,
+  'zField': instance.zField,
+};
+
+ToJsonNullFromJsonTruePublic _$ToJsonNullFromJsonTruePublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonNullFromJsonTruePublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonNullFromJsonTruePublicToJson(
+  ToJsonNullFromJsonTruePublic instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance.field,
+  'zField': instance.zField,
+};
+
+ToJsonNullFromJsonFalsePublic _$ToJsonNullFromJsonFalsePublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonNullFromJsonFalsePublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonNullFromJsonFalsePublicToJson(
+  ToJsonNullFromJsonFalsePublic instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonTrueFromJsonNullPublic _$ToJsonTrueFromJsonNullPublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonTrueFromJsonNullPublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonTrueFromJsonNullPublicToJson(
+  ToJsonTrueFromJsonNullPublic instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance.field,
+  'zField': instance.zField,
+};
+
+ToJsonTrueFromJsonTruePublic _$ToJsonTrueFromJsonTruePublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonTrueFromJsonTruePublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonTrueFromJsonTruePublicToJson(
+  ToJsonTrueFromJsonTruePublic instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance.field,
+  'zField': instance.zField,
+};
+
+ToJsonTrueFromJsonFalsePublic _$ToJsonTrueFromJsonFalsePublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonTrueFromJsonFalsePublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonTrueFromJsonFalsePublicToJson(
+  ToJsonTrueFromJsonFalsePublic instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance.field,
+  'zField': instance.zField,
+};
+
+ToJsonFalseFromJsonNullPublic _$ToJsonFalseFromJsonNullPublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonFalseFromJsonNullPublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonFalseFromJsonNullPublicToJson(
+  ToJsonFalseFromJsonNullPublic instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonFalseFromJsonTruePublic _$ToJsonFalseFromJsonTruePublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonFalseFromJsonTruePublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonFalseFromJsonTruePublicToJson(
+  ToJsonFalseFromJsonTruePublic instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonFalseFromJsonFalsePublic _$ToJsonFalseFromJsonFalsePublicFromJson(
+  Map<String, dynamic> json,
+) => ToJsonFalseFromJsonFalsePublic()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonFalseFromJsonFalsePublicToJson(
+  ToJsonFalseFromJsonFalsePublic instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonNullFromJsonNullPrivate _$ToJsonNullFromJsonNullPrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonNullFromJsonNullPrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonNullFromJsonNullPrivateToJson(
+  ToJsonNullFromJsonNullPrivate instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonNullFromJsonTruePrivate _$ToJsonNullFromJsonTruePrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonNullFromJsonTruePrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  .._field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonNullFromJsonTruePrivateToJson(
+  ToJsonNullFromJsonTruePrivate instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance._field,
+  'zField': instance.zField,
+};
+
+ToJsonNullFromJsonFalsePrivate _$ToJsonNullFromJsonFalsePrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonNullFromJsonFalsePrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonNullFromJsonFalsePrivateToJson(
+  ToJsonNullFromJsonFalsePrivate instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonTrueFromJsonNullPrivate _$ToJsonTrueFromJsonNullPrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonTrueFromJsonNullPrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonTrueFromJsonNullPrivateToJson(
+  ToJsonTrueFromJsonNullPrivate instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance._field,
+  'zField': instance.zField,
+};
+
+ToJsonTrueFromJsonTruePrivate _$ToJsonTrueFromJsonTruePrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonTrueFromJsonTruePrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  .._field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonTrueFromJsonTruePrivateToJson(
+  ToJsonTrueFromJsonTruePrivate instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance._field,
+  'zField': instance.zField,
+};
+
+ToJsonTrueFromJsonFalsePrivate _$ToJsonTrueFromJsonFalsePrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonTrueFromJsonFalsePrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonTrueFromJsonFalsePrivateToJson(
+  ToJsonTrueFromJsonFalsePrivate instance,
+) => <String, dynamic>{
+  'aField': instance.aField,
+  'field': instance._field,
+  'zField': instance.zField,
+};
+
+ToJsonFalseFromJsonNullPrivate _$ToJsonFalseFromJsonNullPrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonFalseFromJsonNullPrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonFalseFromJsonNullPrivateToJson(
+  ToJsonFalseFromJsonNullPrivate instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonFalseFromJsonTruePrivate _$ToJsonFalseFromJsonTruePrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonFalseFromJsonTruePrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  .._field = (json['field'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonFalseFromJsonTruePrivateToJson(
+  ToJsonFalseFromJsonTruePrivate instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
+
+ToJsonFalseFromJsonFalsePrivate _$ToJsonFalseFromJsonFalsePrivateFromJson(
+  Map<String, dynamic> json,
+) => ToJsonFalseFromJsonFalsePrivate()
+  ..aField = (json['aField'] as num?)?.toInt()
+  ..zField = (json['zField'] as num?)?.toInt();
+
+Map<String, dynamic> _$ToJsonFalseFromJsonFalsePrivateToJson(
+  ToJsonFalseFromJsonFalsePrivate instance,
+) => <String, dynamic>{'aField': instance.aField, 'zField': instance.zField};
diff --git a/json_serializable/test/generic_files/generic_argument_factories.dart b/json_serializable/test/generic_files/generic_argument_factories.dart
index 0ebb09d69..b87154632 100644
--- a/json_serializable/test/generic_files/generic_argument_factories.dart
+++ b/json_serializable/test/generic_files/generic_argument_factories.dart
@@ -14,24 +14,18 @@ class GenericClassWithHelpers<T, S> {
 
   final Set<S> someSet;
 
-  GenericClassWithHelpers(
-    this.value,
-    this.list,
-    this.someSet,
-  );
+  GenericClassWithHelpers(this.value, this.list, this.someSet);
 
   factory GenericClassWithHelpers.fromJson(
     Map<String, dynamic> json,
     T Function(Object? json) fromJsonT,
     S Function(Object? json) fromJsonS,
-  ) =>
-      _$GenericClassWithHelpersFromJson(json, fromJsonT, fromJsonS);
+  ) => _$GenericClassWithHelpersFromJson(json, fromJsonT, fromJsonS);
 
   Map<String, dynamic> toJson(
     Object? Function(T value) toJsonT,
     Object? Function(S value) toJsonS,
-  ) =>
-      _$GenericClassWithHelpersToJson(this, toJsonT, toJsonS);
+  ) => _$GenericClassWithHelpersToJson(this, toJsonT, toJsonS);
 }
 
 @JsonSerializable()
diff --git a/json_serializable/test/generic_files/generic_argument_factories.g.dart b/json_serializable/test/generic_files/generic_argument_factories.g.dart
index 965996240..a4d098d52 100644
--- a/json_serializable/test/generic_files/generic_argument_factories.g.dart
+++ b/json_serializable/test/generic_files/generic_argument_factories.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'generic_argument_factories.dart';
 
@@ -12,46 +12,44 @@ GenericClassWithHelpers<T, S> _$GenericClassWithHelpersFromJson<T, S>(
   Map<String, dynamic> json,
   T Function(Object? json) fromJsonT,
   S Function(Object? json) fromJsonS,
-) =>
-    GenericClassWithHelpers<T, S>(
-      fromJsonT(json['value']),
-      (json['list'] as List<dynamic>).map(fromJsonT).toList(),
-      (json['someSet'] as List<dynamic>).map(fromJsonS).toSet(),
-    );
+) => GenericClassWithHelpers<T, S>(
+  fromJsonT(json['value']),
+  (json['list'] as List<dynamic>).map(fromJsonT).toList(),
+  (json['someSet'] as List<dynamic>).map(fromJsonS).toSet(),
+);
 
 Map<String, dynamic> _$GenericClassWithHelpersToJson<T, S>(
   GenericClassWithHelpers<T, S> instance,
   Object? Function(T value) toJsonT,
   Object? Function(S value) toJsonS,
-) =>
-    <String, dynamic>{
-      'value': toJsonT(instance.value),
-      'list': instance.list.map(toJsonT).toList(),
-      'someSet': instance.someSet.map(toJsonS).toList(),
-    };
+) => <String, dynamic>{
+  'value': toJsonT(instance.value),
+  'list': instance.list.map(toJsonT).toList(),
+  'someSet': instance.someSet.map(toJsonS).toList(),
+};
 
 ConcreteClass _$ConcreteClassFromJson(Map<String, dynamic> json) =>
     ConcreteClass(
       GenericClassWithHelpers<int, String>.fromJson(
-          json['value'] as Map<String, dynamic>,
-          (value) => value as int,
-          (value) => value as String),
+        json['value'] as Map<String, dynamic>,
+        (value) => (value as num).toInt(),
+        (value) => value as String,
+      ),
       GenericClassWithHelpers<double, BigInt>.fromJson(
-          json['value2'] as Map<String, dynamic>,
-          (value) => (value as num).toDouble(),
-          (value) => BigInt.parse(value as String)),
+        json['value2'] as Map<String, dynamic>,
+        (value) => (value as num).toDouble(),
+        (value) => BigInt.parse(value as String),
+      ),
       GenericClassWithHelpers<double?, BigInt?>.fromJson(
-          json['value3'] as Map<String, dynamic>,
-          (value) => (value as num?)?.toDouble(),
-          (value) => value == null ? null : BigInt.parse(value as String)),
+        json['value3'] as Map<String, dynamic>,
+        (value) => (value as num?)?.toDouble(),
+        (value) => value == null ? null : BigInt.parse(value as String),
+      ),
     );
 
 Map<String, dynamic> _$ConcreteClassToJson(ConcreteClass instance) =>
     <String, dynamic>{
-      'value': instance.value.toJson(
-        (value) => value,
-        (value) => value,
-      ),
+      'value': instance.value.toJson((value) => value, (value) => value),
       'value2': instance.value2.toJson(
         (value) => value,
         (value) => value.toString(),
diff --git a/json_serializable/test/generic_files/generic_argument_factories_nullable.dart b/json_serializable/test/generic_files/generic_argument_factories_nullable.dart
index 355d30a84..f883c140f 100644
--- a/json_serializable/test/generic_files/generic_argument_factories_nullable.dart
+++ b/json_serializable/test/generic_files/generic_argument_factories_nullable.dart
@@ -2,8 +2,6 @@
 // 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.
 
-// @dart=2.12
-
 import 'package:json_annotation/json_annotation.dart';
 
 part 'generic_argument_factories_nullable.g.dart';
@@ -16,24 +14,18 @@ class GenericClassWithHelpersNullable<T, S> {
 
   final Set<S?>? someSet;
 
-  GenericClassWithHelpersNullable({
-    this.value,
-    this.list,
-    this.someSet,
-  });
+  GenericClassWithHelpersNullable({this.value, this.list, this.someSet});
 
   factory GenericClassWithHelpersNullable.fromJson(
     Map<String, dynamic> json,
     T Function(Object? json) fromJsonT,
     S Function(Object? json) fromJsonS,
-  ) =>
-      _$GenericClassWithHelpersNullableFromJson(json, fromJsonT, fromJsonS);
+  ) => _$GenericClassWithHelpersNullableFromJson(json, fromJsonT, fromJsonS);
 
   Map<String, dynamic> toJson(
     Object? Function(T value) toJsonT,
     Object? Function(S value) toJsonS,
-  ) =>
-      _$GenericClassWithHelpersNullableToJson(this, toJsonT, toJsonS);
+  ) => _$GenericClassWithHelpersNullableToJson(this, toJsonT, toJsonS);
 }
 
 @JsonSerializable()
diff --git a/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart b/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart
index 93bde3ca0..556ec9de1 100644
--- a/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart
+++ b/json_serializable/test/generic_files/generic_argument_factories_nullable.g.dart
@@ -1,7 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
-// @dart=2.12
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'generic_argument_factories_nullable.dart';
 
@@ -10,78 +9,74 @@ part of 'generic_argument_factories_nullable.dart';
 // **************************************************************************
 
 GenericClassWithHelpersNullable<T, S>
-    _$GenericClassWithHelpersNullableFromJson<T, S>(
+_$GenericClassWithHelpersNullableFromJson<T, S>(
   Map<String, dynamic> json,
   T Function(Object? json) fromJsonT,
   S Function(Object? json) fromJsonS,
-) =>
-        GenericClassWithHelpersNullable<T, S>(
-          value: _$nullableGenericFromJson(json['value'], fromJsonT),
-          list: (json['list'] as List<dynamic>?)
-              ?.map((e) => _$nullableGenericFromJson(e, fromJsonT))
-              .toList(),
-          someSet: (json['someSet'] as List<dynamic>?)
-              ?.map((e) => _$nullableGenericFromJson(e, fromJsonS))
-              .toSet(),
-        );
+) => GenericClassWithHelpersNullable<T, S>(
+  value: _$nullableGenericFromJson(json['value'], fromJsonT),
+  list: (json['list'] as List<dynamic>?)
+      ?.map((e) => _$nullableGenericFromJson(e, fromJsonT))
+      .toList(),
+  someSet: (json['someSet'] as List<dynamic>?)
+      ?.map((e) => _$nullableGenericFromJson(e, fromJsonS))
+      .toSet(),
+);
 
 Map<String, dynamic> _$GenericClassWithHelpersNullableToJson<T, S>(
   GenericClassWithHelpersNullable<T, S> instance,
   Object? Function(T value) toJsonT,
   Object? Function(S value) toJsonS,
-) =>
-    <String, dynamic>{
-      'value': _$nullableGenericToJson(instance.value, toJsonT),
-      'list': instance.list
-          ?.map((e) => _$nullableGenericToJson(e, toJsonT))
-          .toList(),
-      'someSet': instance.someSet
-          ?.map((e) => _$nullableGenericToJson(e, toJsonS))
-          .toList(),
-    };
+) => <String, dynamic>{
+  'value': _$nullableGenericToJson(instance.value, toJsonT),
+  'list': instance.list
+      ?.map((e) => _$nullableGenericToJson(e, toJsonT))
+      .toList(),
+  'someSet': instance.someSet
+      ?.map((e) => _$nullableGenericToJson(e, toJsonS))
+      .toList(),
+};
 
 T? _$nullableGenericFromJson<T>(
   Object? input,
   T Function(Object? json) fromJson,
-) =>
-    input == null ? null : fromJson(input);
+) => input == null ? null : fromJson(input);
 
 Object? _$nullableGenericToJson<T>(
   T? input,
   Object? Function(T value) toJson,
-) =>
-    input == null ? null : toJson(input);
+) => input == null ? null : toJson(input);
 
 ConcreteClassNullable _$ConcreteClassNullableFromJson(
-        Map<String, dynamic> json) =>
-    ConcreteClassNullable(
-      GenericClassWithHelpersNullable<int, String>.fromJson(
-          json['value'] as Map<String, dynamic>,
-          (value) => value as int,
-          (value) => value as String),
-      GenericClassWithHelpersNullable<double, BigInt>.fromJson(
-          json['value2'] as Map<String, dynamic>,
-          (value) => (value as num).toDouble(),
-          (value) => BigInt.parse(value as String)),
-      GenericClassWithHelpersNullable<double?, BigInt?>.fromJson(
-          json['value3'] as Map<String, dynamic>,
-          (value) => (value as num?)?.toDouble(),
-          (value) => value == null ? null : BigInt.parse(value as String)),
-    );
+  Map<String, dynamic> json,
+) => ConcreteClassNullable(
+  GenericClassWithHelpersNullable<int, String>.fromJson(
+    json['value'] as Map<String, dynamic>,
+    (value) => (value as num).toInt(),
+    (value) => value as String,
+  ),
+  GenericClassWithHelpersNullable<double, BigInt>.fromJson(
+    json['value2'] as Map<String, dynamic>,
+    (value) => (value as num).toDouble(),
+    (value) => BigInt.parse(value as String),
+  ),
+  GenericClassWithHelpersNullable<double?, BigInt?>.fromJson(
+    json['value3'] as Map<String, dynamic>,
+    (value) => (value as num?)?.toDouble(),
+    (value) => value == null ? null : BigInt.parse(value as String),
+  ),
+);
 
 Map<String, dynamic> _$ConcreteClassNullableToJson(
-        ConcreteClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toJson(
-        (value) => value,
-        (value) => value,
-      ),
-      'value2': instance.value2.toJson(
-        (value) => value,
-        (value) => value.toString(),
-      ),
-      'value3': instance.value3.toJson(
-        (value) => value,
-        (value) => value?.toString(),
-      ),
-    };
+  ConcreteClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.toJson((value) => value, (value) => value),
+  'value2': instance.value2.toJson(
+    (value) => value,
+    (value) => value.toString(),
+  ),
+  'value3': instance.value3.toJson(
+    (value) => value,
+    (value) => value?.toString(),
+  ),
+};
diff --git a/json_serializable/test/generic_files/generic_class.dart b/json_serializable/test/generic_files/generic_class.dart
index d0fbd6e0b..196bfeaca 100644
--- a/json_serializable/test/generic_files/generic_class.dart
+++ b/json_serializable/test/generic_files/generic_class.dart
@@ -2,7 +2,8 @@
 // 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 'package:collection/collection.dart';
+// ignore_for_file: inference_failure_on_instance_creation
+
 import 'package:json_annotation/json_annotation.dart';
 
 import '../test_utils.dart';
@@ -33,25 +34,32 @@ class GenericClass<T extends num, S> {
 
   Map<String, dynamic> toJson() => _$GenericClassToJson(this);
 
-  static T _dataFromJson<T, S, U>(Map<String, dynamic> input,
-          [S? other1, U? other2]) =>
-      input['value'] as T;
-
-  static Map<String, dynamic> _dataToJson<T, S, U>(T input,
-          [S? other1, U? other2]) =>
-      {'value': input};
+  static T _dataFromJson<T, S, U>(
+    Map<String, dynamic> input, [
+    S? other1,
+    U? other2,
+  ]) => input['value'] as T;
+
+  static Map<String, dynamic> _dataToJson<T, S, U>(
+    T input, [
+    S? other1,
+    U? other2,
+  ]) => {'value': input};
 }
 
 @JsonSerializable()
 @_DurationMillisecondConverter.named()
 @_DurationListMillisecondConverter()
 class GenericClassWithConverter<T extends num, S> {
+  // TODO: this annotation is a no-op. Need to figure out what to do about it!
   @_SimpleConverter()
   Object? fieldObject;
 
+  // TODO: this annotation is a no-op. Need to figure out what to do about it!
   @_SimpleConverter()
   dynamic fieldDynamic;
 
+  // TODO: this annotation is a no-op. Need to figure out what to do about it!
   @_SimpleConverter()
   int? fieldInt;
 
@@ -141,5 +149,35 @@ class Issue980ParentClass {
       other is Issue980ParentClass && deepEquals(list, other.list);
 
   @override
-  int get hashCode => const DeepCollectionEquality().hash(list);
+  int get hashCode => deepHash(list);
+}
+
+@JsonSerializable(genericArgumentFactories: true)
+class Issue1047ParentClass<T> {
+  Issue1047ParentClass({required this.edges});
+
+  factory Issue1047ParentClass.fromJson(
+    Map<String, dynamic> json,
+    T Function(Object? json) fromJsonT,
+  ) => _$Issue1047ParentClassFromJson<T>(json, fromJsonT);
+
+  final List<Issue1047Class<T>> edges;
+
+  Map<String, dynamic> toJson(Object? Function(T value) toJsonT) =>
+      _$Issue1047ParentClassToJson(this, toJsonT);
+}
+
+@JsonSerializable(genericArgumentFactories: true)
+class Issue1047Class<T> {
+  Issue1047Class({required this.node});
+
+  factory Issue1047Class.fromJson(
+    Map<String, dynamic> json,
+    T Function(Object? json) fromJsonT,
+  ) => _$Issue1047ClassFromJson<T>(json, fromJsonT);
+
+  final T node;
+
+  Map<String, dynamic> toJson(Object? Function(T value) toJsonT) =>
+      _$Issue1047ClassToJson(this, toJsonT);
 }
diff --git a/json_serializable/test/generic_files/generic_class.g.dart b/json_serializable/test/generic_files/generic_class.g.dart
index aa5f32e79..4b260a766 100644
--- a/json_serializable/test/generic_files/generic_class.g.dart
+++ b/json_serializable/test/generic_files/generic_class.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'generic_class.dart';
 
@@ -9,69 +9,127 @@ part of 'generic_class.dart';
 // **************************************************************************
 
 GenericClass<T, S> _$GenericClassFromJson<T extends num, S>(
-        Map<String, dynamic> json) =>
-    GenericClass<T, S>()
-      ..fieldObject = GenericClass._dataFromJson(
-          json['fieldObject'] as Map<String, dynamic>)
-      ..fieldDynamic = GenericClass._dataFromJson(
-          json['fieldDynamic'] as Map<String, dynamic>)
-      ..fieldInt =
-          GenericClass._dataFromJson(json['fieldInt'] as Map<String, dynamic>)
-      ..fieldT =
-          GenericClass._dataFromJson(json['fieldT'] as Map<String, dynamic>)
-      ..fieldS =
-          GenericClass._dataFromJson(json['fieldS'] as Map<String, dynamic>);
+  Map<String, dynamic> json,
+) => GenericClass<T, S>()
+  ..fieldObject = GenericClass._dataFromJson(
+    json['fieldObject'] as Map<String, dynamic>,
+  )
+  ..fieldDynamic = GenericClass._dataFromJson(
+    json['fieldDynamic'] as Map<String, dynamic>,
+  )
+  ..fieldInt = GenericClass._dataFromJson(
+    json['fieldInt'] as Map<String, dynamic>,
+  )
+  ..fieldT = GenericClass._dataFromJson(json['fieldT'] as Map<String, dynamic>)
+  ..fieldS = GenericClass._dataFromJson(json['fieldS'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$GenericClassToJson<T extends num, S>(
-        GenericClass<T, S> instance) =>
-    <String, dynamic>{
-      'fieldObject': GenericClass._dataToJson(instance.fieldObject),
-      'fieldDynamic': GenericClass._dataToJson(instance.fieldDynamic),
-      'fieldInt': GenericClass._dataToJson(instance.fieldInt),
-      'fieldT': GenericClass._dataToJson(instance.fieldT),
-      'fieldS': GenericClass._dataToJson(instance.fieldS),
-    };
+  GenericClass<T, S> instance,
+) => <String, dynamic>{
+  'fieldObject': GenericClass._dataToJson(instance.fieldObject),
+  'fieldDynamic': GenericClass._dataToJson(instance.fieldDynamic),
+  'fieldInt': GenericClass._dataToJson(instance.fieldInt),
+  'fieldT': GenericClass._dataToJson(instance.fieldT),
+  'fieldS': GenericClass._dataToJson(instance.fieldS),
+};
 
-GenericClassWithConverter<T, S>
-    _$GenericClassWithConverterFromJson<T extends num, S>(
-            Map<String, dynamic> json) =>
-        GenericClassWithConverter<T, S>()
-          ..fieldObject = json['fieldObject']
-          ..fieldDynamic = json['fieldDynamic']
-          ..fieldInt = json['fieldInt'] as int?
-          ..fieldT = _SimpleConverter<T?>()
-              .fromJson(json['fieldT'] as Map<String, dynamic>)
-          ..fieldS = _SimpleConverter<S?>()
-              .fromJson(json['fieldS'] as Map<String, dynamic>)
-          ..duration = const _DurationMillisecondConverter.named()
-              .fromJson(json['duration'] as int?)
-          ..listDuration = const _DurationListMillisecondConverter()
-              .fromJson(json['listDuration'] as int?);
+GenericClassWithConverter<T, S> _$GenericClassWithConverterFromJson<
+  T extends num,
+  S
+>(Map<String, dynamic> json) => GenericClassWithConverter<T, S>()
+  ..fieldObject = json['fieldObject']
+  ..fieldDynamic = json['fieldDynamic']
+  ..fieldInt = (json['fieldInt'] as num?)?.toInt()
+  ..fieldT = _$JsonConverterFromJson<Map<String, dynamic>, T>(
+    json['fieldT'],
+    _SimpleConverter<T?>().fromJson,
+  )
+  ..fieldS = _$JsonConverterFromJson<Map<String, dynamic>, S>(
+    json['fieldS'],
+    _SimpleConverter<S?>().fromJson,
+  )
+  ..duration = const _DurationMillisecondConverter.named().fromJson(
+    (json['duration'] as num?)?.toInt(),
+  )
+  ..listDuration = const _DurationListMillisecondConverter().fromJson(
+    (json['listDuration'] as num?)?.toInt(),
+  );
 
 Map<String, dynamic> _$GenericClassWithConverterToJson<T extends num, S>(
-        GenericClassWithConverter<T, S> instance) =>
-    <String, dynamic>{
-      'fieldObject': instance.fieldObject,
-      'fieldDynamic': instance.fieldDynamic,
-      'fieldInt': instance.fieldInt,
-      'fieldT': _SimpleConverter<T?>().toJson(instance.fieldT),
-      'fieldS': _SimpleConverter<S?>().toJson(instance.fieldS),
-      'duration':
-          const _DurationMillisecondConverter.named().toJson(instance.duration),
-      'listDuration': const _DurationListMillisecondConverter()
-          .toJson(instance.listDuration),
-    };
+  GenericClassWithConverter<T, S> instance,
+) => <String, dynamic>{
+  'fieldObject': instance.fieldObject,
+  'fieldDynamic': instance.fieldDynamic,
+  'fieldInt': instance.fieldInt,
+  'fieldT': _$JsonConverterToJson<Map<String, dynamic>, T>(
+    instance.fieldT,
+    _SimpleConverter<T?>().toJson,
+  ),
+  'fieldS': _$JsonConverterToJson<Map<String, dynamic>, S>(
+    instance.fieldS,
+    _SimpleConverter<S?>().toJson,
+  ),
+  'duration': const _DurationMillisecondConverter.named().toJson(
+    instance.duration,
+  ),
+  'listDuration': const _DurationListMillisecondConverter().toJson(
+    instance.listDuration,
+  ),
+};
+
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => json == null ? null : fromJson(json as Json);
+
+Json? _$JsonConverterToJson<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => value == null ? null : toJson(value);
 
 Issue980ParentClass _$Issue980ParentClassFromJson(Map<String, dynamic> json) =>
     Issue980ParentClass(
       (json['list'] as List<dynamic>)
-          .map((e) =>
-              Issue980GenericClass<int>.fromJson(e as Map<String, dynamic>))
+          .map(
+            (e) =>
+                Issue980GenericClass<int>.fromJson(e as Map<String, dynamic>),
+          )
           .toList(),
     );
 
 Map<String, dynamic> _$Issue980ParentClassToJson(
-        Issue980ParentClass instance) =>
-    <String, dynamic>{
-      'list': instance.list,
-    };
+  Issue980ParentClass instance,
+) => <String, dynamic>{'list': instance.list};
+
+Issue1047ParentClass<T> _$Issue1047ParentClassFromJson<T>(
+  Map<String, dynamic> json,
+  T Function(Object? json) fromJsonT,
+) => Issue1047ParentClass<T>(
+  edges: (json['edges'] as List<dynamic>)
+      .map(
+        (e) => Issue1047Class<T>.fromJson(
+          e as Map<String, dynamic>,
+          (value) => fromJsonT(value),
+        ),
+      )
+      .toList(),
+);
+
+Map<String, dynamic> _$Issue1047ParentClassToJson<T>(
+  Issue1047ParentClass<T> instance,
+  Object? Function(T value) toJsonT,
+) => <String, dynamic>{
+  'edges': instance.edges
+      .map((e) => e.toJson((value) => toJsonT(value)))
+      .toList(),
+};
+
+Issue1047Class<T> _$Issue1047ClassFromJson<T>(
+  Map<String, dynamic> json,
+  T Function(Object? json) fromJsonT,
+) => Issue1047Class<T>(node: fromJsonT(json['node']));
+
+Map<String, dynamic> _$Issue1047ClassToJson<T>(
+  Issue1047Class<T> instance,
+  Object? Function(T value) toJsonT,
+) => <String, dynamic>{'node': toJsonT(instance.node)};
diff --git a/json_serializable/test/generic_files/generic_test.dart b/json_serializable/test/generic_files/generic_test.dart
index f3de54bd7..9cdc7daa5 100644
--- a/json_serializable/test/generic_files/generic_test.dart
+++ b/json_serializable/test/generic_files/generic_test.dart
@@ -14,35 +14,43 @@ import 'generic_class.dart';
 void main() {
   group('generic', () {
     GenericClass<T, S> roundTripGenericClass<T extends num, S>(
-        GenericClass<T, S> p) {
+      GenericClass<T, S> p,
+    ) {
       final outputJson = loudEncode(p);
       final p2 = GenericClass<T, S>.fromJson(
-          jsonDecode(outputJson) as Map<String, dynamic>);
+        jsonDecode(outputJson) as Map<String, dynamic>,
+      );
       final outputJson2 = loudEncode(p2);
       expect(outputJson2, outputJson);
       return p2;
     }
 
     test('no type args', () {
-      roundTripGenericClass(GenericClass()
-        ..fieldDynamic = 1
-        ..fieldInt = 2
-        ..fieldObject = 3
-        ..fieldT = 5
-        ..fieldS = 'six');
+      roundTripGenericClass(
+        // ignore: inference_failure_on_instance_creation
+        GenericClass()
+          ..fieldDynamic = 1
+          ..fieldInt = 2
+          ..fieldObject = 3
+          ..fieldT = 5
+          ..fieldS = 'six',
+      );
     });
     test('with type arguments', () {
-      roundTripGenericClass(GenericClass<double, String>()
-        ..fieldDynamic = 1
-        ..fieldInt = 2
-        ..fieldObject = 3
-        ..fieldT = 5.0
-        ..fieldS = 'six');
+      roundTripGenericClass(
+        GenericClass<double, String>()
+          ..fieldDynamic = 1
+          ..fieldInt = 2
+          ..fieldObject = 3
+          ..fieldT = 5.0
+          ..fieldS = 'six',
+      );
     });
     test('with bad arguments', () {
       expect(
-        () => GenericClass<double, String>()
-          ..fieldT = (true as dynamic) as double,
+        () =>
+            GenericClass<double, String>()
+              ..fieldT = (true as dynamic) as double,
         throwsTypeError,
       );
     });
@@ -75,7 +83,7 @@ void main() {
       final decoded = GenericClassWithHelpers<DateTime, Duration>.fromJson(
         jsonDecode(encodedJson) as Map<String, dynamic>,
         (value) => DateTime.parse(value as String),
-        (value) => Duration(milliseconds: value as int),
+        (value) => Duration(milliseconds: (value as num).toInt()),
       );
 
       final encodedJson2 = loudEncode(
@@ -178,7 +186,7 @@ void main() {
         ],
         someSet: {
           const Duration(milliseconds: 3),
-          const Duration(milliseconds: 4)
+          const Duration(milliseconds: 4),
         },
       );
 
@@ -191,10 +199,10 @@ void main() {
 
       final decoded =
           GenericClassWithHelpersNullable<DateTime, Duration>.fromJson(
-        jsonDecode(encodedJson) as Map<String, dynamic>,
-        (value) => DateTime.parse(value as String),
-        (value) => Duration(milliseconds: value as int),
-      );
+            jsonDecode(encodedJson) as Map<String, dynamic>,
+            (value) => DateTime.parse(value as String),
+            (value) => Duration(milliseconds: (value as num).toInt()),
+          );
 
       final encodedJson2 = loudEncode(
         decoded.toJson(encodeDateTime, encodeDuration),
@@ -206,10 +214,7 @@ void main() {
     test('basic round-trip with null values', () {
       final instance = GenericClassWithHelpersNullable<DateTime, Duration>(
         //value: null, // value is null by omission
-        list: [
-          null,
-          DateTime.fromMillisecondsSinceEpoch(2).toUtc(),
-        ],
+        list: [null, DateTime.fromMillisecondsSinceEpoch(2).toUtc()],
         someSet: {null, const Duration(milliseconds: 4)},
       );
 
@@ -222,10 +227,10 @@ void main() {
 
       final decoded =
           GenericClassWithHelpersNullable<DateTime, Duration>.fromJson(
-        jsonDecode(encodedJson) as Map<String, dynamic>,
-        (value) => DateTime.parse(value as String),
-        (value) => Duration(milliseconds: value as int),
-      );
+            jsonDecode(encodedJson) as Map<String, dynamic>,
+            (value) => DateTime.parse(value as String),
+            (value) => Duration(milliseconds: (value as num).toInt()),
+          );
 
       final encodedJson2 = loudEncode(
         decoded.toJson(encodeDateTime, encodeDuration),
@@ -318,12 +323,38 @@ void main() {
   });
 
   test('issue 980 regression test', () {
-    validateRoundTrip(
-      Issue980ParentClass([
-        Issue980GenericClass(45),
-        Issue980GenericClass(42),
-      ]),
-      (json) => Issue980ParentClass.fromJson(json),
+    roundTripObject(
+      Issue980ParentClass([Issue980GenericClass(45), Issue980GenericClass(42)]),
+      Issue980ParentClass.fromJson,
+    );
+  });
+
+  test('issue 1047 regression', () {
+    _roundTrip(
+      sourceJson: {
+        'edges': [
+          {'node': '42'},
+        ],
+      },
+      genericEncode: (o) => o.toString(),
+      genericDecode: (o) => int.parse(o as String),
     );
   });
 }
+
+void _roundTrip<T>({
+  required Map<String, dynamic> sourceJson,
+  required Object? Function(T) genericEncode,
+  required T Function(Object?) genericDecode,
+}) {
+  final json = jsonEncode(sourceJson);
+
+  final instance2 = Issue1047ParentClass<T>.fromJson(
+    jsonDecode(json) as Map<String, dynamic>,
+    genericDecode,
+  );
+
+  final json2 = jsonEncode(instance2.toJson(genericEncode));
+
+  expect(json2, json);
+}
diff --git a/json_serializable/test/integration/converter_examples.dart b/json_serializable/test/integration/converter_examples.dart
new file mode 100644
index 000000000..73be3828f
--- /dev/null
+++ b/json_serializable/test/integration/converter_examples.dart
@@ -0,0 +1,119 @@
+import 'dart:convert';
+
+import 'package:json_annotation/json_annotation.dart';
+
+part 'converter_examples.g.dart';
+
+@JsonEnum(valueField: 'value')
+enum Issue1202RegressionEnum {
+  normalValue(42),
+  nullValue(null);
+
+  const Issue1202RegressionEnum(this.value);
+
+  final int? value;
+}
+
+@JsonSerializable(includeIfNull: false)
+class Issue1202RegressionClass {
+  @JsonKey(fromJson: _fromJson, toJson: _toJson)
+  final int valueWithFunctions;
+
+  @_Issue1202RegressionNotNullConverter()
+  final int notNullableValueWithConverter;
+
+  final Issue1202RegressionEnum value;
+  final int? normalNullableValue;
+
+  @_Issue1202RegressionConverter()
+  final int notNullableValueWithNullableConverter;
+
+  @JsonKey(fromJson: _fromJsonNullable, toJson: _toJsonNullable)
+  final int valueWithNullableFunctions;
+
+  Issue1202RegressionClass({
+    required this.value,
+    required this.normalNullableValue,
+    required this.notNullableValueWithNullableConverter,
+    required this.notNullableValueWithConverter,
+    required this.valueWithFunctions,
+    required this.valueWithNullableFunctions,
+  });
+
+  factory Issue1202RegressionClass.fromJson(Map<String, dynamic> json) =>
+      _$Issue1202RegressionClassFromJson(json);
+
+  Map<String, dynamic> toJson() => _$Issue1202RegressionClassToJson(this);
+
+  @override
+  bool operator ==(Object other) =>
+      other is Issue1202RegressionClass &&
+      jsonEncode(other) == jsonEncode(this);
+
+  @override
+  int get hashCode => jsonEncode(this).hashCode;
+
+  static int _fromJsonNullable(String? json) {
+    if (json == null) return _default;
+    return int.parse(json);
+  }
+
+  static String? _toJsonNullable(int object) {
+    if (object == _default) return null;
+    return object.toString();
+  }
+
+  static int _fromJson(String json) => int.parse(json);
+
+  static String _toJson(int object) => object.toString();
+}
+
+const _default = 42;
+
+class _Issue1202RegressionConverter extends JsonConverter<int, String?> {
+  const _Issue1202RegressionConverter();
+
+  @override
+  int fromJson(String? json) {
+    if (json == null) return _default;
+    return int.parse(json);
+  }
+
+  @override
+  String? toJson(int object) {
+    if (object == _default) return null;
+    return object.toString();
+  }
+}
+
+class _Issue1202RegressionNotNullConverter extends JsonConverter<int, String> {
+  const _Issue1202RegressionNotNullConverter();
+
+  @override
+  int fromJson(String json) => int.parse(json);
+
+  @override
+  String toJson(int object) => object.toString();
+}
+
+class DateTimeConverter extends JsonConverter<DateTime, String> {
+  const DateTimeConverter();
+  @override
+  DateTime fromJson(String json) => DateTime.parse(json).toLocal();
+  @override
+  String toJson(DateTime object) => object.toUtc().toIso8601String();
+}
+
+@JsonSerializable()
+@DateTimeConverter()
+class Regression1229 {
+  @JsonKey(includeIfNull: false)
+  final DateTime? date;
+
+  Regression1229({this.date});
+
+  factory Regression1229.fromJson(Map<String, dynamic> json) =>
+      _$Regression1229FromJson(json);
+
+  Map<String, dynamic> toJson() => _$Regression1229ToJson(this);
+}
diff --git a/json_serializable/test/integration/converter_examples.g.dart b/json_serializable/test/integration/converter_examples.g.dart
new file mode 100644
index 000000000..7315b4a30
--- /dev/null
+++ b/json_serializable/test/integration/converter_examples.g.dart
@@ -0,0 +1,76 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
+
+part of 'converter_examples.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Issue1202RegressionClass _$Issue1202RegressionClassFromJson(
+  Map<String, dynamic> json,
+) => Issue1202RegressionClass(
+  value: $enumDecode(_$Issue1202RegressionEnumEnumMap, json['value']),
+  normalNullableValue: (json['normalNullableValue'] as num?)?.toInt(),
+  notNullableValueWithNullableConverter: const _Issue1202RegressionConverter()
+      .fromJson(json['notNullableValueWithNullableConverter'] as String?),
+  notNullableValueWithConverter: const _Issue1202RegressionNotNullConverter()
+      .fromJson(json['notNullableValueWithConverter'] as String),
+  valueWithFunctions: Issue1202RegressionClass._fromJson(
+    json['valueWithFunctions'] as String,
+  ),
+  valueWithNullableFunctions: Issue1202RegressionClass._fromJsonNullable(
+    json['valueWithNullableFunctions'] as String?,
+  ),
+);
+
+Map<String, dynamic> _$Issue1202RegressionClassToJson(
+  Issue1202RegressionClass instance,
+) => <String, dynamic>{
+  'valueWithFunctions': Issue1202RegressionClass._toJson(
+    instance.valueWithFunctions,
+  ),
+  'notNullableValueWithConverter': const _Issue1202RegressionNotNullConverter()
+      .toJson(instance.notNullableValueWithConverter),
+  'value': ?_$Issue1202RegressionEnumEnumMap[instance.value],
+  'normalNullableValue': ?instance.normalNullableValue,
+  'notNullableValueWithNullableConverter':
+      ?const _Issue1202RegressionConverter().toJson(
+        instance.notNullableValueWithNullableConverter,
+      ),
+  'valueWithNullableFunctions': ?Issue1202RegressionClass._toJsonNullable(
+    instance.valueWithNullableFunctions,
+  ),
+};
+
+const _$Issue1202RegressionEnumEnumMap = {
+  Issue1202RegressionEnum.normalValue: 42,
+  Issue1202RegressionEnum.nullValue: null,
+};
+
+Regression1229 _$Regression1229FromJson(Map<String, dynamic> json) =>
+    Regression1229(
+      date: _$JsonConverterFromJson<String, DateTime>(
+        json['date'],
+        const DateTimeConverter().fromJson,
+      ),
+    );
+
+Map<String, dynamic> _$Regression1229ToJson(Regression1229 instance) =>
+    <String, dynamic>{
+      'date': ?_$JsonConverterToJson<String, DateTime>(
+        instance.date,
+        const DateTimeConverter().toJson,
+      ),
+    };
+
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => json == null ? null : fromJson(json as Json);
+
+Json? _$JsonConverterToJson<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => value == null ? null : toJson(value);
diff --git a/json_serializable/test/integration/create_per_field_to_json_example.dart b/json_serializable/test/integration/create_per_field_to_json_example.dart
new file mode 100644
index 000000000..d086253f3
--- /dev/null
+++ b/json_serializable/test/integration/create_per_field_to_json_example.dart
@@ -0,0 +1,87 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'create_per_field_to_json_example.g.dart';
+
+@JsonSerializable(createPerFieldToJson: true, explicitToJson: true)
+class Model {
+  Model({
+    required this.firstName,
+    required this.lastName,
+    this.ignoredName,
+    this.enumValue,
+    this.nested,
+    this.nestedExcludeIfNull,
+    this.nestedGeneric,
+  });
+
+  factory Model.fromJson(Map<String, Object?> json) => _$ModelFromJson(json);
+
+  final String firstName;
+  final String lastName;
+  final EnumValue? enumValue;
+  final Nested? nested;
+  final GenericFactory<int>? nestedGeneric;
+
+  @JsonKey(includeIfNull: false)
+  final Nested? nestedExcludeIfNull;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? ignoredName;
+
+  String get fullName => '$firstName $lastName';
+
+  Map<String, Object?> toJson() => _$ModelToJson(this);
+}
+
+typedef ModelPerFieldToJson = _$ModelPerFieldToJson;
+
+@JsonEnum()
+enum EnumValue {
+  @JsonValue('1')
+  first,
+  second,
+}
+
+@JsonSerializable()
+class Nested {
+  Nested(this.value);
+
+  factory Nested.fromJson(Map<String, Object?> json) => _$NestedFromJson(json);
+
+  final String value;
+
+  Map<String, Object?> toJson() => _$NestedToJson(this);
+}
+
+@JsonSerializable(createPerFieldToJson: true, genericArgumentFactories: true)
+class GenericFactory<T> {
+  GenericFactory(this.value, this.map);
+
+  factory GenericFactory.fromJson(
+    Map<String, Object?> json,
+    T Function(Object? json) fromJsonT,
+  ) => _$GenericFactoryFromJson(json, fromJsonT);
+
+  final T value;
+  final Map<String, T> map;
+
+  Map<String, Object?> toJson(Object? Function(T value) toJsonT) =>
+      _$GenericFactoryToJson(this, toJsonT);
+}
+
+typedef GenericFactoryPerFieldToJson = _$GenericFactoryPerFieldToJson;
+
+@JsonSerializable(
+  createPerFieldToJson: true,
+  fieldRename: FieldRename.kebab,
+  createFactory: false,
+)
+class _PrivateModel {
+  _PrivateModel(this.fullName);
+
+  final String fullName;
+
+  Map<String, Object?> toJson() => _$PrivateModelToJson(this);
+}
+
+typedef PrivatePerFieldToJson = _$PrivateModelPerFieldToJson;
diff --git a/json_serializable/test/integration/create_per_field_to_json_example.g.dart b/json_serializable/test/integration/create_per_field_to_json_example.g.dart
new file mode 100644
index 000000000..f77139ee1
--- /dev/null
+++ b/json_serializable/test/integration/create_per_field_to_json_example.g.dart
@@ -0,0 +1,101 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
+
+part of 'create_per_field_to_json_example.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Model _$ModelFromJson(Map<String, dynamic> json) => Model(
+  firstName: json['firstName'] as String,
+  lastName: json['lastName'] as String,
+  enumValue: $enumDecodeNullable(_$EnumValueEnumMap, json['enumValue']),
+  nested: json['nested'] == null
+      ? null
+      : Nested.fromJson(json['nested'] as Map<String, dynamic>),
+  nestedExcludeIfNull: json['nestedExcludeIfNull'] == null
+      ? null
+      : Nested.fromJson(json['nestedExcludeIfNull'] as Map<String, dynamic>),
+  nestedGeneric: json['nestedGeneric'] == null
+      ? null
+      : GenericFactory<int>.fromJson(
+          json['nestedGeneric'] as Map<String, dynamic>,
+          (value) => (value as num).toInt(),
+        ),
+);
+
+// ignore: unused_element
+abstract class _$ModelPerFieldToJson {
+  // ignore: unused_element
+  static Object? firstName(String instance) => instance;
+  // ignore: unused_element
+  static Object? lastName(String instance) => instance;
+  // ignore: unused_element
+  static Object? enumValue(EnumValue? instance) => _$EnumValueEnumMap[instance];
+  // ignore: unused_element
+  static Object? nested(Nested? instance) => instance?.toJson();
+  // ignore: unused_element
+  static Object? nestedGeneric(GenericFactory<int>? instance) =>
+      instance?.toJson((value) => value);
+  // ignore: unused_element
+  static Object? nestedExcludeIfNull(Nested? instance) => instance?.toJson();
+}
+
+Map<String, dynamic> _$ModelToJson(Model instance) => <String, dynamic>{
+  'firstName': instance.firstName,
+  'lastName': instance.lastName,
+  'enumValue': _$EnumValueEnumMap[instance.enumValue],
+  'nested': instance.nested?.toJson(),
+  'nestedGeneric': instance.nestedGeneric?.toJson((value) => value),
+  'nestedExcludeIfNull': ?instance.nestedExcludeIfNull?.toJson(),
+};
+
+const _$EnumValueEnumMap = {EnumValue.first: '1', EnumValue.second: 'second'};
+
+Nested _$NestedFromJson(Map<String, dynamic> json) =>
+    Nested(json['value'] as String);
+
+Map<String, dynamic> _$NestedToJson(Nested instance) => <String, dynamic>{
+  'value': instance.value,
+};
+
+GenericFactory<T> _$GenericFactoryFromJson<T>(
+  Map<String, dynamic> json,
+  T Function(Object? json) fromJsonT,
+) => GenericFactory<T>(
+  fromJsonT(json['value']),
+  (json['map'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, fromJsonT(e)),
+  ),
+);
+
+// ignore: unused_element
+abstract class _$GenericFactoryPerFieldToJson {
+  // ignore: unused_element
+  static Object? value<T>(T instance, Object? Function(T value) toJsonT) =>
+      toJsonT(instance);
+  // ignore: unused_element
+  static Object? map<T>(
+    Map<String, T> instance,
+    Object? Function(T value) toJsonT,
+  ) => instance.map((k, e) => MapEntry(k, toJsonT(e)));
+}
+
+Map<String, dynamic> _$GenericFactoryToJson<T>(
+  GenericFactory<T> instance,
+  Object? Function(T value) toJsonT,
+) => <String, dynamic>{
+  'value': toJsonT(instance.value),
+  'map': instance.map.map((k, e) => MapEntry(k, toJsonT(e))),
+};
+
+// ignore: unused_element
+abstract class _$PrivateModelPerFieldToJson {
+  // ignore: unused_element
+  static Object? fullName(String instance) => instance;
+}
+
+Map<String, dynamic> _$PrivateModelToJson(_PrivateModel instance) =>
+    <String, dynamic>{'full-name': instance.fullName};
diff --git a/json_serializable/test/integration/field_map_example.dart b/json_serializable/test/integration/field_map_example.dart
new file mode 100644
index 000000000..3eef44693
--- /dev/null
+++ b/json_serializable/test/integration/field_map_example.dart
@@ -0,0 +1,39 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'field_map_example.g.dart';
+
+@JsonSerializable(createFieldMap: true, fieldRename: FieldRename.kebab)
+class Model {
+  Model({required this.firstName, required this.lastName, this.ignoredName});
+
+  factory Model.fromJson(Map<String, Object?> json) => _$ModelFromJson(json);
+
+  final String firstName;
+
+  @JsonKey(name: 'LAST_NAME')
+  final String lastName;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? ignoredName;
+
+  String get fullName => '$firstName $lastName';
+
+  Map<String, Object?> toJson() => _$ModelToJson(this);
+}
+
+const modelFieldMap = _$ModelFieldMap;
+
+@JsonSerializable(
+  createFieldMap: true,
+  fieldRename: FieldRename.kebab,
+  createFactory: false,
+)
+class _PrivateModel {
+  _PrivateModel(this.fullName);
+
+  final String fullName;
+
+  Map<String, Object?> toJson() => _$PrivateModelToJson(this);
+}
+
+const privateModelFieldMap = _$PrivateModelFieldMap;
diff --git a/json_serializable/test/integration/field_map_example.g.dart b/json_serializable/test/integration/field_map_example.g.dart
new file mode 100644
index 000000000..fcf6cb864
--- /dev/null
+++ b/json_serializable/test/integration/field_map_example.g.dart
@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
+
+part of 'field_map_example.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Model _$ModelFromJson(Map<String, dynamic> json) => Model(
+  firstName: json['first-name'] as String,
+  lastName: json['LAST_NAME'] as String,
+);
+
+const _$ModelFieldMap = <String, String>{
+  'firstName': 'first-name',
+  'lastName': 'LAST_NAME',
+};
+
+Map<String, dynamic> _$ModelToJson(Model instance) => <String, dynamic>{
+  'first-name': instance.firstName,
+  'LAST_NAME': instance.lastName,
+};
+
+const _$PrivateModelFieldMap = <String, String>{'fullName': 'full-name'};
+
+Map<String, dynamic> _$PrivateModelToJson(_PrivateModel instance) =>
+    <String, dynamic>{'full-name': instance.fullName};
diff --git a/json_serializable/test/integration/integration_test.dart b/json_serializable/test/integration/integration_test.dart
index 13e06f2b6..9cc5d0948 100644
--- a/json_serializable/test/integration/integration_test.dart
+++ b/json_serializable/test/integration/integration_test.dart
@@ -6,27 +6,45 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
+import 'converter_examples.dart';
+import 'create_per_field_to_json_example.dart';
+import 'field_map_example.dart';
 import 'json_enum_example.dart';
+import 'json_keys_example.dart' as js_keys;
 import 'json_test_common.dart' show Category, Platform, StatusCode;
 import 'json_test_example.dart';
 
-Matcher _throwsArgumentError(matcher) =>
+Matcher _throwsArgumentError(Object matcher) =>
     throwsA(isArgumentError.having((e) => e.message, 'message', matcher));
 
 void main() {
   group('Person', () {
     void roundTripPerson(Person p) {
-      validateRoundTrip(p, (json) => Person.fromJson(json));
+      roundTripObject(p, Person.fromJson);
     }
 
     test('now', () {
-      roundTripPerson(Person('a', 'b', Category.charmed,
-          middleName: 'c', dateOfBirth: DateTime.now()));
+      roundTripPerson(
+        Person(
+          'a',
+          'b',
+          Category.charmed,
+          middleName: 'c',
+          dateOfBirth: DateTime.now(),
+        ),
+      );
     });
 
     test('now toUtc', () {
-      roundTripPerson(Person('a', 'b', Category.bottom,
-          middleName: 'c', dateOfBirth: DateTime.now().toUtc()));
+      roundTripPerson(
+        Person(
+          'a',
+          'b',
+          Category.bottom,
+          middleName: 'c',
+          dateOfBirth: DateTime.now().toUtc(),
+        ),
+      );
     });
 
     test('empty json', () {
@@ -50,30 +68,35 @@ void main() {
 
   group('Order', () {
     void roundTripOrder(Order p) {
-      validateRoundTrip(p, (json) => Order.fromJson(json));
+      roundTripObject(p, Order.fromJson);
     }
 
     test('null', () {
       roundTripOrder(
-          Order.custom(Category.charmed)..statusCode = StatusCode.success);
+        Order.custom(Category.charmed)..statusCode = StatusCode.success,
+      );
     });
 
     test('empty', () {
-      roundTripOrder(Order.custom(Category.strange, const [])
-        ..statusCode = StatusCode.success
-        ..count = 0
-        ..isRushed = false);
+      roundTripOrder(
+        Order.custom(Category.strange, const [])
+          ..statusCode = StatusCode.success
+          ..count = 0
+          ..isRushed = false,
+      );
     });
 
     test('simple', () {
-      roundTripOrder(Order.custom(Category.top, <Item>[
-        Item(24)
-          ..itemNumber = 42
-          ..saleDates = [DateTime.now()]
-      ])
-        ..statusCode = StatusCode.success
-        ..count = 42
-        ..isRushed = true);
+      roundTripOrder(
+        Order.custom(Category.top, <Item>[
+            Item(24)
+              ..itemNumber = 42
+              ..saleDates = [DateTime.now()],
+          ])
+          ..statusCode = StatusCode.success
+          ..count = 42
+          ..isRushed = true,
+      );
     });
 
     test('almost empty json', () {
@@ -90,29 +113,29 @@ void main() {
 
     test('required, but missing enum value fails', () {
       expect(
-          () => Person.fromJson({
-                'firstName': 'a',
-                'lastName': 'b',
-              }),
-          _throwsArgumentError('A value must be provided. Supported values: '
-              'top, bottom, strange, charmed, up, down, not_discovered_yet'));
+        () => Person.fromJson({'firstName': 'a', 'lastName': 'b'}),
+        _throwsArgumentError(
+          'A value must be provided. Supported values: '
+          'top, bottom, strange, charmed, up, down, not_discovered_yet',
+        ),
+      );
     });
 
     test('mismatched enum value fails', () {
       expect(
-          () => Order.fromJson({'category': 'weird'}),
-          _throwsArgumentError('`weird` is not one of the supported values: '
-              'top, bottom, strange, charmed, up, down, not_discovered_yet'));
+        () => Order.fromJson({'category': 'weird'}),
+        _throwsArgumentError(
+          '`weird` is not one of the supported values: '
+          'top, bottom, strange, charmed, up, down, not_discovered_yet',
+        ),
+      );
     });
 
     test('platform', () {
       final order = Order.custom(Category.charmed)
         ..statusCode = StatusCode.success
         ..platform = Platform.undefined
-        ..altPlatforms = {
-          'u': Platform.undefined,
-          'f': Platform.foo,
-        };
+        ..altPlatforms = {'u': Platform.undefined, 'f': Platform.foo};
 
       roundTripOrder(order);
     });
@@ -121,35 +144,35 @@ void main() {
       final order = Order.custom(Category.charmed)
         ..platform = Platform.undefined
         ..statusCode = StatusCode.success
-        ..altPlatforms = {
-          'u': Platform.undefined,
-          'f': Platform.foo,
-        }
+        ..altPlatforms = {'u': Platform.undefined, 'f': Platform.foo}
         ..homepage = Uri.parse('https://dart.dev');
 
       roundTripOrder(order);
     });
 
     test('statusCode', () {
-      final order = Order.fromJson(
-        {'category': 'not_discovered_yet', 'status_code': 404},
-      );
+      final order = Order.fromJson({
+        'category': 'not_discovered_yet',
+        'status_code': 404,
+      });
       expect(order.statusCode, StatusCode.notFound);
       roundTripOrder(order);
     });
 
     test('statusCode "500" - weird', () {
-      final order = Order.fromJson(
-        {'category': 'not_discovered_yet', 'status_code': '500'},
-      );
+      final order = Order.fromJson({
+        'category': 'not_discovered_yet',
+        'status_code': '500',
+      });
       expect(order.statusCode, StatusCode.weird);
       roundTripOrder(order);
     });
 
     test('statusCode `500` - unknown', () {
-      final order = Order.fromJson(
-        {'category': 'not_discovered_yet', 'status_code': 500},
-      );
+      final order = Order.fromJson({
+        'category': 'not_discovered_yet',
+        'status_code': 500,
+      });
       expect(order.statusCode, StatusCode.unknown);
       roundTripOrder(order);
     });
@@ -175,22 +198,25 @@ void main() {
         'duration': 190473023012,
       });
       expect(
-          order.duration,
-          equals(const Duration(
+        order.duration,
+        equals(
+          const Duration(
             days: 2,
             hours: 4,
             minutes: 54,
             seconds: 33,
             milliseconds: 23,
             microseconds: 12,
-          )));
+          ),
+        ),
+      );
       roundTripOrder(order);
     });
   });
 
   group('Item', () {
     void roundTripItem(Item p) {
-      validateRoundTrip(p, (json) => Item.fromJson(json));
+      roundTripObject(p, Item.fromJson);
     }
 
     test('empty json', () {
@@ -200,12 +226,7 @@ void main() {
 
       expect(
         item.toJson().keys,
-        orderedEquals([
-          'price',
-          'saleDates',
-          'rates',
-          'geoPoint',
-        ]),
+        orderedEquals(['price', 'saleDates', 'rates', 'geoPoint']),
         reason: 'Omits null `itemNumber`',
       );
     });
@@ -231,17 +252,19 @@ void main() {
 
   group('Numbers', () {
     void roundTripNumber(Numbers p) {
-      validateRoundTrip(p, (json) => Numbers.fromJson(json));
+      roundTripObject(p, Numbers.fromJson);
     }
 
     test('simple', () {
-      roundTripNumber(Numbers()
-        ..nums = [0, 0.0]
-        ..doubles = [0.0]
-        ..nnDoubles = [0.0]
-        ..ints = [0]
-        ..duration = const Duration(seconds: 1)
-        ..date = DateTime.now());
+      roundTripNumber(
+        Numbers()
+          ..nums = [0, 0.0]
+          ..doubles = [0.0]
+          ..nnDoubles = [0.0]
+          ..ints = [0]
+          ..duration = const Duration(seconds: 1)
+          ..date = DateTime.now(),
+      );
     });
 
     test('custom DateTime', () {
@@ -254,18 +277,23 @@ void main() {
     test('support ints as doubles', () {
       final value = {
         'doubles': [0, 0.0],
-        'nnDoubles': [0, 0.0]
+        'nnDoubles': [0, 0.0],
+        'doubleAsString': 3,
       };
 
-      roundTripNumber(Numbers.fromJson(value));
+      final output = roundTripObject(Numbers.fromJson(value), Numbers.fromJson);
+      expect(output.doubleAsString, 3.0.toString());
     });
 
-    test('does not support doubles as ints', () {
+    test('support doubles as ints', () {
       final value = {
-        'ints': [3.14, 0],
+        'ints': [3, 3.0, 3.14, 0],
       };
 
-      expect(() => Numbers.fromJson(value), throwsTypeError);
+      final output = roundTripObject(Numbers.fromJson(value), Numbers.fromJson);
+
+      // NOTE: all of the double values are truncated
+      expect(output.ints, [3, 3, 3, 0]);
     });
   });
 
@@ -276,7 +304,7 @@ void main() {
       ..intIntMap = {3: 3}
       ..uriIntMap = {Uri.parse('https://example.com'): 4};
 
-    validateRoundTrip(instance, (j) => MapKeyVariety.fromJson(j));
+    roundTripObject(instance, MapKeyVariety.fromJson);
   });
 
   test('UnknownEnumValue', () {
@@ -296,7 +324,7 @@ void main() {
   test('PrivateConstructor', () {
     final value = PrivateConstructor('test');
 
-    validateRoundTrip(value, (json) => PrivateConstructor.fromJson(json));
+    roundTripObject(value, PrivateConstructor.fromJson);
   });
 
   test('enum helpers', () {
@@ -304,6 +332,22 @@ void main() {
     expect(dayTypeEnumValues, ['no-good', 'rotten', 'very-bad']);
   });
 
+  test('serializing a non-nullable enum as a key in a map should produce a '
+      'non-nullable string key', () {
+    final cls = Issue1145RegressionA(
+      status: {Issue1145RegressionEnum.gamma: true},
+    );
+    // Due to issue 1145 this resulted in Map<String?, dynamic>
+    expect(cls.toJson()['status'], const TypeMatcher<Map<String, dynamic>>());
+  });
+
+  test('serializing a nullable enum in a list should produce a list with'
+      ' nullable entries', () {
+    final cls = Issue1145RegressionB(status: [Issue1145RegressionEnum.gamma]);
+    // Issue 1145 should not have affected nullable enums
+    expect(cls.toJson()['status'], const TypeMatcher<List<String?>>());
+  });
+
   test('unknown as null for enum', () {
     expect(
       () => Issue559Regression.fromJson({}).status,
@@ -317,9 +361,125 @@ void main() {
       Issue559Regression.fromJson({'status': 'gamma'}).status,
       Issue559RegressionEnum.gamma,
     );
+    expect(Issue559Regression.fromJson({'status': 'bob'}).status, isNull);
+  });
+
+  test(r'_$ModelFieldMap', () {
+    expect(modelFieldMap, {'firstName': 'first-name', 'lastName': 'LAST_NAME'});
+  });
+
+  test(
+    r'Generates _$PrivateModelFieldMap instead of __$PrivateModelFieldMap',
+    () {
+      expect(privateModelFieldMap, {'fullName': 'full-name'});
+    },
+  );
+
+  test(r'_$ModelPerFieldToJson', () {
+    expect(ModelPerFieldToJson.firstName('foo'), 'foo');
+
+    expect(ModelPerFieldToJson.enumValue(EnumValue.first), '1');
+    expect(ModelPerFieldToJson.enumValue(EnumValue.second), 'second');
+
+    expect(ModelPerFieldToJson.nested(Nested('foo')), {'value': 'foo'});
+    expect(ModelPerFieldToJson.nested(null), null);
+    expect(ModelPerFieldToJson.nestedExcludeIfNull(Nested('foo')), {
+      'value': 'foo',
+    });
+    expect(ModelPerFieldToJson.nestedExcludeIfNull(null), null);
+    expect(ModelPerFieldToJson.nestedGeneric(GenericFactory(42, {'key': 21})), {
+      'value': 42,
+      'map': {'key': 21},
+    });
+  });
+
+  test(r'_$GenericFactoryPerFieldToJson', () {
+    expect(
+      GenericFactoryPerFieldToJson.value<int>(42, (value) => '$value'),
+      '42',
+    );
+    expect(GenericFactoryPerFieldToJson.value<String>('42', int.tryParse), 42);
+
     expect(
-      Issue559Regression.fromJson({'status': 'bob'}).status,
-      isNull,
+      GenericFactoryPerFieldToJson.map<int>({'foo': 21}, (value) => '$value'),
+      {'foo': '21'},
     );
+    expect(
+      GenericFactoryPerFieldToJson.map<String>({'key': '42'}, int.tryParse),
+      {'key': 42},
+    );
+  });
+
+  group('classes with converters', () {
+    Issue1202RegressionClass roundTripIssue1202RegressionClass(int value) {
+      final instance = Issue1202RegressionClass(
+        normalNullableValue: value,
+        notNullableValueWithConverter: value,
+        notNullableValueWithNullableConverter: value,
+        value: Issue1202RegressionEnum.normalValue,
+        valueWithFunctions: value,
+        valueWithNullableFunctions: value,
+      );
+      return roundTripObject(instance, Issue1202RegressionClass.fromJson);
+    }
+
+    test('With default values', () {
+      final thing = roundTripIssue1202RegressionClass(42);
+
+      expect(thing.toJson(), {
+        'valueWithFunctions': '42',
+        'notNullableValueWithConverter': '42',
+        'value': 42,
+        'normalNullableValue': 42,
+      });
+    });
+
+    test('With non-default values', () {
+      final thing = roundTripIssue1202RegressionClass(43);
+
+      expect(thing.toJson(), {
+        'valueWithFunctions': '43',
+        'notNullableValueWithConverter': '43',
+        'value': 42,
+        'normalNullableValue': 43,
+        'notNullableValueWithNullableConverter': '43',
+        'valueWithNullableFunctions': '43',
+      });
+    });
+
+    test('enum with null value', () {
+      final instance = Issue1202RegressionClass(
+        normalNullableValue: 42,
+        notNullableValueWithConverter: 42,
+        notNullableValueWithNullableConverter: 42,
+        value: Issue1202RegressionEnum.nullValue,
+        valueWithFunctions: 42,
+        valueWithNullableFunctions: 42,
+      );
+
+      expect(instance.toJson(), {
+        'valueWithFunctions': '42',
+        'notNullableValueWithConverter': '42',
+        'normalNullableValue': 42,
+      });
+    });
+  });
+
+  test('Issue1226Regression', () {
+    final instance = Issue1226Regression(durationType: null);
+    expect(instance.toJson(), isEmpty);
+  });
+
+  test('Regression1229', () {
+    final instance = Regression1229();
+    expect(instance.toJson(), isEmpty);
+  });
+
+  test('value field index fun', () {
+    expect(enumValueFieldIndexValues, [0, 701, 2]);
+  });
+
+  test('ModelJsonKeys', () {
+    expect(js_keys.keys, {'first-name', 'LAST_NAME'});
   });
 }
diff --git a/json_serializable/test/integration/json_enum_example.dart b/json_serializable/test/integration/json_enum_example.dart
index 5b25001f8..f36159cc1 100644
--- a/json_serializable/test/integration/json_enum_example.dart
+++ b/json_serializable/test/integration/json_enum_example.dart
@@ -17,21 +17,43 @@ enum StandAloneEnum {
 Iterable<String> get standAloneEnumValues => _$StandAloneEnumEnumMap.values;
 
 @JsonEnum(alwaysCreate: true, fieldRename: FieldRename.kebab)
-enum DayType {
-  noGood,
-  rotten,
-  veryBad,
-}
+enum DayType { noGood, rotten, veryBad }
 
 Iterable<String> get dayTypeEnumValues => _$DayTypeEnumMap.values;
 
-@JsonSerializable(
-  createToJson: false,
-)
+@JsonEnum(alwaysCreate: true, valueField: 'value')
+enum MyStatusCode {
+  success(200),
+  @JsonValue(701) // explicit value always takes precedence
+  weird(601);
+
+  const MyStatusCode(this.value);
+
+  final int value;
+}
+
+Iterable<int> get myStatusCodeEnumValues => _$MyStatusCodeEnumMap.values;
+
+@JsonEnum(alwaysCreate: true, valueField: 'index')
+enum EnumValueFieldIndex {
+  success(200),
+  @JsonValue(701) // explicit value always takes precedence
+  weird(601),
+  oneMore(777);
+
+  static const tryingToBeConfusing = weird;
+
+  const EnumValueFieldIndex(this.value);
+
+  final int value;
+}
+
+Iterable<int> get enumValueFieldIndexValues =>
+    _$EnumValueFieldIndexEnumMap.values;
+
+@JsonSerializable(createToJson: false)
 class Issue559Regression {
-  Issue559Regression({
-    required this.status,
-  });
+  Issue559Regression({required this.status});
 
   factory Issue559Regression.fromJson(Map<String, dynamic> json) =>
       _$Issue559RegressionFromJson(json);
@@ -44,8 +66,36 @@ class Issue559Regression {
   final Issue559RegressionEnum? status;
 }
 
-enum Issue559RegressionEnum {
-  alpha,
-  beta,
-  gamma,
+enum Issue559RegressionEnum { alpha, beta, gamma }
+
+enum Issue1145RegressionEnum { alpha, beta, gamma }
+
+@JsonSerializable(createFactory: false)
+class Issue1145RegressionA {
+  Issue1145RegressionA({required this.status});
+
+  Map<String, dynamic> toJson() => _$Issue1145RegressionAToJson(this);
+
+  final Map<Issue1145RegressionEnum, bool> status;
+}
+
+@JsonSerializable(createFactory: false)
+class Issue1145RegressionB {
+  Issue1145RegressionB({required this.status});
+
+  Map<String, dynamic> toJson() => _$Issue1145RegressionBToJson(this);
+
+  final List<Issue1145RegressionEnum?> status;
+}
+
+@JsonSerializable(includeIfNull: false)
+class Issue1226Regression {
+  Issue1226Regression({required this.durationType});
+
+  factory Issue1226Regression.fromJson(Map<String, dynamic> json) =>
+      _$Issue1226RegressionFromJson(json);
+
+  final Issue1145RegressionEnum? durationType;
+
+  Map<String, dynamic> toJson() => _$Issue1226RegressionToJson(this);
 }
diff --git a/json_serializable/test/integration/json_enum_example.g.dart b/json_serializable/test/integration/json_enum_example.g.dart
index c416d5540..0cbe2616f 100644
--- a/json_serializable/test/integration/json_enum_example.g.dart
+++ b/json_serializable/test/integration/json_enum_example.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'json_enum_example.dart';
 
@@ -15,8 +15,11 @@ Issue559Regression _$Issue559RegressionFromJson(Map<String, dynamic> json) {
     disallowNullValues: const ['status'],
   );
   return Issue559Regression(
-    status: $enumDecodeNullable(_$Issue559RegressionEnumEnumMap, json['status'],
-        unknownValue: JsonKey.nullForUndefinedEnumValue),
+    status: $enumDecodeNullable(
+      _$Issue559RegressionEnumEnumMap,
+      json['status'],
+      unknownValue: JsonKey.nullForUndefinedEnumValue,
+    ),
   );
 }
 
@@ -26,6 +29,42 @@ const _$Issue559RegressionEnumEnumMap = {
   Issue559RegressionEnum.gamma: 'gamma',
 };
 
+Map<String, dynamic> _$Issue1145RegressionAToJson(
+  Issue1145RegressionA instance,
+) => <String, dynamic>{
+  'status': instance.status.map(
+    (k, e) => MapEntry(_$Issue1145RegressionEnumEnumMap[k]!, e),
+  ),
+};
+
+const _$Issue1145RegressionEnumEnumMap = {
+  Issue1145RegressionEnum.alpha: 'alpha',
+  Issue1145RegressionEnum.beta: 'beta',
+  Issue1145RegressionEnum.gamma: 'gamma',
+};
+
+Map<String, dynamic> _$Issue1145RegressionBToJson(
+  Issue1145RegressionB instance,
+) => <String, dynamic>{
+  'status': instance.status
+      .map((e) => _$Issue1145RegressionEnumEnumMap[e])
+      .toList(),
+};
+
+Issue1226Regression _$Issue1226RegressionFromJson(Map<String, dynamic> json) =>
+    Issue1226Regression(
+      durationType: $enumDecodeNullable(
+        _$Issue1145RegressionEnumEnumMap,
+        json['durationType'],
+      ),
+    );
+
+Map<String, dynamic> _$Issue1226RegressionToJson(
+  Issue1226Regression instance,
+) => <String, dynamic>{
+  'durationType': ?_$Issue1145RegressionEnumEnumMap[instance.durationType],
+};
+
 const _$StandAloneEnumEnumMap = {
   StandAloneEnum.alpha: 'a',
   StandAloneEnum.beta: 'b',
@@ -38,3 +77,14 @@ const _$DayTypeEnumMap = {
   DayType.rotten: 'rotten',
   DayType.veryBad: 'very-bad',
 };
+
+const _$MyStatusCodeEnumMap = {
+  MyStatusCode.success: 200,
+  MyStatusCode.weird: 701,
+};
+
+const _$EnumValueFieldIndexEnumMap = {
+  EnumValueFieldIndex.success: 0,
+  EnumValueFieldIndex.weird: 701,
+  EnumValueFieldIndex.oneMore: 2,
+};
diff --git a/json_serializable/test/integration/json_keys_example.dart b/json_serializable/test/integration/json_keys_example.dart
new file mode 100644
index 000000000..985979d28
--- /dev/null
+++ b/json_serializable/test/integration/json_keys_example.dart
@@ -0,0 +1,28 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'json_keys_example.g.dart';
+
+@JsonSerializable(createJsonKeys: true, fieldRename: FieldRename.kebab)
+class Model {
+  Model({required this.firstName, required this.lastName, this.ignoredName});
+
+  factory Model.fromJson(Map<String, Object?> json) => _$ModelFromJson(json);
+
+  final String firstName;
+
+  @JsonKey(name: 'LAST_NAME')
+  final String lastName;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? ignoredName;
+
+  String get fullName => '$firstName $lastName';
+
+  Map<String, Object?> toJson() => _$ModelToJson(this);
+}
+
+// TODO: use this once https://github.com/dart-lang/sdk/issues/54543 is fixed
+typedef ModelJsonKeys = _$ModelJsonKeys;
+
+// Work-around until https://github.com/dart-lang/sdk/issues/54543 is fixed
+Set<String> get keys => {_$ModelJsonKeys.firstName, _$ModelJsonKeys.lastName};
diff --git a/json_serializable/test/integration/json_keys_example.g.dart b/json_serializable/test/integration/json_keys_example.g.dart
new file mode 100644
index 000000000..fc9429301
--- /dev/null
+++ b/json_serializable/test/integration/json_keys_example.g.dart
@@ -0,0 +1,24 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
+
+part of 'json_keys_example.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Model _$ModelFromJson(Map<String, dynamic> json) => Model(
+  firstName: json['first-name'] as String,
+  lastName: json['LAST_NAME'] as String,
+);
+
+abstract final class _$ModelJsonKeys {
+  static const String firstName = 'first-name';
+  static const String lastName = 'LAST_NAME';
+}
+
+Map<String, dynamic> _$ModelToJson(Model instance) => <String, dynamic>{
+  'first-name': instance.firstName,
+  'LAST_NAME': instance.lastName,
+};
diff --git a/json_serializable/test/integration/json_test_common.dart b/json_serializable/test/integration/json_test_common.dart
index fb7c4d212..95372161e 100644
--- a/json_serializable/test/integration/json_test_common.dart
+++ b/json_serializable/test/integration/json_test_common.dart
@@ -16,7 +16,7 @@ enum Category {
   down,
   // NOTE: this should override the kebab bits below!
   @JsonValue('not_discovered_yet')
-  notDiscoveredYet
+  notDiscoveredYet,
 }
 
 enum StatusCode {
@@ -38,6 +38,11 @@ Duration? durationFromInt(int? ms) =>
 
 int? durationToInt(Duration? duration) => duration?.inMilliseconds;
 
+String? stringFromDouble(double? value) => value?.toString();
+
+double? stringToDouble(String? value) =>
+    value == null ? null : double.parse(value);
+
 DateTime? dateTimeFromEpochUs(int? us) =>
     us == null ? null : DateTime.fromMicrosecondsSinceEpoch(us);
 
@@ -51,16 +56,11 @@ class Platform {
 
   const Platform._(this.description);
 
-  factory Platform.fromJson(String value) {
-    switch (value) {
-      case 'foo':
-        return foo;
-      case 'undefined':
-        return undefined;
-      default:
-        throw ArgumentError.value(value, 'value', 'Not a supported value.');
-    }
-  }
+  factory Platform.fromJson(String value) => switch (value) {
+    'foo' => foo,
+    'undefined' => undefined,
+    _ => throw ArgumentError.value(value, 'value', 'Not a supported value.'),
+  };
 
   String toJson() => description;
 }
diff --git a/json_serializable/test/integration/json_test_example.dart b/json_serializable/test/integration/json_test_example.dart
index b4c0ab86c..963cdc27e 100644
--- a/json_serializable/test/integration/json_test_example.dart
+++ b/json_serializable/test/integration/json_test_example.dart
@@ -27,8 +27,13 @@ class Person {
   Map<String, Category>? houseMap;
   Map<Category, int>? categoryCounts;
 
-  Person(this.firstName, this.lastName, this.house,
-      {this.middleName, this.dateOfBirth});
+  Person(
+    this.firstName,
+    this.lastName,
+    this.house, {
+    this.middleName,
+    this.dateOfBirth,
+  });
 
   factory Person.fromJson(Map<String, dynamic> json) => _$PersonFromJson(json);
 
@@ -68,7 +73,7 @@ class Order {
   )
   StatusCode? statusCode;
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   String get platformValue => platform!.description;
 
   set platformValue(String value) {
@@ -78,12 +83,13 @@ class Order {
   // Ignored getter without value set in ctor
   int get price => items!.fold(0, (total, item) => item.price! + total);
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   bool? shouldBeCached;
 
   Order.custom(this.category, [Iterable<Item>? items])
-      : items = UnmodifiableListView<Item>(
-            List<Item>.unmodifiable(items ?? const <Item>[]));
+    : items = UnmodifiableListView<Item>(
+        List<Item>.unmodifiable(items ?? const <Item>[]),
+      );
 
   factory Order.fromJson(Map<String, dynamic> json) => _$OrderFromJson(json);
 
@@ -109,7 +115,7 @@ class Item extends ItemCore {
   @JsonKey(fromJson: _fromJsonGeoPoint, toJson: _toJsonGeoPoint)
   GeoPoint? geoPoint;
 
-  Item([int? price]) : super(price);
+  Item([super.price]);
 
   factory Item.fromJson(Map<String, dynamic> json) => _$ItemFromJson(json);
 
@@ -155,6 +161,9 @@ class Numbers {
   @JsonKey(fromJson: durationFromInt, toJson: durationToInt)
   Duration? duration;
 
+  @JsonKey(fromJson: stringFromDouble, toJson: stringToDouble)
+  String? doubleAsString;
+
   @JsonKey(fromJson: dateTimeFromEpochUs, toJson: dateTimeToEpochUs)
   DateTime? date;
 
@@ -239,3 +248,21 @@ class PrivateConstructor {
   bool operator ==(Object other) =>
       other is PrivateConstructor && id == other.id && value == other.value;
 }
+
+mixin RegressionTestIssue1210Mixin {
+  bool? get someProperty => null;
+
+  @override
+  int get hashCode => identityHashCode(this);
+}
+
+@JsonSerializable()
+class RegressionTestIssue1210 with RegressionTestIssue1210Mixin {
+  const RegressionTestIssue1210(this.field);
+
+  factory RegressionTestIssue1210.fromJson(Map<String, dynamic> json) =>
+      _$RegressionTestIssue1210FromJson(json);
+  final String field;
+
+  Map<String, dynamic> toJson() => _$RegressionTestIssue1210ToJson(this);
+}
diff --git a/json_serializable/test/integration/json_test_example.g.dart b/json_serializable/test/integration/json_test_example.g.dart
index a4a8172a1..1f1b456ee 100644
--- a/json_serializable/test/integration/json_test_example.g.dart
+++ b/json_serializable/test/integration/json_test_example.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'json_test_example.dart';
 
@@ -8,43 +8,49 @@ part of 'json_test_example.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Person _$PersonFromJson(Map<String, dynamic> json) => Person(
-      json['firstName'] as String,
-      json['lastName'] as String,
-      $enumDecode(_$CategoryEnumMap, json[r'$house']),
-      middleName: json['middleName'] as String?,
-      dateOfBirth: json['dateOfBirth'] == null
-          ? null
-          : DateTime.parse(json['dateOfBirth'] as String),
-    )
+Person _$PersonFromJson(Map<String, dynamic> json) =>
+    Person(
+        json['firstName'] as String,
+        json['lastName'] as String,
+        $enumDecode(_$CategoryEnumMap, json[r'$house']),
+        middleName: json['middleName'] as String?,
+        dateOfBirth: json['dateOfBirth'] == null
+            ? null
+            : DateTime.parse(json['dateOfBirth'] as String),
+      )
       ..order = json['order'] == null
           ? null
           : Order.fromJson(json['order'] as Map<String, dynamic>)
       ..customOrders = json['customOrders'] == null
           ? null
-          : MyList<Order>.fromJson((json['customOrders'] as List<dynamic>)
-              .map((e) => Order.fromJson(e as Map<String, dynamic>))
-              .toList())
+          : MyList<Order>.fromJson(
+              (json['customOrders'] as List<dynamic>)
+                  .map((e) => Order.fromJson(e as Map<String, dynamic>))
+                  .toList(),
+            )
       ..houseMap = (json['houseMap'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, $enumDecode(_$CategoryEnumMap, e)),
       )
       ..categoryCounts = (json['categoryCounts'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry($enumDecode(_$CategoryEnumMap, k), e as int),
+        (k, e) =>
+            MapEntry($enumDecode(_$CategoryEnumMap, k), (e as num).toInt()),
       );
 
 Map<String, dynamic> _$PersonToJson(Person instance) => <String, dynamic>{
-      'firstName': instance.firstName,
-      'lastName': instance.lastName,
-      'middleName': instance.middleName,
-      'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
-      r'$house': _$CategoryEnumMap[instance.house],
-      'order': instance.order,
-      'customOrders': instance.customOrders,
-      'houseMap':
-          instance.houseMap?.map((k, e) => MapEntry(k, _$CategoryEnumMap[e])),
-      'categoryCounts': instance.categoryCounts
-          ?.map((k, e) => MapEntry(_$CategoryEnumMap[k], e)),
-    };
+  'firstName': instance.firstName,
+  'lastName': instance.lastName,
+  'middleName': instance.middleName,
+  'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
+  r'$house': _$CategoryEnumMap[instance.house]!,
+  'order': instance.order,
+  'customOrders': instance.customOrders,
+  'houseMap': instance.houseMap?.map(
+    (k, e) => MapEntry(k, _$CategoryEnumMap[e]!),
+  ),
+  'categoryCounts': instance.categoryCounts?.map(
+    (k, e) => MapEntry(_$CategoryEnumMap[k]!, e),
+  ),
+};
 
 const _$CategoryEnumMap = {
   Category.top: 'top',
@@ -57,53 +63,47 @@ const _$CategoryEnumMap = {
 };
 
 Order _$OrderFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    disallowNullValues: const ['count'],
-  );
+  $checkKeys(json, disallowNullValues: const ['count']);
   return Order.custom(
-    $enumDecodeNullable(_$CategoryEnumMap, json['category']),
-    (json['items'] as List<dynamic>?)
-        ?.map((e) => Item.fromJson(e as Map<String, dynamic>)),
-  )
-    ..count = json['count'] as int?
+      $enumDecodeNullable(_$CategoryEnumMap, json['category']),
+      (json['items'] as List<dynamic>?)?.map(
+        (e) => Item.fromJson(e as Map<String, dynamic>),
+      ),
+    )
+    ..count = (json['count'] as num?)?.toInt()
     ..isRushed = json['isRushed'] as bool?
     ..duration = json['duration'] == null
         ? null
-        : Duration(microseconds: json['duration'] as int)
+        : Duration(microseconds: (json['duration'] as num).toInt())
     ..platform = json['platform'] == null
         ? null
         : Platform.fromJson(json['platform'] as String)
     ..altPlatforms = (json['altPlatforms'] as Map<String, dynamic>?)?.map(
       (k, e) => MapEntry(k, Platform.fromJson(e as String)),
     )
-    ..homepage =
-        json['homepage'] == null ? null : Uri.parse(json['homepage'] as String)
-    ..statusCode = $enumDecodeNullable(_$StatusCodeEnumMap, json['status_code'],
-            unknownValue: StatusCode.unknown) ??
+    ..homepage = json['homepage'] == null
+        ? null
+        : Uri.parse(json['homepage'] as String)
+    ..statusCode =
+        $enumDecodeNullable(
+          _$StatusCodeEnumMap,
+          json['status_code'],
+          unknownValue: StatusCode.unknown,
+        ) ??
         StatusCode.success;
 }
 
-Map<String, dynamic> _$OrderToJson(Order instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('count', instance.count);
-  val['isRushed'] = instance.isRushed;
-  val['duration'] = instance.duration?.inMicroseconds;
-  val['category'] = _$CategoryEnumMap[instance.category];
-  val['items'] = instance.items;
-  val['platform'] = instance.platform;
-  val['altPlatforms'] = instance.altPlatforms;
-  val['homepage'] = instance.homepage?.toString();
-  val['status_code'] = _$StatusCodeEnumMap[instance.statusCode];
-  return val;
-}
+Map<String, dynamic> _$OrderToJson(Order instance) => <String, dynamic>{
+  'count': ?instance.count,
+  'isRushed': instance.isRushed,
+  'duration': instance.duration?.inMicroseconds,
+  'category': _$CategoryEnumMap[instance.category],
+  'items': instance.items,
+  'platform': instance.platform,
+  'altPlatforms': instance.altPlatforms,
+  'homepage': instance.homepage?.toString(),
+  'status_code': _$StatusCodeEnumMap[instance.statusCode],
+};
 
 const _$StatusCodeEnumMap = {
   StatusCode.success: 200,
@@ -112,37 +112,29 @@ const _$StatusCodeEnumMap = {
   StatusCode.unknown: 'unknown',
 };
 
-Item _$ItemFromJson(Map<String, dynamic> json) => Item(
-      json['price'] as int?,
-    )
-      ..itemNumber = json['item-number'] as int?
+Item _$ItemFromJson(Map<String, dynamic> json) =>
+    Item((json['price'] as num?)?.toInt())
+      ..itemNumber = (json['item-number'] as num?)?.toInt()
       ..saleDates = (json['saleDates'] as List<dynamic>?)
           ?.map((e) => DateTime.parse(e as String))
           .toList()
-      ..rates = (json['rates'] as List<dynamic>?)?.map((e) => e as int).toList()
+      ..rates = (json['rates'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList()
       ..geoPoint = _fromJsonGeoPoint(json['geoPoint'] as Map<String, dynamic>?);
 
-Map<String, dynamic> _$ItemToJson(Item instance) {
-  final val = <String, dynamic>{
-    'price': instance.price,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('item-number', instance.itemNumber);
-  val['saleDates'] =
-      instance.saleDates?.map((e) => e.toIso8601String()).toList();
-  val['rates'] = instance.rates;
-  val['geoPoint'] = _toJsonGeoPoint(instance.geoPoint);
-  return val;
-}
+Map<String, dynamic> _$ItemToJson(Item instance) => <String, dynamic>{
+  'price': instance.price,
+  'item-number': ?instance.itemNumber,
+  'saleDates': instance.saleDates?.map((e) => e.toIso8601String()).toList(),
+  'rates': instance.rates,
+  'geoPoint': _toJsonGeoPoint(instance.geoPoint),
+};
 
 Numbers _$NumbersFromJson(Map<String, dynamic> json) => Numbers()
-  ..ints = (json['ints'] as List<dynamic>?)?.map((e) => e as int).toList()
+  ..ints = (json['ints'] as List<dynamic>?)
+      ?.map((e) => (e as num).toInt())
+      .toList()
   ..nums = (json['nums'] as List<dynamic>?)?.map((e) => e as num).toList()
   ..doubles = (json['doubles'] as List<dynamic>?)
       ?.map((e) => (e as num).toDouble())
@@ -150,66 +142,90 @@ Numbers _$NumbersFromJson(Map<String, dynamic> json) => Numbers()
   ..nnDoubles = (json['nnDoubles'] as List<dynamic>?)
       ?.map((e) => (e as num).toDouble())
       .toList()
-  ..duration = durationFromInt(json['duration'] as int?)
-  ..date = dateTimeFromEpochUs(json['date'] as int?);
+  ..duration = durationFromInt((json['duration'] as num?)?.toInt())
+  ..doubleAsString = stringFromDouble(
+    (json['doubleAsString'] as num?)?.toDouble(),
+  )
+  ..date = dateTimeFromEpochUs((json['date'] as num?)?.toInt());
 
 Map<String, dynamic> _$NumbersToJson(Numbers instance) => <String, dynamic>{
-      'ints': instance.ints,
-      'nums': instance.nums,
-      'doubles': instance.doubles,
-      'nnDoubles': instance.nnDoubles,
-      'duration': durationToInt(instance.duration),
-      'date': dateTimeToEpochUs(instance.date),
-    };
+  'ints': instance.ints,
+  'nums': instance.nums,
+  'doubles': instance.doubles,
+  'nnDoubles': instance.nnDoubles,
+  'duration': durationToInt(instance.duration),
+  'doubleAsString': stringToDouble(instance.doubleAsString),
+  'date': dateTimeToEpochUs(instance.date),
+};
 
 MapKeyVariety _$MapKeyVarietyFromJson(Map<String, dynamic> json) =>
     MapKeyVariety()
       ..intIntMap = (json['intIntMap'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), e as int),
+        (k, e) => MapEntry(int.parse(k), (e as num).toInt()),
       )
       ..uriIntMap = (json['uriIntMap'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), e as int),
+        (k, e) => MapEntry(Uri.parse(k), (e as num).toInt()),
       )
       ..dateTimeIntMap = (json['dateTimeIntMap'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(DateTime.parse(k), e as int),
+        (k, e) => MapEntry(DateTime.parse(k), (e as num).toInt()),
       )
       ..bigIntMap = (json['bigIntMap'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(BigInt.parse(k), e as int),
+        (k, e) => MapEntry(BigInt.parse(k), (e as num).toInt()),
       );
 
 Map<String, dynamic> _$MapKeyVarietyToJson(MapKeyVariety instance) =>
     <String, dynamic>{
       'intIntMap': instance.intIntMap?.map((k, e) => MapEntry(k.toString(), e)),
       'uriIntMap': instance.uriIntMap?.map((k, e) => MapEntry(k.toString(), e)),
-      'dateTimeIntMap': instance.dateTimeIntMap
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+      'dateTimeIntMap': instance.dateTimeIntMap?.map(
+        (k, e) => MapEntry(k.toIso8601String(), e),
+      ),
       'bigIntMap': instance.bigIntMap?.map((k, e) => MapEntry(k.toString(), e)),
     };
 
 UnknownEnumValue _$UnknownEnumValueFromJson(Map<String, dynamic> json) =>
     UnknownEnumValue()
-      ..enumValue = $enumDecode(_$CategoryEnumMap, json['enumValue'],
-          unknownValue: Category.notDiscoveredYet)
-      ..enumIterable = (json['enumIterable'] as List<dynamic>).map((e) =>
-          $enumDecode(_$CategoryEnumMap, e,
-              unknownValue: Category.notDiscoveredYet))
+      ..enumValue = $enumDecode(
+        _$CategoryEnumMap,
+        json['enumValue'],
+        unknownValue: Category.notDiscoveredYet,
+      )
+      ..enumIterable = (json['enumIterable'] as List<dynamic>).map(
+        (e) => $enumDecode(
+          _$CategoryEnumMap,
+          e,
+          unknownValue: Category.notDiscoveredYet,
+        ),
+      )
       ..enumList = (json['enumList'] as List<dynamic>)
-          .map((e) => $enumDecode(_$CategoryEnumMap, e,
-              unknownValue: Category.notDiscoveredYet))
+          .map(
+            (e) => $enumDecode(
+              _$CategoryEnumMap,
+              e,
+              unknownValue: Category.notDiscoveredYet,
+            ),
+          )
           .toList()
       ..enumSet = (json['enumSet'] as List<dynamic>)
-          .map((e) => $enumDecode(_$CategoryEnumMap, e,
-              unknownValue: Category.notDiscoveredYet))
+          .map(
+            (e) => $enumDecode(
+              _$CategoryEnumMap,
+              e,
+              unknownValue: Category.notDiscoveredYet,
+            ),
+          )
           .toSet();
 
 PrivateConstructor _$PrivateConstructorFromJson(Map<String, dynamic> json) =>
-    PrivateConstructor._(
-      json['id'] as int,
-      json['value'] as String,
-    );
+    PrivateConstructor._((json['id'] as num).toInt(), json['value'] as String);
 
 Map<String, dynamic> _$PrivateConstructorToJson(PrivateConstructor instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'value': instance.value,
-    };
+    <String, dynamic>{'id': instance.id, 'value': instance.value};
+
+RegressionTestIssue1210 _$RegressionTestIssue1210FromJson(
+  Map<String, dynamic> json,
+) => RegressionTestIssue1210(json['field'] as String);
+
+Map<String, dynamic> _$RegressionTestIssue1210ToJson(
+  RegressionTestIssue1210 instance,
+) => <String, dynamic>{'field': instance.field};
diff --git a/json_serializable/test/integration/json_test_example.g_any_map.dart b/json_serializable/test/integration/json_test_example.g_any_map.dart
index a6ce3663b..f499eb13d 100644
--- a/json_serializable/test/integration/json_test_example.g_any_map.dart
+++ b/json_serializable/test/integration/json_test_example.g_any_map.dart
@@ -12,9 +12,7 @@ import 'json_test_common.dart';
 
 part 'json_test_example.g_any_map.g.dart';
 
-@JsonSerializable(
-  anyMap: true,
-)
+@JsonSerializable(anyMap: true)
 class Person {
   final String firstName, lastName;
   final String? middleName;
@@ -29,8 +27,13 @@ class Person {
   Map<String, Category>? houseMap;
   Map<Category, int>? categoryCounts;
 
-  Person(this.firstName, this.lastName, this.house,
-      {this.middleName, this.dateOfBirth});
+  Person(
+    this.firstName,
+    this.lastName,
+    this.house, {
+    this.middleName,
+    this.dateOfBirth,
+  });
 
   factory Person.fromJson(Map<String, dynamic> json) => _$PersonFromJson(json);
 
@@ -70,7 +73,7 @@ class Order {
   )
   StatusCode? statusCode;
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   String get platformValue => platform!.description;
 
   set platformValue(String value) {
@@ -80,12 +83,13 @@ class Order {
   // Ignored getter without value set in ctor
   int get price => items!.fold(0, (total, item) => item.price! + total);
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   bool? shouldBeCached;
 
   Order.custom(this.category, [Iterable<Item>? items])
-      : items = UnmodifiableListView<Item>(
-            List<Item>.unmodifiable(items ?? const <Item>[]));
+    : items = UnmodifiableListView<Item>(
+        List<Item>.unmodifiable(items ?? const <Item>[]),
+      );
 
   factory Order.fromJson(Map<String, dynamic> json) => _$OrderFromJson(json);
 
@@ -100,9 +104,7 @@ class Order {
       deepEquals(altPlatforms, other.altPlatforms);
 }
 
-@JsonSerializable(
-  anyMap: true,
-)
+@JsonSerializable(anyMap: true)
 class Item extends ItemCore {
   @JsonKey(includeIfNull: false, name: 'item-number')
   int? itemNumber;
@@ -113,7 +115,7 @@ class Item extends ItemCore {
   @JsonKey(fromJson: _fromJsonGeoPoint, toJson: _toJsonGeoPoint)
   GeoPoint? geoPoint;
 
-  Item([int? price]) : super(price);
+  Item([super.price]);
 
   factory Item.fromJson(Map<String, dynamic> json) => _$ItemFromJson(json);
 
@@ -148,9 +150,7 @@ class GeoPoint {
   GeoPoint(this.latitude, this.longitude);
 }
 
-@JsonSerializable(
-  anyMap: true,
-)
+@JsonSerializable(anyMap: true)
 class Numbers {
   List<int>? ints;
   List<num>? nums;
@@ -161,6 +161,9 @@ class Numbers {
   @JsonKey(fromJson: durationFromInt, toJson: durationToInt)
   Duration? duration;
 
+  @JsonKey(fromJson: stringFromDouble, toJson: stringToDouble)
+  String? doubleAsString;
+
   @JsonKey(fromJson: dateTimeFromEpochUs, toJson: dateTimeToEpochUs)
   DateTime? date;
 
@@ -182,9 +185,7 @@ class Numbers {
       deepEquals(date, other.date);
 }
 
-@JsonSerializable(
-  anyMap: true,
-)
+@JsonSerializable(anyMap: true)
 class MapKeyVariety {
   Map<int, int>? intIntMap;
   Map<Uri, int>? uriIntMap;
@@ -247,3 +248,21 @@ class PrivateConstructor {
   bool operator ==(Object other) =>
       other is PrivateConstructor && id == other.id && value == other.value;
 }
+
+mixin RegressionTestIssue1210Mixin {
+  bool? get someProperty => null;
+
+  @override
+  int get hashCode => identityHashCode(this);
+}
+
+@JsonSerializable(anyMap: true)
+class RegressionTestIssue1210 with RegressionTestIssue1210Mixin {
+  const RegressionTestIssue1210(this.field);
+
+  factory RegressionTestIssue1210.fromJson(Map<String, dynamic> json) =>
+      _$RegressionTestIssue1210FromJson(json);
+  final String field;
+
+  Map<String, dynamic> toJson() => _$RegressionTestIssue1210ToJson(this);
+}
diff --git a/json_serializable/test/integration/json_test_example.g_any_map.g.dart b/json_serializable/test/integration/json_test_example.g_any_map.g.dart
index b25d890bb..f25c7971e 100644
--- a/json_serializable/test/integration/json_test_example.g_any_map.g.dart
+++ b/json_serializable/test/integration/json_test_example.g_any_map.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'json_test_example.g_any_map.dart';
 
@@ -8,43 +8,51 @@ part of 'json_test_example.g_any_map.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-Person _$PersonFromJson(Map json) => Person(
-      json['firstName'] as String,
-      json['lastName'] as String,
-      $enumDecode(_$CategoryEnumMap, json[r'$house']),
-      middleName: json['middleName'] as String?,
-      dateOfBirth: json['dateOfBirth'] == null
-          ? null
-          : DateTime.parse(json['dateOfBirth'] as String),
-    )
+Person _$PersonFromJson(Map json) =>
+    Person(
+        json['firstName'] as String,
+        json['lastName'] as String,
+        $enumDecode(_$CategoryEnumMap, json[r'$house']),
+        middleName: json['middleName'] as String?,
+        dateOfBirth: json['dateOfBirth'] == null
+            ? null
+            : DateTime.parse(json['dateOfBirth'] as String),
+      )
       ..order = json['order'] == null
           ? null
           : Order.fromJson(Map<String, dynamic>.from(json['order'] as Map))
       ..customOrders = json['customOrders'] == null
           ? null
-          : MyList<Order>.fromJson((json['customOrders'] as List<dynamic>)
-              .map((e) => Order.fromJson(Map<String, dynamic>.from(e as Map)))
-              .toList())
+          : MyList<Order>.fromJson(
+              (json['customOrders'] as List<dynamic>)
+                  .map(
+                    (e) => Order.fromJson(Map<String, dynamic>.from(e as Map)),
+                  )
+                  .toList(),
+            )
       ..houseMap = (json['houseMap'] as Map?)?.map(
         (k, e) => MapEntry(k as String, $enumDecode(_$CategoryEnumMap, e)),
       )
       ..categoryCounts = (json['categoryCounts'] as Map?)?.map(
-        (k, e) => MapEntry($enumDecode(_$CategoryEnumMap, k), e as int),
+        (k, e) =>
+            MapEntry($enumDecode(_$CategoryEnumMap, k), (e as num).toInt()),
       );
 
 Map<String, dynamic> _$PersonToJson(Person instance) => <String, dynamic>{
-      'firstName': instance.firstName,
-      'lastName': instance.lastName,
-      'middleName': instance.middleName,
-      'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
-      r'$house': _$CategoryEnumMap[instance.house],
-      'order': instance.order,
-      'customOrders': instance.customOrders,
-      'houseMap':
-          instance.houseMap?.map((k, e) => MapEntry(k, _$CategoryEnumMap[e])),
-      'categoryCounts': instance.categoryCounts
-          ?.map((k, e) => MapEntry(_$CategoryEnumMap[k], e)),
-    };
+  'firstName': instance.firstName,
+  'lastName': instance.lastName,
+  'middleName': instance.middleName,
+  'dateOfBirth': instance.dateOfBirth?.toIso8601String(),
+  r'$house': _$CategoryEnumMap[instance.house]!,
+  'order': instance.order,
+  'customOrders': instance.customOrders,
+  'houseMap': instance.houseMap?.map(
+    (k, e) => MapEntry(k, _$CategoryEnumMap[e]!),
+  ),
+  'categoryCounts': instance.categoryCounts?.map(
+    (k, e) => MapEntry(_$CategoryEnumMap[k]!, e),
+  ),
+};
 
 const _$CategoryEnumMap = {
   Category.top: 'top',
@@ -57,53 +65,47 @@ const _$CategoryEnumMap = {
 };
 
 Order _$OrderFromJson(Map json) {
-  $checkKeys(
-    json,
-    disallowNullValues: const ['count'],
-  );
+  $checkKeys(json, disallowNullValues: const ['count']);
   return Order.custom(
-    $enumDecodeNullable(_$CategoryEnumMap, json['category']),
-    (json['items'] as List<dynamic>?)
-        ?.map((e) => Item.fromJson(Map<String, dynamic>.from(e as Map))),
-  )
-    ..count = json['count'] as int?
+      $enumDecodeNullable(_$CategoryEnumMap, json['category']),
+      (json['items'] as List<dynamic>?)?.map(
+        (e) => Item.fromJson(Map<String, dynamic>.from(e as Map)),
+      ),
+    )
+    ..count = (json['count'] as num?)?.toInt()
     ..isRushed = json['isRushed'] as bool?
     ..duration = json['duration'] == null
         ? null
-        : Duration(microseconds: json['duration'] as int)
+        : Duration(microseconds: (json['duration'] as num).toInt())
     ..platform = json['platform'] == null
         ? null
         : Platform.fromJson(json['platform'] as String)
     ..altPlatforms = (json['altPlatforms'] as Map?)?.map(
       (k, e) => MapEntry(k as String, Platform.fromJson(e as String)),
     )
-    ..homepage =
-        json['homepage'] == null ? null : Uri.parse(json['homepage'] as String)
-    ..statusCode = $enumDecodeNullable(_$StatusCodeEnumMap, json['status_code'],
-            unknownValue: StatusCode.unknown) ??
+    ..homepage = json['homepage'] == null
+        ? null
+        : Uri.parse(json['homepage'] as String)
+    ..statusCode =
+        $enumDecodeNullable(
+          _$StatusCodeEnumMap,
+          json['status_code'],
+          unknownValue: StatusCode.unknown,
+        ) ??
         StatusCode.success;
 }
 
-Map<String, dynamic> _$OrderToJson(Order instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('count', instance.count);
-  val['isRushed'] = instance.isRushed;
-  val['duration'] = instance.duration?.inMicroseconds;
-  val['category'] = _$CategoryEnumMap[instance.category];
-  val['items'] = instance.items;
-  val['platform'] = instance.platform;
-  val['altPlatforms'] = instance.altPlatforms;
-  val['homepage'] = instance.homepage?.toString();
-  val['status_code'] = _$StatusCodeEnumMap[instance.statusCode];
-  return val;
-}
+Map<String, dynamic> _$OrderToJson(Order instance) => <String, dynamic>{
+  'count': ?instance.count,
+  'isRushed': instance.isRushed,
+  'duration': instance.duration?.inMicroseconds,
+  'category': _$CategoryEnumMap[instance.category],
+  'items': instance.items,
+  'platform': instance.platform,
+  'altPlatforms': instance.altPlatforms,
+  'homepage': instance.homepage?.toString(),
+  'status_code': _$StatusCodeEnumMap[instance.statusCode],
+};
 
 const _$StatusCodeEnumMap = {
   StatusCode.success: 200,
@@ -112,37 +114,28 @@ const _$StatusCodeEnumMap = {
   StatusCode.unknown: 'unknown',
 };
 
-Item _$ItemFromJson(Map json) => Item(
-      json['price'] as int?,
-    )
-      ..itemNumber = json['item-number'] as int?
-      ..saleDates = (json['saleDates'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String))
-          .toList()
-      ..rates = (json['rates'] as List<dynamic>?)?.map((e) => e as int).toList()
-      ..geoPoint = _fromJsonGeoPoint(json['geoPoint'] as Map<String, dynamic>?);
-
-Map<String, dynamic> _$ItemToJson(Item instance) {
-  final val = <String, dynamic>{
-    'price': instance.price,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('item-number', instance.itemNumber);
-  val['saleDates'] =
-      instance.saleDates?.map((e) => e.toIso8601String()).toList();
-  val['rates'] = instance.rates;
-  val['geoPoint'] = _toJsonGeoPoint(instance.geoPoint);
-  return val;
-}
+Item _$ItemFromJson(Map json) => Item((json['price'] as num?)?.toInt())
+  ..itemNumber = (json['item-number'] as num?)?.toInt()
+  ..saleDates = (json['saleDates'] as List<dynamic>?)
+      ?.map((e) => DateTime.parse(e as String))
+      .toList()
+  ..rates = (json['rates'] as List<dynamic>?)
+      ?.map((e) => (e as num).toInt())
+      .toList()
+  ..geoPoint = _fromJsonGeoPoint(json['geoPoint'] as Map<String, dynamic>?);
+
+Map<String, dynamic> _$ItemToJson(Item instance) => <String, dynamic>{
+  'price': instance.price,
+  'item-number': ?instance.itemNumber,
+  'saleDates': instance.saleDates?.map((e) => e.toIso8601String()).toList(),
+  'rates': instance.rates,
+  'geoPoint': _toJsonGeoPoint(instance.geoPoint),
+};
 
 Numbers _$NumbersFromJson(Map json) => Numbers()
-  ..ints = (json['ints'] as List<dynamic>?)?.map((e) => e as int).toList()
+  ..ints = (json['ints'] as List<dynamic>?)
+      ?.map((e) => (e as num).toInt())
+      .toList()
   ..nums = (json['nums'] as List<dynamic>?)?.map((e) => e as num).toList()
   ..doubles = (json['doubles'] as List<dynamic>?)
       ?.map((e) => (e as num).toDouble())
@@ -150,64 +143,87 @@ Numbers _$NumbersFromJson(Map json) => Numbers()
   ..nnDoubles = (json['nnDoubles'] as List<dynamic>?)
       ?.map((e) => (e as num).toDouble())
       .toList()
-  ..duration = durationFromInt(json['duration'] as int?)
-  ..date = dateTimeFromEpochUs(json['date'] as int?);
+  ..duration = durationFromInt((json['duration'] as num?)?.toInt())
+  ..doubleAsString = stringFromDouble(
+    (json['doubleAsString'] as num?)?.toDouble(),
+  )
+  ..date = dateTimeFromEpochUs((json['date'] as num?)?.toInt());
 
 Map<String, dynamic> _$NumbersToJson(Numbers instance) => <String, dynamic>{
-      'ints': instance.ints,
-      'nums': instance.nums,
-      'doubles': instance.doubles,
-      'nnDoubles': instance.nnDoubles,
-      'duration': durationToInt(instance.duration),
-      'date': dateTimeToEpochUs(instance.date),
-    };
+  'ints': instance.ints,
+  'nums': instance.nums,
+  'doubles': instance.doubles,
+  'nnDoubles': instance.nnDoubles,
+  'duration': durationToInt(instance.duration),
+  'doubleAsString': stringToDouble(instance.doubleAsString),
+  'date': dateTimeToEpochUs(instance.date),
+};
 
 MapKeyVariety _$MapKeyVarietyFromJson(Map json) => MapKeyVariety()
   ..intIntMap = (json['intIntMap'] as Map?)?.map(
-    (k, e) => MapEntry(int.parse(k as String), e as int),
+    (k, e) => MapEntry(int.parse(k as String), (e as num).toInt()),
   )
   ..uriIntMap = (json['uriIntMap'] as Map?)?.map(
-    (k, e) => MapEntry(Uri.parse(k as String), e as int),
+    (k, e) => MapEntry(Uri.parse(k as String), (e as num).toInt()),
   )
   ..dateTimeIntMap = (json['dateTimeIntMap'] as Map?)?.map(
-    (k, e) => MapEntry(DateTime.parse(k as String), e as int),
+    (k, e) => MapEntry(DateTime.parse(k as String), (e as num).toInt()),
   )
   ..bigIntMap = (json['bigIntMap'] as Map?)?.map(
-    (k, e) => MapEntry(BigInt.parse(k as String), e as int),
+    (k, e) => MapEntry(BigInt.parse(k as String), (e as num).toInt()),
   );
 
 Map<String, dynamic> _$MapKeyVarietyToJson(MapKeyVariety instance) =>
     <String, dynamic>{
       'intIntMap': instance.intIntMap?.map((k, e) => MapEntry(k.toString(), e)),
       'uriIntMap': instance.uriIntMap?.map((k, e) => MapEntry(k.toString(), e)),
-      'dateTimeIntMap': instance.dateTimeIntMap
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+      'dateTimeIntMap': instance.dateTimeIntMap?.map(
+        (k, e) => MapEntry(k.toIso8601String(), e),
+      ),
       'bigIntMap': instance.bigIntMap?.map((k, e) => MapEntry(k.toString(), e)),
     };
 
 UnknownEnumValue _$UnknownEnumValueFromJson(Map json) => UnknownEnumValue()
-  ..enumValue = $enumDecode(_$CategoryEnumMap, json['enumValue'],
-      unknownValue: Category.notDiscoveredYet)
-  ..enumIterable = (json['enumIterable'] as List<dynamic>).map((e) =>
-      $enumDecode(_$CategoryEnumMap, e,
-          unknownValue: Category.notDiscoveredYet))
+  ..enumValue = $enumDecode(
+    _$CategoryEnumMap,
+    json['enumValue'],
+    unknownValue: Category.notDiscoveredYet,
+  )
+  ..enumIterable = (json['enumIterable'] as List<dynamic>).map(
+    (e) => $enumDecode(
+      _$CategoryEnumMap,
+      e,
+      unknownValue: Category.notDiscoveredYet,
+    ),
+  )
   ..enumList = (json['enumList'] as List<dynamic>)
-      .map((e) => $enumDecode(_$CategoryEnumMap, e,
-          unknownValue: Category.notDiscoveredYet))
+      .map(
+        (e) => $enumDecode(
+          _$CategoryEnumMap,
+          e,
+          unknownValue: Category.notDiscoveredYet,
+        ),
+      )
       .toList()
   ..enumSet = (json['enumSet'] as List<dynamic>)
-      .map((e) => $enumDecode(_$CategoryEnumMap, e,
-          unknownValue: Category.notDiscoveredYet))
+      .map(
+        (e) => $enumDecode(
+          _$CategoryEnumMap,
+          e,
+          unknownValue: Category.notDiscoveredYet,
+        ),
+      )
       .toSet();
 
 PrivateConstructor _$PrivateConstructorFromJson(Map json) =>
-    PrivateConstructor._(
-      json['id'] as int,
-      json['value'] as String,
-    );
+    PrivateConstructor._((json['id'] as num).toInt(), json['value'] as String);
 
 Map<String, dynamic> _$PrivateConstructorToJson(PrivateConstructor instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'value': instance.value,
-    };
+    <String, dynamic>{'id': instance.id, 'value': instance.value};
+
+RegressionTestIssue1210 _$RegressionTestIssue1210FromJson(Map json) =>
+    RegressionTestIssue1210(json['field'] as String);
+
+Map<String, dynamic> _$RegressionTestIssue1210ToJson(
+  RegressionTestIssue1210 instance,
+) => <String, dynamic>{'field': instance.field};
diff --git a/json_serializable/test/json_serializable_test.dart b/json_serializable/test/json_serializable_test.dart
index 9c8b2d46a..b6ff36789 100644
--- a/json_serializable/test/json_serializable_test.dart
+++ b/json_serializable/test/json_serializable_test.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library;
+
 import 'package:json_serializable/json_serializable.dart';
 import 'package:path/path.dart' as p;
 import 'package:source_gen_test/source_gen_test.dart';
@@ -29,25 +31,29 @@ Future<void> main() async {
   testAnnotatedElements(
     jsonEnumTestReader,
     const JsonEnumGenerator(),
-    expectedAnnotatedTests: {'UnsupportedClass'},
+    expectedAnnotatedTests: {
+      'EnumValueIssue1147',
+      'EnumValueNotAField',
+      'EnumValueNotSupportType',
+      'EnumValueWeirdField',
+      'UnsupportedClass',
+    },
   );
 }
 
 const _expectedAnnotatedTests = {
-  'annotatedMethod',
-  'unsupportedEnum',
+  'BadEnumDefaultValue',
   'BadFromFuncReturnType',
   'BadNoArgs',
   'BadOneNamed',
   'BadToFuncReturnType',
   'BadTwoRequiredPositional',
-  'BadEnumDefaultValue',
-  '_BetterPrivateNames',
   'CtorDefaultValueAndJsonKeyDefaultValue',
   'DefaultDoubleConstants',
   'DefaultWithConstObject',
   'DefaultWithDisallowNullRequiredClass',
   'DefaultWithFunction',
+  'DefaultWithFunctionInList',
   'DefaultWithNestedEnum',
   'DefaultWithSymbol',
   'DefaultWithToJsonClass',
@@ -57,6 +63,7 @@ const _expectedAnnotatedTests = {
   'FieldNamerKebab',
   'FieldNamerNone',
   'FieldNamerPascal',
+  'FieldNamerScreamingSnake',
   'FieldNamerSnake',
   'FieldWithFromJsonCtorAndTypeParams',
   'FinalFields',
@@ -67,9 +74,11 @@ const _expectedAnnotatedTests = {
   'GeneralTestClass2',
   'GenericArgumentFactoriesFlagWithoutGenericType',
   'GenericClass',
+  'IgnoreAndIncludeFromJsonFieldCtorClass',
+  'IgnoreAndIncludeToJsonFieldCtorClass',
+  'IgnoreUnannotated',
   'IgnoredFieldClass',
   'IgnoredFieldCtorClass',
-  'IgnoreUnannotated',
   'IncludeIfNullDisallowNullClass',
   'IncludeIfNullOverride',
   'InvalidChildClassFromJson',
@@ -77,11 +86,13 @@ const _expectedAnnotatedTests = {
   'InvalidChildClassFromJson3',
   'InvalidFromFunc2Args',
   'InvalidToFunc2Args',
+  'Issue1038RegressionTest',
   'Issue713',
   'JsonConvertOnField',
   'JsonConverterCtorParams',
   'JsonConverterDuplicateAnnotations',
   'JsonConverterNamedCtor',
+  'JsonConverterNullableToNonNullable',
   'JsonConverterOnGetter',
   'JsonConverterWithBadTypeArg',
   'JsonValueValid',
@@ -109,22 +120,24 @@ const _expectedAnnotatedTests = {
   'PropInMixinI448Regression',
   'Reproduce869NullableGenericType',
   'Reproduce869NullableGenericTypeWithDefault',
+  'SameCtorAndJsonKeyDefaultValue',
   'SetSupport',
-  'SubclassedJsonKey',
   'SubType',
   'SubTypeWithAnnotatedFieldOverrideExtends',
   'SubTypeWithAnnotatedFieldOverrideExtendsWithOverrides',
   'SubTypeWithAnnotatedFieldOverrideImplements',
-  'theAnswer',
+  'SubclassedJsonKey',
+  'TearOffFromJsonClass',
   'ToJsonNullableFalseIncludeIfNullFalse',
   'TypedConvertMethods',
   'UnknownEnumValue',
   'UnknownEnumValueListWrongEnumType',
   'UnknownEnumValueListWrongType',
-  'UnknownEnumValueWrongEnumType',
   'UnknownEnumValueNotEnumField',
+  'UnknownEnumValueWrongEnumType',
   'UnsupportedDateTimeField',
   'UnsupportedDurationField',
+  'UnsupportedEnum',
   'UnsupportedListField',
   'UnsupportedMapField',
   'UnsupportedSetField',
@@ -133,4 +146,7 @@ const _expectedAnnotatedTests = {
   'WithANonCtorGetter',
   'WithANonCtorGetterChecked',
   'WrongConstructorNameClass',
+  '_BetterPrivateNames',
+  'annotatedMethod',
+  'theAnswer',
 };
diff --git a/json_serializable/test/kitchen_sink/json_converters.dart b/json_serializable/test/kitchen_sink/json_converters.dart
index aefb246d2..4f31a5b4e 100644
--- a/json_serializable/test/kitchen_sink/json_converters.dart
+++ b/json_serializable/test/kitchen_sink/json_converters.dart
@@ -55,6 +55,25 @@ class DurationMillisecondConverter implements JsonConverter<Duration?, int?> {
   int? toJson(Duration? object) => object?.inMilliseconds;
 }
 
+class TrivialString {
+  TrivialString(this.value);
+
+  final String? value;
+}
+
+const trivialStringConverter = TrivialStringConverter();
+
+class TrivialStringConverter implements JsonConverter<TrivialString?, String?> {
+  const TrivialStringConverter();
+
+  @override
+  TrivialString? fromJson(String? json) =>
+      json == null ? null : TrivialString(json);
+
+  @override
+  String? toJson(TrivialString? object) => object?.value;
+}
+
 class EpochDateTimeConverter implements JsonConverter<DateTime?, int?> {
   const EpochDateTimeConverter();
 
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.dart b/json_serializable/test/kitchen_sink/kitchen_sink.dart
index 7456234f7..d9a304478 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.dart
@@ -48,33 +48,45 @@ class _Factory implements k.KitchenSinkFactory<String, dynamic> {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  }) =>
-      KitchenSink(
-        ctorValidatedNo42: ctorValidatedNo42,
-        iterable: iterable,
-        dynamicIterable: dynamicIterable,
-        objectIterable: objectIterable,
-        intIterable: intIterable,
-        dateTimeIterable: dateTimeIterable,
-      );
+  }) => KitchenSink(
+    ctorValidatedNo42: ctorValidatedNo42,
+    iterable: iterable,
+    dynamicIterable: dynamicIterable,
+    objectIterable: objectIterable,
+    intIterable: intIterable,
+    dateTimeIterable: dateTimeIterable,
+  );
 
   k.KitchenSink fromJson(Map<String, dynamic> json) =>
       KitchenSink.fromJson(json);
 
   k.JsonConverterTestClass jsonConverterCtor() => JsonConverterTestClass(
-        const Duration(),
-        [],
-        BigInt.zero,
-        {},
-        TrivialNumber(0),
-        {},
-        DateTime.fromMillisecondsSinceEpoch(0),
-      );
+    const Duration(),
+    [],
+    BigInt.zero,
+    {},
+    BigInt.zero,
+    {},
+    TrivialNumber(0),
+    {},
+    DateTime.fromMillisecondsSinceEpoch(0),
+    TrivialString(''),
+    TrivialNumber(0),
+    {},
+  );
 
   k.JsonConverterTestClass jsonConverterFromJson(Map<String, dynamic> json) =>
       JsonConverterTestClass.fromJson(json);
 }
 
+Object? _valueAccessor(Map json, String key) {
+  if (key == 'iterable') {
+    return json['iterable'] ?? json['theIterable'];
+  }
+
+  return json[key];
+}
+
 @JsonSerializable()
 class KitchenSink implements k.KitchenSink {
   // NOTE: exposing these as Iterable, but storing the values as List
@@ -95,14 +107,17 @@ class KitchenSink implements k.KitchenSink {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  })  : _iterable = iterable?.toList(),
-        _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
-        _objectIterable = objectIterable?.toList() ?? _defaultList(),
-        _intIterable = intIterable?.toList() ?? _defaultList(),
-        _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
+  }) : _iterable = iterable?.toList(),
+       _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
+       _objectIterable = objectIterable?.toList() ?? _defaultList(),
+       _intIterable = intIterable?.toList() ?? _defaultList(),
+       _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
     if (ctorValidatedNo42 == 42) {
       throw ArgumentError.value(
-          42, 'ctorValidatedNo42', 'The value `42` is not allowed.');
+        42,
+        'ctorValidatedNo42',
+        'The value `42` is not allowed.',
+      );
     }
   }
 
@@ -115,6 +130,7 @@ class KitchenSink implements k.KitchenSink {
 
   BigInt? bigInt;
 
+  @JsonKey(readValue: _valueAccessor)
   Iterable? get iterable => _iterable;
 
   Iterable<dynamic> get dynamicIterable => _dynamicIterable;
@@ -152,7 +168,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: r'$string')
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -170,14 +186,29 @@ class KitchenSink implements k.KitchenSink {
     _validatedPropertyNo42 = value;
   }
 
+  k.RecordSample? recordField;
+
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
-@JsonSerializable()
+@JsonSerializable(
+  converters: [
+    // referencing a top-level field should work
+    durationConverter,
+    // referencing via a const constructor should work
+    BigIntStringConverter(),
+  ],
+)
 // referencing a top-level field should work
-@durationConverter
-// referencing via a const constructor should work
-@BigIntStringConverter()
+@trivialStringConverter
 @TrivialNumberConverter.instance
 @EpochDateTimeConverter()
 class JsonConverterTestClass implements k.JsonConverterTestClass {
@@ -186,9 +217,14 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
     this.durationList,
     this.bigInt,
     this.bigIntMap,
+    this.nullableBigInt,
+    this.nullableBigIntMap,
     this.numberSilly,
     this.numberSillySet,
     this.dateTime,
+    this.trivialString,
+    this.nullableNumberSilly,
+    this.nullableNumberSillySet,
   );
 
   factory JsonConverterTestClass.fromJson(Map<String, dynamic> json) =>
@@ -202,24 +238,29 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
   BigInt bigInt;
   Map<String, BigInt> bigIntMap;
 
+  BigInt? nullableBigInt;
+  Map<String, BigInt?> nullableBigIntMap;
+
   TrivialNumber numberSilly;
   Set<TrivialNumber> numberSillySet;
 
   DateTime? dateTime;
+
+  TrivialString? trivialString;
+
+  TrivialNumber? nullableNumberSilly;
+  Set<TrivialNumber?> nullableNumberSillySet;
 }
 
 @JsonSerializable()
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;
   List<T> itemList;
   Map<String, U> itemMap;
 
-  JsonConverterGeneric(
-    this.item,
-    this.itemList,
-    this.itemMap,
-  );
+  JsonConverterGeneric(this.item, this.itemList, this.itemMap);
 
   factory JsonConverterGeneric.fromJson(Map<String, dynamic> json) =>
       _$JsonConverterGenericFromJson(json);
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g.dart
index 0b51b3fc7..0e2d4e93b 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'kitchen_sink.dart';
 
@@ -8,186 +8,305 @@ part of 'kitchen_sink.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-KitchenSink _$KitchenSinkFromJson(Map<String, dynamic> json) => KitchenSink(
-      ctorValidatedNo42: json['no-42'] as int?,
-      iterable: json['iterable'] as List<dynamic>?,
-      dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
-      objectIterable:
-          (json['objectIterable'] as List<dynamic>?)?.map((e) => e as Object),
-      intIterable:
-          (json['intIterable'] as List<dynamic>?)?.map((e) => e as int),
-      dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String)),
-    )
+KitchenSink _$KitchenSinkFromJson(Map<String, dynamic> json) =>
+    KitchenSink(
+        ctorValidatedNo42: (json['no-42'] as num?)?.toInt(),
+        iterable: _valueAccessor(json, 'iterable') as List<dynamic>?,
+        dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
+        objectIterable: (json['objectIterable'] as List<dynamic>?)?.map(
+          (e) => e as Object,
+        ),
+        intIterable: (json['intIterable'] as List<dynamic>?)?.map(
+          (e) => (e as num).toInt(),
+        ),
+        dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)?.map(
+          (e) => DateTime.parse(e as String),
+        ),
+      )
       ..dateTime = json['dateTime'] == null
           ? null
           : DateTime.parse(json['dateTime'] as String)
-      ..bigInt =
-          json['bigInt'] == null ? null : BigInt.parse(json['bigInt'] as String)
+      ..bigInt = json['bigInt'] == null
+          ? null
+          : BigInt.parse(json['bigInt'] as String)
       ..set = (json['set'] as List<dynamic>).toSet()
       ..dynamicSet = (json['dynamicSet'] as List<dynamic>).toSet()
-      ..objectSet =
-          (json['objectSet'] as List<dynamic>).map((e) => e as Object).toSet()
-      ..intSet = (json['intSet'] as List<dynamic>).map((e) => e as int).toSet()
+      ..objectSet = (json['objectSet'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toSet()
+      ..intSet = (json['intSet'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toSet()
       ..dateTimeSet = (json['dateTimeSet'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toSet()
       ..list = json['list'] as List<dynamic>
       ..dynamicList = json['dynamicList'] as List<dynamic>
-      ..objectList =
-          (json['objectList'] as List<dynamic>).map((e) => e as Object).toList()
-      ..intList =
-          (json['intList'] as List<dynamic>).map((e) => e as int).toList()
+      ..objectList = (json['objectList'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toList()
+      ..intList = (json['intList'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList()
       ..dateTimeList = (json['dateTimeList'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toList()
       ..nullableSimpleObjectList =
           (json['nullableSimpleObjectList'] as List<dynamic>)
-              .map((e) => e == null
-                  ? null
-                  : SimpleObject.fromJson(e as Map<String, dynamic>))
+              .map(
+                (e) => e == null
+                    ? null
+                    : SimpleObject.fromJson(e as Map<String, dynamic>),
+              )
               .toList()
       ..map = json['map'] as Map<String, dynamic>
-      ..stringStringMap =
-          Map<String, String>.from(json['stringStringMap'] as Map)
-      ..dynamicIntMap = Map<String, int>.from(json['dynamicIntMap'] as Map)
-      ..objectDateTimeMap =
-          (json['objectDateTimeMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, DateTime.parse(e as String)),
+      ..stringStringMap = Map<String, String>.from(
+        json['stringStringMap'] as Map,
       )
+      ..dynamicIntMap = Map<String, int>.from(json['dynamicIntMap'] as Map)
+      ..objectDateTimeMap = (json['objectDateTimeMap'] as Map<String, dynamic>)
+          .map((k, e) => MapEntry(k, DateTime.parse(e as String)))
       ..nullableSimpleObjectMap =
           (json['nullableSimpleObjectMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            k,
-            e == null
-                ? null
-                : SimpleObject.fromJson(e as Map<String, dynamic>)),
-      )
+            (k, e) => MapEntry(
+              k,
+              e == null
+                  ? null
+                  : SimpleObject.fromJson(e as Map<String, dynamic>),
+            ),
+          )
       ..crazyComplex = (json['crazyComplex'] as List<dynamic>)
-          .map((e) => (e as Map<String, dynamic>?)?.map(
-                (k, e) => MapEntry(
+          .map(
+            (e) => (e as Map<String, dynamic>?)?.map(
+              (k, e) => MapEntry(
+                k,
+                (e as Map<String, dynamic>?)?.map(
+                  (k, e) => MapEntry(
                     k,
-                    (e as Map<String, dynamic>?)?.map(
-                      (k, e) => MapEntry(
-                          k,
-                          (e as List<dynamic>?)
-                              ?.map((e) => (e as List<dynamic>?)
-                                  ?.map((e) => DateTime.parse(e as String))
-                                  .toList())
-                              .toList()),
-                    )),
-              ))
+                    (e as List<dynamic>?)
+                        ?.map(
+                          (e) => (e as List<dynamic>?)
+                              ?.map((e) => DateTime.parse(e as String))
+                              .toList(),
+                        )
+                        .toList(),
+                  ),
+                ),
+              ),
+            ),
+          )
           .toList()
       ..val = Map<String, bool>.from(json['val'] as Map)
       ..writeNotNull = json['writeNotNull'] as bool?
-      ..string = json[r'$string'] as String?
-      ..simpleObject =
-          SimpleObject.fromJson(json['simpleObject'] as Map<String, dynamic>)
+      ..string = KitchenSink._trickyValueAccessor(json, r'$string') as String?
+      ..simpleObject = SimpleObject.fromJson(
+        json['simpleObject'] as Map<String, dynamic>,
+      )
       ..strictKeysObject = StrictKeysObject.fromJson(
-          json['strictKeysObject'] as Map<String, dynamic>)
-      ..validatedPropertyNo42 = json['validatedPropertyNo42'] as int?;
+        json['strictKeysObject'] as Map<String, dynamic>,
+      )
+      ..validatedPropertyNo42 = (json['validatedPropertyNo42'] as num?)?.toInt()
+      ..recordField = _$recordConvertNullable(
+        json['recordField'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      );
 
-Map<String, dynamic> _$KitchenSinkToJson(KitchenSink instance) =>
-    <String, dynamic>{
-      'no-42': instance.ctorValidatedNo42,
-      'dateTime': instance.dateTime?.toIso8601String(),
-      'bigInt': instance.bigInt?.toString(),
-      'iterable': instance.iterable?.toList(),
-      'dynamicIterable': instance.dynamicIterable.toList(),
-      'objectIterable': instance.objectIterable.toList(),
-      'intIterable': instance.intIterable.toList(),
-      'set': instance.set.toList(),
-      'dynamicSet': instance.dynamicSet.toList(),
-      'objectSet': instance.objectSet.toList(),
-      'intSet': instance.intSet.toList(),
-      'dateTimeSet':
-          instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
-      'datetime-iterable':
-          instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(),
-      'list': instance.list,
-      'dynamicList': instance.dynamicList,
-      'objectList': instance.objectList,
-      'intList': instance.intList,
-      'dateTimeList':
-          instance.dateTimeList.map((e) => e.toIso8601String()).toList(),
-      'nullableSimpleObjectList': instance.nullableSimpleObjectList,
-      'map': instance.map,
-      'stringStringMap': instance.stringStringMap,
-      'dynamicIntMap': instance.dynamicIntMap,
-      'objectDateTimeMap': instance.objectDateTimeMap
-          .map((k, e) => MapEntry(k, e.toIso8601String())),
-      'nullableSimpleObjectMap': instance.nullableSimpleObjectMap,
-      'crazyComplex': instance.crazyComplex
-          .map((e) => e?.map((k, e) => MapEntry(
-              k,
-              e?.map((k, e) => MapEntry(
-                  k,
-                  e
-                      ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
-                      .toList())))))
-          .toList(),
-      'val': instance.val,
-      'writeNotNull': instance.writeNotNull,
-      r'$string': instance.string,
-      'simpleObject': instance.simpleObject,
-      'strictKeysObject': instance.strictKeysObject,
-      'validatedPropertyNo42': instance.validatedPropertyNo42,
-    };
+Map<String, dynamic> _$KitchenSinkToJson(
+  KitchenSink instance,
+) => <String, dynamic>{
+  'no-42': instance.ctorValidatedNo42,
+  'dateTime': instance.dateTime?.toIso8601String(),
+  'bigInt': instance.bigInt?.toString(),
+  'iterable': instance.iterable?.toList(),
+  'dynamicIterable': instance.dynamicIterable.toList(),
+  'objectIterable': instance.objectIterable.toList(),
+  'intIterable': instance.intIterable.toList(),
+  'set': instance.set.toList(),
+  'dynamicSet': instance.dynamicSet.toList(),
+  'objectSet': instance.objectSet.toList(),
+  'intSet': instance.intSet.toList(),
+  'dateTimeSet': instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
+  'datetime-iterable': instance.dateTimeIterable
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'list': instance.list,
+  'dynamicList': instance.dynamicList,
+  'objectList': instance.objectList,
+  'intList': instance.intList,
+  'dateTimeList': instance.dateTimeList
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'nullableSimpleObjectList': instance.nullableSimpleObjectList,
+  'map': instance.map,
+  'stringStringMap': instance.stringStringMap,
+  'dynamicIntMap': instance.dynamicIntMap,
+  'objectDateTimeMap': instance.objectDateTimeMap.map(
+    (k, e) => MapEntry(k, e.toIso8601String()),
+  ),
+  'nullableSimpleObjectMap': instance.nullableSimpleObjectMap,
+  'crazyComplex': instance.crazyComplex
+      .map(
+        (e) => e?.map(
+          (k, e) => MapEntry(
+            k,
+            e?.map(
+              (k, e) => MapEntry(
+                k,
+                e
+                    ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
+                    .toList(),
+              ),
+            ),
+          ),
+        ),
+      )
+      .toList(),
+  'val': instance.val,
+  'writeNotNull': instance.writeNotNull,
+  r'$string': instance.string,
+  'simpleObject': instance.simpleObject,
+  'strictKeysObject': instance.strictKeysObject,
+  'validatedPropertyNo42': instance.validatedPropertyNo42,
+  'recordField': instance.recordField == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.recordField!.$1,
+          r'$2': instance.recordField!.$2,
+          'truth': instance.recordField!.truth,
+        },
+};
+
+$Rec? _$recordConvertNullable<$Rec>(
+  Object? value,
+  $Rec Function(Map) convert,
+) => value == null ? null : convert(value as Map<String, dynamic>);
 
 JsonConverterTestClass _$JsonConverterTestClassFromJson(
-        Map<String, dynamic> json) =>
-    JsonConverterTestClass(
-      durationConverter.fromJson(json['duration'] as int?),
-      (json['durationList'] as List<dynamic>)
-          .map((e) => durationConverter.fromJson(e as int?))
-          .toList(),
-      const BigIntStringConverter().fromJson(json['bigInt'] as String),
-      (json['bigIntMap'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(k, const BigIntStringConverter().fromJson(e as String)),
+  Map<String, dynamic> json,
+) => JsonConverterTestClass(
+  const DurationMillisecondConverter().fromJson(
+    (json['duration'] as num?)?.toInt(),
+  ),
+  (json['durationList'] as List<dynamic>)
+      .map(
+        (e) =>
+            const DurationMillisecondConverter().fromJson((e as num?)?.toInt()),
+      )
+      .toList(),
+  const BigIntStringConverter().fromJson(json['bigInt'] as String),
+  (json['bigIntMap'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().fromJson(e as String)),
+  ),
+  _$JsonConverterFromJson<String, BigInt>(
+    json['nullableBigInt'],
+    const BigIntStringConverter().fromJson,
+  ),
+  (json['nullableBigIntMap'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterFromJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().fromJson,
       ),
-      TrivialNumberConverter.instance.fromJson(json['numberSilly'] as int?),
-      (json['numberSillySet'] as List<dynamic>)
-          .map((e) => TrivialNumberConverter.instance.fromJson(e as int?))
-          .toSet(),
-      const EpochDateTimeConverter().fromJson(json['dateTime'] as int?),
-    );
+    ),
+  ),
+  TrivialNumberConverter.instance.fromJson(
+    (json['numberSilly'] as num?)?.toInt(),
+  ),
+  (json['numberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+  const EpochDateTimeConverter().fromJson((json['dateTime'] as num?)?.toInt()),
+  trivialStringConverter.fromJson(json['trivialString'] as String?),
+  TrivialNumberConverter.instance.fromJson(
+    (json['nullableNumberSilly'] as num?)?.toInt(),
+  ),
+  (json['nullableNumberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+);
 
 Map<String, dynamic> _$JsonConverterTestClassToJson(
-        JsonConverterTestClass instance) =>
-    <String, dynamic>{
-      'duration': durationConverter.toJson(instance.duration),
-      'durationList':
-          instance.durationList.map(durationConverter.toJson).toList(),
-      'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
-      'bigIntMap': instance.bigIntMap
-          .map((k, e) => MapEntry(k, const BigIntStringConverter().toJson(e))),
-      'numberSilly':
-          TrivialNumberConverter.instance.toJson(instance.numberSilly),
-      'numberSillySet': instance.numberSillySet
-          .map(TrivialNumberConverter.instance.toJson)
-          .toList(),
-      'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
-    };
+  JsonConverterTestClass instance,
+) => <String, dynamic>{
+  'duration': const DurationMillisecondConverter().toJson(instance.duration),
+  'durationList': instance.durationList
+      .map(const DurationMillisecondConverter().toJson)
+      .toList(),
+  'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
+  'bigIntMap': instance.bigIntMap.map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().toJson(e)),
+  ),
+  'nullableBigInt': _$JsonConverterToJson<String, BigInt>(
+    instance.nullableBigInt,
+    const BigIntStringConverter().toJson,
+  ),
+  'nullableBigIntMap': instance.nullableBigIntMap.map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterToJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().toJson,
+      ),
+    ),
+  ),
+  'numberSilly': TrivialNumberConverter.instance.toJson(instance.numberSilly),
+  'numberSillySet': instance.numberSillySet
+      .map(TrivialNumberConverter.instance.toJson)
+      .toList(),
+  'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
+  'trivialString': trivialStringConverter.toJson(instance.trivialString),
+  'nullableNumberSilly': _$JsonConverterToJson<int?, TrivialNumber>(
+    instance.nullableNumberSilly,
+    TrivialNumberConverter.instance.toJson,
+  ),
+  'nullableNumberSillySet': instance.nullableNumberSillySet
+      .map(
+        (e) => _$JsonConverterToJson<int?, TrivialNumber>(
+          e,
+          TrivialNumberConverter.instance.toJson,
+        ),
+      )
+      .toList(),
+};
+
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => json == null ? null : fromJson(json as Json);
+
+Json? _$JsonConverterToJson<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => value == null ? null : toJson(value);
 
 JsonConverterGeneric<S, T, U> _$JsonConverterGenericFromJson<S, T, U>(
-        Map<String, dynamic> json) =>
-    JsonConverterGeneric<S, T, U>(
-      GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
-      (json['itemList'] as List<dynamic>)
-          .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
-          .toList(),
-      (json['itemMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            k, GenericConverter<U>().fromJson(e as Map<String, dynamic>)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => JsonConverterGeneric<S, T, U>(
+  GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
+  (json['itemList'] as List<dynamic>)
+      .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
+      .toList(),
+  (json['itemMap'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(k, GenericConverter<U>().fromJson(e as Map<String, dynamic>)),
+  ),
+);
 
 Map<String, dynamic> _$JsonConverterGenericToJson<S, T, U>(
-        JsonConverterGeneric<S, T, U> instance) =>
-    <String, dynamic>{
-      'item': GenericConverter<S>().toJson(instance.item),
-      'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
-      'itemMap': instance.itemMap
-          .map((k, e) => MapEntry(k, GenericConverter<U>().toJson(e))),
-    };
+  JsonConverterGeneric<S, T, U> instance,
+) => <String, dynamic>{
+  'item': GenericConverter<S>().toJson(instance.item),
+  'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
+  'itemMap': instance.itemMap.map(
+    (k, e) => MapEntry(k, GenericConverter<U>().toJson(e)),
+  ),
+};
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart
index 56cdb9a1e..39efca774 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart
@@ -48,35 +48,45 @@ class _Factory implements k.KitchenSinkFactory<dynamic, dynamic> {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  }) =>
-      KitchenSink(
-        ctorValidatedNo42: ctorValidatedNo42,
-        iterable: iterable,
-        dynamicIterable: dynamicIterable,
-        objectIterable: objectIterable,
-        intIterable: intIterable,
-        dateTimeIterable: dateTimeIterable,
-      );
+  }) => KitchenSink(
+    ctorValidatedNo42: ctorValidatedNo42,
+    iterable: iterable,
+    dynamicIterable: dynamicIterable,
+    objectIterable: objectIterable,
+    intIterable: intIterable,
+    dateTimeIterable: dateTimeIterable,
+  );
 
   k.KitchenSink fromJson(Map json) => KitchenSink.fromJson(json);
 
   k.JsonConverterTestClass jsonConverterCtor() => JsonConverterTestClass(
-        const Duration(),
-        [],
-        BigInt.zero,
-        {},
-        TrivialNumber(0),
-        {},
-        DateTime.fromMillisecondsSinceEpoch(0),
-      );
+    const Duration(),
+    [],
+    BigInt.zero,
+    {},
+    BigInt.zero,
+    {},
+    TrivialNumber(0),
+    {},
+    DateTime.fromMillisecondsSinceEpoch(0),
+    TrivialString(''),
+    TrivialNumber(0),
+    {},
+  );
 
   k.JsonConverterTestClass jsonConverterFromJson(Map<String, dynamic> json) =>
       JsonConverterTestClass.fromJson(json);
 }
 
-@JsonSerializable(
-  anyMap: true,
-)
+Object? _valueAccessor(Map json, String key) {
+  if (key == 'iterable') {
+    return json['iterable'] ?? json['theIterable'];
+  }
+
+  return json[key];
+}
+
+@JsonSerializable(anyMap: true)
 class KitchenSink implements k.KitchenSink {
   // NOTE: exposing these as Iterable, but storing the values as List
   // to make the equality test work trivially.
@@ -96,14 +106,17 @@ class KitchenSink implements k.KitchenSink {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  })  : _iterable = iterable?.toList(),
-        _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
-        _objectIterable = objectIterable?.toList() ?? _defaultList(),
-        _intIterable = intIterable?.toList() ?? _defaultList(),
-        _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
+  }) : _iterable = iterable?.toList(),
+       _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
+       _objectIterable = objectIterable?.toList() ?? _defaultList(),
+       _intIterable = intIterable?.toList() ?? _defaultList(),
+       _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
     if (ctorValidatedNo42 == 42) {
       throw ArgumentError.value(
-          42, 'ctorValidatedNo42', 'The value `42` is not allowed.');
+        42,
+        'ctorValidatedNo42',
+        'The value `42` is not allowed.',
+      );
     }
   }
 
@@ -115,6 +128,7 @@ class KitchenSink implements k.KitchenSink {
 
   BigInt? bigInt;
 
+  @JsonKey(readValue: _valueAccessor)
   Iterable? get iterable => _iterable;
 
   Iterable<dynamic> get dynamicIterable => _dynamicIterable;
@@ -152,7 +166,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: r'$string')
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -170,16 +184,30 @@ class KitchenSink implements k.KitchenSink {
     _validatedPropertyNo42 = value;
   }
 
+  k.RecordSample? recordField;
+
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
 @JsonSerializable(
   anyMap: true,
+  converters: [
+    // referencing a top-level field should work
+    durationConverter,
+    // referencing via a const constructor should work
+    BigIntStringConverter(),
+  ],
 )
 // referencing a top-level field should work
-@durationConverter
-// referencing via a const constructor should work
-@BigIntStringConverter()
+@trivialStringConverter
 @TrivialNumberConverter.instance
 @EpochDateTimeConverter()
 class JsonConverterTestClass implements k.JsonConverterTestClass {
@@ -188,9 +216,14 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
     this.durationList,
     this.bigInt,
     this.bigIntMap,
+    this.nullableBigInt,
+    this.nullableBigIntMap,
     this.numberSilly,
     this.numberSillySet,
     this.dateTime,
+    this.trivialString,
+    this.nullableNumberSilly,
+    this.nullableNumberSillySet,
   );
 
   factory JsonConverterTestClass.fromJson(Map<String, dynamic> json) =>
@@ -204,26 +237,29 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
   BigInt bigInt;
   Map<String, BigInt> bigIntMap;
 
+  BigInt? nullableBigInt;
+  Map<String, BigInt?> nullableBigIntMap;
+
   TrivialNumber numberSilly;
   Set<TrivialNumber> numberSillySet;
 
   DateTime? dateTime;
+
+  TrivialString? trivialString;
+
+  TrivialNumber? nullableNumberSilly;
+  Set<TrivialNumber?> nullableNumberSillySet;
 }
 
-@JsonSerializable(
-  anyMap: true,
-)
+@JsonSerializable(anyMap: true)
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;
   List<T> itemList;
   Map<String, U> itemMap;
 
-  JsonConverterGeneric(
-    this.item,
-    this.itemList,
-    this.itemMap,
-  );
+  JsonConverterGeneric(this.item, this.itemList, this.itemMap);
 
   factory JsonConverterGeneric.fromJson(Map<String, dynamic> json) =>
       _$JsonConverterGenericFromJson(json);
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart
index b2c48bf02..326f7e80e 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'kitchen_sink.g_any_map.dart';
 
@@ -8,36 +8,46 @@ part of 'kitchen_sink.g_any_map.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-KitchenSink _$KitchenSinkFromJson(Map json) => KitchenSink(
-      ctorValidatedNo42: json['no-42'] as int?,
-      iterable: json['iterable'] as List<dynamic>?,
-      dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
-      objectIterable:
-          (json['objectIterable'] as List<dynamic>?)?.map((e) => e as Object),
-      intIterable:
-          (json['intIterable'] as List<dynamic>?)?.map((e) => e as int),
-      dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String)),
-    )
+KitchenSink _$KitchenSinkFromJson(Map json) =>
+    KitchenSink(
+        ctorValidatedNo42: (json['no-42'] as num?)?.toInt(),
+        iterable: _valueAccessor(json, 'iterable') as List<dynamic>?,
+        dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
+        objectIterable: (json['objectIterable'] as List<dynamic>?)?.map(
+          (e) => e as Object,
+        ),
+        intIterable: (json['intIterable'] as List<dynamic>?)?.map(
+          (e) => (e as num).toInt(),
+        ),
+        dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)?.map(
+          (e) => DateTime.parse(e as String),
+        ),
+      )
       ..dateTime = json['dateTime'] == null
           ? null
           : DateTime.parse(json['dateTime'] as String)
-      ..bigInt =
-          json['bigInt'] == null ? null : BigInt.parse(json['bigInt'] as String)
+      ..bigInt = json['bigInt'] == null
+          ? null
+          : BigInt.parse(json['bigInt'] as String)
       ..set = (json['set'] as List<dynamic>).toSet()
       ..dynamicSet = (json['dynamicSet'] as List<dynamic>).toSet()
-      ..objectSet =
-          (json['objectSet'] as List<dynamic>).map((e) => e as Object).toSet()
-      ..intSet = (json['intSet'] as List<dynamic>).map((e) => e as int).toSet()
+      ..objectSet = (json['objectSet'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toSet()
+      ..intSet = (json['intSet'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toSet()
       ..dateTimeSet = (json['dateTimeSet'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toSet()
       ..list = json['list'] as List<dynamic>
       ..dynamicList = json['dynamicList'] as List<dynamic>
-      ..objectList =
-          (json['objectList'] as List<dynamic>).map((e) => e as Object).toList()
-      ..intList =
-          (json['intList'] as List<dynamic>).map((e) => e as int).toList()
+      ..objectList = (json['objectList'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toList()
+      ..intList = (json['intList'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList()
       ..dateTimeList = (json['dateTimeList'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toList()
@@ -46,139 +56,254 @@ KitchenSink _$KitchenSinkFromJson(Map json) => KitchenSink(
               .map((e) => e == null ? null : SimpleObject.fromJson(e as Map))
               .toList()
       ..map = json['map'] as Map
-      ..stringStringMap =
-          Map<String, String>.from(json['stringStringMap'] as Map)
+      ..stringStringMap = Map<String, String>.from(
+        json['stringStringMap'] as Map,
+      )
       ..dynamicIntMap = Map<String, int>.from(json['dynamicIntMap'] as Map)
       ..objectDateTimeMap = (json['objectDateTimeMap'] as Map).map(
         (k, e) => MapEntry(k as Object, DateTime.parse(e as String)),
       )
       ..nullableSimpleObjectMap = (json['nullableSimpleObjectMap'] as Map).map(
         (k, e) => MapEntry(
-            k as String, e == null ? null : SimpleObject.fromJson(e as Map)),
+          k as String,
+          e == null ? null : SimpleObject.fromJson(e as Map),
+        ),
       )
       ..crazyComplex = (json['crazyComplex'] as List<dynamic>)
-          .map((e) => (e as Map?)?.map(
-                (k, e) => MapEntry(
+          .map(
+            (e) => (e as Map?)?.map(
+              (k, e) => MapEntry(
+                k as String,
+                (e as Map?)?.map(
+                  (k, e) => MapEntry(
                     k as String,
-                    (e as Map?)?.map(
-                      (k, e) => MapEntry(
-                          k as String,
-                          (e as List<dynamic>?)
-                              ?.map((e) => (e as List<dynamic>?)
-                                  ?.map((e) => DateTime.parse(e as String))
-                                  .toList())
-                              .toList()),
-                    )),
-              ))
+                    (e as List<dynamic>?)
+                        ?.map(
+                          (e) => (e as List<dynamic>?)
+                              ?.map((e) => DateTime.parse(e as String))
+                              .toList(),
+                        )
+                        .toList(),
+                  ),
+                ),
+              ),
+            ),
+          )
           .toList()
       ..val = Map<String, bool>.from(json['val'] as Map)
       ..writeNotNull = json['writeNotNull'] as bool?
-      ..string = json[r'$string'] as String?
+      ..string = KitchenSink._trickyValueAccessor(json, r'$string') as String?
       ..simpleObject = SimpleObject.fromJson(json['simpleObject'] as Map)
-      ..strictKeysObject =
-          StrictKeysObject.fromJson(json['strictKeysObject'] as Map)
-      ..validatedPropertyNo42 = json['validatedPropertyNo42'] as int?;
+      ..strictKeysObject = StrictKeysObject.fromJson(
+        json['strictKeysObject'] as Map,
+      )
+      ..validatedPropertyNo42 = (json['validatedPropertyNo42'] as num?)?.toInt()
+      ..recordField = _$recordConvertAnyNullable(
+        json['recordField'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      );
 
-Map<String, dynamic> _$KitchenSinkToJson(KitchenSink instance) =>
-    <String, dynamic>{
-      'no-42': instance.ctorValidatedNo42,
-      'dateTime': instance.dateTime?.toIso8601String(),
-      'bigInt': instance.bigInt?.toString(),
-      'iterable': instance.iterable?.toList(),
-      'dynamicIterable': instance.dynamicIterable.toList(),
-      'objectIterable': instance.objectIterable.toList(),
-      'intIterable': instance.intIterable.toList(),
-      'set': instance.set.toList(),
-      'dynamicSet': instance.dynamicSet.toList(),
-      'objectSet': instance.objectSet.toList(),
-      'intSet': instance.intSet.toList(),
-      'dateTimeSet':
-          instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
-      'datetime-iterable':
-          instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(),
-      'list': instance.list,
-      'dynamicList': instance.dynamicList,
-      'objectList': instance.objectList,
-      'intList': instance.intList,
-      'dateTimeList':
-          instance.dateTimeList.map((e) => e.toIso8601String()).toList(),
-      'nullableSimpleObjectList': instance.nullableSimpleObjectList,
-      'map': instance.map,
-      'stringStringMap': instance.stringStringMap,
-      'dynamicIntMap': instance.dynamicIntMap,
-      'objectDateTimeMap': instance.objectDateTimeMap
-          .map((k, e) => MapEntry(k, e.toIso8601String())),
-      'nullableSimpleObjectMap': instance.nullableSimpleObjectMap,
-      'crazyComplex': instance.crazyComplex
-          .map((e) => e?.map((k, e) => MapEntry(
-              k,
-              e?.map((k, e) => MapEntry(
-                  k,
-                  e
-                      ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
-                      .toList())))))
-          .toList(),
-      'val': instance.val,
-      'writeNotNull': instance.writeNotNull,
-      r'$string': instance.string,
-      'simpleObject': instance.simpleObject,
-      'strictKeysObject': instance.strictKeysObject,
-      'validatedPropertyNo42': instance.validatedPropertyNo42,
-    };
+Map<String, dynamic> _$KitchenSinkToJson(
+  KitchenSink instance,
+) => <String, dynamic>{
+  'no-42': instance.ctorValidatedNo42,
+  'dateTime': instance.dateTime?.toIso8601String(),
+  'bigInt': instance.bigInt?.toString(),
+  'iterable': instance.iterable?.toList(),
+  'dynamicIterable': instance.dynamicIterable.toList(),
+  'objectIterable': instance.objectIterable.toList(),
+  'intIterable': instance.intIterable.toList(),
+  'set': instance.set.toList(),
+  'dynamicSet': instance.dynamicSet.toList(),
+  'objectSet': instance.objectSet.toList(),
+  'intSet': instance.intSet.toList(),
+  'dateTimeSet': instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
+  'datetime-iterable': instance.dateTimeIterable
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'list': instance.list,
+  'dynamicList': instance.dynamicList,
+  'objectList': instance.objectList,
+  'intList': instance.intList,
+  'dateTimeList': instance.dateTimeList
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'nullableSimpleObjectList': instance.nullableSimpleObjectList,
+  'map': instance.map,
+  'stringStringMap': instance.stringStringMap,
+  'dynamicIntMap': instance.dynamicIntMap,
+  'objectDateTimeMap': instance.objectDateTimeMap.map(
+    (k, e) => MapEntry(k, e.toIso8601String()),
+  ),
+  'nullableSimpleObjectMap': instance.nullableSimpleObjectMap,
+  'crazyComplex': instance.crazyComplex
+      .map(
+        (e) => e?.map(
+          (k, e) => MapEntry(
+            k,
+            e?.map(
+              (k, e) => MapEntry(
+                k,
+                e
+                    ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
+                    .toList(),
+              ),
+            ),
+          ),
+        ),
+      )
+      .toList(),
+  'val': instance.val,
+  'writeNotNull': instance.writeNotNull,
+  r'$string': instance.string,
+  'simpleObject': instance.simpleObject,
+  'strictKeysObject': instance.strictKeysObject,
+  'validatedPropertyNo42': instance.validatedPropertyNo42,
+  'recordField': instance.recordField == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.recordField!.$1,
+          r'$2': instance.recordField!.$2,
+          'truth': instance.recordField!.truth,
+        },
+};
 
-JsonConverterTestClass _$JsonConverterTestClassFromJson(Map json) =>
-    JsonConverterTestClass(
-      durationConverter.fromJson(json['duration'] as int?),
-      (json['durationList'] as List<dynamic>)
-          .map((e) => durationConverter.fromJson(e as int?))
-          .toList(),
-      const BigIntStringConverter().fromJson(json['bigInt'] as String),
-      (json['bigIntMap'] as Map).map(
-        (k, e) => MapEntry(
-            k as String, const BigIntStringConverter().fromJson(e as String)),
+$Rec? _$recordConvertAnyNullable<$Rec>(
+  Object? value,
+  $Rec Function(Map) convert,
+) => value == null ? null : convert(value as Map);
+
+JsonConverterTestClass _$JsonConverterTestClassFromJson(
+  Map json,
+) => JsonConverterTestClass(
+  const DurationMillisecondConverter().fromJson(
+    (json['duration'] as num?)?.toInt(),
+  ),
+  (json['durationList'] as List<dynamic>)
+      .map(
+        (e) =>
+            const DurationMillisecondConverter().fromJson((e as num?)?.toInt()),
+      )
+      .toList(),
+  const BigIntStringConverter().fromJson(json['bigInt'] as String),
+  (json['bigIntMap'] as Map).map(
+    (k, e) => MapEntry(
+      k as String,
+      const BigIntStringConverter().fromJson(e as String),
+    ),
+  ),
+  _$JsonConverterFromJson<String, BigInt>(
+    json['nullableBigInt'],
+    const BigIntStringConverter().fromJson,
+  ),
+  (json['nullableBigIntMap'] as Map).map(
+    (k, e) => MapEntry(
+      k as String,
+      _$JsonConverterFromJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().fromJson,
       ),
-      TrivialNumberConverter.instance.fromJson(json['numberSilly'] as int?),
-      (json['numberSillySet'] as List<dynamic>)
-          .map((e) => TrivialNumberConverter.instance.fromJson(e as int?))
-          .toSet(),
-      const EpochDateTimeConverter().fromJson(json['dateTime'] as int?),
-    );
+    ),
+  ),
+  TrivialNumberConverter.instance.fromJson(
+    (json['numberSilly'] as num?)?.toInt(),
+  ),
+  (json['numberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+  const EpochDateTimeConverter().fromJson((json['dateTime'] as num?)?.toInt()),
+  trivialStringConverter.fromJson(json['trivialString'] as String?),
+  TrivialNumberConverter.instance.fromJson(
+    (json['nullableNumberSilly'] as num?)?.toInt(),
+  ),
+  (json['nullableNumberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+);
 
 Map<String, dynamic> _$JsonConverterTestClassToJson(
-        JsonConverterTestClass instance) =>
-    <String, dynamic>{
-      'duration': durationConverter.toJson(instance.duration),
-      'durationList':
-          instance.durationList.map(durationConverter.toJson).toList(),
-      'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
-      'bigIntMap': instance.bigIntMap
-          .map((k, e) => MapEntry(k, const BigIntStringConverter().toJson(e))),
-      'numberSilly':
-          TrivialNumberConverter.instance.toJson(instance.numberSilly),
-      'numberSillySet': instance.numberSillySet
-          .map(TrivialNumberConverter.instance.toJson)
-          .toList(),
-      'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
-    };
+  JsonConverterTestClass instance,
+) => <String, dynamic>{
+  'duration': const DurationMillisecondConverter().toJson(instance.duration),
+  'durationList': instance.durationList
+      .map(const DurationMillisecondConverter().toJson)
+      .toList(),
+  'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
+  'bigIntMap': instance.bigIntMap.map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().toJson(e)),
+  ),
+  'nullableBigInt': _$JsonConverterToJson<String, BigInt>(
+    instance.nullableBigInt,
+    const BigIntStringConverter().toJson,
+  ),
+  'nullableBigIntMap': instance.nullableBigIntMap.map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterToJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().toJson,
+      ),
+    ),
+  ),
+  'numberSilly': TrivialNumberConverter.instance.toJson(instance.numberSilly),
+  'numberSillySet': instance.numberSillySet
+      .map(TrivialNumberConverter.instance.toJson)
+      .toList(),
+  'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
+  'trivialString': trivialStringConverter.toJson(instance.trivialString),
+  'nullableNumberSilly': _$JsonConverterToJson<int?, TrivialNumber>(
+    instance.nullableNumberSilly,
+    TrivialNumberConverter.instance.toJson,
+  ),
+  'nullableNumberSillySet': instance.nullableNumberSillySet
+      .map(
+        (e) => _$JsonConverterToJson<int?, TrivialNumber>(
+          e,
+          TrivialNumberConverter.instance.toJson,
+        ),
+      )
+      .toList(),
+};
+
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => json == null ? null : fromJson(json as Json);
+
+Json? _$JsonConverterToJson<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => value == null ? null : toJson(value);
 
 JsonConverterGeneric<S, T, U> _$JsonConverterGenericFromJson<S, T, U>(
-        Map json) =>
-    JsonConverterGeneric<S, T, U>(
-      GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
-      (json['itemList'] as List<dynamic>)
-          .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
-          .toList(),
-      (json['itemMap'] as Map).map(
-        (k, e) => MapEntry(k as String,
-            GenericConverter<U>().fromJson(e as Map<String, dynamic>)),
-      ),
-    );
+  Map json,
+) => JsonConverterGeneric<S, T, U>(
+  GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
+  (json['itemList'] as List<dynamic>)
+      .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
+      .toList(),
+  (json['itemMap'] as Map).map(
+    (k, e) => MapEntry(
+      k as String,
+      GenericConverter<U>().fromJson(e as Map<String, dynamic>),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$JsonConverterGenericToJson<S, T, U>(
-        JsonConverterGeneric<S, T, U> instance) =>
-    <String, dynamic>{
-      'item': GenericConverter<S>().toJson(instance.item),
-      'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
-      'itemMap': instance.itemMap
-          .map((k, e) => MapEntry(k, GenericConverter<U>().toJson(e))),
-    };
+  JsonConverterGeneric<S, T, U> instance,
+) => <String, dynamic>{
+  'item': GenericConverter<S>().toJson(instance.item),
+  'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
+  'itemMap': instance.itemMap.map(
+    (k, e) => MapEntry(k, GenericConverter<U>().toJson(e)),
+  ),
+};
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.dart
index d997a4422..05f287f39 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.dart
@@ -48,36 +48,45 @@ class _Factory implements k.KitchenSinkFactory<dynamic, dynamic> {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  }) =>
-      KitchenSink(
-        ctorValidatedNo42: ctorValidatedNo42,
-        iterable: iterable,
-        dynamicIterable: dynamicIterable,
-        objectIterable: objectIterable,
-        intIterable: intIterable,
-        dateTimeIterable: dateTimeIterable,
-      );
+  }) => KitchenSink(
+    ctorValidatedNo42: ctorValidatedNo42,
+    iterable: iterable,
+    dynamicIterable: dynamicIterable,
+    objectIterable: objectIterable,
+    intIterable: intIterable,
+    dateTimeIterable: dateTimeIterable,
+  );
 
   k.KitchenSink fromJson(Map json) => KitchenSink.fromJson(json);
 
   k.JsonConverterTestClass jsonConverterCtor() => JsonConverterTestClass(
-        const Duration(),
-        [],
-        BigInt.zero,
-        {},
-        TrivialNumber(0),
-        {},
-        DateTime.fromMillisecondsSinceEpoch(0),
-      );
+    const Duration(),
+    [],
+    BigInt.zero,
+    {},
+    BigInt.zero,
+    {},
+    TrivialNumber(0),
+    {},
+    DateTime.fromMillisecondsSinceEpoch(0),
+    TrivialString(''),
+    TrivialNumber(0),
+    {},
+  );
 
   k.JsonConverterTestClass jsonConverterFromJson(Map<String, dynamic> json) =>
       JsonConverterTestClass.fromJson(json);
 }
 
-@JsonSerializable(
-  checked: true,
-  anyMap: true,
-)
+Object? _valueAccessor(Map json, String key) {
+  if (key == 'iterable') {
+    return json['iterable'] ?? json['theIterable'];
+  }
+
+  return json[key];
+}
+
+@JsonSerializable(checked: true, anyMap: true)
 class KitchenSink implements k.KitchenSink {
   // NOTE: exposing these as Iterable, but storing the values as List
   // to make the equality test work trivially.
@@ -97,14 +106,17 @@ class KitchenSink implements k.KitchenSink {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  })  : _iterable = iterable?.toList(),
-        _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
-        _objectIterable = objectIterable?.toList() ?? _defaultList(),
-        _intIterable = intIterable?.toList() ?? _defaultList(),
-        _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
+  }) : _iterable = iterable?.toList(),
+       _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
+       _objectIterable = objectIterable?.toList() ?? _defaultList(),
+       _intIterable = intIterable?.toList() ?? _defaultList(),
+       _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
     if (ctorValidatedNo42 == 42) {
       throw ArgumentError.value(
-          42, 'ctorValidatedNo42', 'The value `42` is not allowed.');
+        42,
+        'ctorValidatedNo42',
+        'The value `42` is not allowed.',
+      );
     }
   }
 
@@ -116,6 +128,7 @@ class KitchenSink implements k.KitchenSink {
 
   BigInt? bigInt;
 
+  @JsonKey(readValue: _valueAccessor)
   Iterable? get iterable => _iterable;
 
   Iterable<dynamic> get dynamicIterable => _dynamicIterable;
@@ -153,7 +166,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: r'$string')
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -171,17 +184,31 @@ class KitchenSink implements k.KitchenSink {
     _validatedPropertyNo42 = value;
   }
 
+  k.RecordSample? recordField;
+
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
 @JsonSerializable(
   checked: true,
   anyMap: true,
+  converters: [
+    // referencing a top-level field should work
+    durationConverter,
+    // referencing via a const constructor should work
+    BigIntStringConverter(),
+  ],
 )
 // referencing a top-level field should work
-@durationConverter
-// referencing via a const constructor should work
-@BigIntStringConverter()
+@trivialStringConverter
 @TrivialNumberConverter.instance
 @EpochDateTimeConverter()
 class JsonConverterTestClass implements k.JsonConverterTestClass {
@@ -190,9 +217,14 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
     this.durationList,
     this.bigInt,
     this.bigIntMap,
+    this.nullableBigInt,
+    this.nullableBigIntMap,
     this.numberSilly,
     this.numberSillySet,
     this.dateTime,
+    this.trivialString,
+    this.nullableNumberSilly,
+    this.nullableNumberSillySet,
   );
 
   factory JsonConverterTestClass.fromJson(Map<String, dynamic> json) =>
@@ -206,27 +238,29 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
   BigInt bigInt;
   Map<String, BigInt> bigIntMap;
 
+  BigInt? nullableBigInt;
+  Map<String, BigInt?> nullableBigIntMap;
+
   TrivialNumber numberSilly;
   Set<TrivialNumber> numberSillySet;
 
   DateTime? dateTime;
+
+  TrivialString? trivialString;
+
+  TrivialNumber? nullableNumberSilly;
+  Set<TrivialNumber?> nullableNumberSillySet;
 }
 
-@JsonSerializable(
-  checked: true,
-  anyMap: true,
-)
+@JsonSerializable(checked: true, anyMap: true)
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;
   List<T> itemList;
   Map<String, U> itemMap;
 
-  JsonConverterGeneric(
-    this.item,
-    this.itemList,
-    this.itemMap,
-  );
+  JsonConverterGeneric(this.item, this.itemList, this.itemMap);
 
   factory JsonConverterGeneric.fromJson(Map<String, dynamic> json) =>
       _$JsonConverterGenericFromJson(json);
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart
index 20066ff54..25cfabf1c 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'kitchen_sink.g_any_map__checked.dart';
 
@@ -9,252 +9,422 @@ part of 'kitchen_sink.g_any_map__checked.dart';
 // **************************************************************************
 
 KitchenSink _$KitchenSinkFromJson(Map json) => $checkedCreate(
-      'KitchenSink',
-      json,
-      ($checkedConvert) {
-        final val = KitchenSink(
-          ctorValidatedNo42: $checkedConvert('no-42', (v) => v as int?),
-          iterable: $checkedConvert('iterable', (v) => v as List<dynamic>?),
-          dynamicIterable:
-              $checkedConvert('dynamicIterable', (v) => v as List<dynamic>?),
-          objectIterable: $checkedConvert('objectIterable',
-              (v) => (v as List<dynamic>?)?.map((e) => e as Object)),
-          intIterable: $checkedConvert('intIterable',
-              (v) => (v as List<dynamic>?)?.map((e) => e as int)),
-          dateTimeIterable: $checkedConvert(
-              'datetime-iterable',
-              (v) => (v as List<dynamic>?)
-                  ?.map((e) => DateTime.parse(e as String))),
-        );
-        $checkedConvert(
-            'dateTime',
-            (v) =>
-                val.dateTime = v == null ? null : DateTime.parse(v as String));
-        $checkedConvert('bigInt',
-            (v) => val.bigInt = v == null ? null : BigInt.parse(v as String));
-        $checkedConvert('set', (v) => val.set = (v as List<dynamic>).toSet());
-        $checkedConvert(
-            'dynamicSet', (v) => val.dynamicSet = (v as List<dynamic>).toSet());
-        $checkedConvert(
-            'objectSet',
-            (v) => val.objectSet =
-                (v as List<dynamic>).map((e) => e as Object).toSet());
-        $checkedConvert(
-            'intSet',
-            (v) =>
-                val.intSet = (v as List<dynamic>).map((e) => e as int).toSet());
-        $checkedConvert(
-            'dateTimeSet',
-            (v) => val.dateTimeSet = (v as List<dynamic>)
-                .map((e) => DateTime.parse(e as String))
-                .toSet());
-        $checkedConvert('list', (v) => val.list = v as List<dynamic>);
-        $checkedConvert(
-            'dynamicList', (v) => val.dynamicList = v as List<dynamic>);
-        $checkedConvert(
-            'objectList',
-            (v) => val.objectList =
-                (v as List<dynamic>).map((e) => e as Object).toList());
-        $checkedConvert(
-            'intList',
-            (v) => val.intList =
-                (v as List<dynamic>).map((e) => e as int).toList());
-        $checkedConvert(
-            'dateTimeList',
-            (v) => val.dateTimeList = (v as List<dynamic>)
-                .map((e) => DateTime.parse(e as String))
-                .toList());
-        $checkedConvert(
-            'nullableSimpleObjectList',
-            (v) => val.nullableSimpleObjectList = (v as List<dynamic>)
-                .map((e) => e == null ? null : SimpleObject.fromJson(e as Map))
-                .toList());
-        $checkedConvert('map', (v) => val.map = v as Map);
-        $checkedConvert('stringStringMap',
-            (v) => val.stringStringMap = Map<String, String>.from(v as Map));
-        $checkedConvert('dynamicIntMap',
-            (v) => val.dynamicIntMap = Map<String, int>.from(v as Map));
-        $checkedConvert(
-            'objectDateTimeMap',
-            (v) => val.objectDateTimeMap = (v as Map).map(
-                  (k, e) => MapEntry(k as Object, DateTime.parse(e as String)),
-                ));
-        $checkedConvert(
-            'nullableSimpleObjectMap',
-            (v) => val.nullableSimpleObjectMap = (v as Map).map(
-                  (k, e) => MapEntry(k as String,
-                      e == null ? null : SimpleObject.fromJson(e as Map)),
-                ));
-        $checkedConvert(
-            'crazyComplex',
-            (v) => val.crazyComplex = (v as List<dynamic>)
-                .map((e) => (e as Map?)?.map(
-                      (k, e) => MapEntry(
-                          k as String,
-                          (e as Map?)?.map(
-                            (k, e) => MapEntry(
-                                k as String,
-                                (e as List<dynamic>?)
-                                    ?.map((e) => (e as List<dynamic>?)
-                                        ?.map(
-                                            (e) => DateTime.parse(e as String))
-                                        .toList())
-                                    .toList()),
-                          )),
-                    ))
-                .toList());
-        $checkedConvert(
-            'val', (v) => val.val = Map<String, bool>.from(v as Map));
-        $checkedConvert('writeNotNull', (v) => val.writeNotNull = v as bool?);
-        $checkedConvert(r'$string', (v) => val.string = v as String?);
-        $checkedConvert('simpleObject',
-            (v) => val.simpleObject = SimpleObject.fromJson(v as Map));
-        $checkedConvert('strictKeysObject',
-            (v) => val.strictKeysObject = StrictKeysObject.fromJson(v as Map));
-        $checkedConvert('validatedPropertyNo42',
-            (v) => val.validatedPropertyNo42 = v as int?);
-        return val;
-      },
-      fieldKeyMap: const {
-        'ctorValidatedNo42': 'no-42',
-        'dateTimeIterable': 'datetime-iterable',
-        'string': r'$string'
-      },
+  'KitchenSink',
+  json,
+  ($checkedConvert) {
+    final val = KitchenSink(
+      ctorValidatedNo42: $checkedConvert('no-42', (v) => (v as num?)?.toInt()),
+      iterable: $checkedConvert(
+        'iterable',
+        (v) => v as List<dynamic>?,
+        readValue: _valueAccessor,
+      ),
+      dynamicIterable: $checkedConvert(
+        'dynamicIterable',
+        (v) => v as List<dynamic>?,
+      ),
+      objectIterable: $checkedConvert(
+        'objectIterable',
+        (v) => (v as List<dynamic>?)?.map((e) => e as Object),
+      ),
+      intIterable: $checkedConvert(
+        'intIterable',
+        (v) => (v as List<dynamic>?)?.map((e) => (e as num).toInt()),
+      ),
+      dateTimeIterable: $checkedConvert(
+        'datetime-iterable',
+        (v) => (v as List<dynamic>?)?.map((e) => DateTime.parse(e as String)),
+      ),
     );
-
-Map<String, dynamic> _$KitchenSinkToJson(KitchenSink instance) =>
-    <String, dynamic>{
-      'no-42': instance.ctorValidatedNo42,
-      'dateTime': instance.dateTime?.toIso8601String(),
-      'bigInt': instance.bigInt?.toString(),
-      'iterable': instance.iterable?.toList(),
-      'dynamicIterable': instance.dynamicIterable.toList(),
-      'objectIterable': instance.objectIterable.toList(),
-      'intIterable': instance.intIterable.toList(),
-      'set': instance.set.toList(),
-      'dynamicSet': instance.dynamicSet.toList(),
-      'objectSet': instance.objectSet.toList(),
-      'intSet': instance.intSet.toList(),
-      'dateTimeSet':
-          instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
-      'datetime-iterable':
-          instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(),
-      'list': instance.list,
-      'dynamicList': instance.dynamicList,
-      'objectList': instance.objectList,
-      'intList': instance.intList,
-      'dateTimeList':
-          instance.dateTimeList.map((e) => e.toIso8601String()).toList(),
-      'nullableSimpleObjectList': instance.nullableSimpleObjectList,
-      'map': instance.map,
-      'stringStringMap': instance.stringStringMap,
-      'dynamicIntMap': instance.dynamicIntMap,
-      'objectDateTimeMap': instance.objectDateTimeMap
-          .map((k, e) => MapEntry(k, e.toIso8601String())),
-      'nullableSimpleObjectMap': instance.nullableSimpleObjectMap,
-      'crazyComplex': instance.crazyComplex
-          .map((e) => e?.map((k, e) => MapEntry(
-              k,
-              e?.map((k, e) => MapEntry(
-                  k,
-                  e
-                      ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
-                      .toList())))))
+    $checkedConvert(
+      'dateTime',
+      (v) => val.dateTime = v == null ? null : DateTime.parse(v as String),
+    );
+    $checkedConvert(
+      'bigInt',
+      (v) => val.bigInt = v == null ? null : BigInt.parse(v as String),
+    );
+    $checkedConvert('set', (v) => val.set = (v as List<dynamic>).toSet());
+    $checkedConvert(
+      'dynamicSet',
+      (v) => val.dynamicSet = (v as List<dynamic>).toSet(),
+    );
+    $checkedConvert(
+      'objectSet',
+      (v) =>
+          val.objectSet = (v as List<dynamic>).map((e) => e as Object).toSet(),
+    );
+    $checkedConvert(
+      'intSet',
+      (v) => val.intSet = (v as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toSet(),
+    );
+    $checkedConvert(
+      'dateTimeSet',
+      (v) => val.dateTimeSet = (v as List<dynamic>)
+          .map((e) => DateTime.parse(e as String))
+          .toSet(),
+    );
+    $checkedConvert('list', (v) => val.list = v as List<dynamic>);
+    $checkedConvert('dynamicList', (v) => val.dynamicList = v as List<dynamic>);
+    $checkedConvert(
+      'objectList',
+      (v) => val.objectList = (v as List<dynamic>)
+          .map((e) => e as Object)
           .toList(),
-      'val': instance.val,
-      'writeNotNull': instance.writeNotNull,
-      r'$string': instance.string,
-      'simpleObject': instance.simpleObject,
-      'strictKeysObject': instance.strictKeysObject,
-      'validatedPropertyNo42': instance.validatedPropertyNo42,
-    };
-
-JsonConverterTestClass _$JsonConverterTestClassFromJson(Map json) =>
-    $checkedCreate(
-      'JsonConverterTestClass',
-      json,
-      ($checkedConvert) {
-        final val = JsonConverterTestClass(
-          $checkedConvert(
-              'duration', (v) => durationConverter.fromJson(v as int?)),
-          $checkedConvert(
-              'durationList',
-              (v) => (v as List<dynamic>)
-                  .map((e) => durationConverter.fromJson(e as int?))
-                  .toList()),
-          $checkedConvert('bigInt',
-              (v) => const BigIntStringConverter().fromJson(v as String)),
-          $checkedConvert(
-              'bigIntMap',
-              (v) => (v as Map).map(
-                    (k, e) => MapEntry(k as String,
-                        const BigIntStringConverter().fromJson(e as String)),
-                  )),
-          $checkedConvert('numberSilly',
-              (v) => TrivialNumberConverter.instance.fromJson(v as int?)),
-          $checkedConvert(
-              'numberSillySet',
-              (v) => (v as List<dynamic>)
-                  .map((e) =>
-                      TrivialNumberConverter.instance.fromJson(e as int?))
-                  .toSet()),
-          $checkedConvert('dateTime',
-              (v) => const EpochDateTimeConverter().fromJson(v as int?)),
-        );
-        return val;
-      },
     );
+    $checkedConvert(
+      'intList',
+      (v) => val.intList = (v as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
+    );
+    $checkedConvert(
+      'dateTimeList',
+      (v) => val.dateTimeList = (v as List<dynamic>)
+          .map((e) => DateTime.parse(e as String))
+          .toList(),
+    );
+    $checkedConvert(
+      'nullableSimpleObjectList',
+      (v) => val.nullableSimpleObjectList = (v as List<dynamic>)
+          .map((e) => e == null ? null : SimpleObject.fromJson(e as Map))
+          .toList(),
+    );
+    $checkedConvert('map', (v) => val.map = v as Map);
+    $checkedConvert(
+      'stringStringMap',
+      (v) => val.stringStringMap = Map<String, String>.from(v as Map),
+    );
+    $checkedConvert(
+      'dynamicIntMap',
+      (v) => val.dynamicIntMap = Map<String, int>.from(v as Map),
+    );
+    $checkedConvert(
+      'objectDateTimeMap',
+      (v) => val.objectDateTimeMap = (v as Map).map(
+        (k, e) => MapEntry(k as Object, DateTime.parse(e as String)),
+      ),
+    );
+    $checkedConvert(
+      'nullableSimpleObjectMap',
+      (v) => val.nullableSimpleObjectMap = (v as Map).map(
+        (k, e) => MapEntry(
+          k as String,
+          e == null ? null : SimpleObject.fromJson(e as Map),
+        ),
+      ),
+    );
+    $checkedConvert(
+      'crazyComplex',
+      (v) => val.crazyComplex = (v as List<dynamic>)
+          .map(
+            (e) => (e as Map?)?.map(
+              (k, e) => MapEntry(
+                k as String,
+                (e as Map?)?.map(
+                  (k, e) => MapEntry(
+                    k as String,
+                    (e as List<dynamic>?)
+                        ?.map(
+                          (e) => (e as List<dynamic>?)
+                              ?.map((e) => DateTime.parse(e as String))
+                              .toList(),
+                        )
+                        .toList(),
+                  ),
+                ),
+              ),
+            ),
+          )
+          .toList(),
+    );
+    $checkedConvert('val', (v) => val.val = Map<String, bool>.from(v as Map));
+    $checkedConvert('writeNotNull', (v) => val.writeNotNull = v as bool?);
+    $checkedConvert(
+      r'$string',
+      (v) => val.string = v as String?,
+      readValue: KitchenSink._trickyValueAccessor,
+    );
+    $checkedConvert(
+      'simpleObject',
+      (v) => val.simpleObject = SimpleObject.fromJson(v as Map),
+    );
+    $checkedConvert(
+      'strictKeysObject',
+      (v) => val.strictKeysObject = StrictKeysObject.fromJson(v as Map),
+    );
+    $checkedConvert(
+      'validatedPropertyNo42',
+      (v) => val.validatedPropertyNo42 = (v as num?)?.toInt(),
+    );
+    $checkedConvert(
+      'recordField',
+      (v) => val.recordField = _$recordConvertAnyNullable(
+        v,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    );
+    return val;
+  },
+  fieldKeyMap: const {
+    'ctorValidatedNo42': 'no-42',
+    'dateTimeIterable': 'datetime-iterable',
+    'string': r'$string',
+  },
+);
 
-Map<String, dynamic> _$JsonConverterTestClassToJson(
-        JsonConverterTestClass instance) =>
-    <String, dynamic>{
-      'duration': durationConverter.toJson(instance.duration),
-      'durationList':
-          instance.durationList.map(durationConverter.toJson).toList(),
-      'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
-      'bigIntMap': instance.bigIntMap
-          .map((k, e) => MapEntry(k, const BigIntStringConverter().toJson(e))),
-      'numberSilly':
-          TrivialNumberConverter.instance.toJson(instance.numberSilly),
-      'numberSillySet': instance.numberSillySet
-          .map(TrivialNumberConverter.instance.toJson)
+Map<String, dynamic> _$KitchenSinkToJson(
+  KitchenSink instance,
+) => <String, dynamic>{
+  'no-42': instance.ctorValidatedNo42,
+  'dateTime': instance.dateTime?.toIso8601String(),
+  'bigInt': instance.bigInt?.toString(),
+  'iterable': instance.iterable?.toList(),
+  'dynamicIterable': instance.dynamicIterable.toList(),
+  'objectIterable': instance.objectIterable.toList(),
+  'intIterable': instance.intIterable.toList(),
+  'set': instance.set.toList(),
+  'dynamicSet': instance.dynamicSet.toList(),
+  'objectSet': instance.objectSet.toList(),
+  'intSet': instance.intSet.toList(),
+  'dateTimeSet': instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
+  'datetime-iterable': instance.dateTimeIterable
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'list': instance.list,
+  'dynamicList': instance.dynamicList,
+  'objectList': instance.objectList,
+  'intList': instance.intList,
+  'dateTimeList': instance.dateTimeList
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'nullableSimpleObjectList': instance.nullableSimpleObjectList,
+  'map': instance.map,
+  'stringStringMap': instance.stringStringMap,
+  'dynamicIntMap': instance.dynamicIntMap,
+  'objectDateTimeMap': instance.objectDateTimeMap.map(
+    (k, e) => MapEntry(k, e.toIso8601String()),
+  ),
+  'nullableSimpleObjectMap': instance.nullableSimpleObjectMap,
+  'crazyComplex': instance.crazyComplex
+      .map(
+        (e) => e?.map(
+          (k, e) => MapEntry(
+            k,
+            e?.map(
+              (k, e) => MapEntry(
+                k,
+                e
+                    ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
+                    .toList(),
+              ),
+            ),
+          ),
+        ),
+      )
+      .toList(),
+  'val': instance.val,
+  'writeNotNull': instance.writeNotNull,
+  r'$string': instance.string,
+  'simpleObject': instance.simpleObject,
+  'strictKeysObject': instance.strictKeysObject,
+  'validatedPropertyNo42': instance.validatedPropertyNo42,
+  'recordField': instance.recordField == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.recordField!.$1,
+          r'$2': instance.recordField!.$2,
+          'truth': instance.recordField!.truth,
+        },
+};
+
+$Rec? _$recordConvertAnyNullable<$Rec>(
+  Object? value,
+  $Rec Function(Map) convert,
+) => value == null ? null : convert(value as Map);
+
+JsonConverterTestClass _$JsonConverterTestClassFromJson(
+  Map json,
+) => $checkedCreate('JsonConverterTestClass', json, ($checkedConvert) {
+  final val = JsonConverterTestClass(
+    $checkedConvert(
+      'duration',
+      (v) =>
+          const DurationMillisecondConverter().fromJson((v as num?)?.toInt()),
+    ),
+    $checkedConvert(
+      'durationList',
+      (v) => (v as List<dynamic>)
+          .map(
+            (e) => const DurationMillisecondConverter().fromJson(
+              (e as num?)?.toInt(),
+            ),
+          )
           .toList(),
-      'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
-    };
+    ),
+    $checkedConvert(
+      'bigInt',
+      (v) => const BigIntStringConverter().fromJson(v as String),
+    ),
+    $checkedConvert(
+      'bigIntMap',
+      (v) => (v as Map).map(
+        (k, e) => MapEntry(
+          k as String,
+          const BigIntStringConverter().fromJson(e as String),
+        ),
+      ),
+    ),
+    $checkedConvert(
+      'nullableBigInt',
+      (v) => _$JsonConverterFromJson<String, BigInt>(
+        v,
+        const BigIntStringConverter().fromJson,
+      ),
+    ),
+    $checkedConvert(
+      'nullableBigIntMap',
+      (v) => (v as Map).map(
+        (k, e) => MapEntry(
+          k as String,
+          _$JsonConverterFromJson<String, BigInt>(
+            e,
+            const BigIntStringConverter().fromJson,
+          ),
+        ),
+      ),
+    ),
+    $checkedConvert(
+      'numberSilly',
+      (v) => TrivialNumberConverter.instance.fromJson((v as num?)?.toInt()),
+    ),
+    $checkedConvert(
+      'numberSillySet',
+      (v) => (v as List<dynamic>)
+          .map(
+            (e) =>
+                TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+          )
+          .toSet(),
+    ),
+    $checkedConvert(
+      'dateTime',
+      (v) => const EpochDateTimeConverter().fromJson((v as num?)?.toInt()),
+    ),
+    $checkedConvert(
+      'trivialString',
+      (v) => trivialStringConverter.fromJson(v as String?),
+    ),
+    $checkedConvert(
+      'nullableNumberSilly',
+      (v) => TrivialNumberConverter.instance.fromJson((v as num?)?.toInt()),
+    ),
+    $checkedConvert(
+      'nullableNumberSillySet',
+      (v) => (v as List<dynamic>)
+          .map(
+            (e) =>
+                TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+          )
+          .toSet(),
+    ),
+  );
+  return val;
+});
+
+Map<String, dynamic> _$JsonConverterTestClassToJson(
+  JsonConverterTestClass instance,
+) => <String, dynamic>{
+  'duration': const DurationMillisecondConverter().toJson(instance.duration),
+  'durationList': instance.durationList
+      .map(const DurationMillisecondConverter().toJson)
+      .toList(),
+  'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
+  'bigIntMap': instance.bigIntMap.map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().toJson(e)),
+  ),
+  'nullableBigInt': _$JsonConverterToJson<String, BigInt>(
+    instance.nullableBigInt,
+    const BigIntStringConverter().toJson,
+  ),
+  'nullableBigIntMap': instance.nullableBigIntMap.map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterToJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().toJson,
+      ),
+    ),
+  ),
+  'numberSilly': TrivialNumberConverter.instance.toJson(instance.numberSilly),
+  'numberSillySet': instance.numberSillySet
+      .map(TrivialNumberConverter.instance.toJson)
+      .toList(),
+  'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
+  'trivialString': trivialStringConverter.toJson(instance.trivialString),
+  'nullableNumberSilly': _$JsonConverterToJson<int?, TrivialNumber>(
+    instance.nullableNumberSilly,
+    TrivialNumberConverter.instance.toJson,
+  ),
+  'nullableNumberSillySet': instance.nullableNumberSillySet
+      .map(
+        (e) => _$JsonConverterToJson<int?, TrivialNumber>(
+          e,
+          TrivialNumberConverter.instance.toJson,
+        ),
+      )
+      .toList(),
+};
+
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => json == null ? null : fromJson(json as Json);
+
+Json? _$JsonConverterToJson<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => value == null ? null : toJson(value);
 
 JsonConverterGeneric<S, T, U> _$JsonConverterGenericFromJson<S, T, U>(
-        Map json) =>
-    $checkedCreate(
-      'JsonConverterGeneric',
-      json,
-      ($checkedConvert) {
-        final val = JsonConverterGeneric<S, T, U>(
-          $checkedConvert('item',
-              (v) => GenericConverter<S>().fromJson(v as Map<String, dynamic>)),
-          $checkedConvert(
-              'itemList',
-              (v) => (v as List<dynamic>)
-                  .map((e) =>
-                      GenericConverter<T>().fromJson(e as Map<String, dynamic>))
-                  .toList()),
-          $checkedConvert(
-              'itemMap',
-              (v) => (v as Map).map(
-                    (k, e) => MapEntry(
-                        k as String,
-                        GenericConverter<U>()
-                            .fromJson(e as Map<String, dynamic>)),
-                  )),
-        );
-        return val;
-      },
-    );
+  Map json,
+) => $checkedCreate('JsonConverterGeneric', json, ($checkedConvert) {
+  final val = JsonConverterGeneric<S, T, U>(
+    $checkedConvert(
+      'item',
+      (v) => GenericConverter<S>().fromJson(v as Map<String, dynamic>),
+    ),
+    $checkedConvert(
+      'itemList',
+      (v) => (v as List<dynamic>)
+          .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
+          .toList(),
+    ),
+    $checkedConvert(
+      'itemMap',
+      (v) => (v as Map).map(
+        (k, e) => MapEntry(
+          k as String,
+          GenericConverter<U>().fromJson(e as Map<String, dynamic>),
+        ),
+      ),
+    ),
+  );
+  return val;
+});
 
 Map<String, dynamic> _$JsonConverterGenericToJson<S, T, U>(
-        JsonConverterGeneric<S, T, U> instance) =>
-    <String, dynamic>{
-      'item': GenericConverter<S>().toJson(instance.item),
-      'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
-      'itemMap': instance.itemMap
-          .map((k, e) => MapEntry(k, GenericConverter<U>().toJson(e))),
-    };
+  JsonConverterGeneric<S, T, U> instance,
+) => <String, dynamic>{
+  'item': GenericConverter<S>().toJson(instance.item),
+  'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
+  'itemMap': instance.itemMap.map(
+    (k, e) => MapEntry(k, GenericConverter<U>().toJson(e)),
+  ),
+};
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.dart
index 44750ac8e..a5b701cd7 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.dart
@@ -48,36 +48,46 @@ class _Factory implements k.KitchenSinkFactory<String, dynamic> {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  }) =>
-      KitchenSink(
-        ctorValidatedNo42: ctorValidatedNo42,
-        iterable: iterable,
-        dynamicIterable: dynamicIterable,
-        objectIterable: objectIterable,
-        intIterable: intIterable,
-        dateTimeIterable: dateTimeIterable,
-      );
+  }) => KitchenSink(
+    ctorValidatedNo42: ctorValidatedNo42,
+    iterable: iterable,
+    dynamicIterable: dynamicIterable,
+    objectIterable: objectIterable,
+    intIterable: intIterable,
+    dateTimeIterable: dateTimeIterable,
+  );
 
   k.KitchenSink fromJson(Map<String, dynamic> json) =>
       KitchenSink.fromJson(json);
 
   k.JsonConverterTestClass jsonConverterCtor() => JsonConverterTestClass(
-        const Duration(),
-        [],
-        BigInt.zero,
-        {},
-        TrivialNumber(0),
-        {},
-        DateTime.fromMillisecondsSinceEpoch(0),
-      );
+    const Duration(),
+    [],
+    BigInt.zero,
+    {},
+    BigInt.zero,
+    {},
+    TrivialNumber(0),
+    {},
+    DateTime.fromMillisecondsSinceEpoch(0),
+    TrivialString(''),
+    TrivialNumber(0),
+    {},
+  );
 
   k.JsonConverterTestClass jsonConverterFromJson(Map<String, dynamic> json) =>
       JsonConverterTestClass.fromJson(json);
 }
 
-@JsonSerializable(
-  includeIfNull: false,
-)
+Object? _valueAccessor(Map json, String key) {
+  if (key == 'iterable') {
+    return json['iterable'] ?? json['theIterable'];
+  }
+
+  return json[key];
+}
+
+@JsonSerializable(includeIfNull: false)
 class KitchenSink implements k.KitchenSink {
   // NOTE: exposing these as Iterable, but storing the values as List
   // to make the equality test work trivially.
@@ -97,14 +107,17 @@ class KitchenSink implements k.KitchenSink {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  })  : _iterable = iterable?.toList(),
-        _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
-        _objectIterable = objectIterable?.toList() ?? _defaultList(),
-        _intIterable = intIterable?.toList() ?? _defaultList(),
-        _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
+  }) : _iterable = iterable?.toList(),
+       _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
+       _objectIterable = objectIterable?.toList() ?? _defaultList(),
+       _intIterable = intIterable?.toList() ?? _defaultList(),
+       _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
     if (ctorValidatedNo42 == 42) {
       throw ArgumentError.value(
-          42, 'ctorValidatedNo42', 'The value `42` is not allowed.');
+        42,
+        'ctorValidatedNo42',
+        'The value `42` is not allowed.',
+      );
     }
   }
 
@@ -117,6 +130,7 @@ class KitchenSink implements k.KitchenSink {
 
   BigInt? bigInt;
 
+  @JsonKey(readValue: _valueAccessor)
   Iterable? get iterable => _iterable;
 
   Iterable<dynamic> get dynamicIterable => _dynamicIterable;
@@ -154,7 +168,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: r'$string')
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -172,16 +186,30 @@ class KitchenSink implements k.KitchenSink {
     _validatedPropertyNo42 = value;
   }
 
+  k.RecordSample? recordField;
+
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
 @JsonSerializable(
   includeIfNull: false,
+  converters: [
+    // referencing a top-level field should work
+    durationConverter,
+    // referencing via a const constructor should work
+    BigIntStringConverter(),
+  ],
 )
 // referencing a top-level field should work
-@durationConverter
-// referencing via a const constructor should work
-@BigIntStringConverter()
+@trivialStringConverter
 @TrivialNumberConverter.instance
 @EpochDateTimeConverter()
 class JsonConverterTestClass implements k.JsonConverterTestClass {
@@ -190,9 +218,14 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
     this.durationList,
     this.bigInt,
     this.bigIntMap,
+    this.nullableBigInt,
+    this.nullableBigIntMap,
     this.numberSilly,
     this.numberSillySet,
     this.dateTime,
+    this.trivialString,
+    this.nullableNumberSilly,
+    this.nullableNumberSillySet,
   );
 
   factory JsonConverterTestClass.fromJson(Map<String, dynamic> json) =>
@@ -206,26 +239,29 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
   BigInt bigInt;
   Map<String, BigInt> bigIntMap;
 
+  BigInt? nullableBigInt;
+  Map<String, BigInt?> nullableBigIntMap;
+
   TrivialNumber numberSilly;
   Set<TrivialNumber> numberSillySet;
 
   DateTime? dateTime;
+
+  TrivialString? trivialString;
+
+  TrivialNumber? nullableNumberSilly;
+  Set<TrivialNumber?> nullableNumberSillySet;
 }
 
-@JsonSerializable(
-  includeIfNull: false,
-)
+@JsonSerializable(includeIfNull: false)
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;
   List<T> itemList;
   Map<String, U> itemMap;
 
-  JsonConverterGeneric(
-    this.item,
-    this.itemList,
-    this.itemMap,
-  );
+  JsonConverterGeneric(this.item, this.itemList, this.itemMap);
 
   factory JsonConverterGeneric.fromJson(Map<String, dynamic> json) =>
       _$JsonConverterGenericFromJson(json);
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart
index c7ef240b6..57ca82487 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'kitchen_sink.g_exclude_null.dart';
 
@@ -8,212 +8,305 @@ part of 'kitchen_sink.g_exclude_null.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-KitchenSink _$KitchenSinkFromJson(Map<String, dynamic> json) => KitchenSink(
-      ctorValidatedNo42: json['no-42'] as int?,
-      iterable: json['iterable'] as List<dynamic>?,
-      dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
-      objectIterable:
-          (json['objectIterable'] as List<dynamic>?)?.map((e) => e as Object),
-      intIterable:
-          (json['intIterable'] as List<dynamic>?)?.map((e) => e as int),
-      dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String)),
-    )
+KitchenSink _$KitchenSinkFromJson(Map<String, dynamic> json) =>
+    KitchenSink(
+        ctorValidatedNo42: (json['no-42'] as num?)?.toInt(),
+        iterable: _valueAccessor(json, 'iterable') as List<dynamic>?,
+        dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
+        objectIterable: (json['objectIterable'] as List<dynamic>?)?.map(
+          (e) => e as Object,
+        ),
+        intIterable: (json['intIterable'] as List<dynamic>?)?.map(
+          (e) => (e as num).toInt(),
+        ),
+        dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)?.map(
+          (e) => DateTime.parse(e as String),
+        ),
+      )
       ..dateTime = json['dateTime'] == null
           ? null
           : DateTime.parse(json['dateTime'] as String)
-      ..bigInt =
-          json['bigInt'] == null ? null : BigInt.parse(json['bigInt'] as String)
+      ..bigInt = json['bigInt'] == null
+          ? null
+          : BigInt.parse(json['bigInt'] as String)
       ..set = (json['set'] as List<dynamic>).toSet()
       ..dynamicSet = (json['dynamicSet'] as List<dynamic>).toSet()
-      ..objectSet =
-          (json['objectSet'] as List<dynamic>).map((e) => e as Object).toSet()
-      ..intSet = (json['intSet'] as List<dynamic>).map((e) => e as int).toSet()
+      ..objectSet = (json['objectSet'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toSet()
+      ..intSet = (json['intSet'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toSet()
       ..dateTimeSet = (json['dateTimeSet'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toSet()
       ..list = json['list'] as List<dynamic>
       ..dynamicList = json['dynamicList'] as List<dynamic>
-      ..objectList =
-          (json['objectList'] as List<dynamic>).map((e) => e as Object).toList()
-      ..intList =
-          (json['intList'] as List<dynamic>).map((e) => e as int).toList()
+      ..objectList = (json['objectList'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toList()
+      ..intList = (json['intList'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList()
       ..dateTimeList = (json['dateTimeList'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toList()
       ..nullableSimpleObjectList =
           (json['nullableSimpleObjectList'] as List<dynamic>)
-              .map((e) => e == null
-                  ? null
-                  : SimpleObject.fromJson(e as Map<String, dynamic>))
+              .map(
+                (e) => e == null
+                    ? null
+                    : SimpleObject.fromJson(e as Map<String, dynamic>),
+              )
               .toList()
       ..map = json['map'] as Map<String, dynamic>
-      ..stringStringMap =
-          Map<String, String>.from(json['stringStringMap'] as Map)
-      ..dynamicIntMap = Map<String, int>.from(json['dynamicIntMap'] as Map)
-      ..objectDateTimeMap =
-          (json['objectDateTimeMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, DateTime.parse(e as String)),
+      ..stringStringMap = Map<String, String>.from(
+        json['stringStringMap'] as Map,
       )
+      ..dynamicIntMap = Map<String, int>.from(json['dynamicIntMap'] as Map)
+      ..objectDateTimeMap = (json['objectDateTimeMap'] as Map<String, dynamic>)
+          .map((k, e) => MapEntry(k, DateTime.parse(e as String)))
       ..nullableSimpleObjectMap =
           (json['nullableSimpleObjectMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            k,
-            e == null
-                ? null
-                : SimpleObject.fromJson(e as Map<String, dynamic>)),
-      )
+            (k, e) => MapEntry(
+              k,
+              e == null
+                  ? null
+                  : SimpleObject.fromJson(e as Map<String, dynamic>),
+            ),
+          )
       ..crazyComplex = (json['crazyComplex'] as List<dynamic>)
-          .map((e) => (e as Map<String, dynamic>?)?.map(
-                (k, e) => MapEntry(
+          .map(
+            (e) => (e as Map<String, dynamic>?)?.map(
+              (k, e) => MapEntry(
+                k,
+                (e as Map<String, dynamic>?)?.map(
+                  (k, e) => MapEntry(
                     k,
-                    (e as Map<String, dynamic>?)?.map(
-                      (k, e) => MapEntry(
-                          k,
-                          (e as List<dynamic>?)
-                              ?.map((e) => (e as List<dynamic>?)
-                                  ?.map((e) => DateTime.parse(e as String))
-                                  .toList())
-                              .toList()),
-                    )),
-              ))
+                    (e as List<dynamic>?)
+                        ?.map(
+                          (e) => (e as List<dynamic>?)
+                              ?.map((e) => DateTime.parse(e as String))
+                              .toList(),
+                        )
+                        .toList(),
+                  ),
+                ),
+              ),
+            ),
+          )
           .toList()
       ..val = Map<String, bool>.from(json['val'] as Map)
       ..writeNotNull = json['writeNotNull'] as bool?
-      ..string = json[r'$string'] as String?
-      ..simpleObject =
-          SimpleObject.fromJson(json['simpleObject'] as Map<String, dynamic>)
+      ..string = KitchenSink._trickyValueAccessor(json, r'$string') as String?
+      ..simpleObject = SimpleObject.fromJson(
+        json['simpleObject'] as Map<String, dynamic>,
+      )
       ..strictKeysObject = StrictKeysObject.fromJson(
-          json['strictKeysObject'] as Map<String, dynamic>)
-      ..validatedPropertyNo42 = json['validatedPropertyNo42'] as int?;
-
-Map<String, dynamic> _$KitchenSinkToJson(KitchenSink instance) {
-  final val = <String, dynamic>{};
+        json['strictKeysObject'] as Map<String, dynamic>,
+      )
+      ..validatedPropertyNo42 = (json['validatedPropertyNo42'] as num?)?.toInt()
+      ..recordField = _$recordConvertNullable(
+        json['recordField'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      );
 
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
+Map<String, dynamic> _$KitchenSinkToJson(
+  KitchenSink instance,
+) => <String, dynamic>{
+  'no-42': ?instance.ctorValidatedNo42,
+  'dateTime': ?instance.dateTime?.toIso8601String(),
+  'bigInt': ?instance.bigInt?.toString(),
+  'iterable': ?instance.iterable?.toList(),
+  'dynamicIterable': instance.dynamicIterable.toList(),
+  'objectIterable': instance.objectIterable.toList(),
+  'intIterable': instance.intIterable.toList(),
+  'set': instance.set.toList(),
+  'dynamicSet': instance.dynamicSet.toList(),
+  'objectSet': instance.objectSet.toList(),
+  'intSet': instance.intSet.toList(),
+  'dateTimeSet': instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
+  'datetime-iterable': instance.dateTimeIterable
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'list': instance.list,
+  'dynamicList': instance.dynamicList,
+  'objectList': instance.objectList,
+  'intList': instance.intList,
+  'dateTimeList': instance.dateTimeList
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'nullableSimpleObjectList': instance.nullableSimpleObjectList,
+  'map': instance.map,
+  'stringStringMap': instance.stringStringMap,
+  'dynamicIntMap': instance.dynamicIntMap,
+  'objectDateTimeMap': instance.objectDateTimeMap.map(
+    (k, e) => MapEntry(k, e.toIso8601String()),
+  ),
+  'nullableSimpleObjectMap': instance.nullableSimpleObjectMap,
+  'crazyComplex': instance.crazyComplex
+      .map(
+        (e) => e?.map(
+          (k, e) => MapEntry(
+            k,
+            e?.map(
+              (k, e) => MapEntry(
+                k,
+                e
+                    ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
+                    .toList(),
+              ),
+            ),
+          ),
+        ),
+      )
+      .toList(),
+  'val': instance.val,
+  'writeNotNull': ?instance.writeNotNull,
+  r'$string': ?instance.string,
+  'simpleObject': instance.simpleObject,
+  'strictKeysObject': instance.strictKeysObject,
+  'validatedPropertyNo42': ?instance.validatedPropertyNo42,
+  'recordField': ?instance.recordField == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.recordField!.$1,
+          r'$2': instance.recordField!.$2,
+          'truth': instance.recordField!.truth,
+        },
+};
 
-  writeNotNull('no-42', instance.ctorValidatedNo42);
-  writeNotNull('dateTime', instance.dateTime?.toIso8601String());
-  writeNotNull('bigInt', instance.bigInt?.toString());
-  writeNotNull('iterable', instance.iterable?.toList());
-  val['dynamicIterable'] = instance.dynamicIterable.toList();
-  val['objectIterable'] = instance.objectIterable.toList();
-  val['intIterable'] = instance.intIterable.toList();
-  val['set'] = instance.set.toList();
-  val['dynamicSet'] = instance.dynamicSet.toList();
-  val['objectSet'] = instance.objectSet.toList();
-  val['intSet'] = instance.intSet.toList();
-  val['dateTimeSet'] =
-      instance.dateTimeSet.map((e) => e.toIso8601String()).toList();
-  val['datetime-iterable'] =
-      instance.dateTimeIterable.map((e) => e.toIso8601String()).toList();
-  val['list'] = instance.list;
-  val['dynamicList'] = instance.dynamicList;
-  val['objectList'] = instance.objectList;
-  val['intList'] = instance.intList;
-  val['dateTimeList'] =
-      instance.dateTimeList.map((e) => e.toIso8601String()).toList();
-  val['nullableSimpleObjectList'] = instance.nullableSimpleObjectList;
-  val['map'] = instance.map;
-  val['stringStringMap'] = instance.stringStringMap;
-  val['dynamicIntMap'] = instance.dynamicIntMap;
-  val['objectDateTimeMap'] = instance.objectDateTimeMap
-      .map((k, e) => MapEntry(k, e.toIso8601String()));
-  val['nullableSimpleObjectMap'] = instance.nullableSimpleObjectMap;
-  val['crazyComplex'] = instance.crazyComplex
-      .map((e) => e?.map((k, e) => MapEntry(
-          k,
-          e?.map((k, e) => MapEntry(
-              k,
-              e
-                  ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
-                  .toList())))))
-      .toList();
-  val['val'] = instance.val;
-  writeNotNull('writeNotNull', instance.writeNotNull);
-  writeNotNull(r'$string', instance.string);
-  val['simpleObject'] = instance.simpleObject;
-  val['strictKeysObject'] = instance.strictKeysObject;
-  writeNotNull('validatedPropertyNo42', instance.validatedPropertyNo42);
-  return val;
-}
+$Rec? _$recordConvertNullable<$Rec>(
+  Object? value,
+  $Rec Function(Map) convert,
+) => value == null ? null : convert(value as Map<String, dynamic>);
 
 JsonConverterTestClass _$JsonConverterTestClassFromJson(
-        Map<String, dynamic> json) =>
-    JsonConverterTestClass(
-      durationConverter.fromJson(json['duration'] as int?),
-      (json['durationList'] as List<dynamic>)
-          .map((e) => durationConverter.fromJson(e as int?))
-          .toList(),
-      const BigIntStringConverter().fromJson(json['bigInt'] as String),
-      (json['bigIntMap'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(k, const BigIntStringConverter().fromJson(e as String)),
+  Map<String, dynamic> json,
+) => JsonConverterTestClass(
+  const DurationMillisecondConverter().fromJson(
+    (json['duration'] as num?)?.toInt(),
+  ),
+  (json['durationList'] as List<dynamic>)
+      .map(
+        (e) =>
+            const DurationMillisecondConverter().fromJson((e as num?)?.toInt()),
+      )
+      .toList(),
+  const BigIntStringConverter().fromJson(json['bigInt'] as String),
+  (json['bigIntMap'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().fromJson(e as String)),
+  ),
+  _$JsonConverterFromJson<String, BigInt>(
+    json['nullableBigInt'],
+    const BigIntStringConverter().fromJson,
+  ),
+  (json['nullableBigIntMap'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterFromJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().fromJson,
       ),
-      TrivialNumberConverter.instance.fromJson(json['numberSilly'] as int?),
-      (json['numberSillySet'] as List<dynamic>)
-          .map((e) => TrivialNumberConverter.instance.fromJson(e as int?))
-          .toSet(),
-      const EpochDateTimeConverter().fromJson(json['dateTime'] as int?),
-    );
+    ),
+  ),
+  TrivialNumberConverter.instance.fromJson(
+    (json['numberSilly'] as num?)?.toInt(),
+  ),
+  (json['numberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+  const EpochDateTimeConverter().fromJson((json['dateTime'] as num?)?.toInt()),
+  trivialStringConverter.fromJson(json['trivialString'] as String?),
+  TrivialNumberConverter.instance.fromJson(
+    (json['nullableNumberSilly'] as num?)?.toInt(),
+  ),
+  (json['nullableNumberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+);
 
 Map<String, dynamic> _$JsonConverterTestClassToJson(
-    JsonConverterTestClass instance) {
-  final val = <String, dynamic>{};
+  JsonConverterTestClass instance,
+) => <String, dynamic>{
+  'duration': ?const DurationMillisecondConverter().toJson(instance.duration),
+  'durationList': instance.durationList
+      .map(const DurationMillisecondConverter().toJson)
+      .toList(),
+  'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
+  'bigIntMap': instance.bigIntMap.map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().toJson(e)),
+  ),
+  'nullableBigInt': ?_$JsonConverterToJson<String, BigInt>(
+    instance.nullableBigInt,
+    const BigIntStringConverter().toJson,
+  ),
+  'nullableBigIntMap': instance.nullableBigIntMap.map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterToJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().toJson,
+      ),
+    ),
+  ),
+  'numberSilly': ?TrivialNumberConverter.instance.toJson(instance.numberSilly),
+  'numberSillySet': instance.numberSillySet
+      .map(TrivialNumberConverter.instance.toJson)
+      .toList(),
+  'dateTime': ?const EpochDateTimeConverter().toJson(instance.dateTime),
+  'trivialString': ?trivialStringConverter.toJson(instance.trivialString),
+  'nullableNumberSilly': ?_$JsonConverterToJson<int?, TrivialNumber>(
+    instance.nullableNumberSilly,
+    TrivialNumberConverter.instance.toJson,
+  ),
+  'nullableNumberSillySet': instance.nullableNumberSillySet
+      .map(
+        (e) => _$JsonConverterToJson<int?, TrivialNumber>(
+          e,
+          TrivialNumberConverter.instance.toJson,
+        ),
+      )
+      .toList(),
+};
 
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => json == null ? null : fromJson(json as Json);
 
-  writeNotNull('duration', durationConverter.toJson(instance.duration));
-  val['durationList'] =
-      instance.durationList.map(durationConverter.toJson).toList();
-  writeNotNull('bigInt', const BigIntStringConverter().toJson(instance.bigInt));
-  val['bigIntMap'] = instance.bigIntMap
-      .map((k, e) => MapEntry(k, const BigIntStringConverter().toJson(e)));
-  writeNotNull('numberSilly',
-      TrivialNumberConverter.instance.toJson(instance.numberSilly));
-  val['numberSillySet'] = instance.numberSillySet
-      .map(TrivialNumberConverter.instance.toJson)
-      .toList();
-  writeNotNull(
-      'dateTime', const EpochDateTimeConverter().toJson(instance.dateTime));
-  return val;
-}
+Json? _$JsonConverterToJson<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => value == null ? null : toJson(value);
 
 JsonConverterGeneric<S, T, U> _$JsonConverterGenericFromJson<S, T, U>(
-        Map<String, dynamic> json) =>
-    JsonConverterGeneric<S, T, U>(
-      GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
-      (json['itemList'] as List<dynamic>)
-          .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
-          .toList(),
-      (json['itemMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            k, GenericConverter<U>().fromJson(e as Map<String, dynamic>)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => JsonConverterGeneric<S, T, U>(
+  GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
+  (json['itemList'] as List<dynamic>)
+      .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
+      .toList(),
+  (json['itemMap'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(k, GenericConverter<U>().fromJson(e as Map<String, dynamic>)),
+  ),
+);
 
 Map<String, dynamic> _$JsonConverterGenericToJson<S, T, U>(
-    JsonConverterGeneric<S, T, U> instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('item', GenericConverter<S>().toJson(instance.item));
-  val['itemList'] =
-      instance.itemList.map(GenericConverter<T>().toJson).toList();
-  val['itemMap'] = instance.itemMap
-      .map((k, e) => MapEntry(k, GenericConverter<U>().toJson(e)));
-  return val;
-}
+  JsonConverterGeneric<S, T, U> instance,
+) => <String, dynamic>{
+  'item': GenericConverter<S>().toJson(instance.item),
+  'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
+  'itemMap': instance.itemMap.map(
+    (k, e) => MapEntry(k, GenericConverter<U>().toJson(e)),
+  ),
+};
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.dart
index 4568b1cd0..bebc9da38 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.dart
@@ -48,36 +48,46 @@ class _Factory implements k.KitchenSinkFactory<String, dynamic> {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  }) =>
-      KitchenSink(
-        ctorValidatedNo42: ctorValidatedNo42,
-        iterable: iterable,
-        dynamicIterable: dynamicIterable,
-        objectIterable: objectIterable,
-        intIterable: intIterable,
-        dateTimeIterable: dateTimeIterable,
-      );
+  }) => KitchenSink(
+    ctorValidatedNo42: ctorValidatedNo42,
+    iterable: iterable,
+    dynamicIterable: dynamicIterable,
+    objectIterable: objectIterable,
+    intIterable: intIterable,
+    dateTimeIterable: dateTimeIterable,
+  );
 
   k.KitchenSink fromJson(Map<String, dynamic> json) =>
       KitchenSink.fromJson(json);
 
   k.JsonConverterTestClass jsonConverterCtor() => JsonConverterTestClass(
-        const Duration(),
-        [],
-        BigInt.zero,
-        {},
-        TrivialNumber(0),
-        {},
-        DateTime.fromMillisecondsSinceEpoch(0),
-      );
+    const Duration(),
+    [],
+    BigInt.zero,
+    {},
+    BigInt.zero,
+    {},
+    TrivialNumber(0),
+    {},
+    DateTime.fromMillisecondsSinceEpoch(0),
+    TrivialString(''),
+    TrivialNumber(0),
+    {},
+  );
 
   k.JsonConverterTestClass jsonConverterFromJson(Map<String, dynamic> json) =>
       JsonConverterTestClass.fromJson(json);
 }
 
-@JsonSerializable(
-  explicitToJson: true,
-)
+Object? _valueAccessor(Map json, String key) {
+  if (key == 'iterable') {
+    return json['iterable'] ?? json['theIterable'];
+  }
+
+  return json[key];
+}
+
+@JsonSerializable(explicitToJson: true)
 class KitchenSink implements k.KitchenSink {
   // NOTE: exposing these as Iterable, but storing the values as List
   // to make the equality test work trivially.
@@ -97,14 +107,17 @@ class KitchenSink implements k.KitchenSink {
     Iterable<Object>? objectIterable,
     Iterable<int>? intIterable,
     Iterable<DateTime>? dateTimeIterable,
-  })  : _iterable = iterable?.toList(),
-        _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
-        _objectIterable = objectIterable?.toList() ?? _defaultList(),
-        _intIterable = intIterable?.toList() ?? _defaultList(),
-        _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
+  }) : _iterable = iterable?.toList(),
+       _dynamicIterable = dynamicIterable?.toList() ?? _defaultList(),
+       _objectIterable = objectIterable?.toList() ?? _defaultList(),
+       _intIterable = intIterable?.toList() ?? _defaultList(),
+       _dateTimeIterable = dateTimeIterable?.toList() ?? _defaultList() {
     if (ctorValidatedNo42 == 42) {
       throw ArgumentError.value(
-          42, 'ctorValidatedNo42', 'The value `42` is not allowed.');
+        42,
+        'ctorValidatedNo42',
+        'The value `42` is not allowed.',
+      );
     }
   }
 
@@ -117,6 +130,7 @@ class KitchenSink implements k.KitchenSink {
 
   BigInt? bigInt;
 
+  @JsonKey(readValue: _valueAccessor)
   Iterable? get iterable => _iterable;
 
   Iterable<dynamic> get dynamicIterable => _dynamicIterable;
@@ -154,7 +168,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: r'$string')
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -172,16 +186,30 @@ class KitchenSink implements k.KitchenSink {
     _validatedPropertyNo42 = value;
   }
 
+  k.RecordSample? recordField;
+
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
 @JsonSerializable(
   explicitToJson: true,
+  converters: [
+    // referencing a top-level field should work
+    durationConverter,
+    // referencing via a const constructor should work
+    BigIntStringConverter(),
+  ],
 )
 // referencing a top-level field should work
-@durationConverter
-// referencing via a const constructor should work
-@BigIntStringConverter()
+@trivialStringConverter
 @TrivialNumberConverter.instance
 @EpochDateTimeConverter()
 class JsonConverterTestClass implements k.JsonConverterTestClass {
@@ -190,9 +218,14 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
     this.durationList,
     this.bigInt,
     this.bigIntMap,
+    this.nullableBigInt,
+    this.nullableBigIntMap,
     this.numberSilly,
     this.numberSillySet,
     this.dateTime,
+    this.trivialString,
+    this.nullableNumberSilly,
+    this.nullableNumberSillySet,
   );
 
   factory JsonConverterTestClass.fromJson(Map<String, dynamic> json) =>
@@ -206,26 +239,29 @@ class JsonConverterTestClass implements k.JsonConverterTestClass {
   BigInt bigInt;
   Map<String, BigInt> bigIntMap;
 
+  BigInt? nullableBigInt;
+  Map<String, BigInt?> nullableBigIntMap;
+
   TrivialNumber numberSilly;
   Set<TrivialNumber> numberSillySet;
 
   DateTime? dateTime;
+
+  TrivialString? trivialString;
+
+  TrivialNumber? nullableNumberSilly;
+  Set<TrivialNumber?> nullableNumberSillySet;
 }
 
-@JsonSerializable(
-  explicitToJson: true,
-)
+@JsonSerializable(explicitToJson: true)
+// ignore: inference_failure_on_instance_creation
 @GenericConverter()
 class JsonConverterGeneric<S, T, U> {
   S item;
   List<T> itemList;
   Map<String, U> itemMap;
 
-  JsonConverterGeneric(
-    this.item,
-    this.itemList,
-    this.itemMap,
-  );
+  JsonConverterGeneric(this.item, this.itemList, this.itemMap);
 
   factory JsonConverterGeneric.fromJson(Map<String, dynamic> json) =>
       _$JsonConverterGenericFromJson(json);
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart
index 36f94cadd..366035c7c 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'kitchen_sink.g_explicit_to_json.dart';
 
@@ -8,188 +8,309 @@ part of 'kitchen_sink.g_explicit_to_json.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-KitchenSink _$KitchenSinkFromJson(Map<String, dynamic> json) => KitchenSink(
-      ctorValidatedNo42: json['no-42'] as int?,
-      iterable: json['iterable'] as List<dynamic>?,
-      dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
-      objectIterable:
-          (json['objectIterable'] as List<dynamic>?)?.map((e) => e as Object),
-      intIterable:
-          (json['intIterable'] as List<dynamic>?)?.map((e) => e as int),
-      dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String)),
-    )
+KitchenSink _$KitchenSinkFromJson(Map<String, dynamic> json) =>
+    KitchenSink(
+        ctorValidatedNo42: (json['no-42'] as num?)?.toInt(),
+        iterable: _valueAccessor(json, 'iterable') as List<dynamic>?,
+        dynamicIterable: json['dynamicIterable'] as List<dynamic>?,
+        objectIterable: (json['objectIterable'] as List<dynamic>?)?.map(
+          (e) => e as Object,
+        ),
+        intIterable: (json['intIterable'] as List<dynamic>?)?.map(
+          (e) => (e as num).toInt(),
+        ),
+        dateTimeIterable: (json['datetime-iterable'] as List<dynamic>?)?.map(
+          (e) => DateTime.parse(e as String),
+        ),
+      )
       ..dateTime = json['dateTime'] == null
           ? null
           : DateTime.parse(json['dateTime'] as String)
-      ..bigInt =
-          json['bigInt'] == null ? null : BigInt.parse(json['bigInt'] as String)
+      ..bigInt = json['bigInt'] == null
+          ? null
+          : BigInt.parse(json['bigInt'] as String)
       ..set = (json['set'] as List<dynamic>).toSet()
       ..dynamicSet = (json['dynamicSet'] as List<dynamic>).toSet()
-      ..objectSet =
-          (json['objectSet'] as List<dynamic>).map((e) => e as Object).toSet()
-      ..intSet = (json['intSet'] as List<dynamic>).map((e) => e as int).toSet()
+      ..objectSet = (json['objectSet'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toSet()
+      ..intSet = (json['intSet'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toSet()
       ..dateTimeSet = (json['dateTimeSet'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toSet()
       ..list = json['list'] as List<dynamic>
       ..dynamicList = json['dynamicList'] as List<dynamic>
-      ..objectList =
-          (json['objectList'] as List<dynamic>).map((e) => e as Object).toList()
-      ..intList =
-          (json['intList'] as List<dynamic>).map((e) => e as int).toList()
+      ..objectList = (json['objectList'] as List<dynamic>)
+          .map((e) => e as Object)
+          .toList()
+      ..intList = (json['intList'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList()
       ..dateTimeList = (json['dateTimeList'] as List<dynamic>)
           .map((e) => DateTime.parse(e as String))
           .toList()
       ..nullableSimpleObjectList =
           (json['nullableSimpleObjectList'] as List<dynamic>)
-              .map((e) => e == null
-                  ? null
-                  : SimpleObject.fromJson(e as Map<String, dynamic>))
+              .map(
+                (e) => e == null
+                    ? null
+                    : SimpleObject.fromJson(e as Map<String, dynamic>),
+              )
               .toList()
       ..map = json['map'] as Map<String, dynamic>
-      ..stringStringMap =
-          Map<String, String>.from(json['stringStringMap'] as Map)
-      ..dynamicIntMap = Map<String, int>.from(json['dynamicIntMap'] as Map)
-      ..objectDateTimeMap =
-          (json['objectDateTimeMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, DateTime.parse(e as String)),
+      ..stringStringMap = Map<String, String>.from(
+        json['stringStringMap'] as Map,
       )
+      ..dynamicIntMap = Map<String, int>.from(json['dynamicIntMap'] as Map)
+      ..objectDateTimeMap = (json['objectDateTimeMap'] as Map<String, dynamic>)
+          .map((k, e) => MapEntry(k, DateTime.parse(e as String)))
       ..nullableSimpleObjectMap =
           (json['nullableSimpleObjectMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            k,
-            e == null
-                ? null
-                : SimpleObject.fromJson(e as Map<String, dynamic>)),
-      )
+            (k, e) => MapEntry(
+              k,
+              e == null
+                  ? null
+                  : SimpleObject.fromJson(e as Map<String, dynamic>),
+            ),
+          )
       ..crazyComplex = (json['crazyComplex'] as List<dynamic>)
-          .map((e) => (e as Map<String, dynamic>?)?.map(
-                (k, e) => MapEntry(
+          .map(
+            (e) => (e as Map<String, dynamic>?)?.map(
+              (k, e) => MapEntry(
+                k,
+                (e as Map<String, dynamic>?)?.map(
+                  (k, e) => MapEntry(
                     k,
-                    (e as Map<String, dynamic>?)?.map(
-                      (k, e) => MapEntry(
-                          k,
-                          (e as List<dynamic>?)
-                              ?.map((e) => (e as List<dynamic>?)
-                                  ?.map((e) => DateTime.parse(e as String))
-                                  .toList())
-                              .toList()),
-                    )),
-              ))
+                    (e as List<dynamic>?)
+                        ?.map(
+                          (e) => (e as List<dynamic>?)
+                              ?.map((e) => DateTime.parse(e as String))
+                              .toList(),
+                        )
+                        .toList(),
+                  ),
+                ),
+              ),
+            ),
+          )
           .toList()
       ..val = Map<String, bool>.from(json['val'] as Map)
       ..writeNotNull = json['writeNotNull'] as bool?
-      ..string = json[r'$string'] as String?
-      ..simpleObject =
-          SimpleObject.fromJson(json['simpleObject'] as Map<String, dynamic>)
+      ..string = KitchenSink._trickyValueAccessor(json, r'$string') as String?
+      ..simpleObject = SimpleObject.fromJson(
+        json['simpleObject'] as Map<String, dynamic>,
+      )
       ..strictKeysObject = StrictKeysObject.fromJson(
-          json['strictKeysObject'] as Map<String, dynamic>)
-      ..validatedPropertyNo42 = json['validatedPropertyNo42'] as int?;
+        json['strictKeysObject'] as Map<String, dynamic>,
+      )
+      ..validatedPropertyNo42 = (json['validatedPropertyNo42'] as num?)?.toInt()
+      ..recordField = _$recordConvertNullable(
+        json['recordField'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      );
 
-Map<String, dynamic> _$KitchenSinkToJson(KitchenSink instance) =>
-    <String, dynamic>{
-      'no-42': instance.ctorValidatedNo42,
-      'dateTime': instance.dateTime?.toIso8601String(),
-      'bigInt': instance.bigInt?.toString(),
-      'iterable': instance.iterable?.toList(),
-      'dynamicIterable': instance.dynamicIterable.toList(),
-      'objectIterable': instance.objectIterable.toList(),
-      'intIterable': instance.intIterable.toList(),
-      'set': instance.set.toList(),
-      'dynamicSet': instance.dynamicSet.toList(),
-      'objectSet': instance.objectSet.toList(),
-      'intSet': instance.intSet.toList(),
-      'dateTimeSet':
-          instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
-      'datetime-iterable':
-          instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(),
-      'list': instance.list,
-      'dynamicList': instance.dynamicList,
-      'objectList': instance.objectList,
-      'intList': instance.intList,
-      'dateTimeList':
-          instance.dateTimeList.map((e) => e.toIso8601String()).toList(),
-      'nullableSimpleObjectList':
-          instance.nullableSimpleObjectList.map((e) => e?.toJson()).toList(),
-      'map': instance.map,
-      'stringStringMap': instance.stringStringMap,
-      'dynamicIntMap': instance.dynamicIntMap,
-      'objectDateTimeMap': instance.objectDateTimeMap
-          .map((k, e) => MapEntry(k, e.toIso8601String())),
-      'nullableSimpleObjectMap': instance.nullableSimpleObjectMap
-          .map((k, e) => MapEntry(k, e?.toJson())),
-      'crazyComplex': instance.crazyComplex
-          .map((e) => e?.map((k, e) => MapEntry(
-              k,
-              e?.map((k, e) => MapEntry(
-                  k,
-                  e
-                      ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
-                      .toList())))))
-          .toList(),
-      'val': instance.val,
-      'writeNotNull': instance.writeNotNull,
-      r'$string': instance.string,
-      'simpleObject': instance.simpleObject.toJson(),
-      'strictKeysObject': instance.strictKeysObject.toJson(),
-      'validatedPropertyNo42': instance.validatedPropertyNo42,
-    };
+Map<String, dynamic> _$KitchenSinkToJson(
+  KitchenSink instance,
+) => <String, dynamic>{
+  'no-42': instance.ctorValidatedNo42,
+  'dateTime': instance.dateTime?.toIso8601String(),
+  'bigInt': instance.bigInt?.toString(),
+  'iterable': instance.iterable?.toList(),
+  'dynamicIterable': instance.dynamicIterable.toList(),
+  'objectIterable': instance.objectIterable.toList(),
+  'intIterable': instance.intIterable.toList(),
+  'set': instance.set.toList(),
+  'dynamicSet': instance.dynamicSet.toList(),
+  'objectSet': instance.objectSet.toList(),
+  'intSet': instance.intSet.toList(),
+  'dateTimeSet': instance.dateTimeSet.map((e) => e.toIso8601String()).toList(),
+  'datetime-iterable': instance.dateTimeIterable
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'list': instance.list,
+  'dynamicList': instance.dynamicList,
+  'objectList': instance.objectList,
+  'intList': instance.intList,
+  'dateTimeList': instance.dateTimeList
+      .map((e) => e.toIso8601String())
+      .toList(),
+  'nullableSimpleObjectList': instance.nullableSimpleObjectList
+      .map((e) => e?.toJson())
+      .toList(),
+  'map': instance.map,
+  'stringStringMap': instance.stringStringMap,
+  'dynamicIntMap': instance.dynamicIntMap,
+  'objectDateTimeMap': instance.objectDateTimeMap.map(
+    (k, e) => MapEntry(k, e.toIso8601String()),
+  ),
+  'nullableSimpleObjectMap': instance.nullableSimpleObjectMap.map(
+    (k, e) => MapEntry(k, e?.toJson()),
+  ),
+  'crazyComplex': instance.crazyComplex
+      .map(
+        (e) => e?.map(
+          (k, e) => MapEntry(
+            k,
+            e?.map(
+              (k, e) => MapEntry(
+                k,
+                e
+                    ?.map((e) => e?.map((e) => e.toIso8601String()).toList())
+                    .toList(),
+              ),
+            ),
+          ),
+        ),
+      )
+      .toList(),
+  'val': instance.val,
+  'writeNotNull': instance.writeNotNull,
+  r'$string': instance.string,
+  'simpleObject': instance.simpleObject.toJson(),
+  'strictKeysObject': instance.strictKeysObject.toJson(),
+  'validatedPropertyNo42': instance.validatedPropertyNo42,
+  'recordField': instance.recordField == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.recordField!.$1,
+          r'$2': instance.recordField!.$2,
+          'truth': instance.recordField!.truth,
+        },
+};
+
+$Rec? _$recordConvertNullable<$Rec>(
+  Object? value,
+  $Rec Function(Map) convert,
+) => value == null ? null : convert(value as Map<String, dynamic>);
 
 JsonConverterTestClass _$JsonConverterTestClassFromJson(
-        Map<String, dynamic> json) =>
-    JsonConverterTestClass(
-      durationConverter.fromJson(json['duration'] as int?),
-      (json['durationList'] as List<dynamic>)
-          .map((e) => durationConverter.fromJson(e as int?))
-          .toList(),
-      const BigIntStringConverter().fromJson(json['bigInt'] as String),
-      (json['bigIntMap'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(k, const BigIntStringConverter().fromJson(e as String)),
+  Map<String, dynamic> json,
+) => JsonConverterTestClass(
+  const DurationMillisecondConverter().fromJson(
+    (json['duration'] as num?)?.toInt(),
+  ),
+  (json['durationList'] as List<dynamic>)
+      .map(
+        (e) =>
+            const DurationMillisecondConverter().fromJson((e as num?)?.toInt()),
+      )
+      .toList(),
+  const BigIntStringConverter().fromJson(json['bigInt'] as String),
+  (json['bigIntMap'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().fromJson(e as String)),
+  ),
+  _$JsonConverterFromJson<String, BigInt>(
+    json['nullableBigInt'],
+    const BigIntStringConverter().fromJson,
+  ),
+  (json['nullableBigIntMap'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterFromJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().fromJson,
       ),
-      TrivialNumberConverter.instance.fromJson(json['numberSilly'] as int?),
-      (json['numberSillySet'] as List<dynamic>)
-          .map((e) => TrivialNumberConverter.instance.fromJson(e as int?))
-          .toSet(),
-      const EpochDateTimeConverter().fromJson(json['dateTime'] as int?),
-    );
+    ),
+  ),
+  TrivialNumberConverter.instance.fromJson(
+    (json['numberSilly'] as num?)?.toInt(),
+  ),
+  (json['numberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+  const EpochDateTimeConverter().fromJson((json['dateTime'] as num?)?.toInt()),
+  trivialStringConverter.fromJson(json['trivialString'] as String?),
+  TrivialNumberConverter.instance.fromJson(
+    (json['nullableNumberSilly'] as num?)?.toInt(),
+  ),
+  (json['nullableNumberSillySet'] as List<dynamic>)
+      .map(
+        (e) => TrivialNumberConverter.instance.fromJson((e as num?)?.toInt()),
+      )
+      .toSet(),
+);
 
 Map<String, dynamic> _$JsonConverterTestClassToJson(
-        JsonConverterTestClass instance) =>
-    <String, dynamic>{
-      'duration': durationConverter.toJson(instance.duration),
-      'durationList':
-          instance.durationList.map(durationConverter.toJson).toList(),
-      'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
-      'bigIntMap': instance.bigIntMap
-          .map((k, e) => MapEntry(k, const BigIntStringConverter().toJson(e))),
-      'numberSilly':
-          TrivialNumberConverter.instance.toJson(instance.numberSilly),
-      'numberSillySet': instance.numberSillySet
-          .map(TrivialNumberConverter.instance.toJson)
-          .toList(),
-      'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
-    };
+  JsonConverterTestClass instance,
+) => <String, dynamic>{
+  'duration': const DurationMillisecondConverter().toJson(instance.duration),
+  'durationList': instance.durationList
+      .map(const DurationMillisecondConverter().toJson)
+      .toList(),
+  'bigInt': const BigIntStringConverter().toJson(instance.bigInt),
+  'bigIntMap': instance.bigIntMap.map(
+    (k, e) => MapEntry(k, const BigIntStringConverter().toJson(e)),
+  ),
+  'nullableBigInt': _$JsonConverterToJson<String, BigInt>(
+    instance.nullableBigInt,
+    const BigIntStringConverter().toJson,
+  ),
+  'nullableBigIntMap': instance.nullableBigIntMap.map(
+    (k, e) => MapEntry(
+      k,
+      _$JsonConverterToJson<String, BigInt>(
+        e,
+        const BigIntStringConverter().toJson,
+      ),
+    ),
+  ),
+  'numberSilly': TrivialNumberConverter.instance.toJson(instance.numberSilly),
+  'numberSillySet': instance.numberSillySet
+      .map(TrivialNumberConverter.instance.toJson)
+      .toList(),
+  'dateTime': const EpochDateTimeConverter().toJson(instance.dateTime),
+  'trivialString': trivialStringConverter.toJson(instance.trivialString),
+  'nullableNumberSilly': _$JsonConverterToJson<int?, TrivialNumber>(
+    instance.nullableNumberSilly,
+    TrivialNumberConverter.instance.toJson,
+  ),
+  'nullableNumberSillySet': instance.nullableNumberSillySet
+      .map(
+        (e) => _$JsonConverterToJson<int?, TrivialNumber>(
+          e,
+          TrivialNumberConverter.instance.toJson,
+        ),
+      )
+      .toList(),
+};
+
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) => json == null ? null : fromJson(json as Json);
+
+Json? _$JsonConverterToJson<Json, Value>(
+  Value? value,
+  Json? Function(Value value) toJson,
+) => value == null ? null : toJson(value);
 
 JsonConverterGeneric<S, T, U> _$JsonConverterGenericFromJson<S, T, U>(
-        Map<String, dynamic> json) =>
-    JsonConverterGeneric<S, T, U>(
-      GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
-      (json['itemList'] as List<dynamic>)
-          .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
-          .toList(),
-      (json['itemMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            k, GenericConverter<U>().fromJson(e as Map<String, dynamic>)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => JsonConverterGeneric<S, T, U>(
+  GenericConverter<S>().fromJson(json['item'] as Map<String, dynamic>),
+  (json['itemList'] as List<dynamic>)
+      .map((e) => GenericConverter<T>().fromJson(e as Map<String, dynamic>))
+      .toList(),
+  (json['itemMap'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(k, GenericConverter<U>().fromJson(e as Map<String, dynamic>)),
+  ),
+);
 
 Map<String, dynamic> _$JsonConverterGenericToJson<S, T, U>(
-        JsonConverterGeneric<S, T, U> instance) =>
-    <String, dynamic>{
-      'item': GenericConverter<S>().toJson(instance.item),
-      'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
-      'itemMap': instance.itemMap
-          .map((k, e) => MapEntry(k, GenericConverter<U>().toJson(e))),
-    };
+  JsonConverterGeneric<S, T, U> instance,
+) => <String, dynamic>{
+  'item': GenericConverter<S>().toJson(instance.item),
+  'itemList': instance.itemList.map(GenericConverter<T>().toJson).toList(),
+  'itemMap': instance.itemMap.map(
+    (k, e) => MapEntry(k, GenericConverter<U>().toJson(e)),
+  ),
+};
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_interface.dart b/json_serializable/test/kitchen_sink/kitchen_sink_interface.dart
index ca4ad5b8f..e862c9708 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink_interface.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink_interface.dart
@@ -3,8 +3,12 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import '../test_utils.dart';
+import 'json_converters.dart';
 import 'simple_object.dart';
 
+/// A key name that requires special encoding
+const trickyKeyName = r'$string';
+
 abstract class KitchenSinkFactory<K, V> {
   String get description;
 
@@ -38,6 +42,8 @@ abstract class KitchenSinkFactory<K, V> {
 }
 
 abstract class JsonConverterTestClass {
+  TrivialNumber? nullableNumberSilly;
+
   Map<String, dynamic> toJson();
 }
 
@@ -114,9 +120,13 @@ abstract class KitchenSink {
 
   int? validatedPropertyNo42;
 
+  RecordSample? recordField;
+
   Map<String, dynamic> toJson();
 }
 
+typedef RecordSample = (int, String, {bool truth});
+
 // TODO: finish this...
 bool sinkEquals(KitchenSink a, Object other) =>
     other is KitchenSink &&
@@ -139,4 +149,5 @@ bool sinkEquals(KitchenSink a, Object other) =>
     deepEquals(a.crazyComplex, other.crazyComplex) &&
     // val
     a.writeNotNull == other.writeNotNull &&
-    a.string == other.string;
+    a.string == other.string &&
+    a.recordField == other.recordField;
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_test.dart b/json_serializable/test/kitchen_sink/kitchen_sink_test.dart
index c60d9bd08..e3c43efdd 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink_test.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink_test.dart
@@ -6,14 +6,18 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
+import 'json_converters.dart';
 import 'kitchen_sink.factories.dart';
 import 'kitchen_sink_interface.dart';
 import 'kitchen_sink_test_shared.dart';
 import 'strict_keys_object.dart';
 
-Matcher _isMissingKeyException(expectedMessage) =>
-    isA<MissingRequiredKeysException>()
-        .having((e) => e.message, 'message', expectedMessage);
+Matcher _isMissingKeyException(String expectedMessage) =>
+    isA<MissingRequiredKeysException>().having(
+      (e) => e.message,
+      'message',
+      expectedMessage,
+    );
 
 void main() {
   test('valid values covers all keys', () {
@@ -33,9 +37,13 @@ void main() {
 
   test('required keys', () {
     expect(
-        () => StrictKeysObject.fromJson({}),
-        throwsA(_isMissingKeyException(
-            'Required keys are missing: value, custom_field.')));
+      () => StrictKeysObject.fromJson({}),
+      throwsA(
+        _isMissingKeyException(
+          'Required keys are missing: value, custom_field.',
+        ),
+      ),
+    );
   });
 
   for (var factory in factories) {
@@ -54,10 +62,15 @@ const _jsonConverterValidValues = {
   'duration': 5,
   'durationList': [5],
   'bigInt': '5',
-  'bigIntMap': {'vaule': '5'},
+  'bigIntMap': {'value': '5'},
   'numberSilly': 5,
   'numberSillySet': [5],
-  'dateTime': 5
+  'dateTime': 5,
+  'trivialString': '',
+  'nullableNumberSilly': 5,
+  'nullableBigInt': '42',
+  'nullableBigIntMap': {'value': '42'},
+  'nullableNumberSillySet': [42],
 };
 
 void _nonNullableTests(KitchenSinkFactory factory) {
@@ -84,7 +97,7 @@ void _nonNullableTests(KitchenSinkFactory factory) {
 
 void _nullableTests(KitchenSinkFactory factory) {
   void roundTripSink(KitchenSink p) {
-    validateRoundTrip(p, factory.fromJson);
+    roundTripObject(p, factory.fromJson);
   }
 
   test('nullable values are allowed in the nullable version', () {
@@ -93,12 +106,17 @@ void _nullableTests(KitchenSinkFactory factory) {
 
     expect(json, const {
       'duration': 0,
-      'durationList': [],
+      'durationList': <dynamic>[],
       'bigInt': '0',
-      'bigIntMap': {},
+      'bigIntMap': <String, dynamic>{},
+      'nullableBigInt': '0',
+      'nullableBigIntMap': <String, dynamic>{},
       'numberSilly': 0,
-      'numberSillySet': [],
-      'dateTime': 0
+      'numberSillySet': <dynamic>[],
+      'dateTime': 0,
+      'trivialString': '',
+      'nullableNumberSilly': 0,
+      'nullableNumberSillySet': <dynamic>[],
     });
 
     expect(json.keys, unorderedEquals(_jsonConverterValidValues.keys));
@@ -152,19 +170,47 @@ void _nullableTests(KitchenSinkFactory factory) {
             'items': [
               null,
               [],
-              [DateTime.now()]
-            ]
-          }
-        }
+              [DateTime.now()],
+            ],
+          },
+        },
       ];
     roundTripSink(item);
   });
 }
 
 void _sharedTests(KitchenSinkFactory factory) {
+  test('other names', () {
+    final originalName = factory.fromJson(validValues);
+
+    final aliasName = factory.fromJson(
+      <String, dynamic>{
+          ...validValues,
+          'theIterable': validValues['iterable'],
+          'STRING': validValues[trickyKeyName],
+        }
+        ..remove('iterable')
+        ..remove(trickyKeyName),
+    );
+
+    expect(loudEncode(aliasName), loudEncode(originalName));
+  });
+
   test('empty', () {
     final item = factory.ctor();
-    validateRoundTrip(item, factory.fromJson);
+    roundTripObject(item, factory.fromJson);
+  });
+
+  test('JsonConverters with nullable JSON keys handle `null` JSON values', () {
+    final item = factory.jsonConverterFromJson({
+      ..._jsonConverterValidValues,
+      'nullableNumberSilly': null,
+    });
+
+    expect(
+      item.nullableNumberSilly,
+      isA<TrivialNumber>().having((e) => e.value, 'value', isNull),
+    );
   });
 
   test('list and map of DateTime - not null', () {
@@ -173,7 +219,7 @@ void _sharedTests(KitchenSinkFactory factory) {
       ..dateTimeList = <DateTime>[now, now]
       ..objectDateTimeMap = <Object, DateTime>{'value': now};
 
-    validateRoundTrip(item, factory.fromJson);
+    roundTripObject(item, factory.fromJson);
   });
 
   test('complex nested type - not null', () {
@@ -186,31 +232,33 @@ void _sharedTests(KitchenSinkFactory factory) {
             'empty': [],
             'items': [
               [],
-              [DateTime.now()]
-            ]
-          }
-        }
+              [DateTime.now()],
+            ],
+          },
+        },
       ];
-    validateRoundTrip(item, factory.fromJson);
+    roundTripObject(item, factory.fromJson);
   });
 
   test('round trip valid, empty values', () {
-    final values = Map.fromEntries(validValues.entries.map((e) {
-      var value = e.value;
-      if (_iterableMapKeys.contains(e.key)) {
-        if (value is List) {
-          value = [];
-        } else {
-          assert(value is Map);
-          value = <String, dynamic>{};
+    final values = Map.fromEntries(
+      validValues.entries.map((e) {
+        var value = e.value;
+        if (_iterableMapKeys.contains(e.key)) {
+          if (value is List) {
+            value = [];
+          } else {
+            assert(value is Map);
+            value = <String, dynamic>{};
+          }
         }
-      }
-      return MapEntry(e.key, value);
-    }));
+        return MapEntry(e.key, value);
+      }),
+    );
 
     final validInstance = factory.fromJson(values);
 
-    validateRoundTrip(validInstance, factory.fromJson);
+    roundTripObject(validInstance, factory.fromJson);
   });
 
   test('JSON keys should be defined in field/property order', () {
@@ -224,7 +272,7 @@ void _sharedTests(KitchenSinkFactory factory) {
 
   test('valid values round-trip - json', () {
     final validInstance = factory.fromJson(validValues);
-    validateRoundTrip(validInstance, factory.fromJson);
+    roundTripObject(validInstance, factory.fromJson);
   });
 }
 
@@ -252,10 +300,10 @@ const _nonNullableFields = {
   'crazyComplex',
   'val',
   'simpleObject',
-  'strictKeysObject'
+  'strictKeysObject',
 };
 
-const _encodedAsMapKeys = {'simpleObject', 'strictKeysObject'};
+const _encodedAsMapKeys = {'simpleObject', 'strictKeysObject', 'recordField'};
 
 const _iterableMapKeys = {
   'bigIntMap',
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_test_shared.dart b/json_serializable/test/kitchen_sink/kitchen_sink_test_shared.dart
index f39dcaed1..9ded8bccf 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink_test_shared.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink_test_shared.dart
@@ -1,6 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:test/test.dart';
 
+import 'kitchen_sink_interface.dart' show trickyKeyName;
+
 const validValues = <String, dynamic>{
   'no-42': 0,
   'dateTime': '2018-05-10T14:20:58.927',
@@ -22,7 +24,7 @@ const validValues = <String, dynamic>{
   'dateTimeList': ['2018-05-10T14:20:58.927'],
   'nullableSimpleObjectList': [
     {'value': 42},
-    null
+    null,
   ],
   'map': <String, dynamic>{'key': true},
   'stringStringMap': <String, dynamic>{'key': 'vaule'},
@@ -35,10 +37,11 @@ const validValues = <String, dynamic>{
   'crazyComplex': [<String, dynamic>{}],
   generatedLocalVarName: <String, dynamic>{'key': true},
   _toJsonMapHelperName: true,
-  r'$string': 'string',
+  trickyKeyName: 'string',
   'simpleObject': {'value': 42},
   'strictKeysObject': {'value': 10, 'custom_field': 'cool'},
-  'validatedPropertyNo42': 0
+  'validatedPropertyNo42': 0,
+  'recordField': {'\$1': 0, '\$2': 'string', 'truth': true},
 };
 
 const invalidValueTypes = {
@@ -69,13 +72,11 @@ const invalidValueTypes = {
   'crazyComplex': [true],
   generatedLocalVarName: {'key': 42},
   _toJsonMapHelperName: 42,
-  r'$string': true,
+  trickyKeyName: true,
   'simpleObject': 42,
-  'strictKeysObject': {
-    'value': 10,
-    'invalid_key': true,
-  },
-  'validatedPropertyNo42': true
+  'strictKeysObject': {'value': 10, 'invalid_key': true},
+  'validatedPropertyNo42': true,
+  'recordField': true,
 };
 
 const disallowNullKeys = {
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_yaml_test.dart b/json_serializable/test/kitchen_sink/kitchen_sink_yaml_test.dart
index f9a09b521..19c7fd3c4 100644
--- a/json_serializable/test/kitchen_sink/kitchen_sink_yaml_test.dart
+++ b/json_serializable/test/kitchen_sink/kitchen_sink_yaml_test.dart
@@ -35,22 +35,28 @@ void _anyMapTests(KitchenSinkFactory factory) {
   });
 }
 
-void _testBadValue(String key, Object? badValue, KitchenSinkFactory factory,
-    bool checkedAssignment) {
+void _testBadValue(
+  String key,
+  Object? badValue,
+  KitchenSinkFactory factory,
+  bool checkedAssignment,
+) {
   final matcher = _getMatcher(factory.checked, key, checkedAssignment);
 
   for (final isJson in [true, false]) {
-    test('`$key` fails with value `$badValue`- ${isJson ? 'json' : 'yaml'}',
-        () {
-      var copy = Map.from(validValues);
-      copy[key] = badValue;
+    test(
+      '`$key` fails with value `$badValue`- ${isJson ? 'json' : 'yaml'}',
+      () {
+        var copy = Map<dynamic, dynamic>.of(validValues);
+        copy[key] = badValue;
 
-      if (!isJson) {
-        copy = loadYaml(loudEncode(copy)) as YamlMap;
-      }
+        if (!isJson) {
+          copy = loadYaml(loudEncode(copy)) as YamlMap;
+        }
 
-      expect(() => factory.fromJson(copy), matcher);
-    });
+        expect(() => factory.fromJson(copy), matcher);
+      },
+    );
   }
 }
 
@@ -74,32 +80,26 @@ Matcher _getMatcher(bool checked, String? expectedKey, bool checkedAssignment) {
     );
 
     if (checkedAssignment) {
-      switch (expectedKey) {
-        case 'validatedPropertyNo42':
-          innerMatcher = isStateError;
-          break;
-        case 'no-42':
-          innerMatcher = isArgumentError;
-          break;
-        case 'strictKeysObject':
-          innerMatcher = _isAUnrecognizedKeysException('bob');
-          break;
-        case 'intIterable':
-        case 'datetime-iterable':
-          innerMatcher = isTypeError;
-          break;
-        default:
-          throw StateError('Not expected! - $expectedKey');
-      }
+      innerMatcher = switch (expectedKey) {
+        'validatedPropertyNo42' => isStateError,
+        'no-42' => isArgumentError,
+        'strictKeysObject' => _isAUnrecognizedKeysException('bob'),
+        'intIterable' => isTypeError,
+        'datetime-iterable' => isTypeError,
+        _ => throw StateError('Not expected! - $expectedKey'),
+      };
     }
   }
 
   return throwsA(innerMatcher);
 }
 
-Matcher _isAUnrecognizedKeysException(expectedMessage) =>
-    isA<UnrecognizedKeysException>()
-        .having((e) => e.message, 'message', expectedMessage);
+Matcher _isAUnrecognizedKeysException(String expectedMessage) =>
+    isA<UnrecognizedKeysException>().having(
+      (e) => e.message,
+      'message',
+      expectedMessage,
+    );
 
 /// Invalid values that are found after the property set or ctor call
 const _invalidCheckedValues = {
diff --git a/json_serializable/test/kitchen_sink/simple_object.g.dart b/json_serializable/test/kitchen_sink/simple_object.g.dart
index 30c82ebfe..ebb31411a 100644
--- a/json_serializable/test/kitchen_sink/simple_object.g.dart
+++ b/json_serializable/test/kitchen_sink/simple_object.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'simple_object.dart';
 
@@ -8,11 +8,8 @@ part of 'simple_object.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SimpleObject _$SimpleObjectFromJson(Map json) => SimpleObject(
-      json['value'] as int,
-    );
+SimpleObject _$SimpleObjectFromJson(Map json) =>
+    SimpleObject((json['value'] as num).toInt());
 
 Map<String, dynamic> _$SimpleObjectToJson(SimpleObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+    <String, dynamic>{'value': instance.value};
diff --git a/json_serializable/test/kitchen_sink/strict_keys_object.g.dart b/json_serializable/test/kitchen_sink/strict_keys_object.g.dart
index e112c1444..820d237ee 100644
--- a/json_serializable/test/kitchen_sink/strict_keys_object.g.dart
+++ b/json_serializable/test/kitchen_sink/strict_keys_object.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'strict_keys_object.dart';
 
@@ -15,7 +15,7 @@ StrictKeysObject _$StrictKeysObjectFromJson(Map json) {
     requiredKeys: const ['value', 'custom_field'],
   );
   return StrictKeysObject(
-    json['value'] as int,
+    (json['value'] as num).toInt(),
     json['custom_field'] as String,
   );
 }
diff --git a/json_serializable/test/literal/json_literal.g.dart b/json_serializable/test/literal/json_literal.g.dart
index 87f89f479..8449ee4c8 100644
--- a/json_serializable/test/literal/json_literal.g.dart
+++ b/json_serializable/test/literal/json_literal.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'json_literal.dart';
 
@@ -16,7 +16,7 @@ final _$dataJsonLiteral = [
     'vertical tab': '\v',
     'form feed': '\r',
     'carriage return': '\r',
-    'delete': '\x7F'
+    'delete': '\x7F',
   },
   'simple string',
   "'string with single quotes'",
@@ -47,8 +47,8 @@ final _$dataJsonLiteral = [
     'double': 42.0,
     'string': 'string',
     'list': [],
-    'bool': true
-  }
+    'bool': true,
+  },
 ];
 
 const _$asConstJsonLiteral = [
@@ -59,7 +59,7 @@ const _$asConstJsonLiteral = [
     'vertical tab': '\v',
     'form feed': '\r',
     'carriage return': '\r',
-    'delete': '\x7F'
+    'delete': '\x7F',
   },
   'simple string',
   "'string with single quotes'",
@@ -90,8 +90,8 @@ const _$asConstJsonLiteral = [
     'double': 42.0,
     'string': 'string',
     'list': [],
-    'bool': true
-  }
+    'bool': true,
+  },
 ];
 
 const _$naughtyStringsJsonLiteral = [
@@ -601,5 +601,5 @@ const _$naughtyStringsJsonLiteral = [
   'Roses are \x1B[0;31mred\x1B[0m, violets are \x1B[0;34mblue. Hope you enjoy terminal hue',
   'But now...\x1B[20Cfor my greatest trick...\x1B[8m',
   'The quic\b\b\b\b\b\bk brown fo\x07\x07\x07\x07\x07\x07\x07\x07\x07\x07\x07x... [Beeeep]',
-  'Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗'
+  'Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗',
 ];
diff --git a/json_serializable/test/literal/json_literal_test.dart b/json_serializable/test/literal/json_literal_test.dart
index d8d6c2643..afc2d18b8 100644
--- a/json_serializable/test/literal/json_literal_test.dart
+++ b/json_serializable/test/literal/json_literal_test.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library;
+
 import 'dart:convert';
 import 'dart:io';
 
@@ -27,8 +29,11 @@ void main() {
   });
 
   test('naughty strings', () {
-    final dataFilePath =
-        p.join('test', 'literal', 'big-list-of-naughty-strings.json');
+    final dataFilePath = p.join(
+      'test',
+      'literal',
+      'big-list-of-naughty-strings.json',
+    );
     final dataFile = File(dataFilePath);
 
     final dataString = loudEncode(json.decode(dataFile.readAsStringSync()));
diff --git a/json_serializable/test/shared_config.dart b/json_serializable/test/shared_config.dart
index 09311ad10..510250175 100644
--- a/json_serializable/test/shared_config.dart
+++ b/json_serializable/test/shared_config.dart
@@ -7,21 +7,26 @@ import 'package:json_serializable/src/type_helpers/config_types.dart';
 
 final jsonSerializableFields = generatorConfigDefaultJson.keys.toList();
 
-final generatorConfigDefaultJson =
-    Map<String, dynamic>.unmodifiable(ClassConfig.defaults.toJson());
+final generatorConfigDefaultJson = Map<String, dynamic>.unmodifiable(
+  ClassConfig.defaults.toJsonSerializable().toJson(),
+);
 
 // #CHANGE WHEN UPDATING json_annotation
-final generatorConfigNonDefaultJson =
-    Map<String, dynamic>.unmodifiable(const JsonSerializable(
-  anyMap: true,
-  checked: true,
-  constructor: 'something',
-  createFactory: false,
-  createToJson: false,
-  disallowUnrecognizedKeys: true,
-  explicitToJson: true,
-  fieldRename: FieldRename.kebab,
-  ignoreUnannotated: true,
-  includeIfNull: false,
-  genericArgumentFactories: true,
-).toJson());
+final generatorConfigNonDefaultJson = Map<String, dynamic>.unmodifiable(
+  const JsonSerializable(
+    anyMap: true,
+    checked: true,
+    constructor: 'something',
+    createFactory: false,
+    createToJson: false,
+    createFieldMap: true,
+    createJsonKeys: true,
+    createPerFieldToJson: true,
+    disallowUnrecognizedKeys: true,
+    explicitToJson: true,
+    fieldRename: FieldRename.kebab,
+    ignoreUnannotated: true,
+    includeIfNull: false,
+    genericArgumentFactories: true,
+  ).toJson(),
+);
diff --git a/json_serializable/test/src/_json_enum_test_input.dart b/json_serializable/test/src/_json_enum_test_input.dart
index bf3f96050..594229f7b 100644
--- a/json_serializable/test/src/_json_enum_test_input.dart
+++ b/json_serializable/test/src/_json_enum_test_input.dart
@@ -5,6 +5,67 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:source_gen_test/annotations.dart';
 
+@ShouldGenerate(r'''
+const _$EnumValueIssue1147EnumMap = {
+  EnumValueIssue1147.success: 200,
+  EnumValueIssue1147.weird: 601,
+};
+''')
+@JsonEnum(alwaysCreate: true, valueField: 'statusCodeNumber')
+enum EnumValueIssue1147 {
+  success(200),
+  @JsonValue(601)
+  weird(701);
+
+  const EnumValueIssue1147(this.statusCodeNumber);
+
+  final int statusCodeNumber;
+}
+
+@ShouldThrow(
+  '`JsonEnum.valueField` was set to "notAField", but that is not a valid, '
+  'instance field on `EnumValueNotAField`.',
+)
+@JsonEnum(alwaysCreate: true, valueField: 'notAField')
+enum EnumValueNotAField {
+  success(200),
+  @JsonValue(601)
+  weird(701);
+
+  const EnumValueNotAField(this.statusCodeNumber);
+
+  final int statusCodeNumber;
+}
+
+@ShouldThrow(
+  '`JsonEnum.valueField` was set to "symbolWeird", but that field does not '
+  'have a type of String, int, or null.',
+)
+@JsonEnum(alwaysCreate: true, valueField: 'symbolWeird')
+enum EnumValueNotSupportType {
+  success(#success),
+  @JsonValue(601)
+  weird(#weird);
+
+  const EnumValueNotSupportType(this.symbolWeird);
+
+  final Symbol symbolWeird;
+}
+
+@ShouldThrow(
+  '`JsonEnum.valueField` was set to "values", but that is not a valid, '
+  'instance field on `EnumValueWeirdField`.',
+)
+@JsonEnum(alwaysCreate: true, valueField: 'values')
+enum EnumValueWeirdField {
+  success(200),
+  weird(701);
+
+  const EnumValueWeirdField(this.something);
+
+  final int something;
+}
+
 @ShouldThrow('`@JsonEnum` can only be used on enum elements.')
 @JsonEnum() // ignore: invalid_annotation_target
 class UnsupportedClass {}
diff --git a/json_serializable/test/src/_json_serializable_test_input.dart b/json_serializable/test/src/_json_serializable_test_input.dart
index 72ab3c447..09deed525 100644
--- a/json_serializable/test/src/_json_serializable_test_input.dart
+++ b/json_serializable/test/src/_json_serializable_test_input.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=3.8
+
 import 'dart:collection';
 
 import 'package:json_annotation/json_annotation.dart';
@@ -26,21 +28,19 @@ const theAnswer = 42;
 
 @ShouldThrow('`@JsonSerializable` can only be used on classes.')
 @JsonSerializable() // ignore: invalid_annotation_target
-enum unsupportedEnum { not, valid }
+enum UnsupportedEnum { not, valid }
 
 @ShouldThrow('`@JsonSerializable` can only be used on classes.')
 @JsonSerializable() // ignore: invalid_annotation_target
 Object annotatedMethod() => throw UnimplementedError();
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 OnlyStaticMembers _$OnlyStaticMembersFromJson(Map<String, dynamic> json) =>
     OnlyStaticMembers();
 
 Map<String, dynamic> _$OnlyStaticMembersToJson(OnlyStaticMembers instance) =>
     <String, dynamic>{};
-''',
-)
+''')
 @JsonSerializable()
 class OnlyStaticMembers {
   // To ensure static members are not considered for serialization.
@@ -55,12 +55,13 @@ GeneralTestClass1 _$GeneralTestClass1FromJson(Map<String, dynamic> json) =>
     GeneralTestClass1()
       ..firstName = json['firstName'] as String
       ..lastName = json['lastName'] as String
-      ..height = json['h'] as int
+      ..height = (json['h'] as num).toInt()
       ..dateOfBirth = DateTime.parse(json['dateOfBirth'] as String)
       ..dynamicType = json['dynamicType']
       ..varType = json['varType']
-      ..listOfInts =
-          (json['listOfInts'] as List<dynamic>).map((e) => e as int).toList();
+      ..listOfInts = (json['listOfInts'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList();
 
 Map<String, dynamic> _$GeneralTestClass1ToJson(GeneralTestClass1 instance) =>
     <String, dynamic>{
@@ -81,7 +82,7 @@ class GeneralTestClass1 {
   late DateTime dateOfBirth;
   dynamic dynamicType;
 
-  //ignore: prefer_typing_uninitialized_variables,type_annotate_public_apis
+  //ignore: prefer_typing_uninitialized_variables,type_annotate_public_apis,inference_failure_on_uninitialized_variable, strict_top_level_inference
   var varType;
   late List<int> listOfInts;
 }
@@ -89,7 +90,7 @@ class GeneralTestClass1 {
 @ShouldGenerate(r'''
 GeneralTestClass2 _$GeneralTestClass2FromJson(Map<String, dynamic> json) =>
     GeneralTestClass2(
-      json['height'] as int,
+      (json['height'] as num).toInt(),
       json['firstName'] as String,
       json['lastName'] as String?,
     )..dateOfBirth = DateTime.parse(json['dateOfBirth'] as String);
@@ -110,20 +111,16 @@ class GeneralTestClass2 {
   late DateTime dateOfBirth;
 
   GeneralTestClass2(this.height, String firstName, [this.lastName])
-      :
-        // ignore: prefer_initializing_formals
-        firstName = firstName;
+    // ignore: prefer_initializing_formals
+    : firstName = firstName;
 }
 
 @ShouldGenerate(r'''
-FinalFields _$FinalFieldsFromJson(Map<String, dynamic> json) => FinalFields(
-      json['a'] as int,
-    );
+FinalFields _$FinalFieldsFromJson(Map<String, dynamic> json) =>
+    FinalFields((json['a'] as num).toInt());
 
 Map<String, dynamic> _$FinalFieldsToJson(FinalFields instance) =>
-    <String, dynamic>{
-      'a': instance.a,
-    };
+    <String, dynamic>{'a': instance.a};
 ''')
 @JsonSerializable()
 class FinalFields {
@@ -134,17 +131,15 @@ class FinalFields {
   FinalFields(this.a);
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 FinalFieldsNotSetInCtor _$FinalFieldsNotSetInCtorFromJson(
-        Map<String, dynamic> json) =>
-    FinalFieldsNotSetInCtor();
+  Map<String, dynamic> json,
+) => FinalFieldsNotSetInCtor();
 
 Map<String, dynamic> _$FinalFieldsNotSetInCtorToJson(
-        FinalFieldsNotSetInCtor instance) =>
-    <String, dynamic>{};
-''',
-)
+  FinalFieldsNotSetInCtor instance,
+) => <String, dynamic>{};
+''')
 @JsonSerializable()
 class FinalFieldsNotSetInCtor {
   final int a = 1;
@@ -154,13 +149,11 @@ class FinalFieldsNotSetInCtor {
 
 @ShouldGenerate(r'''
 SetSupport _$SetSupportFromJson(Map<String, dynamic> json) => SetSupport(
-      (json['values'] as List<dynamic>).map((e) => e as int).toSet(),
-    );
+  (json['values'] as List<dynamic>).map((e) => (e as num).toInt()).toSet(),
+);
 
 Map<String, dynamic> _$SetSupportToJson(SetSupport instance) =>
-    <String, dynamic>{
-      'values': instance.values.toList(),
-    };
+    <String, dynamic>{'values': instance.values.toList()};
 ''')
 @JsonSerializable()
 class SetSupport {
@@ -169,67 +162,45 @@ class SetSupport {
   SetSupport(this.values);
 }
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `toJson` code for `watch`.
 To support the type `Stopwatch` you can:
-$converterOrKeyInstructions''',
-)
+$converterOrKeyInstructions''')
 @JsonSerializable(createFactory: false)
 class NoSerializeFieldType {
   Stopwatch? watch;
 }
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `watch`.
 To support the type `Stopwatch` you can:
-$converterOrKeyInstructions''',
-)
+$converterOrKeyInstructions''')
 @JsonSerializable(createToJson: false)
 class NoDeserializeFieldType {
   Stopwatch? watch;
 }
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `toJson` code for `durationDateTimeMap` because of type `Duration`.
-Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''',
-)
+Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''')
 @JsonSerializable(createFactory: false)
 class NoSerializeBadKey {
   late Map<Duration, DateTime> durationDateTimeMap;
 }
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `durationDateTimeMap` because of type `Duration`.
-Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''',
-)
+Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''')
 @JsonSerializable(createToJson: false)
 class NoDeserializeBadKey {
   late Map<Duration, DateTime> durationDateTimeMap;
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 Map<String, dynamic> _$IncludeIfNullOverrideToJson(
-    IncludeIfNullOverride instance) {
-  final val = <String, dynamic>{
-    'number': instance.number,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('str', instance.str);
-  return val;
-}
-''',
-)
+  IncludeIfNullOverride instance,
+) => <String, dynamic>{'number': instance.number, 'str': ?instance.str};
+''')
 @JsonSerializable(createFactory: false, includeIfNull: false)
 class IncludeIfNullOverride {
   @JsonKey(includeIfNull: true)
@@ -238,9 +209,7 @@ class IncludeIfNullOverride {
 }
 
 // https://github.com/google/json_serializable.dart/issues/7 regression
-@ShouldThrow(
-  'The class `NoCtorClass` has no default constructor.',
-)
+@ShouldThrow('The class `NoCtorClass` has no default constructor.')
 @JsonSerializable()
 class NoCtorClass {
   late final int member;
@@ -294,9 +263,11 @@ Map<String, dynamic> _$IgnoredFieldClassToJson(IgnoredFieldClass instance) =>
 ''')
 @JsonSerializable(createFactory: false)
 class IgnoredFieldClass {
+  // ignore: deprecated_member_use
   @JsonKey(ignore: true)
   late int ignoredTrueField;
 
+  // ignore: deprecated_member_use
   @JsonKey(ignore: false)
   late int ignoredFalseField;
 
@@ -304,22 +275,46 @@ class IgnoredFieldClass {
 }
 
 @ShouldThrow(
-  'Cannot populate the required constructor argument: '
-  'ignoredTrueField. It is assigned to an ignored field.',
-  element: '',
+  'Cannot populate the required constructor argument: ignoredTrueField. It is '
+  'assigned to a field not meant to be used in fromJson.',
+  element: 'new',
 )
 @JsonSerializable()
 class IgnoredFieldCtorClass {
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   int ignoredTrueField;
 
   IgnoredFieldCtorClass(this.ignoredTrueField);
 }
 
+@ShouldThrow(
+  'Error with `@JsonKey` on the `ignoredTrueField` field. '
+  'Cannot use both `ignore` and `includeToJson` on the same field. '
+  'Since `ignore` is deprecated, you should only use `includeToJson`.',
+)
+@JsonSerializable()
+class IgnoreAndIncludeToJsonFieldCtorClass {
+  // ignore: deprecated_member_use
+  @JsonKey(ignore: true, includeToJson: true)
+  int? ignoredTrueField;
+}
+
+@ShouldThrow(
+  'Error with `@JsonKey` on the `ignoredTrueField` field. '
+  'Cannot use both `ignore` and `includeFromJson` on the same field. '
+  'Since `ignore` is deprecated, you should only use `includeFromJson`.',
+)
+@JsonSerializable()
+class IgnoreAndIncludeFromJsonFieldCtorClass {
+  // ignore: deprecated_member_use
+  @JsonKey(ignore: true, includeFromJson: true)
+  int? ignoredTrueField;
+}
+
 @ShouldThrow(
   'Cannot populate the required constructor argument: '
   '_privateField. It is assigned to a private field.',
-  element: '',
+  element: 'new',
 )
 @JsonSerializable()
 class PrivateFieldCtorClass {
@@ -353,7 +348,7 @@ class JsonValueWithBool {
 
 enum BadEnum {
   @JsonValue(true)
-  value
+  value,
 }
 
 @ShouldGenerate(r'''const _$GoodEnumEnumMap = {
@@ -378,19 +373,20 @@ enum GoodEnum {
   @JsonValue(42)
   intValue,
   @JsonValue(null)
-  nullValue
+  nullValue,
 }
 
 @ShouldGenerate(r'''
 FieldWithFromJsonCtorAndTypeParams _$FieldWithFromJsonCtorAndTypeParamsFromJson(
-        Map<String, dynamic> json) =>
-    FieldWithFromJsonCtorAndTypeParams()
-      ..customOrders = json['customOrders'] == null
-          ? null
-          : MyList<GeneralTestClass2, int>.fromJson((json['customOrders']
-                  as List<dynamic>)
+  Map<String, dynamic> json,
+) => FieldWithFromJsonCtorAndTypeParams()
+  ..customOrders = json['customOrders'] == null
+      ? null
+      : MyList<GeneralTestClass2, int>.fromJson(
+          (json['customOrders'] as List<dynamic>)
               .map((e) => GeneralTestClass2.fromJson(e as Map<String, dynamic>))
-              .toList());
+              .toList(),
+        );
 ''')
 @JsonSerializable(createToJson: false)
 class FieldWithFromJsonCtorAndTypeParams {
@@ -427,17 +423,17 @@ mixin _PropInMixinI448RegressionMixin {
 
 @ShouldGenerate(r'''
 PropInMixinI448Regression _$PropInMixinI448RegressionFromJson(
-        Map<String, dynamic> json) =>
-    PropInMixinI448Regression()
-      ..nullable = json['nullable'] as int
-      ..notNullable = json['notNullable'] as int;
+  Map<String, dynamic> json,
+) => PropInMixinI448Regression()
+  ..nullable = (json['nullable'] as num).toInt()
+  ..notNullable = (json['notNullable'] as num).toInt();
 
 Map<String, dynamic> _$PropInMixinI448RegressionToJson(
-        PropInMixinI448Regression instance) =>
-    <String, dynamic>{
-      'nullable': instance.nullable,
-      'notNullable': instance.notNullable,
-    };
+  PropInMixinI448Regression instance,
+) => <String, dynamic>{
+  'nullable': instance.nullable,
+  'notNullable': instance.notNullable,
+};
 ''')
 @JsonSerializable()
 class PropInMixinI448Regression with _PropInMixinI448RegressionMixin {
@@ -445,17 +441,13 @@ class PropInMixinI448Regression with _PropInMixinI448RegressionMixin {
   late int notNullable;
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 IgnoreUnannotated _$IgnoreUnannotatedFromJson(Map<String, dynamic> json) =>
-    IgnoreUnannotated()..annotated = json['annotated'] as int;
+    IgnoreUnannotated()..annotated = (json['annotated'] as num).toInt();
 
 Map<String, dynamic> _$IgnoreUnannotatedToJson(IgnoreUnannotated instance) =>
-    <String, dynamic>{
-      'annotated': instance.annotated,
-    };
-''',
-)
+    <String, dynamic>{'annotated': instance.annotated};
+''')
 @JsonSerializable(ignoreUnannotated: true)
 class IgnoreUnannotated {
   @JsonKey()
@@ -464,17 +456,13 @@ class IgnoreUnannotated {
   late int unannotated;
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 SubclassedJsonKey _$SubclassedJsonKeyFromJson(Map<String, dynamic> json) =>
-    SubclassedJsonKey()..annotatedWithSubclass = json['bob'] as int;
+    SubclassedJsonKey()..annotatedWithSubclass = (json['bob'] as num).toInt();
 
 Map<String, dynamic> _$SubclassedJsonKeyToJson(SubclassedJsonKey instance) =>
-    <String, dynamic>{
-      'bob': instance.annotatedWithSubclass,
-    };
-''',
-)
+    <String, dynamic>{'bob': instance.annotatedWithSubclass};
+''')
 @JsonSerializable(ignoreUnannotated: true)
 class SubclassedJsonKey {
   @MyJsonKey()
@@ -485,19 +473,15 @@ class MyJsonKey extends JsonKey {
   const MyJsonKey() : super(name: 'bob');
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 OverrideGetterExampleI613 _$OverrideGetterExampleI613FromJson(
-        Map<String, dynamic> json) =>
-    OverrideGetterExampleI613()..id = json['id'] as String;
+  Map<String, dynamic> json,
+) => OverrideGetterExampleI613()..id = json['id'] as String;
 
 Map<String, dynamic> _$OverrideGetterExampleI613ToJson(
-        OverrideGetterExampleI613 instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-    };
-''',
-)
+  OverrideGetterExampleI613 instance,
+) => <String, dynamic>{'id': instance.id};
+''')
 @JsonSerializable()
 class OverrideGetterExampleI613 extends OverrideGetterExampleI613Super {
   @override
@@ -561,3 +545,44 @@ class ExtraParamToJson {
 
   Map<String, dynamic> toJson(int bob) => throw UnimplementedError();
 }
+
+@ShouldGenerate(r'''
+Map<String, dynamic> _$Issue1038RegressionTestToJson(
+  Issue1038RegressionTest instance,
+) => <String, dynamic>{'id': instance.id, 'ean': instance.ean};
+''')
+@JsonSerializable(createFactory: false)
+class Issue1038RegressionTest {
+  final String? id;
+  final String? ean;
+
+  Issue1038RegressionTest.id(this.id) : ean = null;
+
+  Issue1038RegressionTest.ean(this.ean) : id = null;
+}
+
+@ShouldGenerate(r'''
+TearOffFromJsonClass _$TearOffFromJsonClassFromJson(
+  Map<String, dynamic> json,
+) => TearOffFromJsonClass(
+  TearOffValueClass(json['value'] as String),
+  TearOffValueClass.fromJson(json['factoryValue'] as String),
+);
+''')
+@JsonSerializable(createToJson: false)
+class TearOffFromJsonClass {
+  TearOffFromJsonClass(this.value, this.factoryValue);
+
+  @JsonKey(fromJson: TearOffValueClass.new)
+  final TearOffValueClass value;
+  @JsonKey(fromJson: TearOffValueClass.fromJson)
+  final TearOffValueClass factoryValue;
+}
+
+class TearOffValueClass {
+  const TearOffValueClass(this.value);
+
+  factory TearOffValueClass.fromJson(String value) => TearOffValueClass(value);
+
+  final String value;
+}
diff --git a/json_serializable/test/src/checked_test_input.dart b/json_serializable/test/src/checked_test_input.dart
index bfbc62457..f37360139 100644
--- a/json_serializable/test/src/checked_test_input.dart
+++ b/json_serializable/test/src/checked_test_input.dart
@@ -1,25 +1,25 @@
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldGenerate(r'''
 WithANonCtorGetterChecked _$WithANonCtorGetterCheckedFromJson(
-        Map<String, dynamic> json) =>
-    $checkedCreate(
-      'WithANonCtorGetterChecked',
-      json,
-      ($checkedConvert) {
-        $checkKeys(
-          json,
-          allowedKeys: const ['items'],
-          requiredKeys: const ['items'],
-          disallowNullValues: const ['items'],
-        );
-        final val = WithANonCtorGetterChecked(
-          $checkedConvert('items',
-              (v) => (v as List<dynamic>).map((e) => e as String).toList()),
-        );
-        return val;
-      },
-    );
+  Map<String, dynamic> json,
+) => $checkedCreate('WithANonCtorGetterChecked', json, ($checkedConvert) {
+  $checkKeys(
+    json,
+    allowedKeys: const ['items'],
+    requiredKeys: const ['items'],
+    disallowNullValues: const ['items'],
+  );
+  final val = WithANonCtorGetterChecked(
+    $checkedConvert(
+      'items',
+      (v) => (v as List<dynamic>).map((e) => e as String).toList(),
+    ),
+  );
+  return val;
+});
 ''')
 @JsonSerializable(
   disallowUnrecognizedKeys: true,
diff --git a/json_serializable/test/src/constants_copy.dart b/json_serializable/test/src/constants_copy.dart
index a4b0f1086..3229cbaba 100644
--- a/json_serializable/test/src/constants_copy.dart
+++ b/json_serializable/test/src/constants_copy.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 // TODO: remove this and return link to lib/src/constants.dart once this
diff --git a/json_serializable/test/src/core_subclass_type_input.dart b/json_serializable/test/src/core_subclass_type_input.dart
index 02b889a2c..1d45aca3d 100644
--- a/json_serializable/test/src/core_subclass_type_input.dart
+++ b/json_serializable/test/src/core_subclass_type_input.dart
@@ -1,81 +1,65 @@
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `mapView`.
 To support the type `MapView` you can:
-$converterOrKeyInstructions''',
-  element: 'mapView',
-)
+$converterOrKeyInstructions''', element: 'mapView')
 @JsonSerializable(createToJson: false)
 class UnsupportedMapField {
   late MapView mapView;
 }
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `listView`.
 To support the type `UnmodifiableListView` you can:
-$converterOrKeyInstructions''',
-  element: 'listView',
-)
+$converterOrKeyInstructions''', element: 'listView')
 @JsonSerializable(createToJson: false)
 class UnsupportedListField {
   late UnmodifiableListView listView;
 }
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `customSet`.
-To support the type `_CustomSet` you can:
-$converterOrKeyInstructions''',
-  element: 'customSet',
-)
+To support the type `CustomSet` you can:
+$converterOrKeyInstructions''', element: 'customSet')
 @JsonSerializable(createToJson: false)
 class UnsupportedSetField {
-  late _CustomSet customSet;
+  late CustomSet customSet;
 }
 
-abstract class _CustomSet implements Set {}
+abstract class CustomSet implements Set {}
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `customDuration`.
-To support the type `_CustomDuration` you can:
-$converterOrKeyInstructions''',
-  element: 'customDuration',
-)
+To support the type `CustomDuration` you can:
+$converterOrKeyInstructions''', element: 'customDuration')
 @JsonSerializable(createToJson: false)
 class UnsupportedDurationField {
-  late _CustomDuration customDuration;
+  late CustomDuration customDuration;
 }
 
-abstract class _CustomDuration implements Duration {}
+abstract class CustomDuration implements Duration {}
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `customUri`.
-To support the type `_CustomUri` you can:
-$converterOrKeyInstructions''',
-  element: 'customUri',
-)
+To support the type `CustomUri` you can:
+$converterOrKeyInstructions''', element: 'customUri')
 @JsonSerializable(createToJson: false)
 class UnsupportedUriField {
-  _CustomUri? customUri;
+  CustomUri? customUri;
 }
 
-abstract class _CustomUri implements Uri {}
+abstract class CustomUri implements Uri {}
 
-@ShouldThrow(
-  '''
+@ShouldThrow('''
 Could not generate `fromJson` code for `customDateTime`.
-To support the type `_CustomDateTime` you can:
-$converterOrKeyInstructions''',
-  element: 'customDateTime',
-)
+To support the type `CustomDateTime` you can:
+$converterOrKeyInstructions''', element: 'customDateTime')
 @JsonSerializable(createToJson: false)
 class UnsupportedDateTimeField {
-  late _CustomDateTime customDateTime;
+  late CustomDateTime customDateTime;
 }
 
-abstract class _CustomDateTime implements DateTime {}
+abstract class CustomDateTime implements DateTime {}
diff --git a/json_serializable/test/src/default_value_input.dart b/json_serializable/test/src/default_value_input.dart
index 7eb0ff7da..aa9ac4f0b 100644
--- a/json_serializable/test/src/default_value_input.dart
+++ b/json_serializable/test/src/default_value_input.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldThrow(
@@ -19,17 +21,33 @@ class DefaultWithSymbol {
 
 int _function() => 42;
 
+@ShouldGenerate(r'''
+DefaultWithFunction _$DefaultWithFunctionFromJson(Map<String, dynamic> json) =>
+    DefaultWithFunction()..field = json['field'] ?? _function();
+
+Map<String, dynamic> _$DefaultWithFunctionToJson(
+  DefaultWithFunction instance,
+) => <String, dynamic>{'field': instance.field};
+''')
+@JsonSerializable()
+class DefaultWithFunction {
+  @JsonKey(defaultValue: _function)
+  Object? field;
+
+  DefaultWithFunction();
+}
+
 @ShouldThrow(
   'Error with `@JsonKey` on the `field` field. '
-  '`defaultValue` is `Function`, it must be a literal.',
+  '`defaultValue` is `List > Function`, it must be a literal.',
   element: 'field',
 )
 @JsonSerializable()
-class DefaultWithFunction {
-  @JsonKey(defaultValue: _function)
+class DefaultWithFunctionInList {
+  @JsonKey(defaultValue: [_function])
   Object? field;
 
-  DefaultWithFunction();
+  DefaultWithFunctionInList();
 }
 
 @ShouldThrow(
@@ -86,17 +104,16 @@ class BadEnumDefaultValue {
   BadEnumDefaultValue();
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 DefaultWithToJsonClass _$DefaultWithToJsonClassFromJson(
-        Map<String, dynamic> json) =>
-    DefaultWithToJsonClass()
-      ..fieldDefaultValueToJson = json['fieldDefaultValueToJson'] == null
-          ? 7
-          : DefaultWithToJsonClass._fromJson(
-              json['fieldDefaultValueToJson'] as String);
-''',
-)
+  Map<String, dynamic> json,
+) => DefaultWithToJsonClass()
+  ..fieldDefaultValueToJson = json['fieldDefaultValueToJson'] == null
+      ? 7
+      : DefaultWithToJsonClass._fromJson(
+          json['fieldDefaultValueToJson'] as String,
+        );
+''')
 @JsonSerializable(createToJson: false)
 class DefaultWithToJsonClass {
   @JsonKey(defaultValue: 7, fromJson: _fromJson)
@@ -110,14 +127,14 @@ class DefaultWithToJsonClass {
 @ShouldGenerate(
   r'''
 DefaultWithDisallowNullRequiredClass
-    _$DefaultWithDisallowNullRequiredClassFromJson(Map<String, dynamic> json) {
+_$DefaultWithDisallowNullRequiredClassFromJson(Map<String, dynamic> json) {
   $checkKeys(
     json,
     requiredKeys: const ['theField'],
     disallowNullValues: const ['theField'],
   );
   return DefaultWithDisallowNullRequiredClass()
-    ..theField = json['theField'] as int? ?? 7;
+    ..theField = (json['theField'] as num?)?.toInt() ?? 7;
 }
 ''',
   expectedLogItems: [
@@ -136,11 +153,10 @@ class DefaultWithDisallowNullRequiredClass {
 @ShouldGenerate(
   r'''
 CtorDefaultValueAndJsonKeyDefaultValue
-    _$CtorDefaultValueAndJsonKeyDefaultValueFromJson(
-            Map<String, dynamic> json) =>
-        CtorDefaultValueAndJsonKeyDefaultValue(
-          json['theField'] as int? ?? 7,
-        );
+_$CtorDefaultValueAndJsonKeyDefaultValueFromJson(Map<String, dynamic> json) =>
+    CtorDefaultValueAndJsonKeyDefaultValue(
+      (json['theField'] as num?)?.toInt() ?? 7,
+    );
 ''',
   expectedLogItems: [
     'The constructor parameter for `theField` has a default value `6`, but the '
@@ -156,20 +172,39 @@ class CtorDefaultValueAndJsonKeyDefaultValue {
   CtorDefaultValueAndJsonKeyDefaultValue([this.theField = 6]);
 }
 
+@ShouldGenerate(
+  r'''
+SameCtorAndJsonKeyDefaultValue _$SameCtorAndJsonKeyDefaultValueFromJson(
+  Map<String, dynamic> json,
+) => SameCtorAndJsonKeyDefaultValue((json['theField'] as num?)?.toInt() ?? 3);
+''',
+  expectedLogItems: [
+    'The default value `3` for `theField` is defined twice '
+        'in the constructor and in the `JsonKey.defaultValue`.',
+  ],
+)
+@JsonSerializable(createToJson: false)
+class SameCtorAndJsonKeyDefaultValue {
+  @JsonKey(defaultValue: 3)
+  final int theField;
+
+  SameCtorAndJsonKeyDefaultValue([this.theField = 3]);
+}
+
 @ShouldGenerate(r'''
 DefaultDoubleConstants _$DefaultDoubleConstantsFromJson(
-        Map<String, dynamic> json) =>
-    DefaultDoubleConstants()
-      ..defaultNan = (json['defaultNan'] as num?)?.toDouble() ?? double.nan
-      ..defaultNegativeInfinity =
-          (json['defaultNegativeInfinity'] as num?)?.toDouble() ??
-              double.negativeInfinity
-      ..defaultInfinity =
-          (json['defaultInfinity'] as num?)?.toDouble() ?? double.infinity
-      ..defaultMinPositive =
-          (json['defaultMinPositive'] as num?)?.toDouble() ?? 5e-324
-      ..defaultMaxFinite = (json['defaultMaxFinite'] as num?)?.toDouble() ??
-          1.7976931348623157e+308;
+  Map<String, dynamic> json,
+) => DefaultDoubleConstants()
+  ..defaultNan = (json['defaultNan'] as num?)?.toDouble() ?? double.nan
+  ..defaultNegativeInfinity =
+      (json['defaultNegativeInfinity'] as num?)?.toDouble() ??
+      double.negativeInfinity
+  ..defaultInfinity =
+      (json['defaultInfinity'] as num?)?.toDouble() ?? double.infinity
+  ..defaultMinPositive =
+      (json['defaultMinPositive'] as num?)?.toDouble() ?? 5e-324
+  ..defaultMaxFinite =
+      (json['defaultMaxFinite'] as num?)?.toDouble() ?? 1.7976931348623157e+308;
 ''')
 @JsonSerializable(createToJson: false)
 class DefaultDoubleConstants {
diff --git a/json_serializable/test/src/field_namer_input.dart b/json_serializable/test/src/field_namer_input.dart
index 5f8bc6011..6541857e5 100644
--- a/json_serializable/test/src/field_namer_input.dart
+++ b/json_serializable/test/src/field_namer_input.dart
@@ -1,3 +1,5 @@
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldGenerate(r'''
@@ -59,3 +61,19 @@ class FieldNamerSnake {
   @JsonKey(name: 'NAME_OVERRIDE')
   late String nameOverride;
 }
+
+@ShouldGenerate(r'''
+Map<String, dynamic> _$FieldNamerScreamingSnakeToJson(
+  FieldNamerScreamingSnake instance,
+) => <String, dynamic>{
+  'THE_FIELD': instance.theField,
+  'nameOverride': instance.nameOverride,
+};
+''')
+@JsonSerializable(fieldRename: FieldRename.screamingSnake, createFactory: false)
+class FieldNamerScreamingSnake {
+  late String theField;
+
+  @JsonKey(name: 'nameOverride')
+  late String nameOverride;
+}
diff --git a/json_serializable/test/src/generic_test_input.dart b/json_serializable/test/src/generic_test_input.dart
index 8baaa433f..810c5a674 100644
--- a/json_serializable/test/src/generic_test_input.dart
+++ b/json_serializable/test/src/generic_test_input.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldThrow(
@@ -20,23 +22,23 @@ class Issue713<TResult> {
 
 @ShouldGenerate(r'''
 GenericClass<T, S> _$GenericClassFromJson<T extends num, S>(
-        Map<String, dynamic> json) =>
-    GenericClass<T, S>()
-      ..fieldObject = _dataFromJson(json['fieldObject'])
-      ..fieldDynamic = _dataFromJson(json['fieldDynamic'])
-      ..fieldInt = _dataFromJson(json['fieldInt'])
-      ..fieldT = _dataFromJson(json['fieldT'])
-      ..fieldS = _dataFromJson(json['fieldS']);
+  Map<String, dynamic> json,
+) => GenericClass<T, S>()
+  ..fieldObject = _dataFromJson(json['fieldObject'])
+  ..fieldDynamic = _dataFromJson(json['fieldDynamic'])
+  ..fieldInt = _dataFromJson(json['fieldInt'])
+  ..fieldT = _dataFromJson(json['fieldT'])
+  ..fieldS = _dataFromJson(json['fieldS']);
 
 Map<String, dynamic> _$GenericClassToJson<T extends num, S>(
-        GenericClass<T, S> instance) =>
-    <String, dynamic>{
-      'fieldObject': _dataToJson(instance.fieldObject),
-      'fieldDynamic': _dataToJson(instance.fieldDynamic),
-      'fieldInt': _dataToJson(instance.fieldInt),
-      'fieldT': _dataToJson(instance.fieldT),
-      'fieldS': _dataToJson(instance.fieldS),
-    };
+  GenericClass<T, S> instance,
+) => <String, dynamic>{
+  'fieldObject': _dataToJson(instance.fieldObject),
+  'fieldDynamic': _dataToJson(instance.fieldDynamic),
+  'fieldInt': _dataToJson(instance.fieldInt),
+  'fieldT': _dataToJson(instance.fieldT),
+  'fieldS': _dataToJson(instance.fieldS),
+};
 ''')
 @JsonSerializable()
 class GenericClass<T extends num, S> {
@@ -65,13 +67,13 @@ Object _dataToJson<T extends num>(T input) => throw UnimplementedError();
 @ShouldGenerate(
   r'''
 GenericArgumentFactoriesFlagWithoutGenericType
-    _$GenericArgumentFactoriesFlagWithoutGenericTypeFromJson(
-            Map<String, dynamic> json) =>
-        GenericArgumentFactoriesFlagWithoutGenericType();
+_$GenericArgumentFactoriesFlagWithoutGenericTypeFromJson(
+  Map<String, dynamic> json,
+) => GenericArgumentFactoriesFlagWithoutGenericType();
 
 Map<String, dynamic> _$GenericArgumentFactoriesFlagWithoutGenericTypeToJson(
-        GenericArgumentFactoriesFlagWithoutGenericType instance) =>
-    <String, dynamic>{};
+  GenericArgumentFactoriesFlagWithoutGenericType instance,
+) => <String, dynamic>{};
 ''',
   expectedLogItems: [
     'The class `GenericArgumentFactoriesFlagWithoutGenericType` is annotated '
diff --git a/json_serializable/test/src/inheritance_test_input.dart b/json_serializable/test/src/inheritance_test_input.dart
index b33aaa2c9..0aac74d82 100644
--- a/json_serializable/test/src/inheritance_test_input.dart
+++ b/json_serializable/test/src/inheritance_test_input.dart
@@ -1,29 +1,22 @@
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldGenerate(r'''
-SubType _$SubTypeFromJson(Map<String, dynamic> json) => SubType(
-      json['subTypeViaCtor'] as int,
-      json['super-final-field'] as int,
-    )
-      ..superReadWriteField = json['superReadWriteField'] as int?
-      ..subTypeReadWrite = json['subTypeReadWrite'] as int;
-
-Map<String, dynamic> _$SubTypeToJson(SubType instance) {
-  final val = <String, dynamic>{
-    'super-final-field': instance.superFinalField,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('superReadWriteField', instance.superReadWriteField);
-  val['subTypeViaCtor'] = instance.subTypeViaCtor;
-  val['subTypeReadWrite'] = instance.subTypeReadWrite;
-  return val;
-}
+SubType _$SubTypeFromJson(Map<String, dynamic> json) =>
+    SubType(
+        (json['subTypeViaCtor'] as num).toInt(),
+        (json['super-final-field'] as num).toInt(),
+      )
+      ..superReadWriteField = (json['superReadWriteField'] as num?)?.toInt()
+      ..subTypeReadWrite = (json['subTypeReadWrite'] as num).toInt();
+
+Map<String, dynamic> _$SubTypeToJson(SubType instance) => <String, dynamic>{
+  'super-final-field': instance.superFinalField,
+  'superReadWriteField': ?instance.superReadWriteField,
+  'subTypeViaCtor': instance.subTypeViaCtor,
+  'subTypeReadWrite': instance.subTypeReadWrite,
+};
 ''')
 @JsonSerializable()
 class SubType extends SuperType {
@@ -54,42 +47,33 @@ class SuperType {
 
 @ShouldGenerate(r'''
 Map<String, dynamic> _$SubTypeWithAnnotatedFieldOverrideExtendsToJson(
-    SubTypeWithAnnotatedFieldOverrideExtends instance) {
-  final val = <String, dynamic>{
-    'super-final-field': instance.superFinalField,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('superReadWriteField', instance.superReadWriteField);
-  val['priceHalf'] = instance.priceHalf;
-  return val;
-}
+  SubTypeWithAnnotatedFieldOverrideExtends instance,
+) => <String, dynamic>{
+  'super-final-field': instance.superFinalField,
+  'superReadWriteField': ?instance.superReadWriteField,
+  'priceHalf': instance.priceHalf,
+};
 ''')
 @JsonSerializable(createFactory: false)
 class SubTypeWithAnnotatedFieldOverrideExtends extends SuperType {
-  SubTypeWithAnnotatedFieldOverrideExtends(int superTypeViaCtor)
-      : super(superTypeViaCtor);
+  SubTypeWithAnnotatedFieldOverrideExtends(int super.superTypeViaCtor);
 }
 
 @ShouldGenerate(r'''
 Map<String, dynamic>
-    _$SubTypeWithAnnotatedFieldOverrideExtendsWithOverridesToJson(
-            SubTypeWithAnnotatedFieldOverrideExtendsWithOverrides instance) =>
-        <String, dynamic>{
-          'priceHalf': instance.priceHalf,
-          'superReadWriteField': instance.superReadWriteField,
-          'super-final-field': instance.superFinalField,
-        };
+_$SubTypeWithAnnotatedFieldOverrideExtendsWithOverridesToJson(
+  SubTypeWithAnnotatedFieldOverrideExtendsWithOverrides instance,
+) => <String, dynamic>{
+  'priceHalf': instance.priceHalf,
+  'superReadWriteField': instance.superReadWriteField,
+  'super-final-field': instance.superFinalField,
+};
 ''')
 @JsonSerializable(createFactory: false)
 class SubTypeWithAnnotatedFieldOverrideExtendsWithOverrides extends SuperType {
-  SubTypeWithAnnotatedFieldOverrideExtendsWithOverrides(int superTypeViaCtor)
-      : super(superTypeViaCtor);
+  SubTypeWithAnnotatedFieldOverrideExtendsWithOverrides(
+    int super.superTypeViaCtor,
+  );
 
   /// The annotation applied here overrides the annotation in [SuperType].
   @JsonKey(includeIfNull: true)
@@ -109,11 +93,11 @@ class SubTypeWithAnnotatedFieldOverrideExtendsWithOverrides extends SuperType {
 
 @ShouldGenerate(r'''
 Map<String, dynamic> _$SubTypeWithAnnotatedFieldOverrideImplementsToJson(
-        SubTypeWithAnnotatedFieldOverrideImplements instance) =>
-    <String, dynamic>{
-      'superReadWriteField': instance.superReadWriteField,
-      'superFinalField': instance.superFinalField,
-    };
+  SubTypeWithAnnotatedFieldOverrideImplements instance,
+) => <String, dynamic>{
+  'superReadWriteField': instance.superReadWriteField,
+  'superFinalField': instance.superFinalField,
+};
 ''')
 @JsonSerializable(createFactory: false)
 class SubTypeWithAnnotatedFieldOverrideImplements implements SuperType {
@@ -121,7 +105,7 @@ class SubTypeWithAnnotatedFieldOverrideImplements implements SuperType {
   @override
   int? superReadWriteField;
 
-  @JsonKey(ignore: true)
+  @JsonKey(includeToJson: false, includeFromJson: false)
   @override
   int get priceHalf => 42;
 
diff --git a/json_serializable/test/src/json_converter_test_input.dart b/json_serializable/test/src/json_converter_test_input.dart
index 10d029b41..1c082dd4c 100644
--- a/json_serializable/test/src/json_converter_test_input.dart
+++ b/json_serializable/test/src/json_converter_test_input.dart
@@ -2,29 +2,35 @@
 // 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.
 
+// @dart=3.8
+
+// ignore_for_file: inference_failure_on_instance_creation
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldGenerate(r'''
 JsonConverterNamedCtor<E> _$JsonConverterNamedCtorFromJson<E>(
-        Map<String, dynamic> json) =>
-    JsonConverterNamedCtor<E>()
-      ..value = const _DurationMillisecondConverter.named()
-          .fromJson(json['value'] as int)
-      ..genericValue =
-          _GenericConverter<E>.named().fromJson(json['genericValue'] as int)
-      ..keyAnnotationFirst =
-          JsonConverterNamedCtor._fromJson(json['keyAnnotationFirst'] as int);
+  Map<String, dynamic> json,
+) => JsonConverterNamedCtor<E>()
+  ..value = const _DurationMillisecondConverter.named().fromJson(
+    (json['value'] as num).toInt(),
+  )
+  ..genericValue = _GenericConverter<E>.named().fromJson(
+    (json['genericValue'] as num).toInt(),
+  )
+  ..keyAnnotationFirst = JsonConverterNamedCtor._fromJson(
+    (json['keyAnnotationFirst'] as num).toInt(),
+  );
 
 Map<String, dynamic> _$JsonConverterNamedCtorToJson<E>(
-        JsonConverterNamedCtor<E> instance) =>
-    <String, dynamic>{
-      'value':
-          const _DurationMillisecondConverter.named().toJson(instance.value),
-      'genericValue':
-          _GenericConverter<E>.named().toJson(instance.genericValue),
-      'keyAnnotationFirst':
-          JsonConverterNamedCtor._toJson(instance.keyAnnotationFirst),
-    };
+  JsonConverterNamedCtor<E> instance,
+) => <String, dynamic>{
+  'value': const _DurationMillisecondConverter.named().toJson(instance.value),
+  'genericValue': _GenericConverter<E>.named().toJson(instance.genericValue),
+  'keyAnnotationFirst': JsonConverterNamedCtor._toJson(
+    instance.keyAnnotationFirst,
+  ),
+};
 ''')
 @JsonSerializable()
 @_DurationMillisecondConverter.named()
@@ -44,28 +50,34 @@ class JsonConverterNamedCtor<E> {
 
 @ShouldGenerate(r'''
 JsonConvertOnField<E> _$JsonConvertOnFieldFromJson<E>(
-        Map<String, dynamic> json) =>
-    JsonConvertOnField<E>()
-      ..annotatedField = const _DurationMillisecondConverter()
-          .fromJson(json['annotatedField'] as int)
-      ..annotatedWithNamedCtor = const _DurationMillisecondConverter.named()
-          .fromJson(json['annotatedWithNamedCtor'] as int)
-      ..classAnnotatedWithField =
-          _durationConverter.fromJson(json['classAnnotatedWithField'] as int)
-      ..genericValue =
-          _GenericConverter<E>().fromJson(json['genericValue'] as int);
+  Map<String, dynamic> json,
+) => JsonConvertOnField<E>()
+  ..annotatedField = const _DurationMillisecondConverter().fromJson(
+    (json['annotatedField'] as num).toInt(),
+  )
+  ..annotatedWithNamedCtor = const _DurationMillisecondConverter.named()
+      .fromJson((json['annotatedWithNamedCtor'] as num).toInt())
+  ..classAnnotatedWithField = _durationConverter.fromJson(
+    (json['classAnnotatedWithField'] as num).toInt(),
+  )
+  ..genericValue = _GenericConverter<E>().fromJson(
+    (json['genericValue'] as num).toInt(),
+  );
 
 Map<String, dynamic> _$JsonConvertOnFieldToJson<E>(
-        JsonConvertOnField<E> instance) =>
-    <String, dynamic>{
-      'annotatedField':
-          const _DurationMillisecondConverter().toJson(instance.annotatedField),
-      'annotatedWithNamedCtor': const _DurationMillisecondConverter.named()
-          .toJson(instance.annotatedWithNamedCtor),
-      'classAnnotatedWithField':
-          _durationConverter.toJson(instance.classAnnotatedWithField),
-      'genericValue': _GenericConverter<E>().toJson(instance.genericValue),
-    };
+  JsonConvertOnField<E> instance,
+) => <String, dynamic>{
+  'annotatedField': const _DurationMillisecondConverter().toJson(
+    instance.annotatedField,
+  ),
+  'annotatedWithNamedCtor': const _DurationMillisecondConverter.named().toJson(
+    instance.annotatedWithNamedCtor,
+  ),
+  'classAnnotatedWithField': _durationConverter.toJson(
+    instance.classAnnotatedWithField,
+  ),
+  'genericValue': _GenericConverter<E>().toJson(instance.genericValue),
+};
 ''')
 @JsonSerializable()
 @_durationConverter
@@ -117,7 +129,7 @@ class _BadConverter<T, S> implements JsonConverter<S, int> {
 
 @ShouldThrow(
   'Found more than one matching converter for `Duration`.',
-  element: '',
+  element: 'new',
 )
 @JsonSerializable()
 @_durationConverter
@@ -142,7 +154,7 @@ class _DurationMillisecondConverter implements JsonConverter<Duration, int> {
 
 @ShouldThrow(
   'Generators with constructor arguments are not supported.',
-  element: '',
+  element: 'new',
 )
 @JsonSerializable()
 @_ConverterWithCtorParams(42)
@@ -164,28 +176,48 @@ class _ConverterWithCtorParams implements JsonConverter<Duration, int> {
 
 @ShouldGenerate(r'''
 Map<String, dynamic> _$JsonConverterOnGetterToJson(
-        JsonConverterOnGetter instance) =>
-    <String, dynamic>{
-      'annotatedGetter':
-          const _NeedsConversionConverter().toJson(instance.annotatedGetter),
-    };
+  JsonConverterOnGetter instance,
+) => <String, dynamic>{
+  'annotatedGetter': const _NeedsConversionConverter().toJson(
+    instance.annotatedGetter,
+  ),
+};
 ''')
 @JsonSerializable(createFactory: false)
 class JsonConverterOnGetter {
   @JsonKey()
   @_NeedsConversionConverter()
-  _NeedsConversion get annotatedGetter => _NeedsConversion();
+  NeedsConversion get annotatedGetter => NeedsConversion();
 }
 
-class _NeedsConversion {}
+class NeedsConversion {}
 
-class _NeedsConversionConverter
-    implements JsonConverter<_NeedsConversion, int> {
+class _NeedsConversionConverter implements JsonConverter<NeedsConversion, int> {
   const _NeedsConversionConverter();
 
   @override
-  _NeedsConversion fromJson(int json) => _NeedsConversion();
+  NeedsConversion fromJson(int json) => NeedsConversion();
+
+  @override
+  int toJson(NeedsConversion object) => 0;
+}
+
+@ShouldThrow('''
+Could not generate `fromJson` code for `value`.
+To support the type `NeedsConversion` you can:
+$converterOrKeyInstructions''')
+@_NullableConverter()
+@JsonSerializable()
+class JsonConverterNullableToNonNullable {
+  late NeedsConversion value;
+}
+
+class _NullableConverter implements JsonConverter<NeedsConversion?, Object?> {
+  const _NullableConverter();
+
+  @override
+  NeedsConversion? fromJson(Object? json) => null;
 
   @override
-  int toJson(_NeedsConversion object) => 0;
+  Object? toJson(NeedsConversion? object) => null;
 }
diff --git a/json_serializable/test/src/map_key_variety_test_input.dart b/json_serializable/test/src/map_key_variety_test_input.dart
index 861512f18..d81b0bca0 100644
--- a/json_serializable/test/src/map_key_variety_test_input.dart
+++ b/json_serializable/test/src/map_key_variety_test_input.dart
@@ -1,10 +1,12 @@
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldGenerate(r'''
 MapKeyVariety _$MapKeyVarietyFromJson(Map<String, dynamic> json) =>
     MapKeyVariety()
       ..intIntMap = (json['intIntMap'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as int),
+        (k, e) => MapEntry(int.parse(k), (e as num).toInt()),
       );
 
 Map<String, dynamic> _$MapKeyVarietyToJson(MapKeyVariety instance) =>
@@ -17,21 +19,17 @@ class MapKeyVariety {
   late Map<int, int> intIntMap;
 }
 
-@ShouldThrow(
-  r'''
+@ShouldThrow(r'''
 Could not generate `fromJson` code for `value` because of type `Object?`.
-Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''',
-)
+Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''')
 @JsonSerializable()
 class MapKeyNoNullableObject {
   late Map<Object?, int> value;
 }
 
-@ShouldThrow(
-  r'''
+@ShouldThrow(r'''
 Could not generate `fromJson` code for `value` because of type `String?`.
-Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''',
-)
+Map keys must be one of: Object, dynamic, enum, String, BigInt, DateTime, int, Uri.''')
 @JsonSerializable()
 class MapKeyNoNullableString {
   late Map<String?, int> value;
diff --git a/json_serializable/test/src/setter_test_input.dart b/json_serializable/test/src/setter_test_input.dart
index f9dddf4bd..678a5419d 100644
--- a/json_serializable/test/src/setter_test_input.dart
+++ b/json_serializable/test/src/setter_test_input.dart
@@ -1,3 +1,5 @@
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
 @ShouldGenerate(
@@ -29,8 +31,8 @@ class JustSetterNoToJson {
 @ShouldGenerate(
   r'''
 Map<String, dynamic> _$JustSetterNoFromJsonToJson(
-        JustSetterNoFromJson instance) =>
-    <String, dynamic>{};
+  JustSetterNoFromJson instance,
+) => <String, dynamic>{};
 ''',
   expectedLogItems: ['Setters are ignored: JustSetterNoFromJson.someSetter'],
 )
diff --git a/json_serializable/test/src/to_from_json_test_input.dart b/json_serializable/test/src/to_from_json_test_input.dart
index dafd680ea..f811d6a39 100644
--- a/json_serializable/test/src/to_from_json_test_input.dart
+++ b/json_serializable/test/src/to_from_json_test_input.dart
@@ -2,6 +2,10 @@
 // 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.
 
+// @dart=3.8
+
+// ignore_for_file: strict_top_level_inference
+
 part of '_json_serializable_test_input.dart';
 
 int _toInt(bool input) => 42;
@@ -36,20 +40,19 @@ class InvalidFromFunc2Args {
   late String field;
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 ValidToFromFuncClassStatic _$ValidToFromFuncClassStaticFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
+) =>
     ValidToFromFuncClassStatic()
       ..field = ValidToFromFuncClassStatic._staticFunc(json['field'] as String);
 
 Map<String, dynamic> _$ValidToFromFuncClassStaticToJson(
-        ValidToFromFuncClassStatic instance) =>
-    <String, dynamic>{
-      'field': ValidToFromFuncClassStatic._staticFunc(instance.field),
-    };
-''',
-)
+  ValidToFromFuncClassStatic instance,
+) => <String, dynamic>{
+  'field': ValidToFromFuncClassStatic._staticFunc(instance.field),
+};
+''')
 @JsonSerializable()
 class ValidToFromFuncClassStatic {
   static String _staticFunc(String param) => throw UnimplementedError();
@@ -84,26 +87,23 @@ class Reproduce869NullableGenericType {
   late final List<int> values;
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 Reproduce869NullableGenericTypeWithDefault
-    _$Reproduce869NullableGenericTypeWithDefaultFromJson(
-            Map<String, dynamic> json) =>
-        Reproduce869NullableGenericTypeWithDefault()
-          ..values =
-              json['values'] == null ? [] : _fromList(json['values'] as List?)
-          ..valuesNullable = json['valuesNullable'] == null
-              ? []
-              : _fromList(json['valuesNullable'] as List?);
+_$Reproduce869NullableGenericTypeWithDefaultFromJson(
+  Map<String, dynamic> json,
+) => Reproduce869NullableGenericTypeWithDefault()
+  ..values = json['values'] == null ? [] : _fromList(json['values'] as List?)
+  ..valuesNullable = json['valuesNullable'] == null
+      ? []
+      : _fromList(json['valuesNullable'] as List?);
 
 Map<String, dynamic> _$Reproduce869NullableGenericTypeWithDefaultToJson(
-        Reproduce869NullableGenericTypeWithDefault instance) =>
-    <String, dynamic>{
-      'values': _toList(instance.values),
-      'valuesNullable': _toList(instance.valuesNullable),
-    };
-''',
-)
+  Reproduce869NullableGenericTypeWithDefault instance,
+) => <String, dynamic>{
+  'values': _toList(instance.values),
+  'valuesNullable': _toList(instance.valuesNullable),
+};
+''')
 @JsonSerializable()
 class Reproduce869NullableGenericTypeWithDefault {
   @JsonKey(
@@ -122,7 +122,7 @@ class Reproduce869NullableGenericTypeWithDefault {
 }
 
 List<int>? _fromList(List? pairs) =>
-    pairs?.map((it) => it as int).toList(growable: false);
+    pairs?.map((it) => (it as num).toInt()).toList(growable: false);
 
 List<List>? _toList(List<int>? pairs) =>
     pairs?.map((it) => [it]).toList(growable: false);
@@ -138,20 +138,14 @@ class InvalidToFunc2Args {
   late String field;
 }
 
-@ShouldGenerate(
-  "_toStringFromObject(json['field'])",
-  contains: true,
-)
+@ShouldGenerate("_toStringFromObject(json['field'])", contains: true)
 @JsonSerializable()
 class ObjectConvertMethods {
   @JsonKey(fromJson: _toStringFromObject, toJson: _toObject)
   late String field;
 }
 
-@ShouldGenerate(
-  "_toDynamic(json['field'])",
-  contains: true,
-)
+@ShouldGenerate("_toDynamic(json['field'])", contains: true)
 @JsonSerializable()
 class DynamicConvertMethods {
   @JsonKey(fromJson: _toDynamic, toJson: _toDynamic)
@@ -160,36 +154,23 @@ class DynamicConvertMethods {
 
 String _toString(String input) => 'null';
 
-@ShouldGenerate(
-  "_toString(json['field'] as String)",
-  contains: true,
-)
+@ShouldGenerate("_toString(json['field'] as String)", contains: true)
 @JsonSerializable()
 class TypedConvertMethods {
   @JsonKey(fromJson: _toString, toJson: _toString)
   late String field;
 }
 
-@ShouldGenerate(
-  r'''
-Map<String, dynamic> _$ToJsonNullableFalseIncludeIfNullFalseToJson(
-    ToJsonNullableFalseIncludeIfNullFalse instance) {
-  final val = <String, dynamic>{};
+String? _toStringNullOnEmpty(String input) => input.isEmpty ? null : input;
 
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('field', _toString(instance.field));
-  return val;
-}
-''',
-)
+@ShouldGenerate(r'''
+Map<String, dynamic> _$ToJsonNullableFalseIncludeIfNullFalseToJson(
+  ToJsonNullableFalseIncludeIfNullFalse instance,
+) => <String, dynamic>{'field': ?_toStringNullOnEmpty(instance.field)};
+''')
 @JsonSerializable(createFactory: false)
 class ToJsonNullableFalseIncludeIfNullFalse {
-  @JsonKey(toJson: _toString, includeIfNull: false)
+  @JsonKey(toJson: _toStringNullOnEmpty, includeIfNull: false)
   late String field;
 }
 
@@ -199,16 +180,14 @@ String _fromDynamicList(List input) => 'null';
 
 String _fromDynamicIterable(Iterable input) => 'null';
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 FromDynamicCollection _$FromDynamicCollectionFromJson(
-        Map<String, dynamic> json) =>
-    FromDynamicCollection()
-      ..mapField = _fromDynamicMap(json['mapField'] as Map)
-      ..listField = _fromDynamicList(json['listField'] as List)
-      ..iterableField = _fromDynamicIterable(json['iterableField'] as List);
-''',
-)
+  Map<String, dynamic> json,
+) => FromDynamicCollection()
+  ..mapField = _fromDynamicMap(json['mapField'] as Map)
+  ..listField = _fromDynamicList(json['listField'] as List)
+  ..iterableField = _fromDynamicIterable(json['iterableField'] as List);
+''')
 @JsonSerializable(createToJson: false)
 class FromDynamicCollection {
   @JsonKey(fromJson: _fromDynamicMap)
@@ -225,17 +204,16 @@ String _fromNullableDynamicList(List? input) => 'null';
 
 String _fromNullableDynamicIterable(Iterable? input) => 'null';
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 FromNullableDynamicCollection _$FromNullableDynamicCollectionFromJson(
-        Map<String, dynamic> json) =>
-    FromNullableDynamicCollection()
-      ..mapField = _fromNullableDynamicMap(json['mapField'] as Map?)
-      ..listField = _fromNullableDynamicList(json['listField'] as List?)
-      ..iterableField =
-          _fromNullableDynamicIterable(json['iterableField'] as List?);
-''',
-)
+  Map<String, dynamic> json,
+) => FromNullableDynamicCollection()
+  ..mapField = _fromNullableDynamicMap(json['mapField'] as Map?)
+  ..listField = _fromNullableDynamicList(json['listField'] as List?)
+  ..iterableField = _fromNullableDynamicIterable(
+    json['iterableField'] as List?,
+  );
+''')
 @JsonSerializable(createToJson: false)
 class FromNullableDynamicCollection {
   @JsonKey(fromJson: _fromNullableDynamicMap)
@@ -312,19 +290,13 @@ class OkayOnlyOptionalPositional {
   String? field;
 }
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 _BetterPrivateNames _$BetterPrivateNamesFromJson(Map<String, dynamic> json) =>
-    _BetterPrivateNames(
-      name: json['name'] as String,
-    );
+    _BetterPrivateNames(name: json['name'] as String);
 
 Map<String, dynamic> _$BetterPrivateNamesToJson(_BetterPrivateNames instance) =>
-    <String, dynamic>{
-      'name': instance.name,
-    };
-''',
-)
+    <String, dynamic>{'name': instance.name};
+''')
 @JsonSerializable(createFactory: true, createToJson: true)
 // ignore: unused_element
 class _BetterPrivateNames {
diff --git a/json_serializable/test/src/unknown_enum_value_test_input.dart b/json_serializable/test/src/unknown_enum_value_test_input.dart
index c2f745899..3e9bd27c8 100644
--- a/json_serializable/test/src/unknown_enum_value_test_input.dart
+++ b/json_serializable/test/src/unknown_enum_value_test_input.dart
@@ -1,12 +1,16 @@
+// @dart=3.8
+
 part of '_json_serializable_test_input.dart';
 
-@ShouldGenerate(
-  r'''
+@ShouldGenerate(r'''
 UnknownEnumValue _$UnknownEnumValueFromJson(Map<String, dynamic> json) =>
     UnknownEnumValue()
-      ..value = $enumDecodeNullable(
-              _$UnknownEnumValueItemsEnumMap, json['value'],
-              unknownValue: UnknownEnumValueItems.vUnknown) ??
+      ..value =
+          $enumDecodeNullable(
+            _$UnknownEnumValueItemsEnumMap,
+            json['value'],
+            unknownValue: UnknownEnumValueItems.vUnknown,
+          ) ??
           UnknownEnumValueItems.vNull;
 
 const _$UnknownEnumValueItemsEnumMap = {
@@ -16,11 +20,8 @@ const _$UnknownEnumValueItemsEnumMap = {
   UnknownEnumValueItems.vUnknown: 'vUnknown',
   UnknownEnumValueItems.vNull: 'vNull',
 };
-''',
-)
-@JsonSerializable(
-  createToJson: false,
-)
+''')
+@JsonSerializable(createToJson: false)
 class UnknownEnumValue {
   @JsonKey(
     defaultValue: UnknownEnumValueItems.vNull,
diff --git a/json_serializable/test/supported_types/enum_type.dart b/json_serializable/test/supported_types/enum_type.dart
index 360a6bf8e..91750dd6b 100644
--- a/json_serializable/test/supported_types/enum_type.dart
+++ b/json_serializable/test/supported_types/enum_type.dart
@@ -3,3 +3,36 @@
 // BSD-style license that can be found in the LICENSE file.
 
 enum EnumType { alpha, beta, gamma, delta }
+
+class FromJsonDynamicParam {
+  FromJsonDynamicParam({required this.value});
+
+  final int value;
+
+  factory FromJsonDynamicParam.fromJson(dynamic json) =>
+      FromJsonDynamicParam(value: (json as num).toInt());
+
+  dynamic toJson() => null;
+}
+
+class FromJsonNullableObjectParam {
+  FromJsonNullableObjectParam({required this.value});
+
+  final int value;
+
+  factory FromJsonNullableObjectParam.fromJson(Object? json) =>
+      FromJsonNullableObjectParam(value: (json as num).toInt());
+
+  Object? toJson() => null;
+}
+
+class FromJsonObjectParam {
+  FromJsonObjectParam({required this.value});
+
+  final int value;
+
+  factory FromJsonObjectParam.fromJson(Object json) =>
+      FromJsonObjectParam(value: (json as num).toInt());
+
+  dynamic toJson() => null;
+}
diff --git a/json_serializable/test/supported_types/extra_map_test.dart b/json_serializable/test/supported_types/extra_map_test.dart
index 78a1af821..922b57730 100644
--- a/json_serializable/test/supported_types/extra_map_test.dart
+++ b/json_serializable/test/supported_types/extra_map_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -16,11 +16,11 @@ void main() {
   for (var input in const <Map<String, Object?>>{
     {'value': {}},
     {
-      'value': {'key': 'value'}
+      'value': {'key': 'value'},
     },
     {
       // Regression case for https://github.com/google/json_serializable.dart/issues/864
-      'value': {'key': null}
+      'value': {'key': null},
     },
   }) {
     test(input, () {
diff --git a/json_serializable/test/supported_types/input.dart b/json_serializable/test/supported_types/input.dart
index 8a43e9fcc..be9300aee 100644
--- a/json_serializable/test/supported_types/input.dart
+++ b/json_serializable/test/supported_types/input.dart
@@ -13,10 +13,7 @@ class SimpleClass {
   @JsonKey(defaultValue: 42)
   dynamic withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
diff --git a/json_serializable/test/supported_types/input.g.dart b/json_serializable/test/supported_types/input.g.dart
index 619612027..5657db18b 100644
--- a/json_serializable/test/supported_types/input.g.dart
+++ b/json_serializable/test/supported_types/input.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.dart';
 
@@ -8,10 +8,8 @@ part of 'input.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'],
-      json['withDefault'] ?? 42,
-    );
+SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) =>
+    SimpleClass(json['value'], json['withDefault'] ?? 42);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
diff --git a/json_serializable/test/supported_types/input.type_bigint.dart b/json_serializable/test/supported_types/input.type_bigint.dart
index 07ab37ba4..d965e2925 100644
--- a/json_serializable/test/supported_types/input.type_bigint.dart
+++ b/json_serializable/test/supported_types/input.type_bigint.dart
@@ -10,9 +10,10 @@ part 'input.type_bigint.g.dart';
 class SimpleClass {
   final BigInt value;
 
-  SimpleClass(
-    this.value,
-  );
+  @JsonKey(defaultValue: _defaultValueFunc)
+  BigInt withDefault;
+
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -24,12 +25,15 @@ class SimpleClass {
 class SimpleClassNullable {
   final BigInt? value;
 
-  SimpleClassNullable(
-    this.value,
-  );
+  @JsonKey(defaultValue: _defaultValueFunc)
+  BigInt? withDefault;
+
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
 
   Map<String, Object?> toJson() => _$SimpleClassNullableToJson(this);
 }
+
+BigInt _defaultValueFunc() => BigInt.parse('12345');
diff --git a/json_serializable/test/supported_types/input.type_bigint.g.dart b/json_serializable/test/supported_types/input.type_bigint.g.dart
index 16bb34ed8..fd9be38b5 100644
--- a/json_serializable/test/supported_types/input.type_bigint.g.dart
+++ b/json_serializable/test/supported_types/input.type_bigint.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_bigint.dart';
 
@@ -9,21 +9,29 @@ part of 'input.type_bigint.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      BigInt.parse(json['value'] as String),
-    );
+  BigInt.parse(json['value'] as String),
+  json['withDefault'] == null
+      ? _defaultValueFunc()
+      : BigInt.parse(json['withDefault'] as String),
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
       'value': instance.value.toString(),
+      'withDefault': instance.withDefault.toString(),
     };
 
 SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     SimpleClassNullable(
       json['value'] == null ? null : BigInt.parse(json['value'] as String),
+      json['withDefault'] == null
+          ? _defaultValueFunc()
+          : BigInt.parse(json['withDefault'] as String),
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toString(),
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.toString(),
+  'withDefault': instance.withDefault?.toString(),
+};
diff --git a/json_serializable/test/supported_types/input.type_bool.dart b/json_serializable/test/supported_types/input.type_bool.dart
index e3fd6078c..f90c87aa4 100644
--- a/json_serializable/test/supported_types/input.type_bool.dart
+++ b/json_serializable/test/supported_types/input.type_bool.dart
@@ -13,10 +13,7 @@ class SimpleClass {
   @JsonKey(defaultValue: true)
   bool withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -31,10 +28,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: true)
   bool? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_bool.g.dart b/json_serializable/test/supported_types/input.type_bool.g.dart
index 9138ae273..90b889703 100644
--- a/json_serializable/test/supported_types/input.type_bool.g.dart
+++ b/json_serializable/test/supported_types/input.type_bool.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_bool.dart';
 
@@ -8,10 +8,8 @@ part of 'input.type_bool.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as bool,
-      json['withDefault'] as bool? ?? true,
-    );
+SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) =>
+    SimpleClass(json['value'] as bool, json['withDefault'] as bool? ?? true);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -26,8 +24,8 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
diff --git a/json_serializable/test/supported_types/input.type_datetime.dart b/json_serializable/test/supported_types/input.type_datetime.dart
index 880c7ce89..24b91514f 100644
--- a/json_serializable/test/supported_types/input.type_datetime.dart
+++ b/json_serializable/test/supported_types/input.type_datetime.dart
@@ -10,9 +10,10 @@ part 'input.type_datetime.g.dart';
 class SimpleClass {
   final DateTime value;
 
-  SimpleClass(
-    this.value,
-  );
+  @JsonKey(defaultValue: _defaultValueFunc)
+  DateTime withDefault;
+
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -24,12 +25,15 @@ class SimpleClass {
 class SimpleClassNullable {
   final DateTime? value;
 
-  SimpleClassNullable(
-    this.value,
-  );
+  @JsonKey(defaultValue: _defaultValueFunc)
+  DateTime? withDefault;
+
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
 
   Map<String, Object?> toJson() => _$SimpleClassNullableToJson(this);
 }
+
+DateTime _defaultValueFunc() => DateTime.parse('2020-01-01T00:00:00.000');
diff --git a/json_serializable/test/supported_types/input.type_datetime.g.dart b/json_serializable/test/supported_types/input.type_datetime.g.dart
index 2e2b0b6a0..fdc0aff3f 100644
--- a/json_serializable/test/supported_types/input.type_datetime.g.dart
+++ b/json_serializable/test/supported_types/input.type_datetime.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_datetime.dart';
 
@@ -9,21 +9,29 @@ part of 'input.type_datetime.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      DateTime.parse(json['value'] as String),
-    );
+  DateTime.parse(json['value'] as String),
+  json['withDefault'] == null
+      ? _defaultValueFunc()
+      : DateTime.parse(json['withDefault'] as String),
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
       'value': instance.value.toIso8601String(),
+      'withDefault': instance.withDefault.toIso8601String(),
     };
 
 SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     SimpleClassNullable(
       json['value'] == null ? null : DateTime.parse(json['value'] as String),
+      json['withDefault'] == null
+          ? _defaultValueFunc()
+          : DateTime.parse(json['withDefault'] as String),
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toIso8601String(),
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.toIso8601String(),
+  'withDefault': instance.withDefault?.toIso8601String(),
+};
diff --git a/json_serializable/test/supported_types/input.type_double.dart b/json_serializable/test/supported_types/input.type_double.dart
index c51a0e35b..4ea8dafb0 100644
--- a/json_serializable/test/supported_types/input.type_double.dart
+++ b/json_serializable/test/supported_types/input.type_double.dart
@@ -13,10 +13,7 @@ class SimpleClass {
   @JsonKey(defaultValue: 3.14)
   double withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -31,10 +28,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: 3.14)
   double? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_double.g.dart b/json_serializable/test/supported_types/input.type_double.g.dart
index 0f7e12fdc..3261dce7f 100644
--- a/json_serializable/test/supported_types/input.type_double.g.dart
+++ b/json_serializable/test/supported_types/input.type_double.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_double.dart';
 
@@ -9,9 +9,9 @@ part of 'input.type_double.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      (json['value'] as num).toDouble(),
-      (json['withDefault'] as num?)?.toDouble() ?? 3.14,
-    );
+  (json['value'] as num).toDouble(),
+  (json['withDefault'] as num?)?.toDouble() ?? 3.14,
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -26,8 +26,8 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
diff --git a/json_serializable/test/supported_types/input.type_duration.dart b/json_serializable/test/supported_types/input.type_duration.dart
index 7ecdef825..c040b4b6e 100644
--- a/json_serializable/test/supported_types/input.type_duration.dart
+++ b/json_serializable/test/supported_types/input.type_duration.dart
@@ -10,9 +10,7 @@ part 'input.type_duration.g.dart';
 class SimpleClass {
   final Duration value;
 
-  SimpleClass(
-    this.value,
-  );
+  SimpleClass(this.value);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -24,9 +22,7 @@ class SimpleClass {
 class SimpleClassNullable {
   final Duration? value;
 
-  SimpleClassNullable(
-    this.value,
-  );
+  SimpleClassNullable(this.value);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_duration.g.dart b/json_serializable/test/supported_types/input.type_duration.g.dart
index b33f0e19f..bcb4bc291 100644
--- a/json_serializable/test/supported_types/input.type_duration.g.dart
+++ b/json_serializable/test/supported_types/input.type_duration.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_duration.dart';
 
@@ -8,24 +8,19 @@ part of 'input.type_duration.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      Duration(microseconds: json['value'] as int),
-    );
+SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) =>
+    SimpleClass(Duration(microseconds: (json['value'] as num).toInt()));
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
-    <String, dynamic>{
-      'value': instance.value.inMicroseconds,
-    };
+    <String, dynamic>{'value': instance.value.inMicroseconds};
 
 SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     SimpleClassNullable(
       json['value'] == null
           ? null
-          : Duration(microseconds: json['value'] as int),
+          : Duration(microseconds: (json['value'] as num).toInt()),
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.inMicroseconds,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{'value': instance.value?.inMicroseconds};
diff --git a/json_serializable/test/supported_types/input.type_enumtype.dart b/json_serializable/test/supported_types/input.type_enumtype.dart
index 9225db715..117e9a6f7 100644
--- a/json_serializable/test/supported_types/input.type_enumtype.dart
+++ b/json_serializable/test/supported_types/input.type_enumtype.dart
@@ -14,10 +14,7 @@ class SimpleClass {
   @JsonKey(defaultValue: EnumType.alpha)
   EnumType withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -32,10 +29,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: EnumType.alpha)
   EnumType? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_enumtype.g.dart b/json_serializable/test/supported_types/input.type_enumtype.g.dart
index 931ddfc3e..3e25a0194 100644
--- a/json_serializable/test/supported_types/input.type_enumtype.g.dart
+++ b/json_serializable/test/supported_types/input.type_enumtype.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_enumtype.dart';
 
@@ -9,15 +9,14 @@ part of 'input.type_enumtype.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      $enumDecode(_$EnumTypeEnumMap, json['value']),
-      $enumDecodeNullable(_$EnumTypeEnumMap, json['withDefault']) ??
-          EnumType.alpha,
-    );
+  $enumDecode(_$EnumTypeEnumMap, json['value']),
+  $enumDecodeNullable(_$EnumTypeEnumMap, json['withDefault']) ?? EnumType.alpha,
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
-      'value': _$EnumTypeEnumMap[instance.value],
-      'withDefault': _$EnumTypeEnumMap[instance.withDefault],
+      'value': _$EnumTypeEnumMap[instance.value]!,
+      'withDefault': _$EnumTypeEnumMap[instance.withDefault]!,
     };
 
 const _$EnumTypeEnumMap = {
@@ -35,8 +34,8 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': _$EnumTypeEnumMap[instance.value],
-      'withDefault': _$EnumTypeEnumMap[instance.withDefault],
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': _$EnumTypeEnumMap[instance.value],
+  'withDefault': _$EnumTypeEnumMap[instance.withDefault],
+};
diff --git a/json_serializable/test/supported_types/input.type_int.dart b/json_serializable/test/supported_types/input.type_int.dart
index 6d80dc79c..62b5a882e 100644
--- a/json_serializable/test/supported_types/input.type_int.dart
+++ b/json_serializable/test/supported_types/input.type_int.dart
@@ -13,10 +13,7 @@ class SimpleClass {
   @JsonKey(defaultValue: 42)
   int withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -31,10 +28,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: 42)
   int? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_int.g.dart b/json_serializable/test/supported_types/input.type_int.g.dart
index 3e6b3aa75..00fd9ba1b 100644
--- a/json_serializable/test/supported_types/input.type_int.g.dart
+++ b/json_serializable/test/supported_types/input.type_int.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_int.dart';
 
@@ -9,9 +9,9 @@ part of 'input.type_int.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as int,
-      json['withDefault'] as int? ?? 42,
-    );
+  (json['value'] as num).toInt(),
+  (json['withDefault'] as num?)?.toInt() ?? 42,
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -21,13 +21,13 @@ Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
 
 SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     SimpleClassNullable(
-      json['value'] as int?,
-      json['withDefault'] as int? ?? 42,
+      (json['value'] as num?)?.toInt(),
+      (json['withDefault'] as num?)?.toInt() ?? 42,
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
diff --git a/json_serializable/test/supported_types/input.type_iterable.dart b/json_serializable/test/supported_types/input.type_iterable.dart
index 1471dc935..b1b39e080 100644
--- a/json_serializable/test/supported_types/input.type_iterable.dart
+++ b/json_serializable/test/supported_types/input.type_iterable.dart
@@ -14,10 +14,7 @@ class SimpleClass {
   @JsonKey(defaultValue: [42, true, false, null])
   Iterable withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -32,10 +29,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: [42, true, false, null])
   Iterable? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
@@ -47,9 +41,7 @@ class SimpleClassNullable {
 class SimpleClassOfBigInt {
   final Iterable<BigInt> value;
 
-  SimpleClassOfBigInt(
-    this.value,
-  );
+  SimpleClassOfBigInt(this.value);
 
   factory SimpleClassOfBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntFromJson(json);
@@ -61,9 +53,7 @@ class SimpleClassOfBigInt {
 class SimpleClassNullableOfBigInt {
   final Iterable<BigInt>? value;
 
-  SimpleClassNullableOfBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfBigInt(this.value);
 
   factory SimpleClassNullableOfBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfBigIntFromJson(json);
@@ -75,9 +65,7 @@ class SimpleClassNullableOfBigInt {
 class SimpleClassOfBigIntNullable {
   final Iterable<BigInt?> value;
 
-  SimpleClassOfBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntNullable(this.value);
 
   factory SimpleClassOfBigIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntNullableFromJson(json);
@@ -89,13 +77,11 @@ class SimpleClassOfBigIntNullable {
 class SimpleClassNullableOfBigIntNullable {
   final Iterable<BigInt?>? value;
 
-  SimpleClassNullableOfBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntNullable(this.value);
 
   factory SimpleClassNullableOfBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntNullableToJson(this);
@@ -105,9 +91,7 @@ class SimpleClassNullableOfBigIntNullable {
 class SimpleClassOfBool {
   final Iterable<bool> value;
 
-  SimpleClassOfBool(
-    this.value,
-  );
+  SimpleClassOfBool(this.value);
 
   factory SimpleClassOfBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBoolFromJson(json);
@@ -119,9 +103,7 @@ class SimpleClassOfBool {
 class SimpleClassNullableOfBool {
   final Iterable<bool>? value;
 
-  SimpleClassNullableOfBool(
-    this.value,
-  );
+  SimpleClassNullableOfBool(this.value);
 
   factory SimpleClassNullableOfBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfBoolFromJson(json);
@@ -133,9 +115,7 @@ class SimpleClassNullableOfBool {
 class SimpleClassOfBoolNullable {
   final Iterable<bool?> value;
 
-  SimpleClassOfBoolNullable(
-    this.value,
-  );
+  SimpleClassOfBoolNullable(this.value);
 
   factory SimpleClassOfBoolNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBoolNullableFromJson(json);
@@ -147,13 +127,11 @@ class SimpleClassOfBoolNullable {
 class SimpleClassNullableOfBoolNullable {
   final Iterable<bool?>? value;
 
-  SimpleClassNullableOfBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBoolNullable(this.value);
 
   factory SimpleClassNullableOfBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBoolNullableToJson(this);
@@ -163,9 +141,7 @@ class SimpleClassNullableOfBoolNullable {
 class SimpleClassOfDateTime {
   final Iterable<DateTime> value;
 
-  SimpleClassOfDateTime(
-    this.value,
-  );
+  SimpleClassOfDateTime(this.value);
 
   factory SimpleClassOfDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeFromJson(json);
@@ -177,9 +153,7 @@ class SimpleClassOfDateTime {
 class SimpleClassNullableOfDateTime {
   final Iterable<DateTime>? value;
 
-  SimpleClassNullableOfDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfDateTime(this.value);
 
   factory SimpleClassNullableOfDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDateTimeFromJson(json);
@@ -191,9 +165,7 @@ class SimpleClassNullableOfDateTime {
 class SimpleClassOfDateTimeNullable {
   final Iterable<DateTime?> value;
 
-  SimpleClassOfDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeNullable(this.value);
 
   factory SimpleClassOfDateTimeNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeNullableFromJson(json);
@@ -205,13 +177,11 @@ class SimpleClassOfDateTimeNullable {
 class SimpleClassNullableOfDateTimeNullable {
   final Iterable<DateTime?>? value;
 
-  SimpleClassNullableOfDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeNullableToJson(this);
@@ -221,9 +191,7 @@ class SimpleClassNullableOfDateTimeNullable {
 class SimpleClassOfDouble {
   final Iterable<double> value;
 
-  SimpleClassOfDouble(
-    this.value,
-  );
+  SimpleClassOfDouble(this.value);
 
   factory SimpleClassOfDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDoubleFromJson(json);
@@ -235,9 +203,7 @@ class SimpleClassOfDouble {
 class SimpleClassNullableOfDouble {
   final Iterable<double>? value;
 
-  SimpleClassNullableOfDouble(
-    this.value,
-  );
+  SimpleClassNullableOfDouble(this.value);
 
   factory SimpleClassNullableOfDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDoubleFromJson(json);
@@ -249,9 +215,7 @@ class SimpleClassNullableOfDouble {
 class SimpleClassOfDoubleNullable {
   final Iterable<double?> value;
 
-  SimpleClassOfDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfDoubleNullable(this.value);
 
   factory SimpleClassOfDoubleNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDoubleNullableFromJson(json);
@@ -263,13 +227,11 @@ class SimpleClassOfDoubleNullable {
 class SimpleClassNullableOfDoubleNullable {
   final Iterable<double?>? value;
 
-  SimpleClassNullableOfDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDoubleNullable(this.value);
 
   factory SimpleClassNullableOfDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDoubleNullableToJson(this);
@@ -279,9 +241,7 @@ class SimpleClassNullableOfDoubleNullable {
 class SimpleClassOfDuration {
   final Iterable<Duration> value;
 
-  SimpleClassOfDuration(
-    this.value,
-  );
+  SimpleClassOfDuration(this.value);
 
   factory SimpleClassOfDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDurationFromJson(json);
@@ -293,9 +253,7 @@ class SimpleClassOfDuration {
 class SimpleClassNullableOfDuration {
   final Iterable<Duration>? value;
 
-  SimpleClassNullableOfDuration(
-    this.value,
-  );
+  SimpleClassNullableOfDuration(this.value);
 
   factory SimpleClassNullableOfDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDurationFromJson(json);
@@ -307,9 +265,7 @@ class SimpleClassNullableOfDuration {
 class SimpleClassOfDurationNullable {
   final Iterable<Duration?> value;
 
-  SimpleClassOfDurationNullable(
-    this.value,
-  );
+  SimpleClassOfDurationNullable(this.value);
 
   factory SimpleClassOfDurationNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDurationNullableFromJson(json);
@@ -321,13 +277,11 @@ class SimpleClassOfDurationNullable {
 class SimpleClassNullableOfDurationNullable {
   final Iterable<Duration?>? value;
 
-  SimpleClassNullableOfDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDurationNullable(this.value);
 
   factory SimpleClassNullableOfDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDurationNullableToJson(this);
@@ -337,9 +291,7 @@ class SimpleClassNullableOfDurationNullable {
 class SimpleClassOfDynamic {
   final Iterable<dynamic> value;
 
-  SimpleClassOfDynamic(
-    this.value,
-  );
+  SimpleClassOfDynamic(this.value);
 
   factory SimpleClassOfDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicFromJson(json);
@@ -351,9 +303,7 @@ class SimpleClassOfDynamic {
 class SimpleClassNullableOfDynamic {
   final Iterable<dynamic>? value;
 
-  SimpleClassNullableOfDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfDynamic(this.value);
 
   factory SimpleClassNullableOfDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDynamicFromJson(json);
@@ -365,9 +315,7 @@ class SimpleClassNullableOfDynamic {
 class SimpleClassOfEnumType {
   final Iterable<EnumType> value;
 
-  SimpleClassOfEnumType(
-    this.value,
-  );
+  SimpleClassOfEnumType(this.value);
 
   factory SimpleClassOfEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeFromJson(json);
@@ -379,9 +327,7 @@ class SimpleClassOfEnumType {
 class SimpleClassNullableOfEnumType {
   final Iterable<EnumType>? value;
 
-  SimpleClassNullableOfEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfEnumType(this.value);
 
   factory SimpleClassNullableOfEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfEnumTypeFromJson(json);
@@ -393,9 +339,7 @@ class SimpleClassNullableOfEnumType {
 class SimpleClassOfEnumTypeNullable {
   final Iterable<EnumType?> value;
 
-  SimpleClassOfEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeNullable(this.value);
 
   factory SimpleClassOfEnumTypeNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeNullableFromJson(json);
@@ -407,25 +351,105 @@ class SimpleClassOfEnumTypeNullable {
 class SimpleClassNullableOfEnumTypeNullable {
   final Iterable<EnumType?>? value;
 
-  SimpleClassNullableOfEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeNullableToJson(this);
 }
 
+@JsonSerializable()
+class SimpleClassOfFromJsonDynamicParam {
+  final Iterable<FromJsonDynamicParam> value;
+
+  SimpleClassOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonDynamicParam {
+  final Iterable<FromJsonDynamicParam>? value;
+
+  SimpleClassNullableOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfFromJsonNullableObjectParam {
+  final Iterable<FromJsonNullableObjectParam> value;
+
+  SimpleClassOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonNullableObjectParam {
+  final Iterable<FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfFromJsonObjectParam {
+  final Iterable<FromJsonObjectParam> value;
+
+  SimpleClassOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonObjectParam {
+  final Iterable<FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonObjectParamToJson(this);
+}
+
 @JsonSerializable()
 class SimpleClassOfInt {
   final Iterable<int> value;
 
-  SimpleClassOfInt(
-    this.value,
-  );
+  SimpleClassOfInt(this.value);
 
   factory SimpleClassOfInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntFromJson(json);
@@ -437,9 +461,7 @@ class SimpleClassOfInt {
 class SimpleClassNullableOfInt {
   final Iterable<int>? value;
 
-  SimpleClassNullableOfInt(
-    this.value,
-  );
+  SimpleClassNullableOfInt(this.value);
 
   factory SimpleClassNullableOfInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfIntFromJson(json);
@@ -451,9 +473,7 @@ class SimpleClassNullableOfInt {
 class SimpleClassOfIntNullable {
   final Iterable<int?> value;
 
-  SimpleClassOfIntNullable(
-    this.value,
-  );
+  SimpleClassOfIntNullable(this.value);
 
   factory SimpleClassOfIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntNullableFromJson(json);
@@ -465,13 +485,11 @@ class SimpleClassOfIntNullable {
 class SimpleClassNullableOfIntNullable {
   final Iterable<int?>? value;
 
-  SimpleClassNullableOfIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntNullable(this.value);
 
   factory SimpleClassNullableOfIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntNullableToJson(this);
@@ -481,9 +499,7 @@ class SimpleClassNullableOfIntNullable {
 class SimpleClassOfNum {
   final Iterable<num> value;
 
-  SimpleClassOfNum(
-    this.value,
-  );
+  SimpleClassOfNum(this.value);
 
   factory SimpleClassOfNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfNumFromJson(json);
@@ -495,9 +511,7 @@ class SimpleClassOfNum {
 class SimpleClassNullableOfNum {
   final Iterable<num>? value;
 
-  SimpleClassNullableOfNum(
-    this.value,
-  );
+  SimpleClassNullableOfNum(this.value);
 
   factory SimpleClassNullableOfNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfNumFromJson(json);
@@ -509,9 +523,7 @@ class SimpleClassNullableOfNum {
 class SimpleClassOfNumNullable {
   final Iterable<num?> value;
 
-  SimpleClassOfNumNullable(
-    this.value,
-  );
+  SimpleClassOfNumNullable(this.value);
 
   factory SimpleClassOfNumNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfNumNullableFromJson(json);
@@ -523,13 +535,11 @@ class SimpleClassOfNumNullable {
 class SimpleClassNullableOfNumNullable {
   final Iterable<num?>? value;
 
-  SimpleClassNullableOfNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfNumNullable(this.value);
 
   factory SimpleClassNullableOfNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfNumNullableToJson(this);
@@ -539,9 +549,7 @@ class SimpleClassNullableOfNumNullable {
 class SimpleClassOfObject {
   final Iterable<Object> value;
 
-  SimpleClassOfObject(
-    this.value,
-  );
+  SimpleClassOfObject(this.value);
 
   factory SimpleClassOfObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectFromJson(json);
@@ -553,9 +561,7 @@ class SimpleClassOfObject {
 class SimpleClassNullableOfObject {
   final Iterable<Object>? value;
 
-  SimpleClassNullableOfObject(
-    this.value,
-  );
+  SimpleClassNullableOfObject(this.value);
 
   factory SimpleClassNullableOfObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfObjectFromJson(json);
@@ -567,9 +573,7 @@ class SimpleClassNullableOfObject {
 class SimpleClassOfObjectNullable {
   final Iterable<Object?> value;
 
-  SimpleClassOfObjectNullable(
-    this.value,
-  );
+  SimpleClassOfObjectNullable(this.value);
 
   factory SimpleClassOfObjectNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectNullableFromJson(json);
@@ -581,25 +585,45 @@ class SimpleClassOfObjectNullable {
 class SimpleClassNullableOfObjectNullable {
   final Iterable<Object?>? value;
 
-  SimpleClassNullableOfObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectNullable(this.value);
 
   factory SimpleClassNullableOfObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectNullableToJson(this);
 }
 
+@JsonSerializable()
+class SimpleClassOfRecord {
+  final Iterable<(int, String, {bool truth})> value;
+
+  SimpleClassOfRecord(this.value);
+
+  factory SimpleClassOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfRecord {
+  final Iterable<(int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfRecord(this.value);
+
+  factory SimpleClassNullableOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfRecordToJson(this);
+}
+
 @JsonSerializable()
 class SimpleClassOfString {
   final Iterable<String> value;
 
-  SimpleClassOfString(
-    this.value,
-  );
+  SimpleClassOfString(this.value);
 
   factory SimpleClassOfString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringFromJson(json);
@@ -611,9 +635,7 @@ class SimpleClassOfString {
 class SimpleClassNullableOfString {
   final Iterable<String>? value;
 
-  SimpleClassNullableOfString(
-    this.value,
-  );
+  SimpleClassNullableOfString(this.value);
 
   factory SimpleClassNullableOfString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfStringFromJson(json);
@@ -625,9 +647,7 @@ class SimpleClassNullableOfString {
 class SimpleClassOfStringNullable {
   final Iterable<String?> value;
 
-  SimpleClassOfStringNullable(
-    this.value,
-  );
+  SimpleClassOfStringNullable(this.value);
 
   factory SimpleClassOfStringNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringNullableFromJson(json);
@@ -639,13 +659,11 @@ class SimpleClassOfStringNullable {
 class SimpleClassNullableOfStringNullable {
   final Iterable<String?>? value;
 
-  SimpleClassNullableOfStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringNullable(this.value);
 
   factory SimpleClassNullableOfStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringNullableToJson(this);
@@ -655,9 +673,7 @@ class SimpleClassNullableOfStringNullable {
 class SimpleClassOfUri {
   final Iterable<Uri> value;
 
-  SimpleClassOfUri(
-    this.value,
-  );
+  SimpleClassOfUri(this.value);
 
   factory SimpleClassOfUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriFromJson(json);
@@ -669,9 +685,7 @@ class SimpleClassOfUri {
 class SimpleClassNullableOfUri {
   final Iterable<Uri>? value;
 
-  SimpleClassNullableOfUri(
-    this.value,
-  );
+  SimpleClassNullableOfUri(this.value);
 
   factory SimpleClassNullableOfUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfUriFromJson(json);
@@ -683,9 +697,7 @@ class SimpleClassNullableOfUri {
 class SimpleClassOfUriNullable {
   final Iterable<Uri?> value;
 
-  SimpleClassOfUriNullable(
-    this.value,
-  );
+  SimpleClassOfUriNullable(this.value);
 
   factory SimpleClassOfUriNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriNullableFromJson(json);
@@ -697,13 +709,11 @@ class SimpleClassOfUriNullable {
 class SimpleClassNullableOfUriNullable {
   final Iterable<Uri?>? value;
 
-  SimpleClassNullableOfUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriNullable(this.value);
 
   factory SimpleClassNullableOfUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriNullableToJson(this);
diff --git a/json_serializable/test/supported_types/input.type_iterable.g.dart b/json_serializable/test/supported_types/input.type_iterable.g.dart
index f312e76ba..6f2df94a4 100644
--- a/json_serializable/test/supported_types/input.type_iterable.g.dart
+++ b/json_serializable/test/supported_types/input.type_iterable.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_iterable.dart';
 
@@ -9,9 +9,9 @@ part of 'input.type_iterable.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as List<dynamic>,
-      json['withDefault'] as List<dynamic>? ?? [42, true, false, null],
-    );
+  json['value'] as List<dynamic>,
+  json['withDefault'] as List<dynamic>? ?? [42, true, false, null],
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -26,11 +26,11 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-      'withDefault': instance.withDefault?.toList(),
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.toList(),
+  'withDefault': instance.withDefault?.toList(),
+};
 
 SimpleClassOfBigInt _$SimpleClassOfBigIntFromJson(Map<String, dynamic> json) =>
     SimpleClassOfBigInt(
@@ -38,146 +38,138 @@ SimpleClassOfBigInt _$SimpleClassOfBigIntFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToJson(
-        SimpleClassOfBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.toString()).toList(),
-    };
+  SimpleClassOfBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.toString()).toList(),
+};
 
 SimpleClassNullableOfBigInt _$SimpleClassNullableOfBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBigInt(
-      (json['value'] as List<dynamic>?)?.map((e) => BigInt.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigInt(
+  (json['value'] as List<dynamic>?)?.map((e) => BigInt.parse(e as String)),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToJson(
-        SimpleClassNullableOfBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toString()).toList(),
-    };
+  SimpleClassNullableOfBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toString()).toList(),
+};
 
 SimpleClassOfBigIntNullable _$SimpleClassOfBigIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : BigInt.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntNullable(
+  (json['value'] as List<dynamic>).map(
+    (e) => e == null ? null : BigInt.parse(e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntNullableToJson(
-        SimpleClassOfBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassNullableOfBigIntNullable
-    _$SimpleClassNullableOfBigIntNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : BigInt.parse(e as String)),
-        );
+_$SimpleClassNullableOfBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntNullable(
+      (json['value'] as List<dynamic>?)?.map(
+        (e) => e == null ? null : BigInt.parse(e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntNullableToJson(
-        SimpleClassNullableOfBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassNullableOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassOfBool _$SimpleClassOfBoolFromJson(Map<String, dynamic> json) =>
-    SimpleClassOfBool(
-      (json['value'] as List<dynamic>).map((e) => e as bool),
-    );
+    SimpleClassOfBool((json['value'] as List<dynamic>).map((e) => e as bool));
 
 Map<String, dynamic> _$SimpleClassOfBoolToJson(SimpleClassOfBool instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+    <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfBool _$SimpleClassNullableOfBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBool(
-      (json['value'] as List<dynamic>?)?.map((e) => e as bool),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBool(
+  (json['value'] as List<dynamic>?)?.map((e) => e as bool),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBoolToJson(
-        SimpleClassNullableOfBool instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfBool instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfBoolNullable _$SimpleClassOfBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBoolNullable(
-      (json['value'] as List<dynamic>).map((e) => e as bool?),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBoolNullable(
+  (json['value'] as List<dynamic>).map((e) => e as bool?),
+);
 
 Map<String, dynamic> _$SimpleClassOfBoolNullableToJson(
-        SimpleClassOfBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfBoolNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfBoolNullable _$SimpleClassNullableOfBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBoolNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as bool?),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBoolNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => e as bool?),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBoolNullableToJson(
-        SimpleClassNullableOfBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfBoolNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfDateTime _$SimpleClassOfDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTime(
-      (json['value'] as List<dynamic>).map((e) => DateTime.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTime(
+  (json['value'] as List<dynamic>).map((e) => DateTime.parse(e as String)),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToJson(
-        SimpleClassOfDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.toIso8601String()).toList(),
-    };
+  SimpleClassOfDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.toIso8601String()).toList(),
+};
 
 SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDateTime(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTime(
+  (json['value'] as List<dynamic>?)?.map((e) => DateTime.parse(e as String)),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToJson(
-        SimpleClassNullableOfDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toIso8601String()).toList(),
-    };
+  SimpleClassNullableOfDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toIso8601String()).toList(),
+};
 
 SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : DateTime.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeNullable(
+  (json['value'] as List<dynamic>).map(
+    (e) => e == null ? null : DateTime.parse(e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeNullableToJson(
-        SimpleClassOfDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toIso8601String()).toList(),
-    };
+  SimpleClassOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toIso8601String()).toList(),
+};
 
 SimpleClassNullableOfDateTimeNullable
-    _$SimpleClassNullableOfDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : DateTime.parse(e as String)),
-        );
+_$SimpleClassNullableOfDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeNullable(
+      (json['value'] as List<dynamic>?)?.map(
+        (e) => e == null ? null : DateTime.parse(e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeNullableToJson(
-        SimpleClassNullableOfDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toIso8601String()).toList(),
-    };
+  SimpleClassNullableOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toIso8601String()).toList(),
+};
 
 SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map<String, dynamic> json) =>
     SimpleClassOfDouble(
@@ -185,137 +177,124 @@ SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfDoubleToJson(
-        SimpleClassOfDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfDouble instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfDouble _$SimpleClassNullableOfDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDouble(
-      (json['value'] as List<dynamic>?)?.map((e) => (e as num).toDouble()),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDouble(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num).toDouble()),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDoubleToJson(
-        SimpleClassNullableOfDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfDouble instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfDoubleNullable _$SimpleClassOfDoubleNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDoubleNullable(
-      (json['value'] as List<dynamic>).map((e) => (e as num?)?.toDouble()),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDoubleNullable(
+  (json['value'] as List<dynamic>).map((e) => (e as num?)?.toDouble()),
+);
 
 Map<String, dynamic> _$SimpleClassOfDoubleNullableToJson(
-        SimpleClassOfDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfDoubleNullable
-    _$SimpleClassNullableOfDoubleNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDoubleNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => (e as num?)?.toDouble()),
-        );
+_$SimpleClassNullableOfDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDoubleNullable(
+      (json['value'] as List<dynamic>?)?.map((e) => (e as num?)?.toDouble()),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDoubleNullableToJson(
-        SimpleClassNullableOfDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfDuration _$SimpleClassOfDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDuration(
-      (json['value'] as List<dynamic>)
-          .map((e) => Duration(microseconds: e as int)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDuration(
+  (json['value'] as List<dynamic>).map(
+    (e) => Duration(microseconds: (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDurationToJson(
-        SimpleClassOfDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.inMicroseconds).toList(),
-    };
+  SimpleClassOfDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.inMicroseconds).toList(),
+};
 
 SimpleClassNullableOfDuration _$SimpleClassNullableOfDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDuration(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => Duration(microseconds: e as int)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDuration(
+  (json['value'] as List<dynamic>?)?.map(
+    (e) => Duration(microseconds: (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDurationToJson(
-        SimpleClassNullableOfDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.inMicroseconds).toList(),
-    };
+  SimpleClassNullableOfDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.inMicroseconds).toList(),
+};
 
 SimpleClassOfDurationNullable _$SimpleClassOfDurationNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDurationNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : Duration(microseconds: e as int)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDurationNullable(
+  (json['value'] as List<dynamic>).map(
+    (e) => e == null ? null : Duration(microseconds: (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDurationNullableToJson(
-        SimpleClassOfDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.inMicroseconds).toList(),
-    };
+  SimpleClassOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.inMicroseconds).toList(),
+};
 
 SimpleClassNullableOfDurationNullable
-    _$SimpleClassNullableOfDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDurationNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : Duration(microseconds: e as int)),
-        );
+_$SimpleClassNullableOfDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDurationNullable(
+      (json['value'] as List<dynamic>?)?.map(
+        (e) => e == null ? null : Duration(microseconds: (e as num).toInt()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDurationNullableToJson(
-        SimpleClassNullableOfDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.inMicroseconds).toList(),
-    };
+  SimpleClassNullableOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.inMicroseconds).toList(),
+};
 
 SimpleClassOfDynamic _$SimpleClassOfDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamic(
-      json['value'] as List<dynamic>,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamic(json['value'] as List<dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToJson(
-        SimpleClassOfDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfDynamic instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfDynamic _$SimpleClassNullableOfDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDynamic(
-      json['value'] as List<dynamic>?,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamic(json['value'] as List<dynamic>?);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToJson(
-        SimpleClassNullableOfDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfDynamic instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfEnumType _$SimpleClassOfEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumType(
-      (json['value'] as List<dynamic>)
-          .map((e) => $enumDecode(_$EnumTypeEnumMap, e)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumType(
+  (json['value'] as List<dynamic>).map(
+    (e) => $enumDecode(_$EnumTypeEnumMap, e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToJson(
-        SimpleClassOfEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassOfEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => _$EnumTypeEnumMap[e]!).toList(),
+};
 
 const _$EnumTypeEnumMap = {
   EnumType.alpha: 'alpha',
@@ -325,136 +304,188 @@ const _$EnumTypeEnumMap = {
 };
 
 SimpleClassNullableOfEnumType _$SimpleClassNullableOfEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfEnumType(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => $enumDecode(_$EnumTypeEnumMap, e)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumType(
+  (json['value'] as List<dynamic>?)?.map(
+    (e) => $enumDecode(_$EnumTypeEnumMap, e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToJson(
-        SimpleClassNullableOfEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassNullableOfEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]!).toList(),
+};
 
 SimpleClassOfEnumTypeNullable _$SimpleClassOfEnumTypeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeNullable(
+  (json['value'] as List<dynamic>).map(
+    (e) => $enumDecodeNullable(_$EnumTypeEnumMap, e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeNullableToJson(
-        SimpleClassOfEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
+};
 
 SimpleClassNullableOfEnumTypeNullable
-    _$SimpleClassNullableOfEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-        );
+_$SimpleClassNullableOfEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeNullable(
+      (json['value'] as List<dynamic>?)?.map(
+        (e) => $enumDecodeNullable(_$EnumTypeEnumMap, e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeNullableToJson(
-        SimpleClassNullableOfEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassNullableOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
+};
+
+SimpleClassOfFromJsonDynamicParam _$SimpleClassOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonDynamicParam(
+  (json['value'] as List<dynamic>).map(FromJsonDynamicParam.fromJson),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonDynamicParamToJson(
+  SimpleClassOfFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value.toList()};
+
+SimpleClassNullableOfFromJsonDynamicParam
+_$SimpleClassNullableOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonDynamicParam(
+  (json['value'] as List<dynamic>?)?.map(FromJsonDynamicParam.fromJson),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonDynamicParamToJson(
+  SimpleClassNullableOfFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
+
+SimpleClassOfFromJsonNullableObjectParam
+_$SimpleClassOfFromJsonNullableObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfFromJsonNullableObjectParam(
+      (json['value'] as List<dynamic>).map(
+        FromJsonNullableObjectParam.fromJson,
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfFromJsonNullableObjectParamToJson(
+  SimpleClassOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value.toList()};
+
+SimpleClassNullableOfFromJsonNullableObjectParam
+_$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonNullableObjectParam(
+  (json['value'] as List<dynamic>?)?.map(FromJsonNullableObjectParam.fromJson),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
+
+SimpleClassOfFromJsonObjectParam _$SimpleClassOfFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonObjectParam(
+  (json['value'] as List<dynamic>).map(
+    (e) => FromJsonObjectParam.fromJson(e as Object),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonObjectParamToJson(
+  SimpleClassOfFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value.toList()};
+
+SimpleClassNullableOfFromJsonObjectParam
+_$SimpleClassNullableOfFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfFromJsonObjectParam(
+      (json['value'] as List<dynamic>?)?.map(
+        (e) => FromJsonObjectParam.fromJson(e as Object),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonObjectParamToJson(
+  SimpleClassNullableOfFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfInt _$SimpleClassOfIntFromJson(Map<String, dynamic> json) =>
     SimpleClassOfInt(
-      (json['value'] as List<dynamic>).map((e) => e as int),
+      (json['value'] as List<dynamic>).map((e) => (e as num).toInt()),
     );
 
 Map<String, dynamic> _$SimpleClassOfIntToJson(SimpleClassOfInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+    <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfInt _$SimpleClassNullableOfIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfInt(
-      (json['value'] as List<dynamic>?)?.map((e) => e as int),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfInt(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num).toInt()),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToJson(
-        SimpleClassNullableOfInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfInt instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfIntNullable _$SimpleClassOfIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntNullable(
-      (json['value'] as List<dynamic>).map((e) => e as int?),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntNullable(
+  (json['value'] as List<dynamic>).map((e) => (e as num?)?.toInt()),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntNullableToJson(
-        SimpleClassOfIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfIntNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfIntNullable _$SimpleClassNullableOfIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as int?),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num?)?.toInt()),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntNullableToJson(
-        SimpleClassNullableOfIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfIntNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfNum _$SimpleClassOfNumFromJson(Map<String, dynamic> json) =>
-    SimpleClassOfNum(
-      (json['value'] as List<dynamic>).map((e) => e as num),
-    );
+    SimpleClassOfNum((json['value'] as List<dynamic>).map((e) => e as num));
 
 Map<String, dynamic> _$SimpleClassOfNumToJson(SimpleClassOfNum instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+    <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfNum _$SimpleClassNullableOfNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfNum(
-      (json['value'] as List<dynamic>?)?.map((e) => e as num),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNum(
+  (json['value'] as List<dynamic>?)?.map((e) => e as num),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfNumToJson(
-        SimpleClassNullableOfNum instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfNum instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfNumNullable _$SimpleClassOfNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfNumNullable(
-      (json['value'] as List<dynamic>).map((e) => e as num?),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfNumNullable(
+  (json['value'] as List<dynamic>).map((e) => e as num?),
+);
 
 Map<String, dynamic> _$SimpleClassOfNumNullableToJson(
-        SimpleClassOfNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfNumNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfNumNullable _$SimpleClassNullableOfNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfNumNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as num?),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNumNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => e as num?),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfNumNullableToJson(
-        SimpleClassNullableOfNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfNumNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfObject _$SimpleClassOfObjectFromJson(Map<String, dynamic> json) =>
     SimpleClassOfObject(
@@ -462,46 +493,84 @@ SimpleClassOfObject _$SimpleClassOfObjectFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfObjectToJson(
-        SimpleClassOfObject instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfObject instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfObject _$SimpleClassNullableOfObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfObject(
-      (json['value'] as List<dynamic>?)?.map((e) => e as Object),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObject(
+  (json['value'] as List<dynamic>?)?.map((e) => e as Object),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToJson(
-        SimpleClassNullableOfObject instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfObject instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfObjectNullable _$SimpleClassOfObjectNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectNullable(
-      json['value'] as List<dynamic>,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectNullable(json['value'] as List<dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfObjectNullableToJson(
-        SimpleClassOfObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfObjectNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfObjectNullable
-    _$SimpleClassNullableOfObjectNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectNullable(
-          json['value'] as List<dynamic>?,
-        );
+_$SimpleClassNullableOfObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectNullable(json['value'] as List<dynamic>?);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectNullableToJson(
-        SimpleClassNullableOfObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfObjectNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
+
+SimpleClassOfRecord _$SimpleClassOfRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfRecord(
+      (json['value'] as List<dynamic>).map(
+        (e) => _$recordConvert(
+          e,
+          ($jsonValue) => (
+            ($jsonValue[r'$1'] as num).toInt(),
+            $jsonValue[r'$2'] as String,
+            truth: $jsonValue['truth'] as bool,
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfRecordToJson(
+  SimpleClassOfRecord instance,
+) => <String, dynamic>{
+  'value': instance.value
+      .map((e) => <String, dynamic>{r'$1': e.$1, r'$2': e.$2, 'truth': e.truth})
+      .toList(),
+};
+
+$Rec _$recordConvert<$Rec>(Object? value, $Rec Function(Map) convert) =>
+    convert(value as Map<String, dynamic>);
+
+SimpleClassNullableOfRecord _$SimpleClassNullableOfRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfRecord(
+  (json['value'] as List<dynamic>?)?.map(
+    (e) => _$recordConvert(
+      e,
+      ($jsonValue) => (
+        ($jsonValue[r'$1'] as num).toInt(),
+        $jsonValue[r'$2'] as String,
+        truth: $jsonValue['truth'] as bool,
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfRecordToJson(
+  SimpleClassNullableOfRecord instance,
+) => <String, dynamic>{
+  'value': instance.value
+      ?.map(
+        (e) => <String, dynamic>{r'$1': e.$1, r'$2': e.$2, 'truth': e.truth},
+      )
+      .toList(),
+};
 
 SimpleClassOfString _$SimpleClassOfStringFromJson(Map<String, dynamic> json) =>
     SimpleClassOfString(
@@ -509,46 +578,38 @@ SimpleClassOfString _$SimpleClassOfStringFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfStringToJson(
-        SimpleClassOfString instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfString instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfString _$SimpleClassNullableOfStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfString(
-      (json['value'] as List<dynamic>?)?.map((e) => e as String),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfString(
+  (json['value'] as List<dynamic>?)?.map((e) => e as String),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToJson(
-        SimpleClassNullableOfString instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfString instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfStringNullable _$SimpleClassOfStringNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringNullable(
-      (json['value'] as List<dynamic>).map((e) => e as String?),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringNullable(
+  (json['value'] as List<dynamic>).map((e) => e as String?),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringNullableToJson(
-        SimpleClassOfStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfStringNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfStringNullable
-    _$SimpleClassNullableOfStringNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringNullable(
-          (json['value'] as List<dynamic>?)?.map((e) => e as String?),
-        );
+_$SimpleClassNullableOfStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringNullable(
+      (json['value'] as List<dynamic>?)?.map((e) => e as String?),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringNullableToJson(
-        SimpleClassNullableOfStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfStringNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfUri _$SimpleClassOfUriFromJson(Map<String, dynamic> json) =>
     SimpleClassOfUri(
@@ -561,39 +622,41 @@ Map<String, dynamic> _$SimpleClassOfUriToJson(SimpleClassOfUri instance) =>
     };
 
 SimpleClassNullableOfUri _$SimpleClassNullableOfUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUri(
-      (json['value'] as List<dynamic>?)?.map((e) => Uri.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUri(
+  (json['value'] as List<dynamic>?)?.map((e) => Uri.parse(e as String)),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToJson(
-        SimpleClassNullableOfUri instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toString()).toList(),
-    };
+  SimpleClassNullableOfUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toString()).toList(),
+};
 
 SimpleClassOfUriNullable _$SimpleClassOfUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : Uri.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriNullable(
+  (json['value'] as List<dynamic>).map(
+    (e) => e == null ? null : Uri.parse(e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriNullableToJson(
-        SimpleClassOfUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassOfUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassNullableOfUriNullable _$SimpleClassNullableOfUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriNullable(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => e == null ? null : Uri.parse(e as String)),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriNullable(
+  (json['value'] as List<dynamic>?)?.map(
+    (e) => e == null ? null : Uri.parse(e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriNullableToJson(
-        SimpleClassNullableOfUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassNullableOfUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toString()).toList(),
+};
diff --git a/json_serializable/test/supported_types/input.type_list.dart b/json_serializable/test/supported_types/input.type_list.dart
index 41f35fe72..dd23ca6dc 100644
--- a/json_serializable/test/supported_types/input.type_list.dart
+++ b/json_serializable/test/supported_types/input.type_list.dart
@@ -14,10 +14,7 @@ class SimpleClass {
   @JsonKey(defaultValue: [42, true, false, null])
   List withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -32,10 +29,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: [42, true, false, null])
   List? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
@@ -47,9 +41,7 @@ class SimpleClassNullable {
 class SimpleClassOfBigInt {
   final List<BigInt> value;
 
-  SimpleClassOfBigInt(
-    this.value,
-  );
+  SimpleClassOfBigInt(this.value);
 
   factory SimpleClassOfBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntFromJson(json);
@@ -61,9 +53,7 @@ class SimpleClassOfBigInt {
 class SimpleClassNullableOfBigInt {
   final List<BigInt>? value;
 
-  SimpleClassNullableOfBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfBigInt(this.value);
 
   factory SimpleClassNullableOfBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfBigIntFromJson(json);
@@ -75,9 +65,7 @@ class SimpleClassNullableOfBigInt {
 class SimpleClassOfBigIntNullable {
   final List<BigInt?> value;
 
-  SimpleClassOfBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntNullable(this.value);
 
   factory SimpleClassOfBigIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntNullableFromJson(json);
@@ -89,13 +77,11 @@ class SimpleClassOfBigIntNullable {
 class SimpleClassNullableOfBigIntNullable {
   final List<BigInt?>? value;
 
-  SimpleClassNullableOfBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntNullable(this.value);
 
   factory SimpleClassNullableOfBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntNullableToJson(this);
@@ -105,9 +91,7 @@ class SimpleClassNullableOfBigIntNullable {
 class SimpleClassOfBool {
   final List<bool> value;
 
-  SimpleClassOfBool(
-    this.value,
-  );
+  SimpleClassOfBool(this.value);
 
   factory SimpleClassOfBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBoolFromJson(json);
@@ -119,9 +103,7 @@ class SimpleClassOfBool {
 class SimpleClassNullableOfBool {
   final List<bool>? value;
 
-  SimpleClassNullableOfBool(
-    this.value,
-  );
+  SimpleClassNullableOfBool(this.value);
 
   factory SimpleClassNullableOfBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfBoolFromJson(json);
@@ -133,9 +115,7 @@ class SimpleClassNullableOfBool {
 class SimpleClassOfBoolNullable {
   final List<bool?> value;
 
-  SimpleClassOfBoolNullable(
-    this.value,
-  );
+  SimpleClassOfBoolNullable(this.value);
 
   factory SimpleClassOfBoolNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBoolNullableFromJson(json);
@@ -147,13 +127,11 @@ class SimpleClassOfBoolNullable {
 class SimpleClassNullableOfBoolNullable {
   final List<bool?>? value;
 
-  SimpleClassNullableOfBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBoolNullable(this.value);
 
   factory SimpleClassNullableOfBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBoolNullableToJson(this);
@@ -163,9 +141,7 @@ class SimpleClassNullableOfBoolNullable {
 class SimpleClassOfDateTime {
   final List<DateTime> value;
 
-  SimpleClassOfDateTime(
-    this.value,
-  );
+  SimpleClassOfDateTime(this.value);
 
   factory SimpleClassOfDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeFromJson(json);
@@ -177,9 +153,7 @@ class SimpleClassOfDateTime {
 class SimpleClassNullableOfDateTime {
   final List<DateTime>? value;
 
-  SimpleClassNullableOfDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfDateTime(this.value);
 
   factory SimpleClassNullableOfDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDateTimeFromJson(json);
@@ -191,9 +165,7 @@ class SimpleClassNullableOfDateTime {
 class SimpleClassOfDateTimeNullable {
   final List<DateTime?> value;
 
-  SimpleClassOfDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeNullable(this.value);
 
   factory SimpleClassOfDateTimeNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeNullableFromJson(json);
@@ -205,13 +177,11 @@ class SimpleClassOfDateTimeNullable {
 class SimpleClassNullableOfDateTimeNullable {
   final List<DateTime?>? value;
 
-  SimpleClassNullableOfDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeNullableToJson(this);
@@ -221,9 +191,7 @@ class SimpleClassNullableOfDateTimeNullable {
 class SimpleClassOfDouble {
   final List<double> value;
 
-  SimpleClassOfDouble(
-    this.value,
-  );
+  SimpleClassOfDouble(this.value);
 
   factory SimpleClassOfDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDoubleFromJson(json);
@@ -235,9 +203,7 @@ class SimpleClassOfDouble {
 class SimpleClassNullableOfDouble {
   final List<double>? value;
 
-  SimpleClassNullableOfDouble(
-    this.value,
-  );
+  SimpleClassNullableOfDouble(this.value);
 
   factory SimpleClassNullableOfDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDoubleFromJson(json);
@@ -249,9 +215,7 @@ class SimpleClassNullableOfDouble {
 class SimpleClassOfDoubleNullable {
   final List<double?> value;
 
-  SimpleClassOfDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfDoubleNullable(this.value);
 
   factory SimpleClassOfDoubleNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDoubleNullableFromJson(json);
@@ -263,13 +227,11 @@ class SimpleClassOfDoubleNullable {
 class SimpleClassNullableOfDoubleNullable {
   final List<double?>? value;
 
-  SimpleClassNullableOfDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDoubleNullable(this.value);
 
   factory SimpleClassNullableOfDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDoubleNullableToJson(this);
@@ -279,9 +241,7 @@ class SimpleClassNullableOfDoubleNullable {
 class SimpleClassOfDuration {
   final List<Duration> value;
 
-  SimpleClassOfDuration(
-    this.value,
-  );
+  SimpleClassOfDuration(this.value);
 
   factory SimpleClassOfDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDurationFromJson(json);
@@ -293,9 +253,7 @@ class SimpleClassOfDuration {
 class SimpleClassNullableOfDuration {
   final List<Duration>? value;
 
-  SimpleClassNullableOfDuration(
-    this.value,
-  );
+  SimpleClassNullableOfDuration(this.value);
 
   factory SimpleClassNullableOfDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDurationFromJson(json);
@@ -307,9 +265,7 @@ class SimpleClassNullableOfDuration {
 class SimpleClassOfDurationNullable {
   final List<Duration?> value;
 
-  SimpleClassOfDurationNullable(
-    this.value,
-  );
+  SimpleClassOfDurationNullable(this.value);
 
   factory SimpleClassOfDurationNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDurationNullableFromJson(json);
@@ -321,13 +277,11 @@ class SimpleClassOfDurationNullable {
 class SimpleClassNullableOfDurationNullable {
   final List<Duration?>? value;
 
-  SimpleClassNullableOfDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDurationNullable(this.value);
 
   factory SimpleClassNullableOfDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDurationNullableToJson(this);
@@ -337,9 +291,7 @@ class SimpleClassNullableOfDurationNullable {
 class SimpleClassOfDynamic {
   final List<dynamic> value;
 
-  SimpleClassOfDynamic(
-    this.value,
-  );
+  SimpleClassOfDynamic(this.value);
 
   factory SimpleClassOfDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicFromJson(json);
@@ -351,9 +303,7 @@ class SimpleClassOfDynamic {
 class SimpleClassNullableOfDynamic {
   final List<dynamic>? value;
 
-  SimpleClassNullableOfDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfDynamic(this.value);
 
   factory SimpleClassNullableOfDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDynamicFromJson(json);
@@ -365,9 +315,7 @@ class SimpleClassNullableOfDynamic {
 class SimpleClassOfEnumType {
   final List<EnumType> value;
 
-  SimpleClassOfEnumType(
-    this.value,
-  );
+  SimpleClassOfEnumType(this.value);
 
   factory SimpleClassOfEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeFromJson(json);
@@ -379,9 +327,7 @@ class SimpleClassOfEnumType {
 class SimpleClassNullableOfEnumType {
   final List<EnumType>? value;
 
-  SimpleClassNullableOfEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfEnumType(this.value);
 
   factory SimpleClassNullableOfEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfEnumTypeFromJson(json);
@@ -393,9 +339,7 @@ class SimpleClassNullableOfEnumType {
 class SimpleClassOfEnumTypeNullable {
   final List<EnumType?> value;
 
-  SimpleClassOfEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeNullable(this.value);
 
   factory SimpleClassOfEnumTypeNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeNullableFromJson(json);
@@ -407,25 +351,105 @@ class SimpleClassOfEnumTypeNullable {
 class SimpleClassNullableOfEnumTypeNullable {
   final List<EnumType?>? value;
 
-  SimpleClassNullableOfEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeNullableToJson(this);
 }
 
+@JsonSerializable()
+class SimpleClassOfFromJsonDynamicParam {
+  final List<FromJsonDynamicParam> value;
+
+  SimpleClassOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonDynamicParam {
+  final List<FromJsonDynamicParam>? value;
+
+  SimpleClassNullableOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfFromJsonNullableObjectParam {
+  final List<FromJsonNullableObjectParam> value;
+
+  SimpleClassOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonNullableObjectParam {
+  final List<FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfFromJsonObjectParam {
+  final List<FromJsonObjectParam> value;
+
+  SimpleClassOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonObjectParam {
+  final List<FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonObjectParamToJson(this);
+}
+
 @JsonSerializable()
 class SimpleClassOfInt {
   final List<int> value;
 
-  SimpleClassOfInt(
-    this.value,
-  );
+  SimpleClassOfInt(this.value);
 
   factory SimpleClassOfInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntFromJson(json);
@@ -437,9 +461,7 @@ class SimpleClassOfInt {
 class SimpleClassNullableOfInt {
   final List<int>? value;
 
-  SimpleClassNullableOfInt(
-    this.value,
-  );
+  SimpleClassNullableOfInt(this.value);
 
   factory SimpleClassNullableOfInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfIntFromJson(json);
@@ -451,9 +473,7 @@ class SimpleClassNullableOfInt {
 class SimpleClassOfIntNullable {
   final List<int?> value;
 
-  SimpleClassOfIntNullable(
-    this.value,
-  );
+  SimpleClassOfIntNullable(this.value);
 
   factory SimpleClassOfIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntNullableFromJson(json);
@@ -465,13 +485,11 @@ class SimpleClassOfIntNullable {
 class SimpleClassNullableOfIntNullable {
   final List<int?>? value;
 
-  SimpleClassNullableOfIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntNullable(this.value);
 
   factory SimpleClassNullableOfIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntNullableToJson(this);
@@ -481,9 +499,7 @@ class SimpleClassNullableOfIntNullable {
 class SimpleClassOfNum {
   final List<num> value;
 
-  SimpleClassOfNum(
-    this.value,
-  );
+  SimpleClassOfNum(this.value);
 
   factory SimpleClassOfNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfNumFromJson(json);
@@ -495,9 +511,7 @@ class SimpleClassOfNum {
 class SimpleClassNullableOfNum {
   final List<num>? value;
 
-  SimpleClassNullableOfNum(
-    this.value,
-  );
+  SimpleClassNullableOfNum(this.value);
 
   factory SimpleClassNullableOfNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfNumFromJson(json);
@@ -509,9 +523,7 @@ class SimpleClassNullableOfNum {
 class SimpleClassOfNumNullable {
   final List<num?> value;
 
-  SimpleClassOfNumNullable(
-    this.value,
-  );
+  SimpleClassOfNumNullable(this.value);
 
   factory SimpleClassOfNumNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfNumNullableFromJson(json);
@@ -523,13 +535,11 @@ class SimpleClassOfNumNullable {
 class SimpleClassNullableOfNumNullable {
   final List<num?>? value;
 
-  SimpleClassNullableOfNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfNumNullable(this.value);
 
   factory SimpleClassNullableOfNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfNumNullableToJson(this);
@@ -539,9 +549,7 @@ class SimpleClassNullableOfNumNullable {
 class SimpleClassOfObject {
   final List<Object> value;
 
-  SimpleClassOfObject(
-    this.value,
-  );
+  SimpleClassOfObject(this.value);
 
   factory SimpleClassOfObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectFromJson(json);
@@ -553,9 +561,7 @@ class SimpleClassOfObject {
 class SimpleClassNullableOfObject {
   final List<Object>? value;
 
-  SimpleClassNullableOfObject(
-    this.value,
-  );
+  SimpleClassNullableOfObject(this.value);
 
   factory SimpleClassNullableOfObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfObjectFromJson(json);
@@ -567,9 +573,7 @@ class SimpleClassNullableOfObject {
 class SimpleClassOfObjectNullable {
   final List<Object?> value;
 
-  SimpleClassOfObjectNullable(
-    this.value,
-  );
+  SimpleClassOfObjectNullable(this.value);
 
   factory SimpleClassOfObjectNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectNullableFromJson(json);
@@ -581,25 +585,45 @@ class SimpleClassOfObjectNullable {
 class SimpleClassNullableOfObjectNullable {
   final List<Object?>? value;
 
-  SimpleClassNullableOfObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectNullable(this.value);
 
   factory SimpleClassNullableOfObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectNullableToJson(this);
 }
 
+@JsonSerializable()
+class SimpleClassOfRecord {
+  final List<(int, String, {bool truth})> value;
+
+  SimpleClassOfRecord(this.value);
+
+  factory SimpleClassOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfRecord {
+  final List<(int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfRecord(this.value);
+
+  factory SimpleClassNullableOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfRecordToJson(this);
+}
+
 @JsonSerializable()
 class SimpleClassOfString {
   final List<String> value;
 
-  SimpleClassOfString(
-    this.value,
-  );
+  SimpleClassOfString(this.value);
 
   factory SimpleClassOfString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringFromJson(json);
@@ -611,9 +635,7 @@ class SimpleClassOfString {
 class SimpleClassNullableOfString {
   final List<String>? value;
 
-  SimpleClassNullableOfString(
-    this.value,
-  );
+  SimpleClassNullableOfString(this.value);
 
   factory SimpleClassNullableOfString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfStringFromJson(json);
@@ -625,9 +647,7 @@ class SimpleClassNullableOfString {
 class SimpleClassOfStringNullable {
   final List<String?> value;
 
-  SimpleClassOfStringNullable(
-    this.value,
-  );
+  SimpleClassOfStringNullable(this.value);
 
   factory SimpleClassOfStringNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringNullableFromJson(json);
@@ -639,13 +659,11 @@ class SimpleClassOfStringNullable {
 class SimpleClassNullableOfStringNullable {
   final List<String?>? value;
 
-  SimpleClassNullableOfStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringNullable(this.value);
 
   factory SimpleClassNullableOfStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringNullableToJson(this);
@@ -655,9 +673,7 @@ class SimpleClassNullableOfStringNullable {
 class SimpleClassOfUri {
   final List<Uri> value;
 
-  SimpleClassOfUri(
-    this.value,
-  );
+  SimpleClassOfUri(this.value);
 
   factory SimpleClassOfUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriFromJson(json);
@@ -669,9 +685,7 @@ class SimpleClassOfUri {
 class SimpleClassNullableOfUri {
   final List<Uri>? value;
 
-  SimpleClassNullableOfUri(
-    this.value,
-  );
+  SimpleClassNullableOfUri(this.value);
 
   factory SimpleClassNullableOfUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfUriFromJson(json);
@@ -683,9 +697,7 @@ class SimpleClassNullableOfUri {
 class SimpleClassOfUriNullable {
   final List<Uri?> value;
 
-  SimpleClassOfUriNullable(
-    this.value,
-  );
+  SimpleClassOfUriNullable(this.value);
 
   factory SimpleClassOfUriNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriNullableFromJson(json);
@@ -697,13 +709,11 @@ class SimpleClassOfUriNullable {
 class SimpleClassNullableOfUriNullable {
   final List<Uri?>? value;
 
-  SimpleClassNullableOfUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriNullable(this.value);
 
   factory SimpleClassNullableOfUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriNullableToJson(this);
diff --git a/json_serializable/test/supported_types/input.type_list.g.dart b/json_serializable/test/supported_types/input.type_list.g.dart
index 36b9ad467..c89d184e0 100644
--- a/json_serializable/test/supported_types/input.type_list.g.dart
+++ b/json_serializable/test/supported_types/input.type_list.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_list.dart';
 
@@ -9,9 +9,9 @@ part of 'input.type_list.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as List<dynamic>,
-      json['withDefault'] as List<dynamic>? ?? [42, true, false, null],
-    );
+  json['value'] as List<dynamic>,
+  json['withDefault'] as List<dynamic>? ?? [42, true, false, null],
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -26,11 +26,11 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
 
 SimpleClassOfBigInt _$SimpleClassOfBigIntFromJson(Map<String, dynamic> json) =>
     SimpleClassOfBigInt(
@@ -40,52 +40,52 @@ SimpleClassOfBigInt _$SimpleClassOfBigIntFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToJson(
-        SimpleClassOfBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.toString()).toList(),
-    };
+  SimpleClassOfBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.toString()).toList(),
+};
 
 SimpleClassNullableOfBigInt _$SimpleClassNullableOfBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBigInt(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => BigInt.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigInt(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => BigInt.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToJson(
-        SimpleClassNullableOfBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toString()).toList(),
-    };
+  SimpleClassNullableOfBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toString()).toList(),
+};
 
 SimpleClassOfBigIntNullable _$SimpleClassOfBigIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : BigInt.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : BigInt.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntNullableToJson(
-        SimpleClassOfBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassNullableOfBigIntNullable
-    _$SimpleClassNullableOfBigIntNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : BigInt.parse(e as String))
-              .toList(),
-        );
+_$SimpleClassNullableOfBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => e == null ? null : BigInt.parse(e as String))
+          .toList(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntNullableToJson(
-        SimpleClassNullableOfBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassNullableOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassOfBool _$SimpleClassOfBoolFromJson(Map<String, dynamic> json) =>
     SimpleClassOfBool(
@@ -93,102 +93,93 @@ SimpleClassOfBool _$SimpleClassOfBoolFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfBoolToJson(SimpleClassOfBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+    <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfBool _$SimpleClassNullableOfBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBool(
-      (json['value'] as List<dynamic>?)?.map((e) => e as bool).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBool(
+  (json['value'] as List<dynamic>?)?.map((e) => e as bool).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBoolToJson(
-        SimpleClassNullableOfBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfBool instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfBoolNullable _$SimpleClassOfBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBoolNullable(
-      (json['value'] as List<dynamic>).map((e) => e as bool?).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBoolNullable(
+  (json['value'] as List<dynamic>).map((e) => e as bool?).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfBoolNullableToJson(
-        SimpleClassOfBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfBoolNullable _$SimpleClassNullableOfBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBoolNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as bool?).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBoolNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => e as bool?).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBoolNullableToJson(
-        SimpleClassNullableOfBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfDateTime _$SimpleClassOfDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTime(
-      (json['value'] as List<dynamic>)
-          .map((e) => DateTime.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTime(
+  (json['value'] as List<dynamic>)
+      .map((e) => DateTime.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToJson(
-        SimpleClassOfDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.toIso8601String()).toList(),
-    };
+  SimpleClassOfDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.toIso8601String()).toList(),
+};
 
 SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDateTime(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTime(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => DateTime.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToJson(
-        SimpleClassNullableOfDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toIso8601String()).toList(),
-    };
+  SimpleClassNullableOfDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toIso8601String()).toList(),
+};
 
 SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : DateTime.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : DateTime.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeNullableToJson(
-        SimpleClassOfDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toIso8601String()).toList(),
-    };
+  SimpleClassOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toIso8601String()).toList(),
+};
 
 SimpleClassNullableOfDateTimeNullable
-    _$SimpleClassNullableOfDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : DateTime.parse(e as String))
-              .toList(),
-        );
+_$SimpleClassNullableOfDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => e == null ? null : DateTime.parse(e as String))
+          .toList(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeNullableToJson(
-        SimpleClassNullableOfDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toIso8601String()).toList(),
-    };
+  SimpleClassNullableOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toIso8601String()).toList(),
+};
 
 SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map<String, dynamic> json) =>
     SimpleClassOfDouble(
@@ -198,147 +189,129 @@ SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfDoubleToJson(
-        SimpleClassOfDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDouble _$SimpleClassNullableOfDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDouble(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => (e as num).toDouble())
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDouble(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num).toDouble()).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDoubleToJson(
-        SimpleClassNullableOfDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfDoubleNullable _$SimpleClassOfDoubleNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDoubleNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => (e as num?)?.toDouble())
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDoubleNullable(
+  (json['value'] as List<dynamic>).map((e) => (e as num?)?.toDouble()).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDoubleNullableToJson(
-        SimpleClassOfDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDoubleNullable
-    _$SimpleClassNullableOfDoubleNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDoubleNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => (e as num?)?.toDouble())
-              .toList(),
-        );
+_$SimpleClassNullableOfDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDoubleNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => (e as num?)?.toDouble())
+          .toList(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDoubleNullableToJson(
-        SimpleClassNullableOfDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfDuration _$SimpleClassOfDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDuration(
-      (json['value'] as List<dynamic>)
-          .map((e) => Duration(microseconds: e as int))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDuration(
+  (json['value'] as List<dynamic>)
+      .map((e) => Duration(microseconds: (e as num).toInt()))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDurationToJson(
-        SimpleClassOfDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.inMicroseconds).toList(),
-    };
+  SimpleClassOfDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.inMicroseconds).toList(),
+};
 
 SimpleClassNullableOfDuration _$SimpleClassNullableOfDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDuration(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => Duration(microseconds: e as int))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDuration(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => Duration(microseconds: (e as num).toInt()))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDurationToJson(
-        SimpleClassNullableOfDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.inMicroseconds).toList(),
-    };
+  SimpleClassNullableOfDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.inMicroseconds).toList(),
+};
 
 SimpleClassOfDurationNullable _$SimpleClassOfDurationNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDurationNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : Duration(microseconds: e as int))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDurationNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : Duration(microseconds: (e as num).toInt()))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDurationNullableToJson(
-        SimpleClassOfDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.inMicroseconds).toList(),
-    };
+  SimpleClassOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.inMicroseconds).toList(),
+};
 
 SimpleClassNullableOfDurationNullable
-    _$SimpleClassNullableOfDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDurationNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : Duration(microseconds: e as int))
-              .toList(),
-        );
+_$SimpleClassNullableOfDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDurationNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map(
+            (e) =>
+                e == null ? null : Duration(microseconds: (e as num).toInt()),
+          )
+          .toList(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDurationNullableToJson(
-        SimpleClassNullableOfDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.inMicroseconds).toList(),
-    };
+  SimpleClassNullableOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.inMicroseconds).toList(),
+};
 
 SimpleClassOfDynamic _$SimpleClassOfDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamic(
-      json['value'] as List<dynamic>,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamic(json['value'] as List<dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToJson(
-        SimpleClassOfDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamic _$SimpleClassNullableOfDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDynamic(
-      json['value'] as List<dynamic>?,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamic(json['value'] as List<dynamic>?);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToJson(
-        SimpleClassNullableOfDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumType _$SimpleClassOfEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumType(
-      (json['value'] as List<dynamic>)
-          .map((e) => $enumDecode(_$EnumTypeEnumMap, e))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumType(
+  (json['value'] as List<dynamic>)
+      .map((e) => $enumDecode(_$EnumTypeEnumMap, e))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToJson(
-        SimpleClassOfEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassOfEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => _$EnumTypeEnumMap[e]!).toList(),
+};
 
 const _$EnumTypeEnumMap = {
   EnumType.alpha: 'alpha',
@@ -348,93 +321,156 @@ const _$EnumTypeEnumMap = {
 };
 
 SimpleClassNullableOfEnumType _$SimpleClassNullableOfEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfEnumType(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => $enumDecode(_$EnumTypeEnumMap, e))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumType(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => $enumDecode(_$EnumTypeEnumMap, e))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToJson(
-        SimpleClassNullableOfEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassNullableOfEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]!).toList(),
+};
 
 SimpleClassOfEnumTypeNullable _$SimpleClassOfEnumTypeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeNullableToJson(
-        SimpleClassOfEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
+};
 
 SimpleClassNullableOfEnumTypeNullable
-    _$SimpleClassNullableOfEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
-              .toList(),
-        );
+_$SimpleClassNullableOfEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
+          .toList(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeNullableToJson(
-        SimpleClassNullableOfEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassNullableOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
+};
+
+SimpleClassOfFromJsonDynamicParam _$SimpleClassOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonDynamicParam(
+  (json['value'] as List<dynamic>).map(FromJsonDynamicParam.fromJson).toList(),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonDynamicParamToJson(
+  SimpleClassOfFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfFromJsonDynamicParam
+_$SimpleClassNullableOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonDynamicParam(
+  (json['value'] as List<dynamic>?)
+      ?.map(FromJsonDynamicParam.fromJson)
+      .toList(),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonDynamicParamToJson(
+  SimpleClassNullableOfFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfFromJsonNullableObjectParam
+_$SimpleClassOfFromJsonNullableObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfFromJsonNullableObjectParam(
+      (json['value'] as List<dynamic>)
+          .map(FromJsonNullableObjectParam.fromJson)
+          .toList(),
+    );
+
+Map<String, dynamic> _$SimpleClassOfFromJsonNullableObjectParamToJson(
+  SimpleClassOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfFromJsonNullableObjectParam
+_$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonNullableObjectParam(
+  (json['value'] as List<dynamic>?)
+      ?.map(FromJsonNullableObjectParam.fromJson)
+      .toList(),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfFromJsonObjectParam _$SimpleClassOfFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonObjectParam(
+  (json['value'] as List<dynamic>)
+      .map((e) => FromJsonObjectParam.fromJson(e as Object))
+      .toList(),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonObjectParamToJson(
+  SimpleClassOfFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfFromJsonObjectParam
+_$SimpleClassNullableOfFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfFromJsonObjectParam(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => FromJsonObjectParam.fromJson(e as Object))
+          .toList(),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonObjectParamToJson(
+  SimpleClassNullableOfFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfInt _$SimpleClassOfIntFromJson(Map<String, dynamic> json) =>
     SimpleClassOfInt(
-      (json['value'] as List<dynamic>).map((e) => e as int).toList(),
+      (json['value'] as List<dynamic>).map((e) => (e as num).toInt()).toList(),
     );
 
 Map<String, dynamic> _$SimpleClassOfIntToJson(SimpleClassOfInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+    <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfInt _$SimpleClassNullableOfIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfInt(
-      (json['value'] as List<dynamic>?)?.map((e) => e as int).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfInt(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num).toInt()).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToJson(
-        SimpleClassNullableOfInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfInt instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfIntNullable _$SimpleClassOfIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntNullable(
-      (json['value'] as List<dynamic>).map((e) => e as int?).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntNullable(
+  (json['value'] as List<dynamic>).map((e) => (e as num?)?.toInt()).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntNullableToJson(
-        SimpleClassOfIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfIntNullable _$SimpleClassNullableOfIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as int?).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num?)?.toInt()).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntNullableToJson(
-        SimpleClassNullableOfIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfNum _$SimpleClassOfNumFromJson(Map<String, dynamic> json) =>
     SimpleClassOfNum(
@@ -442,45 +478,37 @@ SimpleClassOfNum _$SimpleClassOfNumFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfNumToJson(SimpleClassOfNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+    <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfNum _$SimpleClassNullableOfNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfNum(
-      (json['value'] as List<dynamic>?)?.map((e) => e as num).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNum(
+  (json['value'] as List<dynamic>?)?.map((e) => e as num).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfNumToJson(
-        SimpleClassNullableOfNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfNum instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfNumNullable _$SimpleClassOfNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfNumNullable(
-      (json['value'] as List<dynamic>).map((e) => e as num?).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfNumNullable(
+  (json['value'] as List<dynamic>).map((e) => e as num?).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfNumNullableToJson(
-        SimpleClassOfNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfNumNullable _$SimpleClassNullableOfNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfNumNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as num?).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNumNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => e as num?).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfNumNullableToJson(
-        SimpleClassNullableOfNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfObject _$SimpleClassOfObjectFromJson(Map<String, dynamic> json) =>
     SimpleClassOfObject(
@@ -488,46 +516,88 @@ SimpleClassOfObject _$SimpleClassOfObjectFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfObjectToJson(
-        SimpleClassOfObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObject _$SimpleClassNullableOfObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfObject(
-      (json['value'] as List<dynamic>?)?.map((e) => e as Object).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObject(
+  (json['value'] as List<dynamic>?)?.map((e) => e as Object).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToJson(
-        SimpleClassNullableOfObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfObjectNullable _$SimpleClassOfObjectNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectNullable(
-      json['value'] as List<dynamic>,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectNullable(json['value'] as List<dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfObjectNullableToJson(
-        SimpleClassOfObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectNullable
-    _$SimpleClassNullableOfObjectNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectNullable(
-          json['value'] as List<dynamic>?,
-        );
+_$SimpleClassNullableOfObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectNullable(json['value'] as List<dynamic>?);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectNullableToJson(
-        SimpleClassNullableOfObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfRecord _$SimpleClassOfRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfRecord(
+      (json['value'] as List<dynamic>)
+          .map(
+            (e) => _$recordConvert(
+              e,
+              ($jsonValue) => (
+                ($jsonValue[r'$1'] as num).toInt(),
+                $jsonValue[r'$2'] as String,
+                truth: $jsonValue['truth'] as bool,
+              ),
+            ),
+          )
+          .toList(),
+    );
+
+Map<String, dynamic> _$SimpleClassOfRecordToJson(
+  SimpleClassOfRecord instance,
+) => <String, dynamic>{
+  'value': instance.value
+      .map((e) => <String, dynamic>{r'$1': e.$1, r'$2': e.$2, 'truth': e.truth})
+      .toList(),
+};
+
+$Rec _$recordConvert<$Rec>(Object? value, $Rec Function(Map) convert) =>
+    convert(value as Map<String, dynamic>);
+
+SimpleClassNullableOfRecord _$SimpleClassNullableOfRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfRecord(
+  (json['value'] as List<dynamic>?)
+      ?.map(
+        (e) => _$recordConvert(
+          e,
+          ($jsonValue) => (
+            ($jsonValue[r'$1'] as num).toInt(),
+            $jsonValue[r'$2'] as String,
+            truth: $jsonValue['truth'] as bool,
+          ),
+        ),
+      )
+      .toList(),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfRecordToJson(
+  SimpleClassNullableOfRecord instance,
+) => <String, dynamic>{
+  'value': instance.value
+      ?.map(
+        (e) => <String, dynamic>{r'$1': e.$1, r'$2': e.$2, 'truth': e.truth},
+      )
+      .toList(),
+};
 
 SimpleClassOfString _$SimpleClassOfStringFromJson(Map<String, dynamic> json) =>
     SimpleClassOfString(
@@ -535,46 +605,38 @@ SimpleClassOfString _$SimpleClassOfStringFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfStringToJson(
-        SimpleClassOfString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfString _$SimpleClassNullableOfStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfString(
-      (json['value'] as List<dynamic>?)?.map((e) => e as String).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfString(
+  (json['value'] as List<dynamic>?)?.map((e) => e as String).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToJson(
-        SimpleClassNullableOfString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringNullable _$SimpleClassOfStringNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringNullable(
-      (json['value'] as List<dynamic>).map((e) => e as String?).toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringNullable(
+  (json['value'] as List<dynamic>).map((e) => e as String?).toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringNullableToJson(
-        SimpleClassOfStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringNullable
-    _$SimpleClassNullableOfStringNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringNullable(
-          (json['value'] as List<dynamic>?)?.map((e) => e as String?).toList(),
-        );
+_$SimpleClassNullableOfStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringNullable(
+      (json['value'] as List<dynamic>?)?.map((e) => e as String?).toList(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringNullableToJson(
-        SimpleClassNullableOfStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUri _$SimpleClassOfUriFromJson(Map<String, dynamic> json) =>
     SimpleClassOfUri(
@@ -589,43 +651,43 @@ Map<String, dynamic> _$SimpleClassOfUriToJson(SimpleClassOfUri instance) =>
     };
 
 SimpleClassNullableOfUri _$SimpleClassNullableOfUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUri(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => Uri.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUri(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => Uri.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToJson(
-        SimpleClassNullableOfUri instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toString()).toList(),
-    };
+  SimpleClassNullableOfUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toString()).toList(),
+};
 
 SimpleClassOfUriNullable _$SimpleClassOfUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : Uri.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : Uri.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriNullableToJson(
-        SimpleClassOfUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassOfUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassNullableOfUriNullable _$SimpleClassNullableOfUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriNullable(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => e == null ? null : Uri.parse(e as String))
-          .toList(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriNullable(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => e == null ? null : Uri.parse(e as String))
+      .toList(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriNullableToJson(
-        SimpleClassNullableOfUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassNullableOfUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toString()).toList(),
+};
diff --git a/json_serializable/test/supported_types/input.type_map.dart b/json_serializable/test/supported_types/input.type_map.dart
index bdf45e336..59d1a21d0 100644
--- a/json_serializable/test/supported_types/input.type_map.dart
+++ b/json_serializable/test/supported_types/input.type_map.dart
@@ -14,10 +14,7 @@ class SimpleClass {
   @JsonKey(defaultValue: {'a': 1})
   Map withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -32,10 +29,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: {'a': 1})
   Map? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
@@ -47,9 +41,7 @@ class SimpleClassNullable {
 class SimpleClassOfBigIntToBigInt {
   final Map<BigInt, BigInt> value;
 
-  SimpleClassOfBigIntToBigInt(
-    this.value,
-  );
+  SimpleClassOfBigIntToBigInt(this.value);
 
   factory SimpleClassOfBigIntToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToBigIntFromJson(json);
@@ -61,13 +53,11 @@ class SimpleClassOfBigIntToBigInt {
 class SimpleClassNullableOfBigIntToBigInt {
   final Map<BigInt, BigInt>? value;
 
-  SimpleClassNullableOfBigIntToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToBigInt(this.value);
 
   factory SimpleClassNullableOfBigIntToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToBigIntToJson(this);
@@ -77,9 +67,7 @@ class SimpleClassNullableOfBigIntToBigInt {
 class SimpleClassOfDateTimeToBigInt {
   final Map<DateTime, BigInt> value;
 
-  SimpleClassOfDateTimeToBigInt(
-    this.value,
-  );
+  SimpleClassOfDateTimeToBigInt(this.value);
 
   factory SimpleClassOfDateTimeToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToBigIntFromJson(json);
@@ -91,13 +79,11 @@ class SimpleClassOfDateTimeToBigInt {
 class SimpleClassNullableOfDateTimeToBigInt {
   final Map<DateTime, BigInt>? value;
 
-  SimpleClassNullableOfDateTimeToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToBigInt(this.value);
 
   factory SimpleClassNullableOfDateTimeToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToBigIntToJson(this);
@@ -107,9 +93,7 @@ class SimpleClassNullableOfDateTimeToBigInt {
 class SimpleClassOfDynamicToBigInt {
   final Map<dynamic, BigInt> value;
 
-  SimpleClassOfDynamicToBigInt(
-    this.value,
-  );
+  SimpleClassOfDynamicToBigInt(this.value);
 
   factory SimpleClassOfDynamicToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToBigIntFromJson(json);
@@ -121,13 +105,11 @@ class SimpleClassOfDynamicToBigInt {
 class SimpleClassNullableOfDynamicToBigInt {
   final Map<dynamic, BigInt>? value;
 
-  SimpleClassNullableOfDynamicToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToBigInt(this.value);
 
   factory SimpleClassNullableOfDynamicToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToBigIntToJson(this);
@@ -137,9 +119,7 @@ class SimpleClassNullableOfDynamicToBigInt {
 class SimpleClassOfEnumTypeToBigInt {
   final Map<EnumType, BigInt> value;
 
-  SimpleClassOfEnumTypeToBigInt(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToBigInt(this.value);
 
   factory SimpleClassOfEnumTypeToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToBigIntFromJson(json);
@@ -151,13 +131,11 @@ class SimpleClassOfEnumTypeToBigInt {
 class SimpleClassNullableOfEnumTypeToBigInt {
   final Map<EnumType, BigInt>? value;
 
-  SimpleClassNullableOfEnumTypeToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToBigInt(this.value);
 
   factory SimpleClassNullableOfEnumTypeToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToBigIntToJson(this);
@@ -167,9 +145,7 @@ class SimpleClassNullableOfEnumTypeToBigInt {
 class SimpleClassOfIntToBigInt {
   final Map<int, BigInt> value;
 
-  SimpleClassOfIntToBigInt(
-    this.value,
-  );
+  SimpleClassOfIntToBigInt(this.value);
 
   factory SimpleClassOfIntToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToBigIntFromJson(json);
@@ -181,13 +157,11 @@ class SimpleClassOfIntToBigInt {
 class SimpleClassNullableOfIntToBigInt {
   final Map<int, BigInt>? value;
 
-  SimpleClassNullableOfIntToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfIntToBigInt(this.value);
 
   factory SimpleClassNullableOfIntToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToBigIntToJson(this);
@@ -197,9 +171,7 @@ class SimpleClassNullableOfIntToBigInt {
 class SimpleClassOfObjectToBigInt {
   final Map<Object, BigInt> value;
 
-  SimpleClassOfObjectToBigInt(
-    this.value,
-  );
+  SimpleClassOfObjectToBigInt(this.value);
 
   factory SimpleClassOfObjectToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToBigIntFromJson(json);
@@ -211,13 +183,11 @@ class SimpleClassOfObjectToBigInt {
 class SimpleClassNullableOfObjectToBigInt {
   final Map<Object, BigInt>? value;
 
-  SimpleClassNullableOfObjectToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToBigInt(this.value);
 
   factory SimpleClassNullableOfObjectToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToBigIntToJson(this);
@@ -227,9 +197,7 @@ class SimpleClassNullableOfObjectToBigInt {
 class SimpleClassOfStringToBigInt {
   final Map<String, BigInt> value;
 
-  SimpleClassOfStringToBigInt(
-    this.value,
-  );
+  SimpleClassOfStringToBigInt(this.value);
 
   factory SimpleClassOfStringToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToBigIntFromJson(json);
@@ -241,13 +209,11 @@ class SimpleClassOfStringToBigInt {
 class SimpleClassNullableOfStringToBigInt {
   final Map<String, BigInt>? value;
 
-  SimpleClassNullableOfStringToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfStringToBigInt(this.value);
 
   factory SimpleClassNullableOfStringToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToBigIntToJson(this);
@@ -257,9 +223,7 @@ class SimpleClassNullableOfStringToBigInt {
 class SimpleClassOfUriToBigInt {
   final Map<Uri, BigInt> value;
 
-  SimpleClassOfUriToBigInt(
-    this.value,
-  );
+  SimpleClassOfUriToBigInt(this.value);
 
   factory SimpleClassOfUriToBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToBigIntFromJson(json);
@@ -271,13 +235,11 @@ class SimpleClassOfUriToBigInt {
 class SimpleClassNullableOfUriToBigInt {
   final Map<Uri, BigInt>? value;
 
-  SimpleClassNullableOfUriToBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfUriToBigInt(this.value);
 
   factory SimpleClassNullableOfUriToBigInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToBigIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToBigIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToBigIntToJson(this);
@@ -287,13 +249,11 @@ class SimpleClassNullableOfUriToBigInt {
 class SimpleClassOfBigIntToBigIntNullable {
   final Map<BigInt, BigInt?> value;
 
-  SimpleClassOfBigIntToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToBigIntNullable(this.value);
 
   factory SimpleClassOfBigIntToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToBigIntNullableToJson(this);
@@ -303,13 +263,11 @@ class SimpleClassOfBigIntToBigIntNullable {
 class SimpleClassNullableOfBigIntToBigIntNullable {
   final Map<BigInt, BigInt?>? value;
 
-  SimpleClassNullableOfBigIntToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToBigIntNullableToJson(this);
@@ -319,13 +277,11 @@ class SimpleClassNullableOfBigIntToBigIntNullable {
 class SimpleClassOfDateTimeToBigIntNullable {
   final Map<DateTime, BigInt?> value;
 
-  SimpleClassOfDateTimeToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToBigIntNullable(this.value);
 
   factory SimpleClassOfDateTimeToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToBigIntNullableToJson(this);
@@ -335,13 +291,11 @@ class SimpleClassOfDateTimeToBigIntNullable {
 class SimpleClassNullableOfDateTimeToBigIntNullable {
   final Map<DateTime, BigInt?>? value;
 
-  SimpleClassNullableOfDateTimeToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToBigIntNullableToJson(this);
@@ -351,13 +305,11 @@ class SimpleClassNullableOfDateTimeToBigIntNullable {
 class SimpleClassOfDynamicToBigIntNullable {
   final Map<dynamic, BigInt?> value;
 
-  SimpleClassOfDynamicToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToBigIntNullable(this.value);
 
   factory SimpleClassOfDynamicToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToBigIntNullableToJson(this);
@@ -367,13 +319,11 @@ class SimpleClassOfDynamicToBigIntNullable {
 class SimpleClassNullableOfDynamicToBigIntNullable {
   final Map<dynamic, BigInt?>? value;
 
-  SimpleClassNullableOfDynamicToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToBigIntNullableToJson(this);
@@ -383,13 +333,11 @@ class SimpleClassNullableOfDynamicToBigIntNullable {
 class SimpleClassOfEnumTypeToBigIntNullable {
   final Map<EnumType, BigInt?> value;
 
-  SimpleClassOfEnumTypeToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToBigIntNullable(this.value);
 
   factory SimpleClassOfEnumTypeToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToBigIntNullableToJson(this);
@@ -399,13 +347,11 @@ class SimpleClassOfEnumTypeToBigIntNullable {
 class SimpleClassNullableOfEnumTypeToBigIntNullable {
   final Map<EnumType, BigInt?>? value;
 
-  SimpleClassNullableOfEnumTypeToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToBigIntNullableToJson(this);
@@ -415,13 +361,11 @@ class SimpleClassNullableOfEnumTypeToBigIntNullable {
 class SimpleClassOfIntToBigIntNullable {
   final Map<int, BigInt?> value;
 
-  SimpleClassOfIntToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfIntToBigIntNullable(this.value);
 
   factory SimpleClassOfIntToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfIntToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfIntToBigIntNullableToJson(this);
@@ -431,13 +375,11 @@ class SimpleClassOfIntToBigIntNullable {
 class SimpleClassNullableOfIntToBigIntNullable {
   final Map<int, BigInt?>? value;
 
-  SimpleClassNullableOfIntToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfIntToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToBigIntNullableToJson(this);
@@ -447,13 +389,11 @@ class SimpleClassNullableOfIntToBigIntNullable {
 class SimpleClassOfObjectToBigIntNullable {
   final Map<Object, BigInt?> value;
 
-  SimpleClassOfObjectToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToBigIntNullable(this.value);
 
   factory SimpleClassOfObjectToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToBigIntNullableToJson(this);
@@ -463,13 +403,11 @@ class SimpleClassOfObjectToBigIntNullable {
 class SimpleClassNullableOfObjectToBigIntNullable {
   final Map<Object, BigInt?>? value;
 
-  SimpleClassNullableOfObjectToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfObjectToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToBigIntNullableToJson(this);
@@ -479,13 +417,11 @@ class SimpleClassNullableOfObjectToBigIntNullable {
 class SimpleClassOfStringToBigIntNullable {
   final Map<String, BigInt?> value;
 
-  SimpleClassOfStringToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfStringToBigIntNullable(this.value);
 
   factory SimpleClassOfStringToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToBigIntNullableToJson(this);
@@ -495,13 +431,11 @@ class SimpleClassOfStringToBigIntNullable {
 class SimpleClassNullableOfStringToBigIntNullable {
   final Map<String, BigInt?>? value;
 
-  SimpleClassNullableOfStringToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfStringToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToBigIntNullableToJson(this);
@@ -511,13 +445,11 @@ class SimpleClassNullableOfStringToBigIntNullable {
 class SimpleClassOfUriToBigIntNullable {
   final Map<Uri, BigInt?> value;
 
-  SimpleClassOfUriToBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfUriToBigIntNullable(this.value);
 
   factory SimpleClassOfUriToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfUriToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfUriToBigIntNullableToJson(this);
@@ -527,13 +459,11 @@ class SimpleClassOfUriToBigIntNullable {
 class SimpleClassNullableOfUriToBigIntNullable {
   final Map<Uri, BigInt?>? value;
 
-  SimpleClassNullableOfUriToBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToBigIntNullable(this.value);
 
   factory SimpleClassNullableOfUriToBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToBigIntNullableToJson(this);
@@ -543,9 +473,7 @@ class SimpleClassNullableOfUriToBigIntNullable {
 class SimpleClassOfBigIntToBool {
   final Map<BigInt, bool> value;
 
-  SimpleClassOfBigIntToBool(
-    this.value,
-  );
+  SimpleClassOfBigIntToBool(this.value);
 
   factory SimpleClassOfBigIntToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToBoolFromJson(json);
@@ -557,13 +485,11 @@ class SimpleClassOfBigIntToBool {
 class SimpleClassNullableOfBigIntToBool {
   final Map<BigInt, bool>? value;
 
-  SimpleClassNullableOfBigIntToBool(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToBool(this.value);
 
   factory SimpleClassNullableOfBigIntToBool.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToBoolFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToBoolFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToBoolToJson(this);
@@ -573,9 +499,7 @@ class SimpleClassNullableOfBigIntToBool {
 class SimpleClassOfDateTimeToBool {
   final Map<DateTime, bool> value;
 
-  SimpleClassOfDateTimeToBool(
-    this.value,
-  );
+  SimpleClassOfDateTimeToBool(this.value);
 
   factory SimpleClassOfDateTimeToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToBoolFromJson(json);
@@ -587,13 +511,11 @@ class SimpleClassOfDateTimeToBool {
 class SimpleClassNullableOfDateTimeToBool {
   final Map<DateTime, bool>? value;
 
-  SimpleClassNullableOfDateTimeToBool(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToBool(this.value);
 
   factory SimpleClassNullableOfDateTimeToBool.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToBoolFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToBoolFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToBoolToJson(this);
@@ -603,9 +525,7 @@ class SimpleClassNullableOfDateTimeToBool {
 class SimpleClassOfDynamicToBool {
   final Map<dynamic, bool> value;
 
-  SimpleClassOfDynamicToBool(
-    this.value,
-  );
+  SimpleClassOfDynamicToBool(this.value);
 
   factory SimpleClassOfDynamicToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToBoolFromJson(json);
@@ -617,13 +537,11 @@ class SimpleClassOfDynamicToBool {
 class SimpleClassNullableOfDynamicToBool {
   final Map<dynamic, bool>? value;
 
-  SimpleClassNullableOfDynamicToBool(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToBool(this.value);
 
   factory SimpleClassNullableOfDynamicToBool.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToBoolFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToBoolFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToBoolToJson(this);
@@ -633,9 +551,7 @@ class SimpleClassNullableOfDynamicToBool {
 class SimpleClassOfEnumTypeToBool {
   final Map<EnumType, bool> value;
 
-  SimpleClassOfEnumTypeToBool(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToBool(this.value);
 
   factory SimpleClassOfEnumTypeToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToBoolFromJson(json);
@@ -647,13 +563,11 @@ class SimpleClassOfEnumTypeToBool {
 class SimpleClassNullableOfEnumTypeToBool {
   final Map<EnumType, bool>? value;
 
-  SimpleClassNullableOfEnumTypeToBool(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToBool(this.value);
 
   factory SimpleClassNullableOfEnumTypeToBool.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToBoolFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToBoolFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToBoolToJson(this);
@@ -663,9 +577,7 @@ class SimpleClassNullableOfEnumTypeToBool {
 class SimpleClassOfIntToBool {
   final Map<int, bool> value;
 
-  SimpleClassOfIntToBool(
-    this.value,
-  );
+  SimpleClassOfIntToBool(this.value);
 
   factory SimpleClassOfIntToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToBoolFromJson(json);
@@ -677,9 +589,7 @@ class SimpleClassOfIntToBool {
 class SimpleClassNullableOfIntToBool {
   final Map<int, bool>? value;
 
-  SimpleClassNullableOfIntToBool(
-    this.value,
-  );
+  SimpleClassNullableOfIntToBool(this.value);
 
   factory SimpleClassNullableOfIntToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfIntToBoolFromJson(json);
@@ -691,9 +601,7 @@ class SimpleClassNullableOfIntToBool {
 class SimpleClassOfObjectToBool {
   final Map<Object, bool> value;
 
-  SimpleClassOfObjectToBool(
-    this.value,
-  );
+  SimpleClassOfObjectToBool(this.value);
 
   factory SimpleClassOfObjectToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToBoolFromJson(json);
@@ -705,13 +613,11 @@ class SimpleClassOfObjectToBool {
 class SimpleClassNullableOfObjectToBool {
   final Map<Object, bool>? value;
 
-  SimpleClassNullableOfObjectToBool(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToBool(this.value);
 
   factory SimpleClassNullableOfObjectToBool.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToBoolFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToBoolFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToBoolToJson(this);
@@ -721,9 +627,7 @@ class SimpleClassNullableOfObjectToBool {
 class SimpleClassOfStringToBool {
   final Map<String, bool> value;
 
-  SimpleClassOfStringToBool(
-    this.value,
-  );
+  SimpleClassOfStringToBool(this.value);
 
   factory SimpleClassOfStringToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToBoolFromJson(json);
@@ -735,13 +639,11 @@ class SimpleClassOfStringToBool {
 class SimpleClassNullableOfStringToBool {
   final Map<String, bool>? value;
 
-  SimpleClassNullableOfStringToBool(
-    this.value,
-  );
+  SimpleClassNullableOfStringToBool(this.value);
 
   factory SimpleClassNullableOfStringToBool.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToBoolFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToBoolFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToBoolToJson(this);
@@ -751,9 +653,7 @@ class SimpleClassNullableOfStringToBool {
 class SimpleClassOfUriToBool {
   final Map<Uri, bool> value;
 
-  SimpleClassOfUriToBool(
-    this.value,
-  );
+  SimpleClassOfUriToBool(this.value);
 
   factory SimpleClassOfUriToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToBoolFromJson(json);
@@ -765,9 +665,7 @@ class SimpleClassOfUriToBool {
 class SimpleClassNullableOfUriToBool {
   final Map<Uri, bool>? value;
 
-  SimpleClassNullableOfUriToBool(
-    this.value,
-  );
+  SimpleClassNullableOfUriToBool(this.value);
 
   factory SimpleClassNullableOfUriToBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfUriToBoolFromJson(json);
@@ -779,13 +677,11 @@ class SimpleClassNullableOfUriToBool {
 class SimpleClassOfBigIntToBoolNullable {
   final Map<BigInt, bool?> value;
 
-  SimpleClassOfBigIntToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToBoolNullable(this.value);
 
   factory SimpleClassOfBigIntToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToBoolNullableToJson(this);
@@ -795,13 +691,11 @@ class SimpleClassOfBigIntToBoolNullable {
 class SimpleClassNullableOfBigIntToBoolNullable {
   final Map<BigInt, bool?>? value;
 
-  SimpleClassNullableOfBigIntToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToBoolNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToBoolNullableToJson(this);
@@ -811,13 +705,11 @@ class SimpleClassNullableOfBigIntToBoolNullable {
 class SimpleClassOfDateTimeToBoolNullable {
   final Map<DateTime, bool?> value;
 
-  SimpleClassOfDateTimeToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToBoolNullable(this.value);
 
   factory SimpleClassOfDateTimeToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToBoolNullableToJson(this);
@@ -827,13 +719,11 @@ class SimpleClassOfDateTimeToBoolNullable {
 class SimpleClassNullableOfDateTimeToBoolNullable {
   final Map<DateTime, bool?>? value;
 
-  SimpleClassNullableOfDateTimeToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToBoolNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToBoolNullableToJson(this);
@@ -843,13 +733,11 @@ class SimpleClassNullableOfDateTimeToBoolNullable {
 class SimpleClassOfDynamicToBoolNullable {
   final Map<dynamic, bool?> value;
 
-  SimpleClassOfDynamicToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToBoolNullable(this.value);
 
   factory SimpleClassOfDynamicToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToBoolNullableToJson(this);
@@ -859,13 +747,11 @@ class SimpleClassOfDynamicToBoolNullable {
 class SimpleClassNullableOfDynamicToBoolNullable {
   final Map<dynamic, bool?>? value;
 
-  SimpleClassNullableOfDynamicToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToBoolNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToBoolNullableToJson(this);
@@ -875,13 +761,11 @@ class SimpleClassNullableOfDynamicToBoolNullable {
 class SimpleClassOfEnumTypeToBoolNullable {
   final Map<EnumType, bool?> value;
 
-  SimpleClassOfEnumTypeToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToBoolNullable(this.value);
 
   factory SimpleClassOfEnumTypeToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToBoolNullableToJson(this);
@@ -891,13 +775,11 @@ class SimpleClassOfEnumTypeToBoolNullable {
 class SimpleClassNullableOfEnumTypeToBoolNullable {
   final Map<EnumType, bool?>? value;
 
-  SimpleClassNullableOfEnumTypeToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToBoolNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToBoolNullableToJson(this);
@@ -907,9 +789,7 @@ class SimpleClassNullableOfEnumTypeToBoolNullable {
 class SimpleClassOfIntToBoolNullable {
   final Map<int, bool?> value;
 
-  SimpleClassOfIntToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfIntToBoolNullable(this.value);
 
   factory SimpleClassOfIntToBoolNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToBoolNullableFromJson(json);
@@ -921,13 +801,11 @@ class SimpleClassOfIntToBoolNullable {
 class SimpleClassNullableOfIntToBoolNullable {
   final Map<int, bool?>? value;
 
-  SimpleClassNullableOfIntToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToBoolNullable(this.value);
 
   factory SimpleClassNullableOfIntToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToBoolNullableToJson(this);
@@ -937,13 +815,11 @@ class SimpleClassNullableOfIntToBoolNullable {
 class SimpleClassOfObjectToBoolNullable {
   final Map<Object, bool?> value;
 
-  SimpleClassOfObjectToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToBoolNullable(this.value);
 
   factory SimpleClassOfObjectToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToBoolNullableToJson(this);
@@ -953,13 +829,11 @@ class SimpleClassOfObjectToBoolNullable {
 class SimpleClassNullableOfObjectToBoolNullable {
   final Map<Object, bool?>? value;
 
-  SimpleClassNullableOfObjectToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToBoolNullable(this.value);
 
   factory SimpleClassNullableOfObjectToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToBoolNullableToJson(this);
@@ -969,13 +843,11 @@ class SimpleClassNullableOfObjectToBoolNullable {
 class SimpleClassOfStringToBoolNullable {
   final Map<String, bool?> value;
 
-  SimpleClassOfStringToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfStringToBoolNullable(this.value);
 
   factory SimpleClassOfStringToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToBoolNullableToJson(this);
@@ -985,13 +857,11 @@ class SimpleClassOfStringToBoolNullable {
 class SimpleClassNullableOfStringToBoolNullable {
   final Map<String, bool?>? value;
 
-  SimpleClassNullableOfStringToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToBoolNullable(this.value);
 
   factory SimpleClassNullableOfStringToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToBoolNullableToJson(this);
@@ -1001,9 +871,7 @@ class SimpleClassNullableOfStringToBoolNullable {
 class SimpleClassOfUriToBoolNullable {
   final Map<Uri, bool?> value;
 
-  SimpleClassOfUriToBoolNullable(
-    this.value,
-  );
+  SimpleClassOfUriToBoolNullable(this.value);
 
   factory SimpleClassOfUriToBoolNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToBoolNullableFromJson(json);
@@ -1015,13 +883,11 @@ class SimpleClassOfUriToBoolNullable {
 class SimpleClassNullableOfUriToBoolNullable {
   final Map<Uri, bool?>? value;
 
-  SimpleClassNullableOfUriToBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToBoolNullable(this.value);
 
   factory SimpleClassNullableOfUriToBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToBoolNullableToJson(this);
@@ -1031,9 +897,7 @@ class SimpleClassNullableOfUriToBoolNullable {
 class SimpleClassOfBigIntToDateTime {
   final Map<BigInt, DateTime> value;
 
-  SimpleClassOfBigIntToDateTime(
-    this.value,
-  );
+  SimpleClassOfBigIntToDateTime(this.value);
 
   factory SimpleClassOfBigIntToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToDateTimeFromJson(json);
@@ -1045,13 +909,11 @@ class SimpleClassOfBigIntToDateTime {
 class SimpleClassNullableOfBigIntToDateTime {
   final Map<BigInt, DateTime>? value;
 
-  SimpleClassNullableOfBigIntToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToDateTime(this.value);
 
   factory SimpleClassNullableOfBigIntToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToDateTimeToJson(this);
@@ -1061,9 +923,7 @@ class SimpleClassNullableOfBigIntToDateTime {
 class SimpleClassOfDateTimeToDateTime {
   final Map<DateTime, DateTime> value;
 
-  SimpleClassOfDateTimeToDateTime(
-    this.value,
-  );
+  SimpleClassOfDateTimeToDateTime(this.value);
 
   factory SimpleClassOfDateTimeToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToDateTimeFromJson(json);
@@ -1076,13 +936,11 @@ class SimpleClassOfDateTimeToDateTime {
 class SimpleClassNullableOfDateTimeToDateTime {
   final Map<DateTime, DateTime>? value;
 
-  SimpleClassNullableOfDateTimeToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToDateTime(this.value);
 
   factory SimpleClassNullableOfDateTimeToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToDateTimeToJson(this);
@@ -1092,9 +950,7 @@ class SimpleClassNullableOfDateTimeToDateTime {
 class SimpleClassOfDynamicToDateTime {
   final Map<dynamic, DateTime> value;
 
-  SimpleClassOfDynamicToDateTime(
-    this.value,
-  );
+  SimpleClassOfDynamicToDateTime(this.value);
 
   factory SimpleClassOfDynamicToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToDateTimeFromJson(json);
@@ -1106,13 +962,11 @@ class SimpleClassOfDynamicToDateTime {
 class SimpleClassNullableOfDynamicToDateTime {
   final Map<dynamic, DateTime>? value;
 
-  SimpleClassNullableOfDynamicToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToDateTime(this.value);
 
   factory SimpleClassNullableOfDynamicToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToDateTimeToJson(this);
@@ -1122,9 +976,7 @@ class SimpleClassNullableOfDynamicToDateTime {
 class SimpleClassOfEnumTypeToDateTime {
   final Map<EnumType, DateTime> value;
 
-  SimpleClassOfEnumTypeToDateTime(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToDateTime(this.value);
 
   factory SimpleClassOfEnumTypeToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToDateTimeFromJson(json);
@@ -1137,13 +989,11 @@ class SimpleClassOfEnumTypeToDateTime {
 class SimpleClassNullableOfEnumTypeToDateTime {
   final Map<EnumType, DateTime>? value;
 
-  SimpleClassNullableOfEnumTypeToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToDateTime(this.value);
 
   factory SimpleClassNullableOfEnumTypeToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToDateTimeToJson(this);
@@ -1153,9 +1003,7 @@ class SimpleClassNullableOfEnumTypeToDateTime {
 class SimpleClassOfIntToDateTime {
   final Map<int, DateTime> value;
 
-  SimpleClassOfIntToDateTime(
-    this.value,
-  );
+  SimpleClassOfIntToDateTime(this.value);
 
   factory SimpleClassOfIntToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToDateTimeFromJson(json);
@@ -1167,13 +1015,11 @@ class SimpleClassOfIntToDateTime {
 class SimpleClassNullableOfIntToDateTime {
   final Map<int, DateTime>? value;
 
-  SimpleClassNullableOfIntToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfIntToDateTime(this.value);
 
   factory SimpleClassNullableOfIntToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToDateTimeToJson(this);
@@ -1183,9 +1029,7 @@ class SimpleClassNullableOfIntToDateTime {
 class SimpleClassOfObjectToDateTime {
   final Map<Object, DateTime> value;
 
-  SimpleClassOfObjectToDateTime(
-    this.value,
-  );
+  SimpleClassOfObjectToDateTime(this.value);
 
   factory SimpleClassOfObjectToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToDateTimeFromJson(json);
@@ -1197,13 +1041,11 @@ class SimpleClassOfObjectToDateTime {
 class SimpleClassNullableOfObjectToDateTime {
   final Map<Object, DateTime>? value;
 
-  SimpleClassNullableOfObjectToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToDateTime(this.value);
 
   factory SimpleClassNullableOfObjectToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToDateTimeToJson(this);
@@ -1213,9 +1055,7 @@ class SimpleClassNullableOfObjectToDateTime {
 class SimpleClassOfStringToDateTime {
   final Map<String, DateTime> value;
 
-  SimpleClassOfStringToDateTime(
-    this.value,
-  );
+  SimpleClassOfStringToDateTime(this.value);
 
   factory SimpleClassOfStringToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToDateTimeFromJson(json);
@@ -1227,13 +1067,11 @@ class SimpleClassOfStringToDateTime {
 class SimpleClassNullableOfStringToDateTime {
   final Map<String, DateTime>? value;
 
-  SimpleClassNullableOfStringToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfStringToDateTime(this.value);
 
   factory SimpleClassNullableOfStringToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToDateTimeToJson(this);
@@ -1243,9 +1081,7 @@ class SimpleClassNullableOfStringToDateTime {
 class SimpleClassOfUriToDateTime {
   final Map<Uri, DateTime> value;
 
-  SimpleClassOfUriToDateTime(
-    this.value,
-  );
+  SimpleClassOfUriToDateTime(this.value);
 
   factory SimpleClassOfUriToDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToDateTimeFromJson(json);
@@ -1257,13 +1093,11 @@ class SimpleClassOfUriToDateTime {
 class SimpleClassNullableOfUriToDateTime {
   final Map<Uri, DateTime>? value;
 
-  SimpleClassNullableOfUriToDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfUriToDateTime(this.value);
 
   factory SimpleClassNullableOfUriToDateTime.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToDateTimeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToDateTimeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToDateTimeToJson(this);
@@ -1273,13 +1107,11 @@ class SimpleClassNullableOfUriToDateTime {
 class SimpleClassOfBigIntToDateTimeNullable {
   final Map<BigInt, DateTime?> value;
 
-  SimpleClassOfBigIntToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToDateTimeNullable(this.value);
 
   factory SimpleClassOfBigIntToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToDateTimeNullableToJson(this);
@@ -1289,13 +1121,11 @@ class SimpleClassOfBigIntToDateTimeNullable {
 class SimpleClassNullableOfBigIntToDateTimeNullable {
   final Map<BigInt, DateTime?>? value;
 
-  SimpleClassNullableOfBigIntToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToDateTimeNullableToJson(this);
@@ -1305,13 +1135,11 @@ class SimpleClassNullableOfBigIntToDateTimeNullable {
 class SimpleClassOfDateTimeToDateTimeNullable {
   final Map<DateTime, DateTime?> value;
 
-  SimpleClassOfDateTimeToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToDateTimeNullable(this.value);
 
   factory SimpleClassOfDateTimeToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToDateTimeNullableToJson(this);
@@ -1321,13 +1149,11 @@ class SimpleClassOfDateTimeToDateTimeNullable {
 class SimpleClassNullableOfDateTimeToDateTimeNullable {
   final Map<DateTime, DateTime?>? value;
 
-  SimpleClassNullableOfDateTimeToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToDateTimeNullableToJson(this);
@@ -1337,13 +1163,11 @@ class SimpleClassNullableOfDateTimeToDateTimeNullable {
 class SimpleClassOfDynamicToDateTimeNullable {
   final Map<dynamic, DateTime?> value;
 
-  SimpleClassOfDynamicToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToDateTimeNullable(this.value);
 
   factory SimpleClassOfDynamicToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToDateTimeNullableToJson(this);
@@ -1353,13 +1177,11 @@ class SimpleClassOfDynamicToDateTimeNullable {
 class SimpleClassNullableOfDynamicToDateTimeNullable {
   final Map<dynamic, DateTime?>? value;
 
-  SimpleClassNullableOfDynamicToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToDateTimeNullableToJson(this);
@@ -1369,13 +1191,11 @@ class SimpleClassNullableOfDynamicToDateTimeNullable {
 class SimpleClassOfEnumTypeToDateTimeNullable {
   final Map<EnumType, DateTime?> value;
 
-  SimpleClassOfEnumTypeToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToDateTimeNullable(this.value);
 
   factory SimpleClassOfEnumTypeToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToDateTimeNullableToJson(this);
@@ -1385,13 +1205,11 @@ class SimpleClassOfEnumTypeToDateTimeNullable {
 class SimpleClassNullableOfEnumTypeToDateTimeNullable {
   final Map<EnumType, DateTime?>? value;
 
-  SimpleClassNullableOfEnumTypeToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToDateTimeNullableToJson(this);
@@ -1401,13 +1219,11 @@ class SimpleClassNullableOfEnumTypeToDateTimeNullable {
 class SimpleClassOfIntToDateTimeNullable {
   final Map<int, DateTime?> value;
 
-  SimpleClassOfIntToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfIntToDateTimeNullable(this.value);
 
   factory SimpleClassOfIntToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfIntToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfIntToDateTimeNullableToJson(this);
@@ -1417,13 +1233,11 @@ class SimpleClassOfIntToDateTimeNullable {
 class SimpleClassNullableOfIntToDateTimeNullable {
   final Map<int, DateTime?>? value;
 
-  SimpleClassNullableOfIntToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfIntToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToDateTimeNullableToJson(this);
@@ -1433,13 +1247,11 @@ class SimpleClassNullableOfIntToDateTimeNullable {
 class SimpleClassOfObjectToDateTimeNullable {
   final Map<Object, DateTime?> value;
 
-  SimpleClassOfObjectToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToDateTimeNullable(this.value);
 
   factory SimpleClassOfObjectToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToDateTimeNullableToJson(this);
@@ -1449,13 +1261,11 @@ class SimpleClassOfObjectToDateTimeNullable {
 class SimpleClassNullableOfObjectToDateTimeNullable {
   final Map<Object, DateTime?>? value;
 
-  SimpleClassNullableOfObjectToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfObjectToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToDateTimeNullableToJson(this);
@@ -1465,13 +1275,11 @@ class SimpleClassNullableOfObjectToDateTimeNullable {
 class SimpleClassOfStringToDateTimeNullable {
   final Map<String, DateTime?> value;
 
-  SimpleClassOfStringToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfStringToDateTimeNullable(this.value);
 
   factory SimpleClassOfStringToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToDateTimeNullableToJson(this);
@@ -1481,13 +1289,11 @@ class SimpleClassOfStringToDateTimeNullable {
 class SimpleClassNullableOfStringToDateTimeNullable {
   final Map<String, DateTime?>? value;
 
-  SimpleClassNullableOfStringToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfStringToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToDateTimeNullableToJson(this);
@@ -1497,13 +1303,11 @@ class SimpleClassNullableOfStringToDateTimeNullable {
 class SimpleClassOfUriToDateTimeNullable {
   final Map<Uri, DateTime?> value;
 
-  SimpleClassOfUriToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfUriToDateTimeNullable(this.value);
 
   factory SimpleClassOfUriToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfUriToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfUriToDateTimeNullableToJson(this);
@@ -1513,13 +1317,11 @@ class SimpleClassOfUriToDateTimeNullable {
 class SimpleClassNullableOfUriToDateTimeNullable {
   final Map<Uri, DateTime?>? value;
 
-  SimpleClassNullableOfUriToDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfUriToDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToDateTimeNullableToJson(this);
@@ -1529,9 +1331,7 @@ class SimpleClassNullableOfUriToDateTimeNullable {
 class SimpleClassOfBigIntToDouble {
   final Map<BigInt, double> value;
 
-  SimpleClassOfBigIntToDouble(
-    this.value,
-  );
+  SimpleClassOfBigIntToDouble(this.value);
 
   factory SimpleClassOfBigIntToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToDoubleFromJson(json);
@@ -1543,13 +1343,11 @@ class SimpleClassOfBigIntToDouble {
 class SimpleClassNullableOfBigIntToDouble {
   final Map<BigInt, double>? value;
 
-  SimpleClassNullableOfBigIntToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToDouble(this.value);
 
   factory SimpleClassNullableOfBigIntToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToDoubleToJson(this);
@@ -1559,9 +1357,7 @@ class SimpleClassNullableOfBigIntToDouble {
 class SimpleClassOfDateTimeToDouble {
   final Map<DateTime, double> value;
 
-  SimpleClassOfDateTimeToDouble(
-    this.value,
-  );
+  SimpleClassOfDateTimeToDouble(this.value);
 
   factory SimpleClassOfDateTimeToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToDoubleFromJson(json);
@@ -1573,13 +1369,11 @@ class SimpleClassOfDateTimeToDouble {
 class SimpleClassNullableOfDateTimeToDouble {
   final Map<DateTime, double>? value;
 
-  SimpleClassNullableOfDateTimeToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToDouble(this.value);
 
   factory SimpleClassNullableOfDateTimeToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToDoubleToJson(this);
@@ -1589,9 +1383,7 @@ class SimpleClassNullableOfDateTimeToDouble {
 class SimpleClassOfDynamicToDouble {
   final Map<dynamic, double> value;
 
-  SimpleClassOfDynamicToDouble(
-    this.value,
-  );
+  SimpleClassOfDynamicToDouble(this.value);
 
   factory SimpleClassOfDynamicToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToDoubleFromJson(json);
@@ -1603,13 +1395,11 @@ class SimpleClassOfDynamicToDouble {
 class SimpleClassNullableOfDynamicToDouble {
   final Map<dynamic, double>? value;
 
-  SimpleClassNullableOfDynamicToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToDouble(this.value);
 
   factory SimpleClassNullableOfDynamicToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToDoubleToJson(this);
@@ -1619,9 +1409,7 @@ class SimpleClassNullableOfDynamicToDouble {
 class SimpleClassOfEnumTypeToDouble {
   final Map<EnumType, double> value;
 
-  SimpleClassOfEnumTypeToDouble(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToDouble(this.value);
 
   factory SimpleClassOfEnumTypeToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToDoubleFromJson(json);
@@ -1633,13 +1421,11 @@ class SimpleClassOfEnumTypeToDouble {
 class SimpleClassNullableOfEnumTypeToDouble {
   final Map<EnumType, double>? value;
 
-  SimpleClassNullableOfEnumTypeToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToDouble(this.value);
 
   factory SimpleClassNullableOfEnumTypeToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToDoubleToJson(this);
@@ -1649,9 +1435,7 @@ class SimpleClassNullableOfEnumTypeToDouble {
 class SimpleClassOfIntToDouble {
   final Map<int, double> value;
 
-  SimpleClassOfIntToDouble(
-    this.value,
-  );
+  SimpleClassOfIntToDouble(this.value);
 
   factory SimpleClassOfIntToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToDoubleFromJson(json);
@@ -1663,13 +1447,11 @@ class SimpleClassOfIntToDouble {
 class SimpleClassNullableOfIntToDouble {
   final Map<int, double>? value;
 
-  SimpleClassNullableOfIntToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfIntToDouble(this.value);
 
   factory SimpleClassNullableOfIntToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToDoubleToJson(this);
@@ -1679,9 +1461,7 @@ class SimpleClassNullableOfIntToDouble {
 class SimpleClassOfObjectToDouble {
   final Map<Object, double> value;
 
-  SimpleClassOfObjectToDouble(
-    this.value,
-  );
+  SimpleClassOfObjectToDouble(this.value);
 
   factory SimpleClassOfObjectToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToDoubleFromJson(json);
@@ -1693,13 +1473,11 @@ class SimpleClassOfObjectToDouble {
 class SimpleClassNullableOfObjectToDouble {
   final Map<Object, double>? value;
 
-  SimpleClassNullableOfObjectToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToDouble(this.value);
 
   factory SimpleClassNullableOfObjectToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToDoubleToJson(this);
@@ -1709,9 +1487,7 @@ class SimpleClassNullableOfObjectToDouble {
 class SimpleClassOfStringToDouble {
   final Map<String, double> value;
 
-  SimpleClassOfStringToDouble(
-    this.value,
-  );
+  SimpleClassOfStringToDouble(this.value);
 
   factory SimpleClassOfStringToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToDoubleFromJson(json);
@@ -1723,13 +1499,11 @@ class SimpleClassOfStringToDouble {
 class SimpleClassNullableOfStringToDouble {
   final Map<String, double>? value;
 
-  SimpleClassNullableOfStringToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfStringToDouble(this.value);
 
   factory SimpleClassNullableOfStringToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToDoubleToJson(this);
@@ -1739,9 +1513,7 @@ class SimpleClassNullableOfStringToDouble {
 class SimpleClassOfUriToDouble {
   final Map<Uri, double> value;
 
-  SimpleClassOfUriToDouble(
-    this.value,
-  );
+  SimpleClassOfUriToDouble(this.value);
 
   factory SimpleClassOfUriToDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToDoubleFromJson(json);
@@ -1753,13 +1525,11 @@ class SimpleClassOfUriToDouble {
 class SimpleClassNullableOfUriToDouble {
   final Map<Uri, double>? value;
 
-  SimpleClassNullableOfUriToDouble(
-    this.value,
-  );
+  SimpleClassNullableOfUriToDouble(this.value);
 
   factory SimpleClassNullableOfUriToDouble.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToDoubleFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToDoubleFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToDoubleToJson(this);
@@ -1769,13 +1539,11 @@ class SimpleClassNullableOfUriToDouble {
 class SimpleClassOfBigIntToDoubleNullable {
   final Map<BigInt, double?> value;
 
-  SimpleClassOfBigIntToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToDoubleNullable(this.value);
 
   factory SimpleClassOfBigIntToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToDoubleNullableToJson(this);
@@ -1785,13 +1553,11 @@ class SimpleClassOfBigIntToDoubleNullable {
 class SimpleClassNullableOfBigIntToDoubleNullable {
   final Map<BigInt, double?>? value;
 
-  SimpleClassNullableOfBigIntToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToDoubleNullableToJson(this);
@@ -1801,13 +1567,11 @@ class SimpleClassNullableOfBigIntToDoubleNullable {
 class SimpleClassOfDateTimeToDoubleNullable {
   final Map<DateTime, double?> value;
 
-  SimpleClassOfDateTimeToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToDoubleNullable(this.value);
 
   factory SimpleClassOfDateTimeToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToDoubleNullableToJson(this);
@@ -1817,13 +1581,11 @@ class SimpleClassOfDateTimeToDoubleNullable {
 class SimpleClassNullableOfDateTimeToDoubleNullable {
   final Map<DateTime, double?>? value;
 
-  SimpleClassNullableOfDateTimeToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToDoubleNullableToJson(this);
@@ -1833,13 +1595,11 @@ class SimpleClassNullableOfDateTimeToDoubleNullable {
 class SimpleClassOfDynamicToDoubleNullable {
   final Map<dynamic, double?> value;
 
-  SimpleClassOfDynamicToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToDoubleNullable(this.value);
 
   factory SimpleClassOfDynamicToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToDoubleNullableToJson(this);
@@ -1849,13 +1609,11 @@ class SimpleClassOfDynamicToDoubleNullable {
 class SimpleClassNullableOfDynamicToDoubleNullable {
   final Map<dynamic, double?>? value;
 
-  SimpleClassNullableOfDynamicToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToDoubleNullableToJson(this);
@@ -1865,13 +1623,11 @@ class SimpleClassNullableOfDynamicToDoubleNullable {
 class SimpleClassOfEnumTypeToDoubleNullable {
   final Map<EnumType, double?> value;
 
-  SimpleClassOfEnumTypeToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToDoubleNullable(this.value);
 
   factory SimpleClassOfEnumTypeToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToDoubleNullableToJson(this);
@@ -1881,13 +1637,11 @@ class SimpleClassOfEnumTypeToDoubleNullable {
 class SimpleClassNullableOfEnumTypeToDoubleNullable {
   final Map<EnumType, double?>? value;
 
-  SimpleClassNullableOfEnumTypeToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToDoubleNullableToJson(this);
@@ -1897,13 +1651,11 @@ class SimpleClassNullableOfEnumTypeToDoubleNullable {
 class SimpleClassOfIntToDoubleNullable {
   final Map<int, double?> value;
 
-  SimpleClassOfIntToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfIntToDoubleNullable(this.value);
 
   factory SimpleClassOfIntToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfIntToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfIntToDoubleNullableToJson(this);
@@ -1913,13 +1665,11 @@ class SimpleClassOfIntToDoubleNullable {
 class SimpleClassNullableOfIntToDoubleNullable {
   final Map<int, double?>? value;
 
-  SimpleClassNullableOfIntToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfIntToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToDoubleNullableToJson(this);
@@ -1929,13 +1679,11 @@ class SimpleClassNullableOfIntToDoubleNullable {
 class SimpleClassOfObjectToDoubleNullable {
   final Map<Object, double?> value;
 
-  SimpleClassOfObjectToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToDoubleNullable(this.value);
 
   factory SimpleClassOfObjectToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToDoubleNullableToJson(this);
@@ -1945,13 +1693,11 @@ class SimpleClassOfObjectToDoubleNullable {
 class SimpleClassNullableOfObjectToDoubleNullable {
   final Map<Object, double?>? value;
 
-  SimpleClassNullableOfObjectToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfObjectToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToDoubleNullableToJson(this);
@@ -1961,13 +1707,11 @@ class SimpleClassNullableOfObjectToDoubleNullable {
 class SimpleClassOfStringToDoubleNullable {
   final Map<String, double?> value;
 
-  SimpleClassOfStringToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfStringToDoubleNullable(this.value);
 
   factory SimpleClassOfStringToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToDoubleNullableToJson(this);
@@ -1977,13 +1721,11 @@ class SimpleClassOfStringToDoubleNullable {
 class SimpleClassNullableOfStringToDoubleNullable {
   final Map<String, double?>? value;
 
-  SimpleClassNullableOfStringToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfStringToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToDoubleNullableToJson(this);
@@ -1993,13 +1735,11 @@ class SimpleClassNullableOfStringToDoubleNullable {
 class SimpleClassOfUriToDoubleNullable {
   final Map<Uri, double?> value;
 
-  SimpleClassOfUriToDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfUriToDoubleNullable(this.value);
 
   factory SimpleClassOfUriToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfUriToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfUriToDoubleNullableToJson(this);
@@ -2009,13 +1749,11 @@ class SimpleClassOfUriToDoubleNullable {
 class SimpleClassNullableOfUriToDoubleNullable {
   final Map<Uri, double?>? value;
 
-  SimpleClassNullableOfUriToDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToDoubleNullable(this.value);
 
   factory SimpleClassNullableOfUriToDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToDoubleNullableToJson(this);
@@ -2025,9 +1763,7 @@ class SimpleClassNullableOfUriToDoubleNullable {
 class SimpleClassOfBigIntToDuration {
   final Map<BigInt, Duration> value;
 
-  SimpleClassOfBigIntToDuration(
-    this.value,
-  );
+  SimpleClassOfBigIntToDuration(this.value);
 
   factory SimpleClassOfBigIntToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToDurationFromJson(json);
@@ -2039,13 +1775,11 @@ class SimpleClassOfBigIntToDuration {
 class SimpleClassNullableOfBigIntToDuration {
   final Map<BigInt, Duration>? value;
 
-  SimpleClassNullableOfBigIntToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToDuration(this.value);
 
   factory SimpleClassNullableOfBigIntToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToDurationToJson(this);
@@ -2055,9 +1789,7 @@ class SimpleClassNullableOfBigIntToDuration {
 class SimpleClassOfDateTimeToDuration {
   final Map<DateTime, Duration> value;
 
-  SimpleClassOfDateTimeToDuration(
-    this.value,
-  );
+  SimpleClassOfDateTimeToDuration(this.value);
 
   factory SimpleClassOfDateTimeToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToDurationFromJson(json);
@@ -2070,13 +1802,11 @@ class SimpleClassOfDateTimeToDuration {
 class SimpleClassNullableOfDateTimeToDuration {
   final Map<DateTime, Duration>? value;
 
-  SimpleClassNullableOfDateTimeToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToDuration(this.value);
 
   factory SimpleClassNullableOfDateTimeToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToDurationToJson(this);
@@ -2086,9 +1816,7 @@ class SimpleClassNullableOfDateTimeToDuration {
 class SimpleClassOfDynamicToDuration {
   final Map<dynamic, Duration> value;
 
-  SimpleClassOfDynamicToDuration(
-    this.value,
-  );
+  SimpleClassOfDynamicToDuration(this.value);
 
   factory SimpleClassOfDynamicToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToDurationFromJson(json);
@@ -2100,13 +1828,11 @@ class SimpleClassOfDynamicToDuration {
 class SimpleClassNullableOfDynamicToDuration {
   final Map<dynamic, Duration>? value;
 
-  SimpleClassNullableOfDynamicToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToDuration(this.value);
 
   factory SimpleClassNullableOfDynamicToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToDurationToJson(this);
@@ -2116,9 +1842,7 @@ class SimpleClassNullableOfDynamicToDuration {
 class SimpleClassOfEnumTypeToDuration {
   final Map<EnumType, Duration> value;
 
-  SimpleClassOfEnumTypeToDuration(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToDuration(this.value);
 
   factory SimpleClassOfEnumTypeToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToDurationFromJson(json);
@@ -2131,13 +1855,11 @@ class SimpleClassOfEnumTypeToDuration {
 class SimpleClassNullableOfEnumTypeToDuration {
   final Map<EnumType, Duration>? value;
 
-  SimpleClassNullableOfEnumTypeToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToDuration(this.value);
 
   factory SimpleClassNullableOfEnumTypeToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToDurationToJson(this);
@@ -2147,9 +1869,7 @@ class SimpleClassNullableOfEnumTypeToDuration {
 class SimpleClassOfIntToDuration {
   final Map<int, Duration> value;
 
-  SimpleClassOfIntToDuration(
-    this.value,
-  );
+  SimpleClassOfIntToDuration(this.value);
 
   factory SimpleClassOfIntToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToDurationFromJson(json);
@@ -2161,13 +1881,11 @@ class SimpleClassOfIntToDuration {
 class SimpleClassNullableOfIntToDuration {
   final Map<int, Duration>? value;
 
-  SimpleClassNullableOfIntToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfIntToDuration(this.value);
 
   factory SimpleClassNullableOfIntToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToDurationToJson(this);
@@ -2177,9 +1895,7 @@ class SimpleClassNullableOfIntToDuration {
 class SimpleClassOfObjectToDuration {
   final Map<Object, Duration> value;
 
-  SimpleClassOfObjectToDuration(
-    this.value,
-  );
+  SimpleClassOfObjectToDuration(this.value);
 
   factory SimpleClassOfObjectToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToDurationFromJson(json);
@@ -2191,13 +1907,11 @@ class SimpleClassOfObjectToDuration {
 class SimpleClassNullableOfObjectToDuration {
   final Map<Object, Duration>? value;
 
-  SimpleClassNullableOfObjectToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToDuration(this.value);
 
   factory SimpleClassNullableOfObjectToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToDurationToJson(this);
@@ -2207,9 +1921,7 @@ class SimpleClassNullableOfObjectToDuration {
 class SimpleClassOfStringToDuration {
   final Map<String, Duration> value;
 
-  SimpleClassOfStringToDuration(
-    this.value,
-  );
+  SimpleClassOfStringToDuration(this.value);
 
   factory SimpleClassOfStringToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToDurationFromJson(json);
@@ -2221,13 +1933,11 @@ class SimpleClassOfStringToDuration {
 class SimpleClassNullableOfStringToDuration {
   final Map<String, Duration>? value;
 
-  SimpleClassNullableOfStringToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfStringToDuration(this.value);
 
   factory SimpleClassNullableOfStringToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToDurationToJson(this);
@@ -2237,9 +1947,7 @@ class SimpleClassNullableOfStringToDuration {
 class SimpleClassOfUriToDuration {
   final Map<Uri, Duration> value;
 
-  SimpleClassOfUriToDuration(
-    this.value,
-  );
+  SimpleClassOfUriToDuration(this.value);
 
   factory SimpleClassOfUriToDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToDurationFromJson(json);
@@ -2251,13 +1959,11 @@ class SimpleClassOfUriToDuration {
 class SimpleClassNullableOfUriToDuration {
   final Map<Uri, Duration>? value;
 
-  SimpleClassNullableOfUriToDuration(
-    this.value,
-  );
+  SimpleClassNullableOfUriToDuration(this.value);
 
   factory SimpleClassNullableOfUriToDuration.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToDurationFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToDurationFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToDurationToJson(this);
@@ -2267,13 +1973,11 @@ class SimpleClassNullableOfUriToDuration {
 class SimpleClassOfBigIntToDurationNullable {
   final Map<BigInt, Duration?> value;
 
-  SimpleClassOfBigIntToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToDurationNullable(this.value);
 
   factory SimpleClassOfBigIntToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToDurationNullableToJson(this);
@@ -2283,13 +1987,11 @@ class SimpleClassOfBigIntToDurationNullable {
 class SimpleClassNullableOfBigIntToDurationNullable {
   final Map<BigInt, Duration?>? value;
 
-  SimpleClassNullableOfBigIntToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToDurationNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToDurationNullableToJson(this);
@@ -2299,13 +2001,11 @@ class SimpleClassNullableOfBigIntToDurationNullable {
 class SimpleClassOfDateTimeToDurationNullable {
   final Map<DateTime, Duration?> value;
 
-  SimpleClassOfDateTimeToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToDurationNullable(this.value);
 
   factory SimpleClassOfDateTimeToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToDurationNullableToJson(this);
@@ -2315,13 +2015,11 @@ class SimpleClassOfDateTimeToDurationNullable {
 class SimpleClassNullableOfDateTimeToDurationNullable {
   final Map<DateTime, Duration?>? value;
 
-  SimpleClassNullableOfDateTimeToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToDurationNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToDurationNullableToJson(this);
@@ -2331,13 +2029,11 @@ class SimpleClassNullableOfDateTimeToDurationNullable {
 class SimpleClassOfDynamicToDurationNullable {
   final Map<dynamic, Duration?> value;
 
-  SimpleClassOfDynamicToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToDurationNullable(this.value);
 
   factory SimpleClassOfDynamicToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToDurationNullableToJson(this);
@@ -2347,13 +2043,11 @@ class SimpleClassOfDynamicToDurationNullable {
 class SimpleClassNullableOfDynamicToDurationNullable {
   final Map<dynamic, Duration?>? value;
 
-  SimpleClassNullableOfDynamicToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToDurationNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToDurationNullableToJson(this);
@@ -2363,13 +2057,11 @@ class SimpleClassNullableOfDynamicToDurationNullable {
 class SimpleClassOfEnumTypeToDurationNullable {
   final Map<EnumType, Duration?> value;
 
-  SimpleClassOfEnumTypeToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToDurationNullable(this.value);
 
   factory SimpleClassOfEnumTypeToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToDurationNullableToJson(this);
@@ -2379,13 +2071,11 @@ class SimpleClassOfEnumTypeToDurationNullable {
 class SimpleClassNullableOfEnumTypeToDurationNullable {
   final Map<EnumType, Duration?>? value;
 
-  SimpleClassNullableOfEnumTypeToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToDurationNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToDurationNullableToJson(this);
@@ -2395,13 +2085,11 @@ class SimpleClassNullableOfEnumTypeToDurationNullable {
 class SimpleClassOfIntToDurationNullable {
   final Map<int, Duration?> value;
 
-  SimpleClassOfIntToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfIntToDurationNullable(this.value);
 
   factory SimpleClassOfIntToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfIntToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfIntToDurationNullableToJson(this);
@@ -2411,13 +2099,11 @@ class SimpleClassOfIntToDurationNullable {
 class SimpleClassNullableOfIntToDurationNullable {
   final Map<int, Duration?>? value;
 
-  SimpleClassNullableOfIntToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToDurationNullable(this.value);
 
   factory SimpleClassNullableOfIntToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToDurationNullableToJson(this);
@@ -2427,13 +2113,11 @@ class SimpleClassNullableOfIntToDurationNullable {
 class SimpleClassOfObjectToDurationNullable {
   final Map<Object, Duration?> value;
 
-  SimpleClassOfObjectToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToDurationNullable(this.value);
 
   factory SimpleClassOfObjectToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToDurationNullableToJson(this);
@@ -2443,13 +2127,11 @@ class SimpleClassOfObjectToDurationNullable {
 class SimpleClassNullableOfObjectToDurationNullable {
   final Map<Object, Duration?>? value;
 
-  SimpleClassNullableOfObjectToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToDurationNullable(this.value);
 
   factory SimpleClassNullableOfObjectToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToDurationNullableToJson(this);
@@ -2459,13 +2141,11 @@ class SimpleClassNullableOfObjectToDurationNullable {
 class SimpleClassOfStringToDurationNullable {
   final Map<String, Duration?> value;
 
-  SimpleClassOfStringToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfStringToDurationNullable(this.value);
 
   factory SimpleClassOfStringToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToDurationNullableToJson(this);
@@ -2475,13 +2155,11 @@ class SimpleClassOfStringToDurationNullable {
 class SimpleClassNullableOfStringToDurationNullable {
   final Map<String, Duration?>? value;
 
-  SimpleClassNullableOfStringToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToDurationNullable(this.value);
 
   factory SimpleClassNullableOfStringToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToDurationNullableToJson(this);
@@ -2491,13 +2169,11 @@ class SimpleClassNullableOfStringToDurationNullable {
 class SimpleClassOfUriToDurationNullable {
   final Map<Uri, Duration?> value;
 
-  SimpleClassOfUriToDurationNullable(
-    this.value,
-  );
+  SimpleClassOfUriToDurationNullable(this.value);
 
   factory SimpleClassOfUriToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfUriToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfUriToDurationNullableToJson(this);
@@ -2507,13 +2183,11 @@ class SimpleClassOfUriToDurationNullable {
 class SimpleClassNullableOfUriToDurationNullable {
   final Map<Uri, Duration?>? value;
 
-  SimpleClassNullableOfUriToDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToDurationNullable(this.value);
 
   factory SimpleClassNullableOfUriToDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToDurationNullableToJson(this);
@@ -2523,9 +2197,7 @@ class SimpleClassNullableOfUriToDurationNullable {
 class SimpleClassOfBigIntToDynamic {
   final Map<BigInt, dynamic> value;
 
-  SimpleClassOfBigIntToDynamic(
-    this.value,
-  );
+  SimpleClassOfBigIntToDynamic(this.value);
 
   factory SimpleClassOfBigIntToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToDynamicFromJson(json);
@@ -2537,13 +2209,11 @@ class SimpleClassOfBigIntToDynamic {
 class SimpleClassNullableOfBigIntToDynamic {
   final Map<BigInt, dynamic>? value;
 
-  SimpleClassNullableOfBigIntToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToDynamic(this.value);
 
   factory SimpleClassNullableOfBigIntToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToDynamicToJson(this);
@@ -2553,9 +2223,7 @@ class SimpleClassNullableOfBigIntToDynamic {
 class SimpleClassOfDateTimeToDynamic {
   final Map<DateTime, dynamic> value;
 
-  SimpleClassOfDateTimeToDynamic(
-    this.value,
-  );
+  SimpleClassOfDateTimeToDynamic(this.value);
 
   factory SimpleClassOfDateTimeToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToDynamicFromJson(json);
@@ -2567,13 +2235,11 @@ class SimpleClassOfDateTimeToDynamic {
 class SimpleClassNullableOfDateTimeToDynamic {
   final Map<DateTime, dynamic>? value;
 
-  SimpleClassNullableOfDateTimeToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToDynamic(this.value);
 
   factory SimpleClassNullableOfDateTimeToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToDynamicToJson(this);
@@ -2583,9 +2249,7 @@ class SimpleClassNullableOfDateTimeToDynamic {
 class SimpleClassOfDynamicToDynamic {
   final Map<dynamic, dynamic> value;
 
-  SimpleClassOfDynamicToDynamic(
-    this.value,
-  );
+  SimpleClassOfDynamicToDynamic(this.value);
 
   factory SimpleClassOfDynamicToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToDynamicFromJson(json);
@@ -2597,13 +2261,11 @@ class SimpleClassOfDynamicToDynamic {
 class SimpleClassNullableOfDynamicToDynamic {
   final Map<dynamic, dynamic>? value;
 
-  SimpleClassNullableOfDynamicToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToDynamic(this.value);
 
   factory SimpleClassNullableOfDynamicToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToDynamicToJson(this);
@@ -2613,9 +2275,7 @@ class SimpleClassNullableOfDynamicToDynamic {
 class SimpleClassOfEnumTypeToDynamic {
   final Map<EnumType, dynamic> value;
 
-  SimpleClassOfEnumTypeToDynamic(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToDynamic(this.value);
 
   factory SimpleClassOfEnumTypeToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToDynamicFromJson(json);
@@ -2627,13 +2287,11 @@ class SimpleClassOfEnumTypeToDynamic {
 class SimpleClassNullableOfEnumTypeToDynamic {
   final Map<EnumType, dynamic>? value;
 
-  SimpleClassNullableOfEnumTypeToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToDynamic(this.value);
 
   factory SimpleClassNullableOfEnumTypeToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToDynamicToJson(this);
@@ -2643,9 +2301,7 @@ class SimpleClassNullableOfEnumTypeToDynamic {
 class SimpleClassOfIntToDynamic {
   final Map<int, dynamic> value;
 
-  SimpleClassOfIntToDynamic(
-    this.value,
-  );
+  SimpleClassOfIntToDynamic(this.value);
 
   factory SimpleClassOfIntToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToDynamicFromJson(json);
@@ -2657,13 +2313,11 @@ class SimpleClassOfIntToDynamic {
 class SimpleClassNullableOfIntToDynamic {
   final Map<int, dynamic>? value;
 
-  SimpleClassNullableOfIntToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfIntToDynamic(this.value);
 
   factory SimpleClassNullableOfIntToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToDynamicToJson(this);
@@ -2673,9 +2327,7 @@ class SimpleClassNullableOfIntToDynamic {
 class SimpleClassOfObjectToDynamic {
   final Map<Object, dynamic> value;
 
-  SimpleClassOfObjectToDynamic(
-    this.value,
-  );
+  SimpleClassOfObjectToDynamic(this.value);
 
   factory SimpleClassOfObjectToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToDynamicFromJson(json);
@@ -2687,13 +2339,11 @@ class SimpleClassOfObjectToDynamic {
 class SimpleClassNullableOfObjectToDynamic {
   final Map<Object, dynamic>? value;
 
-  SimpleClassNullableOfObjectToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToDynamic(this.value);
 
   factory SimpleClassNullableOfObjectToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToDynamicToJson(this);
@@ -2703,9 +2353,7 @@ class SimpleClassNullableOfObjectToDynamic {
 class SimpleClassOfStringToDynamic {
   final Map<String, dynamic> value;
 
-  SimpleClassOfStringToDynamic(
-    this.value,
-  );
+  SimpleClassOfStringToDynamic(this.value);
 
   factory SimpleClassOfStringToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToDynamicFromJson(json);
@@ -2717,13 +2365,11 @@ class SimpleClassOfStringToDynamic {
 class SimpleClassNullableOfStringToDynamic {
   final Map<String, dynamic>? value;
 
-  SimpleClassNullableOfStringToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfStringToDynamic(this.value);
 
   factory SimpleClassNullableOfStringToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToDynamicToJson(this);
@@ -2733,9 +2379,7 @@ class SimpleClassNullableOfStringToDynamic {
 class SimpleClassOfUriToDynamic {
   final Map<Uri, dynamic> value;
 
-  SimpleClassOfUriToDynamic(
-    this.value,
-  );
+  SimpleClassOfUriToDynamic(this.value);
 
   factory SimpleClassOfUriToDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToDynamicFromJson(json);
@@ -2747,13 +2391,11 @@ class SimpleClassOfUriToDynamic {
 class SimpleClassNullableOfUriToDynamic {
   final Map<Uri, dynamic>? value;
 
-  SimpleClassNullableOfUriToDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfUriToDynamic(this.value);
 
   factory SimpleClassNullableOfUriToDynamic.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToDynamicFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToDynamicFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToDynamicToJson(this);
@@ -2763,9 +2405,7 @@ class SimpleClassNullableOfUriToDynamic {
 class SimpleClassOfBigIntToEnumType {
   final Map<BigInt, EnumType> value;
 
-  SimpleClassOfBigIntToEnumType(
-    this.value,
-  );
+  SimpleClassOfBigIntToEnumType(this.value);
 
   factory SimpleClassOfBigIntToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToEnumTypeFromJson(json);
@@ -2777,13 +2417,11 @@ class SimpleClassOfBigIntToEnumType {
 class SimpleClassNullableOfBigIntToEnumType {
   final Map<BigInt, EnumType>? value;
 
-  SimpleClassNullableOfBigIntToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToEnumType(this.value);
 
   factory SimpleClassNullableOfBigIntToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToEnumTypeToJson(this);
@@ -2793,9 +2431,7 @@ class SimpleClassNullableOfBigIntToEnumType {
 class SimpleClassOfDateTimeToEnumType {
   final Map<DateTime, EnumType> value;
 
-  SimpleClassOfDateTimeToEnumType(
-    this.value,
-  );
+  SimpleClassOfDateTimeToEnumType(this.value);
 
   factory SimpleClassOfDateTimeToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToEnumTypeFromJson(json);
@@ -2808,13 +2444,11 @@ class SimpleClassOfDateTimeToEnumType {
 class SimpleClassNullableOfDateTimeToEnumType {
   final Map<DateTime, EnumType>? value;
 
-  SimpleClassNullableOfDateTimeToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToEnumType(this.value);
 
   factory SimpleClassNullableOfDateTimeToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToEnumTypeToJson(this);
@@ -2824,9 +2458,7 @@ class SimpleClassNullableOfDateTimeToEnumType {
 class SimpleClassOfDynamicToEnumType {
   final Map<dynamic, EnumType> value;
 
-  SimpleClassOfDynamicToEnumType(
-    this.value,
-  );
+  SimpleClassOfDynamicToEnumType(this.value);
 
   factory SimpleClassOfDynamicToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToEnumTypeFromJson(json);
@@ -2838,13 +2470,11 @@ class SimpleClassOfDynamicToEnumType {
 class SimpleClassNullableOfDynamicToEnumType {
   final Map<dynamic, EnumType>? value;
 
-  SimpleClassNullableOfDynamicToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToEnumType(this.value);
 
   factory SimpleClassNullableOfDynamicToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToEnumTypeToJson(this);
@@ -2854,9 +2484,7 @@ class SimpleClassNullableOfDynamicToEnumType {
 class SimpleClassOfEnumTypeToEnumType {
   final Map<EnumType, EnumType> value;
 
-  SimpleClassOfEnumTypeToEnumType(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToEnumType(this.value);
 
   factory SimpleClassOfEnumTypeToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToEnumTypeFromJson(json);
@@ -2869,13 +2497,11 @@ class SimpleClassOfEnumTypeToEnumType {
 class SimpleClassNullableOfEnumTypeToEnumType {
   final Map<EnumType, EnumType>? value;
 
-  SimpleClassNullableOfEnumTypeToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToEnumType(this.value);
 
   factory SimpleClassNullableOfEnumTypeToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToEnumTypeToJson(this);
@@ -2885,9 +2511,7 @@ class SimpleClassNullableOfEnumTypeToEnumType {
 class SimpleClassOfIntToEnumType {
   final Map<int, EnumType> value;
 
-  SimpleClassOfIntToEnumType(
-    this.value,
-  );
+  SimpleClassOfIntToEnumType(this.value);
 
   factory SimpleClassOfIntToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToEnumTypeFromJson(json);
@@ -2899,13 +2523,11 @@ class SimpleClassOfIntToEnumType {
 class SimpleClassNullableOfIntToEnumType {
   final Map<int, EnumType>? value;
 
-  SimpleClassNullableOfIntToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfIntToEnumType(this.value);
 
   factory SimpleClassNullableOfIntToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToEnumTypeToJson(this);
@@ -2915,9 +2537,7 @@ class SimpleClassNullableOfIntToEnumType {
 class SimpleClassOfObjectToEnumType {
   final Map<Object, EnumType> value;
 
-  SimpleClassOfObjectToEnumType(
-    this.value,
-  );
+  SimpleClassOfObjectToEnumType(this.value);
 
   factory SimpleClassOfObjectToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToEnumTypeFromJson(json);
@@ -2929,13 +2549,11 @@ class SimpleClassOfObjectToEnumType {
 class SimpleClassNullableOfObjectToEnumType {
   final Map<Object, EnumType>? value;
 
-  SimpleClassNullableOfObjectToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToEnumType(this.value);
 
   factory SimpleClassNullableOfObjectToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToEnumTypeToJson(this);
@@ -2945,9 +2563,7 @@ class SimpleClassNullableOfObjectToEnumType {
 class SimpleClassOfStringToEnumType {
   final Map<String, EnumType> value;
 
-  SimpleClassOfStringToEnumType(
-    this.value,
-  );
+  SimpleClassOfStringToEnumType(this.value);
 
   factory SimpleClassOfStringToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToEnumTypeFromJson(json);
@@ -2959,13 +2575,11 @@ class SimpleClassOfStringToEnumType {
 class SimpleClassNullableOfStringToEnumType {
   final Map<String, EnumType>? value;
 
-  SimpleClassNullableOfStringToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfStringToEnumType(this.value);
 
   factory SimpleClassNullableOfStringToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToEnumTypeToJson(this);
@@ -2975,9 +2589,7 @@ class SimpleClassNullableOfStringToEnumType {
 class SimpleClassOfUriToEnumType {
   final Map<Uri, EnumType> value;
 
-  SimpleClassOfUriToEnumType(
-    this.value,
-  );
+  SimpleClassOfUriToEnumType(this.value);
 
   factory SimpleClassOfUriToEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToEnumTypeFromJson(json);
@@ -2989,13 +2601,11 @@ class SimpleClassOfUriToEnumType {
 class SimpleClassNullableOfUriToEnumType {
   final Map<Uri, EnumType>? value;
 
-  SimpleClassNullableOfUriToEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfUriToEnumType(this.value);
 
   factory SimpleClassNullableOfUriToEnumType.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToEnumTypeFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToEnumTypeFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToEnumTypeToJson(this);
@@ -3005,13 +2615,11 @@ class SimpleClassNullableOfUriToEnumType {
 class SimpleClassOfBigIntToEnumTypeNullable {
   final Map<BigInt, EnumType?> value;
 
-  SimpleClassOfBigIntToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToEnumTypeNullable(this.value);
 
   factory SimpleClassOfBigIntToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToEnumTypeNullableToJson(this);
@@ -3021,13 +2629,11 @@ class SimpleClassOfBigIntToEnumTypeNullable {
 class SimpleClassNullableOfBigIntToEnumTypeNullable {
   final Map<BigInt, EnumType?>? value;
 
-  SimpleClassNullableOfBigIntToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToEnumTypeNullableToJson(this);
@@ -3037,13 +2643,11 @@ class SimpleClassNullableOfBigIntToEnumTypeNullable {
 class SimpleClassOfDateTimeToEnumTypeNullable {
   final Map<DateTime, EnumType?> value;
 
-  SimpleClassOfDateTimeToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToEnumTypeNullable(this.value);
 
   factory SimpleClassOfDateTimeToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToEnumTypeNullableToJson(this);
@@ -3053,13 +2657,11 @@ class SimpleClassOfDateTimeToEnumTypeNullable {
 class SimpleClassNullableOfDateTimeToEnumTypeNullable {
   final Map<DateTime, EnumType?>? value;
 
-  SimpleClassNullableOfDateTimeToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToEnumTypeNullableToJson(this);
@@ -3069,13 +2671,11 @@ class SimpleClassNullableOfDateTimeToEnumTypeNullable {
 class SimpleClassOfDynamicToEnumTypeNullable {
   final Map<dynamic, EnumType?> value;
 
-  SimpleClassOfDynamicToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToEnumTypeNullable(this.value);
 
   factory SimpleClassOfDynamicToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToEnumTypeNullableToJson(this);
@@ -3085,13 +2685,11 @@ class SimpleClassOfDynamicToEnumTypeNullable {
 class SimpleClassNullableOfDynamicToEnumTypeNullable {
   final Map<dynamic, EnumType?>? value;
 
-  SimpleClassNullableOfDynamicToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToEnumTypeNullableToJson(this);
@@ -3101,13 +2699,11 @@ class SimpleClassNullableOfDynamicToEnumTypeNullable {
 class SimpleClassOfEnumTypeToEnumTypeNullable {
   final Map<EnumType, EnumType?> value;
 
-  SimpleClassOfEnumTypeToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToEnumTypeNullable(this.value);
 
   factory SimpleClassOfEnumTypeToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToEnumTypeNullableToJson(this);
@@ -3117,13 +2713,11 @@ class SimpleClassOfEnumTypeToEnumTypeNullable {
 class SimpleClassNullableOfEnumTypeToEnumTypeNullable {
   final Map<EnumType, EnumType?>? value;
 
-  SimpleClassNullableOfEnumTypeToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToEnumTypeNullableToJson(this);
@@ -3133,13 +2727,11 @@ class SimpleClassNullableOfEnumTypeToEnumTypeNullable {
 class SimpleClassOfIntToEnumTypeNullable {
   final Map<int, EnumType?> value;
 
-  SimpleClassOfIntToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfIntToEnumTypeNullable(this.value);
 
   factory SimpleClassOfIntToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfIntToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfIntToEnumTypeNullableToJson(this);
@@ -3149,13 +2741,11 @@ class SimpleClassOfIntToEnumTypeNullable {
 class SimpleClassNullableOfIntToEnumTypeNullable {
   final Map<int, EnumType?>? value;
 
-  SimpleClassNullableOfIntToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfIntToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToEnumTypeNullableToJson(this);
@@ -3165,13 +2755,11 @@ class SimpleClassNullableOfIntToEnumTypeNullable {
 class SimpleClassOfObjectToEnumTypeNullable {
   final Map<Object, EnumType?> value;
 
-  SimpleClassOfObjectToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToEnumTypeNullable(this.value);
 
   factory SimpleClassOfObjectToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToEnumTypeNullableToJson(this);
@@ -3181,13 +2769,11 @@ class SimpleClassOfObjectToEnumTypeNullable {
 class SimpleClassNullableOfObjectToEnumTypeNullable {
   final Map<Object, EnumType?>? value;
 
-  SimpleClassNullableOfObjectToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfObjectToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToEnumTypeNullableToJson(this);
@@ -3197,13 +2783,11 @@ class SimpleClassNullableOfObjectToEnumTypeNullable {
 class SimpleClassOfStringToEnumTypeNullable {
   final Map<String, EnumType?> value;
 
-  SimpleClassOfStringToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfStringToEnumTypeNullable(this.value);
 
   factory SimpleClassOfStringToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToEnumTypeNullableToJson(this);
@@ -3213,13 +2797,11 @@ class SimpleClassOfStringToEnumTypeNullable {
 class SimpleClassNullableOfStringToEnumTypeNullable {
   final Map<String, EnumType?>? value;
 
-  SimpleClassNullableOfStringToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfStringToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToEnumTypeNullableToJson(this);
@@ -3229,13 +2811,11 @@ class SimpleClassNullableOfStringToEnumTypeNullable {
 class SimpleClassOfUriToEnumTypeNullable {
   final Map<Uri, EnumType?> value;
 
-  SimpleClassOfUriToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfUriToEnumTypeNullable(this.value);
 
   factory SimpleClassOfUriToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfUriToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfUriToEnumTypeNullableToJson(this);
@@ -3245,133 +2825,792 @@ class SimpleClassOfUriToEnumTypeNullable {
 class SimpleClassNullableOfUriToEnumTypeNullable {
   final Map<Uri, EnumType?>? value;
 
-  SimpleClassNullableOfUriToEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfUriToEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToEnumTypeNullableToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassOfBigIntToInt {
-  final Map<BigInt, int> value;
+class SimpleClassOfBigIntToFromJsonDynamicParam {
+  final Map<BigInt, FromJsonDynamicParam> value;
 
-  SimpleClassOfBigIntToInt(
-    this.value,
-  );
+  SimpleClassOfBigIntToFromJsonDynamicParam(this.value);
 
-  factory SimpleClassOfBigIntToInt.fromJson(Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToIntFromJson(json);
+  factory SimpleClassOfBigIntToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToFromJsonDynamicParamFromJson(json);
 
-  Map<String, Object?> toJson() => _$SimpleClassOfBigIntToIntToJson(this);
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfBigIntToFromJsonDynamicParamToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassNullableOfBigIntToInt {
-  final Map<BigInt, int>? value;
+class SimpleClassNullableOfBigIntToFromJsonDynamicParam {
+  final Map<BigInt, FromJsonDynamicParam>? value;
 
-  SimpleClassNullableOfBigIntToInt(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToFromJsonDynamicParam(this.value);
 
-  factory SimpleClassNullableOfBigIntToInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToIntFromJson(json);
+  factory SimpleClassNullableOfBigIntToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToFromJsonDynamicParamFromJson(json);
 
   Map<String, Object?> toJson() =>
-      _$SimpleClassNullableOfBigIntToIntToJson(this);
+      _$SimpleClassNullableOfBigIntToFromJsonDynamicParamToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassOfDateTimeToInt {
-  final Map<DateTime, int> value;
+class SimpleClassOfDateTimeToFromJsonDynamicParam {
+  final Map<DateTime, FromJsonDynamicParam> value;
 
-  SimpleClassOfDateTimeToInt(
-    this.value,
-  );
+  SimpleClassOfDateTimeToFromJsonDynamicParam(this.value);
 
-  factory SimpleClassOfDateTimeToInt.fromJson(Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToIntFromJson(json);
+  factory SimpleClassOfDateTimeToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToFromJsonDynamicParamFromJson(json);
 
-  Map<String, Object?> toJson() => _$SimpleClassOfDateTimeToIntToJson(this);
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfDateTimeToFromJsonDynamicParamToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassNullableOfDateTimeToInt {
-  final Map<DateTime, int>? value;
+class SimpleClassNullableOfDateTimeToFromJsonDynamicParam {
+  final Map<DateTime, FromJsonDynamicParam>? value;
 
-  SimpleClassNullableOfDateTimeToInt(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToFromJsonDynamicParam(this.value);
 
-  factory SimpleClassNullableOfDateTimeToInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToIntFromJson(json);
+  factory SimpleClassNullableOfDateTimeToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToFromJsonDynamicParamFromJson(json);
 
   Map<String, Object?> toJson() =>
-      _$SimpleClassNullableOfDateTimeToIntToJson(this);
+      _$SimpleClassNullableOfDateTimeToFromJsonDynamicParamToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassOfDynamicToInt {
-  final Map<dynamic, int> value;
+class SimpleClassOfDynamicToFromJsonDynamicParam {
+  final Map<dynamic, FromJsonDynamicParam> value;
 
-  SimpleClassOfDynamicToInt(
-    this.value,
-  );
+  SimpleClassOfDynamicToFromJsonDynamicParam(this.value);
 
-  factory SimpleClassOfDynamicToInt.fromJson(Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToIntFromJson(json);
+  factory SimpleClassOfDynamicToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToFromJsonDynamicParamFromJson(json);
 
-  Map<String, Object?> toJson() => _$SimpleClassOfDynamicToIntToJson(this);
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfDynamicToFromJsonDynamicParamToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassNullableOfDynamicToInt {
-  final Map<dynamic, int>? value;
+class SimpleClassNullableOfDynamicToFromJsonDynamicParam {
+  final Map<dynamic, FromJsonDynamicParam>? value;
 
-  SimpleClassNullableOfDynamicToInt(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToFromJsonDynamicParam(this.value);
 
-  factory SimpleClassNullableOfDynamicToInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToIntFromJson(json);
+  factory SimpleClassNullableOfDynamicToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToFromJsonDynamicParamFromJson(json);
 
   Map<String, Object?> toJson() =>
-      _$SimpleClassNullableOfDynamicToIntToJson(this);
+      _$SimpleClassNullableOfDynamicToFromJsonDynamicParamToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassOfEnumTypeToInt {
-  final Map<EnumType, int> value;
+class SimpleClassOfEnumTypeToFromJsonDynamicParam {
+  final Map<EnumType, FromJsonDynamicParam> value;
 
-  SimpleClassOfEnumTypeToInt(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToFromJsonDynamicParam(this.value);
 
-  factory SimpleClassOfEnumTypeToInt.fromJson(Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToIntFromJson(json);
+  factory SimpleClassOfEnumTypeToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToFromJsonDynamicParamFromJson(json);
 
-  Map<String, Object?> toJson() => _$SimpleClassOfEnumTypeToIntToJson(this);
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfEnumTypeToFromJsonDynamicParamToJson(this);
 }
 
 @JsonSerializable()
-class SimpleClassNullableOfEnumTypeToInt {
-  final Map<EnumType, int>? value;
+class SimpleClassNullableOfEnumTypeToFromJsonDynamicParam {
+  final Map<EnumType, FromJsonDynamicParam>? value;
 
-  SimpleClassNullableOfEnumTypeToInt(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfEnumTypeToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfEnumTypeToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfIntToFromJsonDynamicParam {
+  final Map<int, FromJsonDynamicParam> value;
+
+  SimpleClassOfIntToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfIntToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfIntToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfIntToFromJsonDynamicParam {
+  final Map<int, FromJsonDynamicParam>? value;
+
+  SimpleClassNullableOfIntToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfIntToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfIntToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfObjectToFromJsonDynamicParam {
+  final Map<Object, FromJsonDynamicParam> value;
+
+  SimpleClassOfObjectToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfObjectToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfObjectToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfObjectToFromJsonDynamicParam {
+  final Map<Object, FromJsonDynamicParam>? value;
+
+  SimpleClassNullableOfObjectToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfObjectToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfObjectToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfStringToFromJsonDynamicParam {
+  final Map<String, FromJsonDynamicParam> value;
+
+  SimpleClassOfStringToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfStringToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfStringToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfStringToFromJsonDynamicParam {
+  final Map<String, FromJsonDynamicParam>? value;
+
+  SimpleClassNullableOfStringToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfStringToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfStringToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfUriToFromJsonDynamicParam {
+  final Map<Uri, FromJsonDynamicParam> value;
+
+  SimpleClassOfUriToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfUriToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfUriToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfUriToFromJsonDynamicParam {
+  final Map<Uri, FromJsonDynamicParam>? value;
+
+  SimpleClassNullableOfUriToFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfUriToFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfUriToFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfBigIntToFromJsonNullableObjectParam {
+  final Map<BigInt, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfBigIntToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfBigIntToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfBigIntToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBigIntToFromJsonNullableObjectParam {
+  final Map<BigInt, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfBigIntToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfBigIntToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfBigIntToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDateTimeToFromJsonNullableObjectParam {
+  final Map<DateTime, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfDateTimeToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfDateTimeToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfDateTimeToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam {
+  final Map<DateTime, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToFromJsonNullableObjectParamFromJson(
+    json,
+  );
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDateTimeToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDynamicToFromJsonNullableObjectParam {
+  final Map<dynamic, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfDynamicToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfDynamicToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfDynamicToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDynamicToFromJsonNullableObjectParam {
+  final Map<dynamic, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfDynamicToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfDynamicToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) =>
+      _$SimpleClassNullableOfDynamicToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDynamicToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfEnumTypeToFromJsonNullableObjectParam {
+  final Map<EnumType, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfEnumTypeToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfEnumTypeToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfEnumTypeToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParam {
+  final Map<EnumType, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParamFromJson(
+    json,
+  );
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfIntToFromJsonNullableObjectParam {
+  final Map<int, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfIntToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfIntToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfIntToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfIntToFromJsonNullableObjectParam {
+  final Map<int, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfIntToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfIntToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfIntToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfObjectToFromJsonNullableObjectParam {
+  final Map<Object, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfObjectToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfObjectToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfObjectToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfObjectToFromJsonNullableObjectParam {
+  final Map<Object, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfObjectToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfObjectToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfObjectToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfStringToFromJsonNullableObjectParam {
+  final Map<String, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfStringToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfStringToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfStringToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfStringToFromJsonNullableObjectParam {
+  final Map<String, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfStringToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfStringToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfStringToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfUriToFromJsonNullableObjectParam {
+  final Map<Uri, FromJsonNullableObjectParam> value;
+
+  SimpleClassOfUriToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfUriToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfUriToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfUriToFromJsonNullableObjectParam {
+  final Map<Uri, FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfUriToFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfUriToFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfUriToFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfBigIntToFromJsonObjectParam {
+  final Map<BigInt, FromJsonObjectParam> value;
+
+  SimpleClassOfBigIntToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfBigIntToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfBigIntToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBigIntToFromJsonObjectParam {
+  final Map<BigInt, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfBigIntToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfBigIntToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfBigIntToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDateTimeToFromJsonObjectParam {
+  final Map<DateTime, FromJsonObjectParam> value;
+
+  SimpleClassOfDateTimeToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfDateTimeToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfDateTimeToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDateTimeToFromJsonObjectParam {
+  final Map<DateTime, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfDateTimeToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfDateTimeToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDateTimeToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDynamicToFromJsonObjectParam {
+  final Map<dynamic, FromJsonObjectParam> value;
+
+  SimpleClassOfDynamicToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfDynamicToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfDynamicToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDynamicToFromJsonObjectParam {
+  final Map<dynamic, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfDynamicToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfDynamicToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDynamicToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfEnumTypeToFromJsonObjectParam {
+  final Map<EnumType, FromJsonObjectParam> value;
+
+  SimpleClassOfEnumTypeToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfEnumTypeToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfEnumTypeToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfEnumTypeToFromJsonObjectParam {
+  final Map<EnumType, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfEnumTypeToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfEnumTypeToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfEnumTypeToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfIntToFromJsonObjectParam {
+  final Map<int, FromJsonObjectParam> value;
+
+  SimpleClassOfIntToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfIntToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfIntToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfIntToFromJsonObjectParam {
+  final Map<int, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfIntToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfIntToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfIntToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfObjectToFromJsonObjectParam {
+  final Map<Object, FromJsonObjectParam> value;
+
+  SimpleClassOfObjectToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfObjectToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfObjectToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfObjectToFromJsonObjectParam {
+  final Map<Object, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfObjectToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfObjectToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfObjectToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfStringToFromJsonObjectParam {
+  final Map<String, FromJsonObjectParam> value;
+
+  SimpleClassOfStringToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfStringToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfStringToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfStringToFromJsonObjectParam {
+  final Map<String, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfStringToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfStringToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfStringToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfUriToFromJsonObjectParam {
+  final Map<Uri, FromJsonObjectParam> value;
+
+  SimpleClassOfUriToFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfUriToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfUriToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfUriToFromJsonObjectParam {
+  final Map<Uri, FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfUriToFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfUriToFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfUriToFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfBigIntToInt {
+  final Map<BigInt, int> value;
+
+  SimpleClassOfBigIntToInt(this.value);
+
+  factory SimpleClassOfBigIntToInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfBigIntToIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfBigIntToIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBigIntToInt {
+  final Map<BigInt, int>? value;
+
+  SimpleClassNullableOfBigIntToInt(this.value);
+
+  factory SimpleClassNullableOfBigIntToInt.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToIntFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfBigIntToIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDateTimeToInt {
+  final Map<DateTime, int> value;
+
+  SimpleClassOfDateTimeToInt(this.value);
+
+  factory SimpleClassOfDateTimeToInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDateTimeToIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDateTimeToIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDateTimeToInt {
+  final Map<DateTime, int>? value;
+
+  SimpleClassNullableOfDateTimeToInt(this.value);
+
+  factory SimpleClassNullableOfDateTimeToInt.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToIntFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDateTimeToIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDynamicToInt {
+  final Map<dynamic, int> value;
+
+  SimpleClassOfDynamicToInt(this.value);
+
+  factory SimpleClassOfDynamicToInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDynamicToIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDynamicToIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDynamicToInt {
+  final Map<dynamic, int>? value;
+
+  SimpleClassNullableOfDynamicToInt(this.value);
+
+  factory SimpleClassNullableOfDynamicToInt.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToIntFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDynamicToIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfEnumTypeToInt {
+  final Map<EnumType, int> value;
+
+  SimpleClassOfEnumTypeToInt(this.value);
+
+  factory SimpleClassOfEnumTypeToInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfEnumTypeToIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfEnumTypeToIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfEnumTypeToInt {
+  final Map<EnumType, int>? value;
+
+  SimpleClassNullableOfEnumTypeToInt(this.value);
 
   factory SimpleClassNullableOfEnumTypeToInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToIntToJson(this);
@@ -3381,9 +3620,7 @@ class SimpleClassNullableOfEnumTypeToInt {
 class SimpleClassOfIntToInt {
   final Map<int, int> value;
 
-  SimpleClassOfIntToInt(
-    this.value,
-  );
+  SimpleClassOfIntToInt(this.value);
 
   factory SimpleClassOfIntToInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToIntFromJson(json);
@@ -3395,9 +3632,7 @@ class SimpleClassOfIntToInt {
 class SimpleClassNullableOfIntToInt {
   final Map<int, int>? value;
 
-  SimpleClassNullableOfIntToInt(
-    this.value,
-  );
+  SimpleClassNullableOfIntToInt(this.value);
 
   factory SimpleClassNullableOfIntToInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfIntToIntFromJson(json);
@@ -3409,9 +3644,7 @@ class SimpleClassNullableOfIntToInt {
 class SimpleClassOfObjectToInt {
   final Map<Object, int> value;
 
-  SimpleClassOfObjectToInt(
-    this.value,
-  );
+  SimpleClassOfObjectToInt(this.value);
 
   factory SimpleClassOfObjectToInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToIntFromJson(json);
@@ -3423,13 +3656,11 @@ class SimpleClassOfObjectToInt {
 class SimpleClassNullableOfObjectToInt {
   final Map<Object, int>? value;
 
-  SimpleClassNullableOfObjectToInt(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToInt(this.value);
 
   factory SimpleClassNullableOfObjectToInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToIntToJson(this);
@@ -3439,9 +3670,7 @@ class SimpleClassNullableOfObjectToInt {
 class SimpleClassOfStringToInt {
   final Map<String, int> value;
 
-  SimpleClassOfStringToInt(
-    this.value,
-  );
+  SimpleClassOfStringToInt(this.value);
 
   factory SimpleClassOfStringToInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToIntFromJson(json);
@@ -3453,13 +3682,11 @@ class SimpleClassOfStringToInt {
 class SimpleClassNullableOfStringToInt {
   final Map<String, int>? value;
 
-  SimpleClassNullableOfStringToInt(
-    this.value,
-  );
+  SimpleClassNullableOfStringToInt(this.value);
 
   factory SimpleClassNullableOfStringToInt.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToIntFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToIntFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToIntToJson(this);
@@ -3469,9 +3696,7 @@ class SimpleClassNullableOfStringToInt {
 class SimpleClassOfUriToInt {
   final Map<Uri, int> value;
 
-  SimpleClassOfUriToInt(
-    this.value,
-  );
+  SimpleClassOfUriToInt(this.value);
 
   factory SimpleClassOfUriToInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToIntFromJson(json);
@@ -3483,9 +3708,7 @@ class SimpleClassOfUriToInt {
 class SimpleClassNullableOfUriToInt {
   final Map<Uri, int>? value;
 
-  SimpleClassNullableOfUriToInt(
-    this.value,
-  );
+  SimpleClassNullableOfUriToInt(this.value);
 
   factory SimpleClassNullableOfUriToInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfUriToIntFromJson(json);
@@ -3497,13 +3720,11 @@ class SimpleClassNullableOfUriToInt {
 class SimpleClassOfBigIntToIntNullable {
   final Map<BigInt, int?> value;
 
-  SimpleClassOfBigIntToIntNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToIntNullable(this.value);
 
   factory SimpleClassOfBigIntToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToIntNullableToJson(this);
@@ -3513,13 +3734,11 @@ class SimpleClassOfBigIntToIntNullable {
 class SimpleClassNullableOfBigIntToIntNullable {
   final Map<BigInt, int?>? value;
 
-  SimpleClassNullableOfBigIntToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToIntNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToIntNullableToJson(this);
@@ -3529,13 +3748,11 @@ class SimpleClassNullableOfBigIntToIntNullable {
 class SimpleClassOfDateTimeToIntNullable {
   final Map<DateTime, int?> value;
 
-  SimpleClassOfDateTimeToIntNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToIntNullable(this.value);
 
   factory SimpleClassOfDateTimeToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToIntNullableToJson(this);
@@ -3545,13 +3762,11 @@ class SimpleClassOfDateTimeToIntNullable {
 class SimpleClassNullableOfDateTimeToIntNullable {
   final Map<DateTime, int?>? value;
 
-  SimpleClassNullableOfDateTimeToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToIntNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToIntNullableToJson(this);
@@ -3561,13 +3776,11 @@ class SimpleClassNullableOfDateTimeToIntNullable {
 class SimpleClassOfDynamicToIntNullable {
   final Map<dynamic, int?> value;
 
-  SimpleClassOfDynamicToIntNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToIntNullable(this.value);
 
   factory SimpleClassOfDynamicToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToIntNullableToJson(this);
@@ -3577,13 +3790,11 @@ class SimpleClassOfDynamicToIntNullable {
 class SimpleClassNullableOfDynamicToIntNullable {
   final Map<dynamic, int?>? value;
 
-  SimpleClassNullableOfDynamicToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToIntNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToIntNullableToJson(this);
@@ -3593,13 +3804,11 @@ class SimpleClassNullableOfDynamicToIntNullable {
 class SimpleClassOfEnumTypeToIntNullable {
   final Map<EnumType, int?> value;
 
-  SimpleClassOfEnumTypeToIntNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToIntNullable(this.value);
 
   factory SimpleClassOfEnumTypeToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToIntNullableToJson(this);
@@ -3609,13 +3818,11 @@ class SimpleClassOfEnumTypeToIntNullable {
 class SimpleClassNullableOfEnumTypeToIntNullable {
   final Map<EnumType, int?>? value;
 
-  SimpleClassNullableOfEnumTypeToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToIntNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToIntNullableToJson(this);
@@ -3625,9 +3832,7 @@ class SimpleClassNullableOfEnumTypeToIntNullable {
 class SimpleClassOfIntToIntNullable {
   final Map<int, int?> value;
 
-  SimpleClassOfIntToIntNullable(
-    this.value,
-  );
+  SimpleClassOfIntToIntNullable(this.value);
 
   factory SimpleClassOfIntToIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToIntNullableFromJson(json);
@@ -3639,13 +3844,11 @@ class SimpleClassOfIntToIntNullable {
 class SimpleClassNullableOfIntToIntNullable {
   final Map<int, int?>? value;
 
-  SimpleClassNullableOfIntToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToIntNullable(this.value);
 
   factory SimpleClassNullableOfIntToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToIntNullableToJson(this);
@@ -3655,13 +3858,11 @@ class SimpleClassNullableOfIntToIntNullable {
 class SimpleClassOfObjectToIntNullable {
   final Map<Object, int?> value;
 
-  SimpleClassOfObjectToIntNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToIntNullable(this.value);
 
   factory SimpleClassOfObjectToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToIntNullableToJson(this);
@@ -3671,13 +3872,11 @@ class SimpleClassOfObjectToIntNullable {
 class SimpleClassNullableOfObjectToIntNullable {
   final Map<Object, int?>? value;
 
-  SimpleClassNullableOfObjectToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToIntNullable(this.value);
 
   factory SimpleClassNullableOfObjectToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToIntNullableToJson(this);
@@ -3687,13 +3886,11 @@ class SimpleClassNullableOfObjectToIntNullable {
 class SimpleClassOfStringToIntNullable {
   final Map<String, int?> value;
 
-  SimpleClassOfStringToIntNullable(
-    this.value,
-  );
+  SimpleClassOfStringToIntNullable(this.value);
 
   factory SimpleClassOfStringToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToIntNullableToJson(this);
@@ -3703,13 +3900,11 @@ class SimpleClassOfStringToIntNullable {
 class SimpleClassNullableOfStringToIntNullable {
   final Map<String, int?>? value;
 
-  SimpleClassNullableOfStringToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToIntNullable(this.value);
 
   factory SimpleClassNullableOfStringToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToIntNullableToJson(this);
@@ -3719,9 +3914,7 @@ class SimpleClassNullableOfStringToIntNullable {
 class SimpleClassOfUriToIntNullable {
   final Map<Uri, int?> value;
 
-  SimpleClassOfUriToIntNullable(
-    this.value,
-  );
+  SimpleClassOfUriToIntNullable(this.value);
 
   factory SimpleClassOfUriToIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToIntNullableFromJson(json);
@@ -3733,13 +3926,11 @@ class SimpleClassOfUriToIntNullable {
 class SimpleClassNullableOfUriToIntNullable {
   final Map<Uri, int?>? value;
 
-  SimpleClassNullableOfUriToIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToIntNullable(this.value);
 
   factory SimpleClassNullableOfUriToIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToIntNullableToJson(this);
@@ -3749,9 +3940,7 @@ class SimpleClassNullableOfUriToIntNullable {
 class SimpleClassOfBigIntToNum {
   final Map<BigInt, num> value;
 
-  SimpleClassOfBigIntToNum(
-    this.value,
-  );
+  SimpleClassOfBigIntToNum(this.value);
 
   factory SimpleClassOfBigIntToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToNumFromJson(json);
@@ -3763,13 +3952,11 @@ class SimpleClassOfBigIntToNum {
 class SimpleClassNullableOfBigIntToNum {
   final Map<BigInt, num>? value;
 
-  SimpleClassNullableOfBigIntToNum(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToNum(this.value);
 
   factory SimpleClassNullableOfBigIntToNum.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToNumFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToNumFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToNumToJson(this);
@@ -3779,9 +3966,7 @@ class SimpleClassNullableOfBigIntToNum {
 class SimpleClassOfDateTimeToNum {
   final Map<DateTime, num> value;
 
-  SimpleClassOfDateTimeToNum(
-    this.value,
-  );
+  SimpleClassOfDateTimeToNum(this.value);
 
   factory SimpleClassOfDateTimeToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToNumFromJson(json);
@@ -3793,13 +3978,11 @@ class SimpleClassOfDateTimeToNum {
 class SimpleClassNullableOfDateTimeToNum {
   final Map<DateTime, num>? value;
 
-  SimpleClassNullableOfDateTimeToNum(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToNum(this.value);
 
   factory SimpleClassNullableOfDateTimeToNum.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToNumFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToNumFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToNumToJson(this);
@@ -3809,9 +3992,7 @@ class SimpleClassNullableOfDateTimeToNum {
 class SimpleClassOfDynamicToNum {
   final Map<dynamic, num> value;
 
-  SimpleClassOfDynamicToNum(
-    this.value,
-  );
+  SimpleClassOfDynamicToNum(this.value);
 
   factory SimpleClassOfDynamicToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToNumFromJson(json);
@@ -3823,13 +4004,11 @@ class SimpleClassOfDynamicToNum {
 class SimpleClassNullableOfDynamicToNum {
   final Map<dynamic, num>? value;
 
-  SimpleClassNullableOfDynamicToNum(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToNum(this.value);
 
   factory SimpleClassNullableOfDynamicToNum.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToNumFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToNumFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToNumToJson(this);
@@ -3839,9 +4018,7 @@ class SimpleClassNullableOfDynamicToNum {
 class SimpleClassOfEnumTypeToNum {
   final Map<EnumType, num> value;
 
-  SimpleClassOfEnumTypeToNum(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToNum(this.value);
 
   factory SimpleClassOfEnumTypeToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToNumFromJson(json);
@@ -3853,13 +4030,11 @@ class SimpleClassOfEnumTypeToNum {
 class SimpleClassNullableOfEnumTypeToNum {
   final Map<EnumType, num>? value;
 
-  SimpleClassNullableOfEnumTypeToNum(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToNum(this.value);
 
   factory SimpleClassNullableOfEnumTypeToNum.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToNumFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToNumFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToNumToJson(this);
@@ -3869,9 +4044,7 @@ class SimpleClassNullableOfEnumTypeToNum {
 class SimpleClassOfIntToNum {
   final Map<int, num> value;
 
-  SimpleClassOfIntToNum(
-    this.value,
-  );
+  SimpleClassOfIntToNum(this.value);
 
   factory SimpleClassOfIntToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToNumFromJson(json);
@@ -3883,9 +4056,7 @@ class SimpleClassOfIntToNum {
 class SimpleClassNullableOfIntToNum {
   final Map<int, num>? value;
 
-  SimpleClassNullableOfIntToNum(
-    this.value,
-  );
+  SimpleClassNullableOfIntToNum(this.value);
 
   factory SimpleClassNullableOfIntToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfIntToNumFromJson(json);
@@ -3897,9 +4068,7 @@ class SimpleClassNullableOfIntToNum {
 class SimpleClassOfObjectToNum {
   final Map<Object, num> value;
 
-  SimpleClassOfObjectToNum(
-    this.value,
-  );
+  SimpleClassOfObjectToNum(this.value);
 
   factory SimpleClassOfObjectToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToNumFromJson(json);
@@ -3911,13 +4080,11 @@ class SimpleClassOfObjectToNum {
 class SimpleClassNullableOfObjectToNum {
   final Map<Object, num>? value;
 
-  SimpleClassNullableOfObjectToNum(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToNum(this.value);
 
   factory SimpleClassNullableOfObjectToNum.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToNumFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToNumFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToNumToJson(this);
@@ -3927,9 +4094,7 @@ class SimpleClassNullableOfObjectToNum {
 class SimpleClassOfStringToNum {
   final Map<String, num> value;
 
-  SimpleClassOfStringToNum(
-    this.value,
-  );
+  SimpleClassOfStringToNum(this.value);
 
   factory SimpleClassOfStringToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToNumFromJson(json);
@@ -3941,13 +4106,11 @@ class SimpleClassOfStringToNum {
 class SimpleClassNullableOfStringToNum {
   final Map<String, num>? value;
 
-  SimpleClassNullableOfStringToNum(
-    this.value,
-  );
+  SimpleClassNullableOfStringToNum(this.value);
 
   factory SimpleClassNullableOfStringToNum.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToNumFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToNumFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToNumToJson(this);
@@ -3957,9 +4120,7 @@ class SimpleClassNullableOfStringToNum {
 class SimpleClassOfUriToNum {
   final Map<Uri, num> value;
 
-  SimpleClassOfUriToNum(
-    this.value,
-  );
+  SimpleClassOfUriToNum(this.value);
 
   factory SimpleClassOfUriToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToNumFromJson(json);
@@ -3971,9 +4132,7 @@ class SimpleClassOfUriToNum {
 class SimpleClassNullableOfUriToNum {
   final Map<Uri, num>? value;
 
-  SimpleClassNullableOfUriToNum(
-    this.value,
-  );
+  SimpleClassNullableOfUriToNum(this.value);
 
   factory SimpleClassNullableOfUriToNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfUriToNumFromJson(json);
@@ -3985,13 +4144,11 @@ class SimpleClassNullableOfUriToNum {
 class SimpleClassOfBigIntToNumNullable {
   final Map<BigInt, num?> value;
 
-  SimpleClassOfBigIntToNumNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToNumNullable(this.value);
 
   factory SimpleClassOfBigIntToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToNumNullableToJson(this);
@@ -4001,13 +4158,11 @@ class SimpleClassOfBigIntToNumNullable {
 class SimpleClassNullableOfBigIntToNumNullable {
   final Map<BigInt, num?>? value;
 
-  SimpleClassNullableOfBigIntToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToNumNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToNumNullableToJson(this);
@@ -4017,13 +4172,11 @@ class SimpleClassNullableOfBigIntToNumNullable {
 class SimpleClassOfDateTimeToNumNullable {
   final Map<DateTime, num?> value;
 
-  SimpleClassOfDateTimeToNumNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToNumNullable(this.value);
 
   factory SimpleClassOfDateTimeToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToNumNullableToJson(this);
@@ -4033,13 +4186,11 @@ class SimpleClassOfDateTimeToNumNullable {
 class SimpleClassNullableOfDateTimeToNumNullable {
   final Map<DateTime, num?>? value;
 
-  SimpleClassNullableOfDateTimeToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToNumNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToNumNullableToJson(this);
@@ -4049,13 +4200,11 @@ class SimpleClassNullableOfDateTimeToNumNullable {
 class SimpleClassOfDynamicToNumNullable {
   final Map<dynamic, num?> value;
 
-  SimpleClassOfDynamicToNumNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToNumNullable(this.value);
 
   factory SimpleClassOfDynamicToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToNumNullableToJson(this);
@@ -4065,13 +4214,11 @@ class SimpleClassOfDynamicToNumNullable {
 class SimpleClassNullableOfDynamicToNumNullable {
   final Map<dynamic, num?>? value;
 
-  SimpleClassNullableOfDynamicToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToNumNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToNumNullableToJson(this);
@@ -4081,13 +4228,11 @@ class SimpleClassNullableOfDynamicToNumNullable {
 class SimpleClassOfEnumTypeToNumNullable {
   final Map<EnumType, num?> value;
 
-  SimpleClassOfEnumTypeToNumNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToNumNullable(this.value);
 
   factory SimpleClassOfEnumTypeToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToNumNullableToJson(this);
@@ -4097,13 +4242,11 @@ class SimpleClassOfEnumTypeToNumNullable {
 class SimpleClassNullableOfEnumTypeToNumNullable {
   final Map<EnumType, num?>? value;
 
-  SimpleClassNullableOfEnumTypeToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToNumNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToNumNullableToJson(this);
@@ -4113,9 +4256,7 @@ class SimpleClassNullableOfEnumTypeToNumNullable {
 class SimpleClassOfIntToNumNullable {
   final Map<int, num?> value;
 
-  SimpleClassOfIntToNumNullable(
-    this.value,
-  );
+  SimpleClassOfIntToNumNullable(this.value);
 
   factory SimpleClassOfIntToNumNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToNumNullableFromJson(json);
@@ -4127,13 +4268,11 @@ class SimpleClassOfIntToNumNullable {
 class SimpleClassNullableOfIntToNumNullable {
   final Map<int, num?>? value;
 
-  SimpleClassNullableOfIntToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToNumNullable(this.value);
 
   factory SimpleClassNullableOfIntToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToNumNullableToJson(this);
@@ -4143,13 +4282,11 @@ class SimpleClassNullableOfIntToNumNullable {
 class SimpleClassOfObjectToNumNullable {
   final Map<Object, num?> value;
 
-  SimpleClassOfObjectToNumNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToNumNullable(this.value);
 
   factory SimpleClassOfObjectToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToNumNullableToJson(this);
@@ -4159,13 +4296,11 @@ class SimpleClassOfObjectToNumNullable {
 class SimpleClassNullableOfObjectToNumNullable {
   final Map<Object, num?>? value;
 
-  SimpleClassNullableOfObjectToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToNumNullable(this.value);
 
   factory SimpleClassNullableOfObjectToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToNumNullableToJson(this);
@@ -4175,13 +4310,11 @@ class SimpleClassNullableOfObjectToNumNullable {
 class SimpleClassOfStringToNumNullable {
   final Map<String, num?> value;
 
-  SimpleClassOfStringToNumNullable(
-    this.value,
-  );
+  SimpleClassOfStringToNumNullable(this.value);
 
   factory SimpleClassOfStringToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToNumNullableToJson(this);
@@ -4191,13 +4324,11 @@ class SimpleClassOfStringToNumNullable {
 class SimpleClassNullableOfStringToNumNullable {
   final Map<String, num?>? value;
 
-  SimpleClassNullableOfStringToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToNumNullable(this.value);
 
   factory SimpleClassNullableOfStringToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToNumNullableToJson(this);
@@ -4207,9 +4338,7 @@ class SimpleClassNullableOfStringToNumNullable {
 class SimpleClassOfUriToNumNullable {
   final Map<Uri, num?> value;
 
-  SimpleClassOfUriToNumNullable(
-    this.value,
-  );
+  SimpleClassOfUriToNumNullable(this.value);
 
   factory SimpleClassOfUriToNumNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToNumNullableFromJson(json);
@@ -4221,13 +4350,11 @@ class SimpleClassOfUriToNumNullable {
 class SimpleClassNullableOfUriToNumNullable {
   final Map<Uri, num?>? value;
 
-  SimpleClassNullableOfUriToNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToNumNullable(this.value);
 
   factory SimpleClassNullableOfUriToNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToNumNullableToJson(this);
@@ -4237,9 +4364,7 @@ class SimpleClassNullableOfUriToNumNullable {
 class SimpleClassOfBigIntToObject {
   final Map<BigInt, Object> value;
 
-  SimpleClassOfBigIntToObject(
-    this.value,
-  );
+  SimpleClassOfBigIntToObject(this.value);
 
   factory SimpleClassOfBigIntToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToObjectFromJson(json);
@@ -4251,13 +4376,11 @@ class SimpleClassOfBigIntToObject {
 class SimpleClassNullableOfBigIntToObject {
   final Map<BigInt, Object>? value;
 
-  SimpleClassNullableOfBigIntToObject(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToObject(this.value);
 
   factory SimpleClassNullableOfBigIntToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToObjectToJson(this);
@@ -4267,9 +4390,7 @@ class SimpleClassNullableOfBigIntToObject {
 class SimpleClassOfDateTimeToObject {
   final Map<DateTime, Object> value;
 
-  SimpleClassOfDateTimeToObject(
-    this.value,
-  );
+  SimpleClassOfDateTimeToObject(this.value);
 
   factory SimpleClassOfDateTimeToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToObjectFromJson(json);
@@ -4281,13 +4402,11 @@ class SimpleClassOfDateTimeToObject {
 class SimpleClassNullableOfDateTimeToObject {
   final Map<DateTime, Object>? value;
 
-  SimpleClassNullableOfDateTimeToObject(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToObject(this.value);
 
   factory SimpleClassNullableOfDateTimeToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToObjectToJson(this);
@@ -4297,9 +4416,7 @@ class SimpleClassNullableOfDateTimeToObject {
 class SimpleClassOfDynamicToObject {
   final Map<dynamic, Object> value;
 
-  SimpleClassOfDynamicToObject(
-    this.value,
-  );
+  SimpleClassOfDynamicToObject(this.value);
 
   factory SimpleClassOfDynamicToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToObjectFromJson(json);
@@ -4311,13 +4428,11 @@ class SimpleClassOfDynamicToObject {
 class SimpleClassNullableOfDynamicToObject {
   final Map<dynamic, Object>? value;
 
-  SimpleClassNullableOfDynamicToObject(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToObject(this.value);
 
   factory SimpleClassNullableOfDynamicToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToObjectToJson(this);
@@ -4327,9 +4442,7 @@ class SimpleClassNullableOfDynamicToObject {
 class SimpleClassOfEnumTypeToObject {
   final Map<EnumType, Object> value;
 
-  SimpleClassOfEnumTypeToObject(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToObject(this.value);
 
   factory SimpleClassOfEnumTypeToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToObjectFromJson(json);
@@ -4341,13 +4454,11 @@ class SimpleClassOfEnumTypeToObject {
 class SimpleClassNullableOfEnumTypeToObject {
   final Map<EnumType, Object>? value;
 
-  SimpleClassNullableOfEnumTypeToObject(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToObject(this.value);
 
   factory SimpleClassNullableOfEnumTypeToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToObjectToJson(this);
@@ -4357,9 +4468,7 @@ class SimpleClassNullableOfEnumTypeToObject {
 class SimpleClassOfIntToObject {
   final Map<int, Object> value;
 
-  SimpleClassOfIntToObject(
-    this.value,
-  );
+  SimpleClassOfIntToObject(this.value);
 
   factory SimpleClassOfIntToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToObjectFromJson(json);
@@ -4371,13 +4480,11 @@ class SimpleClassOfIntToObject {
 class SimpleClassNullableOfIntToObject {
   final Map<int, Object>? value;
 
-  SimpleClassNullableOfIntToObject(
-    this.value,
-  );
+  SimpleClassNullableOfIntToObject(this.value);
 
   factory SimpleClassNullableOfIntToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToObjectToJson(this);
@@ -4387,9 +4494,7 @@ class SimpleClassNullableOfIntToObject {
 class SimpleClassOfObjectToObject {
   final Map<Object, Object> value;
 
-  SimpleClassOfObjectToObject(
-    this.value,
-  );
+  SimpleClassOfObjectToObject(this.value);
 
   factory SimpleClassOfObjectToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToObjectFromJson(json);
@@ -4401,13 +4506,11 @@ class SimpleClassOfObjectToObject {
 class SimpleClassNullableOfObjectToObject {
   final Map<Object, Object>? value;
 
-  SimpleClassNullableOfObjectToObject(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToObject(this.value);
 
   factory SimpleClassNullableOfObjectToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToObjectToJson(this);
@@ -4417,9 +4520,7 @@ class SimpleClassNullableOfObjectToObject {
 class SimpleClassOfStringToObject {
   final Map<String, Object> value;
 
-  SimpleClassOfStringToObject(
-    this.value,
-  );
+  SimpleClassOfStringToObject(this.value);
 
   factory SimpleClassOfStringToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToObjectFromJson(json);
@@ -4431,13 +4532,11 @@ class SimpleClassOfStringToObject {
 class SimpleClassNullableOfStringToObject {
   final Map<String, Object>? value;
 
-  SimpleClassNullableOfStringToObject(
-    this.value,
-  );
+  SimpleClassNullableOfStringToObject(this.value);
 
   factory SimpleClassNullableOfStringToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToObjectToJson(this);
@@ -4447,9 +4546,7 @@ class SimpleClassNullableOfStringToObject {
 class SimpleClassOfUriToObject {
   final Map<Uri, Object> value;
 
-  SimpleClassOfUriToObject(
-    this.value,
-  );
+  SimpleClassOfUriToObject(this.value);
 
   factory SimpleClassOfUriToObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToObjectFromJson(json);
@@ -4461,13 +4558,11 @@ class SimpleClassOfUriToObject {
 class SimpleClassNullableOfUriToObject {
   final Map<Uri, Object>? value;
 
-  SimpleClassNullableOfUriToObject(
-    this.value,
-  );
+  SimpleClassNullableOfUriToObject(this.value);
 
   factory SimpleClassNullableOfUriToObject.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToObjectFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToObjectFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToObjectToJson(this);
@@ -4477,13 +4572,11 @@ class SimpleClassNullableOfUriToObject {
 class SimpleClassOfBigIntToObjectNullable {
   final Map<BigInt, Object?> value;
 
-  SimpleClassOfBigIntToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToObjectNullable(this.value);
 
   factory SimpleClassOfBigIntToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToObjectNullableToJson(this);
@@ -4493,13 +4586,11 @@ class SimpleClassOfBigIntToObjectNullable {
 class SimpleClassNullableOfBigIntToObjectNullable {
   final Map<BigInt, Object?>? value;
 
-  SimpleClassNullableOfBigIntToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToObjectNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToObjectNullableToJson(this);
@@ -4509,13 +4600,11 @@ class SimpleClassNullableOfBigIntToObjectNullable {
 class SimpleClassOfDateTimeToObjectNullable {
   final Map<DateTime, Object?> value;
 
-  SimpleClassOfDateTimeToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToObjectNullable(this.value);
 
   factory SimpleClassOfDateTimeToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToObjectNullableToJson(this);
@@ -4525,13 +4614,11 @@ class SimpleClassOfDateTimeToObjectNullable {
 class SimpleClassNullableOfDateTimeToObjectNullable {
   final Map<DateTime, Object?>? value;
 
-  SimpleClassNullableOfDateTimeToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToObjectNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToObjectNullableToJson(this);
@@ -4541,13 +4628,11 @@ class SimpleClassNullableOfDateTimeToObjectNullable {
 class SimpleClassOfDynamicToObjectNullable {
   final Map<dynamic, Object?> value;
 
-  SimpleClassOfDynamicToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToObjectNullable(this.value);
 
   factory SimpleClassOfDynamicToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToObjectNullableToJson(this);
@@ -4557,13 +4642,11 @@ class SimpleClassOfDynamicToObjectNullable {
 class SimpleClassNullableOfDynamicToObjectNullable {
   final Map<dynamic, Object?>? value;
 
-  SimpleClassNullableOfDynamicToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToObjectNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToObjectNullableToJson(this);
@@ -4573,13 +4656,11 @@ class SimpleClassNullableOfDynamicToObjectNullable {
 class SimpleClassOfEnumTypeToObjectNullable {
   final Map<EnumType, Object?> value;
 
-  SimpleClassOfEnumTypeToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToObjectNullable(this.value);
 
   factory SimpleClassOfEnumTypeToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToObjectNullableToJson(this);
@@ -4589,13 +4670,11 @@ class SimpleClassOfEnumTypeToObjectNullable {
 class SimpleClassNullableOfEnumTypeToObjectNullable {
   final Map<EnumType, Object?>? value;
 
-  SimpleClassNullableOfEnumTypeToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToObjectNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToObjectNullableToJson(this);
@@ -4605,13 +4684,11 @@ class SimpleClassNullableOfEnumTypeToObjectNullable {
 class SimpleClassOfIntToObjectNullable {
   final Map<int, Object?> value;
 
-  SimpleClassOfIntToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfIntToObjectNullable(this.value);
 
   factory SimpleClassOfIntToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfIntToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfIntToObjectNullableToJson(this);
@@ -4621,13 +4698,11 @@ class SimpleClassOfIntToObjectNullable {
 class SimpleClassNullableOfIntToObjectNullable {
   final Map<int, Object?>? value;
 
-  SimpleClassNullableOfIntToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToObjectNullable(this.value);
 
   factory SimpleClassNullableOfIntToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToObjectNullableToJson(this);
@@ -4637,13 +4712,11 @@ class SimpleClassNullableOfIntToObjectNullable {
 class SimpleClassOfObjectToObjectNullable {
   final Map<Object, Object?> value;
 
-  SimpleClassOfObjectToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToObjectNullable(this.value);
 
   factory SimpleClassOfObjectToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToObjectNullableToJson(this);
@@ -4653,13 +4726,11 @@ class SimpleClassOfObjectToObjectNullable {
 class SimpleClassNullableOfObjectToObjectNullable {
   final Map<Object, Object?>? value;
 
-  SimpleClassNullableOfObjectToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToObjectNullable(this.value);
 
   factory SimpleClassNullableOfObjectToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToObjectNullableToJson(this);
@@ -4669,13 +4740,11 @@ class SimpleClassNullableOfObjectToObjectNullable {
 class SimpleClassOfStringToObjectNullable {
   final Map<String, Object?> value;
 
-  SimpleClassOfStringToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfStringToObjectNullable(this.value);
 
   factory SimpleClassOfStringToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToObjectNullableToJson(this);
@@ -4685,13 +4754,11 @@ class SimpleClassOfStringToObjectNullable {
 class SimpleClassNullableOfStringToObjectNullable {
   final Map<String, Object?>? value;
 
-  SimpleClassNullableOfStringToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToObjectNullable(this.value);
 
   factory SimpleClassNullableOfStringToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToObjectNullableToJson(this);
@@ -4701,13 +4768,11 @@ class SimpleClassNullableOfStringToObjectNullable {
 class SimpleClassOfUriToObjectNullable {
   final Map<Uri, Object?> value;
 
-  SimpleClassOfUriToObjectNullable(
-    this.value,
-  );
+  SimpleClassOfUriToObjectNullable(this.value);
 
   factory SimpleClassOfUriToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfUriToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfUriToObjectNullableToJson(this);
@@ -4717,25 +4782,229 @@ class SimpleClassOfUriToObjectNullable {
 class SimpleClassNullableOfUriToObjectNullable {
   final Map<Uri, Object?>? value;
 
-  SimpleClassNullableOfUriToObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToObjectNullable(this.value);
 
   factory SimpleClassNullableOfUriToObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToObjectNullableToJson(this);
 }
 
+@JsonSerializable()
+class SimpleClassOfBigIntToRecord {
+  final Map<BigInt, (int, String, {bool truth})> value;
+
+  SimpleClassOfBigIntToRecord(this.value);
+
+  factory SimpleClassOfBigIntToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfBigIntToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfBigIntToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBigIntToRecord {
+  final Map<BigInt, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfBigIntToRecord(this.value);
+
+  factory SimpleClassNullableOfBigIntToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfBigIntToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDateTimeToRecord {
+  final Map<DateTime, (int, String, {bool truth})> value;
+
+  SimpleClassOfDateTimeToRecord(this.value);
+
+  factory SimpleClassOfDateTimeToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDateTimeToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDateTimeToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDateTimeToRecord {
+  final Map<DateTime, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfDateTimeToRecord(this.value);
+
+  factory SimpleClassNullableOfDateTimeToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDateTimeToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfDynamicToRecord {
+  final Map<dynamic, (int, String, {bool truth})> value;
+
+  SimpleClassOfDynamicToRecord(this.value);
+
+  factory SimpleClassOfDynamicToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDynamicToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDynamicToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDynamicToRecord {
+  final Map<dynamic, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfDynamicToRecord(this.value);
+
+  factory SimpleClassNullableOfDynamicToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDynamicToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfEnumTypeToRecord {
+  final Map<EnumType, (int, String, {bool truth})> value;
+
+  SimpleClassOfEnumTypeToRecord(this.value);
+
+  factory SimpleClassOfEnumTypeToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfEnumTypeToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfEnumTypeToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfEnumTypeToRecord {
+  final Map<EnumType, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfEnumTypeToRecord(this.value);
+
+  factory SimpleClassNullableOfEnumTypeToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfEnumTypeToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfIntToRecord {
+  final Map<int, (int, String, {bool truth})> value;
+
+  SimpleClassOfIntToRecord(this.value);
+
+  factory SimpleClassOfIntToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfIntToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfIntToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfIntToRecord {
+  final Map<int, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfIntToRecord(this.value);
+
+  factory SimpleClassNullableOfIntToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfIntToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfObjectToRecord {
+  final Map<Object, (int, String, {bool truth})> value;
+
+  SimpleClassOfObjectToRecord(this.value);
+
+  factory SimpleClassOfObjectToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfObjectToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfObjectToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfObjectToRecord {
+  final Map<Object, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfObjectToRecord(this.value);
+
+  factory SimpleClassNullableOfObjectToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfObjectToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfStringToRecord {
+  final Map<String, (int, String, {bool truth})> value;
+
+  SimpleClassOfStringToRecord(this.value);
+
+  factory SimpleClassOfStringToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfStringToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfStringToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfStringToRecord {
+  final Map<String, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfStringToRecord(this.value);
+
+  factory SimpleClassNullableOfStringToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfStringToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfUriToRecord {
+  final Map<Uri, (int, String, {bool truth})> value;
+
+  SimpleClassOfUriToRecord(this.value);
+
+  factory SimpleClassOfUriToRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfUriToRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfUriToRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfUriToRecord {
+  final Map<Uri, (int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfUriToRecord(this.value);
+
+  factory SimpleClassNullableOfUriToRecord.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToRecordFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfUriToRecordToJson(this);
+}
+
 @JsonSerializable()
 class SimpleClassOfBigIntToString {
   final Map<BigInt, String> value;
 
-  SimpleClassOfBigIntToString(
-    this.value,
-  );
+  SimpleClassOfBigIntToString(this.value);
 
   factory SimpleClassOfBigIntToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToStringFromJson(json);
@@ -4747,13 +5016,11 @@ class SimpleClassOfBigIntToString {
 class SimpleClassNullableOfBigIntToString {
   final Map<BigInt, String>? value;
 
-  SimpleClassNullableOfBigIntToString(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToString(this.value);
 
   factory SimpleClassNullableOfBigIntToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToStringToJson(this);
@@ -4763,9 +5030,7 @@ class SimpleClassNullableOfBigIntToString {
 class SimpleClassOfDateTimeToString {
   final Map<DateTime, String> value;
 
-  SimpleClassOfDateTimeToString(
-    this.value,
-  );
+  SimpleClassOfDateTimeToString(this.value);
 
   factory SimpleClassOfDateTimeToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToStringFromJson(json);
@@ -4777,13 +5042,11 @@ class SimpleClassOfDateTimeToString {
 class SimpleClassNullableOfDateTimeToString {
   final Map<DateTime, String>? value;
 
-  SimpleClassNullableOfDateTimeToString(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToString(this.value);
 
   factory SimpleClassNullableOfDateTimeToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToStringToJson(this);
@@ -4793,9 +5056,7 @@ class SimpleClassNullableOfDateTimeToString {
 class SimpleClassOfDynamicToString {
   final Map<dynamic, String> value;
 
-  SimpleClassOfDynamicToString(
-    this.value,
-  );
+  SimpleClassOfDynamicToString(this.value);
 
   factory SimpleClassOfDynamicToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToStringFromJson(json);
@@ -4807,13 +5068,11 @@ class SimpleClassOfDynamicToString {
 class SimpleClassNullableOfDynamicToString {
   final Map<dynamic, String>? value;
 
-  SimpleClassNullableOfDynamicToString(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToString(this.value);
 
   factory SimpleClassNullableOfDynamicToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToStringToJson(this);
@@ -4823,9 +5082,7 @@ class SimpleClassNullableOfDynamicToString {
 class SimpleClassOfEnumTypeToString {
   final Map<EnumType, String> value;
 
-  SimpleClassOfEnumTypeToString(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToString(this.value);
 
   factory SimpleClassOfEnumTypeToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToStringFromJson(json);
@@ -4837,13 +5094,11 @@ class SimpleClassOfEnumTypeToString {
 class SimpleClassNullableOfEnumTypeToString {
   final Map<EnumType, String>? value;
 
-  SimpleClassNullableOfEnumTypeToString(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToString(this.value);
 
   factory SimpleClassNullableOfEnumTypeToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToStringToJson(this);
@@ -4853,9 +5108,7 @@ class SimpleClassNullableOfEnumTypeToString {
 class SimpleClassOfIntToString {
   final Map<int, String> value;
 
-  SimpleClassOfIntToString(
-    this.value,
-  );
+  SimpleClassOfIntToString(this.value);
 
   factory SimpleClassOfIntToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToStringFromJson(json);
@@ -4867,13 +5120,11 @@ class SimpleClassOfIntToString {
 class SimpleClassNullableOfIntToString {
   final Map<int, String>? value;
 
-  SimpleClassNullableOfIntToString(
-    this.value,
-  );
+  SimpleClassNullableOfIntToString(this.value);
 
   factory SimpleClassNullableOfIntToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToStringToJson(this);
@@ -4883,9 +5134,7 @@ class SimpleClassNullableOfIntToString {
 class SimpleClassOfObjectToString {
   final Map<Object, String> value;
 
-  SimpleClassOfObjectToString(
-    this.value,
-  );
+  SimpleClassOfObjectToString(this.value);
 
   factory SimpleClassOfObjectToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToStringFromJson(json);
@@ -4897,13 +5146,11 @@ class SimpleClassOfObjectToString {
 class SimpleClassNullableOfObjectToString {
   final Map<Object, String>? value;
 
-  SimpleClassNullableOfObjectToString(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToString(this.value);
 
   factory SimpleClassNullableOfObjectToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToStringToJson(this);
@@ -4913,9 +5160,7 @@ class SimpleClassNullableOfObjectToString {
 class SimpleClassOfStringToString {
   final Map<String, String> value;
 
-  SimpleClassOfStringToString(
-    this.value,
-  );
+  SimpleClassOfStringToString(this.value);
 
   factory SimpleClassOfStringToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToStringFromJson(json);
@@ -4927,13 +5172,11 @@ class SimpleClassOfStringToString {
 class SimpleClassNullableOfStringToString {
   final Map<String, String>? value;
 
-  SimpleClassNullableOfStringToString(
-    this.value,
-  );
+  SimpleClassNullableOfStringToString(this.value);
 
   factory SimpleClassNullableOfStringToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToStringToJson(this);
@@ -4943,9 +5186,7 @@ class SimpleClassNullableOfStringToString {
 class SimpleClassOfUriToString {
   final Map<Uri, String> value;
 
-  SimpleClassOfUriToString(
-    this.value,
-  );
+  SimpleClassOfUriToString(this.value);
 
   factory SimpleClassOfUriToString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToStringFromJson(json);
@@ -4957,13 +5198,11 @@ class SimpleClassOfUriToString {
 class SimpleClassNullableOfUriToString {
   final Map<Uri, String>? value;
 
-  SimpleClassNullableOfUriToString(
-    this.value,
-  );
+  SimpleClassNullableOfUriToString(this.value);
 
   factory SimpleClassNullableOfUriToString.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToStringFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToStringFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToStringToJson(this);
@@ -4973,13 +5212,11 @@ class SimpleClassNullableOfUriToString {
 class SimpleClassOfBigIntToStringNullable {
   final Map<BigInt, String?> value;
 
-  SimpleClassOfBigIntToStringNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToStringNullable(this.value);
 
   factory SimpleClassOfBigIntToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToStringNullableToJson(this);
@@ -4989,13 +5226,11 @@ class SimpleClassOfBigIntToStringNullable {
 class SimpleClassNullableOfBigIntToStringNullable {
   final Map<BigInt, String?>? value;
 
-  SimpleClassNullableOfBigIntToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToStringNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToStringNullableToJson(this);
@@ -5005,13 +5240,11 @@ class SimpleClassNullableOfBigIntToStringNullable {
 class SimpleClassOfDateTimeToStringNullable {
   final Map<DateTime, String?> value;
 
-  SimpleClassOfDateTimeToStringNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToStringNullable(this.value);
 
   factory SimpleClassOfDateTimeToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToStringNullableToJson(this);
@@ -5021,13 +5254,11 @@ class SimpleClassOfDateTimeToStringNullable {
 class SimpleClassNullableOfDateTimeToStringNullable {
   final Map<DateTime, String?>? value;
 
-  SimpleClassNullableOfDateTimeToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToStringNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToStringNullableToJson(this);
@@ -5037,13 +5268,11 @@ class SimpleClassNullableOfDateTimeToStringNullable {
 class SimpleClassOfDynamicToStringNullable {
   final Map<dynamic, String?> value;
 
-  SimpleClassOfDynamicToStringNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToStringNullable(this.value);
 
   factory SimpleClassOfDynamicToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToStringNullableToJson(this);
@@ -5053,13 +5282,11 @@ class SimpleClassOfDynamicToStringNullable {
 class SimpleClassNullableOfDynamicToStringNullable {
   final Map<dynamic, String?>? value;
 
-  SimpleClassNullableOfDynamicToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToStringNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToStringNullableToJson(this);
@@ -5069,13 +5296,11 @@ class SimpleClassNullableOfDynamicToStringNullable {
 class SimpleClassOfEnumTypeToStringNullable {
   final Map<EnumType, String?> value;
 
-  SimpleClassOfEnumTypeToStringNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToStringNullable(this.value);
 
   factory SimpleClassOfEnumTypeToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToStringNullableToJson(this);
@@ -5085,13 +5310,11 @@ class SimpleClassOfEnumTypeToStringNullable {
 class SimpleClassNullableOfEnumTypeToStringNullable {
   final Map<EnumType, String?>? value;
 
-  SimpleClassNullableOfEnumTypeToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToStringNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToStringNullableToJson(this);
@@ -5101,13 +5324,11 @@ class SimpleClassNullableOfEnumTypeToStringNullable {
 class SimpleClassOfIntToStringNullable {
   final Map<int, String?> value;
 
-  SimpleClassOfIntToStringNullable(
-    this.value,
-  );
+  SimpleClassOfIntToStringNullable(this.value);
 
   factory SimpleClassOfIntToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfIntToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfIntToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfIntToStringNullableToJson(this);
@@ -5117,13 +5338,11 @@ class SimpleClassOfIntToStringNullable {
 class SimpleClassNullableOfIntToStringNullable {
   final Map<int, String?>? value;
 
-  SimpleClassNullableOfIntToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToStringNullable(this.value);
 
   factory SimpleClassNullableOfIntToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToStringNullableToJson(this);
@@ -5133,13 +5352,11 @@ class SimpleClassNullableOfIntToStringNullable {
 class SimpleClassOfObjectToStringNullable {
   final Map<Object, String?> value;
 
-  SimpleClassOfObjectToStringNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToStringNullable(this.value);
 
   factory SimpleClassOfObjectToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToStringNullableToJson(this);
@@ -5149,13 +5366,11 @@ class SimpleClassOfObjectToStringNullable {
 class SimpleClassNullableOfObjectToStringNullable {
   final Map<Object, String?>? value;
 
-  SimpleClassNullableOfObjectToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToStringNullable(this.value);
 
   factory SimpleClassNullableOfObjectToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToStringNullableToJson(this);
@@ -5165,13 +5380,11 @@ class SimpleClassNullableOfObjectToStringNullable {
 class SimpleClassOfStringToStringNullable {
   final Map<String, String?> value;
 
-  SimpleClassOfStringToStringNullable(
-    this.value,
-  );
+  SimpleClassOfStringToStringNullable(this.value);
 
   factory SimpleClassOfStringToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToStringNullableToJson(this);
@@ -5181,13 +5394,11 @@ class SimpleClassOfStringToStringNullable {
 class SimpleClassNullableOfStringToStringNullable {
   final Map<String, String?>? value;
 
-  SimpleClassNullableOfStringToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToStringNullable(this.value);
 
   factory SimpleClassNullableOfStringToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToStringNullableToJson(this);
@@ -5197,13 +5408,11 @@ class SimpleClassNullableOfStringToStringNullable {
 class SimpleClassOfUriToStringNullable {
   final Map<Uri, String?> value;
 
-  SimpleClassOfUriToStringNullable(
-    this.value,
-  );
+  SimpleClassOfUriToStringNullable(this.value);
 
   factory SimpleClassOfUriToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfUriToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfUriToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfUriToStringNullableToJson(this);
@@ -5213,13 +5422,11 @@ class SimpleClassOfUriToStringNullable {
 class SimpleClassNullableOfUriToStringNullable {
   final Map<Uri, String?>? value;
 
-  SimpleClassNullableOfUriToStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToStringNullable(this.value);
 
   factory SimpleClassNullableOfUriToStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToStringNullableToJson(this);
@@ -5229,9 +5436,7 @@ class SimpleClassNullableOfUriToStringNullable {
 class SimpleClassOfBigIntToUri {
   final Map<BigInt, Uri> value;
 
-  SimpleClassOfBigIntToUri(
-    this.value,
-  );
+  SimpleClassOfBigIntToUri(this.value);
 
   factory SimpleClassOfBigIntToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntToUriFromJson(json);
@@ -5243,13 +5448,11 @@ class SimpleClassOfBigIntToUri {
 class SimpleClassNullableOfBigIntToUri {
   final Map<BigInt, Uri>? value;
 
-  SimpleClassNullableOfBigIntToUri(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToUri(this.value);
 
   factory SimpleClassNullableOfBigIntToUri.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToUriFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToUriFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToUriToJson(this);
@@ -5259,9 +5462,7 @@ class SimpleClassNullableOfBigIntToUri {
 class SimpleClassOfDateTimeToUri {
   final Map<DateTime, Uri> value;
 
-  SimpleClassOfDateTimeToUri(
-    this.value,
-  );
+  SimpleClassOfDateTimeToUri(this.value);
 
   factory SimpleClassOfDateTimeToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeToUriFromJson(json);
@@ -5273,13 +5474,11 @@ class SimpleClassOfDateTimeToUri {
 class SimpleClassNullableOfDateTimeToUri {
   final Map<DateTime, Uri>? value;
 
-  SimpleClassNullableOfDateTimeToUri(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToUri(this.value);
 
   factory SimpleClassNullableOfDateTimeToUri.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToUriFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToUriFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToUriToJson(this);
@@ -5289,9 +5488,7 @@ class SimpleClassNullableOfDateTimeToUri {
 class SimpleClassOfDynamicToUri {
   final Map<dynamic, Uri> value;
 
-  SimpleClassOfDynamicToUri(
-    this.value,
-  );
+  SimpleClassOfDynamicToUri(this.value);
 
   factory SimpleClassOfDynamicToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicToUriFromJson(json);
@@ -5303,13 +5500,11 @@ class SimpleClassOfDynamicToUri {
 class SimpleClassNullableOfDynamicToUri {
   final Map<dynamic, Uri>? value;
 
-  SimpleClassNullableOfDynamicToUri(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToUri(this.value);
 
   factory SimpleClassNullableOfDynamicToUri.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToUriFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToUriFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToUriToJson(this);
@@ -5319,9 +5514,7 @@ class SimpleClassNullableOfDynamicToUri {
 class SimpleClassOfEnumTypeToUri {
   final Map<EnumType, Uri> value;
 
-  SimpleClassOfEnumTypeToUri(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToUri(this.value);
 
   factory SimpleClassOfEnumTypeToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeToUriFromJson(json);
@@ -5333,13 +5526,11 @@ class SimpleClassOfEnumTypeToUri {
 class SimpleClassNullableOfEnumTypeToUri {
   final Map<EnumType, Uri>? value;
 
-  SimpleClassNullableOfEnumTypeToUri(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToUri(this.value);
 
   factory SimpleClassNullableOfEnumTypeToUri.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToUriFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToUriFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToUriToJson(this);
@@ -5349,9 +5540,7 @@ class SimpleClassNullableOfEnumTypeToUri {
 class SimpleClassOfIntToUri {
   final Map<int, Uri> value;
 
-  SimpleClassOfIntToUri(
-    this.value,
-  );
+  SimpleClassOfIntToUri(this.value);
 
   factory SimpleClassOfIntToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToUriFromJson(json);
@@ -5363,9 +5552,7 @@ class SimpleClassOfIntToUri {
 class SimpleClassNullableOfIntToUri {
   final Map<int, Uri>? value;
 
-  SimpleClassNullableOfIntToUri(
-    this.value,
-  );
+  SimpleClassNullableOfIntToUri(this.value);
 
   factory SimpleClassNullableOfIntToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfIntToUriFromJson(json);
@@ -5377,9 +5564,7 @@ class SimpleClassNullableOfIntToUri {
 class SimpleClassOfObjectToUri {
   final Map<Object, Uri> value;
 
-  SimpleClassOfObjectToUri(
-    this.value,
-  );
+  SimpleClassOfObjectToUri(this.value);
 
   factory SimpleClassOfObjectToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectToUriFromJson(json);
@@ -5391,13 +5576,11 @@ class SimpleClassOfObjectToUri {
 class SimpleClassNullableOfObjectToUri {
   final Map<Object, Uri>? value;
 
-  SimpleClassNullableOfObjectToUri(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToUri(this.value);
 
   factory SimpleClassNullableOfObjectToUri.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToUriFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToUriFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToUriToJson(this);
@@ -5407,9 +5590,7 @@ class SimpleClassNullableOfObjectToUri {
 class SimpleClassOfStringToUri {
   final Map<String, Uri> value;
 
-  SimpleClassOfStringToUri(
-    this.value,
-  );
+  SimpleClassOfStringToUri(this.value);
 
   factory SimpleClassOfStringToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringToUriFromJson(json);
@@ -5421,13 +5602,11 @@ class SimpleClassOfStringToUri {
 class SimpleClassNullableOfStringToUri {
   final Map<String, Uri>? value;
 
-  SimpleClassNullableOfStringToUri(
-    this.value,
-  );
+  SimpleClassNullableOfStringToUri(this.value);
 
   factory SimpleClassNullableOfStringToUri.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToUriFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToUriFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToUriToJson(this);
@@ -5437,9 +5616,7 @@ class SimpleClassNullableOfStringToUri {
 class SimpleClassOfUriToUri {
   final Map<Uri, Uri> value;
 
-  SimpleClassOfUriToUri(
-    this.value,
-  );
+  SimpleClassOfUriToUri(this.value);
 
   factory SimpleClassOfUriToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToUriFromJson(json);
@@ -5451,9 +5628,7 @@ class SimpleClassOfUriToUri {
 class SimpleClassNullableOfUriToUri {
   final Map<Uri, Uri>? value;
 
-  SimpleClassNullableOfUriToUri(
-    this.value,
-  );
+  SimpleClassNullableOfUriToUri(this.value);
 
   factory SimpleClassNullableOfUriToUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfUriToUriFromJson(json);
@@ -5465,13 +5640,11 @@ class SimpleClassNullableOfUriToUri {
 class SimpleClassOfBigIntToUriNullable {
   final Map<BigInt, Uri?> value;
 
-  SimpleClassOfBigIntToUriNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntToUriNullable(this.value);
 
   factory SimpleClassOfBigIntToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfBigIntToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfBigIntToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfBigIntToUriNullableToJson(this);
@@ -5481,13 +5654,11 @@ class SimpleClassOfBigIntToUriNullable {
 class SimpleClassNullableOfBigIntToUriNullable {
   final Map<BigInt, Uri?>? value;
 
-  SimpleClassNullableOfBigIntToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntToUriNullable(this.value);
 
   factory SimpleClassNullableOfBigIntToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntToUriNullableToJson(this);
@@ -5497,13 +5668,11 @@ class SimpleClassNullableOfBigIntToUriNullable {
 class SimpleClassOfDateTimeToUriNullable {
   final Map<DateTime, Uri?> value;
 
-  SimpleClassOfDateTimeToUriNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeToUriNullable(this.value);
 
   factory SimpleClassOfDateTimeToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDateTimeToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDateTimeToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDateTimeToUriNullableToJson(this);
@@ -5513,13 +5682,11 @@ class SimpleClassOfDateTimeToUriNullable {
 class SimpleClassNullableOfDateTimeToUriNullable {
   final Map<DateTime, Uri?>? value;
 
-  SimpleClassNullableOfDateTimeToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeToUriNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeToUriNullableToJson(this);
@@ -5529,13 +5696,11 @@ class SimpleClassNullableOfDateTimeToUriNullable {
 class SimpleClassOfDynamicToUriNullable {
   final Map<dynamic, Uri?> value;
 
-  SimpleClassOfDynamicToUriNullable(
-    this.value,
-  );
+  SimpleClassOfDynamicToUriNullable(this.value);
 
   factory SimpleClassOfDynamicToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfDynamicToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfDynamicToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfDynamicToUriNullableToJson(this);
@@ -5545,13 +5710,11 @@ class SimpleClassOfDynamicToUriNullable {
 class SimpleClassNullableOfDynamicToUriNullable {
   final Map<dynamic, Uri?>? value;
 
-  SimpleClassNullableOfDynamicToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDynamicToUriNullable(this.value);
 
   factory SimpleClassNullableOfDynamicToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDynamicToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDynamicToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDynamicToUriNullableToJson(this);
@@ -5561,13 +5724,11 @@ class SimpleClassNullableOfDynamicToUriNullable {
 class SimpleClassOfEnumTypeToUriNullable {
   final Map<EnumType, Uri?> value;
 
-  SimpleClassOfEnumTypeToUriNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeToUriNullable(this.value);
 
   factory SimpleClassOfEnumTypeToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfEnumTypeToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfEnumTypeToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfEnumTypeToUriNullableToJson(this);
@@ -5577,13 +5738,11 @@ class SimpleClassOfEnumTypeToUriNullable {
 class SimpleClassNullableOfEnumTypeToUriNullable {
   final Map<EnumType, Uri?>? value;
 
-  SimpleClassNullableOfEnumTypeToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeToUriNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeToUriNullableToJson(this);
@@ -5593,9 +5752,7 @@ class SimpleClassNullableOfEnumTypeToUriNullable {
 class SimpleClassOfIntToUriNullable {
   final Map<int, Uri?> value;
 
-  SimpleClassOfIntToUriNullable(
-    this.value,
-  );
+  SimpleClassOfIntToUriNullable(this.value);
 
   factory SimpleClassOfIntToUriNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntToUriNullableFromJson(json);
@@ -5607,13 +5764,11 @@ class SimpleClassOfIntToUriNullable {
 class SimpleClassNullableOfIntToUriNullable {
   final Map<int, Uri?>? value;
 
-  SimpleClassNullableOfIntToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntToUriNullable(this.value);
 
   factory SimpleClassNullableOfIntToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntToUriNullableToJson(this);
@@ -5623,13 +5778,11 @@ class SimpleClassNullableOfIntToUriNullable {
 class SimpleClassOfObjectToUriNullable {
   final Map<Object, Uri?> value;
 
-  SimpleClassOfObjectToUriNullable(
-    this.value,
-  );
+  SimpleClassOfObjectToUriNullable(this.value);
 
   factory SimpleClassOfObjectToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfObjectToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfObjectToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfObjectToUriNullableToJson(this);
@@ -5639,13 +5792,11 @@ class SimpleClassOfObjectToUriNullable {
 class SimpleClassNullableOfObjectToUriNullable {
   final Map<Object, Uri?>? value;
 
-  SimpleClassNullableOfObjectToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectToUriNullable(this.value);
 
   factory SimpleClassNullableOfObjectToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectToUriNullableToJson(this);
@@ -5655,13 +5806,11 @@ class SimpleClassNullableOfObjectToUriNullable {
 class SimpleClassOfStringToUriNullable {
   final Map<String, Uri?> value;
 
-  SimpleClassOfStringToUriNullable(
-    this.value,
-  );
+  SimpleClassOfStringToUriNullable(this.value);
 
   factory SimpleClassOfStringToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassOfStringToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfStringToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassOfStringToUriNullableToJson(this);
@@ -5671,13 +5820,11 @@ class SimpleClassOfStringToUriNullable {
 class SimpleClassNullableOfStringToUriNullable {
   final Map<String, Uri?>? value;
 
-  SimpleClassNullableOfStringToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringToUriNullable(this.value);
 
   factory SimpleClassNullableOfStringToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringToUriNullableToJson(this);
@@ -5687,9 +5834,7 @@ class SimpleClassNullableOfStringToUriNullable {
 class SimpleClassOfUriToUriNullable {
   final Map<Uri, Uri?> value;
 
-  SimpleClassOfUriToUriNullable(
-    this.value,
-  );
+  SimpleClassOfUriToUriNullable(this.value);
 
   factory SimpleClassOfUriToUriNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriToUriNullableFromJson(json);
@@ -5701,13 +5846,11 @@ class SimpleClassOfUriToUriNullable {
 class SimpleClassNullableOfUriToUriNullable {
   final Map<Uri, Uri?>? value;
 
-  SimpleClassNullableOfUriToUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriToUriNullable(this.value);
 
   factory SimpleClassNullableOfUriToUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriToUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriToUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriToUriNullableToJson(this);
diff --git a/json_serializable/test/supported_types/input.type_map.g.dart b/json_serializable/test/supported_types/input.type_map.g.dart
index 0886e800a..7077797f6 100644
--- a/json_serializable/test/supported_types/input.type_map.g.dart
+++ b/json_serializable/test/supported_types/input.type_map.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_map.dart';
 
@@ -9,9 +9,9 @@ part of 'input.type_map.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as Map<String, dynamic>,
-      json['withDefault'] as Map<String, dynamic>? ?? {'a': 1},
-    );
+  json['value'] as Map<String, dynamic>,
+  json['withDefault'] as Map<String, dynamic>? ?? {'a': 1},
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -26,116 +26,116 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
 
 SimpleClassOfBigIntToBigInt _$SimpleClassOfBigIntToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToBigIntToJson(
-        SimpleClassOfBigIntToBigInt instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassOfBigIntToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassNullableOfBigIntToBigInt
-    _$SimpleClassNullableOfBigIntToBigIntFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToBigInt(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToBigIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToBigInt(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToBigIntToJson(
-        SimpleClassNullableOfBigIntToBigInt instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassNullableOfBigIntToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassOfDateTimeToBigInt _$SimpleClassOfDateTimeToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToBigIntToJson(
-        SimpleClassOfDateTimeToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e.toString())),
-    };
+  SimpleClassOfDateTimeToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.toString()),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToBigInt
-    _$SimpleClassNullableOfDateTimeToBigIntFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToBigInt(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToBigIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToBigInt(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(DateTime.parse(k), BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToBigIntToJson(
-        SimpleClassNullableOfDateTimeToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e.toString())),
-    };
+  SimpleClassNullableOfDateTimeToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.toString()),
+  ),
+};
 
 SimpleClassOfDynamicToBigInt _$SimpleClassOfDynamicToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToBigIntToJson(
-        SimpleClassOfDynamicToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassOfDynamicToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassNullableOfDynamicToBigInt
-    _$SimpleClassNullableOfDynamicToBigIntFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToBigInt(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToBigIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToBigInt(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToBigIntToJson(
-        SimpleClassNullableOfDynamicToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassNullableOfDynamicToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassOfEnumTypeToBigInt _$SimpleClassOfEnumTypeToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            $enumDecode(_$EnumTypeEnumMap, k), BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry($enumDecode(_$EnumTypeEnumMap, k), BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToBigIntToJson(
-        SimpleClassOfEnumTypeToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.toString())),
-    };
+  SimpleClassOfEnumTypeToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toString()),
+  ),
+};
 
 const _$EnumTypeEnumMap = {
   EnumType.alpha: 'alpha',
@@ -145,5300 +145,6368 @@ const _$EnumTypeEnumMap = {
 };
 
 SimpleClassNullableOfEnumTypeToBigInt
-    _$SimpleClassNullableOfEnumTypeToBigIntFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToBigInt(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                $enumDecode(_$EnumTypeEnumMap, k), BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToBigIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToBigInt(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          BigInt.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToBigIntToJson(
-        SimpleClassNullableOfEnumTypeToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.toString())),
-    };
+  SimpleClassNullableOfEnumTypeToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toString()),
+  ),
+};
 
 SimpleClassOfIntToBigInt _$SimpleClassOfIntToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToBigIntToJson(
-        SimpleClassOfIntToBigInt instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassOfIntToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassNullableOfIntToBigInt _$SimpleClassNullableOfIntToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToBigInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToBigInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToBigIntToJson(
-        SimpleClassNullableOfIntToBigInt instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassNullableOfIntToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassOfObjectToBigInt _$SimpleClassOfObjectToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToBigIntToJson(
-        SimpleClassOfObjectToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassOfObjectToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassNullableOfObjectToBigInt
-    _$SimpleClassNullableOfObjectToBigIntFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToBigInt(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToBigIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToBigInt(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToBigIntToJson(
-        SimpleClassNullableOfObjectToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassNullableOfObjectToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassOfStringToBigInt _$SimpleClassOfStringToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToBigIntToJson(
-        SimpleClassOfStringToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassOfStringToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassNullableOfStringToBigInt
-    _$SimpleClassNullableOfStringToBigIntFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToBigInt(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfStringToBigIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToBigInt(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToBigIntToJson(
-        SimpleClassNullableOfStringToBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassNullableOfStringToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassOfUriToBigInt _$SimpleClassOfUriToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToBigInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToBigInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToBigIntToJson(
-        SimpleClassOfUriToBigInt instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassOfUriToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassNullableOfUriToBigInt _$SimpleClassNullableOfUriToBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToBigInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToBigInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToBigIntToJson(
-        SimpleClassNullableOfUriToBigInt instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassNullableOfUriToBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassOfBigIntToBigIntNullable
-    _$SimpleClassOfBigIntToBigIntNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfBigIntToBigIntNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(
-                BigInt.parse(k), e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfBigIntToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToBigIntNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          e == null ? null : BigInt.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToBigIntNullableToJson(
-        SimpleClassOfBigIntToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassOfBigIntToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassNullableOfBigIntToBigIntNullable
-    _$SimpleClassNullableOfBigIntToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                BigInt.parse(k), e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToBigIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToBigIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(BigInt.parse(k), e == null ? null : BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToBigIntNullableToJson(
-        SimpleClassNullableOfBigIntToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassNullableOfBigIntToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassOfDateTimeToBigIntNullable
-    _$SimpleClassOfDateTimeToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToBigIntNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(DateTime.parse(k),
-                e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfDateTimeToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToBigIntNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          DateTime.parse(k),
+          e == null ? null : BigInt.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToBigIntNullableToJson(
-        SimpleClassOfDateTimeToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e?.toString())),
-    };
+  SimpleClassOfDateTimeToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.toString()),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToBigIntNullable
-    _$SimpleClassNullableOfDateTimeToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k),
-                e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToBigIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToBigIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      DateTime.parse(k),
+      e == null ? null : BigInt.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToBigIntNullableToJson(
-        SimpleClassNullableOfDateTimeToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e?.toString())),
-    };
+  SimpleClassNullableOfDateTimeToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.toString()),
+  ),
+};
 
 SimpleClassOfDynamicToBigIntNullable
-    _$SimpleClassOfDynamicToBigIntNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfDynamicToBigIntNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfDynamicToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDynamicToBigIntNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDynamicToBigIntNullableToJson(
-        SimpleClassOfDynamicToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassOfDynamicToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassNullableOfDynamicToBigIntNullable
-    _$SimpleClassNullableOfDynamicToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToBigIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToBigIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToBigIntNullableToJson(
-        SimpleClassNullableOfDynamicToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassNullableOfDynamicToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassOfEnumTypeToBigIntNullable
-    _$SimpleClassOfEnumTypeToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToBigIntNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfEnumTypeToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToBigIntNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          e == null ? null : BigInt.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToBigIntNullableToJson(
-        SimpleClassOfEnumTypeToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.toString())),
-    };
+  SimpleClassOfEnumTypeToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toString()),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToBigIntNullable
-    _$SimpleClassNullableOfEnumTypeToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToBigIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToBigIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      e == null ? null : BigInt.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToBigIntNullableToJson(
-        SimpleClassNullableOfEnumTypeToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.toString())),
-    };
+  SimpleClassNullableOfEnumTypeToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toString()),
+  ),
+};
 
 SimpleClassOfIntToBigIntNullable _$SimpleClassOfIntToBigIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToBigIntNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            int.parse(k), e == null ? null : BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToBigIntNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(int.parse(k), e == null ? null : BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToBigIntNullableToJson(
-        SimpleClassOfIntToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassOfIntToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassNullableOfIntToBigIntNullable
-    _$SimpleClassNullableOfIntToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                int.parse(k), e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfIntToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToBigIntNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          int.parse(k),
+          e == null ? null : BigInt.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToBigIntNullableToJson(
-        SimpleClassNullableOfIntToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassNullableOfIntToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassOfObjectToBigIntNullable
-    _$SimpleClassOfObjectToBigIntNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfObjectToBigIntNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfObjectToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToBigIntNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfObjectToBigIntNullableToJson(
-        SimpleClassOfObjectToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassOfObjectToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassNullableOfObjectToBigIntNullable
-    _$SimpleClassNullableOfObjectToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToBigIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToBigIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToBigIntNullableToJson(
-        SimpleClassNullableOfObjectToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassNullableOfObjectToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassOfStringToBigIntNullable
-    _$SimpleClassOfStringToBigIntNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfStringToBigIntNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfStringToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToBigIntNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfStringToBigIntNullableToJson(
-        SimpleClassOfStringToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassOfStringToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassNullableOfStringToBigIntNullable
-    _$SimpleClassNullableOfStringToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfStringToBigIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToBigIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e == null ? null : BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToBigIntNullableToJson(
-        SimpleClassNullableOfStringToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassNullableOfStringToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassOfUriToBigIntNullable _$SimpleClassOfUriToBigIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToBigIntNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            Uri.parse(k), e == null ? null : BigInt.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToBigIntNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(Uri.parse(k), e == null ? null : BigInt.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToBigIntNullableToJson(
-        SimpleClassOfUriToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassOfUriToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassNullableOfUriToBigIntNullable
-    _$SimpleClassNullableOfUriToBigIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToBigIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                Uri.parse(k), e == null ? null : BigInt.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfUriToBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToBigIntNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          Uri.parse(k),
+          e == null ? null : BigInt.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToBigIntNullableToJson(
-        SimpleClassNullableOfUriToBigIntNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassNullableOfUriToBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassOfBigIntToBool _$SimpleClassOfBigIntToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToBool(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToBool(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToBoolToJson(
-        SimpleClassOfBigIntToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToBool instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToBool _$SimpleClassNullableOfBigIntToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBigIntToBool(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(BigInt.parse(k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToBool(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToBoolToJson(
-        SimpleClassNullableOfBigIntToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToBool instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToBool _$SimpleClassOfDateTimeToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToBool(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToBool(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToBoolToJson(
-        SimpleClassOfDateTimeToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToBool instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToBool
-    _$SimpleClassNullableOfDateTimeToBoolFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToBool(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e as bool),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToBoolFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToBool(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(DateTime.parse(k), e as bool),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToBoolToJson(
-        SimpleClassNullableOfDateTimeToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToBool instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToBool _$SimpleClassOfDynamicToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToBool(
-      Map<String, bool>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToBool(Map<String, bool>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfDynamicToBoolToJson(
-        SimpleClassOfDynamicToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToBool instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToBool _$SimpleClassNullableOfDynamicToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDynamicToBool(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToBool(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToBoolToJson(
-        SimpleClassNullableOfDynamicToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToBool instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToBool _$SimpleClassOfEnumTypeToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToBool(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToBool(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToBoolToJson(
-        SimpleClassOfEnumTypeToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToBool instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToBool
-    _$SimpleClassNullableOfEnumTypeToBoolFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToBool(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToBoolFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToBool(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToBoolToJson(
-        SimpleClassNullableOfEnumTypeToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToBool instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToBool _$SimpleClassOfIntToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToBool(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToBool(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToBoolToJson(
-        SimpleClassOfIntToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToBool instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToBool _$SimpleClassNullableOfIntToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToBool(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToBool(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToBoolToJson(
-        SimpleClassNullableOfIntToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToBool instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToBool _$SimpleClassOfObjectToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToBool(
-      Map<String, bool>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToBool(Map<String, bool>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfObjectToBoolToJson(
-        SimpleClassOfObjectToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToBool instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToBool _$SimpleClassNullableOfObjectToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfObjectToBool(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToBool(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToBoolToJson(
-        SimpleClassNullableOfObjectToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToBool instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToBool _$SimpleClassOfStringToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToBool(
-      Map<String, bool>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToBool(Map<String, bool>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfStringToBoolToJson(
-        SimpleClassOfStringToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToBool instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToBool _$SimpleClassNullableOfStringToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfStringToBool(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToBool(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToBoolToJson(
-        SimpleClassNullableOfStringToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToBool instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToBool _$SimpleClassOfUriToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToBool(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToBool(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToBoolToJson(
-        SimpleClassOfUriToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToBool instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToBool _$SimpleClassNullableOfUriToBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToBool(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), e as bool),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToBool(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), e as bool),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToBoolToJson(
-        SimpleClassNullableOfUriToBool instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToBool instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToBoolNullable _$SimpleClassOfBigIntToBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToBoolNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as bool?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToBoolNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToBoolNullableToJson(
-        SimpleClassOfBigIntToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToBoolNullable
-    _$SimpleClassNullableOfBigIntToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToBoolNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToBoolNullableToJson(
-        SimpleClassNullableOfBigIntToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToBoolNullable
-    _$SimpleClassOfDateTimeToBoolNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToBoolNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(DateTime.parse(k), e as bool?),
-          ),
-        );
+_$SimpleClassOfDateTimeToBoolNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToBoolNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(DateTime.parse(k), e as bool?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToBoolNullableToJson(
-        SimpleClassOfDateTimeToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToBoolNullable
-    _$SimpleClassNullableOfDateTimeToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToBoolNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToBoolNullableToJson(
-        SimpleClassNullableOfDateTimeToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToBoolNullable _$SimpleClassOfDynamicToBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToBoolNullable(
-      Map<String, bool?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToBoolNullable(
+  Map<String, bool?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToBoolNullableToJson(
-        SimpleClassOfDynamicToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToBoolNullable
-    _$SimpleClassNullableOfDynamicToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToBoolNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToBoolNullableToJson(
-        SimpleClassNullableOfDynamicToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToBoolNullable
-    _$SimpleClassOfEnumTypeToBoolNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToBoolNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool?),
-          ),
-        );
+_$SimpleClassOfEnumTypeToBoolNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToBoolNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToBoolNullableToJson(
-        SimpleClassOfEnumTypeToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToBoolNullable
-    _$SimpleClassNullableOfEnumTypeToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToBoolNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToBoolNullableToJson(
-        SimpleClassNullableOfEnumTypeToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToBoolNullable _$SimpleClassOfIntToBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToBoolNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as bool?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToBoolNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToBoolNullableToJson(
-        SimpleClassOfIntToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToBoolNullable
-    _$SimpleClassNullableOfIntToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(int.parse(k), e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfIntToBoolNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToBoolNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(int.parse(k), e as bool?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToBoolNullableToJson(
-        SimpleClassNullableOfIntToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToBoolNullable _$SimpleClassOfObjectToBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToBoolNullable(
-      Map<String, bool?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToBoolNullable(
+  Map<String, bool?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToBoolNullableToJson(
-        SimpleClassOfObjectToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToBoolNullable
-    _$SimpleClassNullableOfObjectToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfObjectToBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToBoolNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToBoolNullableToJson(
-        SimpleClassNullableOfObjectToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToBoolNullable _$SimpleClassOfStringToBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToBoolNullable(
-      Map<String, bool?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToBoolNullable(
+  Map<String, bool?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToBoolNullableToJson(
-        SimpleClassOfStringToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToBoolNullable
-    _$SimpleClassNullableOfStringToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfStringToBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToBoolNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToBoolNullableToJson(
-        SimpleClassNullableOfStringToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToBoolNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToBoolNullable _$SimpleClassOfUriToBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToBoolNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as bool?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToBoolNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e as bool?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToBoolNullableToJson(
-        SimpleClassOfUriToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToBoolNullable
-    _$SimpleClassNullableOfUriToBoolNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToBoolNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(Uri.parse(k), e as bool?),
-          ),
-        );
+_$SimpleClassNullableOfUriToBoolNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToBoolNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(Uri.parse(k), e as bool?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToBoolNullableToJson(
-        SimpleClassNullableOfUriToBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToDateTime _$SimpleClassOfBigIntToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToDateTimeToJson(
-        SimpleClassOfBigIntToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e.toIso8601String())),
-    };
+  SimpleClassOfBigIntToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfBigIntToDateTime
-    _$SimpleClassNullableOfBigIntToDateTimeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToDateTime(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToDateTimeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToDateTime(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToDateTimeToJson(
-        SimpleClassNullableOfBigIntToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e.toIso8601String())),
-    };
+  SimpleClassNullableOfBigIntToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassOfDateTimeToDateTime _$SimpleClassOfDateTimeToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToDateTimeToJson(
-        SimpleClassOfDateTimeToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e.toIso8601String())),
-    };
+  SimpleClassOfDateTimeToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToDateTime
-    _$SimpleClassNullableOfDateTimeToDateTimeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToDateTime(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToDateTimeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToDateTime(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(DateTime.parse(k), DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToDateTimeToJson(
-        SimpleClassNullableOfDateTimeToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e.toIso8601String())),
-    };
+  SimpleClassNullableOfDateTimeToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassOfDynamicToDateTime _$SimpleClassOfDynamicToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToDateTimeToJson(
-        SimpleClassOfDynamicToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())),
-    };
+  SimpleClassOfDynamicToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())),
+};
 
 SimpleClassNullableOfDynamicToDateTime
-    _$SimpleClassNullableOfDynamicToDateTimeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToDateTime(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToDateTimeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToDateTime(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToDateTimeToJson(
-        SimpleClassNullableOfDynamicToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())),
-    };
+  SimpleClassNullableOfDynamicToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())),
+};
 
 SimpleClassOfEnumTypeToDateTime _$SimpleClassOfEnumTypeToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            $enumDecode(_$EnumTypeEnumMap, k), DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      DateTime.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToDateTimeToJson(
-        SimpleClassOfEnumTypeToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.toIso8601String())),
-    };
+  SimpleClassOfEnumTypeToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToDateTime
-    _$SimpleClassNullableOfEnumTypeToDateTimeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToDateTime(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                $enumDecode(_$EnumTypeEnumMap, k), DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToDateTimeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToDateTime(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          DateTime.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToDateTimeToJson(
-        SimpleClassNullableOfEnumTypeToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.toIso8601String())),
-    };
+  SimpleClassNullableOfEnumTypeToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toIso8601String()),
+  ),
+};
 
 SimpleClassOfIntToDateTime _$SimpleClassOfIntToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToDateTimeToJson(
-        SimpleClassOfIntToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e.toIso8601String())),
-    };
+  SimpleClassOfIntToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfIntToDateTime _$SimpleClassNullableOfIntToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToDateTime(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToDateTime(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToDateTimeToJson(
-        SimpleClassNullableOfIntToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e.toIso8601String())),
-    };
+  SimpleClassNullableOfIntToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassOfObjectToDateTime _$SimpleClassOfObjectToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToDateTimeToJson(
-        SimpleClassOfObjectToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())),
-    };
+  SimpleClassOfObjectToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())),
+};
 
 SimpleClassNullableOfObjectToDateTime
-    _$SimpleClassNullableOfObjectToDateTimeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToDateTime(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToDateTimeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToDateTime(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToDateTimeToJson(
-        SimpleClassNullableOfObjectToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())),
-    };
+  SimpleClassNullableOfObjectToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())),
+};
 
 SimpleClassOfStringToDateTime _$SimpleClassOfStringToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToDateTimeToJson(
-        SimpleClassOfStringToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())),
-    };
+  SimpleClassOfStringToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())),
+};
 
 SimpleClassNullableOfStringToDateTime
-    _$SimpleClassNullableOfStringToDateTimeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToDateTime(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfStringToDateTimeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToDateTime(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToDateTimeToJson(
-        SimpleClassNullableOfStringToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())),
-    };
+  SimpleClassNullableOfStringToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())),
+};
 
 SimpleClassOfUriToDateTime _$SimpleClassOfUriToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToDateTime(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToDateTime(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToDateTimeToJson(
-        SimpleClassOfUriToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e.toIso8601String())),
-    };
+  SimpleClassOfUriToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfUriToDateTime _$SimpleClassNullableOfUriToDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToDateTime(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToDateTime(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToDateTimeToJson(
-        SimpleClassNullableOfUriToDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e.toIso8601String())),
-    };
+  SimpleClassNullableOfUriToDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e.toIso8601String()),
+  ),
+};
 
 SimpleClassOfBigIntToDateTimeNullable
-    _$SimpleClassOfBigIntToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfBigIntToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(BigInt.parse(k),
-                e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfBigIntToDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToDateTimeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          e == null ? null : DateTime.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToDateTimeNullableToJson(
-        SimpleClassOfBigIntToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e?.toIso8601String())),
-    };
+  SimpleClassOfBigIntToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfBigIntToDateTimeNullable
-    _$SimpleClassNullableOfBigIntToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k),
-                e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      BigInt.parse(k),
+      e == null ? null : DateTime.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToDateTimeNullableToJson(
-        SimpleClassNullableOfBigIntToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e?.toIso8601String())),
-    };
+  SimpleClassNullableOfBigIntToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassOfDateTimeToDateTimeNullable
-    _$SimpleClassOfDateTimeToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(DateTime.parse(k),
-                e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfDateTimeToDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToDateTimeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          DateTime.parse(k),
+          e == null ? null : DateTime.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToDateTimeNullableToJson(
-        SimpleClassOfDateTimeToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e?.toIso8601String())),
-    };
+  SimpleClassOfDateTimeToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToDateTimeNullable
-    _$SimpleClassNullableOfDateTimeToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k),
-                e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      DateTime.parse(k),
+      e == null ? null : DateTime.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToDateTimeNullableToJson(
-        SimpleClassNullableOfDateTimeToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e?.toIso8601String())),
-    };
+  SimpleClassNullableOfDateTimeToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassOfDynamicToDateTimeNullable
-    _$SimpleClassOfDynamicToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDynamicToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) =>
-                MapEntry(k, e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfDynamicToDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDynamicToDateTimeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, e == null ? null : DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDynamicToDateTimeNullableToJson(
-        SimpleClassOfDynamicToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())),
-    };
+  SimpleClassOfDynamicToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())),
+};
 
 SimpleClassNullableOfDynamicToDateTimeNullable
-    _$SimpleClassNullableOfDynamicToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) =>
-                MapEntry(k, e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e == null ? null : DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToDateTimeNullableToJson(
-        SimpleClassNullableOfDynamicToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())),
-    };
+  SimpleClassNullableOfDynamicToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())),
+};
 
 SimpleClassOfEnumTypeToDateTimeNullable
-    _$SimpleClassOfEnumTypeToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfEnumTypeToDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToDateTimeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          e == null ? null : DateTime.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToDateTimeNullableToJson(
-        SimpleClassOfEnumTypeToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.toIso8601String())),
-    };
+  SimpleClassOfEnumTypeToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToDateTimeNullable
-    _$SimpleClassNullableOfEnumTypeToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      e == null ? null : DateTime.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToDateTimeNullableToJson(
-        SimpleClassNullableOfEnumTypeToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.toIso8601String())),
-    };
+  SimpleClassNullableOfEnumTypeToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toIso8601String()),
+  ),
+};
 
 SimpleClassOfIntToDateTimeNullable _$SimpleClassOfIntToDateTimeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToDateTimeNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            int.parse(k), e == null ? null : DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(int.parse(k), e == null ? null : DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToDateTimeNullableToJson(
-        SimpleClassOfIntToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e?.toIso8601String())),
-    };
+  SimpleClassOfIntToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfIntToDateTimeNullable
-    _$SimpleClassNullableOfIntToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                int.parse(k), e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfIntToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(int.parse(k), e == null ? null : DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToDateTimeNullableToJson(
-        SimpleClassNullableOfIntToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e?.toIso8601String())),
-    };
+  SimpleClassNullableOfIntToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassOfObjectToDateTimeNullable
-    _$SimpleClassOfObjectToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfObjectToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) =>
-                MapEntry(k, e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfObjectToDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToDateTimeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, e == null ? null : DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfObjectToDateTimeNullableToJson(
-        SimpleClassOfObjectToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())),
-    };
+  SimpleClassOfObjectToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())),
+};
 
 SimpleClassNullableOfObjectToDateTimeNullable
-    _$SimpleClassNullableOfObjectToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) =>
-                MapEntry(k, e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e == null ? null : DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToDateTimeNullableToJson(
-        SimpleClassNullableOfObjectToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())),
-    };
+  SimpleClassNullableOfObjectToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())),
+};
 
 SimpleClassOfStringToDateTimeNullable
-    _$SimpleClassOfStringToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfStringToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) =>
-                MapEntry(k, e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassOfStringToDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToDateTimeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, e == null ? null : DateTime.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfStringToDateTimeNullableToJson(
-        SimpleClassOfStringToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())),
-    };
+  SimpleClassOfStringToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())),
+};
 
 SimpleClassNullableOfStringToDateTimeNullable
-    _$SimpleClassNullableOfStringToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) =>
-                MapEntry(k, e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfStringToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e == null ? null : DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToDateTimeNullableToJson(
-        SimpleClassNullableOfStringToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())),
-    };
+  SimpleClassNullableOfStringToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())),
+};
 
 SimpleClassOfUriToDateTimeNullable _$SimpleClassOfUriToDateTimeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToDateTimeNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            Uri.parse(k), e == null ? null : DateTime.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(Uri.parse(k), e == null ? null : DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToDateTimeNullableToJson(
-        SimpleClassOfUriToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e?.toIso8601String())),
-    };
+  SimpleClassOfUriToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassNullableOfUriToDateTimeNullable
-    _$SimpleClassNullableOfUriToDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToDateTimeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                Uri.parse(k), e == null ? null : DateTime.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfUriToDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToDateTimeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(Uri.parse(k), e == null ? null : DateTime.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToDateTimeNullableToJson(
-        SimpleClassNullableOfUriToDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e?.toIso8601String())),
-    };
+  SimpleClassNullableOfUriToDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e?.toIso8601String()),
+  ),
+};
 
 SimpleClassOfBigIntToDouble _$SimpleClassOfBigIntToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToDoubleToJson(
-        SimpleClassOfBigIntToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToDouble
-    _$SimpleClassNullableOfBigIntToDoubleFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToDouble(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), (e as num).toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToDoubleFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToDouble(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), (e as num).toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToDoubleToJson(
-        SimpleClassNullableOfBigIntToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToDouble _$SimpleClassOfDateTimeToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToDoubleToJson(
-        SimpleClassOfDateTimeToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToDouble
-    _$SimpleClassNullableOfDateTimeToDoubleFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToDouble(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), (e as num).toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToDoubleFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToDouble(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(DateTime.parse(k), (e as num).toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToDoubleToJson(
-        SimpleClassNullableOfDateTimeToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToDouble _$SimpleClassOfDynamicToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToDoubleToJson(
-        SimpleClassOfDynamicToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToDouble
-    _$SimpleClassNullableOfDynamicToDoubleFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToDouble(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, (e as num).toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToDoubleFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToDouble(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToDoubleToJson(
-        SimpleClassNullableOfDynamicToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToDouble _$SimpleClassOfEnumTypeToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToDoubleToJson(
-        SimpleClassOfEnumTypeToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToDouble
-    _$SimpleClassNullableOfEnumTypeToDoubleFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToDouble(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                $enumDecode(_$EnumTypeEnumMap, k), (e as num).toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToDoubleFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToDouble(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) =>
+            MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num).toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToDoubleToJson(
-        SimpleClassNullableOfEnumTypeToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToDouble _$SimpleClassOfIntToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToDoubleToJson(
-        SimpleClassOfIntToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToDouble _$SimpleClassNullableOfIntToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToDouble(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToDouble(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToDoubleToJson(
-        SimpleClassNullableOfIntToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToDouble _$SimpleClassOfObjectToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToDoubleToJson(
-        SimpleClassOfObjectToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToDouble
-    _$SimpleClassNullableOfObjectToDoubleFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToDouble(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, (e as num).toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfObjectToDoubleFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToDouble(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToDoubleToJson(
-        SimpleClassNullableOfObjectToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToDouble _$SimpleClassOfStringToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToDoubleToJson(
-        SimpleClassOfStringToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToDouble
-    _$SimpleClassNullableOfStringToDoubleFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToDouble(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, (e as num).toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfStringToDoubleFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToDouble(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToDoubleToJson(
-        SimpleClassNullableOfStringToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToDouble instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToDouble _$SimpleClassOfUriToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToDouble(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToDouble(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToDoubleToJson(
-        SimpleClassOfUriToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToDouble _$SimpleClassNullableOfUriToDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToDouble(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), (e as num).toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToDouble(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), (e as num).toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToDoubleToJson(
-        SimpleClassNullableOfUriToDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToDouble instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToDoubleNullable
-    _$SimpleClassOfBigIntToDoubleNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfBigIntToDoubleNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(BigInt.parse(k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassOfBigIntToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToDoubleNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(BigInt.parse(k), (e as num?)?.toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToDoubleNullableToJson(
-        SimpleClassOfBigIntToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToDoubleNullable
-    _$SimpleClassNullableOfBigIntToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToDoubleNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToDoubleNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToDoubleNullableToJson(
-        SimpleClassNullableOfBigIntToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToDoubleNullable
-    _$SimpleClassOfDateTimeToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToDoubleNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(DateTime.parse(k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassOfDateTimeToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToDoubleNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(DateTime.parse(k), (e as num?)?.toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToDoubleNullableToJson(
-        SimpleClassOfDateTimeToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToDoubleNullable
-    _$SimpleClassNullableOfDateTimeToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToDoubleNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToDoubleNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToDoubleNullableToJson(
-        SimpleClassNullableOfDateTimeToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToDoubleNullable
-    _$SimpleClassOfDynamicToDoubleNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfDynamicToDoubleNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassOfDynamicToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDynamicToDoubleNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, (e as num?)?.toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDynamicToDoubleNullableToJson(
-        SimpleClassOfDynamicToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToDoubleNullable
-    _$SimpleClassNullableOfDynamicToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToDoubleNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToDoubleNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToDoubleNullableToJson(
-        SimpleClassNullableOfDynamicToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToDoubleNullable
-    _$SimpleClassOfEnumTypeToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToDoubleNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(
-                $enumDecode(_$EnumTypeEnumMap, k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassOfEnumTypeToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToDoubleNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          (e as num?)?.toDouble(),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToDoubleNullableToJson(
-        SimpleClassOfEnumTypeToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToDoubleNullable
-    _$SimpleClassNullableOfEnumTypeToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                $enumDecode(_$EnumTypeEnumMap, k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToDoubleNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToDoubleNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToDoubleNullableToJson(
-        SimpleClassNullableOfEnumTypeToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToDoubleNullable _$SimpleClassOfIntToDoubleNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToDoubleNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), (e as num?)?.toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToDoubleNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToDoubleNullableToJson(
-        SimpleClassOfIntToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToDoubleNullable
-    _$SimpleClassNullableOfIntToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(int.parse(k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfIntToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToDoubleNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(int.parse(k), (e as num?)?.toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToDoubleNullableToJson(
-        SimpleClassNullableOfIntToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToDoubleNullable
-    _$SimpleClassOfObjectToDoubleNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfObjectToDoubleNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassOfObjectToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToDoubleNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, (e as num?)?.toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfObjectToDoubleNullableToJson(
-        SimpleClassOfObjectToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToDoubleNullable
-    _$SimpleClassNullableOfObjectToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfObjectToDoubleNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToDoubleNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToDoubleNullableToJson(
-        SimpleClassNullableOfObjectToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToDoubleNullable
-    _$SimpleClassOfStringToDoubleNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfStringToDoubleNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassOfStringToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToDoubleNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, (e as num?)?.toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfStringToDoubleNullableToJson(
-        SimpleClassOfStringToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToDoubleNullable
-    _$SimpleClassNullableOfStringToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfStringToDoubleNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToDoubleNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToDoubleNullableToJson(
-        SimpleClassNullableOfStringToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToDoubleNullable _$SimpleClassOfUriToDoubleNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToDoubleNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), (e as num?)?.toDouble()),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToDoubleNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), (e as num?)?.toDouble()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToDoubleNullableToJson(
-        SimpleClassOfUriToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToDoubleNullable
-    _$SimpleClassNullableOfUriToDoubleNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToDoubleNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(Uri.parse(k), (e as num?)?.toDouble()),
-          ),
-        );
+_$SimpleClassNullableOfUriToDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToDoubleNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(Uri.parse(k), (e as num?)?.toDouble()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToDoubleNullableToJson(
-        SimpleClassNullableOfUriToDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToDuration _$SimpleClassOfBigIntToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(BigInt.parse(k), Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToDurationToJson(
-        SimpleClassOfBigIntToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e.inMicroseconds)),
-    };
+  SimpleClassOfBigIntToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfBigIntToDuration
-    _$SimpleClassNullableOfBigIntToDurationFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToDuration(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) =>
-                MapEntry(BigInt.parse(k), Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToDurationFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToDuration(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToDurationToJson(
-        SimpleClassNullableOfBigIntToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e.inMicroseconds)),
-    };
+  SimpleClassNullableOfBigIntToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassOfDateTimeToDuration _$SimpleClassOfDateTimeToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToDurationToJson(
-        SimpleClassOfDateTimeToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e.inMicroseconds)),
-    };
+  SimpleClassOfDateTimeToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToDuration
-    _$SimpleClassNullableOfDateTimeToDurationFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToDuration(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) =>
-                MapEntry(DateTime.parse(k), Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToDurationFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToDuration(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          DateTime.parse(k),
+          Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToDurationToJson(
-        SimpleClassNullableOfDateTimeToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e.inMicroseconds)),
-    };
+  SimpleClassNullableOfDateTimeToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassOfDynamicToDuration _$SimpleClassOfDynamicToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToDurationToJson(
-        SimpleClassOfDynamicToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.inMicroseconds)),
-    };
+  SimpleClassOfDynamicToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.inMicroseconds)),
+};
 
 SimpleClassNullableOfDynamicToDuration
-    _$SimpleClassNullableOfDynamicToDurationFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToDuration(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToDurationFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToDuration(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, Duration(microseconds: (e as num).toInt())),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToDurationToJson(
-        SimpleClassNullableOfDynamicToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.inMicroseconds)),
-    };
+  SimpleClassNullableOfDynamicToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.inMicroseconds)),
+};
 
 SimpleClassOfEnumTypeToDuration _$SimpleClassOfEnumTypeToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-            Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToDurationToJson(
-        SimpleClassOfEnumTypeToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.inMicroseconds)),
-    };
+  SimpleClassOfEnumTypeToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToDuration
-    _$SimpleClassNullableOfEnumTypeToDurationFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToDuration(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToDurationFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToDuration(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToDurationToJson(
-        SimpleClassNullableOfEnumTypeToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.inMicroseconds)),
-    };
+  SimpleClassNullableOfEnumTypeToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.inMicroseconds),
+  ),
+};
 
 SimpleClassOfIntToDuration _$SimpleClassOfIntToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(int.parse(k), Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToDurationToJson(
-        SimpleClassOfIntToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e.inMicroseconds)),
-    };
+  SimpleClassOfIntToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfIntToDuration _$SimpleClassNullableOfIntToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToDuration(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToDuration(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(int.parse(k), Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToDurationToJson(
-        SimpleClassNullableOfIntToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e.inMicroseconds)),
-    };
+  SimpleClassNullableOfIntToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassOfObjectToDuration _$SimpleClassOfObjectToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToDurationToJson(
-        SimpleClassOfObjectToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.inMicroseconds)),
-    };
+  SimpleClassOfObjectToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.inMicroseconds)),
+};
 
 SimpleClassNullableOfObjectToDuration
-    _$SimpleClassNullableOfObjectToDurationFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToDuration(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToDurationFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToDuration(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, Duration(microseconds: (e as num).toInt())),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToDurationToJson(
-        SimpleClassNullableOfObjectToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.inMicroseconds)),
-    };
+  SimpleClassNullableOfObjectToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.inMicroseconds)),
+};
 
 SimpleClassOfStringToDuration _$SimpleClassOfStringToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToDurationToJson(
-        SimpleClassOfStringToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.inMicroseconds)),
-    };
+  SimpleClassOfStringToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.inMicroseconds)),
+};
 
 SimpleClassNullableOfStringToDuration
-    _$SimpleClassNullableOfStringToDurationFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToDuration(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfStringToDurationFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToDuration(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, Duration(microseconds: (e as num).toInt())),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToDurationToJson(
-        SimpleClassNullableOfStringToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.inMicroseconds)),
-    };
+  SimpleClassNullableOfStringToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.inMicroseconds)),
+};
 
 SimpleClassOfUriToDuration _$SimpleClassOfUriToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToDuration(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToDuration(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(Uri.parse(k), Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToDurationToJson(
-        SimpleClassOfUriToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e.inMicroseconds)),
-    };
+  SimpleClassOfUriToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfUriToDuration _$SimpleClassNullableOfUriToDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToDuration(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToDuration(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(Uri.parse(k), Duration(microseconds: (e as num).toInt())),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToDurationToJson(
-        SimpleClassNullableOfUriToDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e.inMicroseconds)),
-    };
+  SimpleClassNullableOfUriToDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e.inMicroseconds),
+  ),
+};
 
 SimpleClassOfBigIntToDurationNullable
-    _$SimpleClassOfBigIntToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfBigIntToDurationNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(BigInt.parse(k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassOfBigIntToDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToDurationNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          e == null ? null : Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToDurationNullableToJson(
-        SimpleClassOfBigIntToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e?.inMicroseconds)),
-    };
+  SimpleClassOfBigIntToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfBigIntToDurationNullable
-    _$SimpleClassNullableOfBigIntToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      BigInt.parse(k),
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToDurationNullableToJson(
-        SimpleClassNullableOfBigIntToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfBigIntToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassOfDateTimeToDurationNullable
-    _$SimpleClassOfDateTimeToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToDurationNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(DateTime.parse(k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassOfDateTimeToDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToDurationNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          DateTime.parse(k),
+          e == null ? null : Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToDurationNullableToJson(
-        SimpleClassOfDateTimeToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e?.inMicroseconds)),
-    };
+  SimpleClassOfDateTimeToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToDurationNullable
-    _$SimpleClassNullableOfDateTimeToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      DateTime.parse(k),
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToDurationNullableToJson(
-        SimpleClassNullableOfDateTimeToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfDateTimeToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassOfDynamicToDurationNullable
-    _$SimpleClassOfDynamicToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDynamicToDurationNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(
-                k, e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassOfDynamicToDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDynamicToDurationNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          k,
+          e == null ? null : Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDynamicToDurationNullableToJson(
-        SimpleClassOfDynamicToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.inMicroseconds)),
-    };
+  SimpleClassOfDynamicToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.inMicroseconds)),
+};
 
 SimpleClassNullableOfDynamicToDurationNullable
-    _$SimpleClassNullableOfDynamicToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                k, e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      k,
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToDurationNullableToJson(
-        SimpleClassNullableOfDynamicToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfDynamicToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.inMicroseconds)),
+};
 
 SimpleClassOfEnumTypeToDurationNullable
-    _$SimpleClassOfEnumTypeToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToDurationNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassOfEnumTypeToDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToDurationNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          e == null ? null : Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToDurationNullableToJson(
-        SimpleClassOfEnumTypeToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.inMicroseconds)),
-    };
+  SimpleClassOfEnumTypeToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToDurationNullable
-    _$SimpleClassNullableOfEnumTypeToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToDurationNullableToJson(
-        SimpleClassNullableOfEnumTypeToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfEnumTypeToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.inMicroseconds),
+  ),
+};
 
 SimpleClassOfIntToDurationNullable _$SimpleClassOfIntToDurationNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToDurationNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            int.parse(k), e == null ? null : Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToDurationNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      int.parse(k),
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToDurationNullableToJson(
-        SimpleClassOfIntToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e?.inMicroseconds)),
-    };
+  SimpleClassOfIntToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfIntToDurationNullable
-    _$SimpleClassNullableOfIntToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(int.parse(k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfIntToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      int.parse(k),
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToDurationNullableToJson(
-        SimpleClassNullableOfIntToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfIntToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassOfObjectToDurationNullable
-    _$SimpleClassOfObjectToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfObjectToDurationNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(
-                k, e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassOfObjectToDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToDurationNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          k,
+          e == null ? null : Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfObjectToDurationNullableToJson(
-        SimpleClassOfObjectToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.inMicroseconds)),
-    };
+  SimpleClassOfObjectToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.inMicroseconds)),
+};
 
 SimpleClassNullableOfObjectToDurationNullable
-    _$SimpleClassNullableOfObjectToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                k, e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      k,
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToDurationNullableToJson(
-        SimpleClassNullableOfObjectToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfObjectToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.inMicroseconds)),
+};
 
 SimpleClassOfStringToDurationNullable
-    _$SimpleClassOfStringToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfStringToDurationNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(
-                k, e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassOfStringToDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToDurationNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          k,
+          e == null ? null : Duration(microseconds: (e as num).toInt()),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfStringToDurationNullableToJson(
-        SimpleClassOfStringToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.inMicroseconds)),
-    };
+  SimpleClassOfStringToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.inMicroseconds)),
+};
 
 SimpleClassNullableOfStringToDurationNullable
-    _$SimpleClassNullableOfStringToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                k, e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfStringToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      k,
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToDurationNullableToJson(
-        SimpleClassNullableOfStringToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfStringToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.inMicroseconds)),
+};
 
 SimpleClassOfUriToDurationNullable _$SimpleClassOfUriToDurationNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToDurationNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            Uri.parse(k), e == null ? null : Duration(microseconds: e as int)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToDurationNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      Uri.parse(k),
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToDurationNullableToJson(
-        SimpleClassOfUriToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), e?.inMicroseconds)),
-    };
+  SimpleClassOfUriToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassNullableOfUriToDurationNullable
-    _$SimpleClassNullableOfUriToDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToDurationNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(Uri.parse(k),
-                e == null ? null : Duration(microseconds: e as int)),
-          ),
-        );
+_$SimpleClassNullableOfUriToDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToDurationNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      Uri.parse(k),
+      e == null ? null : Duration(microseconds: (e as num).toInt()),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToDurationNullableToJson(
-        SimpleClassNullableOfUriToDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), e?.inMicroseconds)),
-    };
+  SimpleClassNullableOfUriToDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), e?.inMicroseconds),
+  ),
+};
 
 SimpleClassOfBigIntToDynamic _$SimpleClassOfBigIntToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToDynamic(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToDynamic(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToDynamicToJson(
-        SimpleClassOfBigIntToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToDynamic
-    _$SimpleClassNullableOfBigIntToDynamicFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToDynamic(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToDynamicFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToDynamic(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToDynamicToJson(
-        SimpleClassNullableOfBigIntToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToDynamic _$SimpleClassOfDateTimeToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToDynamic(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToDynamic(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToDynamicToJson(
-        SimpleClassOfDateTimeToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToDynamic
-    _$SimpleClassNullableOfDateTimeToDynamicFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToDynamic(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToDynamicFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToDynamic(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(DateTime.parse(k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToDynamicToJson(
-        SimpleClassNullableOfDateTimeToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToDynamic _$SimpleClassOfDynamicToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToDynamic(
-      json['value'] as Map<String, dynamic>,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToDynamic(json['value'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToDynamicToJson(
-        SimpleClassOfDynamicToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToDynamic
-    _$SimpleClassNullableOfDynamicToDynamicFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToDynamic(
-          json['value'] as Map<String, dynamic>?,
-        );
+_$SimpleClassNullableOfDynamicToDynamicFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToDynamic(
+      json['value'] as Map<String, dynamic>?,
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToDynamicToJson(
-        SimpleClassNullableOfDynamicToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToDynamic _$SimpleClassOfEnumTypeToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToDynamic(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToDynamic(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToDynamicToJson(
-        SimpleClassOfEnumTypeToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToDynamic
-    _$SimpleClassNullableOfEnumTypeToDynamicFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToDynamic(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToDynamicFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToDynamic(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToDynamicToJson(
-        SimpleClassNullableOfEnumTypeToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToDynamic _$SimpleClassOfIntToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToDynamic(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToDynamic(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToDynamicToJson(
-        SimpleClassOfIntToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToDynamic _$SimpleClassNullableOfIntToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToDynamic(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToDynamic(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToDynamicToJson(
-        SimpleClassNullableOfIntToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToDynamic _$SimpleClassOfObjectToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToDynamic(
-      json['value'] as Map<String, dynamic>,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToDynamic(json['value'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfObjectToDynamicToJson(
-        SimpleClassOfObjectToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToDynamic
-    _$SimpleClassNullableOfObjectToDynamicFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToDynamic(
-          json['value'] as Map<String, dynamic>?,
-        );
+_$SimpleClassNullableOfObjectToDynamicFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToDynamic(
+      json['value'] as Map<String, dynamic>?,
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToDynamicToJson(
-        SimpleClassNullableOfObjectToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToDynamic _$SimpleClassOfStringToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToDynamic(
-      json['value'] as Map<String, dynamic>,
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToDynamic(json['value'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfStringToDynamicToJson(
-        SimpleClassOfStringToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToDynamic
-    _$SimpleClassNullableOfStringToDynamicFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToDynamic(
-          json['value'] as Map<String, dynamic>?,
-        );
+_$SimpleClassNullableOfStringToDynamicFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToDynamic(
+      json['value'] as Map<String, dynamic>?,
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToDynamicToJson(
-        SimpleClassNullableOfStringToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToDynamic instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToDynamic _$SimpleClassOfUriToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToDynamic(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToDynamic(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToDynamicToJson(
-        SimpleClassOfUriToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToDynamic _$SimpleClassNullableOfUriToDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToDynamic(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToDynamic(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToDynamicToJson(
-        SimpleClassNullableOfUriToDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToEnumType _$SimpleClassOfBigIntToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToEnumTypeToJson(
-        SimpleClassOfBigIntToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfBigIntToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassNullableOfBigIntToEnumType
-    _$SimpleClassNullableOfBigIntToEnumTypeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToEnumType(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) =>
-                MapEntry(BigInt.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToEnumTypeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToEnumType(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToEnumTypeToJson(
-        SimpleClassNullableOfBigIntToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfBigIntToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassOfDateTimeToEnumType _$SimpleClassOfDateTimeToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(DateTime.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToEnumTypeToJson(
-        SimpleClassOfDateTimeToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfDateTimeToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToEnumType
-    _$SimpleClassNullableOfDateTimeToEnumTypeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToEnumType(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) =>
-                MapEntry(DateTime.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToEnumTypeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToEnumType(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) =>
+            MapEntry(DateTime.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToEnumTypeToJson(
-        SimpleClassNullableOfDateTimeToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfDateTimeToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassOfDynamicToEnumType _$SimpleClassOfDynamicToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToEnumTypeToJson(
-        SimpleClassOfDynamicToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfDynamicToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e]!)),
+};
 
 SimpleClassNullableOfDynamicToEnumType
-    _$SimpleClassNullableOfDynamicToEnumTypeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToEnumType(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToEnumTypeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToEnumType(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToEnumTypeToJson(
-        SimpleClassNullableOfDynamicToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfDynamicToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e]!)),
+};
 
 SimpleClassOfEnumTypeToEnumType _$SimpleClassOfEnumTypeToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-            $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      $enumDecode(_$EnumTypeEnumMap, e),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToEnumTypeToJson(
-        SimpleClassOfEnumTypeToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfEnumTypeToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToEnumType
-    _$SimpleClassNullableOfEnumTypeToEnumTypeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToEnumType(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                $enumDecode(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToEnumTypeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToEnumType(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          $enumDecode(_$EnumTypeEnumMap, e),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToEnumTypeToJson(
-        SimpleClassNullableOfEnumTypeToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfEnumTypeToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassOfIntToEnumType _$SimpleClassOfIntToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToEnumTypeToJson(
-        SimpleClassOfIntToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfIntToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassNullableOfIntToEnumType _$SimpleClassNullableOfIntToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToEnumType(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToEnumType(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToEnumTypeToJson(
-        SimpleClassNullableOfIntToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfIntToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassOfObjectToEnumType _$SimpleClassOfObjectToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToEnumTypeToJson(
-        SimpleClassOfObjectToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfObjectToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e]!)),
+};
 
 SimpleClassNullableOfObjectToEnumType
-    _$SimpleClassNullableOfObjectToEnumTypeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToEnumType(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToEnumTypeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToEnumType(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToEnumTypeToJson(
-        SimpleClassNullableOfObjectToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfObjectToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e]!)),
+};
 
 SimpleClassOfStringToEnumType _$SimpleClassOfStringToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToEnumTypeToJson(
-        SimpleClassOfStringToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfStringToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e]!)),
+};
 
 SimpleClassNullableOfStringToEnumType
-    _$SimpleClassNullableOfStringToEnumTypeFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToEnumType(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfStringToEnumTypeFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToEnumType(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, $enumDecode(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToEnumTypeToJson(
-        SimpleClassNullableOfStringToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfStringToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e]!)),
+};
 
 SimpleClassOfUriToEnumType _$SimpleClassOfUriToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToEnumType(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToEnumType(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToEnumTypeToJson(
-        SimpleClassOfUriToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfUriToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassNullableOfUriToEnumType _$SimpleClassNullableOfUriToEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToEnumType(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToEnumType(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), $enumDecode(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToEnumTypeToJson(
-        SimpleClassNullableOfUriToEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfUriToEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]!),
+  ),
+};
 
 SimpleClassOfBigIntToEnumTypeNullable
-    _$SimpleClassOfBigIntToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfBigIntToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(
-                BigInt.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassOfBigIntToEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToEnumTypeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          $enumDecodeNullable(_$EnumTypeEnumMap, e),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToEnumTypeNullableToJson(
-        SimpleClassOfBigIntToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfBigIntToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassNullableOfBigIntToEnumTypeNullable
-    _$SimpleClassNullableOfBigIntToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                BigInt.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(BigInt.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToEnumTypeNullableToJson(
-        SimpleClassNullableOfBigIntToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfBigIntToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassOfDateTimeToEnumTypeNullable
-    _$SimpleClassOfDateTimeToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(
-                DateTime.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassOfDateTimeToEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToEnumTypeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          DateTime.parse(k),
+          $enumDecodeNullable(_$EnumTypeEnumMap, e),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToEnumTypeNullableToJson(
-        SimpleClassOfDateTimeToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfDateTimeToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToEnumTypeNullable
-    _$SimpleClassNullableOfDateTimeToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                DateTime.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToEnumTypeNullableToJson(
-        SimpleClassNullableOfDateTimeToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfDateTimeToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassOfDynamicToEnumTypeNullable
-    _$SimpleClassOfDynamicToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDynamicToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassOfDynamicToEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDynamicToEnumTypeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDynamicToEnumTypeNullableToJson(
-        SimpleClassOfDynamicToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfDynamicToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
+};
 
 SimpleClassNullableOfDynamicToEnumTypeNullable
-    _$SimpleClassNullableOfDynamicToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToEnumTypeNullableToJson(
-        SimpleClassNullableOfDynamicToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfDynamicToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
+};
 
 SimpleClassOfEnumTypeToEnumTypeNullable
-    _$SimpleClassOfEnumTypeToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassOfEnumTypeToEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToEnumTypeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          $enumDecodeNullable(_$EnumTypeEnumMap, e),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToEnumTypeNullableToJson(
-        SimpleClassOfEnumTypeToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfEnumTypeToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToEnumTypeNullable
-    _$SimpleClassNullableOfEnumTypeToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      $enumDecodeNullable(_$EnumTypeEnumMap, e),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToEnumTypeNullableToJson(
-        SimpleClassNullableOfEnumTypeToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfEnumTypeToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassOfIntToEnumTypeNullable _$SimpleClassOfIntToEnumTypeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToEnumTypeNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(int.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToEnumTypeNullableToJson(
-        SimpleClassOfIntToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfIntToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassNullableOfIntToEnumTypeNullable
-    _$SimpleClassNullableOfIntToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                int.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfIntToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToEnumTypeNullableToJson(
-        SimpleClassNullableOfIntToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfIntToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassOfObjectToEnumTypeNullable
-    _$SimpleClassOfObjectToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfObjectToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassOfObjectToEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToEnumTypeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfObjectToEnumTypeNullableToJson(
-        SimpleClassOfObjectToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfObjectToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
+};
 
 SimpleClassNullableOfObjectToEnumTypeNullable
-    _$SimpleClassNullableOfObjectToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToEnumTypeNullableToJson(
-        SimpleClassNullableOfObjectToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfObjectToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
+};
 
 SimpleClassOfStringToEnumTypeNullable
-    _$SimpleClassOfStringToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfStringToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassOfStringToEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToEnumTypeNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfStringToEnumTypeNullableToJson(
-        SimpleClassOfStringToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfStringToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
+};
 
 SimpleClassNullableOfStringToEnumTypeNullable
-    _$SimpleClassNullableOfStringToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfStringToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToEnumTypeNullableToJson(
-        SimpleClassNullableOfStringToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfStringToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, _$EnumTypeEnumMap[e])),
+};
 
 SimpleClassOfUriToEnumTypeNullable _$SimpleClassOfUriToEnumTypeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToEnumTypeNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(Uri.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToEnumTypeNullableToJson(
-        SimpleClassOfUriToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassOfUriToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
 SimpleClassNullableOfUriToEnumTypeNullable
-    _$SimpleClassNullableOfUriToEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToEnumTypeNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                Uri.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
-          ),
-        );
+_$SimpleClassNullableOfUriToEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToEnumTypeNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), $enumDecodeNullable(_$EnumTypeEnumMap, e)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToEnumTypeNullableToJson(
-        SimpleClassNullableOfUriToEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e])),
-    };
+  SimpleClassNullableOfUriToEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), _$EnumTypeEnumMap[e]),
+  ),
+};
 
-SimpleClassOfBigIntToInt _$SimpleClassOfBigIntToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToInt(
+SimpleClassOfBigIntToFromJsonDynamicParam
+_$SimpleClassOfBigIntToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfBigIntToFromJsonDynamicParamToJson(
+  SimpleClassOfBigIntToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassNullableOfBigIntToFromJsonDynamicParam
+_$SimpleClassNullableOfBigIntToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfBigIntToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfBigIntToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfDateTimeToFromJsonDynamicParam
+_$SimpleClassOfDateTimeToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDateTimeToFromJsonDynamicParamToJson(
+  SimpleClassOfDateTimeToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassNullableOfDateTimeToFromJsonDynamicParam
+_$SimpleClassNullableOfDateTimeToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfDateTimeToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfDateTimeToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassOfDynamicToFromJsonDynamicParam
+_$SimpleClassOfDynamicToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDynamicToFromJsonDynamicParamToJson(
+  SimpleClassOfDynamicToFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfDynamicToFromJsonDynamicParam
+_$SimpleClassNullableOfDynamicToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDynamicToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfDynamicToFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfEnumTypeToFromJsonDynamicParam
+_$SimpleClassOfEnumTypeToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      FromJsonDynamicParam.fromJson(e),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfEnumTypeToFromJsonDynamicParamToJson(
+  SimpleClassOfEnumTypeToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
+
+SimpleClassNullableOfEnumTypeToFromJsonDynamicParam
+_$SimpleClassNullableOfEnumTypeToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      FromJsonDynamicParam.fromJson(e),
+    ),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfEnumTypeToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfEnumTypeToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
+
+SimpleClassOfIntToFromJsonDynamicParam
+_$SimpleClassOfIntToFromJsonDynamicParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfIntToFromJsonDynamicParam(
       (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as int),
+        (k, e) => MapEntry(int.parse(k), FromJsonDynamicParam.fromJson(e)),
       ),
     );
 
-Map<String, dynamic> _$SimpleClassOfBigIntToIntToJson(
-        SimpleClassOfBigIntToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+Map<String, dynamic> _$SimpleClassOfIntToFromJsonDynamicParamToJson(
+  SimpleClassOfIntToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
-SimpleClassNullableOfBigIntToInt _$SimpleClassNullableOfBigIntToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBigIntToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(BigInt.parse(k), e as int),
+SimpleClassNullableOfIntToFromJsonDynamicParam
+_$SimpleClassNullableOfIntToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfIntToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfIntToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfObjectToFromJsonDynamicParam
+_$SimpleClassOfObjectToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfObjectToFromJsonDynamicParamToJson(
+  SimpleClassOfObjectToFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfObjectToFromJsonDynamicParam
+_$SimpleClassNullableOfObjectToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfObjectToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfObjectToFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfStringToFromJsonDynamicParam
+_$SimpleClassOfStringToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfStringToFromJsonDynamicParamToJson(
+  SimpleClassOfStringToFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfStringToFromJsonDynamicParam
+_$SimpleClassNullableOfStringToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfStringToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfStringToFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfUriToFromJsonDynamicParam
+_$SimpleClassOfUriToFromJsonDynamicParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfUriToFromJsonDynamicParam(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(Uri.parse(k), FromJsonDynamicParam.fromJson(e)),
       ),
     );
 
-Map<String, dynamic> _$SimpleClassNullableOfBigIntToIntToJson(
-        SimpleClassNullableOfBigIntToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+Map<String, dynamic> _$SimpleClassOfUriToFromJsonDynamicParamToJson(
+  SimpleClassOfUriToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
-SimpleClassOfDateTimeToInt _$SimpleClassOfDateTimeToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToInt(
+SimpleClassNullableOfUriToFromJsonDynamicParam
+_$SimpleClassNullableOfUriToFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToFromJsonDynamicParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), FromJsonDynamicParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfUriToFromJsonDynamicParamToJson(
+  SimpleClassNullableOfUriToFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfBigIntToFromJsonNullableObjectParam
+_$SimpleClassOfBigIntToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(BigInt.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfBigIntToFromJsonNullableObjectParamToJson(
+  SimpleClassOfBigIntToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassNullableOfBigIntToFromJsonNullableObjectParam
+_$SimpleClassNullableOfBigIntToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(BigInt.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfBigIntToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfBigIntToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfDateTimeToFromJsonNullableObjectParam
+_$SimpleClassOfDateTimeToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDateTimeToFromJsonNullableObjectParamToJson(
+  SimpleClassOfDateTimeToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam
+_$SimpleClassNullableOfDateTimeToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfDateTimeToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassOfDynamicToFromJsonNullableObjectParam
+_$SimpleClassOfDynamicToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDynamicToFromJsonNullableObjectParamToJson(
+  SimpleClassOfDynamicToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfDynamicToFromJsonNullableObjectParam
+_$SimpleClassNullableOfDynamicToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfDynamicToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfDynamicToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfEnumTypeToFromJsonNullableObjectParam
+_$SimpleClassOfEnumTypeToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      FromJsonNullableObjectParam.fromJson(e),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfEnumTypeToFromJsonNullableObjectParamToJson(
+  SimpleClassOfEnumTypeToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
+
+SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParam
+_$SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      FromJsonNullableObjectParam.fromJson(e),
+    ),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfEnumTypeToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
+
+SimpleClassOfIntToFromJsonNullableObjectParam
+_$SimpleClassOfIntToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfIntToFromJsonNullableObjectParamToJson(
+  SimpleClassOfIntToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassNullableOfIntToFromJsonNullableObjectParam
+_$SimpleClassNullableOfIntToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfIntToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfIntToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfObjectToFromJsonNullableObjectParam
+_$SimpleClassOfObjectToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfObjectToFromJsonNullableObjectParamToJson(
+  SimpleClassOfObjectToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfObjectToFromJsonNullableObjectParam
+_$SimpleClassNullableOfObjectToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfObjectToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfObjectToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfStringToFromJsonNullableObjectParam
+_$SimpleClassOfStringToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfStringToFromJsonNullableObjectParamToJson(
+  SimpleClassOfStringToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfStringToFromJsonNullableObjectParam
+_$SimpleClassNullableOfStringToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfStringToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfStringToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfUriToFromJsonNullableObjectParam
+_$SimpleClassOfUriToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfUriToFromJsonNullableObjectParamToJson(
+  SimpleClassOfUriToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassNullableOfUriToFromJsonNullableObjectParam
+_$SimpleClassNullableOfUriToFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToFromJsonNullableObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), FromJsonNullableObjectParam.fromJson(e)),
+  ),
+);
+
+Map<String, dynamic>
+_$SimpleClassNullableOfUriToFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfUriToFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfBigIntToFromJsonObjectParam
+_$SimpleClassOfBigIntToFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToFromJsonObjectParam(
       (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e as int),
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          FromJsonObjectParam.fromJson(e as Object),
+        ),
       ),
     );
 
-Map<String, dynamic> _$SimpleClassOfDateTimeToIntToJson(
-        SimpleClassOfDateTimeToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+Map<String, dynamic> _$SimpleClassOfBigIntToFromJsonObjectParamToJson(
+  SimpleClassOfBigIntToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
-SimpleClassNullableOfDateTimeToInt _$SimpleClassNullableOfDateTimeToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDateTimeToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(DateTime.parse(k), e as int),
+SimpleClassNullableOfBigIntToFromJsonObjectParam
+_$SimpleClassNullableOfBigIntToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(BigInt.parse(k), FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfBigIntToFromJsonObjectParamToJson(
+  SimpleClassNullableOfBigIntToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfDateTimeToFromJsonObjectParam
+_$SimpleClassOfDateTimeToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDateTimeToFromJsonObjectParamToJson(
+  SimpleClassOfDateTimeToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassNullableOfDateTimeToFromJsonObjectParam
+_$SimpleClassNullableOfDateTimeToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDateTimeToFromJsonObjectParamToJson(
+  SimpleClassNullableOfDateTimeToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassOfDynamicToFromJsonObjectParam
+_$SimpleClassOfDynamicToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDynamicToFromJsonObjectParamToJson(
+  SimpleClassOfDynamicToFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfDynamicToFromJsonObjectParam
+_$SimpleClassNullableOfDynamicToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDynamicToFromJsonObjectParamToJson(
+  SimpleClassNullableOfDynamicToFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfEnumTypeToFromJsonObjectParam
+_$SimpleClassOfEnumTypeToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      FromJsonObjectParam.fromJson(e as Object),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfEnumTypeToFromJsonObjectParamToJson(
+  SimpleClassOfEnumTypeToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
+
+SimpleClassNullableOfEnumTypeToFromJsonObjectParam
+_$SimpleClassNullableOfEnumTypeToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      FromJsonObjectParam.fromJson(e as Object),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToFromJsonObjectParamToJson(
+  SimpleClassNullableOfEnumTypeToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
+
+SimpleClassOfIntToFromJsonObjectParam
+_$SimpleClassOfIntToFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfIntToFromJsonObjectParam(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) =>
+            MapEntry(int.parse(k), FromJsonObjectParam.fromJson(e as Object)),
       ),
     );
 
-Map<String, dynamic> _$SimpleClassNullableOfDateTimeToIntToJson(
-        SimpleClassNullableOfDateTimeToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+Map<String, dynamic> _$SimpleClassOfIntToFromJsonObjectParamToJson(
+  SimpleClassOfIntToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
-SimpleClassOfDynamicToInt _$SimpleClassOfDynamicToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToInt(
-      Map<String, int>.from(json['value'] as Map),
+SimpleClassNullableOfIntToFromJsonObjectParam
+_$SimpleClassNullableOfIntToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfIntToFromJsonObjectParamToJson(
+  SimpleClassNullableOfIntToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfObjectToFromJsonObjectParam
+_$SimpleClassOfObjectToFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToFromJsonObjectParam(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, FromJsonObjectParam.fromJson(e as Object)),
+      ),
     );
 
-Map<String, dynamic> _$SimpleClassOfDynamicToIntToJson(
-        SimpleClassOfDynamicToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+Map<String, dynamic> _$SimpleClassOfObjectToFromJsonObjectParamToJson(
+  SimpleClassOfObjectToFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
 
-SimpleClassNullableOfDynamicToInt _$SimpleClassNullableOfDynamicToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDynamicToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as int),
+SimpleClassNullableOfObjectToFromJsonObjectParam
+_$SimpleClassNullableOfObjectToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfObjectToFromJsonObjectParamToJson(
+  SimpleClassNullableOfObjectToFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfStringToFromJsonObjectParam
+_$SimpleClassOfStringToFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToFromJsonObjectParam(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, FromJsonObjectParam.fromJson(e as Object)),
       ),
     );
 
-Map<String, dynamic> _$SimpleClassNullableOfDynamicToIntToJson(
-        SimpleClassNullableOfDynamicToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+Map<String, dynamic> _$SimpleClassOfStringToFromJsonObjectParamToJson(
+  SimpleClassOfStringToFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
 
-SimpleClassOfEnumTypeToInt _$SimpleClassOfEnumTypeToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToInt(
+SimpleClassNullableOfStringToFromJsonObjectParam
+_$SimpleClassNullableOfStringToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfStringToFromJsonObjectParamToJson(
+  SimpleClassNullableOfStringToFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfUriToFromJsonObjectParam
+_$SimpleClassOfUriToFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfUriToFromJsonObjectParam(
       (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as int),
+        (k, e) =>
+            MapEntry(Uri.parse(k), FromJsonObjectParam.fromJson(e as Object)),
       ),
     );
 
+Map<String, dynamic> _$SimpleClassOfUriToFromJsonObjectParamToJson(
+  SimpleClassOfUriToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassNullableOfUriToFromJsonObjectParam
+_$SimpleClassNullableOfUriToFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToFromJsonObjectParam(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), FromJsonObjectParam.fromJson(e as Object)),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfUriToFromJsonObjectParamToJson(
+  SimpleClassNullableOfUriToFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfBigIntToInt _$SimpleClassOfBigIntToIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), (e as num).toInt()),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfBigIntToIntToJson(
+  SimpleClassOfBigIntToInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassNullableOfBigIntToInt _$SimpleClassNullableOfBigIntToIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), (e as num).toInt()),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfBigIntToIntToJson(
+  SimpleClassNullableOfBigIntToInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfDateTimeToInt _$SimpleClassOfDateTimeToIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), (e as num).toInt()),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDateTimeToIntToJson(
+  SimpleClassOfDateTimeToInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassNullableOfDateTimeToInt _$SimpleClassNullableOfDateTimeToIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), (e as num).toInt()),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDateTimeToIntToJson(
+  SimpleClassNullableOfDateTimeToInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
+
+SimpleClassOfDynamicToInt _$SimpleClassOfDynamicToIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToInt(Map<String, int>.from(json['value'] as Map));
+
+Map<String, dynamic> _$SimpleClassOfDynamicToIntToJson(
+  SimpleClassOfDynamicToInt instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassNullableOfDynamicToInt _$SimpleClassNullableOfDynamicToIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num).toInt()),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDynamicToIntToJson(
+  SimpleClassNullableOfDynamicToInt instance,
+) => <String, dynamic>{'value': instance.value};
+
+SimpleClassOfEnumTypeToInt _$SimpleClassOfEnumTypeToIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num).toInt()),
+  ),
+);
+
 Map<String, dynamic> _$SimpleClassOfEnumTypeToIntToJson(
-        SimpleClassOfEnumTypeToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToInt _$SimpleClassNullableOfEnumTypeToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfEnumTypeToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as int),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToIntToJson(
-        SimpleClassNullableOfEnumTypeToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToInt _$SimpleClassOfIntToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as int),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToIntToJson(
-        SimpleClassOfIntToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToInt _$SimpleClassNullableOfIntToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), e as int),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToIntToJson(
-        SimpleClassNullableOfIntToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToInt _$SimpleClassOfObjectToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToInt(
-      Map<String, int>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToInt(Map<String, int>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfObjectToIntToJson(
-        SimpleClassOfObjectToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToInt instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToInt _$SimpleClassNullableOfObjectToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfObjectToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as int),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToIntToJson(
-        SimpleClassNullableOfObjectToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToInt instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToInt _$SimpleClassOfStringToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToInt(
-      Map<String, int>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToInt(Map<String, int>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfStringToIntToJson(
-        SimpleClassOfStringToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToInt instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToInt _$SimpleClassNullableOfStringToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfStringToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as int),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToIntToJson(
-        SimpleClassNullableOfStringToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToInt instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToInt _$SimpleClassOfUriToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToInt(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as int),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToInt(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToIntToJson(
-        SimpleClassOfUriToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToInt _$SimpleClassNullableOfUriToIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToInt(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), e as int),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToInt(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), (e as num).toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToIntToJson(
-        SimpleClassNullableOfUriToInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToIntNullable _$SimpleClassOfBigIntToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToIntNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as int?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToIntNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToIntNullableToJson(
-        SimpleClassOfBigIntToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToIntNullable
-    _$SimpleClassNullableOfBigIntToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e as int?),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToIntNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), (e as num?)?.toInt()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToIntNullableToJson(
-        SimpleClassNullableOfBigIntToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToIntNullable _$SimpleClassOfDateTimeToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToIntNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e as int?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToIntNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToIntNullableToJson(
-        SimpleClassOfDateTimeToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToIntNullable
-    _$SimpleClassNullableOfDateTimeToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e as int?),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToIntNullableToJson(
-        SimpleClassNullableOfDateTimeToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToIntNullable _$SimpleClassOfDynamicToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToIntNullable(
-      Map<String, int?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToIntNullable(
+  Map<String, int?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToIntNullableToJson(
-        SimpleClassOfDynamicToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToIntNullable
-    _$SimpleClassNullableOfDynamicToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as int?),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToIntNullableToJson(
-        SimpleClassNullableOfDynamicToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToIntNullable _$SimpleClassOfEnumTypeToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToIntNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as int?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToIntNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToIntNullableToJson(
-        SimpleClassOfEnumTypeToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToIntNullable
-    _$SimpleClassNullableOfEnumTypeToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as int?),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToIntNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToIntNullableToJson(
-        SimpleClassNullableOfEnumTypeToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToIntNullable _$SimpleClassOfIntToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToIntNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as int?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToIntNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToIntNullableToJson(
-        SimpleClassOfIntToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToIntNullable
-    _$SimpleClassNullableOfIntToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(int.parse(k), e as int?),
-          ),
-        );
+_$SimpleClassNullableOfIntToIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToIntNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(int.parse(k), (e as num?)?.toInt()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToIntNullableToJson(
-        SimpleClassNullableOfIntToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToIntNullable _$SimpleClassOfObjectToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToIntNullable(
-      Map<String, int?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToIntNullable(
+  Map<String, int?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToIntNullableToJson(
-        SimpleClassOfObjectToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToIntNullable
-    _$SimpleClassNullableOfObjectToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as int?),
-          ),
-        );
+_$SimpleClassNullableOfObjectToIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToIntNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num?)?.toInt()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToIntNullableToJson(
-        SimpleClassNullableOfObjectToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToIntNullable _$SimpleClassOfStringToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToIntNullable(
-      Map<String, int?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToIntNullable(
+  Map<String, int?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToIntNullableToJson(
-        SimpleClassOfStringToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToIntNullable
-    _$SimpleClassNullableOfStringToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as int?),
-          ),
-        );
+_$SimpleClassNullableOfStringToIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToIntNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num?)?.toInt()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToIntNullableToJson(
-        SimpleClassNullableOfStringToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToIntNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToIntNullable _$SimpleClassOfUriToIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToIntNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as int?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToIntNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), (e as num?)?.toInt()),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToIntNullableToJson(
-        SimpleClassOfUriToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToIntNullable
-    _$SimpleClassNullableOfUriToIntNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToIntNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(Uri.parse(k), e as int?),
-          ),
-        );
+_$SimpleClassNullableOfUriToIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToIntNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(Uri.parse(k), (e as num?)?.toInt()),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToIntNullableToJson(
-        SimpleClassNullableOfUriToIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToNum _$SimpleClassOfBigIntToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToNum(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToNum(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToNumToJson(
-        SimpleClassOfBigIntToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToNum instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToNum _$SimpleClassNullableOfBigIntToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBigIntToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(BigInt.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToNumToJson(
-        SimpleClassNullableOfBigIntToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToNum instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToNum _$SimpleClassOfDateTimeToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToNum(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToNum(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToNumToJson(
-        SimpleClassOfDateTimeToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToNum instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToNum _$SimpleClassNullableOfDateTimeToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDateTimeToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(DateTime.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToNumToJson(
-        SimpleClassNullableOfDateTimeToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToNum instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToNum _$SimpleClassOfDynamicToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToNum(
-      Map<String, num>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToNum(Map<String, num>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfDynamicToNumToJson(
-        SimpleClassOfDynamicToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToNum instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToNum _$SimpleClassNullableOfDynamicToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDynamicToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToNumToJson(
-        SimpleClassNullableOfDynamicToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToNum instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToNum _$SimpleClassOfEnumTypeToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToNum(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToNum(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToNumToJson(
-        SimpleClassOfEnumTypeToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToNum instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToNum _$SimpleClassNullableOfEnumTypeToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfEnumTypeToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToNumToJson(
-        SimpleClassNullableOfEnumTypeToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToNum instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToNum _$SimpleClassOfIntToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToNum(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToNum(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToNumToJson(
-        SimpleClassOfIntToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToNum instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToNum _$SimpleClassNullableOfIntToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToNumToJson(
-        SimpleClassNullableOfIntToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToNum instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToNum _$SimpleClassOfObjectToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToNum(
-      Map<String, num>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToNum(Map<String, num>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfObjectToNumToJson(
-        SimpleClassOfObjectToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToNum instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToNum _$SimpleClassNullableOfObjectToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfObjectToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToNumToJson(
-        SimpleClassNullableOfObjectToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToNum instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToNum _$SimpleClassOfStringToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToNum(
-      Map<String, num>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToNum(Map<String, num>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfStringToNumToJson(
-        SimpleClassOfStringToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToNum instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToNum _$SimpleClassNullableOfStringToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfStringToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToNumToJson(
-        SimpleClassNullableOfStringToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToNum instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToNum _$SimpleClassOfUriToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToNum(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToNum(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToNumToJson(
-        SimpleClassOfUriToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToNum instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToNum _$SimpleClassNullableOfUriToNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToNum(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), e as num),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToNum(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), e as num),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToNumToJson(
-        SimpleClassNullableOfUriToNum instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToNum instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToNumNullable _$SimpleClassOfBigIntToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToNumNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as num?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToNumNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToNumNullableToJson(
-        SimpleClassOfBigIntToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToNumNullable
-    _$SimpleClassNullableOfBigIntToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e as num?),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToNumNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToNumNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), e as num?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToNumNullableToJson(
-        SimpleClassNullableOfBigIntToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToNumNullable _$SimpleClassOfDateTimeToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToNumNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e as num?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToNumNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToNumNullableToJson(
-        SimpleClassOfDateTimeToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToNumNullable
-    _$SimpleClassNullableOfDateTimeToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e as num?),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToNumNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToNumNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToNumNullableToJson(
-        SimpleClassNullableOfDateTimeToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToNumNullable _$SimpleClassOfDynamicToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToNumNullable(
-      Map<String, num?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToNumNullable(
+  Map<String, num?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToNumNullableToJson(
-        SimpleClassOfDynamicToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToNumNullable
-    _$SimpleClassNullableOfDynamicToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as num?),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToNumNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToNumNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToNumNullableToJson(
-        SimpleClassNullableOfDynamicToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToNumNullable _$SimpleClassOfEnumTypeToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToNumNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToNumNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToNumNullableToJson(
-        SimpleClassOfEnumTypeToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToNumNullable
-    _$SimpleClassNullableOfEnumTypeToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num?),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToNumNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToNumNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToNumNullableToJson(
-        SimpleClassNullableOfEnumTypeToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToNumNullable _$SimpleClassOfIntToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToNumNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as num?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToNumNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToNumNullableToJson(
-        SimpleClassOfIntToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToNumNullable
-    _$SimpleClassNullableOfIntToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(int.parse(k), e as num?),
-          ),
-        );
+_$SimpleClassNullableOfIntToNumNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToNumNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(int.parse(k), e as num?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToNumNullableToJson(
-        SimpleClassNullableOfIntToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToNumNullable _$SimpleClassOfObjectToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToNumNullable(
-      Map<String, num?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToNumNullable(
+  Map<String, num?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToNumNullableToJson(
-        SimpleClassOfObjectToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToNumNullable
-    _$SimpleClassNullableOfObjectToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as num?),
-          ),
-        );
+_$SimpleClassNullableOfObjectToNumNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToNumNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as num?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToNumNullableToJson(
-        SimpleClassNullableOfObjectToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToNumNullable _$SimpleClassOfStringToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToNumNullable(
-      Map<String, num?>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToNumNullable(
+  Map<String, num?>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToNumNullableToJson(
-        SimpleClassOfStringToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToNumNullable
-    _$SimpleClassNullableOfStringToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as num?),
-          ),
-        );
+_$SimpleClassNullableOfStringToNumNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToNumNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as num?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToNumNullableToJson(
-        SimpleClassNullableOfStringToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToNumNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToNumNullable _$SimpleClassOfUriToNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToNumNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as num?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToNumNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e as num?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToNumNullableToJson(
-        SimpleClassOfUriToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToNumNullable
-    _$SimpleClassNullableOfUriToNumNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToNumNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(Uri.parse(k), e as num?),
-          ),
-        );
+_$SimpleClassNullableOfUriToNumNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToNumNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(Uri.parse(k), e as num?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToNumNullableToJson(
-        SimpleClassNullableOfUriToNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToObject _$SimpleClassOfBigIntToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToObjectToJson(
-        SimpleClassOfBigIntToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToObject instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToObject
-    _$SimpleClassNullableOfBigIntToObjectFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToObject(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e as Object),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToObjectFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToObject(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), e as Object),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToObjectToJson(
-        SimpleClassNullableOfBigIntToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToObject instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToObject _$SimpleClassOfDateTimeToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToObjectToJson(
-        SimpleClassOfDateTimeToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToObject instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToObject
-    _$SimpleClassNullableOfDateTimeToObjectFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToObject(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e as Object),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToObjectFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToObject(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(DateTime.parse(k), e as Object),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToObjectToJson(
-        SimpleClassNullableOfDateTimeToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToObject instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToObject _$SimpleClassOfDynamicToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToObjectToJson(
-        SimpleClassOfDynamicToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToObject
-    _$SimpleClassNullableOfDynamicToObjectFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToObject(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as Object),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToObjectFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToObject(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as Object),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToObjectToJson(
-        SimpleClassNullableOfDynamicToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToObject _$SimpleClassOfEnumTypeToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToObjectToJson(
-        SimpleClassOfEnumTypeToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToObject instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToObject
-    _$SimpleClassNullableOfEnumTypeToObjectFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToObject(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as Object),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToObjectFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToObject(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as Object),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToObjectToJson(
-        SimpleClassNullableOfEnumTypeToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToObject instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToObject _$SimpleClassOfIntToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToObjectToJson(
-        SimpleClassOfIntToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToObject instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToObject _$SimpleClassNullableOfIntToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToObject(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToObject(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToObjectToJson(
-        SimpleClassNullableOfIntToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToObject instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToObject _$SimpleClassOfObjectToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToObjectToJson(
-        SimpleClassOfObjectToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToObject
-    _$SimpleClassNullableOfObjectToObjectFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToObject(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as Object),
-          ),
-        );
+_$SimpleClassNullableOfObjectToObjectFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToObject(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as Object),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToObjectToJson(
-        SimpleClassNullableOfObjectToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToObject _$SimpleClassOfStringToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToObjectToJson(
-        SimpleClassOfStringToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToObject
-    _$SimpleClassNullableOfStringToObjectFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToObject(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as Object),
-          ),
-        );
+_$SimpleClassNullableOfStringToObjectFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToObject(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as Object),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToObjectToJson(
-        SimpleClassNullableOfStringToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToObject instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToObject _$SimpleClassOfUriToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToObject(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToObject(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToObjectToJson(
-        SimpleClassOfUriToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToObject instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToObject _$SimpleClassNullableOfUriToObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToObject(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), e as Object),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToObject(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), e as Object),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToObjectToJson(
-        SimpleClassNullableOfUriToObject instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToObject instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToObjectNullable
-    _$SimpleClassOfBigIntToObjectNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfBigIntToObjectNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(BigInt.parse(k), e),
-          ),
-        );
+_$SimpleClassOfBigIntToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToObjectNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(BigInt.parse(k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToObjectNullableToJson(
-        SimpleClassOfBigIntToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToObjectNullable
-    _$SimpleClassNullableOfBigIntToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToObjectNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToObjectNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToObjectNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToObjectNullableToJson(
-        SimpleClassNullableOfBigIntToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToObjectNullable
-    _$SimpleClassOfDateTimeToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToObjectNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(DateTime.parse(k), e),
-          ),
-        );
+_$SimpleClassOfDateTimeToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToObjectNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(DateTime.parse(k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToObjectNullableToJson(
-        SimpleClassOfDateTimeToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToObjectNullable
-    _$SimpleClassNullableOfDateTimeToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToObjectNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToObjectNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToObjectNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToObjectNullableToJson(
-        SimpleClassNullableOfDateTimeToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToObjectNullable
-    _$SimpleClassOfDynamicToObjectNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfDynamicToObjectNullable(
-          json['value'] as Map<String, dynamic>,
-        );
+_$SimpleClassOfDynamicToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDynamicToObjectNullable(json['value'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToObjectNullableToJson(
-        SimpleClassOfDynamicToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToObjectNullable
-    _$SimpleClassNullableOfDynamicToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToObjectNullable(
-          json['value'] as Map<String, dynamic>?,
-        );
+_$SimpleClassNullableOfDynamicToObjectNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToObjectNullable(
+  json['value'] as Map<String, dynamic>?,
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToObjectNullableToJson(
-        SimpleClassNullableOfDynamicToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToObjectNullable
-    _$SimpleClassOfEnumTypeToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToObjectNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
-          ),
-        );
+_$SimpleClassOfEnumTypeToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToObjectNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToObjectNullableToJson(
-        SimpleClassOfEnumTypeToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToObjectNullable
-    _$SimpleClassNullableOfEnumTypeToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToObjectNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToObjectNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToObjectNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToObjectNullableToJson(
-        SimpleClassNullableOfEnumTypeToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToObjectNullable _$SimpleClassOfIntToObjectNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToObjectNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToObjectNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToObjectNullableToJson(
-        SimpleClassOfIntToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToObjectNullable
-    _$SimpleClassNullableOfIntToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToObjectNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(int.parse(k), e),
-          ),
-        );
+_$SimpleClassNullableOfIntToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToObjectNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(int.parse(k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToObjectNullableToJson(
-        SimpleClassNullableOfIntToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToObjectNullable
-    _$SimpleClassOfObjectToObjectNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfObjectToObjectNullable(
-          json['value'] as Map<String, dynamic>,
-        );
+_$SimpleClassOfObjectToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToObjectNullable(json['value'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfObjectToObjectNullableToJson(
-        SimpleClassOfObjectToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToObjectNullable
-    _$SimpleClassNullableOfObjectToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToObjectNullable(
-          json['value'] as Map<String, dynamic>?,
-        );
+_$SimpleClassNullableOfObjectToObjectNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToObjectNullable(
+  json['value'] as Map<String, dynamic>?,
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToObjectNullableToJson(
-        SimpleClassNullableOfObjectToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToObjectNullable
-    _$SimpleClassOfStringToObjectNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfStringToObjectNullable(
-          json['value'] as Map<String, dynamic>,
-        );
+_$SimpleClassOfStringToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToObjectNullable(json['value'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$SimpleClassOfStringToObjectNullableToJson(
-        SimpleClassOfStringToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToObjectNullable
-    _$SimpleClassNullableOfStringToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToObjectNullable(
-          json['value'] as Map<String, dynamic>?,
-        );
+_$SimpleClassNullableOfStringToObjectNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToObjectNullable(
+  json['value'] as Map<String, dynamic>?,
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToObjectNullableToJson(
-        SimpleClassNullableOfStringToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToObjectNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToObjectNullable _$SimpleClassOfUriToObjectNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToObjectNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToObjectNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToObjectNullableToJson(
-        SimpleClassOfUriToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToObjectNullable
-    _$SimpleClassNullableOfUriToObjectNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToObjectNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(Uri.parse(k), e),
-          ),
-        );
+_$SimpleClassNullableOfUriToObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToObjectNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(Uri.parse(k), e),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToObjectNullableToJson(
-        SimpleClassNullableOfUriToObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
+
+SimpleClassOfBigIntToRecord _$SimpleClassOfBigIntToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      BigInt.parse(k),
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfBigIntToRecordToJson(
+  SimpleClassOfBigIntToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+$Rec _$recordConvert<$Rec>(Object? value, $Rec Function(Map) convert) =>
+    convert(value as Map<String, dynamic>);
+
+SimpleClassNullableOfBigIntToRecord
+_$SimpleClassNullableOfBigIntToRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToRecord(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          _$recordConvert(
+            e,
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfBigIntToRecordToJson(
+  SimpleClassNullableOfBigIntToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassOfDateTimeToRecord _$SimpleClassOfDateTimeToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      DateTime.parse(k),
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDateTimeToRecordToJson(
+  SimpleClassOfDateTimeToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassNullableOfDateTimeToRecord
+_$SimpleClassNullableOfDateTimeToRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToRecord(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          DateTime.parse(k),
+          _$recordConvert(
+            e,
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfDateTimeToRecordToJson(
+  SimpleClassNullableOfDateTimeToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassOfDynamicToRecord _$SimpleClassOfDynamicToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      k,
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDynamicToRecordToJson(
+  SimpleClassOfDynamicToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassNullableOfDynamicToRecord
+_$SimpleClassNullableOfDynamicToRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToRecord(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          _$recordConvert(
+            e,
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfDynamicToRecordToJson(
+  SimpleClassNullableOfDynamicToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassOfEnumTypeToRecord _$SimpleClassOfEnumTypeToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfEnumTypeToRecordToJson(
+  SimpleClassOfEnumTypeToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassNullableOfEnumTypeToRecord
+_$SimpleClassNullableOfEnumTypeToRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToRecord(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          $enumDecode(_$EnumTypeEnumMap, k),
+          _$recordConvert(
+            e,
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToRecordToJson(
+  SimpleClassNullableOfEnumTypeToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassOfIntToRecord _$SimpleClassOfIntToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      int.parse(k),
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfIntToRecordToJson(
+  SimpleClassOfIntToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassNullableOfIntToRecord _$SimpleClassNullableOfIntToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToRecord(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      int.parse(k),
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfIntToRecordToJson(
+  SimpleClassNullableOfIntToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassOfObjectToRecord _$SimpleClassOfObjectToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      k,
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfObjectToRecordToJson(
+  SimpleClassOfObjectToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassNullableOfObjectToRecord
+_$SimpleClassNullableOfObjectToRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToRecord(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          _$recordConvert(
+            e,
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfObjectToRecordToJson(
+  SimpleClassNullableOfObjectToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassOfStringToRecord _$SimpleClassOfStringToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      k,
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfStringToRecordToJson(
+  SimpleClassOfStringToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassNullableOfStringToRecord
+_$SimpleClassNullableOfStringToRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToRecord(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          _$recordConvert(
+            e,
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfStringToRecordToJson(
+  SimpleClassNullableOfStringToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k, <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassOfUriToRecord _$SimpleClassOfUriToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToRecord(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      Uri.parse(k),
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfUriToRecordToJson(
+  SimpleClassOfUriToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toString(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
+
+SimpleClassNullableOfUriToRecord _$SimpleClassNullableOfUriToRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToRecord(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      Uri.parse(k),
+      _$recordConvert(
+        e,
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfUriToRecordToJson(
+  SimpleClassNullableOfUriToRecord instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toString(), <String, dynamic>{
+      r'$1': e.$1,
+      r'$2': e.$2,
+      'truth': e.truth,
+    }),
+  ),
+};
 
 SimpleClassOfBigIntToString _$SimpleClassOfBigIntToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToString(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), e as String),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToString(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToStringToJson(
-        SimpleClassOfBigIntToString instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToString instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToString
-    _$SimpleClassNullableOfBigIntToStringFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToString(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e as String),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToStringFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToString(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(BigInt.parse(k), e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToStringToJson(
-        SimpleClassNullableOfBigIntToString instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToString instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToString _$SimpleClassOfDateTimeToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToString(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), e as String),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToString(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToStringToJson(
-        SimpleClassOfDateTimeToString instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToString instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToString
-    _$SimpleClassNullableOfDateTimeToStringFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToString(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e as String),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToStringFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeToString(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(DateTime.parse(k), e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToStringToJson(
-        SimpleClassNullableOfDateTimeToString instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToString instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToString _$SimpleClassOfDynamicToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToString(
-      Map<String, String>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToString(
+  Map<String, String>.from(json['value'] as Map),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToStringToJson(
-        SimpleClassOfDynamicToString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToString
-    _$SimpleClassNullableOfDynamicToStringFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToString(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToStringFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDynamicToString(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToStringToJson(
-        SimpleClassNullableOfDynamicToString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToString _$SimpleClassOfEnumTypeToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToString(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToString(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToStringToJson(
-        SimpleClassOfEnumTypeToString instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToString instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToString
-    _$SimpleClassNullableOfEnumTypeToStringFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToString(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToStringFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeToString(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToStringToJson(
-        SimpleClassNullableOfEnumTypeToString instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToString instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToString _$SimpleClassOfIntToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToString(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as String),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToString(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToStringToJson(
-        SimpleClassOfIntToString instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToString instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToString _$SimpleClassNullableOfIntToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToString(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), e as String),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToString(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToStringToJson(
-        SimpleClassNullableOfIntToString instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToString instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToString _$SimpleClassOfObjectToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToString(
-      Map<String, String>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) =>
+    SimpleClassOfObjectToString(Map<String, String>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfObjectToStringToJson(
-        SimpleClassOfObjectToString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToString
-    _$SimpleClassNullableOfObjectToStringFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToString(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String),
-          ),
-        );
+_$SimpleClassNullableOfObjectToStringFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToString(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToStringToJson(
-        SimpleClassNullableOfObjectToString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToString _$SimpleClassOfStringToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToString(
-      Map<String, String>.from(json['value'] as Map),
-    );
+  Map<String, dynamic> json,
+) =>
+    SimpleClassOfStringToString(Map<String, String>.from(json['value'] as Map));
 
 Map<String, dynamic> _$SimpleClassOfStringToStringToJson(
-        SimpleClassOfStringToString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToString
-    _$SimpleClassNullableOfStringToStringFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToString(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String),
-          ),
-        );
+_$SimpleClassNullableOfStringToStringFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToString(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToStringToJson(
-        SimpleClassNullableOfStringToString instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToString instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToString _$SimpleClassOfUriToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToString(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as String),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToString(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToStringToJson(
-        SimpleClassOfUriToString instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToString instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToString _$SimpleClassNullableOfUriToStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToString(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), e as String),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToString(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), e as String),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToStringToJson(
-        SimpleClassNullableOfUriToString instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToString instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToStringNullable
-    _$SimpleClassOfBigIntToStringNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfBigIntToStringNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(BigInt.parse(k), e as String?),
-          ),
-        );
+_$SimpleClassOfBigIntToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigIntToStringNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(BigInt.parse(k), e as String?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToStringNullableToJson(
-        SimpleClassOfBigIntToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfBigIntToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfBigIntToStringNullable
-    _$SimpleClassNullableOfBigIntToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(BigInt.parse(k), e as String?),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToStringNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToStringNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToStringNullableToJson(
-        SimpleClassNullableOfBigIntToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfBigIntToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfDateTimeToStringNullable
-    _$SimpleClassOfDateTimeToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfDateTimeToStringNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry(DateTime.parse(k), e as String?),
-          ),
-        );
+_$SimpleClassOfDateTimeToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDateTimeToStringNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(DateTime.parse(k), e as String?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToStringNullableToJson(
-        SimpleClassOfDateTimeToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassOfDateTimeToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassNullableOfDateTimeToStringNullable
-    _$SimpleClassNullableOfDateTimeToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(DateTime.parse(k), e as String?),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToStringNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToStringNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToStringNullableToJson(
-        SimpleClassNullableOfDateTimeToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
-    };
+  SimpleClassNullableOfDateTimeToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)),
+};
 
 SimpleClassOfDynamicToStringNullable
-    _$SimpleClassOfDynamicToStringNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfDynamicToStringNullable(
-          Map<String, String?>.from(json['value'] as Map),
-        );
+_$SimpleClassOfDynamicToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDynamicToStringNullable(
+      Map<String, String?>.from(json['value'] as Map),
+    );
 
 Map<String, dynamic> _$SimpleClassOfDynamicToStringNullableToJson(
-        SimpleClassOfDynamicToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfDynamicToStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfDynamicToStringNullable
-    _$SimpleClassNullableOfDynamicToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String?),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToStringNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToStringNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToStringNullableToJson(
-        SimpleClassNullableOfDynamicToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfDynamicToStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfEnumTypeToStringNullable
-    _$SimpleClassOfEnumTypeToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassOfEnumTypeToStringNullable(
-          (json['value'] as Map<String, dynamic>).map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String?),
-          ),
-        );
+_$SimpleClassOfEnumTypeToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfEnumTypeToStringNullable(
+      (json['value'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToStringNullableToJson(
-        SimpleClassOfEnumTypeToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassOfEnumTypeToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassNullableOfEnumTypeToStringNullable
-    _$SimpleClassNullableOfEnumTypeToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String?),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToStringNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToStringNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k), e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToStringNullableToJson(
-        SimpleClassNullableOfEnumTypeToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e)),
-    };
+  SimpleClassNullableOfEnumTypeToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e)),
+};
 
 SimpleClassOfIntToStringNullable _$SimpleClassOfIntToStringNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToStringNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), e as String?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToStringNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToStringNullableToJson(
-        SimpleClassOfIntToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfIntToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfIntToStringNullable
-    _$SimpleClassNullableOfIntToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(int.parse(k), e as String?),
-          ),
-        );
+_$SimpleClassNullableOfIntToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToStringNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(int.parse(k), e as String?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToStringNullableToJson(
-        SimpleClassNullableOfIntToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfIntToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfObjectToStringNullable
-    _$SimpleClassOfObjectToStringNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfObjectToStringNullable(
-          Map<String, String?>.from(json['value'] as Map),
-        );
+_$SimpleClassOfObjectToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObjectToStringNullable(
+      Map<String, String?>.from(json['value'] as Map),
+    );
 
 Map<String, dynamic> _$SimpleClassOfObjectToStringNullableToJson(
-        SimpleClassOfObjectToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfObjectToStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfObjectToStringNullable
-    _$SimpleClassNullableOfObjectToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String?),
-          ),
-        );
+_$SimpleClassNullableOfObjectToStringNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToStringNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToStringNullableToJson(
-        SimpleClassNullableOfObjectToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfObjectToStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfStringToStringNullable
-    _$SimpleClassOfStringToStringNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassOfStringToStringNullable(
-          Map<String, String?>.from(json['value'] as Map),
-        );
+_$SimpleClassOfStringToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfStringToStringNullable(
+      Map<String, String?>.from(json['value'] as Map),
+    );
 
 Map<String, dynamic> _$SimpleClassOfStringToStringNullableToJson(
-        SimpleClassOfStringToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassOfStringToStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassNullableOfStringToStringNullable
-    _$SimpleClassNullableOfStringToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String?),
-          ),
-        );
+_$SimpleClassNullableOfStringToStringNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToStringNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToStringNullableToJson(
-        SimpleClassNullableOfStringToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-    };
+  SimpleClassNullableOfStringToStringNullable instance,
+) => <String, dynamic>{'value': instance.value};
 
 SimpleClassOfUriToStringNullable _$SimpleClassOfUriToStringNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToStringNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), e as String?),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToStringNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e as String?),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToStringNullableToJson(
-        SimpleClassOfUriToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassOfUriToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassNullableOfUriToStringNullable
-    _$SimpleClassNullableOfUriToStringNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToStringNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(Uri.parse(k), e as String?),
-          ),
-        );
+_$SimpleClassNullableOfUriToStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToStringNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(Uri.parse(k), e as String?),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToStringNullableToJson(
-        SimpleClassNullableOfUriToStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
-    };
+  SimpleClassNullableOfUriToStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e)),
+};
 
 SimpleClassOfBigIntToUri _$SimpleClassOfBigIntToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(BigInt.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(BigInt.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToUriToJson(
-        SimpleClassOfBigIntToUri instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassOfBigIntToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassNullableOfBigIntToUri _$SimpleClassNullableOfBigIntToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBigIntToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(BigInt.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigIntToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(BigInt.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToUriToJson(
-        SimpleClassNullableOfBigIntToUri instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassNullableOfBigIntToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassOfDateTimeToUri _$SimpleClassOfDateTimeToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(DateTime.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(DateTime.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToUriToJson(
-        SimpleClassOfDateTimeToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e.toString())),
-    };
+  SimpleClassOfDateTimeToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.toString()),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToUri _$SimpleClassNullableOfDateTimeToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDateTimeToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(DateTime.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(DateTime.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToUriToJson(
-        SimpleClassNullableOfDateTimeToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e.toString())),
-    };
+  SimpleClassNullableOfDateTimeToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e.toString()),
+  ),
+};
 
 SimpleClassOfDynamicToUri _$SimpleClassOfDynamicToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToUriToJson(
-        SimpleClassOfDynamicToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassOfDynamicToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassNullableOfDynamicToUri _$SimpleClassNullableOfDynamicToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDynamicToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToUriToJson(
-        SimpleClassNullableOfDynamicToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassNullableOfDynamicToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassOfEnumTypeToUri _$SimpleClassOfEnumTypeToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry($enumDecode(_$EnumTypeEnumMap, k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry($enumDecode(_$EnumTypeEnumMap, k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToUriToJson(
-        SimpleClassOfEnumTypeToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.toString())),
-    };
+  SimpleClassOfEnumTypeToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toString()),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToUri _$SimpleClassNullableOfEnumTypeToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfEnumTypeToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) =>
-            MapEntry($enumDecode(_$EnumTypeEnumMap, k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry($enumDecode(_$EnumTypeEnumMap, k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToUriToJson(
-        SimpleClassNullableOfEnumTypeToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e.toString())),
-    };
+  SimpleClassNullableOfEnumTypeToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toString()),
+  ),
+};
 
 SimpleClassOfIntToUri _$SimpleClassOfIntToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(int.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToUriToJson(
-        SimpleClassOfIntToUri instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassOfIntToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassNullableOfIntToUri _$SimpleClassNullableOfIntToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(int.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(int.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToUriToJson(
-        SimpleClassNullableOfIntToUri instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassNullableOfIntToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassOfObjectToUri _$SimpleClassOfObjectToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToUriToJson(
-        SimpleClassOfObjectToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassOfObjectToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassNullableOfObjectToUri _$SimpleClassNullableOfObjectToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfObjectToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObjectToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToUriToJson(
-        SimpleClassNullableOfObjectToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassNullableOfObjectToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassOfStringToUri _$SimpleClassOfStringToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToUriToJson(
-        SimpleClassOfStringToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassOfStringToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassNullableOfStringToUri _$SimpleClassNullableOfStringToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfStringToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfStringToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToUriToJson(
-        SimpleClassNullableOfStringToUri instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
-    };
+  SimpleClassNullableOfStringToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e.toString())),
+};
 
 SimpleClassOfUriToUri _$SimpleClassOfUriToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToUri(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(Uri.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToUri(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToUriToJson(
-        SimpleClassOfUriToUri instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassOfUriToUri instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassNullableOfUriToUri _$SimpleClassNullableOfUriToUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriToUri(
-      (json['value'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(Uri.parse(k), Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriToUri(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(Uri.parse(k), Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToUriToJson(
-        SimpleClassNullableOfUriToUri instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
-    };
+  SimpleClassNullableOfUriToUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e.toString())),
+};
 
 SimpleClassOfBigIntToUriNullable _$SimpleClassOfBigIntToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            BigInt.parse(k), e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(BigInt.parse(k), e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntToUriNullableToJson(
-        SimpleClassOfBigIntToUriNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassOfBigIntToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassNullableOfBigIntToUriNullable
-    _$SimpleClassNullableOfBigIntToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                BigInt.parse(k), e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfBigIntToUriNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntToUriNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          BigInt.parse(k),
+          e == null ? null : Uri.parse(e as String),
+        ),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToUriNullableToJson(
-        SimpleClassNullableOfBigIntToUriNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassNullableOfBigIntToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassOfDateTimeToUriNullable _$SimpleClassOfDateTimeToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            DateTime.parse(k), e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToUriNullableToJson(
-        SimpleClassOfDateTimeToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(k.toIso8601String(), e?.toString())),
-    };
+  SimpleClassOfDateTimeToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.toString()),
+  ),
+};
 
 SimpleClassNullableOfDateTimeToUriNullable
-    _$SimpleClassNullableOfDateTimeToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                DateTime.parse(k), e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDateTimeToUriNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTimeToUriNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) =>
+        MapEntry(DateTime.parse(k), e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToUriNullableToJson(
-        SimpleClassNullableOfDateTimeToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(k.toIso8601String(), e?.toString())),
-    };
+  SimpleClassNullableOfDateTimeToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(k.toIso8601String(), e?.toString()),
+  ),
+};
 
 SimpleClassOfDynamicToUriNullable _$SimpleClassOfDynamicToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamicToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamicToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfDynamicToUriNullableToJson(
-        SimpleClassOfDynamicToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassOfDynamicToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassNullableOfDynamicToUriNullable
-    _$SimpleClassNullableOfDynamicToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDynamicToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfDynamicToUriNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamicToUriNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToUriNullableToJson(
-        SimpleClassNullableOfDynamicToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassNullableOfDynamicToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassOfEnumTypeToUriNullable _$SimpleClassOfEnumTypeToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-            e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      e == null ? null : Uri.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToUriNullableToJson(
-        SimpleClassOfEnumTypeToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          .map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.toString())),
-    };
+  SimpleClassOfEnumTypeToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toString()),
+  ),
+};
 
 SimpleClassNullableOfEnumTypeToUriNullable
-    _$SimpleClassNullableOfEnumTypeToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry($enumDecode(_$EnumTypeEnumMap, k),
-                e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfEnumTypeToUriNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumTypeToUriNullable(
+  (json['value'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(
+      $enumDecode(_$EnumTypeEnumMap, k),
+      e == null ? null : Uri.parse(e as String),
+    ),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToUriNullableToJson(
-        SimpleClassNullableOfEnumTypeToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value
-          ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k], e?.toString())),
-    };
+  SimpleClassNullableOfEnumTypeToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map(
+    (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toString()),
+  ),
+};
 
 SimpleClassOfIntToUriNullable _$SimpleClassOfIntToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(int.parse(k), e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(int.parse(k), e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntToUriNullableToJson(
-        SimpleClassOfIntToUriNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassOfIntToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassNullableOfIntToUriNullable
-    _$SimpleClassNullableOfIntToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfIntToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                int.parse(k), e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfIntToUriNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfIntToUriNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) =>
+            MapEntry(int.parse(k), e == null ? null : Uri.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToUriNullableToJson(
-        SimpleClassNullableOfIntToUriNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassNullableOfIntToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassOfObjectToUriNullable _$SimpleClassOfObjectToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfObjectToUriNullableToJson(
-        SimpleClassOfObjectToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassOfObjectToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassNullableOfObjectToUriNullable
-    _$SimpleClassNullableOfObjectToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfObjectToUriNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectToUriNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToUriNullableToJson(
-        SimpleClassNullableOfObjectToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassNullableOfObjectToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassOfStringToUriNullable _$SimpleClassOfStringToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringToUriNullableToJson(
-        SimpleClassOfStringToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassOfStringToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassNullableOfStringToUriNullable
-    _$SimpleClassNullableOfStringToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfStringToUriNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringToUriNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e == null ? null : Uri.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToUriNullableToJson(
-        SimpleClassNullableOfStringToUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
-    };
+  SimpleClassNullableOfStringToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k, e?.toString())),
+};
 
 SimpleClassOfUriToUriNullable _$SimpleClassOfUriToUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriToUriNullable(
-      (json['value'] as Map<String, dynamic>).map(
-        (k, e) =>
-            MapEntry(Uri.parse(k), e == null ? null : Uri.parse(e as String)),
-      ),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriToUriNullable(
+  (json['value'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(Uri.parse(k), e == null ? null : Uri.parse(e as String)),
+  ),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriToUriNullableToJson(
-        SimpleClassOfUriToUriNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassOfUriToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
 
 SimpleClassNullableOfUriToUriNullable
-    _$SimpleClassNullableOfUriToUriNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfUriToUriNullable(
-          (json['value'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(
-                Uri.parse(k), e == null ? null : Uri.parse(e as String)),
-          ),
-        );
+_$SimpleClassNullableOfUriToUriNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfUriToUriNullable(
+      (json['value'] as Map<String, dynamic>?)?.map(
+        (k, e) =>
+            MapEntry(Uri.parse(k), e == null ? null : Uri.parse(e as String)),
+      ),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToUriNullableToJson(
-        SimpleClassNullableOfUriToUriNullable instance) =>
-    <String, dynamic>{
-      'value':
-          instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
-    };
+  SimpleClassNullableOfUriToUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((k, e) => MapEntry(k.toString(), e?.toString())),
+};
diff --git a/json_serializable/test/supported_types/input.type_num.dart b/json_serializable/test/supported_types/input.type_num.dart
index 57631ce62..e354dd244 100644
--- a/json_serializable/test/supported_types/input.type_num.dart
+++ b/json_serializable/test/supported_types/input.type_num.dart
@@ -13,10 +13,7 @@ class SimpleClass {
   @JsonKey(defaultValue: 88.6)
   num withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -31,10 +28,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: 88.6)
   num? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_num.g.dart b/json_serializable/test/supported_types/input.type_num.g.dart
index e996e5744..f84779b51 100644
--- a/json_serializable/test/supported_types/input.type_num.g.dart
+++ b/json_serializable/test/supported_types/input.type_num.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_num.dart';
 
@@ -8,10 +8,8 @@ part of 'input.type_num.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as num,
-      json['withDefault'] as num? ?? 88.6,
-    );
+SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) =>
+    SimpleClass(json['value'] as num, json['withDefault'] as num? ?? 88.6);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -26,8 +24,8 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
diff --git a/json_serializable/test/supported_types/input.type_object.dart b/json_serializable/test/supported_types/input.type_object.dart
index 193bd440a..57e8f78e3 100644
--- a/json_serializable/test/supported_types/input.type_object.dart
+++ b/json_serializable/test/supported_types/input.type_object.dart
@@ -13,10 +13,7 @@ class SimpleClass {
   @JsonKey(defaultValue: 'o1')
   Object withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -31,10 +28,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: 'o1')
   Object? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_object.g.dart b/json_serializable/test/supported_types/input.type_object.g.dart
index 4ac5cff7b..ac5a9aa57 100644
--- a/json_serializable/test/supported_types/input.type_object.g.dart
+++ b/json_serializable/test/supported_types/input.type_object.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_object.dart';
 
@@ -9,9 +9,9 @@ part of 'input.type_object.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as Object,
-      json['withDefault'] as Object? ?? 'o1',
-    );
+  json['value'] as Object,
+  json['withDefault'] as Object? ?? 'o1',
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -20,14 +20,11 @@ Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     };
 
 SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
-    SimpleClassNullable(
-      json['value'],
-      json['withDefault'] ?? 'o1',
-    );
+    SimpleClassNullable(json['value'], json['withDefault'] ?? 'o1');
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
diff --git a/json_serializable/test/supported_types/input.type_record.dart b/json_serializable/test/supported_types/input.type_record.dart
new file mode 100644
index 000000000..c19ed9532
--- /dev/null
+++ b/json_serializable/test/supported_types/input.type_record.dart
@@ -0,0 +1,782 @@
+// 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 'package:json_annotation/json_annotation.dart';
+import 'enum_type.dart';
+
+part 'input.type_record.g.dart';
+
+typedef RecordTypeDef = ();
+
+@JsonSerializable()
+class SimpleClass {
+  final RecordTypeDef value;
+
+  SimpleClass(this.value);
+
+  factory SimpleClass.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullable {
+  final RecordTypeDef? value;
+
+  SimpleClassNullable(this.value);
+
+  factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableToJson(this);
+}
+
+typedef SimpleClassOfBigIntTypeDef = (BigInt, {BigInt named});
+
+@JsonSerializable()
+class SimpleClassOfBigInt {
+  final SimpleClassOfBigIntTypeDef value;
+
+  SimpleClassOfBigInt(this.value);
+
+  factory SimpleClassOfBigInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfBigIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfBigIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBigInt {
+  final SimpleClassOfBigIntTypeDef? value;
+
+  SimpleClassNullableOfBigInt(this.value);
+
+  factory SimpleClassNullableOfBigInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfBigIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfBigIntToJson(this);
+}
+
+typedef SimpleClassOfBigIntNullableTypeDef = (BigInt?, {BigInt? named});
+
+@JsonSerializable()
+class SimpleClassOfBigIntNullable {
+  final SimpleClassOfBigIntNullableTypeDef value;
+
+  SimpleClassOfBigIntNullable(this.value);
+
+  factory SimpleClassOfBigIntNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfBigIntNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfBigIntNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBigIntNullable {
+  final SimpleClassOfBigIntNullableTypeDef? value;
+
+  SimpleClassNullableOfBigIntNullable(this.value);
+
+  factory SimpleClassNullableOfBigIntNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfBigIntNullableToJson(this);
+}
+
+typedef SimpleClassOfBoolTypeDef = (bool, {bool named});
+
+@JsonSerializable()
+class SimpleClassOfBool {
+  final SimpleClassOfBoolTypeDef value;
+
+  SimpleClassOfBool(this.value);
+
+  factory SimpleClassOfBool.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfBoolFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfBoolToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBool {
+  final SimpleClassOfBoolTypeDef? value;
+
+  SimpleClassNullableOfBool(this.value);
+
+  factory SimpleClassNullableOfBool.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfBoolFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfBoolToJson(this);
+}
+
+typedef SimpleClassOfBoolNullableTypeDef = (bool?, {bool? named});
+
+@JsonSerializable()
+class SimpleClassOfBoolNullable {
+  final SimpleClassOfBoolNullableTypeDef value;
+
+  SimpleClassOfBoolNullable(this.value);
+
+  factory SimpleClassOfBoolNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfBoolNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfBoolNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfBoolNullable {
+  final SimpleClassOfBoolNullableTypeDef? value;
+
+  SimpleClassNullableOfBoolNullable(this.value);
+
+  factory SimpleClassNullableOfBoolNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBoolNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfBoolNullableToJson(this);
+}
+
+typedef SimpleClassOfDateTimeTypeDef = (DateTime, {DateTime named});
+
+@JsonSerializable()
+class SimpleClassOfDateTime {
+  final SimpleClassOfDateTimeTypeDef value;
+
+  SimpleClassOfDateTime(this.value);
+
+  factory SimpleClassOfDateTime.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDateTimeFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDateTimeToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDateTime {
+  final SimpleClassOfDateTimeTypeDef? value;
+
+  SimpleClassNullableOfDateTime(this.value);
+
+  factory SimpleClassNullableOfDateTime.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfDateTimeFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfDateTimeToJson(this);
+}
+
+typedef SimpleClassOfDateTimeNullableTypeDef = (DateTime?, {DateTime? named});
+
+@JsonSerializable()
+class SimpleClassOfDateTimeNullable {
+  final SimpleClassOfDateTimeNullableTypeDef value;
+
+  SimpleClassOfDateTimeNullable(this.value);
+
+  factory SimpleClassOfDateTimeNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDateTimeNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDateTimeNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDateTimeNullable {
+  final SimpleClassOfDateTimeNullableTypeDef? value;
+
+  SimpleClassNullableOfDateTimeNullable(this.value);
+
+  factory SimpleClassNullableOfDateTimeNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDateTimeNullableToJson(this);
+}
+
+typedef SimpleClassOfDoubleTypeDef = (double, {double named});
+
+@JsonSerializable()
+class SimpleClassOfDouble {
+  final SimpleClassOfDoubleTypeDef value;
+
+  SimpleClassOfDouble(this.value);
+
+  factory SimpleClassOfDouble.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDoubleFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDoubleToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDouble {
+  final SimpleClassOfDoubleTypeDef? value;
+
+  SimpleClassNullableOfDouble(this.value);
+
+  factory SimpleClassNullableOfDouble.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfDoubleFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfDoubleToJson(this);
+}
+
+typedef SimpleClassOfDoubleNullableTypeDef = (double?, {double? named});
+
+@JsonSerializable()
+class SimpleClassOfDoubleNullable {
+  final SimpleClassOfDoubleNullableTypeDef value;
+
+  SimpleClassOfDoubleNullable(this.value);
+
+  factory SimpleClassOfDoubleNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDoubleNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDoubleNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDoubleNullable {
+  final SimpleClassOfDoubleNullableTypeDef? value;
+
+  SimpleClassNullableOfDoubleNullable(this.value);
+
+  factory SimpleClassNullableOfDoubleNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDoubleNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDoubleNullableToJson(this);
+}
+
+typedef SimpleClassOfDurationTypeDef = (Duration, {Duration named});
+
+@JsonSerializable()
+class SimpleClassOfDuration {
+  final SimpleClassOfDurationTypeDef value;
+
+  SimpleClassOfDuration(this.value);
+
+  factory SimpleClassOfDuration.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDurationFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDurationToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDuration {
+  final SimpleClassOfDurationTypeDef? value;
+
+  SimpleClassNullableOfDuration(this.value);
+
+  factory SimpleClassNullableOfDuration.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfDurationFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfDurationToJson(this);
+}
+
+typedef SimpleClassOfDurationNullableTypeDef = (Duration?, {Duration? named});
+
+@JsonSerializable()
+class SimpleClassOfDurationNullable {
+  final SimpleClassOfDurationNullableTypeDef value;
+
+  SimpleClassOfDurationNullable(this.value);
+
+  factory SimpleClassOfDurationNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDurationNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDurationNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDurationNullable {
+  final SimpleClassOfDurationNullableTypeDef? value;
+
+  SimpleClassNullableOfDurationNullable(this.value);
+
+  factory SimpleClassNullableOfDurationNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDurationNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfDurationNullableToJson(this);
+}
+
+typedef SimpleClassOfDynamicTypeDef = (dynamic, {dynamic named});
+
+@JsonSerializable()
+class SimpleClassOfDynamic {
+  final SimpleClassOfDynamicTypeDef value;
+
+  SimpleClassOfDynamic(this.value);
+
+  factory SimpleClassOfDynamic.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfDynamicFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfDynamicToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfDynamic {
+  final SimpleClassOfDynamicTypeDef? value;
+
+  SimpleClassNullableOfDynamic(this.value);
+
+  factory SimpleClassNullableOfDynamic.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfDynamicFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfDynamicToJson(this);
+}
+
+typedef SimpleClassOfEnumTypeTypeDef = (EnumType, {EnumType named});
+
+@JsonSerializable()
+class SimpleClassOfEnumType {
+  final SimpleClassOfEnumTypeTypeDef value;
+
+  SimpleClassOfEnumType(this.value);
+
+  factory SimpleClassOfEnumType.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfEnumTypeFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfEnumTypeToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfEnumType {
+  final SimpleClassOfEnumTypeTypeDef? value;
+
+  SimpleClassNullableOfEnumType(this.value);
+
+  factory SimpleClassNullableOfEnumType.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfEnumTypeFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfEnumTypeToJson(this);
+}
+
+typedef SimpleClassOfEnumTypeNullableTypeDef = (EnumType?, {EnumType? named});
+
+@JsonSerializable()
+class SimpleClassOfEnumTypeNullable {
+  final SimpleClassOfEnumTypeNullableTypeDef value;
+
+  SimpleClassOfEnumTypeNullable(this.value);
+
+  factory SimpleClassOfEnumTypeNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfEnumTypeNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfEnumTypeNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfEnumTypeNullable {
+  final SimpleClassOfEnumTypeNullableTypeDef? value;
+
+  SimpleClassNullableOfEnumTypeNullable(this.value);
+
+  factory SimpleClassNullableOfEnumTypeNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfEnumTypeNullableToJson(this);
+}
+
+typedef SimpleClassOfFromJsonDynamicParamTypeDef = (
+  FromJsonDynamicParam, {
+  FromJsonDynamicParam named,
+});
+
+@JsonSerializable()
+class SimpleClassOfFromJsonDynamicParam {
+  final SimpleClassOfFromJsonDynamicParamTypeDef value;
+
+  SimpleClassOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonDynamicParam {
+  final SimpleClassOfFromJsonDynamicParamTypeDef? value;
+
+  SimpleClassNullableOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonDynamicParamToJson(this);
+}
+
+typedef SimpleClassOfFromJsonNullableObjectParamTypeDef = (
+  FromJsonNullableObjectParam, {
+  FromJsonNullableObjectParam named,
+});
+
+@JsonSerializable()
+class SimpleClassOfFromJsonNullableObjectParam {
+  final SimpleClassOfFromJsonNullableObjectParamTypeDef value;
+
+  SimpleClassOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonNullableObjectParam {
+  final SimpleClassOfFromJsonNullableObjectParamTypeDef? value;
+
+  SimpleClassNullableOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(this);
+}
+
+typedef SimpleClassOfFromJsonObjectParamTypeDef = (
+  FromJsonObjectParam, {
+  FromJsonObjectParam named,
+});
+
+@JsonSerializable()
+class SimpleClassOfFromJsonObjectParam {
+  final SimpleClassOfFromJsonObjectParamTypeDef value;
+
+  SimpleClassOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonObjectParam {
+  final SimpleClassOfFromJsonObjectParamTypeDef? value;
+
+  SimpleClassNullableOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonObjectParamToJson(this);
+}
+
+typedef SimpleClassOfIntTypeDef = (int, {int named});
+
+@JsonSerializable()
+class SimpleClassOfInt {
+  final SimpleClassOfIntTypeDef value;
+
+  SimpleClassOfInt(this.value);
+
+  factory SimpleClassOfInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfIntToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfInt {
+  final SimpleClassOfIntTypeDef? value;
+
+  SimpleClassNullableOfInt(this.value);
+
+  factory SimpleClassNullableOfInt.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfIntFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfIntToJson(this);
+}
+
+typedef SimpleClassOfIntNullableTypeDef = (int?, {int? named});
+
+@JsonSerializable()
+class SimpleClassOfIntNullable {
+  final SimpleClassOfIntNullableTypeDef value;
+
+  SimpleClassOfIntNullable(this.value);
+
+  factory SimpleClassOfIntNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfIntNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfIntNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfIntNullable {
+  final SimpleClassOfIntNullableTypeDef? value;
+
+  SimpleClassNullableOfIntNullable(this.value);
+
+  factory SimpleClassNullableOfIntNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfIntNullableToJson(this);
+}
+
+typedef SimpleClassOfNumTypeDef = (num, {num named});
+
+@JsonSerializable()
+class SimpleClassOfNum {
+  final SimpleClassOfNumTypeDef value;
+
+  SimpleClassOfNum(this.value);
+
+  factory SimpleClassOfNum.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfNumFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfNumToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfNum {
+  final SimpleClassOfNumTypeDef? value;
+
+  SimpleClassNullableOfNum(this.value);
+
+  factory SimpleClassNullableOfNum.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfNumFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfNumToJson(this);
+}
+
+typedef SimpleClassOfNumNullableTypeDef = (num?, {num? named});
+
+@JsonSerializable()
+class SimpleClassOfNumNullable {
+  final SimpleClassOfNumNullableTypeDef value;
+
+  SimpleClassOfNumNullable(this.value);
+
+  factory SimpleClassOfNumNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfNumNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfNumNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfNumNullable {
+  final SimpleClassOfNumNullableTypeDef? value;
+
+  SimpleClassNullableOfNumNullable(this.value);
+
+  factory SimpleClassNullableOfNumNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfNumNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfNumNullableToJson(this);
+}
+
+typedef SimpleClassOfObjectTypeDef = (Object, {Object named});
+
+@JsonSerializable()
+class SimpleClassOfObject {
+  final SimpleClassOfObjectTypeDef value;
+
+  SimpleClassOfObject(this.value);
+
+  factory SimpleClassOfObject.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfObjectFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfObjectToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfObject {
+  final SimpleClassOfObjectTypeDef? value;
+
+  SimpleClassNullableOfObject(this.value);
+
+  factory SimpleClassNullableOfObject.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfObjectFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfObjectToJson(this);
+}
+
+typedef SimpleClassOfObjectNullableTypeDef = (Object?, {Object? named});
+
+@JsonSerializable()
+class SimpleClassOfObjectNullable {
+  final SimpleClassOfObjectNullableTypeDef value;
+
+  SimpleClassOfObjectNullable(this.value);
+
+  factory SimpleClassOfObjectNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfObjectNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfObjectNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfObjectNullable {
+  final SimpleClassOfObjectNullableTypeDef? value;
+
+  SimpleClassNullableOfObjectNullable(this.value);
+
+  factory SimpleClassNullableOfObjectNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfObjectNullableToJson(this);
+}
+
+typedef SimpleClassOfRecordTypeDef = (
+  (int, String, {bool truth}), {
+  (int, String, {bool truth}) named,
+});
+
+@JsonSerializable()
+class SimpleClassOfRecord {
+  final SimpleClassOfRecordTypeDef value;
+
+  SimpleClassOfRecord(this.value);
+
+  factory SimpleClassOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfRecord {
+  final SimpleClassOfRecordTypeDef? value;
+
+  SimpleClassNullableOfRecord(this.value);
+
+  factory SimpleClassNullableOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfRecordToJson(this);
+}
+
+typedef SimpleClassOfStringTypeDef = (String, {String named});
+
+@JsonSerializable()
+class SimpleClassOfString {
+  final SimpleClassOfStringTypeDef value;
+
+  SimpleClassOfString(this.value);
+
+  factory SimpleClassOfString.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfStringFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfStringToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfString {
+  final SimpleClassOfStringTypeDef? value;
+
+  SimpleClassNullableOfString(this.value);
+
+  factory SimpleClassNullableOfString.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfStringFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfStringToJson(this);
+}
+
+typedef SimpleClassOfStringNullableTypeDef = (String?, {String? named});
+
+@JsonSerializable()
+class SimpleClassOfStringNullable {
+  final SimpleClassOfStringNullableTypeDef value;
+
+  SimpleClassOfStringNullable(this.value);
+
+  factory SimpleClassOfStringNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfStringNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfStringNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfStringNullable {
+  final SimpleClassOfStringNullableTypeDef? value;
+
+  SimpleClassNullableOfStringNullable(this.value);
+
+  factory SimpleClassNullableOfStringNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfStringNullableToJson(this);
+}
+
+typedef SimpleClassOfUriTypeDef = (Uri, {Uri named});
+
+@JsonSerializable()
+class SimpleClassOfUri {
+  final SimpleClassOfUriTypeDef value;
+
+  SimpleClassOfUri(this.value);
+
+  factory SimpleClassOfUri.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfUriFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfUriToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfUri {
+  final SimpleClassOfUriTypeDef? value;
+
+  SimpleClassNullableOfUri(this.value);
+
+  factory SimpleClassNullableOfUri.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfUriFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfUriToJson(this);
+}
+
+typedef SimpleClassOfUriNullableTypeDef = (Uri?, {Uri? named});
+
+@JsonSerializable()
+class SimpleClassOfUriNullable {
+  final SimpleClassOfUriNullableTypeDef value;
+
+  SimpleClassOfUriNullable(this.value);
+
+  factory SimpleClassOfUriNullable.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfUriNullableFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfUriNullableToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfUriNullable {
+  final SimpleClassOfUriNullableTypeDef? value;
+
+  SimpleClassNullableOfUriNullable(this.value);
+
+  factory SimpleClassNullableOfUriNullable.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriNullableFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfUriNullableToJson(this);
+}
diff --git a/json_serializable/test/supported_types/input.type_record.g.dart b/json_serializable/test/supported_types/input.type_record.g.dart
new file mode 100644
index 000000000..98e183040
--- /dev/null
+++ b/json_serializable/test/supported_types/input.type_record.g.dart
@@ -0,0 +1,1249 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
+
+part of 'input.type_record.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(());
+
+Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
+    <String, dynamic>{'value': <String, dynamic>{}};
+
+SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullable(());
+
+Map<String, dynamic> _$SimpleClassNullableToJson(
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null ? null : <String, dynamic>{},
+};
+
+SimpleClassOfBigInt _$SimpleClassOfBigIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBigInt(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) => (
+          BigInt.parse($jsonValue[r'$1'] as String),
+          named: BigInt.parse($jsonValue['named'] as String),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfBigIntToJson(
+  SimpleClassOfBigInt instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1.toString(),
+    'named': instance.value.named.toString(),
+  },
+};
+
+$Rec _$recordConvert<$Rec>(Object? value, $Rec Function(Map) convert) =>
+    convert(value as Map<String, dynamic>);
+
+SimpleClassNullableOfBigInt _$SimpleClassNullableOfBigIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigInt(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      BigInt.parse($jsonValue[r'$1'] as String),
+      named: BigInt.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfBigIntToJson(
+  SimpleClassNullableOfBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1.toString(),
+          'named': instance.value!.named.toString(),
+        },
+};
+
+$Rec? _$recordConvertNullable<$Rec>(
+  Object? value,
+  $Rec Function(Map) convert,
+) => value == null ? null : convert(value as Map<String, dynamic>);
+
+SimpleClassOfBigIntNullable _$SimpleClassOfBigIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      $jsonValue[r'$1'] == null
+          ? null
+          : BigInt.parse($jsonValue[r'$1'] as String),
+      named: $jsonValue['named'] == null
+          ? null
+          : BigInt.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfBigIntNullableToJson(
+  SimpleClassOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1?.toString(),
+    'named': instance.value.named?.toString(),
+  },
+};
+
+SimpleClassNullableOfBigIntNullable
+_$SimpleClassNullableOfBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntNullable(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => (
+          $jsonValue[r'$1'] == null
+              ? null
+              : BigInt.parse($jsonValue[r'$1'] as String),
+          named: $jsonValue['named'] == null
+              ? null
+              : BigInt.parse($jsonValue['named'] as String),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfBigIntNullableToJson(
+  SimpleClassNullableOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1?.toString(),
+          'named': instance.value!.named?.toString(),
+        },
+};
+
+SimpleClassOfBool _$SimpleClassOfBoolFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfBool(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) =>
+            ($jsonValue[r'$1'] as bool, named: $jsonValue['named'] as bool),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfBoolToJson(SimpleClassOfBool instance) =>
+    <String, dynamic>{
+      'value': <String, dynamic>{
+        r'$1': instance.value.$1,
+        'named': instance.value.named,
+      },
+    };
+
+SimpleClassNullableOfBool _$SimpleClassNullableOfBoolFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBool(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as bool, named: $jsonValue['named'] as bool),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfBoolToJson(
+  SimpleClassNullableOfBool instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfBoolNullable _$SimpleClassOfBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfBoolNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as bool?, named: $jsonValue['named'] as bool?),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfBoolNullableToJson(
+  SimpleClassOfBoolNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfBoolNullable _$SimpleClassNullableOfBoolNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBoolNullable(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as bool?, named: $jsonValue['named'] as bool?),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfBoolNullableToJson(
+  SimpleClassNullableOfBoolNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfDateTime _$SimpleClassOfDateTimeFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTime(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      DateTime.parse($jsonValue[r'$1'] as String),
+      named: DateTime.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDateTimeToJson(
+  SimpleClassOfDateTime instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1.toIso8601String(),
+    'named': instance.value.named.toIso8601String(),
+  },
+};
+
+SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTime(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      DateTime.parse($jsonValue[r'$1'] as String),
+      named: DateTime.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDateTimeToJson(
+  SimpleClassNullableOfDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1.toIso8601String(),
+          'named': instance.value!.named.toIso8601String(),
+        },
+};
+
+SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      $jsonValue[r'$1'] == null
+          ? null
+          : DateTime.parse($jsonValue[r'$1'] as String),
+      named: $jsonValue['named'] == null
+          ? null
+          : DateTime.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDateTimeNullableToJson(
+  SimpleClassOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1?.toIso8601String(),
+    'named': instance.value.named?.toIso8601String(),
+  },
+};
+
+SimpleClassNullableOfDateTimeNullable
+_$SimpleClassNullableOfDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeNullable(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => (
+          $jsonValue[r'$1'] == null
+              ? null
+              : DateTime.parse($jsonValue[r'$1'] as String),
+          named: $jsonValue['named'] == null
+              ? null
+              : DateTime.parse($jsonValue['named'] as String),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfDateTimeNullableToJson(
+  SimpleClassNullableOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1?.toIso8601String(),
+          'named': instance.value!.named?.toIso8601String(),
+        },
+};
+
+SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfDouble(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toDouble(),
+          named: ($jsonValue['named'] as num).toDouble(),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfDoubleToJson(
+  SimpleClassOfDouble instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfDouble _$SimpleClassNullableOfDoubleFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDouble(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      ($jsonValue[r'$1'] as num).toDouble(),
+      named: ($jsonValue['named'] as num).toDouble(),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDoubleToJson(
+  SimpleClassNullableOfDouble instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfDoubleNullable _$SimpleClassOfDoubleNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDoubleNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      ($jsonValue[r'$1'] as num?)?.toDouble(),
+      named: ($jsonValue['named'] as num?)?.toDouble(),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDoubleNullableToJson(
+  SimpleClassOfDoubleNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfDoubleNullable
+_$SimpleClassNullableOfDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDoubleNullable(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num?)?.toDouble(),
+          named: ($jsonValue['named'] as num?)?.toDouble(),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfDoubleNullableToJson(
+  SimpleClassNullableOfDoubleNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfDuration _$SimpleClassOfDurationFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDuration(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      Duration(microseconds: ($jsonValue[r'$1'] as num).toInt()),
+      named: Duration(microseconds: ($jsonValue['named'] as num).toInt()),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDurationToJson(
+  SimpleClassOfDuration instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1.inMicroseconds,
+    'named': instance.value.named.inMicroseconds,
+  },
+};
+
+SimpleClassNullableOfDuration _$SimpleClassNullableOfDurationFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDuration(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      Duration(microseconds: ($jsonValue[r'$1'] as num).toInt()),
+      named: Duration(microseconds: ($jsonValue['named'] as num).toInt()),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDurationToJson(
+  SimpleClassNullableOfDuration instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1.inMicroseconds,
+          'named': instance.value!.named.inMicroseconds,
+        },
+};
+
+SimpleClassOfDurationNullable _$SimpleClassOfDurationNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDurationNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      $jsonValue[r'$1'] == null
+          ? null
+          : Duration(microseconds: ($jsonValue[r'$1'] as num).toInt()),
+      named: $jsonValue['named'] == null
+          ? null
+          : Duration(microseconds: ($jsonValue['named'] as num).toInt()),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDurationNullableToJson(
+  SimpleClassOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1?.inMicroseconds,
+    'named': instance.value.named?.inMicroseconds,
+  },
+};
+
+SimpleClassNullableOfDurationNullable
+_$SimpleClassNullableOfDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDurationNullable(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => (
+          $jsonValue[r'$1'] == null
+              ? null
+              : Duration(microseconds: ($jsonValue[r'$1'] as num).toInt()),
+          named: $jsonValue['named'] == null
+              ? null
+              : Duration(microseconds: ($jsonValue['named'] as num).toInt()),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfDurationNullableToJson(
+  SimpleClassNullableOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1?.inMicroseconds,
+          'named': instance.value!.named?.inMicroseconds,
+        },
+};
+
+SimpleClassOfDynamic _$SimpleClassOfDynamicFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamic(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => ($jsonValue[r'$1'], named: $jsonValue['named']),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfDynamicToJson(
+  SimpleClassOfDynamic instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfDynamic _$SimpleClassNullableOfDynamicFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamic(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => ($jsonValue[r'$1'], named: $jsonValue['named']),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfDynamicToJson(
+  SimpleClassNullableOfDynamic instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfEnumType _$SimpleClassOfEnumTypeFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumType(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      $enumDecode(_$EnumTypeEnumMap, $jsonValue[r'$1']),
+      named: $enumDecode(_$EnumTypeEnumMap, $jsonValue['named']),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfEnumTypeToJson(
+  SimpleClassOfEnumType instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': _$EnumTypeEnumMap[instance.value.$1]!,
+    'named': _$EnumTypeEnumMap[instance.value.named]!,
+  },
+};
+
+const _$EnumTypeEnumMap = {
+  EnumType.alpha: 'alpha',
+  EnumType.beta: 'beta',
+  EnumType.gamma: 'gamma',
+  EnumType.delta: 'delta',
+};
+
+SimpleClassNullableOfEnumType _$SimpleClassNullableOfEnumTypeFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumType(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      $enumDecode(_$EnumTypeEnumMap, $jsonValue[r'$1']),
+      named: $enumDecode(_$EnumTypeEnumMap, $jsonValue['named']),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToJson(
+  SimpleClassNullableOfEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': _$EnumTypeEnumMap[instance.value!.$1]!,
+          'named': _$EnumTypeEnumMap[instance.value!.named]!,
+        },
+};
+
+SimpleClassOfEnumTypeNullable _$SimpleClassOfEnumTypeNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      $enumDecodeNullable(_$EnumTypeEnumMap, $jsonValue[r'$1']),
+      named: $enumDecodeNullable(_$EnumTypeEnumMap, $jsonValue['named']),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfEnumTypeNullableToJson(
+  SimpleClassOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': _$EnumTypeEnumMap[instance.value.$1],
+    'named': _$EnumTypeEnumMap[instance.value.named],
+  },
+};
+
+SimpleClassNullableOfEnumTypeNullable
+_$SimpleClassNullableOfEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeNullable(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => (
+          $enumDecodeNullable(_$EnumTypeEnumMap, $jsonValue[r'$1']),
+          named: $enumDecodeNullable(_$EnumTypeEnumMap, $jsonValue['named']),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfEnumTypeNullableToJson(
+  SimpleClassNullableOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': _$EnumTypeEnumMap[instance.value!.$1],
+          'named': _$EnumTypeEnumMap[instance.value!.named],
+        },
+};
+
+SimpleClassOfFromJsonDynamicParam _$SimpleClassOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonDynamicParam(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      FromJsonDynamicParam.fromJson($jsonValue[r'$1']),
+      named: FromJsonDynamicParam.fromJson($jsonValue['named']),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonDynamicParamToJson(
+  SimpleClassOfFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfFromJsonDynamicParam
+_$SimpleClassNullableOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonDynamicParam(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      FromJsonDynamicParam.fromJson($jsonValue[r'$1']),
+      named: FromJsonDynamicParam.fromJson($jsonValue['named']),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonDynamicParamToJson(
+  SimpleClassNullableOfFromJsonDynamicParam instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfFromJsonNullableObjectParam
+_$SimpleClassOfFromJsonNullableObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfFromJsonNullableObjectParam(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) => (
+          FromJsonNullableObjectParam.fromJson($jsonValue[r'$1']),
+          named: FromJsonNullableObjectParam.fromJson($jsonValue['named']),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfFromJsonNullableObjectParamToJson(
+  SimpleClassOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfFromJsonNullableObjectParam
+_$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonNullableObjectParam(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      FromJsonNullableObjectParam.fromJson($jsonValue[r'$1']),
+      named: FromJsonNullableObjectParam.fromJson($jsonValue['named']),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfFromJsonObjectParam _$SimpleClassOfFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonObjectParam(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      FromJsonObjectParam.fromJson($jsonValue[r'$1'] as Object),
+      named: FromJsonObjectParam.fromJson($jsonValue['named'] as Object),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonObjectParamToJson(
+  SimpleClassOfFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfFromJsonObjectParam
+_$SimpleClassNullableOfFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfFromJsonObjectParam(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => (
+          FromJsonObjectParam.fromJson($jsonValue[r'$1'] as Object),
+          named: FromJsonObjectParam.fromJson($jsonValue['named'] as Object),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonObjectParamToJson(
+  SimpleClassNullableOfFromJsonObjectParam instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfInt _$SimpleClassOfIntFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfInt(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          named: ($jsonValue['named'] as num).toInt(),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfIntToJson(SimpleClassOfInt instance) =>
+    <String, dynamic>{
+      'value': <String, dynamic>{
+        r'$1': instance.value.$1,
+        'named': instance.value.named,
+      },
+    };
+
+SimpleClassNullableOfInt _$SimpleClassNullableOfIntFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfInt(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      ($jsonValue[r'$1'] as num).toInt(),
+      named: ($jsonValue['named'] as num).toInt(),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfIntToJson(
+  SimpleClassNullableOfInt instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfIntNullable _$SimpleClassOfIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfIntNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      ($jsonValue[r'$1'] as num?)?.toInt(),
+      named: ($jsonValue['named'] as num?)?.toInt(),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfIntNullableToJson(
+  SimpleClassOfIntNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfIntNullable _$SimpleClassNullableOfIntNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntNullable(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      ($jsonValue[r'$1'] as num?)?.toInt(),
+      named: ($jsonValue['named'] as num?)?.toInt(),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfIntNullableToJson(
+  SimpleClassNullableOfIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfNum _$SimpleClassOfNumFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfNum(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) =>
+            ($jsonValue[r'$1'] as num, named: $jsonValue['named'] as num),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfNumToJson(SimpleClassOfNum instance) =>
+    <String, dynamic>{
+      'value': <String, dynamic>{
+        r'$1': instance.value.$1,
+        'named': instance.value.named,
+      },
+    };
+
+SimpleClassNullableOfNum _$SimpleClassNullableOfNumFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNum(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as num, named: $jsonValue['named'] as num),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfNumToJson(
+  SimpleClassNullableOfNum instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfNumNullable _$SimpleClassOfNumNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfNumNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as num?, named: $jsonValue['named'] as num?),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfNumNullableToJson(
+  SimpleClassOfNumNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfNumNullable _$SimpleClassNullableOfNumNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNumNullable(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as num?, named: $jsonValue['named'] as num?),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfNumNullableToJson(
+  SimpleClassNullableOfNumNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfObject _$SimpleClassOfObjectFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfObject(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) =>
+            ($jsonValue[r'$1'] as Object, named: $jsonValue['named'] as Object),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfObjectToJson(
+  SimpleClassOfObject instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfObject _$SimpleClassNullableOfObjectFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObject(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as Object, named: $jsonValue['named'] as Object),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfObjectToJson(
+  SimpleClassNullableOfObject instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfObjectNullable _$SimpleClassOfObjectNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => ($jsonValue[r'$1'], named: $jsonValue['named']),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfObjectNullableToJson(
+  SimpleClassOfObjectNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfObjectNullable
+_$SimpleClassNullableOfObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectNullable(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => ($jsonValue[r'$1'], named: $jsonValue['named']),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfObjectNullableToJson(
+  SimpleClassNullableOfObjectNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfRecord _$SimpleClassOfRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfRecord(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) => (
+          _$recordConvert(
+            $jsonValue[r'$1'],
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+          named: _$recordConvert(
+            $jsonValue['named'],
+            ($jsonValue) => (
+              ($jsonValue[r'$1'] as num).toInt(),
+              $jsonValue[r'$2'] as String,
+              truth: $jsonValue['truth'] as bool,
+            ),
+          ),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfRecordToJson(
+  SimpleClassOfRecord instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': <String, dynamic>{
+      r'$1': instance.value.$1.$1,
+      r'$2': instance.value.$1.$2,
+      'truth': instance.value.$1.truth,
+    },
+    'named': <String, dynamic>{
+      r'$1': instance.value.named.$1,
+      r'$2': instance.value.named.$2,
+      'truth': instance.value.named.truth,
+    },
+  },
+};
+
+SimpleClassNullableOfRecord _$SimpleClassNullableOfRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfRecord(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      _$recordConvert(
+        $jsonValue[r'$1'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+      named: _$recordConvert(
+        $jsonValue['named'],
+        ($jsonValue) => (
+          ($jsonValue[r'$1'] as num).toInt(),
+          $jsonValue[r'$2'] as String,
+          truth: $jsonValue['truth'] as bool,
+        ),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfRecordToJson(
+  SimpleClassNullableOfRecord instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': <String, dynamic>{
+            r'$1': instance.value!.$1.$1,
+            r'$2': instance.value!.$1.$2,
+            'truth': instance.value!.$1.truth,
+          },
+          'named': <String, dynamic>{
+            r'$1': instance.value!.named.$1,
+            r'$2': instance.value!.named.$2,
+            'truth': instance.value!.named.truth,
+          },
+        },
+};
+
+SimpleClassOfString _$SimpleClassOfStringFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfString(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) =>
+            ($jsonValue[r'$1'] as String, named: $jsonValue['named'] as String),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfStringToJson(
+  SimpleClassOfString instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfString _$SimpleClassNullableOfStringFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfString(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as String, named: $jsonValue['named'] as String),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfStringToJson(
+  SimpleClassNullableOfString instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfStringNullable _$SimpleClassOfStringNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfStringNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) =>
+        ($jsonValue[r'$1'] as String?, named: $jsonValue['named'] as String?),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfStringNullableToJson(
+  SimpleClassOfStringNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1,
+    'named': instance.value.named,
+  },
+};
+
+SimpleClassNullableOfStringNullable
+_$SimpleClassNullableOfStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringNullable(
+      _$recordConvertNullable(
+        json['value'],
+        ($jsonValue) => (
+          $jsonValue[r'$1'] as String?,
+          named: $jsonValue['named'] as String?,
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfStringNullableToJson(
+  SimpleClassNullableOfStringNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1,
+          'named': instance.value!.named,
+        },
+};
+
+SimpleClassOfUri _$SimpleClassOfUriFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfUri(
+      _$recordConvert(
+        json['value'],
+        ($jsonValue) => (
+          Uri.parse($jsonValue[r'$1'] as String),
+          named: Uri.parse($jsonValue['named'] as String),
+        ),
+      ),
+    );
+
+Map<String, dynamic> _$SimpleClassOfUriToJson(SimpleClassOfUri instance) =>
+    <String, dynamic>{
+      'value': <String, dynamic>{
+        r'$1': instance.value.$1.toString(),
+        'named': instance.value.named.toString(),
+      },
+    };
+
+SimpleClassNullableOfUri _$SimpleClassNullableOfUriFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUri(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      Uri.parse($jsonValue[r'$1'] as String),
+      named: Uri.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfUriToJson(
+  SimpleClassNullableOfUri instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1.toString(),
+          'named': instance.value!.named.toString(),
+        },
+};
+
+SimpleClassOfUriNullable _$SimpleClassOfUriNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfUriNullable(
+  _$recordConvert(
+    json['value'],
+    ($jsonValue) => (
+      $jsonValue[r'$1'] == null ? null : Uri.parse($jsonValue[r'$1'] as String),
+      named: $jsonValue['named'] == null
+          ? null
+          : Uri.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassOfUriNullableToJson(
+  SimpleClassOfUriNullable instance,
+) => <String, dynamic>{
+  'value': <String, dynamic>{
+    r'$1': instance.value.$1?.toString(),
+    'named': instance.value.named?.toString(),
+  },
+};
+
+SimpleClassNullableOfUriNullable _$SimpleClassNullableOfUriNullableFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriNullable(
+  _$recordConvertNullable(
+    json['value'],
+    ($jsonValue) => (
+      $jsonValue[r'$1'] == null ? null : Uri.parse($jsonValue[r'$1'] as String),
+      named: $jsonValue['named'] == null
+          ? null
+          : Uri.parse($jsonValue['named'] as String),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfUriNullableToJson(
+  SimpleClassNullableOfUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value == null
+      ? null
+      : <String, dynamic>{
+          r'$1': instance.value!.$1?.toString(),
+          'named': instance.value!.named?.toString(),
+        },
+};
diff --git a/json_serializable/test/supported_types/input.type_set.dart b/json_serializable/test/supported_types/input.type_set.dart
index 8e74fb7c2..f22d10928 100644
--- a/json_serializable/test/supported_types/input.type_set.dart
+++ b/json_serializable/test/supported_types/input.type_set.dart
@@ -14,10 +14,7 @@ class SimpleClass {
   @JsonKey(defaultValue: {42, true, false, null})
   Set withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -32,10 +29,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: {42, true, false, null})
   Set? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
@@ -47,9 +41,7 @@ class SimpleClassNullable {
 class SimpleClassOfBigInt {
   final Set<BigInt> value;
 
-  SimpleClassOfBigInt(
-    this.value,
-  );
+  SimpleClassOfBigInt(this.value);
 
   factory SimpleClassOfBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntFromJson(json);
@@ -61,9 +53,7 @@ class SimpleClassOfBigInt {
 class SimpleClassNullableOfBigInt {
   final Set<BigInt>? value;
 
-  SimpleClassNullableOfBigInt(
-    this.value,
-  );
+  SimpleClassNullableOfBigInt(this.value);
 
   factory SimpleClassNullableOfBigInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfBigIntFromJson(json);
@@ -75,9 +65,7 @@ class SimpleClassNullableOfBigInt {
 class SimpleClassOfBigIntNullable {
   final Set<BigInt?> value;
 
-  SimpleClassOfBigIntNullable(
-    this.value,
-  );
+  SimpleClassOfBigIntNullable(this.value);
 
   factory SimpleClassOfBigIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBigIntNullableFromJson(json);
@@ -89,13 +77,11 @@ class SimpleClassOfBigIntNullable {
 class SimpleClassNullableOfBigIntNullable {
   final Set<BigInt?>? value;
 
-  SimpleClassNullableOfBigIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBigIntNullable(this.value);
 
   factory SimpleClassNullableOfBigIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBigIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBigIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBigIntNullableToJson(this);
@@ -105,9 +91,7 @@ class SimpleClassNullableOfBigIntNullable {
 class SimpleClassOfBool {
   final Set<bool> value;
 
-  SimpleClassOfBool(
-    this.value,
-  );
+  SimpleClassOfBool(this.value);
 
   factory SimpleClassOfBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBoolFromJson(json);
@@ -119,9 +103,7 @@ class SimpleClassOfBool {
 class SimpleClassNullableOfBool {
   final Set<bool>? value;
 
-  SimpleClassNullableOfBool(
-    this.value,
-  );
+  SimpleClassNullableOfBool(this.value);
 
   factory SimpleClassNullableOfBool.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfBoolFromJson(json);
@@ -133,9 +115,7 @@ class SimpleClassNullableOfBool {
 class SimpleClassOfBoolNullable {
   final Set<bool?> value;
 
-  SimpleClassOfBoolNullable(
-    this.value,
-  );
+  SimpleClassOfBoolNullable(this.value);
 
   factory SimpleClassOfBoolNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfBoolNullableFromJson(json);
@@ -147,13 +127,11 @@ class SimpleClassOfBoolNullable {
 class SimpleClassNullableOfBoolNullable {
   final Set<bool?>? value;
 
-  SimpleClassNullableOfBoolNullable(
-    this.value,
-  );
+  SimpleClassNullableOfBoolNullable(this.value);
 
   factory SimpleClassNullableOfBoolNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfBoolNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfBoolNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfBoolNullableToJson(this);
@@ -163,9 +141,7 @@ class SimpleClassNullableOfBoolNullable {
 class SimpleClassOfDateTime {
   final Set<DateTime> value;
 
-  SimpleClassOfDateTime(
-    this.value,
-  );
+  SimpleClassOfDateTime(this.value);
 
   factory SimpleClassOfDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeFromJson(json);
@@ -177,9 +153,7 @@ class SimpleClassOfDateTime {
 class SimpleClassNullableOfDateTime {
   final Set<DateTime>? value;
 
-  SimpleClassNullableOfDateTime(
-    this.value,
-  );
+  SimpleClassNullableOfDateTime(this.value);
 
   factory SimpleClassNullableOfDateTime.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDateTimeFromJson(json);
@@ -191,9 +165,7 @@ class SimpleClassNullableOfDateTime {
 class SimpleClassOfDateTimeNullable {
   final Set<DateTime?> value;
 
-  SimpleClassOfDateTimeNullable(
-    this.value,
-  );
+  SimpleClassOfDateTimeNullable(this.value);
 
   factory SimpleClassOfDateTimeNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDateTimeNullableFromJson(json);
@@ -205,13 +177,11 @@ class SimpleClassOfDateTimeNullable {
 class SimpleClassNullableOfDateTimeNullable {
   final Set<DateTime?>? value;
 
-  SimpleClassNullableOfDateTimeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDateTimeNullable(this.value);
 
   factory SimpleClassNullableOfDateTimeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDateTimeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDateTimeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDateTimeNullableToJson(this);
@@ -221,9 +191,7 @@ class SimpleClassNullableOfDateTimeNullable {
 class SimpleClassOfDouble {
   final Set<double> value;
 
-  SimpleClassOfDouble(
-    this.value,
-  );
+  SimpleClassOfDouble(this.value);
 
   factory SimpleClassOfDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDoubleFromJson(json);
@@ -235,9 +203,7 @@ class SimpleClassOfDouble {
 class SimpleClassNullableOfDouble {
   final Set<double>? value;
 
-  SimpleClassNullableOfDouble(
-    this.value,
-  );
+  SimpleClassNullableOfDouble(this.value);
 
   factory SimpleClassNullableOfDouble.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDoubleFromJson(json);
@@ -249,9 +215,7 @@ class SimpleClassNullableOfDouble {
 class SimpleClassOfDoubleNullable {
   final Set<double?> value;
 
-  SimpleClassOfDoubleNullable(
-    this.value,
-  );
+  SimpleClassOfDoubleNullable(this.value);
 
   factory SimpleClassOfDoubleNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDoubleNullableFromJson(json);
@@ -263,13 +227,11 @@ class SimpleClassOfDoubleNullable {
 class SimpleClassNullableOfDoubleNullable {
   final Set<double?>? value;
 
-  SimpleClassNullableOfDoubleNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDoubleNullable(this.value);
 
   factory SimpleClassNullableOfDoubleNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDoubleNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDoubleNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDoubleNullableToJson(this);
@@ -279,9 +241,7 @@ class SimpleClassNullableOfDoubleNullable {
 class SimpleClassOfDuration {
   final Set<Duration> value;
 
-  SimpleClassOfDuration(
-    this.value,
-  );
+  SimpleClassOfDuration(this.value);
 
   factory SimpleClassOfDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDurationFromJson(json);
@@ -293,9 +253,7 @@ class SimpleClassOfDuration {
 class SimpleClassNullableOfDuration {
   final Set<Duration>? value;
 
-  SimpleClassNullableOfDuration(
-    this.value,
-  );
+  SimpleClassNullableOfDuration(this.value);
 
   factory SimpleClassNullableOfDuration.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDurationFromJson(json);
@@ -307,9 +265,7 @@ class SimpleClassNullableOfDuration {
 class SimpleClassOfDurationNullable {
   final Set<Duration?> value;
 
-  SimpleClassOfDurationNullable(
-    this.value,
-  );
+  SimpleClassOfDurationNullable(this.value);
 
   factory SimpleClassOfDurationNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDurationNullableFromJson(json);
@@ -321,13 +277,11 @@ class SimpleClassOfDurationNullable {
 class SimpleClassNullableOfDurationNullable {
   final Set<Duration?>? value;
 
-  SimpleClassNullableOfDurationNullable(
-    this.value,
-  );
+  SimpleClassNullableOfDurationNullable(this.value);
 
   factory SimpleClassNullableOfDurationNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfDurationNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfDurationNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfDurationNullableToJson(this);
@@ -337,9 +291,7 @@ class SimpleClassNullableOfDurationNullable {
 class SimpleClassOfDynamic {
   final Set<dynamic> value;
 
-  SimpleClassOfDynamic(
-    this.value,
-  );
+  SimpleClassOfDynamic(this.value);
 
   factory SimpleClassOfDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfDynamicFromJson(json);
@@ -351,9 +303,7 @@ class SimpleClassOfDynamic {
 class SimpleClassNullableOfDynamic {
   final Set<dynamic>? value;
 
-  SimpleClassNullableOfDynamic(
-    this.value,
-  );
+  SimpleClassNullableOfDynamic(this.value);
 
   factory SimpleClassNullableOfDynamic.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfDynamicFromJson(json);
@@ -365,9 +315,7 @@ class SimpleClassNullableOfDynamic {
 class SimpleClassOfEnumType {
   final Set<EnumType> value;
 
-  SimpleClassOfEnumType(
-    this.value,
-  );
+  SimpleClassOfEnumType(this.value);
 
   factory SimpleClassOfEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeFromJson(json);
@@ -379,9 +327,7 @@ class SimpleClassOfEnumType {
 class SimpleClassNullableOfEnumType {
   final Set<EnumType>? value;
 
-  SimpleClassNullableOfEnumType(
-    this.value,
-  );
+  SimpleClassNullableOfEnumType(this.value);
 
   factory SimpleClassNullableOfEnumType.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfEnumTypeFromJson(json);
@@ -393,9 +339,7 @@ class SimpleClassNullableOfEnumType {
 class SimpleClassOfEnumTypeNullable {
   final Set<EnumType?> value;
 
-  SimpleClassOfEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassOfEnumTypeNullable(this.value);
 
   factory SimpleClassOfEnumTypeNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfEnumTypeNullableFromJson(json);
@@ -407,25 +351,105 @@ class SimpleClassOfEnumTypeNullable {
 class SimpleClassNullableOfEnumTypeNullable {
   final Set<EnumType?>? value;
 
-  SimpleClassNullableOfEnumTypeNullable(
-    this.value,
-  );
+  SimpleClassNullableOfEnumTypeNullable(this.value);
 
   factory SimpleClassNullableOfEnumTypeNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfEnumTypeNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfEnumTypeNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfEnumTypeNullableToJson(this);
 }
 
+@JsonSerializable()
+class SimpleClassOfFromJsonDynamicParam {
+  final Set<FromJsonDynamicParam> value;
+
+  SimpleClassOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonDynamicParam {
+  final Set<FromJsonDynamicParam>? value;
+
+  SimpleClassNullableOfFromJsonDynamicParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonDynamicParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonDynamicParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonDynamicParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfFromJsonNullableObjectParam {
+  final Set<FromJsonNullableObjectParam> value;
+
+  SimpleClassOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonNullableObjectParam {
+  final Set<FromJsonNullableObjectParam>? value;
+
+  SimpleClassNullableOfFromJsonNullableObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonNullableObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassOfFromJsonObjectParam {
+  final Set<FromJsonObjectParam> value;
+
+  SimpleClassOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassOfFromJsonObjectParamToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfFromJsonObjectParam {
+  final Set<FromJsonObjectParam>? value;
+
+  SimpleClassNullableOfFromJsonObjectParam(this.value);
+
+  factory SimpleClassNullableOfFromJsonObjectParam.fromJson(
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfFromJsonObjectParamFromJson(json);
+
+  Map<String, Object?> toJson() =>
+      _$SimpleClassNullableOfFromJsonObjectParamToJson(this);
+}
+
 @JsonSerializable()
 class SimpleClassOfInt {
   final Set<int> value;
 
-  SimpleClassOfInt(
-    this.value,
-  );
+  SimpleClassOfInt(this.value);
 
   factory SimpleClassOfInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntFromJson(json);
@@ -437,9 +461,7 @@ class SimpleClassOfInt {
 class SimpleClassNullableOfInt {
   final Set<int>? value;
 
-  SimpleClassNullableOfInt(
-    this.value,
-  );
+  SimpleClassNullableOfInt(this.value);
 
   factory SimpleClassNullableOfInt.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfIntFromJson(json);
@@ -451,9 +473,7 @@ class SimpleClassNullableOfInt {
 class SimpleClassOfIntNullable {
   final Set<int?> value;
 
-  SimpleClassOfIntNullable(
-    this.value,
-  );
+  SimpleClassOfIntNullable(this.value);
 
   factory SimpleClassOfIntNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfIntNullableFromJson(json);
@@ -465,13 +485,11 @@ class SimpleClassOfIntNullable {
 class SimpleClassNullableOfIntNullable {
   final Set<int?>? value;
 
-  SimpleClassNullableOfIntNullable(
-    this.value,
-  );
+  SimpleClassNullableOfIntNullable(this.value);
 
   factory SimpleClassNullableOfIntNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfIntNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfIntNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfIntNullableToJson(this);
@@ -481,9 +499,7 @@ class SimpleClassNullableOfIntNullable {
 class SimpleClassOfNum {
   final Set<num> value;
 
-  SimpleClassOfNum(
-    this.value,
-  );
+  SimpleClassOfNum(this.value);
 
   factory SimpleClassOfNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfNumFromJson(json);
@@ -495,9 +511,7 @@ class SimpleClassOfNum {
 class SimpleClassNullableOfNum {
   final Set<num>? value;
 
-  SimpleClassNullableOfNum(
-    this.value,
-  );
+  SimpleClassNullableOfNum(this.value);
 
   factory SimpleClassNullableOfNum.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfNumFromJson(json);
@@ -509,9 +523,7 @@ class SimpleClassNullableOfNum {
 class SimpleClassOfNumNullable {
   final Set<num?> value;
 
-  SimpleClassOfNumNullable(
-    this.value,
-  );
+  SimpleClassOfNumNullable(this.value);
 
   factory SimpleClassOfNumNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfNumNullableFromJson(json);
@@ -523,13 +535,11 @@ class SimpleClassOfNumNullable {
 class SimpleClassNullableOfNumNullable {
   final Set<num?>? value;
 
-  SimpleClassNullableOfNumNullable(
-    this.value,
-  );
+  SimpleClassNullableOfNumNullable(this.value);
 
   factory SimpleClassNullableOfNumNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfNumNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfNumNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfNumNullableToJson(this);
@@ -539,9 +549,7 @@ class SimpleClassNullableOfNumNullable {
 class SimpleClassOfObject {
   final Set<Object> value;
 
-  SimpleClassOfObject(
-    this.value,
-  );
+  SimpleClassOfObject(this.value);
 
   factory SimpleClassOfObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectFromJson(json);
@@ -553,9 +561,7 @@ class SimpleClassOfObject {
 class SimpleClassNullableOfObject {
   final Set<Object>? value;
 
-  SimpleClassNullableOfObject(
-    this.value,
-  );
+  SimpleClassNullableOfObject(this.value);
 
   factory SimpleClassNullableOfObject.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfObjectFromJson(json);
@@ -567,9 +573,7 @@ class SimpleClassNullableOfObject {
 class SimpleClassOfObjectNullable {
   final Set<Object?> value;
 
-  SimpleClassOfObjectNullable(
-    this.value,
-  );
+  SimpleClassOfObjectNullable(this.value);
 
   factory SimpleClassOfObjectNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfObjectNullableFromJson(json);
@@ -581,25 +585,45 @@ class SimpleClassOfObjectNullable {
 class SimpleClassNullableOfObjectNullable {
   final Set<Object?>? value;
 
-  SimpleClassNullableOfObjectNullable(
-    this.value,
-  );
+  SimpleClassNullableOfObjectNullable(this.value);
 
   factory SimpleClassNullableOfObjectNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfObjectNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfObjectNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfObjectNullableToJson(this);
 }
 
+@JsonSerializable()
+class SimpleClassOfRecord {
+  final Set<(int, String, {bool truth})> value;
+
+  SimpleClassOfRecord(this.value);
+
+  factory SimpleClassOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassOfRecordToJson(this);
+}
+
+@JsonSerializable()
+class SimpleClassNullableOfRecord {
+  final Set<(int, String, {bool truth})>? value;
+
+  SimpleClassNullableOfRecord(this.value);
+
+  factory SimpleClassNullableOfRecord.fromJson(Map<String, Object?> json) =>
+      _$SimpleClassNullableOfRecordFromJson(json);
+
+  Map<String, Object?> toJson() => _$SimpleClassNullableOfRecordToJson(this);
+}
+
 @JsonSerializable()
 class SimpleClassOfString {
   final Set<String> value;
 
-  SimpleClassOfString(
-    this.value,
-  );
+  SimpleClassOfString(this.value);
 
   factory SimpleClassOfString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringFromJson(json);
@@ -611,9 +635,7 @@ class SimpleClassOfString {
 class SimpleClassNullableOfString {
   final Set<String>? value;
 
-  SimpleClassNullableOfString(
-    this.value,
-  );
+  SimpleClassNullableOfString(this.value);
 
   factory SimpleClassNullableOfString.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfStringFromJson(json);
@@ -625,9 +647,7 @@ class SimpleClassNullableOfString {
 class SimpleClassOfStringNullable {
   final Set<String?> value;
 
-  SimpleClassOfStringNullable(
-    this.value,
-  );
+  SimpleClassOfStringNullable(this.value);
 
   factory SimpleClassOfStringNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfStringNullableFromJson(json);
@@ -639,13 +659,11 @@ class SimpleClassOfStringNullable {
 class SimpleClassNullableOfStringNullable {
   final Set<String?>? value;
 
-  SimpleClassNullableOfStringNullable(
-    this.value,
-  );
+  SimpleClassNullableOfStringNullable(this.value);
 
   factory SimpleClassNullableOfStringNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfStringNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfStringNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfStringNullableToJson(this);
@@ -655,9 +673,7 @@ class SimpleClassNullableOfStringNullable {
 class SimpleClassOfUri {
   final Set<Uri> value;
 
-  SimpleClassOfUri(
-    this.value,
-  );
+  SimpleClassOfUri(this.value);
 
   factory SimpleClassOfUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriFromJson(json);
@@ -669,9 +685,7 @@ class SimpleClassOfUri {
 class SimpleClassNullableOfUri {
   final Set<Uri>? value;
 
-  SimpleClassNullableOfUri(
-    this.value,
-  );
+  SimpleClassNullableOfUri(this.value);
 
   factory SimpleClassNullableOfUri.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableOfUriFromJson(json);
@@ -683,9 +697,7 @@ class SimpleClassNullableOfUri {
 class SimpleClassOfUriNullable {
   final Set<Uri?> value;
 
-  SimpleClassOfUriNullable(
-    this.value,
-  );
+  SimpleClassOfUriNullable(this.value);
 
   factory SimpleClassOfUriNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassOfUriNullableFromJson(json);
@@ -697,13 +709,11 @@ class SimpleClassOfUriNullable {
 class SimpleClassNullableOfUriNullable {
   final Set<Uri?>? value;
 
-  SimpleClassNullableOfUriNullable(
-    this.value,
-  );
+  SimpleClassNullableOfUriNullable(this.value);
 
   factory SimpleClassNullableOfUriNullable.fromJson(
-          Map<String, Object?> json) =>
-      _$SimpleClassNullableOfUriNullableFromJson(json);
+    Map<String, Object?> json,
+  ) => _$SimpleClassNullableOfUriNullableFromJson(json);
 
   Map<String, Object?> toJson() =>
       _$SimpleClassNullableOfUriNullableToJson(this);
diff --git a/json_serializable/test/supported_types/input.type_set.g.dart b/json_serializable/test/supported_types/input.type_set.g.dart
index a028e2791..f7100e175 100644
--- a/json_serializable/test/supported_types/input.type_set.g.dart
+++ b/json_serializable/test/supported_types/input.type_set.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_set.dart';
 
@@ -9,10 +9,9 @@ part of 'input.type_set.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      (json['value'] as List<dynamic>).toSet(),
-      (json['withDefault'] as List<dynamic>?)?.toSet() ??
-          {42, true, false, null},
-    );
+  (json['value'] as List<dynamic>).toSet(),
+  (json['withDefault'] as List<dynamic>?)?.toSet() ?? {42, true, false, null},
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -28,11 +27,11 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-      'withDefault': instance.withDefault?.toList(),
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.toList(),
+  'withDefault': instance.withDefault?.toList(),
+};
 
 SimpleClassOfBigInt _$SimpleClassOfBigIntFromJson(Map<String, dynamic> json) =>
     SimpleClassOfBigInt(
@@ -42,52 +41,52 @@ SimpleClassOfBigInt _$SimpleClassOfBigIntFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfBigIntToJson(
-        SimpleClassOfBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.toString()).toList(),
-    };
+  SimpleClassOfBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.toString()).toList(),
+};
 
 SimpleClassNullableOfBigInt _$SimpleClassNullableOfBigIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBigInt(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => BigInt.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBigInt(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => BigInt.parse(e as String))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntToJson(
-        SimpleClassNullableOfBigInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toString()).toList(),
-    };
+  SimpleClassNullableOfBigInt instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toString()).toList(),
+};
 
 SimpleClassOfBigIntNullable _$SimpleClassOfBigIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBigIntNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : BigInt.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBigIntNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : BigInt.parse(e as String))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfBigIntNullableToJson(
-        SimpleClassOfBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassNullableOfBigIntNullable
-    _$SimpleClassNullableOfBigIntNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfBigIntNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : BigInt.parse(e as String))
-              .toSet(),
-        );
+_$SimpleClassNullableOfBigIntNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfBigIntNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => e == null ? null : BigInt.parse(e as String))
+          .toSet(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfBigIntNullableToJson(
-        SimpleClassNullableOfBigIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassNullableOfBigIntNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassOfBool _$SimpleClassOfBoolFromJson(Map<String, dynamic> json) =>
     SimpleClassOfBool(
@@ -95,102 +94,93 @@ SimpleClassOfBool _$SimpleClassOfBoolFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfBoolToJson(SimpleClassOfBool instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+    <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfBool _$SimpleClassNullableOfBoolFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBool(
-      (json['value'] as List<dynamic>?)?.map((e) => e as bool).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBool(
+  (json['value'] as List<dynamic>?)?.map((e) => e as bool).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBoolToJson(
-        SimpleClassNullableOfBool instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfBool instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfBoolNullable _$SimpleClassOfBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfBoolNullable(
-      (json['value'] as List<dynamic>).map((e) => e as bool?).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfBoolNullable(
+  (json['value'] as List<dynamic>).map((e) => e as bool?).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfBoolNullableToJson(
-        SimpleClassOfBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfBoolNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfBoolNullable _$SimpleClassNullableOfBoolNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfBoolNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as bool?).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfBoolNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => e as bool?).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfBoolNullableToJson(
-        SimpleClassNullableOfBoolNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfBoolNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfDateTime _$SimpleClassOfDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTime(
-      (json['value'] as List<dynamic>)
-          .map((e) => DateTime.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTime(
+  (json['value'] as List<dynamic>)
+      .map((e) => DateTime.parse(e as String))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeToJson(
-        SimpleClassOfDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.toIso8601String()).toList(),
-    };
+  SimpleClassOfDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.toIso8601String()).toList(),
+};
 
 SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDateTime(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => DateTime.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDateTime(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => DateTime.parse(e as String))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeToJson(
-        SimpleClassNullableOfDateTime instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toIso8601String()).toList(),
-    };
+  SimpleClassNullableOfDateTime instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toIso8601String()).toList(),
+};
 
 SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDateTimeNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : DateTime.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDateTimeNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : DateTime.parse(e as String))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDateTimeNullableToJson(
-        SimpleClassOfDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toIso8601String()).toList(),
-    };
+  SimpleClassOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toIso8601String()).toList(),
+};
 
 SimpleClassNullableOfDateTimeNullable
-    _$SimpleClassNullableOfDateTimeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDateTimeNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : DateTime.parse(e as String))
-              .toSet(),
-        );
+_$SimpleClassNullableOfDateTimeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDateTimeNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => e == null ? null : DateTime.parse(e as String))
+          .toSet(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDateTimeNullableToJson(
-        SimpleClassNullableOfDateTimeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toIso8601String()).toList(),
-    };
+  SimpleClassNullableOfDateTimeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toIso8601String()).toList(),
+};
 
 SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map<String, dynamic> json) =>
     SimpleClassOfDouble(
@@ -200,147 +190,129 @@ SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfDoubleToJson(
-        SimpleClassOfDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfDouble instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfDouble _$SimpleClassNullableOfDoubleFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDouble(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => (e as num).toDouble())
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDouble(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num).toDouble()).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDoubleToJson(
-        SimpleClassNullableOfDouble instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfDouble instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfDoubleNullable _$SimpleClassOfDoubleNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDoubleNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => (e as num?)?.toDouble())
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDoubleNullable(
+  (json['value'] as List<dynamic>).map((e) => (e as num?)?.toDouble()).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDoubleNullableToJson(
-        SimpleClassOfDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfDoubleNullable
-    _$SimpleClassNullableOfDoubleNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfDoubleNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => (e as num?)?.toDouble())
-              .toSet(),
-        );
+_$SimpleClassNullableOfDoubleNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDoubleNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => (e as num?)?.toDouble())
+          .toSet(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDoubleNullableToJson(
-        SimpleClassNullableOfDoubleNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfDoubleNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfDuration _$SimpleClassOfDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDuration(
-      (json['value'] as List<dynamic>)
-          .map((e) => Duration(microseconds: e as int))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDuration(
+  (json['value'] as List<dynamic>)
+      .map((e) => Duration(microseconds: (e as num).toInt()))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDurationToJson(
-        SimpleClassOfDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e.inMicroseconds).toList(),
-    };
+  SimpleClassOfDuration instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e.inMicroseconds).toList(),
+};
 
 SimpleClassNullableOfDuration _$SimpleClassNullableOfDurationFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDuration(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => Duration(microseconds: e as int))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDuration(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => Duration(microseconds: (e as num).toInt()))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfDurationToJson(
-        SimpleClassNullableOfDuration instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.inMicroseconds).toList(),
-    };
+  SimpleClassNullableOfDuration instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.inMicroseconds).toList(),
+};
 
 SimpleClassOfDurationNullable _$SimpleClassOfDurationNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDurationNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : Duration(microseconds: e as int))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDurationNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : Duration(microseconds: (e as num).toInt()))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfDurationNullableToJson(
-        SimpleClassOfDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.inMicroseconds).toList(),
-    };
+  SimpleClassOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.inMicroseconds).toList(),
+};
 
 SimpleClassNullableOfDurationNullable
-    _$SimpleClassNullableOfDurationNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfDurationNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => e == null ? null : Duration(microseconds: e as int))
-              .toSet(),
-        );
+_$SimpleClassNullableOfDurationNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfDurationNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map(
+            (e) =>
+                e == null ? null : Duration(microseconds: (e as num).toInt()),
+          )
+          .toSet(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfDurationNullableToJson(
-        SimpleClassNullableOfDurationNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.inMicroseconds).toList(),
-    };
+  SimpleClassNullableOfDurationNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.inMicroseconds).toList(),
+};
 
 SimpleClassOfDynamic _$SimpleClassOfDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfDynamic(
-      (json['value'] as List<dynamic>).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfDynamic((json['value'] as List<dynamic>).toSet());
 
 Map<String, dynamic> _$SimpleClassOfDynamicToJson(
-        SimpleClassOfDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfDynamic instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfDynamic _$SimpleClassNullableOfDynamicFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfDynamic(
-      (json['value'] as List<dynamic>?)?.toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfDynamic((json['value'] as List<dynamic>?)?.toSet());
 
 Map<String, dynamic> _$SimpleClassNullableOfDynamicToJson(
-        SimpleClassNullableOfDynamic instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfDynamic instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfEnumType _$SimpleClassOfEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumType(
-      (json['value'] as List<dynamic>)
-          .map((e) => $enumDecode(_$EnumTypeEnumMap, e))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumType(
+  (json['value'] as List<dynamic>)
+      .map((e) => $enumDecode(_$EnumTypeEnumMap, e))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeToJson(
-        SimpleClassOfEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassOfEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => _$EnumTypeEnumMap[e]!).toList(),
+};
 
 const _$EnumTypeEnumMap = {
   EnumType.alpha: 'alpha',
@@ -350,93 +322,154 @@ const _$EnumTypeEnumMap = {
 };
 
 SimpleClassNullableOfEnumType _$SimpleClassNullableOfEnumTypeFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfEnumType(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => $enumDecode(_$EnumTypeEnumMap, e))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfEnumType(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => $enumDecode(_$EnumTypeEnumMap, e))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeToJson(
-        SimpleClassNullableOfEnumType instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassNullableOfEnumType instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]!).toList(),
+};
 
 SimpleClassOfEnumTypeNullable _$SimpleClassOfEnumTypeNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfEnumTypeNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfEnumTypeNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfEnumTypeNullableToJson(
-        SimpleClassOfEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => _$EnumTypeEnumMap[e]).toList(),
+};
 
 SimpleClassNullableOfEnumTypeNullable
-    _$SimpleClassNullableOfEnumTypeNullableFromJson(
-            Map<String, dynamic> json) =>
-        SimpleClassNullableOfEnumTypeNullable(
-          (json['value'] as List<dynamic>?)
-              ?.map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
-              .toSet(),
-        );
+_$SimpleClassNullableOfEnumTypeNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfEnumTypeNullable(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => $enumDecodeNullable(_$EnumTypeEnumMap, e))
+          .toSet(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfEnumTypeNullableToJson(
-        SimpleClassNullableOfEnumTypeNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
-    };
+  SimpleClassNullableOfEnumTypeNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => _$EnumTypeEnumMap[e]).toList(),
+};
+
+SimpleClassOfFromJsonDynamicParam _$SimpleClassOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonDynamicParam(
+  (json['value'] as List<dynamic>).map(FromJsonDynamicParam.fromJson).toSet(),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonDynamicParamToJson(
+  SimpleClassOfFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value.toList()};
+
+SimpleClassNullableOfFromJsonDynamicParam
+_$SimpleClassNullableOfFromJsonDynamicParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonDynamicParam(
+  (json['value'] as List<dynamic>?)?.map(FromJsonDynamicParam.fromJson).toSet(),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonDynamicParamToJson(
+  SimpleClassNullableOfFromJsonDynamicParam instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
+
+SimpleClassOfFromJsonNullableObjectParam
+_$SimpleClassOfFromJsonNullableObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfFromJsonNullableObjectParam(
+      (json['value'] as List<dynamic>)
+          .map(FromJsonNullableObjectParam.fromJson)
+          .toSet(),
+    );
+
+Map<String, dynamic> _$SimpleClassOfFromJsonNullableObjectParamToJson(
+  SimpleClassOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value.toList()};
+
+SimpleClassNullableOfFromJsonNullableObjectParam
+_$SimpleClassNullableOfFromJsonNullableObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfFromJsonNullableObjectParam(
+  (json['value'] as List<dynamic>?)
+      ?.map(FromJsonNullableObjectParam.fromJson)
+      .toSet(),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonNullableObjectParamToJson(
+  SimpleClassNullableOfFromJsonNullableObjectParam instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
+
+SimpleClassOfFromJsonObjectParam _$SimpleClassOfFromJsonObjectParamFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassOfFromJsonObjectParam(
+  (json['value'] as List<dynamic>)
+      .map((e) => FromJsonObjectParam.fromJson(e as Object))
+      .toSet(),
+);
+
+Map<String, dynamic> _$SimpleClassOfFromJsonObjectParamToJson(
+  SimpleClassOfFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value.toList()};
+
+SimpleClassNullableOfFromJsonObjectParam
+_$SimpleClassNullableOfFromJsonObjectParamFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfFromJsonObjectParam(
+      (json['value'] as List<dynamic>?)
+          ?.map((e) => FromJsonObjectParam.fromJson(e as Object))
+          .toSet(),
+    );
+
+Map<String, dynamic> _$SimpleClassNullableOfFromJsonObjectParamToJson(
+  SimpleClassNullableOfFromJsonObjectParam instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfInt _$SimpleClassOfIntFromJson(Map<String, dynamic> json) =>
     SimpleClassOfInt(
-      (json['value'] as List<dynamic>).map((e) => e as int).toSet(),
+      (json['value'] as List<dynamic>).map((e) => (e as num).toInt()).toSet(),
     );
 
 Map<String, dynamic> _$SimpleClassOfIntToJson(SimpleClassOfInt instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+    <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfInt _$SimpleClassNullableOfIntFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfInt(
-      (json['value'] as List<dynamic>?)?.map((e) => e as int).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfInt(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num).toInt()).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntToJson(
-        SimpleClassNullableOfInt instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfInt instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfIntNullable _$SimpleClassOfIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfIntNullable(
-      (json['value'] as List<dynamic>).map((e) => e as int?).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfIntNullable(
+  (json['value'] as List<dynamic>).map((e) => (e as num?)?.toInt()).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfIntNullableToJson(
-        SimpleClassOfIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfIntNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfIntNullable _$SimpleClassNullableOfIntNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfIntNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as int?).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfIntNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => (e as num?)?.toInt()).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfIntNullableToJson(
-        SimpleClassNullableOfIntNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfIntNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfNum _$SimpleClassOfNumFromJson(Map<String, dynamic> json) =>
     SimpleClassOfNum(
@@ -444,45 +477,37 @@ SimpleClassOfNum _$SimpleClassOfNumFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfNumToJson(SimpleClassOfNum instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+    <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfNum _$SimpleClassNullableOfNumFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfNum(
-      (json['value'] as List<dynamic>?)?.map((e) => e as num).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNum(
+  (json['value'] as List<dynamic>?)?.map((e) => e as num).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfNumToJson(
-        SimpleClassNullableOfNum instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfNum instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfNumNullable _$SimpleClassOfNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfNumNullable(
-      (json['value'] as List<dynamic>).map((e) => e as num?).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfNumNullable(
+  (json['value'] as List<dynamic>).map((e) => e as num?).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfNumNullableToJson(
-        SimpleClassOfNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfNumNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfNumNullable _$SimpleClassNullableOfNumNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfNumNullable(
-      (json['value'] as List<dynamic>?)?.map((e) => e as num?).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfNumNullable(
+  (json['value'] as List<dynamic>?)?.map((e) => e as num?).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfNumNullableToJson(
-        SimpleClassNullableOfNumNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfNumNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfObject _$SimpleClassOfObjectFromJson(Map<String, dynamic> json) =>
     SimpleClassOfObject(
@@ -490,46 +515,90 @@ SimpleClassOfObject _$SimpleClassOfObjectFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfObjectToJson(
-        SimpleClassOfObject instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfObject instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfObject _$SimpleClassNullableOfObjectFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfObject(
-      (json['value'] as List<dynamic>?)?.map((e) => e as Object).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfObject(
+  (json['value'] as List<dynamic>?)?.map((e) => e as Object).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectToJson(
-        SimpleClassNullableOfObject instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfObject instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfObjectNullable _$SimpleClassOfObjectNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfObjectNullable(
-      (json['value'] as List<dynamic>).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfObjectNullable((json['value'] as List<dynamic>).toSet());
 
 Map<String, dynamic> _$SimpleClassOfObjectNullableToJson(
-        SimpleClassOfObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfObjectNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfObjectNullable
-    _$SimpleClassNullableOfObjectNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfObjectNullable(
-          (json['value'] as List<dynamic>?)?.toSet(),
-        );
+_$SimpleClassNullableOfObjectNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfObjectNullable(
+      (json['value'] as List<dynamic>?)?.toSet(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfObjectNullableToJson(
-        SimpleClassNullableOfObjectNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfObjectNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
+
+SimpleClassOfRecord _$SimpleClassOfRecordFromJson(Map<String, dynamic> json) =>
+    SimpleClassOfRecord(
+      (json['value'] as List<dynamic>)
+          .map(
+            (e) => _$recordConvert(
+              e,
+              ($jsonValue) => (
+                ($jsonValue[r'$1'] as num).toInt(),
+                $jsonValue[r'$2'] as String,
+                truth: $jsonValue['truth'] as bool,
+              ),
+            ),
+          )
+          .toSet(),
+    );
+
+Map<String, dynamic> _$SimpleClassOfRecordToJson(
+  SimpleClassOfRecord instance,
+) => <String, dynamic>{
+  'value': instance.value
+      .map((e) => <String, dynamic>{r'$1': e.$1, r'$2': e.$2, 'truth': e.truth})
+      .toList(),
+};
+
+$Rec _$recordConvert<$Rec>(Object? value, $Rec Function(Map) convert) =>
+    convert(value as Map<String, dynamic>);
+
+SimpleClassNullableOfRecord _$SimpleClassNullableOfRecordFromJson(
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfRecord(
+  (json['value'] as List<dynamic>?)
+      ?.map(
+        (e) => _$recordConvert(
+          e,
+          ($jsonValue) => (
+            ($jsonValue[r'$1'] as num).toInt(),
+            $jsonValue[r'$2'] as String,
+            truth: $jsonValue['truth'] as bool,
+          ),
+        ),
+      )
+      .toSet(),
+);
+
+Map<String, dynamic> _$SimpleClassNullableOfRecordToJson(
+  SimpleClassNullableOfRecord instance,
+) => <String, dynamic>{
+  'value': instance.value
+      ?.map(
+        (e) => <String, dynamic>{r'$1': e.$1, r'$2': e.$2, 'truth': e.truth},
+      )
+      .toList(),
+};
 
 SimpleClassOfString _$SimpleClassOfStringFromJson(Map<String, dynamic> json) =>
     SimpleClassOfString(
@@ -537,46 +606,38 @@ SimpleClassOfString _$SimpleClassOfStringFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassOfStringToJson(
-        SimpleClassOfString instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfString instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfString _$SimpleClassNullableOfStringFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfString(
-      (json['value'] as List<dynamic>?)?.map((e) => e as String).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfString(
+  (json['value'] as List<dynamic>?)?.map((e) => e as String).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfStringToJson(
-        SimpleClassNullableOfString instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfString instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfStringNullable _$SimpleClassOfStringNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfStringNullable(
-      (json['value'] as List<dynamic>).map((e) => e as String?).toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfStringNullable(
+  (json['value'] as List<dynamic>).map((e) => e as String?).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfStringNullableToJson(
-        SimpleClassOfStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.toList(),
-    };
+  SimpleClassOfStringNullable instance,
+) => <String, dynamic>{'value': instance.value.toList()};
 
 SimpleClassNullableOfStringNullable
-    _$SimpleClassNullableOfStringNullableFromJson(Map<String, dynamic> json) =>
-        SimpleClassNullableOfStringNullable(
-          (json['value'] as List<dynamic>?)?.map((e) => e as String?).toSet(),
-        );
+_$SimpleClassNullableOfStringNullableFromJson(Map<String, dynamic> json) =>
+    SimpleClassNullableOfStringNullable(
+      (json['value'] as List<dynamic>?)?.map((e) => e as String?).toSet(),
+    );
 
 Map<String, dynamic> _$SimpleClassNullableOfStringNullableToJson(
-        SimpleClassNullableOfStringNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toList(),
-    };
+  SimpleClassNullableOfStringNullable instance,
+) => <String, dynamic>{'value': instance.value?.toList()};
 
 SimpleClassOfUri _$SimpleClassOfUriFromJson(Map<String, dynamic> json) =>
     SimpleClassOfUri(
@@ -591,43 +652,41 @@ Map<String, dynamic> _$SimpleClassOfUriToJson(SimpleClassOfUri instance) =>
     };
 
 SimpleClassNullableOfUri _$SimpleClassNullableOfUriFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUri(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => Uri.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUri(
+  (json['value'] as List<dynamic>?)?.map((e) => Uri.parse(e as String)).toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriToJson(
-        SimpleClassNullableOfUri instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e.toString()).toList(),
-    };
+  SimpleClassNullableOfUri instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e.toString()).toList(),
+};
 
 SimpleClassOfUriNullable _$SimpleClassOfUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassOfUriNullable(
-      (json['value'] as List<dynamic>)
-          .map((e) => e == null ? null : Uri.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassOfUriNullable(
+  (json['value'] as List<dynamic>)
+      .map((e) => e == null ? null : Uri.parse(e as String))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassOfUriNullableToJson(
-        SimpleClassOfUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassOfUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value.map((e) => e?.toString()).toList(),
+};
 
 SimpleClassNullableOfUriNullable _$SimpleClassNullableOfUriNullableFromJson(
-        Map<String, dynamic> json) =>
-    SimpleClassNullableOfUriNullable(
-      (json['value'] as List<dynamic>?)
-          ?.map((e) => e == null ? null : Uri.parse(e as String))
-          .toSet(),
-    );
+  Map<String, dynamic> json,
+) => SimpleClassNullableOfUriNullable(
+  (json['value'] as List<dynamic>?)
+      ?.map((e) => e == null ? null : Uri.parse(e as String))
+      .toSet(),
+);
 
 Map<String, dynamic> _$SimpleClassNullableOfUriNullableToJson(
-        SimpleClassNullableOfUriNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.map((e) => e?.toString()).toList(),
-    };
+  SimpleClassNullableOfUriNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.map((e) => e?.toString()).toList(),
+};
diff --git a/json_serializable/test/supported_types/input.type_string.dart b/json_serializable/test/supported_types/input.type_string.dart
index d199b13c0..4931a3af1 100644
--- a/json_serializable/test/supported_types/input.type_string.dart
+++ b/json_serializable/test/supported_types/input.type_string.dart
@@ -13,10 +13,7 @@ class SimpleClass {
   @JsonKey(defaultValue: 'a string')
   String withDefault;
 
-  SimpleClass(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -31,10 +28,7 @@ class SimpleClassNullable {
   @JsonKey(defaultValue: 'a string')
   String? withDefault;
 
-  SimpleClassNullable(
-    this.value,
-    this.withDefault,
-  );
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
diff --git a/json_serializable/test/supported_types/input.type_string.g.dart b/json_serializable/test/supported_types/input.type_string.g.dart
index 648df335a..7e69d3b37 100644
--- a/json_serializable/test/supported_types/input.type_string.g.dart
+++ b/json_serializable/test/supported_types/input.type_string.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_string.dart';
 
@@ -9,9 +9,9 @@ part of 'input.type_string.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      json['value'] as String,
-      json['withDefault'] as String? ?? 'a string',
-    );
+  json['value'] as String,
+  json['withDefault'] as String? ?? 'a string',
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
@@ -26,8 +26,8 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value,
-      'withDefault': instance.withDefault,
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'withDefault': instance.withDefault,
+};
diff --git a/json_serializable/test/supported_types/input.type_uri.dart b/json_serializable/test/supported_types/input.type_uri.dart
index fe625bbff..86e13bbc1 100644
--- a/json_serializable/test/supported_types/input.type_uri.dart
+++ b/json_serializable/test/supported_types/input.type_uri.dart
@@ -10,9 +10,10 @@ part 'input.type_uri.g.dart';
 class SimpleClass {
   final Uri value;
 
-  SimpleClass(
-    this.value,
-  );
+  @JsonKey(defaultValue: _defaultValueFunc)
+  Uri withDefault;
+
+  SimpleClass(this.value, this.withDefault);
 
   factory SimpleClass.fromJson(Map<String, Object?> json) =>
       _$SimpleClassFromJson(json);
@@ -24,12 +25,15 @@ class SimpleClass {
 class SimpleClassNullable {
   final Uri? value;
 
-  SimpleClassNullable(
-    this.value,
-  );
+  @JsonKey(defaultValue: _defaultValueFunc)
+  Uri? withDefault;
+
+  SimpleClassNullable(this.value, this.withDefault);
 
   factory SimpleClassNullable.fromJson(Map<String, Object?> json) =>
       _$SimpleClassNullableFromJson(json);
 
   Map<String, Object?> toJson() => _$SimpleClassNullableToJson(this);
 }
+
+Uri _defaultValueFunc() => Uri.parse('https://example.com');
diff --git a/json_serializable/test/supported_types/input.type_uri.g.dart b/json_serializable/test/supported_types/input.type_uri.g.dart
index 9634819b7..33b5951d8 100644
--- a/json_serializable/test/supported_types/input.type_uri.g.dart
+++ b/json_serializable/test/supported_types/input.type_uri.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-// ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
 
 part of 'input.type_uri.dart';
 
@@ -9,21 +9,29 @@ part of 'input.type_uri.dart';
 // **************************************************************************
 
 SimpleClass _$SimpleClassFromJson(Map<String, dynamic> json) => SimpleClass(
-      Uri.parse(json['value'] as String),
-    );
+  Uri.parse(json['value'] as String),
+  json['withDefault'] == null
+      ? _defaultValueFunc()
+      : Uri.parse(json['withDefault'] as String),
+);
 
 Map<String, dynamic> _$SimpleClassToJson(SimpleClass instance) =>
     <String, dynamic>{
       'value': instance.value.toString(),
+      'withDefault': instance.withDefault.toString(),
     };
 
 SimpleClassNullable _$SimpleClassNullableFromJson(Map<String, dynamic> json) =>
     SimpleClassNullable(
       json['value'] == null ? null : Uri.parse(json['value'] as String),
+      json['withDefault'] == null
+          ? _defaultValueFunc()
+          : Uri.parse(json['withDefault'] as String),
     );
 
 Map<String, dynamic> _$SimpleClassNullableToJson(
-        SimpleClassNullable instance) =>
-    <String, dynamic>{
-      'value': instance.value?.toString(),
-    };
+  SimpleClassNullable instance,
+) => <String, dynamic>{
+  'value': instance.value?.toString(),
+  'withDefault': instance.withDefault?.toString(),
+};
diff --git a/json_serializable/test/supported_types/support_types_extra_tests.dart b/json_serializable/test/supported_types/support_types_extra_test.dart
similarity index 74%
rename from json_serializable/test/supported_types/support_types_extra_tests.dart
rename to json_serializable/test/supported_types/support_types_extra_test.dart
index 8ce83f390..ada23d236 100644
--- a/json_serializable/test/supported_types/support_types_extra_tests.dart
+++ b/json_serializable/test/supported_types/support_types_extra_test.dart
@@ -12,10 +12,7 @@ import 'input.type_map.dart';
 void main() {
   test('SimpleClassOfStringToDouble', () {
     const value = {
-      'value': {
-        'double': 1.0,
-        'int': 1,
-      }
+      'value': {'double': 1.0, 'int': 1},
     };
 
     final object = SimpleClassOfStringToDouble.fromJson(value);
@@ -28,7 +25,7 @@ void main() {
           'double': 1.0,
           // Note! Encoded as a double on output!
           'int': 1.0,
-        }
+        },
       }),
     );
 
@@ -40,9 +37,7 @@ void main() {
 
   test('SimpleClassOfStringToInt', () {
     const value = {
-      'value': {
-        'int': 1,
-      }
+      'value': {'int': 1},
     };
 
     final object = SimpleClassOfStringToInt.fromJson(value);
@@ -58,10 +53,7 @@ void main() {
 
   test('SimpleClassOfStringToNum', () {
     const value = {
-      'value': {
-        'double': 1.0,
-        'int': 1,
-      }
+      'value': {'double': 1.0, 'int': 1},
     };
 
     final object = SimpleClassOfStringToNum.fromJson(value);
@@ -74,4 +66,22 @@ void main() {
     );
     expect(loudEncode(object2), encoded);
   });
+
+  test('SimpleClassOfStringToRecord', () {
+    const value = {
+      'value': {
+        'key': {r'$1': 1, r'$2': 'string', 'truth': false},
+      },
+    };
+
+    final object = SimpleClassOfStringToRecord.fromJson(value);
+    final encoded = loudEncode(object);
+
+    expect(encoded, loudEncode(value));
+
+    final object2 = SimpleClassOfStringToRecord.fromJson(
+      jsonDecode(encoded) as Map<String, Object?>,
+    );
+    expect(loudEncode(object2), encoded);
+  });
 }
diff --git a/json_serializable/test/supported_types/type_test.bigint_test.dart b/json_serializable/test/supported_types/type_test.bigint_test.dart
index c012ea507..b7af11dae 100644
--- a/json_serializable/test/supported_types/type_test.bigint_test.dart
+++ b/json_serializable/test/supported_types/type_test.bigint_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,21 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = '12345';
-final _altValue = '67890';
+const _defaultValue = '12345';
+const _altValue = '67890';
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.bool_test.dart b/json_serializable/test/supported_types/type_test.bool_test.dart
index 14e24853b..fd5492a3c 100644
--- a/json_serializable/test/supported_types/type_test.bool_test.dart
+++ b/json_serializable/test/supported_types/type_test.bool_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = true;
-final _altValue = false;
+const _defaultValue = true;
+const _altValue = false;
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.dart b/json_serializable/test/supported_types/type_test.dart
index 625b8e3c4..e65d9a7b3 100644
--- a/json_serializable/test/supported_types/type_test.dart
+++ b/json_serializable/test/supported_types/type_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -52,24 +52,13 @@ void main() {
   }); // end non-nullable group
 }
 
-final _defaultValue = 42;
-final _altValue = 43;
+const _defaultValue = 42;
+const _altValue = 43;
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.datetime_test.dart b/json_serializable/test/supported_types/type_test.datetime_test.dart
index 597bbf680..495e5ab74 100644
--- a/json_serializable/test/supported_types/type_test.datetime_test.dart
+++ b/json_serializable/test/supported_types/type_test.datetime_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,21 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = '2020-01-01T00:00:00.000';
-final _altValue = '2018-01-01T00:00:00.000';
+const _defaultValue = '2020-01-01T00:00:00.000';
+const _altValue = '2018-01-01T00:00:00.000';
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.double_test.dart b/json_serializable/test/supported_types/type_test.double_test.dart
index 3e4c05acf..bf3ebdb02 100644
--- a/json_serializable/test/supported_types/type_test.double_test.dart
+++ b/json_serializable/test/supported_types/type_test.double_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 3.14;
-final _altValue = 6.28;
+const _defaultValue = 3.14;
+const _altValue = 6.28;
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.duration_test.dart b/json_serializable/test/supported_types/type_test.duration_test.dart
index 76816e9fc..3a5ca238b 100644
--- a/json_serializable/test/supported_types/type_test.duration_test.dart
+++ b/json_serializable/test/supported_types/type_test.duration_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,21 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 1234;
-final _altValue = 2345;
+const _defaultValue = 1234;
+const _altValue = 2345;
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-};
+final _nullableDefaultOutput = {'value': null};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.enumtype_test.dart b/json_serializable/test/supported_types/type_test.enumtype_test.dart
index 1652b359b..d16fa7651 100644
--- a/json_serializable/test/supported_types/type_test.enumtype_test.dart
+++ b/json_serializable/test/supported_types/type_test.enumtype_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsArgumentError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsArgumentError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 'alpha';
-final _altValue = 'beta';
+const _defaultValue = 'alpha';
+const _altValue = 'beta';
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.int_test.dart b/json_serializable/test/supported_types/type_test.int_test.dart
index b4252fa5f..e3ef71a68 100644
--- a/json_serializable/test/supported_types/type_test.int_test.dart
+++ b/json_serializable/test/supported_types/type_test.int_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 42;
-final _altValue = 43;
+const _defaultValue = 42;
+const _altValue = 43;
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.iterable_test.dart b/json_serializable/test/supported_types/type_test.iterable_test.dart
index 57b9358b0..81cab5c49 100644
--- a/json_serializable/test/supported_types/type_test.iterable_test.dart
+++ b/json_serializable/test/supported_types/type_test.iterable_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = [42, true, false, null];
-final _altValue = [43, false];
+const _defaultValue = [42, true, false, null];
+const _altValue = [43, false];
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.list_test.dart b/json_serializable/test/supported_types/type_test.list_test.dart
index 342a89079..74c165a28 100644
--- a/json_serializable/test/supported_types/type_test.list_test.dart
+++ b/json_serializable/test/supported_types/type_test.list_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = [42, true, false, null];
-final _altValue = [43, false];
+const _defaultValue = [42, true, false, null];
+const _altValue = [43, false];
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.map_test.dart b/json_serializable/test/supported_types/type_test.map_test.dart
index c8cf4ccb9..ea4b475e1 100644
--- a/json_serializable/test/supported_types/type_test.map_test.dart
+++ b/json_serializable/test/supported_types/type_test.map_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = {'a': 1};
-final _altValue = {'b': 2};
+const _defaultValue = {'a': 1};
+const _altValue = {'b': 2};
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.num_test.dart b/json_serializable/test/supported_types/type_test.num_test.dart
index 52241e719..b365ac6c4 100644
--- a/json_serializable/test/supported_types/type_test.num_test.dart
+++ b/json_serializable/test/supported_types/type_test.num_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 88.6;
-final _altValue = 29;
+const _defaultValue = 88.6;
+const _altValue = 29;
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.object_test.dart b/json_serializable/test/supported_types/type_test.object_test.dart
index a4f9601f6..29fcabb63 100644
--- a/json_serializable/test/supported_types/type_test.object_test.dart
+++ b/json_serializable/test/supported_types/type_test.object_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 'o1';
-final _altValue = 'o2';
+const _defaultValue = 'o1';
+const _altValue = 'o2';
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.set_test.dart b/json_serializable/test/supported_types/type_test.set_test.dart
index a3b1ed57b..293f87be9 100644
--- a/json_serializable/test/supported_types/type_test.set_test.dart
+++ b/json_serializable/test/supported_types/type_test.set_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = [42, true, false, null];
-final _altValue = [43, false];
+const _defaultValue = [42, true, false, null];
+const _altValue = [43, false];
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.string_test.dart b/json_serializable/test/supported_types/type_test.string_test.dart
index 845762b19..4eaee4811 100644
--- a/json_serializable/test/supported_types/type_test.string_test.dart
+++ b/json_serializable/test/supported_types/type_test.string_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,24 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 'a string';
-final _altValue = 'another string';
+const _defaultValue = 'a string';
+const _altValue = 'another string';
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-  'withDefault': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-  'withDefault': _defaultValue,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-  'withDefault': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/supported_types/type_test.uri_test.dart b/json_serializable/test/supported_types/type_test.uri_test.dart
index ff0710b38..5dc504981 100644
--- a/json_serializable/test/supported_types/type_test.uri_test.dart
+++ b/json_serializable/test/supported_types/type_test.uri_test.dart
@@ -2,11 +2,11 @@
 // 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.
 
-// ignore_for_file: prefer_const_declarations
+@TestOn('vm')
+library;
 
 import 'dart:convert';
 
-@TestOn('vm')
 import 'package:test/test.dart';
 
 import '../test_utils.dart';
@@ -27,10 +27,7 @@ void main() {
     });
 
     test('round trip null', () {
-      expect(
-        () => loudEncode(SimpleClass.fromJson({})),
-        throwsTypeError,
-      );
+      expect(() => loudEncode(SimpleClass.fromJson({})), throwsTypeError);
     });
 
     test('round trip alternate values', () {
@@ -86,21 +83,13 @@ void main() {
   }); // end nullable group
 }
 
-final _defaultValue = 'https://example.com';
-final _altValue = 'https://dart.dev';
+const _defaultValue = 'https://example.com';
+const _altValue = 'https://dart.dev';
 
-final _defaultInput = <String, Object?>{
-  'value': _defaultValue,
-};
+final _defaultInput = <String, Object?>{'value': _defaultValue};
 
-final _defaultOutput = {
-  'value': _defaultValue,
-};
+final _defaultOutput = {'value': _defaultValue, 'withDefault': _defaultValue};
 
-final _nullableDefaultOutput = {
-  'value': null,
-};
+final _nullableDefaultOutput = {'value': null, 'withDefault': _defaultValue};
 
-final _nonDefaultJson = {
-  'value': _altValue,
-};
+final _nonDefaultJson = {'value': _altValue, 'withDefault': _altValue};
diff --git a/json_serializable/test/test_sources/test_sources.dart b/json_serializable/test/test_sources/test_sources.dart
index c0d93c839..80a08aa3b 100644
--- a/json_serializable/test/test_sources/test_sources.dart
+++ b/json_serializable/test/test_sources/test_sources.dart
@@ -15,6 +15,9 @@ class ConfigurationImplicitDefaults {
   constructor: '',
   createFactory: true,
   createToJson: true,
+  createFieldMap: false,
+  createJsonKeys: false,
+  createPerFieldToJson: false,
   disallowUnrecognizedKeys: false,
   explicitToJson: false,
   fieldRename: FieldRename.none,
@@ -41,7 +44,7 @@ class FromJsonOptionalParameters {
 }
 
 class ChildWithFromJson {
-  //ignore: avoid_unused_constructor_parameters
+  //ignore: avoid_unused_constructor_parameters, strict_top_level_inference
   ChildWithFromJson.fromJson(json, {initValue = false});
 }
 
diff --git a/json_serializable/test/test_utils.dart b/json_serializable/test/test_utils.dart
index b82e1b780..fce40a9d1 100644
--- a/json_serializable/test/test_utils.dart
+++ b/json_serializable/test/test_utils.dart
@@ -2,60 +2,11 @@
 // 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:collection/collection.dart';
-import 'package:stack_trace/stack_trace.dart';
-import 'package:test/test.dart';
 
-final throwsTypeError = throwsA(isTypeError);
+export 'package:_json_serial_shared_test/shared_test.dart';
 
-final isTypeError = isA<TypeError>();
+int deepHash(List value) => const DeepCollectionEquality().hash(value);
 
 bool deepEquals(dynamic a, dynamic b) =>
     const DeepCollectionEquality().equals(a, b);
-
-void validateRoundTrip<T>(
-  T object,
-  T Function(Map<String, dynamic> json) factory,
-) {
-  final data = loudEncode(object);
-
-  final object2 = factory(json.decode(data) as Map<String, dynamic>);
-
-  expect(object2, equals(object));
-
-  final json2 = loudEncode(object2);
-
-  expect(json2, equals(data));
-}
-
-/// Prints out nested causes before throwing `JsonUnsupportedObjectError`.
-String loudEncode(Object? object) {
-  try {
-    return const JsonEncoder.withIndent(' ').convert(object);
-  } catch (e) {
-    if (e is JsonUnsupportedObjectError) {
-      Object? error = e;
-
-      var count = 1;
-
-      while (error is JsonUnsupportedObjectError) {
-        print(
-          '(${count++}) $error ${error.unsupportedObject} '
-          '(${error.unsupportedObject.runtimeType}) !!!',
-        );
-        print(Trace.from(error.stackTrace!).terse);
-        error = error.cause;
-      }
-
-      if (error != null) {
-        print('(${count++}) $error ???');
-        if (error is Error) {
-          print(Trace.from(error.stackTrace!).terse);
-        }
-      }
-    }
-    rethrow;
-  }
-}
diff --git a/json_serializable/tool/field_matrix_builder.dart b/json_serializable/tool/field_matrix_builder.dart
new file mode 100644
index 000000000..9455f2cb7
--- /dev/null
+++ b/json_serializable/tool/field_matrix_builder.dart
@@ -0,0 +1,92 @@
+// Copyright (c) 2019, 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:async';
+
+import 'package:build/build.dart';
+import 'package:path/path.dart' as p;
+import 'package:source_helper/source_helper.dart';
+
+import 'shared.dart';
+
+Builder builder([BuilderOptions? _]) => _FieldMatrixBuilder();
+
+class _FieldMatrixBuilder extends Builder {
+  @override
+  FutureOr<void> build(BuildStep buildStep) async {
+    final formatter = await buildStep.formatter();
+
+    final inputBaseName = p.basenameWithoutExtension(buildStep.inputId.path);
+
+    final output = buildStep.allowedOutputs.single;
+
+    final content = StringBuffer('''
+import 'package:json_annotation/json_annotation.dart';
+
+part '$inputBaseName.field_matrix.g.dart';
+''');
+
+    final classes = <String>{};
+
+    for (var isPublic in [true, false]) {
+      for (var includeToJson in [null, true, false]) {
+        for (var includeFromJson in [null, true, false]) {
+          final className =
+              'ToJson${includeToJson.toString().pascal}'
+              'FromJson${includeFromJson.toString().pascal}'
+              '${isPublic ? 'Public' : 'Private'}';
+
+          classes.add(className);
+
+          final fieldName = isPublic ? 'field' : '_field';
+
+          final bits = [
+            if (includeFromJson != null) 'includeFromJson: $includeFromJson,',
+            if (includeToJson != null) 'includeToJson: $includeToJson,',
+            if (!isPublic) "name: 'field'",
+          ];
+
+          final fieldAnnotation = bits.isEmpty
+              ? ''
+              : '@JsonKey(${bits.join()})';
+
+          content.writeln('''
+@JsonSerializable()
+class $className {
+  $className();
+  
+  int? aField;
+  
+  $fieldAnnotation
+  int? $fieldName;
+  
+  int? zField;
+
+  factory $className.fromJson(Map<String, dynamic> json) =>
+      _\$${className}FromJson(json);
+
+  Map<String, dynamic> toJson() => _\$${className}ToJson(this);
+  
+  @override
+  String toString() => '$className: $fieldName: \$$fieldName';
+}
+''');
+        }
+      }
+    }
+
+    content.writeln('''
+const fromJsonFactories = <Object Function(Map<String, dynamic>)>{
+  ${classes.map((e) => '$e.fromJson,').join()}
+};
+''');
+
+    await buildStep.writeAsString(output, formatter.format(content.toString()));
+  }
+
+  @override
+  Map<String, List<String>> get buildExtensions => const {
+    '.dart': ['.field_matrix.dart'],
+  };
+}
diff --git a/json_serializable/tool/readme/readme_examples.dart b/json_serializable/tool/readme/readme_examples.dart
new file mode 100644
index 000000000..0c684bcaa
--- /dev/null
+++ b/json_serializable/tool/readme/readme_examples.dart
@@ -0,0 +1,98 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'readme_examples.g.dart';
+
+// # simple_example
+enum StatusCode {
+  @JsonValue(200)
+  success,
+  @JsonValue(301)
+  movedPermanently,
+  @JsonValue(302)
+  found,
+  @JsonValue(500)
+  internalServerError,
+}
+
+// # enhanced_example
+@JsonEnum(valueField: 'code')
+enum StatusCodeEnhanced {
+  success(200),
+  movedPermanently(301),
+  found(302),
+  internalServerError(500);
+
+  const StatusCodeEnhanced(this.code);
+  final int code;
+}
+
+// # to_from
+@JsonSerializable()
+class Sample1 {
+  Sample1(this.value);
+
+  factory Sample1.fromJson(Map<String, dynamic> json) =>
+      _$Sample1FromJson(json);
+
+  // Sample2 is NOT annotated with @JsonSerializable(), but that's okay
+  // The class has a `fromJson` constructor and a `toJson` method, which is
+  // all that is required.
+  final Sample2 value;
+
+  Map<String, dynamic> toJson() => _$Sample1ToJson(this);
+}
+
+class Sample2 {
+  Sample2(this.value);
+
+  // The convention is for `fromJson` to take a single parameter of type
+  // `Map<String, dynamic>` but any JSON-compatible type is allowed.
+  factory Sample2.fromJson(int value) => Sample2(value);
+  final int value;
+
+  // The convention is for `toJson` to take return a type of
+  // `Map<String, dynamic>` but any JSON-compatible type is allowed.
+  int toJson() => value;
+}
+
+// # json_key
+@JsonSerializable()
+class Sample3 {
+  Sample3(this.value);
+
+  factory Sample3.fromJson(Map<String, dynamic> json) =>
+      _$Sample3FromJson(json);
+
+  @JsonKey(toJson: _toJson, fromJson: _fromJson)
+  final DateTime value;
+
+  Map<String, dynamic> toJson() => _$Sample3ToJson(this);
+
+  static int _toJson(DateTime value) => value.millisecondsSinceEpoch;
+  static DateTime _fromJson(int value) =>
+      DateTime.fromMillisecondsSinceEpoch(value);
+}
+
+// # json_converter
+@JsonSerializable()
+class Sample4 {
+  Sample4(this.value);
+
+  factory Sample4.fromJson(Map<String, dynamic> json) =>
+      _$Sample4FromJson(json);
+
+  @EpochDateTimeConverter()
+  final DateTime value;
+
+  Map<String, dynamic> toJson() => _$Sample4ToJson(this);
+}
+
+class EpochDateTimeConverter implements JsonConverter<DateTime, int> {
+  const EpochDateTimeConverter();
+
+  @override
+  DateTime fromJson(int json) => DateTime.fromMillisecondsSinceEpoch(json);
+
+  @override
+  int toJson(DateTime object) => object.millisecondsSinceEpoch;
+}
diff --git a/json_serializable/tool/readme/readme_examples.g.dart b/json_serializable/tool/readme/readme_examples.g.dart
new file mode 100644
index 000000000..5390b6d59
--- /dev/null
+++ b/json_serializable/tool/readme/readme_examples.g.dart
@@ -0,0 +1,31 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: lines_longer_than_80_chars, text_direction_code_point_in_literal, inference_failure_on_function_invocation, inference_failure_on_collection_literal
+
+part of 'readme_examples.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Sample1 _$Sample1FromJson(Map<String, dynamic> json) =>
+    Sample1(Sample2.fromJson((json['value'] as num).toInt()));
+
+Map<String, dynamic> _$Sample1ToJson(Sample1 instance) => <String, dynamic>{
+  'value': instance.value,
+};
+
+Sample3 _$Sample3FromJson(Map<String, dynamic> json) =>
+    Sample3(Sample3._fromJson((json['value'] as num).toInt()));
+
+Map<String, dynamic> _$Sample3ToJson(Sample3 instance) => <String, dynamic>{
+  'value': Sample3._toJson(instance.value),
+};
+
+Sample4 _$Sample4FromJson(Map<String, dynamic> json) => Sample4(
+  const EpochDateTimeConverter().fromJson((json['value'] as num).toInt()),
+);
+
+Map<String, dynamic> _$Sample4ToJson(Sample4 instance) => <String, dynamic>{
+  'value': const EpochDateTimeConverter().toJson(instance.value),
+};
diff --git a/json_serializable/tool/readme/readme_template.md b/json_serializable/tool/readme/readme_template.md
index fa8c3956a..d99c3ec78 100644
--- a/json_serializable/tool/readme/readme_template.md
+++ b/json_serializable/tool/readme/readme_template.md
@@ -16,29 +16,26 @@ in [package:json_annotation].
 
 ## Setup
 
-To configure your project for the latest released version of,
-`json_serializable` see the [example].
+To configure your project for the latest released version of
+`json_serializable`, see the [example].
 
 ## Example
 
 Given a library `example.dart` with an `Person` class annotated with
 `ja:JsonSerializable`:
 
-<!-- REPLACE example.dart -->
+<!-- REPLACE example/example.dart -->
 
 Building creates the corresponding part `example.g.dart`:
 
-<!-- REPLACE example.g.dart -->
+<!-- REPLACE example/example.g.dart -->
 
 # Running the code generator
 
 Once you have added the annotations to your code you then need to run the code
 generator to generate the missing `.g.dart` generated dart files.
 
-With a Dart package, run `dart run build_runner build` in the package directory.
-
-With a Flutter package, run `flutter pub run build_runner build` in your package
-directory.
+Run `dart run build_runner build` in the package directory.
 
 # Annotation values
 
@@ -75,21 +72,19 @@ Annotate `enum` types with `ja:JsonEnum` (new in `json_annotation` 4.2.0) to:
 Annotate `enum` values with `ja:JsonValue` to specify the encoded value to map
 to target `enum` entries. Values can be of type `core:String` or `core:int`.
 
-<!-- TODO: hoist out to source code! -->
+<!-- REPLACE tool/readme/readme_examples.dart-simple_example -->
 
-```dart
-enum StatusCode {
-  @JsonValue(200)
-  success,
-  @JsonValue('500')
-  weird,
-}
-```
+If you are annotating an
+[enhanced enum](https://dart.dev/guides/language/language-tour#declaring-enhanced-enums),
+you can use `ja:JsonEnum.valueField` to specify the field to use for the
+serialized value.
+
+<!-- REPLACE tool/readme/readme_examples.dart-enhanced_example -->
 
 # Supported types
 
 Out of the box, `json_serializable` supports many common types in the
-[dart:core](https://api.dart.dev/stable/dart-core/dart-core-library.html)
+[dart:core](https://api.dart.dev/dart-core/dart-core-library.html)
 library: 
 <!-- REPLACE supported_types -->
 
@@ -105,19 +100,27 @@ For `core:Map`, the key value must be one of
 If you want to use types that are not supported out-of-the-box or if you want to
 customize the encoding/decoding of any type, you have a few options.
 
-1. If you own/cotrol the desired type, add a `fromJson` constructor and/or a
+1. If you own/control the desired type, add a `fromJson` constructor and/or a
    `toJson()` function to the type. Note: while you can use `json_serializable`
    for these types, you don't have to! The generator code only looks for these
    methods. It doesn't care how they were created.
+
+    <!-- REPLACE tool/readme/readme_examples.dart-to_from -->
+
 1. Use the `ja:JsonKey.toJson` and `ja:JsonKey.fromJson` properties to specify
    custom conversions on the annotated field. The functions specified must be
    top-level or static. See the documentation of these properties for details.
+
+    <!-- REPLACE tool/readme/readme_examples.dart-json_key -->
+
 1. Create an implementation of `ja:JsonConverter` and annotate either the
    corresponding field or the containing class. `ja:JsonConverter` is convenient
    if you want to use the same conversion logic on many fields. It also allows
    you to support a type within collections. Check out
    [these examples](https://github.com/google/json_serializable.dart/blob/master/example/lib/json_converter_example.dart).
 
+    <!-- REPLACE tool/readme/readme_examples.dart-json_converter -->
+
 # Build configuration
 
 Aside from setting arguments on the associated annotation classes, you can also
@@ -137,6 +140,9 @@ targets:
           checked: false
           constructor: ""
           create_factory: true
+          create_field_map: false
+          create_json_keys: false
+          create_per_field_to_json: false
           create_to_json: true
           disallow_unrecognized_keys: false
           explicit_to_json: false
@@ -146,6 +152,18 @@ targets:
           include_if_null: true
 ```
 
+To exclude generated files from coverage, you can further configure `build.yaml`.
+
+```yaml
+targets:
+  $default:
+    builders:
+      source_gen:combining_builder:
+        options:
+          preamble: |
+            // coverage:ignore-file
+```
+
 [example]: https://github.com/google/json_serializable.dart/tree/master/example
 [dart build system]: https://github.com/dart-lang/build
 [package:json_annotation]: https://pub.dev/packages/json_annotation
diff --git a/json_serializable/tool/readme_builder.dart b/json_serializable/tool/readme_builder.dart
index cfb255496..3709ee017 100644
--- a/json_serializable/tool/readme_builder.dart
+++ b/json_serializable/tool/readme_builder.dart
@@ -7,24 +7,25 @@ import 'dart:convert';
 
 import 'package:build/build.dart';
 import 'package:collection/collection.dart';
-import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
 import 'package:yaml/yaml.dart';
 
 import 'test_type_builder.dart';
 import 'test_type_data.dart';
 
-Builder readmeBuilder([_]) => _ReadmeBuilder();
+Builder readmeBuilder([BuilderOptions? _]) => _ReadmeBuilder();
 
 class _ReadmeBuilder extends Builder {
   @override
   FutureOr<void> build(BuildStep buildStep) async {
-    final templateAssetId =
-        buildStep.assetIdForInputPackage('tool/readme/readme_template.md');
+    final templateAssetId = buildStep.assetIdForInputPackage(
+      'tool/readme/readme_template.md',
+    );
 
     final replacements = {
-      'example.dart': await buildStep.getExampleContent('example.dart'),
-      'example.g.dart': await buildStep.getExampleContent('example.g.dart'),
+      ...await buildStep.getExampleContent('example/example.dart'),
+      ...await buildStep.getExampleContent('example/example.g.dart'),
+      ...await buildStep.getExampleContent('tool/readme/readme_examples.dart'),
       'supported_types': _classCleanAndSort(supportedTypes()),
       'collection_types': _classCleanAndSort(collectionTypes()),
       'map_key_types': _classCleanAndSort(mapKeyTypes),
@@ -38,17 +39,20 @@ class _ReadmeBuilder extends Builder {
 
     String jsonAnnotationUri(String className, [String? member]) =>
         member == null
-            ? '$jsonAnnotationBaseUri/$className-class.html'
-            : '$jsonAnnotationBaseUri/$className/$member.html';
+        ? '$jsonAnnotationBaseUri/$className-class.html'
+        : '$jsonAnnotationBaseUri/$className/$member.html';
 
     final foundClasses = SplayTreeMap<String, String>(compareAsciiLowerCase);
 
     final theMap = <Pattern, String Function(Match)>{
-      RegExp(r'<!-- REPLACE ([\w\d\.]+) -->'): (match) {
-        final replacementKey = match.group(1)!;
+      RegExp(r'( *)<!-- REPLACE ([\/\w\d\._-]+) -->'): (match) {
+        final replacementKey = match.group(2)!;
         availableKeys.remove(replacementKey);
-        return (replacements[replacementKey] ?? '*MISSING! `$replacementKey`*')
-            .trim();
+        final replacement =
+            (replacements[replacementKey] ?? '*MISSING! `$replacementKey`*')
+                .trim();
+
+        return replacement.indent(match.group(1)!);
       },
       RegExp(r'`(\w+):(\w+)(\.\w+)?`'): (match) {
         final context = match.group(1)!;
@@ -56,19 +60,14 @@ class _ReadmeBuilder extends Builder {
         final memberName = match.group(3);
         final linkContent = '[`$className${memberName ?? ''}`]';
         String linkValue;
-        switch (context) {
-          case 'core':
-            linkValue = _coreTypeUri(className);
-            break;
-          case 'ja':
-            linkValue = jsonAnnotationUri(className, memberName?.substring(1));
-            break;
-          default:
-            linkValue = 'https://unknown.com/$context/$className';
-        }
+        linkValue = switch (context) {
+          'core' => _coreTypeUri(className),
+          'ja' => jsonAnnotationUri(className, memberName?.substring(1)),
+          _ => 'https://unknown.com/$context/$className',
+        };
         foundClasses[linkContent] = linkValue;
         return linkContent;
-      }
+      },
     };
 
     var content = (await buildStep.readAsString(templateAssetId)).trim();
@@ -83,7 +82,8 @@ class _ReadmeBuilder extends Builder {
       );
     }
 
-    content = '''
+    content =
+        '''
 <!-- This content is generated. See $_templatePath -->
 $content
 ${foundClasses.entries.map((e) => '${e.key}: ${e.value}').join('\n')}
@@ -97,7 +97,7 @@ ${foundClasses.entries.map((e) => '${e.key}: ${e.value}').join('\n')}
 
   @override
   final buildExtensions = const {
-    _templatePath: [_readmePath]
+    _templatePath: [_readmePath],
   };
 }
 
@@ -105,16 +105,17 @@ const _templatePath = 'tool/readme/readme_template.md';
 const _readmePath = 'README.md';
 
 String _coreTypeUri(String type) =>
-    'https://api.dart.dev/stable/dart-core/$type-class.html';
+    'https://api.dart.dev/dart-core/$type-class.html';
 
 String _classCleanAndSort(Iterable<String> classes) {
-  final initial = (classes.map((e) => e == customEnumType ? 'Enum' : e).toList()
-        ..sort(compareAsciiLowerCase))
-      // Dropping `dynamic` – it's not linkable!
-      .where((element) => element != 'dynamic')
-      // Start by mapping to the output format – so we wrap correctly
-      .map((e) => '[`$e`]')
-      .join(', ');
+  final initial =
+      (classes.map((e) => e == customEnumType ? 'Enum' : e).toList()
+            ..sort(compareAsciiLowerCase))
+          // Dropping `dynamic` – it's not linkable!
+          .where((element) => element != 'dynamic')
+          // Start by mapping to the output format – so we wrap correctly
+          .map((e) => '[`$e`]')
+          .join(', ');
 
   if (initial.length <= 80) {
     return initial;
@@ -145,7 +146,9 @@ String _classCleanAndSort(Iterable<String> classes) {
     lines.add(currentLine);
   }
 
-  return lines.join('\n').replaceAllMapped(
+  return lines
+      .join('\n')
+      .replaceAllMapped(
         // Now put in the core: logic so we autolink correctly
         RegExp(r'\[`(\w+)`\]'),
         (match) => '`core:${match[1]}`',
@@ -156,16 +159,24 @@ extension on BuildStep {
   AssetId assetIdForInputPackage(String path) => AssetId(inputId.package, path);
 
   Future<String> jsonAnnotationVersion() async {
-    final lockFileAssetId = assetIdForInputPackage('pubspec.lock');
-    final lockFileContent = await readAsString(lockFileAssetId);
-    final lockFileYaml =
-        loadYaml(lockFileContent, sourceUrl: lockFileAssetId.uri) as YamlMap;
-    final pkgMap = lockFileYaml['packages'] as YamlMap;
-    final jsonAnnotationMap = pkgMap['json_annotation'] as YamlMap;
-    final jsonAnnotationVersionString = jsonAnnotationMap['version'] as String;
-
-    final jsonAnnotationVersion =
-        Version.parse(jsonAnnotationVersionString.trim());
+    final jsonAnnotationPubspecAssetId = AssetId(
+      'json_annotation',
+      'pubspec.yaml',
+    );
+    final jsonAnnotationPubspecContent = await readAsString(
+      jsonAnnotationPubspecAssetId,
+    );
+    final pubspecYaml =
+        loadYaml(
+              jsonAnnotationPubspecContent,
+              sourceUrl: jsonAnnotationPubspecAssetId.uri,
+            )
+            as YamlMap;
+    final jsonAnnotationVersionString = pubspecYaml['version'] as String;
+
+    final jsonAnnotationVersion = Version.parse(
+      jsonAnnotationVersionString.trim(),
+    );
 
     final targetVersion = jsonAnnotationVersion.isPreRelease
         ? 'latest'
@@ -174,10 +185,8 @@ extension on BuildStep {
     return targetVersion;
   }
 
-  Future<String> getExampleContent(String fileName) async {
-    final content = await readAsString(
-      assetIdForInputPackage(p.join('example', fileName)),
-    );
+  Future<Map<String, String>> getExampleContent(String fileName) async {
+    final content = await readAsString(assetIdForInputPackage(fileName));
 
     final lines = LineSplitter.split(content);
 
@@ -185,7 +194,12 @@ extension on BuildStep {
 
     // All lines with content, except those starting with `/`.
     // Also exclude blank lines that follow other blank lines
-    final cleanedSource = lines.where((l) {
+    final cleanedSourceLines = lines.where((l) {
+      if (l.isBlockLine) {
+        // This is a block!
+        return true;
+      }
+
       if (l.startsWith(r'/')) {
         return false;
       }
@@ -201,11 +215,79 @@ extension on BuildStep {
       }
 
       return false;
-    }).join('\n');
+    });
+
+    if (cleanedSourceLines.any((element) => element.isBlockLine)) {
+      final result = <String, String>{};
 
-    return '''
+      String? currentBlock;
+      final builder = <String>[];
+
+      void finishBlock() {
+        result[currentBlock!] = builder.join('\n').trim();
+        builder.clear();
+        currentBlock = null;
+      }
+
+      for (var line in cleanedSourceLines) {
+        if (currentBlock == null) {
+          if (!line.isBlockLine) {
+            // have not got to a block yet – skip!
+          } else {
+            // this is our first block!
+            currentBlock = line.blockName;
+            if (result.containsKey(currentBlock)) {
+              throw StateError('Duplicate block "$currentBlock"');
+            }
+          }
+          continue;
+        }
+
+        if (line.isBlockLine) {
+          if (builder.isEmpty) {
+            log.warning('`$currentBlock` is empty');
+          } else {
+            finishBlock();
+            currentBlock = line.blockName;
+            if (result.containsKey(currentBlock)) {
+              throw StateError('Duplicate block "$currentBlock"');
+            }
+          }
+        } else {
+          builder.add(line);
+        }
+      }
+
+      if (currentBlock != null) finishBlock();
+
+      return result.map(
+        (key, value) => MapEntry('$fileName-$key', value.dartBlock),
+      );
+    } else {
+      return {fileName: cleanedSourceLines.join('\n').dartBlock};
+    }
+  }
+}
+
+extension on String {
+  bool get isBlockLine => trim().startsWith(_blockComment);
+
+  String get blockName {
+    assert(isBlockLine);
+    final index = indexOf(_blockComment);
+    assert(index >= 0);
+    final start = index + _blockComment.length;
+    return substring(start).trim();
+  }
+
+  String get dartBlock =>
+      '''
 ```dart
-$cleanedSource
+${trim()}
 ```''';
-  }
+
+  static const _blockComment = r'// # ';
+
+  String indent(String indent) =>
+      LineSplitter.split(this).map((e) => '$indent$e'.trimRight()).join('\n');
 }
diff --git a/json_serializable/tool/shared.dart b/json_serializable/tool/shared.dart
index f1e0b9914..ca7068d4c 100644
--- a/json_serializable/tool/shared.dart
+++ b/json_serializable/tool/shared.dart
@@ -5,15 +5,18 @@
 import 'dart:io';
 
 import 'package:build/build.dart';
+import 'package:dart_style/dart_style.dart';
 import 'package:yaml/yaml.dart';
 
 // Until we have verification in pkg:build and friends
 // https://github.com/dart-lang/build/issues/590
 Builder validate(String builderName, Builder builder) {
-  var buildYaml = loadYaml(
-    File('build.yaml').readAsStringSync(),
-    sourceUrl: Uri.parse('build.yaml'),
-  ) as YamlMap;
+  var buildYaml =
+      loadYaml(
+            File('build.yaml').readAsStringSync(),
+            sourceUrl: Uri.parse('build.yaml'),
+          )
+          as YamlMap;
 
   for (var key in ['builders', builderName, 'build_extensions']) {
     buildYaml = buildYaml[key] as YamlMap;
@@ -49,8 +52,8 @@ class Replacement {
   const Replacement(this.existing, this.replacement);
 
   const Replacement.addJsonSerializableKey(String key, bool value)
-      : existing = '@JsonSerializable(',
-        replacement = '@JsonSerializable(\n  $key: $value,';
+    : existing = '@JsonSerializable(',
+      replacement = '@JsonSerializable(\n  $key: $value,';
 
   static String generate(
     String inputContent,
@@ -69,3 +72,9 @@ class Replacement {
     return outputContent.replaceAll(',)', ',\n)');
   }
 }
+
+extension BuildStepExtension on BuildStep {
+  Future<DartFormatter> formatter() async => DartFormatter(
+    languageVersion: (await inputLibrary).languageVersion.effective,
+  );
+}
diff --git a/json_serializable/tool/test_builder.dart b/json_serializable/tool/test_builder.dart
index 6e6389c4c..4e325882a 100644
--- a/json_serializable/tool/test_builder.dart
+++ b/json_serializable/tool/test_builder.dart
@@ -6,26 +6,25 @@ import 'dart:async';
 import 'dart:collection';
 
 import 'package:build/build.dart';
-import 'package:dart_style/dart_style.dart';
 import 'package:path/path.dart' as p;
 
 import 'shared.dart';
 
-final _formatter = DartFormatter();
-
-Builder testBuilder([_]) => validate('_test_builder', const _TestBuilder());
+Builder testBuilder([BuilderOptions? _]) =>
+    validate('_test_builder', const _TestBuilder());
 
 class _TestBuilder implements Builder {
   const _TestBuilder();
 
   @override
   FutureOr<void> build(BuildStep buildStep) async {
+    final formatter = await buildStep.formatter();
+
     final baseName = p.basenameWithoutExtension(buildStep.inputId.path);
 
     final sourceContent = await buildStep.readAsString(buildStep.inputId);
 
-    final factories =
-        SplayTreeMap.from({'$_kitchenSinkBaseName.dart': 'normal'});
+    final factories = SplayTreeMap.of({'$_kitchenSinkBaseName.dart': 'normal'});
 
     for (var config in _fileConfigurationMap[baseName]!) {
       final extension = _configToExtension(config);
@@ -37,15 +36,17 @@ class _TestBuilder implements Builder {
         Replacement(
           "part '$baseName.g.dart';",
           "part '$baseName$partName.g.dart';",
-        )
+        ),
       ];
 
       if (baseName == _kitchenSinkBaseName) {
         final description = _configToName(config.toSet());
-        replacements.add(Replacement(
-          "String get description => '--defaults--';",
-          "String get description => '$description';",
-        ));
+        replacements.add(
+          Replacement(
+            "String get description => '--defaults--';",
+            "String get description => '$description';",
+          ),
+        );
 
         factories['$baseName$partName.dart'] = description;
       }
@@ -56,7 +57,7 @@ class _TestBuilder implements Builder {
 
       final content = Replacement.generate(sourceContent, replacements);
 
-      await buildStep.writeAsString(newId, _formatter.format(content));
+      await buildStep.writeAsString(newId, formatter.format(content));
     }
 
     if (baseName == _kitchenSinkBaseName) {
@@ -73,29 +74,29 @@ class _TestBuilder implements Builder {
         '];',
       ];
 
-      await buildStep.writeAsString(newId, _formatter.format(lines.join('\n')));
+      await buildStep.writeAsString(newId, formatter.format(lines.join('\n')));
     }
   }
 
   @override
-  Map<String, List<String>> get buildExtensions =>
-      {'.dart': _fileConfigurations};
+  Map<String, List<String>> get buildExtensions => {
+    '.dart': _fileConfigurations,
+  };
 }
 
 const _configReplacements = {
   'any_map': Replacement.addJsonSerializableKey('anyMap', true),
   'checked': Replacement.addJsonSerializableKey('checked', true),
-  'explicit_to_json':
-      Replacement.addJsonSerializableKey('explicitToJson', true),
+  'explicit_to_json': Replacement.addJsonSerializableKey(
+    'explicitToJson',
+    true,
+  ),
   'exclude_null': Replacement.addJsonSerializableKey('includeIfNull', false),
 };
 
 const _kitchenSinkReplacements = {
   'any_map': [
-    Replacement(
-      'bool get anyMap => false;',
-      'bool get anyMap => true;',
-    ),
+    Replacement('bool get anyMap => false;', 'bool get anyMap => true;'),
     Replacement(
       'class _Factory implements k.KitchenSinkFactory<String, dynamic>',
       'class _Factory implements k.KitchenSinkFactory<dynamic, dynamic>',
@@ -110,10 +111,7 @@ const _kitchenSinkReplacements = {
     ),
   ],
   'checked': [
-    Replacement(
-      'bool get checked => false;',
-      'bool get checked => true;',
-    )
+    Replacement('bool get checked => false;', 'bool get checked => true;'),
   ],
   'exclude_null': [
     Replacement(
@@ -136,7 +134,9 @@ const _kitchenSinkReplacements = {
 };
 
 Iterable<Replacement> _optionReplacement(
-    String baseName, String optionKey) sync* {
+  String baseName,
+  String optionKey,
+) sync* {
   final value = _configReplacements[optionKey];
   if (value == null) {
     log.warning('no replacement thingy for `$optionKey`.');
@@ -156,13 +156,14 @@ String _configToExtension(Iterable<String> config) =>
 String _configToName(Set<String> config) =>
     (config.toList()..sort()).join('__');
 
-List<String> get _fileConfigurations => _fileConfigurationMap.values
-    .expand((v) => v)
-    .map(_configToExtension)
-    .followedBy(['.factories.dart'])
-    .toSet()
-    .toList()
-  ..sort();
+List<String> get _fileConfigurations =>
+    _fileConfigurationMap.values
+        .expand((v) => v)
+        .map(_configToExtension)
+        .followedBy(['.factories.dart'])
+        .toSet()
+        .toList()
+      ..sort();
 
 const _kitchenSinkBaseName = 'kitchen_sink';
 
diff --git a/json_serializable/tool/test_type_builder.dart b/json_serializable/tool/test_type_builder.dart
index bfadc7091..54ef05688 100644
--- a/json_serializable/tool/test_type_builder.dart
+++ b/json_serializable/tool/test_type_builder.dart
@@ -6,62 +6,42 @@ import 'dart:async';
 
 import 'package:build/build.dart';
 import 'package:collection/collection.dart';
-import 'package:dart_style/dart_style.dart';
+import 'package:json_serializable/src/type_helpers/map_helper.dart';
 
 import 'shared.dart';
 import 'test_type_data.dart';
 
-final _formatter = DartFormatter();
-
 const _trivialTypesToTest = {
-  'BigInt': TestTypeData(
+  'BigInt': TestTypeData.defaultFunc(
     jsonExpression: "'12345'",
     altJsonExpression: "'67890'",
   ),
-  'bool': TestTypeData(
-    defaultExpression: 'true',
-    altJsonExpression: 'false',
-  ),
-  'DateTime': TestTypeData(
+  'bool': TestTypeData(defaultExpression: 'true', altJsonExpression: 'false'),
+  'DateTime': TestTypeData.defaultFunc(
     jsonExpression: "'2020-01-01T00:00:00.000'",
     altJsonExpression: "'2018-01-01T00:00:00.000'",
   ),
-  'double': TestTypeData(
-    defaultExpression: '3.14',
-    altJsonExpression: '6.28',
-  ),
-  'Duration': TestTypeData(
-    jsonExpression: '1234',
-    altJsonExpression: '2345',
-  ),
+  'double': TestTypeData(defaultExpression: '3.14', altJsonExpression: '6.28'),
+  'Duration': TestTypeData(jsonExpression: '1234', altJsonExpression: '2345'),
   customEnumType: TestTypeData(
     defaultExpression: '$customEnumType.alpha',
     jsonExpression: "'alpha'",
     altJsonExpression: "'beta'",
   ),
-  'int': TestTypeData(
-    defaultExpression: '42',
-    altJsonExpression: '43',
-  ),
-  'num': TestTypeData(
-    defaultExpression: '88.6',
-    altJsonExpression: '29',
-  ),
-  'Object': TestTypeData(
-    defaultExpression: "'o1'",
-    altJsonExpression: "'o2'",
-  ),
+  'int': TestTypeData(defaultExpression: '42', altJsonExpression: '43'),
+  'num': TestTypeData(defaultExpression: '88.6', altJsonExpression: '29'),
+  'Object': TestTypeData(defaultExpression: "'o1'", altJsonExpression: "'o2'"),
   'String': TestTypeData(
     defaultExpression: "'a string'",
     altJsonExpression: "'another string'",
   ),
-  'Uri': TestTypeData(
+  'Uri': TestTypeData.defaultFunc(
     jsonExpression: "'https://example.com'",
     altJsonExpression: "'https://dart.dev'",
   ),
 };
 
-Iterable<String> supportedTypes() => _typesToTest.keys;
+Iterable<String> supportedTypes() => _allTypes.keys;
 
 Iterable<String> collectionTypes() => _collectionTypes.keys;
 
@@ -89,63 +69,65 @@ final _collectionTypes = {
     altJsonExpression: '[$_altCollectionExpressions]',
     genericArgs: _iterableGenericArgs,
   ),
+  recordType: TestTypeData(
+    altJsonExpression: '{}',
+    genericArgs: _iterableGenericArgs,
+  ),
 };
 
-final _typesToTest = {
-  ..._trivialTypesToTest,
-  ..._collectionTypes,
-};
+final _allTypes = {..._trivialTypesToTest, ..._collectionTypes};
 
-const mapKeyTypes = {
-  'BigInt',
-  'DateTime',
-  'dynamic',
-  customEnumType,
-  'int',
-  'Object',
-  'String',
-  'Uri',
-};
+final _typesToTest = Map.of(_allTypes)..remove(recordType);
+
+Iterable<String> get mapKeyTypes =>
+    allowedMapKeyTypes.map((e) => e == 'enum' ? customEnumType : e).toList()
+      ..sort(compareAsciiLowerCase);
 
 final _iterableGenericArgs = ([
   ..._trivialTypesToTest.keys,
   ..._trivialTypesToTest.keys.map((e) => '$e?'),
+  'FromJsonDynamicParam',
+  'FromJsonNullableObjectParam',
+  'FromJsonObjectParam',
   'dynamic',
-]..sort(compareAsciiLowerCase))
-    .toSet();
+  recordType,
+]..sort(compareAsciiLowerCase)).toSet();
 
 const _defaultCollectionExpressions = '42, true, false, null';
 const _altCollectionExpressions = '43, false';
 
-Builder typeBuilder([_]) => validate('_type_builder', const _TypeBuilder());
+Builder typeBuilder([BuilderOptions? _]) =>
+    validate('_type_builder', const _TypeBuilder());
 
 class _TypeBuilder implements Builder {
   const _TypeBuilder();
 
   @override
   FutureOr<void> build(BuildStep buildStep) async {
+    final formatter = await buildStep.formatter();
+
     final inputId = buildStep.inputId;
 
     final sourceContent = await buildStep.readAsString(inputId);
 
-    for (var entry in _typesToTest.entries) {
+    for (var entry in _allTypes.entries) {
       final type = entry.key;
       final newId = buildStep.inputId.changeExtension(toTypeExtension(type));
 
       await buildStep.writeAsString(
         newId,
-        _formatter.format(entry.value.libContent(sourceContent, type)),
+        formatter.format(entry.value.libContent(sourceContent, type)),
       );
     }
   }
 
   @override
   Map<String, List<String>> get buildExtensions => {
-        '.dart': _typesToTest.keys.map(toTypeExtension).toSet().toList()..sort()
-      };
+    '.dart': _allTypes.keys.map(toTypeExtension).toSet().toList()..sort(),
+  };
 }
 
-Builder typeTestBuilder([_]) =>
+Builder typeTestBuilder([BuilderOptions? _]) =>
     validate('_type_test_builder', const _TypeTestBuilder());
 
 class _TypeTestBuilder implements Builder {
@@ -159,8 +141,9 @@ class _TypeTestBuilder implements Builder {
 
     for (var entry in _typesToTest.entries) {
       final type = entry.key;
-      final newId =
-          buildStep.inputId.changeExtension(_toTypeTestExtension(type));
+      final newId = buildStep.inputId.changeExtension(
+        _toTypeTestExtension(type),
+      );
 
       await buildStep.writeAsString(
         newId,
@@ -171,9 +154,9 @@ class _TypeTestBuilder implements Builder {
 
   @override
   Map<String, List<String>> get buildExtensions => {
-        '.dart': _typesToTest.keys.map(_toTypeTestExtension).toSet().toList()
-          ..sort()
-      };
+    '.dart': _typesToTest.keys.map(_toTypeTestExtension).toSet().toList()
+      ..sort(),
+  };
 }
 
 String _toTypeTestExtension(String e) => '.${typeToPathPart(e)}_test.dart';
diff --git a/json_serializable/tool/test_type_data.dart b/json_serializable/tool/test_type_data.dart
index bd310a751..dd09e8bb0 100644
--- a/json_serializable/tool/test_type_data.dart
+++ b/json_serializable/tool/test_type_data.dart
@@ -1,11 +1,17 @@
+import 'package:dart_style/dart_style.dart';
+import 'package:pub_semver/pub_semver.dart';
+
 import 'shared.dart';
 
 const customEnumType = 'EnumType';
 
+const recordType = 'Record';
+
 const _annotationImport =
     "import 'package:json_annotation/json_annotation.dart';";
 
 class TestTypeData {
+  final bool stringParseType;
   final String? defaultExpression;
   final String? jsonExpression;
   final String? altJsonExpression;
@@ -16,9 +22,18 @@ class TestTypeData {
     String? jsonExpression,
     required String? altJsonExpression,
     this.genericArgs = const {},
-  })  : jsonExpression = jsonExpression ?? defaultExpression,
-        altJsonExpression =
-            altJsonExpression ?? jsonExpression ?? defaultExpression;
+  }) : jsonExpression = jsonExpression ?? defaultExpression,
+       altJsonExpression =
+           altJsonExpression ?? jsonExpression ?? defaultExpression,
+       stringParseType = false;
+
+  const TestTypeData.defaultFunc({
+    this.jsonExpression,
+    required String? altJsonExpression,
+  }) : altJsonExpression = altJsonExpression ?? jsonExpression,
+       genericArgs = const {},
+       defaultExpression = null,
+       stringParseType = true;
 
   String libContent(String source, String type) {
     const classAnnotationSplit = '@JsonSerializable()';
@@ -37,46 +52,68 @@ class TestTypeData {
           '$_annotationImport'
           "import 'enum_type.dart';",
         ),
-      Replacement(
-        "part 'input.g.dart';",
-        "part 'input$newPart.g.dart';",
-      )
+      Replacement("part 'input.g.dart';", "part 'input$newPart.g.dart';"),
     ];
 
-    final buffer =
-        StringBuffer(Replacement.generate(split[0], headerReplacements));
+    final buffer = StringBuffer(
+      Replacement.generate(split[0], headerReplacements),
+    );
+
+    if (type == recordType) {
+      buffer.writeln('typedef RecordTypeDef = ();');
+    }
 
     final simpleClassContent = '$classAnnotationSplit${split[1]}';
 
+    final simpleLiteral = type == recordType ? 'RecordTypeDef' : type;
+
     buffer
       ..write(
         Replacement.generate(
           simpleClassContent,
-          _libReplacements(type),
+          _libReplacements(simpleLiteral),
         ),
       )
       ..write(
         Replacement.generate(
-          simpleClassContent.replaceAll(
-            'SimpleClass',
-            'SimpleClassNullable',
-          ),
-          _libReplacements('$type?'),
+          simpleClassContent.replaceAll('SimpleClass', 'SimpleClassNullable'),
+          _libReplacements('$simpleLiteral?'),
         ),
       );
 
+    const sampleRecordDefinition = '(int, String, {bool truth})';
+
     for (var genericArg in genericArgs) {
       final genericArgClassPart = _genericClassPart(genericArg);
 
-      final genericType = '$type<$genericArg>';
+      final theName = 'SimpleClassOf$genericArgClassPart';
+
+      var genericArgFixed = genericArg;
+
+      if (genericArgFixed == recordType) {
+        genericArgFixed = sampleRecordDefinition;
+      }
+
+      genericArgFixed = genericArgFixed.replaceFirst(
+        ',$recordType',
+        ',$sampleRecordDefinition',
+      );
+
+      final genericType = type == recordType
+          ? '${theName}TypeDef'
+          : '$type<$genericArgFixed>';
+
+      if (type == recordType) {
+        buffer.writeln(
+          'typedef $genericType = '
+          '($genericArgFixed, {$genericArgFixed named});',
+        );
+      }
 
       buffer
         ..write(
           Replacement.generate(
-            simpleClassContent.replaceAll(
-              'SimpleClass',
-              'SimpleClassOf$genericArgClassPart',
-            ),
+            simpleClassContent.replaceAll('SimpleClass', theName),
             _libReplacements(genericType),
           ),
         )
@@ -91,36 +128,51 @@ class TestTypeData {
         );
     }
 
+    final defaultValueFuncBody = _defaultValueFuncBody(type);
+
+    if (defaultValueFuncBody != null) {
+      buffer.write(defaultValueFuncBody);
+    }
+
     return buffer.toString();
   }
 
+  String? _defaultValueFuncBody(String type) {
+    if (stringParseType) {
+      return '$type _defaultValueFunc() => $type.parse($jsonExpression);';
+    }
+
+    return null;
+  }
+
+  String? get _annotationDefaultValue {
+    if (stringParseType) {
+      return '_defaultValueFunc';
+    }
+
+    return defaultExpression;
+  }
+
   Iterable<Replacement> _libReplacements(String type) sync* {
-    yield Replacement(
-      'final dynamic value;',
-      'final $type value;',
-    );
+    yield Replacement('final dynamic value;', 'final $type value;');
 
-    final defaultNotSupported = defaultExpression == null // no default provided
+    final defaultNotSupported =
+        _annotationDefaultValue ==
+            null // no default provided
             ||
-            type.contains('<') // no support for default values and generic args
+        type.contains('<') // no support for default values and generic args
         ;
 
     final defaultReplacement = defaultNotSupported
         ? ''
         : _defaultSource
-            .replaceFirst('42', defaultExpression!)
-            .replaceFirst('dynamic', type);
+              .replaceFirst('42', _annotationDefaultValue!)
+              .replaceFirst('dynamic', type);
 
-    yield Replacement(
-      _defaultSource,
-      defaultReplacement,
-    );
+    yield Replacement(_defaultSource, defaultReplacement);
 
     if (defaultNotSupported) {
-      yield const Replacement(
-        '    this.withDefault,',
-        '',
-      );
+      yield const Replacement('this.withDefault', '');
     }
   }
 
@@ -137,8 +189,9 @@ class TestTypeData {
         .replaceAll('non-nullable', 'nullable')
         .replaceAll('SimpleClass', 'SimpleClassNullable');
 
-    final thrownError =
-        type == customEnumType ? 'throwsArgumentError' : 'throwsTypeError';
+    final thrownError = type == customEnumType
+        ? 'throwsArgumentError'
+        : 'throwsTypeError';
 
     final newGroupContent = groupContent.replaceAll(
       r'''
@@ -164,10 +217,12 @@ class TestTypeData {
       sourceContent.substring(endIndex),
     ].join();
 
-    return Replacement.generate(
+    final value = Replacement.generate(
       updatedSourceContent,
       _testReplacements(type),
     );
+
+    return _formatter.format(value);
   }
 
   Iterable<Replacement> _testReplacements(String type) sync* {
@@ -178,24 +233,18 @@ class TestTypeData {
 
     yield Replacement(
       '''
-final _defaultValue = 42;
-final _altValue = 43;
+const _defaultValue = 42;
+const _altValue = 43;
 ''',
       '''
-final _defaultValue = $jsonExpression;
-final _altValue = $altJsonExpression;
+const _defaultValue = $jsonExpression;
+const _altValue = $altJsonExpression;
 ''',
     );
 
-    if (defaultExpression == null) {
-      yield const Replacement(
-        "  'withDefault': _defaultValue,\n",
-        '',
-      );
-      yield const Replacement(
-        "  'withDefault': _altValue,\n",
-        '',
-      );
+    if (defaultExpression == null && !stringParseType) {
+      yield const Replacement("'withDefault': _defaultValue", '');
+      yield const Replacement("'withDefault': _altValue", '');
     }
   }
 
@@ -206,13 +255,16 @@ final _altValue = $altJsonExpression;
 ''';
 }
 
+final _formatter = DartFormatter(
+  languageVersion:
+      // Using parse here so searching for the version string is easier!
+      Version.parse('3.8.0'),
+);
+
 String _genericClassPart(String genericArg) => genericArg
     .replaceAll('?', 'Nullable')
     .split(',')
-    .map((e) => [
-          e.substring(0, 1).toUpperCase(),
-          e.substring(1),
-        ].join())
+    .map((e) => [e.substring(0, 1).toUpperCase(), e.substring(1)].join())
     .join('To');
 
 String toTypeExtension(String e, {bool includeDotDart = true}) =>
diff --git a/pubspec.yaml b/pubspec.yaml
new file mode 100644
index 000000000..a5ba24d13
--- /dev/null
+++ b/pubspec.yaml
@@ -0,0 +1,15 @@
+name: json_serial_workspace     # Can be anything
+environment:
+  sdk: ^3.8.0
+
+publish_to: none
+
+dev_dependencies:
+  dart_flutter_team_lints: ^3.2.0
+workspace:
+  - _test_yaml
+  - checked_yaml
+  - example
+  - json_annotation
+  - json_serializable
+  - shared_test
diff --git a/shared_test/lib/shared_test.dart b/shared_test/lib/shared_test.dart
new file mode 100644
index 000000000..3085effbf
--- /dev/null
+++ b/shared_test/lib/shared_test.dart
@@ -0,0 +1,57 @@
+import 'dart:convert';
+
+import 'package:stack_trace/stack_trace.dart';
+import 'package:test/test.dart';
+
+final throwsTypeError = throwsA(isTypeError);
+
+final isTypeError = isA<TypeError>();
+
+/// Prints out nested causes before throwing `JsonUnsupportedObjectError`.
+String loudEncode(Object? object) {
+  try {
+    return const JsonEncoder.withIndent(' ').convert(object);
+  } catch (e) {
+    if (e is JsonUnsupportedObjectError) {
+      Object? error = e;
+
+      var count = 1;
+
+      while (error is JsonUnsupportedObjectError) {
+        print(
+          '(${count++}) $error ${error.unsupportedObject} '
+          '(${error.unsupportedObject.runtimeType}) !!!',
+        );
+        print(Trace.from(error.stackTrace!).terse);
+        error = error.cause;
+      }
+
+      if (error != null) {
+        print('(${count++}) $error ???');
+        if (error is Error) {
+          print(Trace.from(error.stackTrace!).terse);
+        }
+      }
+    }
+    rethrow;
+  }
+}
+
+T roundTripObject<T>(
+  T object,
+  T Function(Map<String, dynamic> json) factory, {
+  bool skipObjectEquals = false,
+}) {
+  final data = loudEncode(object);
+
+  final object2 = factory(json.decode(data) as Map<String, dynamic>);
+
+  if (!skipObjectEquals) {
+    expect(object2, equals(object));
+  }
+
+  final json2 = loudEncode(object2);
+
+  expect(json2, equals(data));
+  return object2;
+}
diff --git a/shared_test/mono_pkg.yaml b/shared_test/mono_pkg.yaml
new file mode 100644
index 000000000..090f30901
--- /dev/null
+++ b/shared_test/mono_pkg.yaml
@@ -0,0 +1,2 @@
+# No tests to run, this only registers this package with mono_repo for
+# commands like `mono_repo pub get`.
diff --git a/shared_test/pubspec.yaml b/shared_test/pubspec.yaml
new file mode 100644
index 000000000..9b6990a4b
--- /dev/null
+++ b/shared_test/pubspec.yaml
@@ -0,0 +1,10 @@
+name: _json_serial_shared_test
+publish_to: none
+environment:
+  sdk: ^3.8.0
+
+resolution: workspace
+
+dependencies:
+  stack_trace: ^1.10.0
+  test: ^1.6.0
diff --git a/tool/ci.sh b/tool/ci.sh
index 747f00558..8cecb2e3d 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
-# Created with package:mono_repo v5.0.4
+# Created with package:mono_repo v6.6.3
 
 # 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".
+# then "flutter pub" is called instead of "dart pub".
 # This assumes that the Flutter SDK has been installed in a previous step.
 function pub() {
   if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
@@ -12,18 +13,13 @@ function pub() {
     command dart pub "$@"
   fi
 }
-# 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 format() {
-  if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
-    command flutter format "$@"
-  else
-    command dart format "$@"
-  fi
+  command dart format "$@"
 }
+
 # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
-# then "flutter" is called instead of "pub".
+# then "flutter analyze" is called instead of "dart analyze".
 # This assumes that the Flutter SDK has been installed in a previous step.
 function analyze() {
   if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
@@ -67,10 +63,14 @@ for PKG in ${PKGS}; do
       echo
       echo -e "\033[1mPKG: ${PKG}; TASK: ${TASK}\033[22m"
       case ${TASK} in
-      analyze)
+      analyze_0)
         echo 'dart analyze --fatal-infos .'
         dart analyze --fatal-infos . || EXIT_CODE=$?
         ;;
+      analyze_1)
+        echo 'dart analyze'
+        dart analyze || EXIT_CODE=$?
+        ;;
       format)
         echo 'dart format --output=none --set-exit-if-changed .'
         dart format --output=none --set-exit-if-changed . || EXIT_CODE=$?