Revert "fix: support multiple createRecord calls (fixes #239)"

This reverts commit d7bfcc2.

(Just to show that the test indeed fails without it)

Author: jacobq

addon/adapters/pouch.js

@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 import { pluralize } from 'ember-inflector';
-import { v4 } from 'uuid';
 //import BelongsToRelationship from 'ember-data/-private/system/relationships/state/belongs-to';
 
 import {
@@ -154,7 +153,7 @@ export default DS.RESTAdapter.extend({
   willDestroy: function() {
     this._stopChangesListener();
   },
-
+  
   _indexPromises: [],
 
   _init: function (store, type) {
@@ -207,9 +206,8 @@ export default DS.RESTAdapter.extend({
           relModel = (typeof rel.type === 'string' ? store.modelFor(rel.type) : rel.type);
       if (relModel) {
         let includeRel = true;
-        if (!('options' in rel)) {
-          rel.options = {};
-        }
+        if (!('options' in rel)) rel.options = {};
+        
         if (typeof(rel.options.async) === "undefined") {
           rel.options.async = config.emberPouch && !Ember.isEmpty(config.emberPouch.async) ? config.emberPouch.async : true;//default true from https://github.com/emberjs/data/pull/3366
         }
@@ -466,46 +464,27 @@ export default DS.RESTAdapter.extend({
     });
   },
 
-  generateIdForRecord: function(/* store, type, inputProperties */) {
-    return v4();
-  },
-
   createdRecords: {},
-  createRecord: function(store, type, snapshot) {
-    const record = snapshot.record;
-    if (record._emberPouchSavePromise) {
-      const changes = record.changedAttributes();
-      record._emberPouchSavePromise = record._emberPouchSavePromise.then(records => {
-        // If there have been changes since the document was created then we should update the record now
-        if (Object.keys(changes).length > 0) {
-          const rev = records[Object.keys(records)[0]][0].rev;
-          (snapshot.__attributes || snapshot._attributes).rev = rev; // FIXME: it should be possible to do this elsewhere
-          return this.updateRecord(store, type, snapshot);
-        }
-        return records;
-      });
-      return record._emberPouchSavePromise;
-    }
-
+  createRecord: function(store, type, record) {
     this._init(store, type);
-    var data = this._recordToData(store, type, snapshot);
-    const rel = this.get('db').rel;
-    const id = data.id;
+    var data = this._recordToData(store, type, record);
+    let rel = this.get('db').rel;
+    
+    let id = data.id;
+    if (!id) {
+      id = data.id = rel.uuid();
+    }
     this.createdRecords[id] = true;
-    Object.defineProperty(record, '_emberPouchSavePromise', {
-      enumerable: false,
-      writable: true,
-      value: rel.save(this.getRecordTypeName(type), data).catch((e) => {
-        delete this.createdRecords[id];
-        throw e;
-      }),
+    
+    return rel.save(this.getRecordTypeName(type), data).catch((e) => {
+      delete this.createdRecords[id];
+      throw e;
     });
-    return record._emberPouchSavePromise;
   },
 
-  updateRecord: function (store, type, snapshot) {
+  updateRecord: function (store, type, record) {
     this._init(store, type);
-    var data = this._recordToData(store, type, snapshot);
+    var data = this._recordToData(store, type, record);
     return this.get('db').rel.save(this.getRecordTypeName(type), data);
   },
 

ember-cli-build.js

@@ -5,15 +5,7 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {
-    autoImport: {
-      webpack: {
-        node: {
-          global: true
-        }
-      },
-      // We could use ember-auto-import for these, but index.js is already handling them
-      exclude: ['pouchdb', 'pouchdb-find', 'relational-pouch']
-    }
+    // Add options here
   });
 
   /*

package.json

@@ -62,11 +62,9 @@
   "dependencies": {
     "broccoli-file-creator": "^2.1.1",
     "broccoli-stew": "^2.1.0",
-    "ember-auto-import": "^1.5.3",
-    "ember-cli-babel": "^7.7.3",
     "pouchdb": "^7.1.1",
     "relational-pouch": "^3.1.0",
-    "uuid": "^3.3.3"
+    "ember-cli-babel": "^7.7.3"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"