3.0.0-alpha.5

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 3.0.0-alpha.5 - 26 February 2016
+
+- Couple of fixes
+
 ##### 3.0.0-alpha.4 - 23 February 2016
 
 - Improved find, destroy, and update methods

CONTRIBUTORS

@@ -4,4 +4,4 @@
 #
 # Names should be added to this file as:
 #   [commit count] Name <email address>
-    62	Jason Dobry <[email protected]>
+    63	Jason Dobry <[email protected]>

dist/js-data-localstorage.js

@@ -17,7 +17,7 @@ TestRunner.init({
 
 describe('relation functionality', function () {
   // will be available in js-data 3.0.0-alpha.15
-  it.skip('nested create', function () {
+  it('nested create', function () {
     return this.$$container.create('user', {
       name: 'John',
       profile: {
@@ -32,7 +32,6 @@ describe('relation functionality', function () {
         }
       ]
     }, { with: ['profile', 'post', 'organization'] }).then(function (user) {
-      console.log(JSON.stringify(user, null, 2))
       assert.isDefined(user)
       assert.isDefined(user.id)
       assert.isDefined(user.organization)
@@ -45,55 +44,38 @@ describe('relation functionality', function () {
       assert.isDefined(user.posts[0].id)
     })
   })
-  it.skip('nested create many', function () {
-    return this.$$container.create('user', [{
+  it('nested create many', function () {
+    return this.$$container.createMany('user', [{
       name: 'John',
       profile: {
         email: '[email protected]'
       },
       organization: {
         name: 'Company Inc'
-      },
-      posts: [
-        {
-          content: 'foo'
-        }
-      ]
+      }
     }, {
       name: 'Sally',
       profile: {
         email: '[email protected]'
       },
       organization: {
         name: 'Company Inc'
-      },
-      posts: [
-        {
-          content: 'foo'
-        }
-      ]
-    }], { with: ['profile', 'post'] }).then(function (users) {
-      // console.log(JSON.stringify(users, null, 2))
+      }
+    }], { with: ['profile', 'organization'] }).then(function (users) {
       assert.isDefined(users[0])
       assert.isDefined(users[0].id)
       assert.isDefined(users[0].organization)
       assert.isDefined(users[0].organization.id)
       assert.equal(users[0].organizationId, users[0].organization.id)
       assert.isDefined(users[0].profile)
       assert.isDefined(users[0].profile.id)
-      assert.isDefined(users[0].posts)
-      assert.equal(users[0].posts.length, 1)
-      assert.isDefined(users[0].posts[0].id)
       assert.isDefined(users[1])
       assert.isDefined(users[1].id)
       assert.isDefined(users[1].organization)
       assert.isDefined(users[1].organization.id)
       assert.equal(users[1].organizationId, users[1].organization.id)
       assert.isDefined(users[1].profile)
       assert.isDefined(users[1].profile.id)
-      assert.isDefined(users[1].posts)
-      assert.equal(users[1].posts.length, 1)
-      assert.isDefined(users[1].posts[0].id)
     })
   })
 })

dist/js-data-localstorage.js.map

@@ -1,7 +1,7 @@
 {
   "name": "js-data-localstorage",
   "description": "localStorage adapter for js-data.",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "homepage": "https://github.com/js-data/js-data-localstorage",
   "repository": {
     "type": "git",
@@ -59,9 +59,9 @@
     "babel-preset-es2015": "6.5.0",
     "chai": "3.5.0",
     "codacy-coverage": "1.1.3",
-    "coveralls": "2.11.6",
+    "coveralls": "2.11.8",
     "ink-docstrap": "1.1.2",
-    "js-data-adapter-tests": "^2.0.0-alpha.6",
+    "js-data-adapter-tests": "^2.0.0-alpha.7",
     "jsdoc": "3.4.0",
     "karma": "0.13.21",
     "karma-browserstack-launcher": "0.1.10",

dist/js-data-localstorage.min.js

@@ -116,6 +116,15 @@ const DEFAULTS = {
    */
   debug: false,
 
+  /**
+   * TODO
+   *
+   * @name LocalStorageAdapter#returnDeletedIds
+   * @type {boolean}
+   * @default false
+   */
+  returnDeletedIds: false,
+
   /**
    * TODO
    *
@@ -393,6 +402,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
   destroy (mapper, id, opts) {
     const self = this
     opts || (opts = {})
+    const returnDeletedIds = isUndefined(opts.returnDeletedIds) ? self.returnDeletedIds : !!opts.returnDeletedIds
 
     return createTask(function (success, failure) {
       queueTask(function () {
@@ -415,13 +425,14 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
 
           // afterDestroy lifecycle hook
           op = opts.op = 'afterDestroy'
-          return resolve(self[op](mapper, id, opts, deleted ? id : undefined)).then(function (_id) {
+          return resolve(self[op](mapper, id, opts, deleted && returnDeletedIds ? id : undefined)).then(function (_id) {
             // Allow for re-assignment from lifecycle hook
-            id = isUndefined(_id) ? id : _id
-            return opts.raw ? {
-              data: deleted ? id : undefined,
+            id = isUndefined(_id) && returnDeletedIds ? id : _id
+            const result = {
+              data: id,
               deleted
-            } : deleted ? id : undefined
+            }
+            return self.getRaw(opts) ? result : result.data
           })
         }).then(success, failure)
       })
@@ -443,6 +454,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
     const self = this
     query || (query = {})
     opts || (opts = {})
+    const returnDeletedIds = isUndefined(opts.returnDeletedIds) ? self.returnDeletedIds : !!opts.returnDeletedIds
 
     return createTask(function (success, failure) {
       queueTask(function () {
@@ -453,7 +465,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
           op = opts.op = 'destroyAll'
           self.dbg(op, query, opts)
           // Find the records that are to be destroyed
-          return self.findAll(mapper, query, opts)
+          return self.findAll(mapper, query, { raw: false })
         }).then(function (records) {
           const idAttribute = mapper.idAttribute
           // Gather IDs of records to be destroyed
@@ -469,13 +481,14 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
 
           // afterDestroyAll lifecycle hook
           op = opts.op = 'afterDestroyAll'
-          return self[op](mapper, query, opts, ids).then(function (_ids) {
+          return self[op](mapper, query, opts, returnDeletedIds ? ids : undefined).then(function (_ids) {
             // Allow for re-assignment from lifecycle hook
-            ids = isUndefined(_ids) ? ids : _ids
-            return opts.raw ? {
+            ids = isUndefined(_ids) && returnDeletedIds ? ids : _ids
+            const result = {
               data: ids,
               deleted: records.length
-            } : ids
+            }
+            return self.getRaw(opts) ? result : result.data
           })
         }).then(success, failure)
       })
@@ -553,7 +566,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
         } else if (def.type === 'hasMany' && def.localKeys) {
           let localKeys = []
           let itemKeys = get(record, def.localKeys) || []
-          itemKeys = Array.isArray(itemKeys) ? itemKeys : Object.keys(itemKeys)
+          itemKeys = isArray(itemKeys) ? itemKeys : Object.keys(itemKeys)
           localKeys = localKeys.concat(itemKeys)
           task = self.findAll(relatedMapper, {
             where: {
@@ -683,7 +696,7 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
           records.forEach(function (item) {
             let itemKeys = get(item, def.localKeys) || []
             itemKeys = Array.isArray(itemKeys) ? itemKeys : Object.keys(itemKeys)
-            localKeys = localKeys.concat(itemKeys || [])
+            localKeys = localKeys.concat(itemKeys)
           })
           task = self.findAll(relatedMapper, {
             where: {
@@ -785,6 +798,17 @@ addHiddenPropsToTarget(LocalStorageAdapter.prototype, {
     return ids
   },
 
+  /**
+   * TODO
+   *
+   * @name LocalStorageAdapter#getRaw
+   * @method
+   */
+  getRaw (opts) {
+    opts || (opts = {})
+    return !!(isUndefined(opts.raw) ? this.raw : opts.raw)
+  },
+
   /**
    * TODO
    *