Merge pull request #56 from dadi/patch/check-schema

jimlambie · web-flow · commit 4dce9c633624 · 2019-01-05T11:44:19.000+01:00
Gracefully handle missing schema
diff --git a/lib/index.js b/lib/index.js
@@ -191,7 +191,7 @@ DataStore.prototype.find = function ({ query, collection, options = {}, schema,
  */
 DataStore.prototype.handshake = function () {
   return {
-    version: '4.2.1'
+    version: '4.2.2'
   }
 }
 
@@ -538,7 +538,7 @@ function getSchemaOrParent (key, schema) {
   // use the key as specified or the first part after splitting on '.'
   const keyOrParent = (key.split('.').length > 1) ? key.split('.')[0] : key
 
-  if (schema[keyOrParent]) {
+  if (schema && schema[keyOrParent]) {
     return schema[keyOrParent]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ DataStore.prototype.find = function ({ query, collection, options = {}, schema,`
`191`	`191`	`*/`
`192`	`192`	`DataStore.prototype.handshake = function () {`
`193`	`193`	`return {`
`194`		`- version: '4.2.1'`
	`194`	`+ version: '4.2.2'`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`
`@@ -538,7 +538,7 @@ function getSchemaOrParent (key, schema) {`
`538`	`538`	`// use the key as specified or the first part after splitting on '.'`
`539`	`539`	`const keyOrParent = (key.split('.').length > 1) ? key.split('.')[0] : key`
`540`	`540`
`541`		`- if (schema[keyOrParent]) {`
	`541`	`+ if (schema && schema[keyOrParent]) {`
`542`	`542`	`return schema[keyOrParent]`
`543`	`543`	`}`
`544`	`544`	`}`