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

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/errors.js

@@ -2,10 +2,6 @@ import { A, makeArray } from '@ember/array';
 import ArrayProxy from '@ember/array/proxy';
 import { computed, get } from '@ember/object';
 import { mapBy, not } from '@ember/object/computed';
-import { DEBUG } from '@glimmer/env';
-
-import { DEPRECATE_EVENTED_API_USAGE } from '@ember-data/private-build-infra/deprecations';
-import { DeprecatedEvented } from '@ember-data/store/-private';
 
 /**
   @module @ember-data/store
@@ -85,9 +81,8 @@ import { DeprecatedEvented } from '@ember-data/store/-private';
   @class Errors
   @public
   @extends Ember.ArrayProxy
-  @uses Ember.Evented
  */
-export default ArrayProxy.extend(DeprecatedEvented, {
+export default ArrayProxy.extend({
   /**
     Register with target handler
 
@@ -250,11 +245,6 @@ export default ArrayProxy.extend(DeprecatedEvented, {
 
     if (wasEmpty && !get(this, 'isEmpty')) {
       this._registeredHandlers && this._registeredHandlers.becameInvalid();
-      if (DEPRECATE_EVENTED_API_USAGE) {
-        if (this[DEBUG ? '_has' : 'has']('becameInvalid')) {
-          this.trigger('becameInvalid');
-        }
-      }
     }
   },
 
@@ -334,11 +324,6 @@ export default ArrayProxy.extend(DeprecatedEvented, {
 
     if (get(this, 'isEmpty')) {
       this._registeredHandlers && this._registeredHandlers.becameValid();
-      if (DEPRECATE_EVENTED_API_USAGE) {
-        if (this[DEBUG ? '_has' : 'has']('becameValid')) {
-          this.trigger('becameValid');
-        }
-      }
     }
   },
 
@@ -417,11 +402,6 @@ export default ArrayProxy.extend(DeprecatedEvented, {
 
     this._clear();
     this._registeredHandlers && this._registeredHandlers.becameValid();
-    if (DEPRECATE_EVENTED_API_USAGE) {
-      if (this[DEBUG ? '_has' : 'has']('becameValid')) {
-        this.trigger('becameValid');
-      }
-    }
   },
 
   /**

package/addon/-private/model.js

@@ -2,7 +2,7 @@
   @module @ember-data/model
  */
 
-import { assert, deprecate, warn } from '@ember/debug';
+import { assert, warn } from '@ember/debug';
 import EmberError from '@ember/error';
 import EmberObject, { get } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
@@ -12,20 +12,8 @@ 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_RECORD_LIFECYCLE_EVENT_METHODS,
-} from '@ember-data/private-build-infra/deprecations';
-import {
-  coerceId,
-  DeprecatedEvented,
-  errorsArrayToHash,
-  InternalModel,
-  PromiseObject,
-  recordDataFor,
-} from '@ember-data/store/-private';
+import { coerceId, errorsArrayToHash, InternalModel, PromiseObject, recordDataFor } from '@ember-data/store/-private';
 
 import Errors from './errors';
 import RecordState, { peekTag, tagged } from './record-state';
@@ -33,15 +21,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 || [];
 
@@ -115,7 +94,6 @@ function computeOnce(target, key, desc) {
   @class Model
   @public
   @extends Ember.EmberObject
-  @uses DeprecatedEvented
 */
 class Model extends EmberObject {
   init(options = {}) {
@@ -131,9 +109,7 @@ class Model extends EmberObject {
       }
     }
 
-    if (CUSTOM_MODEL_CLASS) {
-      this.___recordState = new RecordState(this);
-    }
+    this.___recordState = new RecordState(this);
     this.setProperties(createProps);
   }
 
@@ -389,21 +365,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`);
     }
   }
 
@@ -472,19 +440,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');
   }
 
   /**
@@ -564,21 +523,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]]);
         }
       }
     }
@@ -593,22 +550,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`);
   }
 
   /**
@@ -630,92 +577,6 @@ class Model extends EmberObject {
     return this._internalModel.createSnapshot().serialize(options);
   }
 
-  /**
-    Fired when the record is ready to be interacted with,
-    that is either loaded from the server or created locally.
-
-    @deprecated
-    @public
-    @event ready
-  */
-
-  /**
-    Fired when the record is loaded from the server.
-
-    @deprecated
-    @public
-    @event didLoad
-  */
-
-  /**
-    Fired when the record is updated.
-
-    @deprecated
-    @public
-    @event didUpdate
-  */
-
-  /**
-    Fired when a new record is commited to the server.
-
-    @deprecated
-    @public
-    @event didCreate
-  */
-
-  /**
-    Fired when the record is deleted.
-
-    @deprecated
-    @public
-    @event didDelete
-  */
-
-  /**
-    Fired when the record becomes invalid.
-
-    @deprecated
-    @public
-    @event becameInvalid
-  */
-
-  /**
-    Fired when the record enters the error state.
-
-    @deprecated
-    @public
-    @event becameError
-  */
-
-  /**
-    Fired when the record is rolled back.
-
-    @deprecated
-    @public
-    @event rolledBack
-  */
-
-  /**
-    @deprecated
-    @method send
-    @private
-    @param {String} name
-    @param {Object} context
-  */
-  send(name, context) {
-    return this._internalModel.send(name, context);
-  }
-
-  /**
-    @deprecated
-    @method transitionTo
-    @private
-    @param {String} name
-  */
-  transitionTo(name) {
-    return this._internalModel.transitionTo(name);
-  }
-
   /*
     We hook the default implementation to ensure
     our tagged properties are properly notified
@@ -766,11 +627,7 @@ class Model extends EmberObject {
     @public
   */
   deleteRecord() {
-    if (CUSTOM_MODEL_CLASS) {
-      this.store.deleteRecord(this);
-    } else {
-      this._internalModel.deleteRecord();
-    }
+    this.store.deleteRecord(this);
   }
 
   /**
@@ -839,11 +696,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);
   }
 
   /**
@@ -933,9 +786,7 @@ class Model extends EmberObject {
   */
   rollbackAttributes() {
     this._internalModel.rollbackAttributes();
-    if (CUSTOM_MODEL_CLASS) {
-      this.currentState.cleanErrorRequests();
-    }
+    this.currentState.cleanErrorRequests();
   }
 
   /**
@@ -2144,38 +1995,6 @@ if (HAS_DEBUG_PACKAGE) {
   };
 }
 
-if (DEPRECATE_EVENTED_API_USAGE) {
-  /**
-  Override the default event firing from Ember.Evented to
-  also call methods with the given name.
-
-  @method trigger
-  @private
-  @param {String} name
-*/
-  Model.reopen(DeprecatedEvented, {
-    trigger(name) {
-      if (DEPRECATE_RECORD_LIFECYCLE_EVENT_METHODS) {
-        let fn = this[name];
-        if (typeof fn === 'function') {
-          let length = arguments.length;
-          let args = new Array(length - 1);
-
-          for (let i = 1; i < length; i++) {
-            args[i - 1] = arguments[i];
-          }
-          fn.apply(this, args);
-        }
-      }
-
-      const _hasEvent = DEBUG ? this._has(name) : this.has(name);
-      if (_hasEvent) {
-        this._super(...arguments);
-      }
-    },
-  });
-}
-
 if (DEBUG) {
   let lookupDescriptor = function lookupDescriptor(obj, keyName) {
     let current = obj;
@@ -2199,42 +2018,10 @@ if (DEBUG) {
     return isBasicDesc(instanceDesc) && lookupDescriptor(obj.constructor, keyName) === null;
   };
 
-  let lookupDeprecations;
-  let _deprecatedLifecycleMethods;
-
-  if (DEPRECATE_RECORD_LIFECYCLE_EVENT_METHODS) {
-    const INSTANCE_DEPRECATIONS = new WeakMap();
-    _deprecatedLifecycleMethods = [
-      'becameError',
-      'becameInvalid',
-      'didCreate',
-      'didDelete',
-      'didLoad',
-      'didUpdate',
-      'ready',
-      'rolledBack',
-    ];
-
-    lookupDeprecations = function lookupInstanceDeprecations(instance) {
-      let deprecations = INSTANCE_DEPRECATIONS.get(instance);
-
-      if (!deprecations) {
-        deprecations = new Set();
-        INSTANCE_DEPRECATIONS.set(instance, deprecations);
-      }
-
-      return deprecations;
-    };
-  }
-
   Model.reopen({
     init() {
       this._super(...arguments);
 
-      if (DEPRECATE_EVENTED_API_USAGE) {
-        this._getDeprecatedEventedInfo = () => `${this._internalModel.modelName}#${this.id}`;
-      }
-
       if (!isDefaultEmptyDescriptor(this, '_internalModel') || !(this._internalModel instanceof InternalModel)) {
         throw new Error(
           `'_internalModel' is a reserved property name on instances of classes extending Model. Please choose a different property name for ${this.constructor.toString()}`
@@ -2258,31 +2045,6 @@ if (DEBUG) {
           `You may not set 'id' as an attribute on your model. Please remove any lines that look like: \`id: attr('<type>')\` from ${this.constructor.toString()}`
         );
       }
-
-      if (DEPRECATE_RECORD_LIFECYCLE_EVENT_METHODS) {
-        let lifecycleDeprecations = lookupDeprecations(this.constructor);
-
-        _deprecatedLifecycleMethods.forEach((methodName) => {
-          if (typeof this[methodName] === 'function' && !lifecycleDeprecations.has(methodName)) {
-            deprecate(
-              `You defined a \`${methodName}\` method for ${this.constructor.toString()} but lifecycle events for models have been deprecated.`,
-              false,
-              {
-                id: 'ember-data:record-lifecycle-event-methods',
-                until: '4.0',
-                url: 'https://deprecations.emberjs.com/ember-data/v3.x#toc_record-lifecycle-event-methods',
-                for: '@ember-data/model',
-                since: {
-                  available: '3.12',
-                  enabled: '3.12',
-                },
-              }
-            );
-
-            lifecycleDeprecations.add(methodName);
-          }
-        });
-      }
     },
   });
 }

package/addon/-private/system/many-array.js

@@ -8,7 +8,7 @@ import EmberObject, { get } from '@ember/object';
 
 import { all } from 'rsvp';
 
-import { DeprecatedEvented, PromiseArray, recordDataFor } from '@ember-data/store/-private';
+import { PromiseArray, recordDataFor } from '@ember-data/store/-private';
 
 import diffArray from './diff-array';
 
@@ -55,9 +55,9 @@ import diffArray from './diff-array';
   @class ManyArray
   @public
   @extends Ember.EmberObject
-  @uses Ember.MutableArray, DeprecatedEvented
+  @uses Ember.MutableArray
 */
-export default EmberObject.extend(MutableArray, DeprecatedEvented, {
+export default EmberObject.extend(MutableArray, {
   isAsync: false,
   isLoaded: false,
 

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

@@ -6,8 +6,6 @@ import Ember from 'ember';
 
 import { resolve } from 'rsvp';
 
-import { DEPRECATE_EVENTED_API_USAGE } from '@ember-data/private-build-infra/deprecations';
-
 /**
  @module @ember-data/model
  */
@@ -330,12 +328,3 @@ InheritedProxyMethods.forEach((method) => {
     return this.content[method](...args);
   };
 });
-
-if (DEPRECATE_EVENTED_API_USAGE) {
-  ['on', 'has', 'trigger', 'off', 'one'].forEach((method) => {
-    PromiseManyArray.prototype[method] = function proxiedMethod(...args) {
-      assert(`Cannot call ${method} before content is assigned.`, this.content);
-      return this.content[method](...args);
-    };
-  });
-}

package/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function() {
   setupTest();

package/blueprints/model-test/qunit-files/__root__/__path__/__test__.js

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function(hooks) {
   setupTest(hooks);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.2.0-beta.0",
+  "version": "4.4.0-alpha.0",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -18,44 +18,44 @@
     "test:node": "mocha"
   },
   "dependencies": {
-    "@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-data/canary-features": "4.4.0-alpha.0",
+    "@ember-data/private-build-infra": "4.4.0-alpha.0",
+    "@ember-data/store": "4.4.0-alpha.0",
     "@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-babel": "^7.26.11",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-test-info": "^1.0.0",
-    "ember-cli-typescript": "^4.1.0",
+    "ember-cli-typescript": "^5.0.0",
     "ember-compatibility-helpers": "^1.2.0",
     "inflection": "~1.13.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.2.0-beta.0",
+    "@ember-data/unpublished-test-infra": "4.4.0-alpha.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.26.1",
+    "ember-cli": "~4.1.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-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.0",
-    "ember-source": "~4.0.0",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "~4.2.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-try": "^1.4.0",
+    "ember-try": "^2.0.0",
     "loader.js": "^4.7.0",
-    "qunit": "^2.15.0",
-    "qunit-dom": "^1.6.0",
+    "qunit": "^2.17.0",
+    "qunit-dom": "^2.0.0",
     "silent-error": "^1.1.1",
     "webpack": "^5.37.1"
   },