Merge branch 'master' into transformJsonapiAttrs

Author: onumossn

.eslintrc.js

@@ -1,15 +1,9 @@
 module.exports = {
-  globals: {
-    server: true,
-  },
   root: true,
   parserOptions: {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  plugins: [
-    'ember'
-  ],
   extends: [
     'eslint:recommended',
     'plugin:ember/recommended'
@@ -19,24 +13,7 @@ module.exports = {
   },
   rules: {
   },
-  overrides: [
-    // node files
-    {
-      files: [
-        'ember-cli-build.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'lib/*/index.js'
-      ],
-      parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
-      },
-      env: {
-        browser: false,
-        node: true
-      }
-    }
-  ]
+  globals: {
+    module: true
+  }
 };

.jshintrc

@@ -1,4 +1,9 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
+import { computed } from '@ember/object';
+import EmberObject from '@ember/object';
+import { A } from '@ember/array';
+import { defineProperty } from '@ember/object';
+import { guidFor } from '@ember/object/internals';
 
 const resetRelations = function(record) {
   Object.keys(record.get('__recordsJustSaved')).forEach((relationName) => {
@@ -23,17 +28,17 @@ const defaultOptions = function(options) {
   }
 };
 
-export default Ember.Mixin.create({
-  hasDirtyAttributes: Ember.computed('currentState.isDirty', 'markedForDestruction', 'markedForDeletion', function() {
+export default Mixin.create({
+  hasDirtyAttributes: computed('currentState.isDirty', 'markedForDestruction', 'markedForDeletion', '_manyToOneDeleted.[]', function() {
     let original = this._super(...arguments);
-    return original || this.get('markedForDestruction') || this.get('markedForDeletion');
+    return original || this.get('markedForDestruction') || this.get('markedForDeletion') || this.get('_manyToOneDeleted.length') > 0;
   }),
 
-  markedForDeletion: Ember.computed('_markedForDeletion', function() {
+  markedForDeletion: computed('_markedForDeletion', function() {
     return this.get('_markedForDeletion') || false;
   }),
 
-  markedForDestruction: Ember.computed('_markedForDestruction', function() {
+  markedForDestruction: computed('_markedForDestruction', function() {
     return this.get('_markedForDestruction') || false;
   }),
 
@@ -53,18 +58,39 @@ export default Ember.Mixin.create({
     this.set('_markedForDestruction', false);
   },
 
+  markManyToOneDeletion(relation) {
+    let deletedRelations = this.get('_manyToOneDeleted');
+
+    if (!deletedRelations) {
+      this.set('_manyToOneDeleted', A());
+      deletedRelations = this.get('_manyToOneDeleted');
+    }
+
+    if (!deletedRelations.includes(relation)) {
+      deletedRelations.pushObject(relation);
+    }
+  },
+
+  unmarkManyToOneDeletion(relation) {
+    return this.markedForManyToOneDeletion(relation) && this.get('_manyToOneDeleted').removeObject(relation);
+  },
+
+  markedForManyToOneDeletion(relation) {
+    return this.get('_manyToOneDeleted') && this.get('_manyToOneDeleted').includes(relation);
+  },
+
   markManyToManyDeletion(relation, model) {
     let deletedRelations = this.get('_manyToManyDeleted');
     if(!deletedRelations) {
-      this.set('_manyToManyDeleted', Ember.Object.create());
+      this.set('_manyToManyDeleted', EmberObject.create());
       deletedRelations = this.get('_manyToManyDeleted');
     }
 
     if(!deletedRelations.get(relation)) {
-      deletedRelations.set(relation, Ember.A());
-      Ember.defineProperty(
+      deletedRelations.set(relation, A());
+      defineProperty(
         this,
-        `manyToManyDeleted${relation}`, Ember.computed.readOnly(`_manyToManyDeleted.${relation}`)
+        `manyToManyDeleted${relation}`, computed.readOnly(`_manyToManyDeleted.${relation}`)
       );
     }
 
@@ -87,7 +113,7 @@ export default Ember.Mixin.create({
 
   tempId() {
     if (!this._tempId) {
-      this._tempId = Ember.guidFor(this);
+      this._tempId = guidFor(this);
     }
     return this._tempId;
   },

addon/mixins/model.js

@@ -1,4 +1,6 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
+import { copy } from '@ember/object/internals';
+import { merge } from '@ember/polyfills';
 
 // This is for reference in our post-save promise
 // We need to unload these records after save, otherwise
@@ -15,13 +17,14 @@ const iterateRelations = function(record, relations, callback) {
     let kind              = metadata.kind;
     let relatedRecord     = record.get(relationName);
     let manyToManyDeleted = record.manyToManyMarkedForDeletionModels(relationName);
+    let isManyToOneDelete = record.markedForManyToOneDeletion(relationName);
 
     if (metadata.options.async !== false) {
       relatedRecord = relatedRecord.get('content');
     }
 
     if (relatedRecord) {
-      callback(relationName, kind, relatedRecord, subRelations, manyToManyDeleted);
+      callback(relationName, kind, relatedRecord, subRelations, manyToManyDeleted, isManyToOneDelete);
     }
   });
 };
@@ -51,7 +54,7 @@ const attributesFor = function(record) {
   return record.transformJsonapiAttrs ? record.transformJsonapiAttrs(attrs) : attrs;
 };
 
-const jsonapiPayload = function(record, isManyToManyDelete) {
+const jsonapiPayload = function(record, relationshipMarkedForDeletion) {
   let attributes = attributesFor(record);
 
   let payload = { type: record.jsonapiType() };
@@ -67,7 +70,7 @@ const jsonapiPayload = function(record, isManyToManyDelete) {
   else if (record.get('markedForDestruction')) {
     payload['method'] = 'destroy';
   }
-  else if (record.get('markedForDeletion') || isManyToManyDelete) {
+  else if (record.get('markedForDeletion') || relationshipMarkedForDeletion) {
     payload['method'] = 'disassociate';
   }
   else if (record.get('currentState.isDirty')) {
@@ -82,14 +85,14 @@ const jsonapiPayload = function(record, isManyToManyDelete) {
 };
 
 const payloadForInclude = function(payload) {
-  let payloadCopy = Ember.copy(payload, true);
+  let payloadCopy = copy(payload, true);
   delete(payloadCopy.method);
 
   return payloadCopy;
 };
 
 const payloadForRelationship = function(payload) {
-  let payloadCopy = Ember.copy(payload, true);
+  let payloadCopy = copy(payload, true);
   delete(payloadCopy.attributes);
   delete(payloadCopy.relationships);
 
@@ -129,21 +132,21 @@ const hasManyData = function(relationName, relatedRecords, subRelations, manyToM
   return { data: payloads };
 };
 
-const belongsToData = function(relatedRecord, subRelations, includedRecords) {
-  let payload = jsonapiPayload(relatedRecord);
+const belongsToData = function(relatedRecord, subRelations, isManyToOneDelete, includedRecords) {
+  let payload = jsonapiPayload(relatedRecord, isManyToOneDelete);
   processRelationships(subRelations, payload, relatedRecord, includedRecords);
   addToIncludes(payload, includedRecords);
 
   return { data: payloadForRelationship(payload) };
 };
 
-const processRelationship = function(name, kind, relationData, subRelations, manyToManyDeleted, includedRecords, callback) {
+const processRelationship = function(name, kind, relationData, subRelations, manyToManyDeleted, isManyToOneDelete, includedRecords, callback) {
   let payload = null;
 
   if (kind === 'hasMany') {
     payload = hasManyData(name, relationData, subRelations, manyToManyDeleted, includedRecords);
   } else {
-    payload = belongsToData(relationData, subRelations, includedRecords);
+    payload = belongsToData(relationData, subRelations, isManyToOneDelete, includedRecords);
   }
 
   if (payload && payload.data) {
@@ -155,8 +158,8 @@ const processRelationships = function(relationshipHash, jsonData, record, includ
   if (isPresentObject(relationshipHash)) {
     jsonData.relationships = {};
 
-    iterateRelations(record, relationshipHash, (name, kind, related, subRelations, manyToManyDeleted) => {
-      processRelationship(name, kind, related, subRelations, manyToManyDeleted, includedRecords, (payload) => {
+    iterateRelations(record, relationshipHash, (name, kind, related, subRelations, manyToManyDeleted, isManyToOneDelete) => {
+      processRelationship(name, kind, related, subRelations, manyToManyDeleted, isManyToOneDelete, includedRecords, (payload) => {
         let serializer = record.store.serializerFor(record.constructor.modelName);
         let serializedName = serializer.keyForRelationship(name);
         jsonData.relationships[serializedName] = payload;
@@ -173,7 +176,7 @@ const relationshipsDirective = function(value) {
       directive[value] = {};
     } else if(Array.isArray(value)) {
       value.forEach((key) => {
-        Ember.merge(directive, relationshipsDirective(key));
+        merge(directive, relationshipsDirective(key));
       });
     } else {
       Object.keys(value).forEach((key) => {
@@ -187,7 +190,7 @@ const relationshipsDirective = function(value) {
   return directive;
 };
 
-export default Ember.Mixin.create({
+export default Mixin.create({
   serialize(snapshot/*, options */) {
     savedRecords = [];
 

addon/mixins/nested-relations.js

@@ -11,41 +11,42 @@
     "start": "ember server",
     "test": "ember try:each"
   },
-  "repository": "",
+  "repository": "https://github.com/jsonapi-suite/ember-data-extensions",
   "engines": {
     "node": ">= 0.10.0"
   },
   "author": "",
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.7.0",
-    "ember-cli-app-version": "^1.0.0",
+    "ember-ajax": "^3.0.1",
+    "ember-cli": "^2.7.0",
+    "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-eslint": "4.2.3",
     "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
     "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^1.0.0",
-    "ember-cli-mirage": "0.2.1",
-    "ember-cli-page-object": "1.6.0",
-    "ember-cli-qunit": "^2.0.0",
+    "ember-cli-mirage": "^0.2.1",
+    "ember-cli-page-object": "^1.6.0",
+    "ember-cli-qunit": "^3.0.0",
     "ember-cli-release": "^0.2.9",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
+    "ember-cli-test-loader": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
+    "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^0.5.1",
-    "ember-resolver": "^2.0.3",
+    "ember-resolver": "^5.0.0",
+    "eslint-plugin-ember": "^5.2.0",
     "loader.js": "^4.0.1"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-data": "^2.7.0",
-    "ember-cli-babel": "^5.1.6"
+    "ember-cli-babel": "^6.6.0",
+    "ember-data": "^2.7.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

package.json

@@ -0,0 +1,9 @@
+module.exports = {
+  env: {
+    embertest: true
+  },
+  globals: {
+    server: true,
+    QUnit: true
+  }
+};