@ember-data/serializer 4.8.0-alpha.0 → 4.8.0-alpha.3

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

@@ -1,6 +1,5 @@
 import { A } from '@ember/array';
 import { warn } from '@ember/debug';
-import { get, set } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import { camelize } from '@ember/string';
 import { typeOf } from '@ember/utils';
@@ -544,7 +543,7 @@ export default Mixin.create({
   },
 
   attrsOption(attr) {
-    let attrs = this.get('attrs');
+    let attrs = this.attrs;
     return attrs && (attrs[camelize(attr)] || attrs[attr]);
   },
 
@@ -571,7 +570,7 @@ export default Mixin.create({
    @private
   */
   _extractEmbeddedHasMany(store, key, hash, relationshipMeta) {
-    let relationshipHash = get(hash, `data.relationships.${key}.data`);
+    let relationshipHash = hash.data?.relationships?.[key]?.data;
 
     if (!relationshipHash) {
       return;
@@ -592,7 +591,7 @@ export default Mixin.create({
     }
 
     let relationship = { data: hasMany };
-    set(hash, `data.relationships.${key}`, relationship);
+    hash.data.relationships[key] = relationship;
   },
 
   /**
@@ -600,7 +599,7 @@ export default Mixin.create({
    @private
   */
   _extractEmbeddedBelongsTo(store, key, hash, relationshipMeta) {
-    let relationshipHash = get(hash, `data.relationships.${key}.data`);
+    let relationshipHash = hash.data?.relationships?.[key]?.data;
     if (!relationshipHash) {
       return;
     }
@@ -615,7 +614,7 @@ export default Mixin.create({
     let belongsTo = { id: data.id, type: data.type };
     let relationship = { data: belongsTo };
 
-    set(hash, `data.relationships.${key}`, relationship);
+    hash.data.relationships[key] = relationship;
   },
 
   /**

package/addon/-private/index.js

@@ -3,7 +3,6 @@
 */
 
 export { default as EmbeddedRecordsMixin } from './embedded-records-mixin';
-export { modelHasAttributeOrRelationshipNamedType } from './utils';
 
 export { default as Transform } from './transforms/transform';
 export { default as BooleanTransform } from './transforms/boolean';

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));
   },
 
   /**
@@ -711,7 +710,7 @@ const JSONAPISerializer = JSONSerializer.extend({
         }
 
         // only serialize has many relationships that are not new
-        let nonNewHasMany = hasMany.filter((item) => item.record && !item.record.get('isNew'));
+        let nonNewHasMany = hasMany.filter((item) => item.record && !item.record.isNew);
         let data = new Array(nonNewHasMany.length);
 
         for (let i = 0; i < nonNewHasMany.length; i++) {

package/addon/json.js

@@ -3,14 +3,15 @@
  */
 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:
@@ -192,7 +193,7 @@ const JSONSerializer = Serializer.extend({
    @return {Object} data The transformed data object
   */
   applyTransforms(typeClass, data) {
-    let attributes = get(typeClass, 'attributes');
+    let attributes = typeClass.attributes;
 
     typeClass.eachTransformedAttribute((key, typeClass) => {
       if (data[key] === undefined) {
@@ -572,7 +573,7 @@ const JSONSerializer = Serializer.extend({
 
     export default class ApplicationSerializer extends JSONSerializer {
       normalize(typeClass, hash) {
-        let fields = get(typeClass, 'fields');
+        let fields = typeClass.fields;
 
         fields.forEach(function(type, field) {
           let payloadField = underscore(field);
@@ -625,7 +626,7 @@ const JSONSerializer = Serializer.extend({
     @return {String}
   */
   extractId(modelClass, resourceHash) {
-    let primaryKey = get(this, 'primaryKey');
+    let primaryKey = this.primaryKey;
     let id = resourceHash[primaryKey];
     return coerceId(id);
   },
@@ -681,7 +682,7 @@ const JSONSerializer = Serializer.extend({
       }
 
       let modelClass = this.store.modelFor(relationshipModelName);
-      if (relationshipHash.type && !modelHasAttributeOrRelationshipNamedType(modelClass)) {
+      if (relationshipHash.type && !modelClass.fields.has('type')) {
         relationshipHash.type = this.modelNameFromPayloadKey(relationshipHash.type);
       }
 
@@ -795,7 +796,7 @@ const JSONSerializer = Serializer.extend({
     @return {String} the model's modelName
   */
   modelNameFromPayloadKey(key) {
-    return normalizeModelName(key);
+    return dasherize(key);
   },
 
   /**
@@ -826,7 +827,7 @@ const JSONSerializer = Serializer.extend({
     @private
   */
   normalizeUsingDeclaredMapping(modelClass, hash) {
-    let attrs = get(this, 'attrs');
+    let attrs = this.attrs;
     let normalizedKey;
     let payloadKey;
 
@@ -838,11 +839,11 @@ const JSONSerializer = Serializer.extend({
           continue;
         }
 
-        if (get(modelClass, 'attributes').has(key)) {
+        if (modelClass.attributes.has(key)) {
           normalizedKey = this.keyForAttribute(key, 'deserialize');
         }
 
-        if (get(modelClass, 'relationshipsByName').has(key)) {
+        if (modelClass.relationshipsByName.has(key)) {
           normalizedKey = this.keyForRelationship(key, modelClass, 'deserialize');
         }
 
@@ -870,13 +871,13 @@ const JSONSerializer = Serializer.extend({
         '` on `' +
         modelClass.modelName +
         '`. Check your serializers attrs hash.',
-      get(modelClass, 'attributes').has(key) || get(modelClass, 'relationshipsByName').has(key),
+      modelClass.attributes.has(key) || modelClass.relationshipsByName.has(key),
       {
         id: 'ds.serializer.no-mapped-attrs-key',
       }
     );
 
-    let attrs = get(this, 'attrs');
+    let attrs = this.attrs;
     let mappedKey;
     if (attrs && attrs[key]) {
       mappedKey = attrs[key];
@@ -903,7 +904,7 @@ const JSONSerializer = Serializer.extend({
     @return {boolean} true if the key can be serialized
   */
   _canSerialize(key) {
-    let attrs = get(this, 'attrs');
+    let attrs = this.attrs;
 
     return !attrs || !attrs[key] || attrs[key].serialize !== false;
   },
@@ -919,7 +920,7 @@ const JSONSerializer = Serializer.extend({
     @return {boolean} true if the key must be serialized
   */
   _mustSerialize(key) {
-    let attrs = get(this, 'attrs');
+    let attrs = this.attrs;
 
     return attrs && attrs[key] && attrs[key].serialize === true;
   },
@@ -1106,7 +1107,7 @@ const JSONSerializer = Serializer.extend({
     if (options && options.includeId) {
       const id = snapshot.id;
       if (id) {
-        json[get(this, 'primaryKey')] = id;
+        json[this.primaryKey] = id;
       }
     }
 
@@ -1467,25 +1468,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 = {};
 
-      this.normalizeUsingDeclaredMapping(typeClass, payload);
+      payload.errors.forEach((error) => {
+        if (error.source && error.source.pointer) {
+          let key = error.source.pointer.match(SOURCE_POINTER_REGEXP);
 
+          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,19 +1,19 @@
 /**
  * @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
@@ -196,7 +196,7 @@ const RESTSerializer = JSONSerializer.extend({
     let serializer = primarySerializer;
     let modelClass = primaryModelClass;
 
-    let primaryHasTypeAttribute = modelHasAttributeOrRelationshipNamedType(primaryModelClass);
+    let primaryHasTypeAttribute = primaryModelClass.fields.has('type');
 
     if (!primaryHasTypeAttribute && hash.type) {
       // Support polymorphic records in async relationships
@@ -350,7 +350,7 @@ const RESTSerializer = JSONSerializer.extend({
   },
 
   isPrimaryType(store, modelName, primaryModelClass) {
-    return normalizeModelName(modelName) === primaryModelClass.modelName;
+    return dasherize(modelName) === primaryModelClass.modelName;
   },
 
   /**
@@ -473,7 +473,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.0",
+  "version": "4.8.0-alpha.3",
   "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.0",
-    "@ember-data/store": "4.8.0-alpha.0",
+    "@ember-data/private-build-infra": "4.8.0-alpha.3",
+    "@ember-data/store": "4.8.0-alpha.3",
     "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.0",
+    "@ember-data/unpublished-test-infra": "4.8.0-alpha.3",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.0",
     "@ember/test-helpers": "~2.7.0",
@@ -54,8 +54,7 @@
     "webpack": "^5.74.0"
   },
   "engines": {
-    "node": "^14.8.0 || 16.* || >= 18.*",
-    "yarn": "1.22.19"
+    "node": "^14.8.0 || 16.* || >= 18.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

package/addon/-private/utils.js

@@ -1,10 +0,0 @@
-import { get } from '@ember/object';
-
-/*
-  Check if the passed model has a `type` attribute or a relationship named `type`.
- */
-function modelHasAttributeOrRelationshipNamedType(modelClass) {
-  return get(modelClass, 'attributes').has('type') || get(modelClass, 'relationshipsByName').has('type');
-}
-
-export { modelHasAttributeOrRelationshipNamedType };