0.8.2 - Allow overriding options for both buildASTSchema and `merge…

…TypeDefs`
valueflows · Apr 26, 2020 · 2206b8b · 2206b8b
1 parent e39f3b3
commit 2206b8b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.2
+
+- Allow overriding options for both `buildASTSchema` and `mergeTypeDefs` 
+
 ## 0.8.1
 
 - Allow overriding options to `mergeTypeDefs` in order to deal with looser validation in extension schemas

diff --git a/lib/index.js b/lib/index.js
@@ -10,16 +10,21 @@ const { mergeTypeDefs } = require('@graphql-toolkit/schema-merging')
 
 const { schemaModules, bridgingSchemas } = require('./schema-manifest')
 
-function buildSchema(moduleIds, extensionSchemas, options) {
+function buildSchema(moduleIds, extensionSchemas, merge_options, build_options) {
   // default to all modules
   if (!moduleIds || !moduleIds.length) {
     moduleIds = Object.keys(schemaModules)
   }
 
-  if (!options) {
-    options = { throwOnConflict: true }
+  if (!merge_options) {
+    merge_options = { throwOnConflict: true }
   }
 
+  if (!build_options) {
+    build_options = { assumeValidSDL: false }
+  }
+
+
   // util types are always required
   moduleIds.push('util')
 
@@ -50,7 +55,7 @@ function buildSchema(moduleIds, extensionSchemas, options) {
   })
 
   // merge fragments and build GraphQLSchema object
-  return buildASTSchema(mergeTypeDefs(fragments.concat(extensionSchemas || []), options))
+  return buildASTSchema(mergeTypeDefs(fragments.concat(extensionSchemas || []), merge_options), build_options)
 }
 
 module.exports = {

diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@valueflows/vf-graphql",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Reference GraphQL implementation of the ValueFlows spec",
   "main": "index.js",
   "types": "index.d.ts",
@@ -72,4 +72,4 @@
     "tape": "^4.10.0",
     "tape-catch": "^1.0.6"
   }
-}
+}