Dissolve package:messages_deserializer for pub publish (#751)

.github/labeler.yml

@@ -18,9 +18,6 @@
 'package:messages_serializer':
   - 'pkgs/messages_serializer/**'
 
-'package:messages_deserializer':
-  - 'pkgs/messages_deserializer/**'
-
 'package:messages_builder':
   - 'pkgs/messages_builder/**'
 

pkgs/messages/README.md

@@ -26,9 +26,7 @@ To enable localization which supports
 The package is partitioned to allow a package to consume some parts of the library only as a `dev_dependency`, not including the message building and serialization packages in the dependencies for the application.
 
 ### `messages`
-Contains the interface for a `MessageList` and the different subtypes of `Message`s. Has a dependency on `messages_deserializer` to parse a data file into a `MessageList`.
-### `messages_deserializer`
-The logic for deserializing the data files into `MessageList`s.
+Contains the interface for a `MessageList` and the different subtypes of `Message`s as well as the functionality to parse a data file into a `MessageList`.
 ### `messages_builder`
 The `builder` to generate the named methods and data files from the input `arb` translation files. Has a dependency on `messages_serializer` and `messages`.
 

pkgs/messages/example_json/pubspec_overrides.yaml

@@ -3,5 +3,3 @@ dependency_overrides:
     path: ../
   messages_serializer:
     path: ../../messages_serializer
-  messages_deserializer:
-    path: ../../messages_deserializer

pkgs/messages/lib/messages.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.
 
+export 'src/deserializer/deserializer.dart';
 export 'src/intl_object.dart' show IntlObject;
 export 'src/intl_style_lookup.dart' show Intl;
 export 'src/message_format.dart';

pkgs/messages/lib/messages_json.dart

@@ -3,4 +3,5 @@
 // BSD-style license that can be found in the LICENSE file.
 
 export 'messages.dart';
+export 'src/deserializer/deserializer_json.dart';
 export 'src/message_list_json.dart';

pkgs/messages_deserializer/lib/src/deserializer.dart → pkgs/messages/lib/src/deserializer/deserializer.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:messages/messages.dart';
+import '../intl_object.dart';
+import '../message_format.dart';
 
 abstract class Deserializer<T extends MessageList> {
   T deserialize(IntlObject intl);

pkgs/messages_deserializer/lib/src/deserializer_json.dart → pkgs/messages/lib/src/deserializer/deserializer_json.dart

@@ -4,8 +4,9 @@
 
 import 'dart:convert';
 
-import 'package:messages/messages_json.dart';
-
+import '../intl_object.dart';
+import '../message_format.dart';
+import '../message_list_json.dart';
 import 'deserializer.dart';
 
 class JsonDeserializer extends Deserializer<MessageListJson> {

pkgs/messages/lib/src/intl_object.dart

@@ -8,7 +8,7 @@ abstract class IntlObject {
   const IntlObject();
 
   Message gender(
-    Gender gender,
+    GenderEnum gender,
     Message? female,
     Message? male,
     Message other,

pkgs/messages/lib/src/message.dart

@@ -106,7 +106,7 @@ final class GenderMessage extends Message {
   }) {
     return intl
         .gender(
-          allArgs[argIndex] as Gender,
+          allArgs[argIndex] as GenderEnum,
           female,
           male,
           other,
@@ -120,7 +120,7 @@ final class GenderMessage extends Message {
   }
 }
 
-enum Gender {
+enum GenderEnum {
   female,
   male,
   other;

pkgs/messages/lib/src/message_list_json.dart

@@ -2,8 +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:messages_deserializer/messages_deserializer.dart';
-
+import 'deserializer/deserializer_json.dart';
 import 'intl_object.dart';
 import 'message_format.dart';
 

pkgs/messages/lib/src/old_intl_object.dart

@@ -11,7 +11,7 @@ class OldIntlObject extends IntlObject {
   const OldIntlObject();
   @override
   Message gender(
-    Gender gender,
+    GenderEnum gender,
     Message? female,
     Message? male,
     Message other,

pkgs/messages/pubspec.yaml

@@ -9,7 +9,6 @@ environment:
 dependencies:
   collection: ^1.17.1
   intl: ^0.18.0
-  messages_deserializer: ^0.1.0
 
 dev_dependencies:
   dart_flutter_team_lints: ^2.1.1

pkgs/messages/pubspec_overrides.yaml

@@ -1,5 +1,3 @@
 dependency_overrides:
   messages_serializer:
     path: ../messages_serializer
-  messages_deserializer:
-    path: ../messages_deserializer

pkgs/messages_builder/pubspec.yaml

@@ -23,5 +23,4 @@ dev_dependencies:
   build_runner: ^2.0.0
   build_web_compilers: ^4.0.5
   dart_flutter_team_lints: ^2.1.1
-  messages_deserializer: ^0.1.0
   test: ^1.16.0

pkgs/messages_builder/pubspec_overrides.yaml

@@ -3,5 +3,3 @@ dependency_overrides:
     path: ../messages
   messages_serializer:
     path: ../messages_serializer
-  messages_deserializer:
-    path: ../messages_deserializer

pkgs/messages_builder/test/web_deserializer_native_test.dart

@@ -5,11 +5,10 @@
 import 'dart:convert';
 
 import 'package:build/src/asset/id.dart';
-import 'package:messages/messages.dart';
+import 'package:messages/messages_json.dart';
 import 'package:messages/package_intl_object.dart';
 import 'package:messages_builder/arb_parser.dart';
 import 'package:messages_builder/message_with_metadata.dart';
-import 'package:messages_deserializer/messages_deserializer.dart';
 import 'package:messages_serializer/messages_serializer.dart';
 import 'package:test/test.dart';
 

pkgs/messages_serializer/pubspec.yaml

@@ -12,5 +12,4 @@ dependencies:
 
 dev_dependencies:
   dart_flutter_team_lints: ^2.1.1
-  messages_deserializer: ^0.1.0
   test: ^1.21.0

pkgs/messages_serializer/pubspec_overrides.yaml

@@ -1,5 +1,3 @@
 dependency_overrides:
   messages:
     path: ../messages
-  messages_deserializer:
-    path: ../messages_deserializer

pkgs/messages_serializer/test/messages_serializer_test.dart

@@ -6,7 +6,6 @@ import 'dart:math';
 
 import 'package:messages/messages_json.dart';
 import 'package:messages/package_intl_object.dart';
-import 'package:messages_deserializer/messages_deserializer.dart';
 import 'package:messages_serializer/messages_serializer.dart';
 import 'package:test/test.dart';
 

pkgs/messages_shrinker/lib/messages_shrinker.dart

@@ -5,8 +5,8 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:messages/messages_json.dart';
 import 'package:messages/package_intl_object.dart';
-import 'package:messages_deserializer/messages_deserializer.dart';
 import 'package:messages_serializer/messages_serializer.dart';
 
 class MessageShrinker {

pkgs/messages_shrinker/pubspec.yaml

@@ -13,7 +13,6 @@ dependencies:
   build: ^2.4.1
   messages: ^0.1.0
   messages_builder: ^0.1.0
-  messages_deserializer: ^0.1.0
   messages_serializer: ^0.1.0
 
 dev_dependencies:

pkgs/messages_shrinker/pubspec_overrides.yaml

@@ -3,7 +3,5 @@ dependency_overrides:
     path: ../messages
   messages_serializer:
     path: ../messages_serializer
-  messages_deserializer:
-    path: ../messages_deserializer
   messages_builder:
     path: ../messages_builder

pkgs/messages_shrinker/test/message_shrinker_test.dart

@@ -9,9 +9,9 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:build/build.dart';
+import 'package:messages/messages_json.dart';
 import 'package:messages/package_intl_object.dart';
 import 'package:messages_builder/arb_parser.dart';
-import 'package:messages_deserializer/messages_deserializer.dart';
 import 'package:messages_serializer/messages_serializer.dart';
 import 'package:messages_shrinker/messages_shrinker.dart';
 import 'package:test/test.dart';