fix an error if a include function does not return a transformer

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 
 
+## [0.0.7] - 2018-02-10
+
+### Fixed
+- If an include function does not return an instance of `ResourceAbstrace`, the returned value is used without transformation.
+
+
 ## [0.0.6] - 2018-02-10
 
 This release adds optional includes that can be requested on a per-transform basis.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adonis-bumblebee",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Api Transformer Provider for AdonisJs Framework",
   "main": "index.js",
   "scripts": {

src/Bumblebee/Resources/index.js

@@ -1,9 +1,11 @@
 const Collection = require('./Collection')
 const Item = require('./Item')
 const Null = require('./Null')
+const ResourceAbstract = require('./ResourceAbstract')
 
 module.exports = {
   Collection,
   Item,
-  Null
+  Null,
+  ResourceAbstract
 }

src/Bumblebee/TransformerAbstract.js

@@ -48,7 +48,11 @@ class TransformerAbstract {
     for (let include of this.figureOutWhichIncludes(parentScope)) {
       let resource = await this.callIncludeFunction(include, data)
 
-      includeData[include] = await this.createChildScopeFor(parentScope, resource, include).toArray()
+      if (resource instanceof Resources.ResourceAbstract) {
+        includeData[include] = await this.createChildScopeFor(parentScope, resource, include).toArray()
+      } else {
+        includeData[include] = resource
+      }
     }
 
     return includeData

test/includes.spec.js

@@ -19,7 +19,8 @@ class Book2Transformer extends TransformerAbstract {
   availableInclude () {
     return [
       'author',
-      'characters'
+      'characters',
+      'school'
     ]
   }
 
@@ -35,6 +36,9 @@ class Book2Transformer extends TransformerAbstract {
   includeCharacters (book) {
     return this.collection(book.characters, Book2CharacterTransformer)
   }
+  includeSchool (book) {
+    return 'Hogwarts'
+  }
 }
 
 class Book2CharacterTransformer extends TransformerAbstract {
@@ -142,4 +146,17 @@ test.group('Includes can be an array or a string', () => {
 
     assert.deepEqual(transformed, {title: 'Harry Potter and the Deathly Hallows'})
   })
+
+  test('an include function can return a object to be merged', async (assert) => {
+    let transformed = await Bumblebee.create()
+    .include(['school'])
+    .item(data)
+    .transformWith(Book2Transformer)
+    .toArray()
+
+    assert.deepEqual(transformed, {
+      title: 'Harry Potter and the Deathly Hallows',
+      school: 'Hogwarts'
+    })
+  })
 })