@ember-data/serializer 4.8.0-alpha.1 → 4.8.0-alpha.2

package/addon/json-api.js

@@ -9,7 +9,6 @@ import { DEBUG } from '@glimmer/env';
 import { pluralize, singularize } from 'ember-inflector';
 
 import JSONSerializer from '@ember-data/serializer/json';
-import { normalizeModelName } from '@ember-data/store';
 
 /**
   Ember Data 2.0 Serializer:
@@ -361,7 +360,7 @@ const JSONAPISerializer = JSONSerializer.extend({
     @return {String} the model's modelName
   */
   modelNameFromPayloadKey(key) {
-    return singularize(normalizeModelName(key));
+    return singularize(dasherize(key));
   },
 
   /**

package/addon/json.js

@@ -4,14 +4,18 @@
 import { getOwner } from '@ember/application';
 import { assert, warn } from '@ember/debug';
 import { get } from '@ember/object';
+import { dasherize } from '@ember/string';
 import { isNone, typeOf } from '@ember/utils';
 
 import Serializer from '@ember-data/serializer';
-import { normalizeModelName } from '@ember-data/store';
-import { coerceId, errorsArrayToHash } from '@ember-data/store/-private';
+import { coerceId } from '@ember-data/store/-private';
 
 import { modelHasAttributeOrRelationshipNamedType } from './-private';
 
+const SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
+const SOURCE_POINTER_PRIMARY_REGEXP = /^\/?data/;
+const PRIMARY_ATTRIBUTE_KEY = 'base';
+
 /**
   Ember Data 2.0 Serializer:
 
@@ -795,7 +799,7 @@ const JSONSerializer = Serializer.extend({
     @return {String} the model's modelName
   */
   modelNameFromPayloadKey(key) {
-    return normalizeModelName(key);
+    return dasherize(key);
   },
 
   /**
@@ -1467,25 +1471,48 @@ const JSONSerializer = Serializer.extend({
   */
   extractErrors(store, typeClass, payload, id) {
     if (payload && typeof payload === 'object' && payload.errors) {
-      payload = errorsArrayToHash(payload.errors);
+      // the default assumption is that errors is already in JSON:API format
+      const extracted = {};
+
+      payload.errors.forEach((error) => {
+        if (error.source && error.source.pointer) {
+          let key = error.source.pointer.match(SOURCE_POINTER_REGEXP);
 
-      this.normalizeUsingDeclaredMapping(typeClass, payload);
+          if (key) {
+            key = key[2];
+          } else if (error.source.pointer.search(SOURCE_POINTER_PRIMARY_REGEXP) !== -1) {
+            key = PRIMARY_ATTRIBUTE_KEY;
+          }
 
+          if (key) {
+            extracted[key] = extracted[key] || [];
+            extracted[key].push(error.detail || error.title);
+          }
+        }
+      });
+
+      // if the user has an attrs hash, convert keys using it
+      this.normalizeUsingDeclaredMapping(typeClass, extracted);
+
+      // for each attr and relationship, make sure that we use
+      // the normalized key
       typeClass.eachAttribute((name) => {
         let key = this.keyForAttribute(name, 'deserialize');
-        if (key !== name && payload[key] !== undefined) {
-          payload[name] = payload[key];
-          delete payload[key];
+        if (key !== name && extracted[key] !== undefined) {
+          extracted[name] = extracted[key];
+          delete extracted[key];
         }
       });
 
       typeClass.eachRelationship((name) => {
         let key = this.keyForRelationship(name, 'deserialize');
-        if (key !== name && payload[key] !== undefined) {
-          payload[name] = payload[key];
-          delete payload[key];
+        if (key !== name && extracted[key] !== undefined) {
+          extracted[name] = extracted[key];
+          delete extracted[key];
         }
       });
+
+      return extracted;
     }
 
     return payload;

package/addon/rest.js

@@ -1,20 +1,22 @@
 /**
  * @module @ember-data/serializer/rest
  */
-import { makeArray } from '@ember/array';
 import { assert, warn } from '@ember/debug';
-import { camelize } from '@ember/string';
+import { camelize, dasherize } from '@ember/string';
 import { isNone, typeOf } from '@ember/utils';
 import { DEBUG } from '@glimmer/env';
 
 import { singularize } from 'ember-inflector';
 
 import JSONSerializer from '@ember-data/serializer/json';
-import { normalizeModelName } from '@ember-data/store';
 import { coerceId } from '@ember-data/store/-private';
 
 import { modelHasAttributeOrRelationshipNamedType } from './-private';
 
+function makeArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+
 /**
   Normally, applications will use the `RESTSerializer` by implementing
   the `normalize` method.
@@ -350,7 +352,7 @@ const RESTSerializer = JSONSerializer.extend({
   },
 
   isPrimaryType(store, modelName, primaryModelClass) {
-    return normalizeModelName(modelName) === primaryModelClass.modelName;
+    return dasherize(modelName) === primaryModelClass.modelName;
   },
 
   /**
@@ -473,7 +475,7 @@ const RESTSerializer = JSONSerializer.extend({
     @return {String} the model's modelName
   */
   modelNameFromPayloadKey(key) {
-    return singularize(normalizeModelName(key));
+    return singularize(dasherize(key));
   },
 
   // SERIALIZE

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/serializer",
-  "version": "4.8.0-alpha.1",
+  "version": "4.8.0-alpha.2",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,15 +18,15 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/private-build-infra": "4.8.0-alpha.1",
-    "@ember-data/store": "4.8.0-alpha.1",
+    "@ember-data/private-build-infra": "4.8.0-alpha.2",
+    "@ember-data/store": "4.8.0-alpha.2",
     "ember-auto-import": "^2.4.2",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^5.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.8.0-alpha.1",
+    "@ember-data/unpublished-test-infra": "4.8.0-alpha.2",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.0",
     "@ember/test-helpers": "~2.7.0",