Skip to content

Commit af92a47

Browse files
author
Mad Sheogorath
committed
Enums and Types are now can be referenced from another manifest files.
Added some details for compiler error messages.
1 parent 4b015fa commit af92a47

File tree

11 files changed

+230
-172
lines changed

11 files changed

+230
-172
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v1.1.0
2+
* Enums and Types are now can be referenced from another manifest files.
3+
* Added some details for compiler error messages.
4+
15
## v1.0.1
26
* Bugfix: it was impossible to refer type declared after current one.
37

‎example/generated/example-posts.generated.dart‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class GetAllResponsePostAuthor extends PackMeMessage {
66
required this.nickname,
77
required this.avatar,
88
});
9-
GetAllResponsePostAuthor._empty();
9+
GetAllResponsePostAuthor.$empty();
1010

1111
late List<int> id;
1212
late String nickname;
@@ -56,7 +56,7 @@ class GetAllResponsePost extends PackMeMessage {
5656
required this.shortContent,
5757
required this.posted,
5858
});
59-
GetAllResponsePost._empty();
59+
GetAllResponsePost.$empty();
6060

6161
late List<int> id;
6262
late GetAllResponsePostAuthor author;
@@ -93,7 +93,7 @@ class GetAllResponsePost extends PackMeMessage {
9393
for (int i = 0; i < idLength; i++) {
9494
id.add($unpackUint8());
9595
}
96-
author = $unpackMessage(GetAllResponsePostAuthor._empty());
96+
author = $unpackMessage(GetAllResponsePostAuthor.$empty());
9797
title = $unpackString();
9898
shortContent = $unpackString();
9999
posted = $unpackDateTime();
@@ -109,7 +109,7 @@ class GetAllResponse extends PackMeMessage {
109109
GetAllResponse({
110110
required this.posts,
111111
});
112-
GetAllResponse._empty();
112+
GetAllResponse.$empty();
113113

114114
late List<GetAllResponsePost> posts;
115115

@@ -135,7 +135,7 @@ class GetAllResponse extends PackMeMessage {
135135
posts = <GetAllResponsePost>[];
136136
final int postsLength = $unpackUint32();
137137
for (int i = 0; i < postsLength; i++) {
138-
posts.add($unpackMessage(GetAllResponsePost._empty()));
138+
posts.add($unpackMessage(GetAllResponsePost.$empty()));
139139
}
140140
}
141141

@@ -147,7 +147,7 @@ class GetAllResponse extends PackMeMessage {
147147

148148
class GetAllRequest extends PackMeMessage {
149149
GetAllRequest();
150-
GetAllRequest._empty();
150+
GetAllRequest.$empty();
151151

152152

153153
GetAllResponse $response({
@@ -190,7 +190,7 @@ class GetResponseAuthor extends PackMeMessage {
190190
this.twitterId,
191191
this.instagramId,
192192
});
193-
GetResponseAuthor._empty();
193+
GetResponseAuthor.$empty();
194194

195195
late List<int> id;
196196
late String nickname;
@@ -266,7 +266,7 @@ class GetResponseStats extends PackMeMessage {
266266
required this.likes,
267267
required this.dislikes,
268268
});
269-
GetResponseStats._empty();
269+
GetResponseStats.$empty();
270270

271271
late int likes;
272272
late int dislikes;
@@ -302,7 +302,7 @@ class GetResponseCommentAuthor extends PackMeMessage {
302302
required this.nickname,
303303
required this.avatar,
304304
});
305-
GetResponseCommentAuthor._empty();
305+
GetResponseCommentAuthor.$empty();
306306

307307
late List<int> id;
308308
late String nickname;
@@ -350,7 +350,7 @@ class GetResponseComment extends PackMeMessage {
350350
required this.comment,
351351
required this.posted,
352352
});
353-
GetResponseComment._empty();
353+
GetResponseComment.$empty();
354354

355355
late GetResponseCommentAuthor author;
356356
late String comment;
@@ -374,7 +374,7 @@ class GetResponseComment extends PackMeMessage {
374374

375375
@override
376376
void $unpack() {
377-
author = $unpackMessage(GetResponseCommentAuthor._empty());
377+
author = $unpackMessage(GetResponseCommentAuthor.$empty());
378378
comment = $unpackString();
379379
posted = $unpackDateTime();
380380
}
@@ -394,7 +394,7 @@ class GetResponse extends PackMeMessage {
394394
required this.stats,
395395
required this.comments,
396396
});
397-
GetResponse._empty();
397+
GetResponse.$empty();
398398

399399
late String title;
400400
late String content;
@@ -434,12 +434,12 @@ class GetResponse extends PackMeMessage {
434434
title = $unpackString();
435435
content = $unpackString();
436436
posted = $unpackDateTime();
437-
author = $unpackMessage(GetResponseAuthor._empty());
438-
stats = $unpackMessage(GetResponseStats._empty());
437+
author = $unpackMessage(GetResponseAuthor.$empty());
438+
stats = $unpackMessage(GetResponseStats.$empty());
439439
comments = <GetResponseComment>[];
440440
final int commentsLength = $unpackUint32();
441441
for (int i = 0; i < commentsLength; i++) {
442-
comments.add($unpackMessage(GetResponseComment._empty()));
442+
comments.add($unpackMessage(GetResponseComment.$empty()));
443443
}
444444
}
445445

@@ -453,7 +453,7 @@ class GetRequest extends PackMeMessage {
453453
GetRequest({
454454
required this.postId,
455455
});
456-
GetRequest._empty();
456+
GetRequest.$empty();
457457

458458
late List<int> postId;
459459

@@ -506,7 +506,7 @@ class DeleteResponse extends PackMeMessage {
506506
DeleteResponse({
507507
this.error,
508508
});
509-
DeleteResponse._empty();
509+
DeleteResponse.$empty();
510510

511511
String? error;
512512

@@ -547,7 +547,7 @@ class DeleteRequest extends PackMeMessage {
547547
DeleteRequest({
548548
required this.postId,
549549
});
550-
DeleteRequest._empty();
550+
DeleteRequest.$empty();
551551

552552
late List<int> postId;
553553

@@ -592,10 +592,10 @@ class DeleteRequest extends PackMeMessage {
592592
}
593593

594594
final Map<int, PackMeMessage Function()> examplePostsMessageFactory = <int, PackMeMessage Function()>{
595-
280110613: () => GetAllResponse._empty(),
596-
63570112: () => GetAllRequest._empty(),
597-
244485545: () => GetResponse._empty(),
598-
187698222: () => GetRequest._empty(),
599-
788388804: () => DeleteResponse._empty(),
600-
486637631: () => DeleteRequest._empty(),
595+
280110613: () => GetAllResponse.$empty(),
596+
63570112: () => GetAllRequest.$empty(),
597+
244485545: () => GetResponse.$empty(),
598+
187698222: () => GetRequest.$empty(),
599+
788388804: () => DeleteResponse.$empty(),
600+
486637631: () => DeleteRequest.$empty(),
601601
};

‎example/generated/example-users.generated.dart‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class GetAllResponseUser extends PackMeMessage {
88
this.lastName,
99
this.age,
1010
});
11-
GetAllResponseUser._empty();
11+
GetAllResponseUser.$empty();
1212

1313
late List<int> id;
1414
late String nickname;
@@ -79,7 +79,7 @@ class GetAllResponse extends PackMeMessage {
7979
GetAllResponse({
8080
required this.users,
8181
});
82-
GetAllResponse._empty();
82+
GetAllResponse.$empty();
8383

8484
late List<GetAllResponseUser> users;
8585

@@ -105,7 +105,7 @@ class GetAllResponse extends PackMeMessage {
105105
users = <GetAllResponseUser>[];
106106
final int usersLength = $unpackUint32();
107107
for (int i = 0; i < usersLength; i++) {
108-
users.add($unpackMessage(GetAllResponseUser._empty()));
108+
users.add($unpackMessage(GetAllResponseUser.$empty()));
109109
}
110110
}
111111

@@ -117,7 +117,7 @@ class GetAllResponse extends PackMeMessage {
117117

118118
class GetAllRequest extends PackMeMessage {
119119
GetAllRequest();
120-
GetAllRequest._empty();
120+
GetAllRequest.$empty();
121121

122122

123123
GetAllResponse $response({
@@ -159,7 +159,7 @@ class GetResponseInfo extends PackMeMessage {
159159
this.age,
160160
this.birthDate,
161161
});
162-
GetResponseInfo._empty();
162+
GetResponseInfo.$empty();
163163

164164
String? firstName;
165165
String? lastName;
@@ -236,7 +236,7 @@ class GetResponseSocial extends PackMeMessage {
236236
this.twitterId,
237237
this.instagramId,
238238
});
239-
GetResponseSocial._empty();
239+
GetResponseSocial.$empty();
240240

241241
String? facebookId;
242242
String? twitterId;
@@ -297,7 +297,7 @@ class GetResponseStats extends PackMeMessage {
297297
required this.dislikes,
298298
required this.rating,
299299
});
300-
GetResponseStats._empty();
300+
GetResponseStats.$empty();
301301

302302
late int posts;
303303
late int comments;
@@ -341,7 +341,7 @@ class GetResponseLastActive extends PackMeMessage {
341341
required this.datetime,
342342
required this.ip,
343343
});
344-
GetResponseLastActive._empty();
344+
GetResponseLastActive.$empty();
345345

346346
late DateTime datetime;
347347
late String ip;
@@ -378,7 +378,7 @@ class GetResponseSession extends PackMeMessage {
378378
required this.ip,
379379
required this.active,
380380
});
381-
GetResponseSession._empty();
381+
GetResponseSession.$empty();
382382

383383
late DateTime created;
384384
late String ip;
@@ -424,7 +424,7 @@ class GetResponse extends PackMeMessage {
424424
this.lastActive,
425425
required this.sessions,
426426
});
427-
GetResponse._empty();
427+
GetResponse.$empty();
428428

429429
late String email;
430430
late String nickname;
@@ -478,16 +478,16 @@ class GetResponse extends PackMeMessage {
478478
nickname = $unpackString();
479479
hidden = $unpackBool();
480480
created = $unpackDateTime();
481-
info = $unpackMessage(GetResponseInfo._empty());
482-
social = $unpackMessage(GetResponseSocial._empty());
483-
stats = $unpackMessage(GetResponseStats._empty());
481+
info = $unpackMessage(GetResponseInfo.$empty());
482+
social = $unpackMessage(GetResponseSocial.$empty());
483+
stats = $unpackMessage(GetResponseStats.$empty());
484484
if ($getFlag()) {
485-
lastActive = $unpackMessage(GetResponseLastActive._empty());
485+
lastActive = $unpackMessage(GetResponseLastActive.$empty());
486486
}
487487
sessions = <GetResponseSession>[];
488488
final int sessionsLength = $unpackUint32();
489489
for (int i = 0; i < sessionsLength; i++) {
490-
sessions.add($unpackMessage(GetResponseSession._empty()));
490+
sessions.add($unpackMessage(GetResponseSession.$empty()));
491491
}
492492
}
493493

@@ -501,7 +501,7 @@ class GetRequest extends PackMeMessage {
501501
GetRequest({
502502
required this.userId,
503503
});
504-
GetRequest._empty();
504+
GetRequest.$empty();
505505

506506
late List<int> userId;
507507

@@ -557,7 +557,7 @@ class DeleteResponse extends PackMeMessage {
557557
DeleteResponse({
558558
this.error,
559559
});
560-
DeleteResponse._empty();
560+
DeleteResponse.$empty();
561561

562562
String? error;
563563

@@ -598,7 +598,7 @@ class DeleteRequest extends PackMeMessage {
598598
DeleteRequest({
599599
required this.userId,
600600
});
601-
DeleteRequest._empty();
601+
DeleteRequest.$empty();
602602

603603
late List<int> userId;
604604

@@ -647,7 +647,7 @@ class UpdateSessionMessage extends PackMeMessage {
647647
required this.userId,
648648
required this.sessionId,
649649
});
650-
UpdateSessionMessage._empty();
650+
UpdateSessionMessage.$empty();
651651

652652
late List<int> userId;
653653
late String sessionId;
@@ -688,11 +688,11 @@ class UpdateSessionMessage extends PackMeMessage {
688688
}
689689

690690
final Map<int, PackMeMessage Function()> exampleUsersMessageFactory = <int, PackMeMessage Function()>{
691-
242206268: () => GetAllResponse._empty(),
692-
12982278: () => GetAllRequest._empty(),
693-
430536944: () => GetResponse._empty(),
694-
781905656: () => GetRequest._empty(),
695-
69897231: () => DeleteResponse._empty(),
696-
808423104: () => DeleteRequest._empty(),
697-
743336169: () => UpdateSessionMessage._empty(),
691+
242206268: () => GetAllResponse.$empty(),
692+
12982278: () => GetAllRequest.$empty(),
693+
430536944: () => GetResponse.$empty(),
694+
781905656: () => GetRequest.$empty(),
695+
69897231: () => DeleteResponse.$empty(),
696+
808423104: () => DeleteRequest.$empty(),
697+
743336169: () => UpdateSessionMessage.$empty(),
698698
};

‎example/generated/example.generated.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class NestedObject extends PackMeMessage {
1111
required this.a,
1212
required this.b,
1313
});
14-
NestedObject._empty();
14+
NestedObject.$empty();
1515

1616
late int a;
1717
late String b;
@@ -61,7 +61,7 @@ class TestMessage extends PackMeMessage {
6161
required this.reqNested,
6262
this.optNested,
6363
});
64-
TestMessage._empty();
64+
TestMessage.$empty();
6565

6666
late int reqInt8;
6767
late int reqUint16;
@@ -190,9 +190,9 @@ class TestMessage extends PackMeMessage {
190190
if ($getFlag()) {
191191
optEnum = TypeEnum.values[$unpackUint8()];
192192
}
193-
reqNested = $unpackMessage(NestedObject._empty());
193+
reqNested = $unpackMessage(NestedObject.$empty());
194194
if ($getFlag()) {
195-
optNested = $unpackMessage(NestedObject._empty());
195+
optNested = $unpackMessage(NestedObject.$empty());
196196
}
197197
}
198198

@@ -203,5 +203,5 @@ class TestMessage extends PackMeMessage {
203203
}
204204

205205
final Map<int, PackMeMessage Function()> exampleMessageFactory = <int, PackMeMessage Function()>{
206-
475203406: () => TestMessage._empty(),
206+
475203406: () => TestMessage.$empty(),
207207
};

0 commit comments

Comments
 (0)