@ember-data/model 4.2.0-alpha.2 → 4.2.0-beta.0

package/addon/-private/attr.js

@@ -2,6 +2,7 @@ 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';
@@ -150,13 +151,15 @@ function attr(type, options) {
           );
         }
       }
-      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 (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();
+            }
           }
         }
       }

package/addon/-private/model.js

@@ -12,6 +12,7 @@ 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,
@@ -32,6 +33,15 @@ 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 || [];
 
@@ -121,7 +131,9 @@ class Model extends EmberObject {
       }
     }
 
-    this.___recordState = new RecordState(this);
+    if (CUSTOM_MODEL_CLASS) {
+      this.___recordState = new RecordState(this);
+    }
     this.setProperties(createProps);
   }
 
@@ -377,13 +389,21 @@ class Model extends EmberObject {
     @type {Boolean}
     @readOnly
   */
-  @dependentKeyCompat
+  @flagToggledDecorator
   get isError() {
-    return this.currentState.isError;
+    if (REQUEST_SERVICE) {
+      return this.currentState.isError;
+    }
+    let tag = peekTag(this, 'isError');
+    tag.value = tag.value || false;
+    return tag.value;
   }
   set isError(v) {
-    if (DEBUG) {
-      throw new Error(`isError is not directly settable`);
+    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;
     }
   }
 
@@ -452,10 +472,19 @@ class Model extends EmberObject {
   */
   @tagged
   get currentState() {
-    return this.___recordState;
+    if (CUSTOM_MODEL_CLASS) {
+      return this.___recordState;
+    }
+    if (this.isDestroyed || this.isDestroying) {
+      return this._internalModel._previousState;
+    }
+
+    return this._internalModel && this._internalModel.currentState;
   }
-  set currentState(_v) {
-    throw new Error('cannot set currentState');
+  set currentState(v) {
+    if (!CUSTOM_MODEL_CLASS) {
+      this.notifyPropertyChange('currentState');
+    }
   }
 
   /**
@@ -535,19 +564,21 @@ class Model extends EmberObject {
         this._internalModel.send('becameValid');
       }
     );
-    // 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]]);
+    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]]);
+          }
         }
       }
     }
@@ -562,12 +593,22 @@ class Model extends EmberObject {
     @public
     @type {AdapterError}
   */
-  @dependentKeyCompat
+  @flagToggledDecorator
   get adapterError() {
-    return this.currentState.adapterError;
+    if (REQUEST_SERVICE) {
+      return this.currentState.adapterError;
+    }
+    let tag = peekTag(this, 'adapterError');
+    tag.value = tag.value || null;
+    return tag.value;
   }
   set adapterError(v) {
-    throw new Error(`adapterError is not directly settable`);
+    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;
+    }
   }
 
   /**
@@ -725,7 +766,11 @@ class Model extends EmberObject {
     @public
   */
   deleteRecord() {
-    this.store.deleteRecord(this);
+    if (CUSTOM_MODEL_CLASS) {
+      this.store.deleteRecord(this);
+    } else {
+      this._internalModel.deleteRecord();
+    }
   }
 
   /**
@@ -794,7 +839,11 @@ class Model extends EmberObject {
     if (this.isDestroyed) {
       return;
     }
-    this.store.unloadRecord(this);
+    if (CUSTOM_MODEL_CLASS) {
+      this.store.unloadRecord(this);
+    } else {
+      this._internalModel.unloadRecord();
+    }
   }
 
   /**
@@ -884,7 +933,9 @@ class Model extends EmberObject {
   */
   rollbackAttributes() {
     this._internalModel.rollbackAttributes();
-    this.currentState.cleanErrorRequests();
+    if (CUSTOM_MODEL_CLASS) {
+      this.currentState.cleanErrorRequests();
+    }
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-beta.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.2.0-alpha.2",
-    "@ember-data/private-build-infra": "4.2.0-alpha.2",
-    "@ember-data/store": "4.2.0-alpha.2",
+    "@ember-data/canary-features": "4.2.0-beta.0",
+    "@ember-data/private-build-infra": "4.2.0-beta.0",
+    "@ember-data/store": "4.2.0-beta.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^3.0.0",
     "ember-auto-import": "^2.2.4",
@@ -33,23 +33,23 @@
     "inflection": "~1.13.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.2.0-alpha.2",
+    "@ember-data/unpublished-test-infra": "4.2.0-beta.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.0.1",
+    "ember-cli": "~3.26.1",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^5.1.2",
     "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": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
+    "ember-resolver": "^8.0.0",
     "ember-source": "~4.0.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^1.4.0",