@ember-data/model 4.1.0-beta.0 → 4.1.0

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

@@ -24,17 +24,17 @@ import { computedMacroWithOptionalParams } from './util';
 
   ```app/models/post.js
   import Model, { hasMany } from '@ember-data/model';
-  
+
   export default class PostModel extends Model {
-    @hasMany('comment') comments; 
+    @hasMany('comment') comments;
   }
   ```
 
   ```app/models/comment.js
   import Model, { belongsTo } from '@ember-data/model';
-  
+
   export default class CommentModel extends Model {
-    @belongsTo('post') post; 
+    @belongsTo('post') post;
   }
   ```
 
@@ -54,7 +54,7 @@ import { computedMacroWithOptionalParams } from './util';
   import Model, { hasMany } from '@ember-data/model';
 
   export default class TagModel extends Model {
-    @hasMany('post') posts; 
+    @hasMany('post') posts;
   }
   ```
 

package/addon/-private/model.js

@@ -16,6 +16,7 @@ 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 {
@@ -77,7 +78,7 @@ function findPossibleInverses(type, inverseType, name, relationshipsSoFar) {
 
 /*
  * This decorator allows us to lazily compute
- * an expensive getter on first-access and thereafter
+ * an expensive getter on first-access and therafter
  * never recompute it.
  */
 function computeOnce(target, key, desc) {
@@ -118,8 +119,10 @@ function computeOnce(target, key, desc) {
   @uses DeprecatedEvented
 */
 class Model extends EmberObject {
-  init(...args) {
-    super.init(...args);
+  init(options = {}) {
+    const createProps = options._createProps;
+    delete options._createProps;
+    super.init(options);
 
     if (DEBUG) {
       if (!this._internalModel) {
@@ -132,6 +135,7 @@ class Model extends EmberObject {
     if (CUSTOM_MODEL_CLASS) {
       this.___recordState = new RecordState(this);
     }
+    this.setProperties(createProps);
   }
 
   /**
@@ -1866,7 +1870,7 @@ class Model extends EmberObject {
 
    ```javascript
    import { get } from '@ember/object';
-   import Person from 'app/models/person'
+   import Blog from 'app/models/blog'
 
    let attributes = Person.attributes
 
@@ -2075,6 +2079,7 @@ class Model extends EmberObject {
 // the values initialized during create to `setUnknownProperty`
 Model.prototype._internalModel = null;
 Model.prototype.store = null;
+Model.prototype._createProps = null;
 
 if (HAS_DEBUG_PACKAGE) {
   /**
@@ -2172,6 +2177,47 @@ 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;

package/addon/-private/system/promise-many-array.ts

@@ -1,3 +1,4 @@
+import ArrayMixin from '@ember/array';
 import { assert } from '@ember/debug';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { tracked } from '@glimmer/tracking';
@@ -16,7 +17,7 @@ import { DEPRECATE_EVENTED_API_USAGE } from '@ember-data/private-build-infra/dep
 
   A PromiseManyArray is an array-like proxy that also proxies certain method calls
   to the underlying ManyArray in addition to being "promisified".
-   
+
   Right now we proxy:
 
     * `reload()`
@@ -41,6 +42,14 @@ export default class PromiseManyArray {
     this._update(promise, content);
     this.isDestroyed = false;
     this.isDestroying = false;
+
+    const meta = Ember.meta(this);
+    meta.hasMixin = (mixin: Object) => {
+      if (mixin === ArrayMixin) {
+        return true;
+      }
+      return false;
+    };
   }
 
   //---- Methods/Properties on ArrayProxy that we will keep as our API

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.1.0-beta.0",
+  "version": "4.1.0",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,9 +18,9 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.1.0-beta.0",
-    "@ember-data/private-build-infra": "4.1.0-beta.0",
-    "@ember-data/store": "4.1.0-beta.0",
+    "@ember-data/canary-features": "4.1.0",
+    "@ember-data/private-build-infra": "4.1.0",
+    "@ember-data/store": "4.1.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^3.0.0",
     "ember-auto-import": "^2.2.4",
@@ -33,7 +33,7 @@
     "inflection": "~1.13.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-beta.0",
+    "@ember-data/unpublished-test-infra": "4.1.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
     "broccoli-asset-rev": "^3.0.0",