fix merge conflict

juicycleff · Mar 5, 2019 · bf77d0d · bf77d0d
2 parents 09ecb32 + a51909d
commit bf77d0d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 24 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1,6 +1,6 @@
 {
-  "projectName": "graphql-flutter",
-  "projectOwner": "zino-app",
+  "projectName": "flutter-graphql",
+  "projectOwner": "juicycleff",
   "repoType": "github",
   "repoHost": "https://github.com",
   "files": [
@@ -9,6 +9,20 @@
   "imageSize": 100,
   "commit": true,
   "contributors": [
+    {
+      "login": "juicycleff",
+      "name": "Rex Raphael",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/4757453?v=4",
+      "profile": "http://rexraphael.com",
+      "contributions": [
+        "bug",
+        "code",
+        "doc",
+        "example",
+        "ideas",
+        "review"
+      ]
+    },
     {
       "login": "eusdima",
       "name": "Eustatiu Dima",

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# GraphQL Flutter
+# Flutter GraphQL
 
 [![version][version-badge]][package]
 [![MIT License][license-badge]][license]
@@ -10,7 +10,7 @@
 
 ## Table of Contents
 
-- [GraphQL Flutter](#graphql-flutter)
+- [Flutter GraphQL](#flutter-graphql)
   - [Table of Contents](#table-of-contents)
   - [About this project](#about-this-project)
   - [Installation](#installation)
@@ -25,7 +25,7 @@
   - [Roadmap](#roadmap)
   - [Contributing](#contributing)
   - [New Contributors](#new-contributors)
-  - [Base Contributors](#base-contributors)
+  - [Founding Contributors](#founding-contributors)
 
 ## About this project
 
@@ -35,6 +35,10 @@ This project combines the benefits of GraphQL with the benefits of `Streams` in
 
 The project took inspriation from the [Apollo GraphQL client](https://github.com/apollographql/apollo-client), great work guys!
 
+**Note: Still in alpha**
+
+**Docs is coming soon**
+
 ## Installation
 
 First depend on the library by adding this to your packages `pubspec.yaml`:
@@ -152,7 +156,7 @@ String typenameDataIdFromObject(Object object) {
   return null;
 }
 ```
-However note that **`graphql-flutter` does not inject __typename into operations** the way apollo does, so if you aren't careful to request them in your query, this normalization scheme is not possible.
+However note that **`flutter-graphql` does not inject __typename into operations** the way apollo does, so if you aren't careful to request them in your query, this normalization scheme is not possible.
 
 
 ### Queries
@@ -333,42 +337,39 @@ This is currently our roadmap, please feel free to request additions/changes.
 | Optimistic results      |    🔜    |
 | Client state management |    🔜    |
 | Modularity              |    🔜    |
+| Documentation      |    🔜    |
 
 ## Contributing
 
-Feel free to open a PR with any suggestions! We'll be actively working on the library ourselves.
+Feel free to open a PR with any suggestions! We'll be actively working on the library ourselves. If you need control to the repo, please contact me <a href="mailto:rex.raphael@outlook.com">Rex Raphael</a>. Please fork and send your PRs to the <a href="https://github.com/juicycleff/flutter-graphql/tree/v1.0.0">v.1.0.0</a> branch.
 
 ## New Contributors
 
-This package was originally created and published by the engineers at [Zino App BV](https://zinoapp.com). Since then the community has helped to make it even more useful for even more developers.
-
-Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
-
-Coming soon
+This package was originally created and published by the engineers at [Zino App BV](https://zinoapp.com) and with contributions from the community. However the original project has been un-maintained for months and I choose to maintain and keep this project running with other developers.
 
-## Base Contributors
+| [<img src="https://avatars2.githubusercontent.com/u/4757453?v=4" width="100px;"/><br /><sub><b>Eustatiu Dima</b></sub>](http://rexraphael.com)<br />[🐛](https://github.com/juicycleff/flutter-graphql/issues?q=author%3Ajuicycleff "Bug reports") [💻](https://github.com/juicycleff/flutter-graphql/commits?author=eusdima "Code") [📖](https://github.com/juicycleff/flutter-graphql/commits?author=eusdima "Documentation") [💡](#example-eusdima "Examples") [🤔](#ideas-juicycleff "Ideas, Planning, & Feedback") [👀](#review-eusdima "Reviewed Pull Requests") |
 
-This package was originally created and published by the engineers at [Zino App BV](https://zinoapp.com). Since then the community has helped to make it even more useful for even more developers.
+## Founding Contributors
 
 Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-| [<img src="https://avatars2.githubusercontent.com/u/4757453?v=4" width="100px;"/><br /><sub><b>Eustatiu Dima</b></sub>](http://eusdima.com)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Aeusdima "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=eusdima "Code") [📖](https://github.com/zino-app/graphql-flutter/commits?author=eusdima "Documentation") [💡](#example-eusdima "Examples") [🤔](#ideas-eusdima "Ideas, Planning, & Feedback") [👀](#review-eusdima "Reviewed Pull Requests") | [<img src="https://avatars3.githubusercontent.com/u/17142193?v=4" width="100px;"/><br /><sub><b>Zino Hofmann</b></sub>](https://github.com/HofmannZ)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3AHofmannZ "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=HofmannZ "Code") [📖](https://github.com/zino-app/graphql-flutter/commits?author=HofmannZ "Documentation") [💡](#example-HofmannZ "Examples") [🤔](#ideas-HofmannZ "Ideas, Planning, & Feedback") [🚇](#infra-HofmannZ "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-HofmannZ "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/15068096?v=4" width="100px;"/><br /><sub><b>Harkirat Saluja</b></sub>](https://github.com/jinxac)<br />[📖](https://github.com/zino-app/graphql-flutter/commits?author=jinxac "Documentation") [🤔](#ideas-jinxac "Ideas, Planning, & Feedback") | [<img src="https://avatars3.githubusercontent.com/u/5178217?v=4" width="100px;"/><br /><sub><b>Chris Muthig</b></sub>](https://github.com/camuthig)<br />[💻](https://github.com/zino-app/graphql-flutter/commits?author=camuthig "Code") [📖](https://github.com/zino-app/graphql-flutter/commits?author=camuthig "Documentation") [💡](#example-camuthig "Examples") [🤔](#ideas-camuthig "Ideas, Planning, & Feedback") | [<img src="https://avatars1.githubusercontent.com/u/7611406?v=4" width="100px;"/><br /><sub><b>Cal Pratt</b></sub>](http://stackoverflow.com/users/3280538/flkes)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Acal-pratt "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=cal-pratt "Code") [📖](https://github.com/zino-app/graphql-flutter/commits?author=cal-pratt "Documentation") [💡](#example-cal-pratt "Examples") [🤔](#ideas-cal-pratt "Ideas, Planning, & Feedback") | [<img src="https://avatars0.githubusercontent.com/u/9830761?v=4" width="100px;"/><br /><sub><b>Miroslav Valkovic-Madjer</b></sub>](http://madjer.info)<br />[💻](https://github.com/zino-app/graphql-flutter/commits?author=mmadjer "Code") | [<img src="https://avatars2.githubusercontent.com/u/4523129?v=4" width="100px;"/><br /><sub><b>Aleksandar Faraj</b></sub>](https://github.com/AleksandarFaraj)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3AAleksandarFaraj "Bug reports") |
+| [<img src="https://avatars2.githubusercontent.com/u/4757453?v=4" width="100px;"/><br /><sub><b>Eustatiu Dima</b></sub>](http://eusdima.com)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Aeusdima "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=eusdima "Code") [📖](https://github.com/zino-app/flutter-graphql/commits?author=eusdima "Documentation") [💡](#example-eusdima "Examples") [🤔](#ideas-eusdima "Ideas, Planning, & Feedback") [👀](#review-eusdima "Reviewed Pull Requests") | [<img src="https://avatars3.githubusercontent.com/u/17142193?v=4" width="100px;"/><br /><sub><b>Zino Hofmann</b></sub>](https://github.com/HofmannZ)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3AHofmannZ "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=HofmannZ "Code") [📖](https://github.com/zino-app/flutter-graphql/commits?author=HofmannZ "Documentation") [💡](#example-HofmannZ "Examples") [🤔](#ideas-HofmannZ "Ideas, Planning, & Feedback") [🚇](#infra-HofmannZ "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-HofmannZ "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/15068096?v=4" width="100px;"/><br /><sub><b>Harkirat Saluja</b></sub>](https://github.com/jinxac)<br />[📖](https://github.com/zino-app/flutter-graphql/commits?author=jinxac "Documentation") [🤔](#ideas-jinxac "Ideas, Planning, & Feedback") | [<img src="https://avatars3.githubusercontent.com/u/5178217?v=4" width="100px;"/><br /><sub><b>Chris Muthig</b></sub>](https://github.com/camuthig)<br />[💻](https://github.com/zino-app/flutter-graphql/commits?author=camuthig "Code") [📖](https://github.com/zino-app/flutter-graphql/commits?author=camuthig "Documentation") [💡](#example-camuthig "Examples") [🤔](#ideas-camuthig "Ideas, Planning, & Feedback") | [<img src="https://avatars1.githubusercontent.com/u/7611406?v=4" width="100px;"/><br /><sub><b>Cal Pratt</b></sub>](http://stackoverflow.com/users/3280538/flkes)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Acal-pratt "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=cal-pratt "Code") [📖](https://github.com/zino-app/flutter-graphql/commits?author=cal-pratt "Documentation") [💡](#example-cal-pratt "Examples") [🤔](#ideas-cal-pratt "Ideas, Planning, & Feedback") | [<img src="https://avatars0.githubusercontent.com/u/9830761?v=4" width="100px;"/><br /><sub><b>Miroslav Valkovic-Madjer</b></sub>](http://madjer.info)<br />[💻](https://github.com/zino-app/flutter-graphql/commits?author=mmadjer "Code") | [<img src="https://avatars2.githubusercontent.com/u/4523129?v=4" width="100px;"/><br /><sub><b>Aleksandar Faraj</b></sub>](https://github.com/AleksandarFaraj)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3AAleksandarFaraj "Bug reports") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars0.githubusercontent.com/u/403029?v=4" width="100px;"/><br /><sub><b>Arnaud Delcasse</b></sub>](https://www.scity.coop)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Aadelcasse "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=adelcasse "Code") | [<img src="https://avatars0.githubusercontent.com/u/959931?v=4" width="100px;"/><br /><sub><b>Dustin Graham</b></sub>](https://github.com/dustin-graham)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Adustin-graham "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=dustin-graham "Code") | [<img src="https://avatars3.githubusercontent.com/u/1375034?v=4" width="100px;"/><br /><sub><b>Fábio Carneiro</b></sub>](https://github.com/fabiocarneiro)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Afabiocarneiro "Bug reports") | [<img src="https://avatars0.githubusercontent.com/u/480546?v=4" width="100px;"/><br /><sub><b>Gregor</b></sub>](https://github.com/lordgreg)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Alordgreg "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=lordgreg "Code") [🤔](#ideas-lordgreg "Ideas, Planning, & Feedback") | [<img src="https://avatars1.githubusercontent.com/u/5159563?v=4" width="100px;"/><br /><sub><b>Kolja Esders</b></sub>](https://github.com/kolja-esders)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Akolja-esders "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=kolja-esders "Code") [🤔](#ideas-kolja-esders "Ideas, Planning, & Feedback") | [<img src="https://avatars1.githubusercontent.com/u/8343799?v=4" width="100px;"/><br /><sub><b>Michael Joseph Rosenthal</b></sub>](https://github.com/micimize)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Amicimize "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=micimize "Code") [📖](https://github.com/zino-app/graphql-flutter/commits?author=micimize "Documentation") [💡](#example-micimize "Examples") [🤔](#ideas-micimize "Ideas, Planning, & Feedback") [⚠️](https://github.com/zino-app/graphql-flutter/commits?author=micimize "Tests") | [<img src="https://avatars2.githubusercontent.com/u/735858?v=4" width="100px;"/><br /><sub><b>Igor Borges</b></sub>](http://borges.me/)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3AIgor1201 "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=Igor1201 "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/6992724?v=4" width="100px;"/><br /><sub><b>Rafael Ring</b></sub>](https://github.com/rafaelring)<br />[🐛](https://github.com/zino-app/graphql-flutter/issues?q=author%3Arafaelring "Bug reports") [💻](https://github.com/zino-app/graphql-flutter/commits?author=rafaelring "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/403029?v=4" width="100px;"/><br /><sub><b>Arnaud Delcasse</b></sub>](https://www.scity.coop)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Aadelcasse "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=adelcasse "Code") | [<img src="https://avatars0.githubusercontent.com/u/959931?v=4" width="100px;"/><br /><sub><b>Dustin Graham</b></sub>](https://github.com/dustin-graham)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Adustin-graham "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=dustin-graham "Code") | [<img src="https://avatars3.githubusercontent.com/u/1375034?v=4" width="100px;"/><br /><sub><b>Fábio Carneiro</b></sub>](https://github.com/fabiocarneiro)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Afabiocarneiro "Bug reports") | [<img src="https://avatars0.githubusercontent.com/u/480546?v=4" width="100px;"/><br /><sub><b>Gregor</b></sub>](https://github.com/lordgreg)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Alordgreg "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=lordgreg "Code") [🤔](#ideas-lordgreg "Ideas, Planning, & Feedback") | [<img src="https://avatars1.githubusercontent.com/u/5159563?v=4" width="100px;"/><br /><sub><b>Kolja Esders</b></sub>](https://github.com/kolja-esders)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Akolja-esders "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=kolja-esders "Code") [🤔](#ideas-kolja-esders "Ideas, Planning, & Feedback") | [<img src="https://avatars1.githubusercontent.com/u/8343799?v=4" width="100px;"/><br /><sub><b>Michael Joseph Rosenthal</b></sub>](https://github.com/micimize)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Amicimize "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=micimize "Code") [📖](https://github.com/zino-app/flutter-graphql/commits?author=micimize "Documentation") [💡](#example-micimize "Examples") [🤔](#ideas-micimize "Ideas, Planning, & Feedback") [⚠️](https://github.com/zino-app/flutter-graphql/commits?author=micimize "Tests") | [<img src="https://avatars2.githubusercontent.com/u/735858?v=4" width="100px;"/><br /><sub><b>Igor Borges</b></sub>](http://borges.me/)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3AIgor1201 "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=Igor1201 "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/6992724?v=4" width="100px;"/><br /><sub><b>Rafael Ring</b></sub>](https://github.com/rafaelring)<br />[🐛](https://github.com/zino-app/flutter-graphql/issues?q=author%3Arafaelring "Bug reports") [💻](https://github.com/zino-app/flutter-graphql/commits?author=rafaelring "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind are welcome!
 
 [version-badge]: https://img.shields.io/pub/v/flutter_graphql.svg?style=flat-square
-[package]: https://pub.dartlang.org/packages/flutter_graphql/versions/1.0.0-alpha.3
-[license-badge]: https://img.shields.io/github/license/zino-app/graphql-flutter.svg?style=flat-square
-[license]: https://github.com/zino-app/graphql-flutter/blob/master/LICENSE
+[package]: https://pub.dartlang.org/packages/flutter_graphql/versions/1.0.0-alpha.12
+[license-badge]: https://img.shields.io/github/license/juicycleff/flutter-graphql.svg?style=flat-square
+[license]: https://github.com/juicycleff/flutter-graphql/blob/master/LICENSE
 [prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
 [prs]: http://makeapullrequest.com
-[github-watch-badge]: https://img.shields.io/github/watchers/zino-app/graphql-flutter.svg?style=social
-[github-watch]: https://github.com/zino-app/graphql-flutter/watchers
-[github-star-badge]: https://img.shields.io/github/stars/zino-app/graphql-flutter.svg?style=social
-[github-star]: https://github.com/zino-app/graphql-flutter/stargazers
+[github-watch-badge]: https://img.shields.io/github/watchers/juicycleff/flutter-graphql.svg?style=social
+[github-watch]: https://github.com/juicycleff/flutter-graphql/watchers
+[github-star-badge]: https://img.shields.io/github/stars/juicycleff/flutter-graphql.svg?style=social
+[github-star]: https://github.com/juicycleff/flutter-graphql/stargazers
diff --git a/lib/src/cache/normalized/record_field_json_adapter.dart b/lib/src/cache/normalized/record_field_json_adapter.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:core';
 
 class RecordFieldJsonAdapter {
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,6 +15,7 @@ dependencies:
   uuid: ^1.0.3
   sqflite: ^1.1.0
   graphql_parser: ^1.1.1
+  sqflite: ^1.1.0
 
 dev_dependencies:
   flutter_test: