@ember-data/serializer 4.2.0-alpha.8 → 4.2.0

package/addon/-private/embedded-records-mixin.js

@@ -580,7 +580,7 @@ export default Mixin.create({
       hash.included = hash.included || [];
       hash.included.push(data);
       if (included) {
-        hash.included = hash.included.concat(included);
+        hash.included.push(...included);
       }
 
       hasMany[i] = { id: data.id, type: data.type };
@@ -604,7 +604,7 @@ export default Mixin.create({
     hash.included = hash.included || [];
     hash.included.push(data);
     if (included) {
-      hash.included = hash.included.concat(included);
+      hash.included.push(...included);
     }
 
     let belongsTo = { id: data.id, type: data.type };

package/addon/json-api.js

@@ -8,6 +8,7 @@ import { DEBUG } from '@glimmer/env';
 
 import { pluralize, singularize } from 'ember-inflector';
 
+import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 import JSONSerializer from '@ember-data/serializer/json';
 import { normalizeModelName } from '@ember-data/store';
 
@@ -674,7 +675,12 @@ const JSONAPISerializer = JSONSerializer.extend({
 
     if (this._canSerialize(key)) {
       let belongsTo = snapshot.belongsTo(key);
-      let belongsToIsNotNew = belongsTo && !belongsTo.isNew;
+      let belongsToIsNotNew;
+      if (CUSTOM_MODEL_CLASS) {
+        belongsToIsNotNew = belongsTo && !belongsTo.isNew;
+      } else {
+        belongsToIsNotNew = belongsTo && belongsTo.record && !belongsTo.record.get('isNew');
+      }
 
       if (belongsTo === null || belongsToIsNotNew) {
         json.relationships = json.relationships || {};

package/addon/json.js

@@ -540,7 +540,7 @@ const JSONSerializer = Serializer.extend({
         let item = payload[i];
         let { data, included } = this.normalize(primaryModelClass, item);
         if (included) {
-          documentHash.included = documentHash.included.concat(included);
+          documentHash.included.push(...included);
         }
         ret[i] = data;
       }

package/addon/rest.js

@@ -185,7 +185,7 @@ const RESTSerializer = JSONSerializer.extend({
       let { data, included } = this._normalizePolymorphicRecord(store, hash, prop, modelClass, serializer);
       documentHash.data.push(data);
       if (included) {
-        documentHash.included = documentHash.included.concat(included);
+        documentHash.included.push(...included);
       }
     });
 
@@ -316,7 +316,7 @@ const RESTSerializer = JSONSerializer.extend({
         let { data, included } = this._normalizePolymorphicRecord(store, value, prop, primaryModelClass, this);
         documentHash.data = data;
         if (included) {
-          documentHash.included = documentHash.included.concat(included);
+          documentHash.included.push(...included);
         }
         continue;
       }
@@ -324,7 +324,7 @@ const RESTSerializer = JSONSerializer.extend({
       let { data, included } = this._normalizeArray(store, typeName, value, prop);
 
       if (included) {
-        documentHash.included = documentHash.included.concat(included);
+        documentHash.included.push(...included);
       }
 
       if (isSingle) {
@@ -352,7 +352,7 @@ const RESTSerializer = JSONSerializer.extend({
           documentHash.data = data;
         } else {
           if (data) {
-            documentHash.included = documentHash.included.concat(data);
+            documentHash.included.push(...data);
           }
         }
       }
@@ -418,7 +418,7 @@ const RESTSerializer = JSONSerializer.extend({
         let { data, included } = typeSerializer.normalize(type, hash, prop);
         documentHash.data.push(data);
         if (included) {
-          documentHash.included = documentHash.included.concat(included);
+          documentHash.included.push(...included);
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/serializer",
-  "version": "4.2.0-alpha.8",
+  "version": "4.2.0",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,38 +18,38 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/private-build-infra": "4.2.0-alpha.8",
-    "@ember-data/store": "4.2.0-alpha.8",
+    "@ember-data/private-build-infra": "4.2.0",
+    "@ember-data/store": "4.2.0",
     "ember-auto-import": "^2.2.4",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.2.0-alpha.8",
+    "@ember-data/unpublished-test-infra": "4.2.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.0",
     "@ember/test-helpers": "^2.6.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.1.1",
+    "ember-cli": "~3.26.1",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "~4.0.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
-    "ember-maybe-import-regenerator": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
+    "ember-resolver": "^8.0.0",
     "ember-source": "~4.0.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",
     "loader.js": "^4.7.0",
     "qunit": "^2.15.0",
-    "qunit-dom": "^2.0.0",
+    "qunit-dom": "^1.6.0",
     "silent-error": "^1.1.1",
     "webpack": "^5.37.1"
   },