This repository has been archived by the owner on Oct 2, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #205 from comigor/tojson-prefix-fix
toJson() doesn't remove "kw$" prefix
- Loading branch information
Showing
7 changed files
with
243 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| # CHANGELOG | ||
|
|
||
| ## 6.9.2-beta.1 | ||
| - Fixed `toJson() doesn't remove "kw$" prefix` | ||
|
|
||
| ## 6.8.2-beta.1 | ||
| - test fix | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| // @dart = 2.8 | ||
|
|
||
| import 'package:artemis/generator/data/data.dart'; | ||
| import 'package:artemis/generator/data/enum_value_definition.dart'; | ||
| import 'package:test/test.dart'; | ||
|
|
||
| import '../../helpers.dart'; | ||
|
|
||
| void main() { | ||
| group('On enums', () { | ||
| test( | ||
| 'Should correctly proceed enum fields with `kw` prefix', | ||
| () async => testGenerator( | ||
| query: query, | ||
| schema: r''' | ||
| type Query { | ||
| articles(titleWhere: ArticleTitleWhereConditions): [Article!] | ||
| } | ||
| input ArticleTitleWhereConditions { | ||
| operator: SQLOperator | ||
| value: String | ||
| } | ||
| type Article { | ||
| id: ID! | ||
| title: String! | ||
| } | ||
| enum SQLOperator { | ||
| EQ | ||
| IN | ||
| } | ||
| ''', | ||
| libraryDefinition: libraryDefinition, | ||
| generatedFile: generatedFile, | ||
| ), | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| const query = r''' | ||
| query SearchArticles($titleWhere: ArticleTitleWhereConditions) { | ||
| articles(titleWhere: $titleWhere) { | ||
| id | ||
| title | ||
| } | ||
| } | ||
| '''; | ||
|
|
||
| final LibraryDefinition libraryDefinition = | ||
| LibraryDefinition(basename: r'query.graphql', queries: [ | ||
| QueryDefinition( | ||
| name: QueryName(name: r'SearchArticles$_Query'), | ||
| operationName: r'SearchArticles', | ||
| classes: [ | ||
| EnumDefinition(name: EnumName(name: r'SQLOperator'), values: [ | ||
| EnumValueDefinition(name: EnumValueName(name: r'EQ')), | ||
| EnumValueDefinition(name: EnumValueName(name: r'IN')), | ||
| EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN')) | ||
| ]), | ||
| ClassDefinition( | ||
| name: ClassName(name: r'SearchArticles$_Query$_Article'), | ||
| properties: [ | ||
| ClassProperty( | ||
| type: TypeName(name: r'String'), | ||
| name: ClassPropertyName(name: r'id'), | ||
| isNonNull: true, | ||
| isResolveType: false), | ||
| ClassProperty( | ||
| type: TypeName(name: r'String'), | ||
| name: ClassPropertyName(name: r'title'), | ||
| isNonNull: true, | ||
| isResolveType: false) | ||
| ], | ||
| factoryPossibilities: {}, | ||
| typeNameField: TypeName(name: r'__typename'), | ||
| isInput: false), | ||
| ClassDefinition( | ||
| name: ClassName(name: r'SearchArticles$_Query'), | ||
| properties: [ | ||
| ClassProperty( | ||
| type: TypeName(name: r'List<SearchArticles$Query$Article>'), | ||
| name: ClassPropertyName(name: r'articles'), | ||
| isNonNull: false, | ||
| isResolveType: false) | ||
| ], | ||
| factoryPossibilities: {}, | ||
| typeNameField: TypeName(name: r'__typename'), | ||
| isInput: false), | ||
| ClassDefinition( | ||
| name: ClassName(name: r'ArticleTitleWhereConditions'), | ||
| properties: [ | ||
| ClassProperty( | ||
| type: TypeName(name: r'SQLOperator'), | ||
| name: ClassPropertyName(name: r'operator'), | ||
| annotations: [ | ||
| r'''JsonKey(name: 'operator', unknownEnumValue: SQLOperator.artemisUnknown)''' | ||
| ], | ||
| isNonNull: false, | ||
| isResolveType: false), | ||
| ClassProperty( | ||
| type: TypeName(name: r'String'), | ||
| name: ClassPropertyName(name: r'value'), | ||
| isNonNull: false, | ||
| isResolveType: false) | ||
| ], | ||
| factoryPossibilities: {}, | ||
| typeNameField: TypeName(name: r'__typename'), | ||
| isInput: true) | ||
| ], | ||
| inputs: [ | ||
| QueryInput( | ||
| type: TypeName(name: r'ArticleTitleWhereConditions'), | ||
| name: QueryInputName(name: r'titleWhere'), | ||
| isNonNull: false) | ||
| ], | ||
| generateHelpers: false, | ||
| suffix: r'Query') | ||
| ]); | ||
|
|
||
| const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND | ||
| import 'package:json_annotation/json_annotation.dart'; | ||
| import 'package:equatable/equatable.dart'; | ||
| import 'package:gql/ast.dart'; | ||
| part 'query.graphql.g.dart'; | ||
| @JsonSerializable(explicitToJson: true) | ||
| class SearchArticles$Query$Article with EquatableMixin { | ||
| SearchArticles$Query$Article(); | ||
| factory SearchArticles$Query$Article.fromJson(Map<String, dynamic> json) => | ||
| _$SearchArticles$Query$ArticleFromJson(json); | ||
| String id; | ||
| String title; | ||
| @override | ||
| List<Object> get props => [id, title]; | ||
| Map<String, dynamic> toJson() => _$SearchArticles$Query$ArticleToJson(this); | ||
| } | ||
| @JsonSerializable(explicitToJson: true) | ||
| class SearchArticles$Query with EquatableMixin { | ||
| SearchArticles$Query(); | ||
| factory SearchArticles$Query.fromJson(Map<String, dynamic> json) => | ||
| _$SearchArticles$QueryFromJson(json); | ||
| List<SearchArticles$Query$Article> articles; | ||
| @override | ||
| List<Object> get props => [articles]; | ||
| Map<String, dynamic> toJson() => _$SearchArticles$QueryToJson(this); | ||
| } | ||
| @JsonSerializable(explicitToJson: true) | ||
| class ArticleTitleWhereConditions with EquatableMixin { | ||
| ArticleTitleWhereConditions({this.kw$operator, this.value}); | ||
| factory ArticleTitleWhereConditions.fromJson(Map<String, dynamic> json) => | ||
| _$ArticleTitleWhereConditionsFromJson(json); | ||
| @JsonKey(name: 'operator', unknownEnumValue: SQLOperator.artemisUnknown) | ||
| SQLOperator kw$operator; | ||
| String value; | ||
| @override | ||
| List<Object> get props => [kw$operator, value]; | ||
| Map<String, dynamic> toJson() => _$ArticleTitleWhereConditionsToJson(this); | ||
| } | ||
| enum SQLOperator { | ||
| @JsonValue('EQ') | ||
| eq, | ||
| @JsonValue('IN') | ||
| kw$IN, | ||
| @JsonValue('ARTEMIS_UNKNOWN') | ||
| artemisUnknown, | ||
| } | ||
| '''; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.