@ember-data/model 4.1.0-alpha.1 → 4.1.0-alpha.13

package/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()}`
           );

package/addon/-private/belongs-to.js

@@ -143,7 +143,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()}`
           );
@@ -173,7 +173,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()}`
           );

package/addon/-private/has-many.js

@@ -183,7 +183,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()}`
           );
@@ -193,7 +193,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()}`
           );

package/addon/-private/model.js

@@ -16,7 +16,6 @@ import { CUSTOM_MODEL_CLASS, RECORD_DATA_ERRORS, REQUEST_SERVICE } from '@ember-
 import { HAS_DEBUG_PACKAGE } from '@ember-data/private-build-infra';
 import {
   DEPRECATE_EVENTED_API_USAGE,
-  DEPRECATE_MODEL_TOJSON,
   DEPRECATE_RECORD_LIFECYCLE_EVENT_METHODS,
 } from '@ember-data/private-build-infra/deprecations';
 import {
@@ -78,7 +77,7 @@ function findPossibleInverses(type, inverseType, name, relationshipsSoFar) {
 
 /*
  * This decorator allows us to lazily compute
- * an expensive getter on first-access and therafter
+ * an expensive getter on first-access and thereafter
  * never recompute it.
  */
 function computeOnce(target, key, desc) {
@@ -1867,7 +1866,7 @@ class Model extends EmberObject {
 
    ```javascript
    import { get } from '@ember/object';
-   import Blog from 'app/models/blog'
+   import Person from 'app/models/person'
 
    let attributes = Person.attributes
 
@@ -2173,47 +2172,6 @@ if (DEPRECATE_EVENTED_API_USAGE) {
   });
 }
 
-if (DEPRECATE_MODEL_TOJSON) {
-  /**
-    Use [JSONSerializer](JSONSerializer.html) to
-    get the JSON representation of a record.
-
-    `toJSON` takes an optional hash as a parameter, currently
-    supported options are:
-
-    - `includeId`: `true` if the record's ID should be included in the
-      JSON representation.
-
-    @method toJSON
-    @public
-    @param {Object} options
-    @return {Object} A JSON representation of the object.
-  */
-  Model.reopen({
-    toJSON(options) {
-      // container is for lazy transform lookups
-      deprecate(
-        `Called the built-in \`toJSON\` on the record "${this.constructor.modelName}:${this.id}". The built-in \`toJSON\` method on instances of classes extending \`Model\` is deprecated. For more information see the link below.`,
-        false,
-        {
-          id: 'ember-data:model.toJSON',
-          until: '4.0',
-          url: 'https://deprecations.emberjs.com/ember-data/v3.x#toc_record-toJSON',
-          for: '@ember-data/model',
-          since: {
-            available: '3.15',
-            enabled: '3.15',
-          },
-        }
-      );
-      let serializer = this._internalModel.store.serializerFor('-default');
-      let snapshot = this._internalModel.createSnapshot();
-
-      return serializer.serialize(snapshot, options);
-    },
-  });
-}
-
 if (DEBUG) {
   let lookupDescriptor = function lookupDescriptor(obj, keyName) {
     let current = obj;
@@ -2279,12 +2237,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.1.0-alpha.1",
+  "version": "4.1.0-alpha.13",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,11 +18,11 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.1.0-alpha.1",
-    "@ember-data/private-build-infra": "4.1.0-alpha.1",
-    "@ember-data/store": "4.1.0-alpha.1",
+    "@ember-data/canary-features": "4.1.0-alpha.13",
+    "@ember-data/private-build-infra": "4.1.0-alpha.13",
+    "@ember-data/store": "4.1.0-alpha.13",
     "@ember/edition-utils": "^1.2.0",
-    "@ember/string": "^1.0.0",
+    "@ember/string": "^3.0.0",
     "ember-cached-decorator-polyfill": "^0.1.4",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-string-utils": "^1.1.0",
@@ -32,7 +32,7 @@
     "inflection": "~1.13.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.1",
+    "@ember-data/unpublished-test-infra": "4.1.0-alpha.13",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "broccoli-asset-rev": "^3.0.0",