@grapes-agency/apollo-link-local-schema - npm Package Compare versions

Comparing version 1.0.0-alpha.9 to 1.0.0-alpha.10

CHANGELOG.md

@@ -5,2 +5,9 @@ # Changelog
 
+## [1.0.0-alpha.10](https://github.com/grapes-agency/apollo-link-local-schema/compare/v1.0.0-alpha.9...v1.0.0-alpha.10) (2020-10-12)
+
+
+### Bug Fixes
+
+* allow scalars to be null ([039da6a](https://github.com/grapes-agency/apollo-link-local-schema/commit/039da6a526eddebaf891e4d669610eea829af2ad))
+
 ## [1.0.0-alpha.9](https://github.com/grapes-agency/apollo-link-local-schema/compare/v1.0.0-alpha.8...v1.0.0-alpha.9) (2020-10-09)
@@ -7,0 +14,0 @@

index.cjs.js

@@ -383,3 +383,9 @@ 'use strict';
                 }
-                mappedResolvers[objectName][fieldName] = root => scalarResolver.parseValue(root[fieldName]);
+                const isNonNull = field.type.kind === 'NonNullType';
+                mappedResolvers[objectName][fieldName] = root => {
+                    if (isNonNull || root[fieldName] !== null) {
+                        return scalarResolver.parseValue(root[fieldName]);
+                    }
+                    return null;
+                };
             }
@@ -719,11 +725,12 @@ }
             return nonLocalObservable.flatMap(remoteResult => new client.Observable(observer => {
-                try {
-                    if (this.validateQuery) {
+                if (this.validateQuery) {
+                    try {
                         validate({ document: localQuery, typeMap: this.typeMap });
                     }
+                    catch (error) {
+                        observer.next({ errors: [{ message: error.message }] });
+                        observer.complete();
+                        return;
+                    }
                 }
-                catch (error) {
-                    observer.error({ errors: [{ message: error.message }] });
-                    return;
-                }
                 localState
@@ -741,3 +748,4 @@ .runResolvers({
                     .catch(error => {
-                    observer.error({ errors: [{ message: error.message }] });
+                    observer.next({ errors: [{ message: error.message }] });
+                    observer.complete();
                 });
@@ -756,3 +764,3 @@ }));
                 if (errors) {
-                    observer.next({ data: null, errors });
+                    observer.next({ errors });
                     observer.complete();
@@ -789,3 +797,4 @@ return;
                 .catch(error => {
-                observer.error({ errors: [{ message: error.message }] });
+                observer.next({ errors: [{ message: error.message }] });
+                observer.complete();
             });
@@ -792,0 +801,0 @@ return () => {

LocalSchemaLink.js

@@ -72,11 +72,12 @@ import { ApolloLink, Observable } from '@apollo/client';
             return nonLocalObservable.flatMap(remoteResult => new Observable(observer => {
-                try {
-                    if (this.validateQuery) {
+                if (this.validateQuery) {
+                    try {
                         validate({ document: localQuery, typeMap: this.typeMap });
                     }
+                    catch (error) {
+                        observer.next({ errors: [{ message: error.message }] });
+                        observer.complete();
+                        return;
+                    }
                 }
-                catch (error) {
-                    observer.error({ errors: [{ message: error.message }] });
-                    return;
-                }
                 localState
@@ -94,3 +95,4 @@ .runResolvers({
                     .catch(error => {
-                    observer.error({ errors: [{ message: error.message }] });
+                    observer.next({ errors: [{ message: error.message }] });
+                    observer.complete();
                 });
@@ -109,3 +111,3 @@ }));
                 if (errors) {
-                    observer.next({ data: null, errors });
+                    observer.next({ errors });
                     observer.complete();
@@ -142,3 +144,4 @@ return;
                 .catch(error => {
-                observer.error({ errors: [{ message: error.message }] });
+                observer.next({ errors: [{ message: error.message }] });
+                observer.complete();
             });
@@ -145,0 +148,0 @@ return () => {

package.json

 {
   "name": "@grapes-agency/apollo-link-local-schema",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-alpha.10",
   "description": "Lightweight local schema resolver for @apollo/client",
@@ -5,0 +5,0 @@ "main": "index.cjs.js",

utils/mapResolvers.js

@@ -80,3 +80,9 @@ import { print } from 'graphql';
                 }
-                mappedResolvers[objectName][fieldName] = root => scalarResolver.parseValue(root[fieldName]);
+                const isNonNull = field.type.kind === 'NonNullType';
+                mappedResolvers[objectName][fieldName] = root => {
+                    if (isNonNull || root[fieldName] !== null) {
+                        return scalarResolver.parseValue(root[fieldName]);
+                    }
+                    return null;
+                };
             }
@@ -83,0 +89,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

155152

increased by1.03%

Lines of code

1770

increased by1.03%

No dependency changes