@ember-data/model 4.1.0-alpha.9 → 4.2.0-alpha.2

package/addon/-private/attr.js

@@ -2,7 +2,6 @@ import { assert } from '@ember/debug';
 import { computed } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 
-import { RECORD_DATA_ERRORS } from '@ember-data/canary-features';
 import { recordDataFor } from '@ember-data/store/-private';
 
 import { computedMacroWithOptionalParams } from './util';
@@ -151,15 +150,13 @@ function attr(type, options) {
           );
         }
       }
-      if (RECORD_DATA_ERRORS) {
-        if (!this.isValid) {
-          let oldValue = this._internalModel._recordData.getAttr(key);
-          if (oldValue !== value) {
-            const { errors } = this;
-            if (errors.get(key)) {
-              errors.remove(key);
-              this.___recordState.cleanErrorRequests();
-            }
+      if (!this.isValid) {
+        let oldValue = this._internalModel._recordData.getAttr(key);
+        if (oldValue !== value) {
+          const { errors } = this;
+          if (errors.get(key)) {
+            errors.remove(key);
+            this.___recordState.cleanErrorRequests();
           }
         }
       }

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

@@ -12,11 +12,9 @@ import { DEBUG } from '@glimmer/env';
 import { tracked } from '@glimmer/tracking';
 import Ember from 'ember';
 
-import { CUSTOM_MODEL_CLASS, RECORD_DATA_ERRORS, REQUEST_SERVICE } from '@ember-data/canary-features';
 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 {
@@ -34,15 +32,6 @@ import { relationshipFromMeta } from './system/relationships/relationship-meta';
 
 const { changeProperties } = Ember;
 
-/*
- In the non-CUSTOM_MODEL_CLASS world things decorated with flagToggledDecorator
- have logic that requires a cache and caching key (which tagged provides), but
- in the CUSTOM_MODEL_CLASS branch it only requires dependentKeyCompat which
- ensures computeds/observers on the field will fire when anything it accesses
- that is tracked changes
-*/
-const flagToggledDecorator = CUSTOM_MODEL_CLASS ? dependentKeyCompat : tagged;
-
 function findPossibleInverses(type, inverseType, name, relationshipsSoFar) {
   let possibleRelationships = relationshipsSoFar || [];
 
@@ -119,8 +108,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) {
@@ -130,9 +121,8 @@ class Model extends EmberObject {
       }
     }
 
-    if (CUSTOM_MODEL_CLASS) {
-      this.___recordState = new RecordState(this);
-    }
+    this.___recordState = new RecordState(this);
+    this.setProperties(createProps);
   }
 
   /**
@@ -387,21 +377,13 @@ class Model extends EmberObject {
     @type {Boolean}
     @readOnly
   */
-  @flagToggledDecorator
+  @dependentKeyCompat
   get isError() {
-    if (REQUEST_SERVICE) {
-      return this.currentState.isError;
-    }
-    let tag = peekTag(this, 'isError');
-    tag.value = tag.value || false;
-    return tag.value;
+    return this.currentState.isError;
   }
   set isError(v) {
-    if (REQUEST_SERVICE && DEBUG) {
-      throw new Error(`isError is not directly settable when REQUEST_SERVICE is enabled`);
-    } else {
-      let tag = peekTag(this, 'isError');
-      tag.value = v;
+    if (DEBUG) {
+      throw new Error(`isError is not directly settable`);
     }
   }
 
@@ -470,19 +452,10 @@ class Model extends EmberObject {
   */
   @tagged
   get currentState() {
-    if (CUSTOM_MODEL_CLASS) {
-      return this.___recordState;
-    }
-    if (this.isDestroyed || this.isDestroying) {
-      return this._internalModel._previousState;
-    }
-
-    return this._internalModel && this._internalModel.currentState;
+    return this.___recordState;
   }
-  set currentState(v) {
-    if (!CUSTOM_MODEL_CLASS) {
-      this.notifyPropertyChange('currentState');
-    }
+  set currentState(_v) {
+    throw new Error('cannot set currentState');
   }
 
   /**
@@ -562,21 +535,19 @@ class Model extends EmberObject {
         this._internalModel.send('becameValid');
       }
     );
-    if (RECORD_DATA_ERRORS) {
-      // TODO we should unify how errors gets populated
-      // with the code managing the update. Probably a
-      // lazy flush similar to retrieveLatest in ManyArray
-      let recordData = recordDataFor(this);
-      let jsonApiErrors;
-      if (recordData.getErrors) {
-        jsonApiErrors = recordData.getErrors();
-        if (jsonApiErrors) {
-          let errorsHash = errorsArrayToHash(jsonApiErrors);
-          let errorKeys = Object.keys(errorsHash);
-
-          for (let i = 0; i < errorKeys.length; i++) {
-            errors._add(errorKeys[i], errorsHash[errorKeys[i]]);
-          }
+    // TODO we should unify how errors gets populated
+    // with the code managing the update. Probably a
+    // lazy flush similar to retrieveLatest in ManyArray
+    let recordData = recordDataFor(this);
+    let jsonApiErrors;
+    if (recordData.getErrors) {
+      jsonApiErrors = recordData.getErrors();
+      if (jsonApiErrors) {
+        let errorsHash = errorsArrayToHash(jsonApiErrors);
+        let errorKeys = Object.keys(errorsHash);
+
+        for (let i = 0; i < errorKeys.length; i++) {
+          errors._add(errorKeys[i], errorsHash[errorKeys[i]]);
         }
       }
     }
@@ -591,22 +562,12 @@ class Model extends EmberObject {
     @public
     @type {AdapterError}
   */
-  @flagToggledDecorator
+  @dependentKeyCompat
   get adapterError() {
-    if (REQUEST_SERVICE) {
-      return this.currentState.adapterError;
-    }
-    let tag = peekTag(this, 'adapterError');
-    tag.value = tag.value || null;
-    return tag.value;
+    return this.currentState.adapterError;
   }
   set adapterError(v) {
-    if (REQUEST_SERVICE && DEBUG) {
-      throw new Error(`adapterError is not directly settable when REQUEST_SERVICE is enabled`);
-    } else {
-      let tag = peekTag(this, 'adapterError');
-      tag.value = v;
-    }
+    throw new Error(`adapterError is not directly settable`);
   }
 
   /**
@@ -764,11 +725,7 @@ class Model extends EmberObject {
     @public
   */
   deleteRecord() {
-    if (CUSTOM_MODEL_CLASS) {
-      this.store.deleteRecord(this);
-    } else {
-      this._internalModel.deleteRecord();
-    }
+    this.store.deleteRecord(this);
   }
 
   /**
@@ -837,11 +794,7 @@ class Model extends EmberObject {
     if (this.isDestroyed) {
       return;
     }
-    if (CUSTOM_MODEL_CLASS) {
-      this.store.unloadRecord(this);
-    } else {
-      this._internalModel.unloadRecord();
-    }
+    this.store.unloadRecord(this);
   }
 
   /**
@@ -931,9 +884,7 @@ class Model extends EmberObject {
   */
   rollbackAttributes() {
     this._internalModel.rollbackAttributes();
-    if (CUSTOM_MODEL_CLASS) {
-      this.currentState.cleanErrorRequests();
-    }
+    this.currentState.cleanErrorRequests();
   }
 
   /**
@@ -2076,6 +2027,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) {
   /**
@@ -2173,47 +2125,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;

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-alpha.9",
+  "version": "4.2.0-alpha.2",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,11 +18,12 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.1.0-alpha.9",
-    "@ember-data/private-build-infra": "4.1.0-alpha.9",
-    "@ember-data/store": "4.1.0-alpha.9",
+    "@ember-data/canary-features": "4.2.0-alpha.2",
+    "@ember-data/private-build-infra": "4.2.0-alpha.2",
+    "@ember-data/store": "4.2.0-alpha.2",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^3.0.0",
+    "ember-auto-import": "^2.2.4",
     "ember-cached-decorator-polyfill": "^0.1.4",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-string-utils": "^1.1.0",
@@ -32,25 +33,24 @@
     "inflection": "~1.13.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.9",
+    "@ember-data/unpublished-test-infra": "4.2.0-alpha.2",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.5",
+    "@ember/test-helpers": "^2.6.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^2.0.0",
-    "ember-cli": "~3.26.1",
+    "ember-cli": "~4.0.1",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^5.1.2",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "~4.0.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^5.1.4",
-    "ember-resolver": "^8.0.0",
-    "ember-source": "~3.27.1",
+    "ember-maybe-import-regenerator": "^1.0.0",
+    "ember-qunit": "^5.1.5",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "~4.0.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",
     "loader.js": "^4.7.0",