Merge pull request #3867 from lostinpatterns/master

Allow serializers to normalize response, remove old internal serializers code

Author: bmac

packages/ember-data/lib/system/store.js

@@ -23,9 +23,7 @@ import {
 } from "ember-data/system/store/common";
 
 import {
-  convertResourceObject,
-  normalizeResponseHelper,
-  _normalizeSerializerPayload
+  normalizeResponseHelper
 } from "ember-data/system/store/serializer-response";
 
 import {
@@ -2093,9 +2091,9 @@ function _commit(adapter, store, operation, snapshot) {
         if (payload.included) {
           store.push({ data: payload.included });
         }
-        data = convertResourceObject(payload.data);
+        data = payload.data;
       }
-      store.didSaveRecord(internalModel, _normalizeSerializerPayload(internalModel.type, data));
+      store.didSaveRecord(internalModel, { data });
     });
 
     return internalModel;

packages/ember-data/lib/system/store/serializer-response.js

@@ -1,7 +1,3 @@
-import Model from 'ember-data/system/model/model';
-
-const get = Ember.get;
-
 /*
   This is a helper method that validates a JSON API top-level document
 
@@ -87,148 +83,3 @@ export function normalizeResponseHelper(serializer, store, modelClass, payload,
 
   return normalizedResponse;
 }
-
-/*
-  Convert the payload from `serializer.extract` to a JSON-API Document.
-
-  @method _normalizeSerializerPayload
-  @private
-  @param {subclass of DS.Model} modelClass
-  @param {Object} payload
-  @return {Object} JSON-API Document
-*/
-export function _normalizeSerializerPayload(modelClass, payload) {
-  let data = null;
-
-  if (payload) {
-    if (Array.isArray(payload)) {
-      data = payload.map((payload) => _normalizeSerializerPayloadItem(modelClass, payload));
-    } else {
-      data = _normalizeSerializerPayloadItem(modelClass, payload);
-    }
-  }
-
-  return { data };
-}
-
-/*
-  Convert the payload representing a single record from `serializer.extract` to
-  a JSON-API Resource Object.
-
-  @method _normalizeSerializerPayloadItem
-  @private
-  @param {subclass of DS.Model} modelClass
-  @param {Object} payload
-  @return {Object} JSON-API Resource Object
-*/
-export function _normalizeSerializerPayloadItem(modelClass, itemPayload) {
-  var item = {};
-
-  item.id = '' + itemPayload.id;
-  item.type = modelClass.modelName;
-  item.attributes = {};
-  item.relationships = {};
-
-  modelClass.eachAttribute((name) => {
-    if (itemPayload.hasOwnProperty(name)) {
-      item.attributes[name] = itemPayload[name];
-    }
-  });
-
-  modelClass.eachRelationship((key, relationshipMeta) => {
-    var relationship, value;
-
-    if (itemPayload.hasOwnProperty(key)) {
-      relationship = {};
-      value = itemPayload[key];
-
-      if (relationshipMeta.kind === 'belongsTo') {
-        relationship.data = normalizeRelationshipData(key, value, relationshipMeta);
-        //handle the belongsTo polymorphic case, where { post:1, postType: 'video' }
-        if (relationshipMeta.options && relationshipMeta.options.polymorphic && itemPayload[key + 'Type']) {
-          relationship.data.type = itemPayload[key + 'Type'];
-        }
-      } else if (relationshipMeta.kind === 'hasMany') {
-        //|| [] because the hasMany could be === null
-        Ember.assert(`A  ${relationshipMeta.parentType} record was pushed into the store with the value of ${key} being ${Ember.inspect(value)}, but ${key} is a hasMany relationship so the value must be an array. You should probably check your data payload or serializer.`, Ember.isArray(value) || value === null);
-
-        relationship.data = (value || []).map((item) => normalizeRelationshipData(key, item, relationshipMeta));
-      }
-    }
-
-    if (itemPayload.links && itemPayload.links.hasOwnProperty(key)) {
-      relationship = relationship || {};
-      value = itemPayload.links[key];
-
-      relationship.links = {
-        related: value
-      };
-    }
-
-    if (relationship) {
-      relationship.meta = get(itemPayload, `meta.${key}`);
-      item.relationships[key] = relationship;
-    }
-  });
-
-  return item;
-}
-
-function normalizeRelationshipData(key, value, relationshipMeta) {
-  if (Ember.isNone(value)) {
-    return null;
-  }
-  //Temporary support for https://github.com/emberjs/data/issues/3271
-  if (value instanceof Model) {
-    value = { id: value.id, type: value.constructor.modelName };
-  }
-  if (Ember.typeOf(value) === 'object') {
-    Ember.assert(`Ember Data expected a number or string to represent the record(s) in the '${key}' relationship instead it found an object. If this is a polymorphic relationship please specify a 'type' key. If this is an embedded relationship please include the 'DS.EmbeddedRecordsMixin' and specify the '${key}' property in your serializer's attrs object.`, value.type);
-    if (value.id) {
-      value.id = `${value.id}`;
-    }
-    return value;
-  }
-
-  Ember.assert(`A  ${relationshipMeta.parentType} record was pushed into the store with the value of ${key} being ${Ember.inspect(value)}, but  ${key} is a belongsTo relationship so the value must not be an array. You should probably check your data payload or serializer.`, !Ember.isArray(value));
-  return { id: `${value}`, type: relationshipMeta.type };
-}
-
-/*
-  This method converts a JSON-API Resource Object to a format that DS.Store
-  understands.
-
-  TODO: This method works as an interim until DS.Store understands JSON-API.
-
-  @method convertResourceObject
-  @param {Object} payload
-  @return {Object} an object formatted the way DS.Store understands
-*/
-export function convertResourceObject(payload) {
-  if (!payload) {
-    return payload;
-  }
-
-  var data = {
-    id: payload.id,
-    type: payload.type,
-    links: {}
-  };
-
-  if (payload.attributes) {
-    var attributeKeys = Object.keys(payload.attributes);
-    attributeKeys.forEach((key) => data[key] = payload.attributes[key]);
-  }
-  if (payload.relationships) {
-    var relationshipKeys = Object.keys(payload.relationships);
-    relationshipKeys.forEach((key) => {
-      var relationship = payload.relationships[key];
-      if (relationship.hasOwnProperty('data')) {
-        data[key] = relationship.data;
-      } else if (relationship.links && relationship.links.related) {
-        data.links[key] = relationship.links.related;
-      }
-    });
-  }
-  return data;
-}