graphql-tools
Advanced tools
Comparing version 0.8.1 to 0.8.2
# Change log | ||
### vNEXT | ||
* ... | ||
### v0.8.2 | ||
* Fix for new custom scalar support introduced in `0.8.1`. ([@oricordeau](https://github.com/oricordeau) in [#203](https://github.com/apollostack/graphql-tools/pull/203) | ||
### v0.8.1 | ||
@@ -4,0 +12,0 @@ |
/// <reference types="typed-graphql" /> | ||
/// <reference types="@types/node" /> | ||
import { GraphQLSchema, GraphQLFieldDefinition, GraphQLResult, GraphQLType, GraphQLFieldResolveFn, GraphQLIsTypeOfFn, GraphQLTypeResolveFn } from 'graphql'; | ||
import { GraphQLSchema, GraphQLFieldDefinition, GraphQLResult, GraphQLType, GraphQLFieldResolveFn, GraphQLIsTypeOfFn, GraphQLTypeResolveFn, GraphQLScalarType } from 'graphql'; | ||
export interface IResolverValidationOptions { | ||
@@ -20,3 +20,3 @@ requireResolversForArgs?: boolean; | ||
export interface IResolvers { | ||
[key: string]: (() => any) | IResolverObject; | ||
[key: string]: (() => any) | IResolverObject | GraphQLScalarType; | ||
} | ||
@@ -23,0 +23,0 @@ export interface ILogger { |
@@ -220,3 +220,2 @@ // Generates a schema for graphql-js given a shorthand schema | ||
schema.getTypeMap()[typeName] = thisScalarType; | ||
return; | ||
} | ||
@@ -231,2 +230,6 @@ } | ||
} | ||
if (type instanceof graphql_3.GraphQLScalarType) { | ||
type[fieldName] = resolveFunctions[typeName][fieldName]; | ||
return; | ||
} | ||
var fields = getFieldsForType(type); | ||
@@ -310,7 +313,8 @@ if (!fields) { | ||
return function (obj, args, ctx, info) { | ||
var root = outerResolver(obj, args, ctx, info); | ||
if (innerResolver) { | ||
return innerResolver(root, args, ctx, info); | ||
} | ||
return defaultResolveFn(root, args, ctx, info); | ||
return Promise.resolve(outerResolver(obj, args, ctx, info)).then(function (root) { | ||
if (innerResolver) { | ||
return innerResolver(root, args, ctx, info); | ||
} | ||
return defaultResolveFn(root, args, ctx, info); | ||
}); | ||
}; | ||
@@ -317,0 +321,0 @@ } |
{ | ||
"name": "graphql-tools", | ||
"version": "0.8.1", | ||
"version": "0.8.2", | ||
"description": "A set of useful tools for GraphQL", | ||
@@ -54,3 +54,3 @@ "main": "dist/index.js", | ||
"peerDependencies": { | ||
"graphql": "^0.5.0 || ^0.6.0 || ^0.7.0", | ||
"graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0", | ||
"graphql-subscriptions": "^0.2.0" | ||
@@ -73,3 +73,3 @@ }, | ||
"express": "^4.13.4", | ||
"graphql": "^0.7.0", | ||
"graphql": "^0.8.1", | ||
"graphql-subscriptions": "^0.2.0", | ||
@@ -85,4 +85,4 @@ "graphql-type-json": "^0.1.3", | ||
"tslint": "^3.15.1", | ||
"typescript": "2.0.7" | ||
"typescript": "2.0.10" | ||
} | ||
} |
@@ -7,3 +7,2 @@ # GraphQL-tools: generate and mock GraphQL.js schemas | ||
[![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](http://www.apollostack.com/#slack) | ||
[![Standard Version](https://img.shields.io/badge/release-standard%20version-brightgreen.svg)](https://github.com/conventional-changelog/standard-version) | ||
@@ -10,0 +9,0 @@ This package allows you to use the GraphQL schema language to build your [GraphQL.js](https://github.com/graphql/graphql-js) schema, and also includes useful schema tools like per-type mocking. |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
869
78249
22
111