Nullsafe gql, gql_exec, gql_link

.github/check_package.sh

@@ -0,0 +1,43 @@
+#/bin/bash
+
+set -e
+
+PACKAGE=$1
+
+git diff --exit-code
+
+clean_up () {
+    ARG=$?
+    git checkout .
+    exit $ARG
+} 
+
+trap clean_up EXIT
+
+# Check pubspec
+multipack --only $PACKAGE pubspec clean
+multipack --only $PACKAGE exec git diff --exit-code pubspec.yaml
+
+# Override local dependencies
+multipack pubspec hard_override
+
+multipack --only $PACKAGE pub get
+
+# Check formatting
+echo ""
+echo "A list of incorrectly formatted files may follow:"
+echo ""
+multipack --only $PACKAGE fmt -n . --set-exit-if-changed
+echo ""
+
+# Analyze package
+multipack --only $PACKAGE analyze --version
+multipack --only $PACKAGE analyze --fatal-warnings --no-hints .
+
+# Run tests
+# mockito requires build runner now
+multipack --only $PACKAGE pub run build_runner build --delete-conflicting-outputs || true
+multipack --only $PACKAGE exec [ ! -d ./test ] && exit 0
+multipack --only $PACKAGE pub run test
+
+git checkout .

.github/workflows/dart.yml

@@ -4,6 +4,7 @@ on: pull_request
 jobs:
   packages:
     strategy:
+      fail-fast: false
       matrix:
         package:
           - gql
@@ -16,13 +17,11 @@ jobs:
           - gql_error_link
           - gql_http_link
           - gql_websocket_link
-          - gql_link
           - gql_transform_link
           - cats
-          - gql_example_http_auth_link
     runs-on: ubuntu-latest
     container:
-      image: google/dart:latest
+      image: google/dart:2.12-beta
     name: Check ${{ matrix.package }}
     env:
       PACKAGE: ${{ matrix.package }}
@@ -50,6 +49,10 @@ jobs:
           echo ""
           multipack --only $PACKAGE fmt -n . --set-exit-if-changed
           echo ""
+      - name: Run build_runner if necessary
+        run: |
+          multipack --only $PACKAGE pub run \
+            build_runner build --delete-conflicting-outputs || true
       - name: Analyze package
         run: |
           multipack --only $PACKAGE analyze --version
@@ -65,9 +68,12 @@ jobs:
           - gql_example_cli
           - gql_example_cli_github
           - gql_example_build
+          - gql_example_http_auth_link
+          - gql_example_dio_link
+          # gql_example_flutter would require flutter
     runs-on: ubuntu-latest
     container:
-      image: google/dart:latest
+      image: google/dart:2.12-beta
     name: Check ${{ matrix.package }}
     env:
       PACKAGE: ${{ matrix.package }}
@@ -90,7 +96,8 @@ jobs:
           multipack --only $PACKAGE pub get
       - name: Run builders
         run: |
-          multipack --only $PACKAGE pub run build_runner build --delete-conflicting-outputs
+          multipack --only $PACKAGE pub run \
+            build_runner build --delete-conflicting-outputs || true
       - name: Check build diff
         run: |
           multipack --only $PACKAGE exec git diff --exit-code **/*.gql.dart
@@ -112,7 +119,7 @@ jobs:
           - end_to_end_test
     runs-on: ubuntu-latest
     container:
-      image: google/dart:latest
+      image: google/dart:2.12-beta
     name: Check ${{ matrix.package }}
     env:
       PACKAGE: ${{ matrix.package }}
@@ -158,7 +165,7 @@ jobs:
   publish_dry_run:
     runs-on: ubuntu-latest
     container:
-      image: google/dart:latest
+      image: google/dart:2.12-beta
     env:
       PACKAGES: 'gql,gql_build,gql_code_builder,gql_dedupe_link,gql_dio_link,gql_exec,gql_http_link,gql_link,gql_pedantic,gql_transform_link,gql_error_link,gql_websocket_link'
       PUB_ACCESS_TOKEN: ${{ secrets.PUB_ACCESS_TOKEN }}
@@ -183,7 +190,7 @@ jobs:
   check_svg:
     runs-on: ubuntu-latest
     container:
-      image: google/dart:latest
+      image: google/dart:2.12-beta
     steps:
       - name: Clone repository
         uses: actions/checkout@v2

.gitignore

@@ -15,3 +15,5 @@ doc/api/
 .vscode/
 
 **/*.iml
+
+**/test/**/*.mocks.dart

cats/lib/src/cat_builder.dart

@@ -31,7 +31,7 @@ class CatBuilder {
   Scenario buildScenario(File file, Directory folder) {
     var doc = loadYaml(
       file.readAsStringSync(),
-      sourceUrl: file.path,
+      sourceUrl: Uri.parse(file.path),
     );
 
     var schema;
@@ -67,7 +67,7 @@ class CatBuilder {
     );
   }
 
-  Iterable<TestCase> buildTests(YamlNode node, Directory folder) {
+  Iterable<TestCase>? buildTests(YamlNode? node, Directory folder) {
     if (node is YamlList) {
       return node.map((n) => buildTest(n, folder));
     }
@@ -110,7 +110,7 @@ class CatBuilder {
     );
   }
 
-  Action buildAction(YamlMap node) {
+  Action? buildAction(YamlMap node) {
     if (node.containsKey('parse')) {
       return ParsingAction();
     }
@@ -135,7 +135,7 @@ class CatBuilder {
     return null;
   }
 
-  Iterable<Assertion> buildAssertions(YamlNode node) {
+  Iterable<Assertion?>? buildAssertions(YamlNode? node) {
     if (node is YamlList) {
       return node.map((n) => buildAssertion(n));
     }
@@ -147,17 +147,17 @@ class CatBuilder {
     return null;
   }
 
-  Assertion buildAssertion(YamlNode node) {
+  Assertion? buildAssertion(YamlNode? node) {
     if (node is YamlMap) {
       if (node.containsKey('passes')) {
         return PassesAssertion(
-          passes: node['passes'] as bool,
+          passes: node['passes'] as bool?,
         );
       }
 
       if (node.containsKey('syntax-error')) {
         return SyntaxErrorAssertion(
-          syntaxError: node['syntax-error'] as bool,
+          syntaxError: node['syntax-error'] as bool?,
         );
       }
 

cats/lib/src/cat_model.dart

@@ -1,7 +1,7 @@
 class Suite {
-  Iterable<Scenario> scenarios;
+  Iterable<Scenario>? scenarios;
 
-  Map<String, ErrorDefinition> errorMapping;
+  Map<String, ErrorDefinition>? errorMapping;
 
   Suite({
     this.scenarios,
@@ -10,15 +10,15 @@ class Suite {
 }
 
 class Scenario {
-  String folder;
-  String file;
+  String? folder;
+  String? file;
 
-  String name;
+  String? name;
 
-  String schema;
-  Map<String, dynamic> testData;
+  String? schema;
+  Map<String, dynamic>? testData;
 
-  Iterable<TestCase> tests;
+  Iterable<TestCase>? tests;
 
   Scenario({
     this.folder,
@@ -31,19 +31,19 @@ class Scenario {
 }
 
 class TestCase {
-  String name;
+  String? name;
 
   String query;
-  String schema;
-  Map<String, dynamic> testData;
+  String? schema;
+  Map<String, dynamic>? testData;
 
-  Action action;
+  Action? action;
 
-  Iterable<Assertion> assertions;
+  Iterable<Assertion?>? assertions;
 
   TestCase({
     this.name,
-    this.query,
+    required this.query,
     this.schema,
     this.testData,
     this.action,
@@ -56,16 +56,16 @@ abstract class Action {}
 class ParsingAction extends Action {}
 
 class ValidationAction extends Action {
-  Iterable<String> validationRules;
+  Iterable<String?> validationRules;
 
   ValidationAction(this.validationRules);
 }
 
 class ExecutionAction extends Action {
-  String operationName;
-  Map<String, dynamic> variables;
-  bool validateQuery;
-  String testValue;
+  String? operationName;
+  Map<String, dynamic>? variables;
+  bool? validateQuery;
+  String? testValue;
 
   ExecutionAction({
     this.operationName,
@@ -78,37 +78,37 @@ class ExecutionAction extends Action {
 abstract class Assertion {}
 
 class PassesAssertion extends Assertion {
-  bool passes;
+  bool? passes;
 
   PassesAssertion({
     this.passes,
   });
 }
 
 class SyntaxErrorAssertion extends Assertion {
-  bool syntaxError;
+  bool? syntaxError;
 
   SyntaxErrorAssertion({
     this.syntaxError,
   });
 }
 
 class DataAssertion extends Assertion {
-  Map<String, dynamic> data;
+  Map<String, dynamic>? data;
 }
 
 class ErrorCountAssertion extends Assertion {
-  int count;
+  int? count;
 
   ErrorCountAssertion({
     this.count,
   });
 }
 
 class ErrorCodeAssertion extends Assertion {
-  String errorCode;
-  Map<String, String> args;
-  Iterable<Location> locations;
+  String? errorCode;
+  Map<String, String>? args;
+  Iterable<Location>? locations;
 
   ErrorCodeAssertion({
     this.errorCode,
@@ -118,38 +118,38 @@ class ErrorCodeAssertion extends Assertion {
 }
 
 class ErrorContainsAssertion extends Assertion {
-  String error;
-  Iterable<Location> locations;
+  String? error;
+  Iterable<Location>? locations;
 }
 
 class ErrorRegexAssertion extends Assertion {
-  String errorRegex;
-  Iterable<Location> locations;
+  String? errorRegex;
+  Iterable<Location>? locations;
 }
 
 class ExecutionExceptionContainsAssertion extends Assertion {
-  String exception;
+  String? exception;
 }
 
 class ExecutionExceptionRegexAssertion extends Assertion {
-  String errorRegex;
+  String? errorRegex;
 }
 
 class Location {
-  int line;
-  int column;
+  int? line;
+  int? column;
 }
 
 class ErrorDefinition {
-  String message;
-  String specReference;
-  String implementationReference;
+  String? message;
+  String? specReference;
+  String? implementationReference;
 }
 
 class DriverError {
-  String code;
-  String message;
-  Location location;
+  String? code;
+  String? message;
+  Location? location;
 
   DriverError({
     this.code,
@@ -159,5 +159,5 @@ class DriverError {
 }
 
 class DriverException {
-  String message;
+  String? message;
 }