@ember-data/serializer 4.5.0-beta.0 → 4.7.0-beta.0

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

@@ -212,7 +212,8 @@ export default Mixin.create({
     let includeRecords = this.hasSerializeRecordsOption(attr);
     let embeddedSnapshot = snapshot.belongsTo(attr);
     if (includeIds) {
-      let serializedKey = this._getMappedKey(relationship.key, snapshot.type);
+      let schema = this.store.modelFor(snapshot.modelName);
+      let serializedKey = this._getMappedKey(relationship.key, schema);
       if (serializedKey === relationship.key && this.keyForRelationship) {
         serializedKey = this.keyForRelationship(relationship.key, relationship.kind, 'serialize');
       }
@@ -233,7 +234,8 @@ export default Mixin.create({
 
   _serializeEmbeddedBelongsTo(snapshot, json, relationship) {
     let embeddedSnapshot = snapshot.belongsTo(relationship.key);
-    let serializedKey = this._getMappedKey(relationship.key, snapshot.type);
+    let schema = this.store.modelFor(snapshot.modelName);
+    let serializedKey = this._getMappedKey(relationship.key, schema);
     if (serializedKey === relationship.key && this.keyForRelationship) {
       serializedKey = this.keyForRelationship(relationship.key, relationship.kind, 'serialize');
     }
@@ -396,7 +398,8 @@ export default Mixin.create({
     }
 
     if (this.hasSerializeIdsOption(attr)) {
-      let serializedKey = this._getMappedKey(relationship.key, snapshot.type);
+      let schema = this.store.modelFor(snapshot.modelName);
+      let serializedKey = this._getMappedKey(relationship.key, schema);
       if (serializedKey === relationship.key && this.keyForRelationship) {
         serializedKey = this.keyForRelationship(relationship.key, relationship.kind, 'serialize');
       }
@@ -433,7 +436,8 @@ export default Mixin.create({
   },
 
   _serializeEmbeddedHasMany(snapshot, json, relationship) {
-    let serializedKey = this._getMappedKey(relationship.key, snapshot.type);
+    let schema = this.store.modelFor(snapshot.modelName);
+    let serializedKey = this._getMappedKey(relationship.key, schema);
     if (serializedKey === relationship.key && this.keyForRelationship) {
       serializedKey = this.keyForRelationship(relationship.key, relationship.kind, 'serialize');
     }
@@ -484,7 +488,8 @@ export default Mixin.create({
   */
   removeEmbeddedForeignKey(snapshot, embeddedSnapshot, relationship, json) {
     if (relationship.kind === 'belongsTo') {
-      let parentRecord = snapshot.type.inverseFor(relationship.key, this.store);
+      let schema = this.store.modelFor(snapshot.modelName);
+      let parentRecord = schema.inverseFor(relationship.key, this.store);
       if (parentRecord) {
         let name = parentRecord.name;
         let embeddedSerializer = this.store.serializerFor(embeddedSnapshot.modelName);

package/addon/index.ts

@@ -100,6 +100,9 @@
 */
 
 import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+
+import type Store from '@ember-data/store';
 
 /**
   `Serializer` is an abstract base class that you should override in your
@@ -121,7 +124,8 @@ import EmberObject from '@ember/object';
   @extends Ember.EmberObject
 */
 
-export default EmberObject.extend({
+export default class extends EmberObject {
+  @service declare store: Store;
   /**
     The `store` property is the application's `store` that contains
     all records. It can be used to look up serializers for other model
@@ -179,7 +183,6 @@ export default EmberObject.extend({
     @param {String} requestType
     @return {Object} JSON-API Document
   */
-  normalizeResponse: null,
 
   /**
     The `serialize` method is used when a record is saved in order to convert
@@ -222,7 +225,6 @@ export default EmberObject.extend({
     @param {Object} [options]
     @return {Object}
   */
-  serialize: null,
 
   /**
     The `normalize` method is used to convert a payload received from your
@@ -253,5 +255,5 @@ export default EmberObject.extend({
   */
   normalize(typeClass, hash) {
     return hash;
-  },
-});
+  }
+}

package/addon/json-api.js

@@ -187,16 +187,14 @@ const JSONAPISerializer = JSONSerializer.extend({
     @private
   */
   _normalizeResourceHelper(resourceHash) {
-    assert(this.warnMessageForUndefinedType(), !isNone(resourceHash.type), {
-      id: 'ds.serializer.type-is-undefined',
-    });
+    assert(this.warnMessageForUndefinedType(), !isNone(resourceHash.type));
 
     let modelName, usedLookup;
 
     modelName = this.modelNameFromPayloadKey(resourceHash.type);
     usedLookup = 'modelNameFromPayloadKey';
 
-    if (!this.store._hasModelFor(modelName)) {
+    if (!this.store.getSchemaDefinitionService().doesTypeExist(modelName)) {
       warn(this.warnMessageNoModelForType(modelName, resourceHash.type, usedLookup), false, {
         id: 'ds.serializer.model-for-type-missing',
       });
@@ -243,10 +241,7 @@ const JSONAPISerializer = JSONSerializer.extend({
 
     assert(
       'Expected the primary data returned by the serializer for a `queryRecord` response to be a single object but instead it was an array.',
-      !Array.isArray(normalized.data),
-      {
-        id: 'ds.serializer.json-api.queryRecord-array-response',
-      }
+      !Array.isArray(normalized.data)
     );
 
     return normalized;
@@ -536,7 +531,7 @@ const JSONAPISerializer = JSONSerializer.extend({
     return data formatted to match your API's expectations, or override
     the invoked adapter method and do the serialization in the adapter directly
     by using the provided snapshot.
-    
+
     If your API's format differs greatly from the JSON:API spec, you should
     consider authoring your own adapter and serializer instead of extending
     this class.
@@ -659,7 +654,8 @@ const JSONAPISerializer = JSONSerializer.extend({
         value = transform.serialize(value, attribute.options);
       }
 
-      let payloadKey = this._getMappedKey(key, snapshot.type);
+      let schema = this.store.modelFor(snapshot.modelName);
+      let payloadKey = this._getMappedKey(key, schema);
 
       if (payloadKey === key) {
         payloadKey = this.keyForAttribute(key, 'serialize');
@@ -679,7 +675,8 @@ const JSONAPISerializer = JSONSerializer.extend({
       if (belongsTo === null || belongsToIsNotNew) {
         json.relationships = json.relationships || {};
 
-        let payloadKey = this._getMappedKey(key, snapshot.type);
+        let schema = this.store.modelFor(snapshot.modelName);
+        let payloadKey = this._getMappedKey(key, schema);
         if (payloadKey === key) {
           payloadKey = this.keyForRelationship(key, 'belongsTo', 'serialize');
         }
@@ -707,7 +704,8 @@ const JSONAPISerializer = JSONSerializer.extend({
       if (hasMany !== undefined) {
         json.relationships = json.relationships || {};
 
-        let payloadKey = this._getMappedKey(key, snapshot.type);
+        let schema = this.store.modelFor(snapshot.modelName);
+        let payloadKey = this._getMappedKey(key, schema);
         if (payloadKey === key && this.keyForRelationship) {
           payloadKey = this.keyForRelationship(key, 'hasMany', 'serialize');
         }
@@ -739,10 +737,7 @@ if (DEBUG) {
 
       assert(
         `You've used the EmbeddedRecordsMixin in ${this.toString()} which is not fully compatible with the JSON:API specification. Please confirm that this works for your specific API and add \`this.isEmbeddedRecordsMixinCompatible = true\` to your serializer.`,
-        !this.isEmbeddedRecordsMixin || this.isEmbeddedRecordsMixinCompatible === true,
-        {
-          id: 'ds.serializer.embedded-records-mixin-not-supported',
-        }
+        !this.isEmbeddedRecordsMixin || this.isEmbeddedRecordsMixinCompatible === true
       );
 
       let constructor = this.constructor;

package/addon/json.js

@@ -938,7 +938,8 @@ const JSONSerializer = Serializer.extend({
     @return {boolean} true if the hasMany relationship should be serialized
   */
   shouldSerializeHasMany(snapshot, key, relationship) {
-    let relationshipType = snapshot.type.determineRelationshipType(relationship, this.store);
+    const schema = this.store.modelFor(snapshot.modelName);
+    let relationshipType = schema.determineRelationshipType(relationship, this.store);
     if (this._mustSerialize(key)) {
       return true;
     }
@@ -1194,7 +1195,8 @@ const JSONSerializer = Serializer.extend({
 
       // if provided, use the mapping provided by `attrs` in
       // the serializer
-      let payloadKey = this._getMappedKey(key, snapshot.type);
+      let schema = this.store.modelFor(snapshot.modelName);
+      let payloadKey = this._getMappedKey(key, schema);
 
       if (payloadKey === key && this.keyForAttribute) {
         payloadKey = this.keyForAttribute(key, 'serialize');
@@ -1240,7 +1242,8 @@ const JSONSerializer = Serializer.extend({
 
       // if provided, use the mapping provided by `attrs` in
       // the serializer
-      let payloadKey = this._getMappedKey(key, snapshot.type);
+      let schema = this.store.modelFor(snapshot.modelName);
+      let payloadKey = this._getMappedKey(key, schema);
       if (payloadKey === key && this.keyForRelationship) {
         payloadKey = this.keyForRelationship(key, 'belongsTo', 'serialize');
       }
@@ -1293,7 +1296,8 @@ const JSONSerializer = Serializer.extend({
       if (hasMany !== undefined) {
         // if provided, use the mapping provided by `attrs` in
         // the serializer
-        let payloadKey = this._getMappedKey(key, snapshot.type);
+        let schema = this.store.modelFor(snapshot.modelName);
+        let payloadKey = this._getMappedKey(key, schema);
         if (payloadKey === key && this.keyForRelationship) {
           payloadKey = this.keyForRelationship(key, 'hasMany', 'serialize');
         }

package/addon/rest.js

@@ -202,7 +202,7 @@ const RESTSerializer = JSONSerializer.extend({
       // Support polymorphic records in async relationships
       let modelName = this.modelNameFromPayloadKey(hash.type);
 
-      if (store._hasModelFor(modelName)) {
+      if (store.getSchemaDefinitionService().doesTypeExist(modelName)) {
         serializer = store.serializerFor(modelName);
         modelClass = store.modelFor(modelName);
       }
@@ -270,7 +270,7 @@ const RESTSerializer = JSONSerializer.extend({
       }
 
       var typeName = this.modelNameFromPayloadKey(modelName);
-      if (!store._hasModelFor(typeName)) {
+      if (!store.getSchemaDefinitionService().doesTypeExist(typeName)) {
         warn(this.warnMessageNoModelForKey(modelName, typeName), false, {
           id: 'ds.serializer.model-for-key-missing',
         });
@@ -393,7 +393,7 @@ const RESTSerializer = JSONSerializer.extend({
 
     for (var prop in payload) {
       var modelName = this.modelNameFromPayloadKey(prop);
-      if (!store._hasModelFor(modelName)) {
+      if (!store.getSchemaDefinitionService().doesTypeExist(modelName)) {
         warn(this.warnMessageNoModelForKey(prop, modelName), false, {
           id: 'ds.serializer.model-for-key-missing',
         });

package/blueprints/serializer-test/index.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const testInfo = require('ember-cli-test-info');
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
+const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a serializer unit test.',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
   locals(options) {
     return {
       friendlyTestDescription: testInfo.description(options.entity.name, 'Unit', 'Serializer'),
+      modulePrefix: modulePrefixForProject(options.project),
     };
   },
 });

package/blueprints/serializer-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function() {
   setupTest();

package/blueprints/serializer-test/qunit-files/__root__/__path__/__test__.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function(hooks) {
   setupTest(hooks);

package/blueprints/transform-test/index.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const testInfo = require('ember-cli-test-info');
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
+const modulePrefixForProject = require('@ember-data/private-build-infra/src/utilities/module-prefix-for-project');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a transform unit test.',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
   locals(options) {
     return {
       friendlyTestDescription: testInfo.description(options.entity.name, 'Unit', 'Transform'),
+      modulePrefix: modulePrefixForProject(options.project),
     };
   },
 });

package/blueprints/transform-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function() {
   setupTest();

package/blueprints/transform-test/qunit-files/__root__/__path__/__test__.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function(hooks) {
   setupTest(hooks);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/serializer",
-  "version": "4.5.0-beta.0",
+  "version": "4.7.0-beta.0",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,49 +18,50 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/private-build-infra": "4.5.0-beta.0",
-    "@ember-data/store": "4.5.0-beta.0",
-    "ember-auto-import": "^2.2.4",
+    "@ember-data/private-build-infra": "4.7.0-beta.0",
+    "@ember-data/store": "4.7.0-beta.0",
+    "ember-auto-import": "^2.4.2",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-test-info": "^1.0.0",
-    "ember-cli-typescript": "^5.0.0"
+    "ember-cli-typescript": "^5.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.5.0-beta.0",
+    "@ember-data/unpublished-test-infra": "4.7.0-beta.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.0",
-    "@ember/test-helpers": "^2.6.0",
+    "@ember/test-helpers": "~2.7.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.3.0",
-    "ember-cli-blueprint-test-helpers": "^0.19.1",
+    "ember-cli": "~4.6.0",
+    "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-dependency-checker": "^3.3.1",
-    "ember-cli-htmlbars": "^6.0.1",
-    "ember-cli-inject-live-reload": "^2.0.2",
+    "ember-cli-htmlbars": "^6.1.0",
+    "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "~4.0.1",
+    "ember-cli-terser": "~4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.1",
+    "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.3.0",
+    "ember-source": "~4.6.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^2.0.0",
     "loader.js": "^4.7.0",
-    "qunit": "^2.17.0",
+    "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
     "silent-error": "^1.1.1",
-    "webpack": "^5.37.1"
+    "webpack": "^5.74.0"
   },
   "engines": {
-    "node": "12.* || >= 14.*"
+    "node": "^14.8.0 || 16.* || >= 18.*",
+    "yarn": "1.22.19"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   },
   "volta": {
-    "node": "14.17.0",
-    "yarn": "1.22.4"
+    "node": "16.16.0",
+    "yarn": "1.22.19"
   }
 }