Revert "[BUGFIX Model] assert when 'content' is used as a property on…

… a record (emberjs#7545)" This reverts commit 1d1496d.
mansona · Aug 28, 2021 · cb0768c · cb0768c
1 parent 7d87813
commit cb0768c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/packages/-ember-data/tests/unit/model-test.js b/packages/-ember-data/tests/unit/model-test.js
@@ -757,15 +757,8 @@ module('unit/model - Model', function (hooks) {
       @attr('string')
       name;
     }
-    class NativePostWithContent extends Model {
-      @attr('string')
-      content;
-      @attr('string')
-      name;
-    }
     const PROP_MAP = {
       _internalModel: NativePostWithInternalModel,
-      content: NativePostWithContent,
       currentState: NativePostWithCurrentState,
     };
 
@@ -805,7 +798,7 @@ module('unit/model - Model', function (hooks) {
       });
     }
 
-    ['_internalModel', 'content', 'currentState'].forEach(testReservedProperty);
+    ['_internalModel', 'currentState'].forEach(testReservedProperty);
 
     testInDebug('A subclass of Model throws an error when calling create() directly', async function (assert) {
       class NativePerson extends Model {}

diff --git a/packages/model/addon/-private/attr.js b/packages/model/addon/-private/attr.js
@@ -130,7 +130,7 @@ function attr(type, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your attr on ${this.constructor.toString()}`
           );
@@ -145,7 +145,7 @@ function attr(type, options) {
     },
     set(key, value) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your attr on ${this.constructor.toString()}`
           );

diff --git a/packages/model/addon/-private/belongs-to.js b/packages/model/addon/-private/belongs-to.js
@@ -140,7 +140,7 @@ function belongsTo(modelName, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your belongsTo on ${this.constructor.toString()}`
           );
@@ -170,7 +170,7 @@ function belongsTo(modelName, options) {
     },
     set(key, value) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your belongsTo on ${this.constructor.toString()}`
           );

diff --git a/packages/model/addon/-private/has-many.js b/packages/model/addon/-private/has-many.js
@@ -180,7 +180,7 @@ function hasMany(type, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your hasMany on ${this.constructor.toString()}`
           );
@@ -190,7 +190,7 @@ function hasMany(type, options) {
     },
     set(key, records) {
       if (DEBUG) {
-        if (['_internalModel', 'content', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
           throw new Error(
             `'${key}' is a reserved property name on instances of classes extending Model. Please choose a different property name for your hasMany on ${this.constructor.toString()}`
           );

diff --git a/packages/model/addon/-private/model.js b/packages/model/addon/-private/model.js
@@ -2279,12 +2279,6 @@ if (DEBUG) {
         );
       }
 
-      if (!isDefaultEmptyDescriptor(this, 'content') || this.content !== undefined) {
-        throw new Error(
-          `'content' is a reserved property name on instances of classes extending Model. Please choose a different property name for ${this.constructor.toString()}`
-        );
-      }
-
       let ourDescriptor = lookupDescriptor(Model.prototype, 'currentState');
       let theirDescriptor = lookupDescriptor(this, 'currentState');
       let realState = this.___recordState || this._internalModel.currentState;