@ember-data/model 4.8.0-alpha.0 → 4.8.0-alpha.3

package/addon/-private/attr.js

@@ -130,13 +130,24 @@ function attr(type, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
+        if (['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()}`
           );
         }
       }
+      if (this.isDestroyed || this.isDestroying) {
+        return;
+      }
       let recordData = recordDataFor(this);
+      // TODO hasAttr is not spec'd
+      // essentially this is needed because
+      // there is a difference between "undefined" meaning never set
+      // and "undefined" meaning set to "undefined". In the "key present"
+      // case we want to return undefined. In the "key absent" case
+      // we want to return getDefaultValue. RecordDataV2 can fix this
+      // by providing the attributes blob such that we can make our
+      // own determination.
       if (recordData.hasAttr(key)) {
         return recordData.getAttr(key);
       } else {
@@ -145,7 +156,7 @@ function attr(type, options) {
     },
     set(key, value) {
       if (DEBUG) {
-        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
+        if (['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

@@ -98,7 +98,7 @@ import { computedMacroWithOptionalParams } from './util';
   a related resource is known to exist and it has not been loaded.
 
   ```
-  let post = comment.get('post');
+  let post = comment.post;
 
   ```
 
@@ -143,10 +143,16 @@ function belongsTo(modelName, options) {
 
   return computed({
     get(key) {
+      // this is a legacy behavior we may not carry into a new model setup
+      // it's better to error on disconnected records so users find errors
+      // in their logic.
+      if (this.isDestroying || this.isDestroyed) {
+        return null;
+      }
       const support = LEGACY_SUPPORT.lookup(this);
 
       if (DEBUG) {
-        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['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()}`
           );
@@ -177,7 +183,7 @@ function belongsTo(modelName, options) {
     set(key, value) {
       const support = LEGACY_SUPPORT.lookup(this);
       if (DEBUG) {
-        if (['_internalModel', 'recordData', 'currentState'].indexOf(key) !== -1) {
+        if (['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/errors.ts

@@ -123,7 +123,7 @@ export default class Errors extends ArrayProxyWithCustomOverrides<ValidationErro
       email: 'invalidEmail'
     });
     user.save().catch(function(){
-      user.get('errors').errorsFor('email'); // returns:
+      user.errors.errorsFor('email'); // returns:
       // [{attribute: "email", message: "Doesn't look like a valid email."}]
     });
     ```
@@ -219,7 +219,7 @@ export default class Errors extends ArrayProxyWithCustomOverrides<ValidationErro
 
    Example
    ```javascript
-    let errors = get(user, 'errors');
+    let errors = user.errors;
 
     // add multiple errors
     errors.add('password', [
@@ -293,7 +293,7 @@ export default class Errors extends ArrayProxyWithCustomOverrides<ValidationErro
    Example:
 
    ```javascript
-    let errors = get('user', errors);
+    let errors = user.errors;
     errors.add('phone', ['error-1', 'error-2']);
 
     errors.errorsFor('phone');
@@ -344,7 +344,7 @@ export default class Errors extends ArrayProxyWithCustomOverrides<ValidationErro
   Example:
 
    ```javascript
-   let errors = get('user', errors);
+   let errors = user.errors;
    errors.add('username', ['error-a']);
    errors.add('phone', ['error-1', 'error-2']);
 
@@ -369,7 +369,7 @@ export default class Errors extends ArrayProxyWithCustomOverrides<ValidationErro
    errors.errorsFor('phone');
    // => undefined
 
-   errors.get('messages')
+   errors.messages
    // => []
    ```
    @method clear
@@ -406,7 +406,7 @@ export default class Errors extends ArrayProxyWithCustomOverrides<ValidationErro
     export default class UserEditController extends Controller {
       @action
       save(user) {
-        if (user.get('errors').has('email')) {
+        if (user.errors.has('email')) {
           return alert('Please update your email before attempting to save.');
         }
         user.save();

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

@@ -1,6 +1,7 @@
 /**
   @module @ember-data/model
 */
+import { A } from '@ember/array';
 import { assert, inspect } from '@ember/debug';
 import { computed } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
@@ -132,7 +133,7 @@ import { computedMacroWithOptionalParams } from './util';
   when any of the known related resources have not been loaded.
 
   ```
-  post.get('comments').forEach((comment) => {
+  post.comments.forEach((comment) => {
 
   });
 
@@ -183,17 +184,20 @@ function hasMany(type, options) {
   return computed({
     get(key) {
       if (DEBUG) {
-        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
+        if (['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()}`
           );
         }
       }
+      if (this.isDestroying || this.isDestroyed) {
+        return A();
+      }
       return LEGACY_SUPPORT.lookup(this).getHasMany(key);
     },
     set(key, records) {
       if (DEBUG) {
-        if (['_internalModel', 'currentState'].indexOf(key) !== -1) {
+        if (['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/legacy-data-fetch.js

@@ -8,6 +8,7 @@ import { DEPRECATE_RSVP_PROMISE } from '@ember-data/private-build-infra/deprecat
 import { iterateData, normalizeResponseHelper } from './legacy-data-utils';
 
 export function _findHasMany(adapter, store, identifier, link, relationship, options) {
+  const record = store._instanceCache.getRecord(identifier);
   const snapshot = store._instanceCache.createSnapshot(identifier, options);
   let modelClass = store.modelFor(relationship.type);
   let useLink = !link || typeof link === 'string';
@@ -18,7 +19,7 @@ export function _findHasMany(adapter, store, identifier, link, relationship, opt
   promise = guardDestroyedStore(promise, store, label);
   promise = promise.then(
     (adapterPayload) => {
-      if (!_objectIsAlive(store._instanceCache.getInternalModel(identifier))) {
+      if (!_objectIsAlive(record)) {
         if (DEPRECATE_RSVP_PROMISE) {
           deprecate(
             `A Promise for fetching ${relationship.type} did not resolve by the time your model was destroyed. This will error in a future release.`,
@@ -57,13 +58,14 @@ export function _findHasMany(adapter, store, identifier, link, relationship, opt
   );
 
   if (DEPRECATE_RSVP_PROMISE) {
-    promise = _guard(promise, _bind(_objectIsAlive, store._instanceCache.getInternalModel(identifier)));
+    promise = _guard(promise, _bind(_objectIsAlive, record));
   }
 
   return promise;
 }
 
 export function _findBelongsTo(store, identifier, link, relationship, options) {
+  const record = store._instanceCache.getRecord(identifier);
   let adapter = store.adapterFor(identifier.type);
 
   assert(`You tried to load a belongsTo relationship but you have no adapter (for ${identifier.type})`, adapter);
@@ -79,11 +81,11 @@ export function _findBelongsTo(store, identifier, link, relationship, options) {
   let label = `DS: Handle Adapter#findBelongsTo of ${identifier.type} : ${relationship.type}`;
 
   promise = guardDestroyedStore(promise, store, label);
-  promise = _guard(promise, _bind(_objectIsAlive, store._instanceCache.getInternalModel(identifier)));
+  promise = _guard(promise, _bind(_objectIsAlive, record));
 
   promise = promise.then(
     (adapterPayload) => {
-      if (!_objectIsAlive(store._instanceCache.getInternalModel(identifier))) {
+      if (!_objectIsAlive(record)) {
         if (DEPRECATE_RSVP_PROMISE) {
           deprecate(
             `A Promise for fetching ${relationship.type} did not resolve by the time your model was destroyed. This will error in a future release.`,
@@ -123,7 +125,7 @@ export function _findBelongsTo(store, identifier, link, relationship, options) {
   );
 
   if (DEPRECATE_RSVP_PROMISE) {
-    promise = _guard(promise, _bind(_objectIsAlive, store._instanceCache.getInternalModel(identifier)));
+    promise = _guard(promise, _bind(_objectIsAlive, record));
   }
 
   return promise;
@@ -229,8 +231,8 @@ function ensureRelationshipIsSetToParent(payload, parentIdentifier, store, paren
   }
 }
 
-function getInverse(store, parentInternalModel, parentRelationship, type) {
-  return recordDataFindInverseRelationshipInfo(store, parentInternalModel, parentRelationship, type);
+function getInverse(store, parentIdentifier, parentRelationship, type) {
+  return recordDataFindInverseRelationshipInfo(store, parentIdentifier, parentRelationship, type);
 }
 
 function recordDataFindInverseRelationshipInfo(store, parentIdentifier, parentRelationship, type) {

package/addon/-private/legacy-data-utils.ts

@@ -2,7 +2,7 @@ import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 import type Store from '@ember-data/store';
-import type ShimModelClass from '@ember-data/store/-private/model/shim-model-class';
+import type ShimModelClass from '@ember-data/store/-private/legacy-model-support/shim-model-class';
 import type { JsonApiDocument } from '@ember-data/types/q/ember-data-json-api';
 import type { StableExistingRecordIdentifier, StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { AdapterPayload } from '@ember-data/types/q/minimum-adapter-interface';

package/addon/-private/legacy-relationships-support.ts

@@ -13,11 +13,10 @@ import type {
 import type { UpgradedMeta } from '@ember-data/record-data/-private/graph/-edge-definition';
 import type { RelationshipState } from '@ember-data/record-data/-private/graph/-state';
 import type Store from '@ember-data/store';
-import type { InternalModel } from '@ember-data/store/-private';
 import { recordDataFor, recordIdentifierFor, storeFor } from '@ember-data/store/-private';
-import type { IdentifierCache } from '@ember-data/store/-private/identifier-cache';
+import { IdentifierCache } from '@ember-data/store/-private/caches/identifier-cache';
 import type { DSModel } from '@ember-data/types/q/ds-model';
-import type { ResourceIdentifierObject } from '@ember-data/types/q/ember-data-json-api';
+import { ResourceIdentifierObject } from '@ember-data/types/q/ember-data-json-api';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { RecordData } from '@ember-data/types/q/record-data';
 import type { JsonApiRelationship } from '@ember-data/types/q/record-data-json-api';
@@ -141,7 +140,7 @@ export class LegacySupport {
           `You looked up the '${key}' relationship on a '${identifier.type}' with id ${
             identifier.id || 'null'
           } but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (\`belongsTo({ async: true })\`)`,
-          toReturn === null || !store._instanceCache.getInternalModel(relatedIdentifier).isEmpty
+          toReturn === null || store._instanceCache.recordIsLoaded(relatedIdentifier, true)
         );
         return toReturn;
       }
@@ -447,7 +446,7 @@ export class LegacySupport {
       return resolve(null);
     }
 
-    const internalModel = resource.data ? this.store._instanceCache._internalModelForResource(resource.data) : null;
+    const identifier = resource.data ? this.store.identifierCache.getOrCreateRecordIdentifier(resource.data) : null;
 
     let { isStale, hasDematerializedInverse, hasReceivedData, isEmpty, shouldForceReload } = resource._relationship
       .state as RelationshipState;
@@ -458,9 +457,9 @@ export class LegacySupport {
       resource.links.related &&
       (shouldForceReload || hasDematerializedInverse || isStale || (!allInverseRecordsAreLoaded && !isEmpty));
 
-    if (internalModel) {
+    if (identifier) {
       // short circuit if we are already loading
-      let pendingRequest = this.store._fetchManager.getPendingFetch(internalModel.identifier, options);
+      let pendingRequest = this.store._fetchManager.getPendingFetch(identifier, options);
       if (pendingRequest) {
         return pendingRequest;
       }
@@ -485,22 +484,21 @@ export class LegacySupport {
         return resolve(null);
       }
 
-      if (!internalModel) {
-        assert(`No InternalModel found for ${resource.lid}`, internalModel);
+      if (!identifier) {
+        assert(`No Information found for ${resource.lid}`, identifier);
       }
 
-      return this.store._instanceCache._fetchDataIfNeededForIdentifier(internalModel.identifier, options);
+      return this.store._instanceCache._fetchDataIfNeededForIdentifier(identifier, options);
     }
 
     let resourceIsLocal = !localDataIsEmpty && resource.data.id === null;
 
-    if (internalModel && resourceIsLocal) {
-      return resolve(internalModel.identifier);
+    if (identifier && resourceIsLocal) {
+      return resolve(identifier);
     }
 
     // fetch by data
-    if (internalModel && !localDataIsEmpty) {
-      let identifier = internalModel.identifier;
+    if (identifier && !localDataIsEmpty) {
       assertIdentifierHasId(identifier);
 
       return this.store._fetchManager.scheduleFetch(identifier, options);
@@ -512,10 +510,6 @@ export class LegacySupport {
   }
 
   destroy() {
-    assert(
-      'Cannot destroy an internalModel while its record is materialized',
-      !this.record || this.record.isDestroyed || this.record.isDestroying
-    );
     this.isDestroying = true;
 
     const cache = this._manyArrayCache;
@@ -625,7 +619,14 @@ function assertRecordsPassedToHasMany(records: RecordInstance[]) {
       .map((r) => `${typeof r}`)
       .join(', ')}`,
     (function () {
-      return records.every((record) => Object.prototype.hasOwnProperty.call(record, '_internalModel') === true);
+      return records.every((record) => {
+        try {
+          recordIdentifierFor(record);
+          return true;
+        } catch {
+          return false;
+        }
+      });
     })()
   );
 }
@@ -634,7 +635,10 @@ function extractRecordDatasFromRecords(records: RecordInstance[]): RecordData[]
   return records.map(extractRecordDataFromRecord) as RecordData[];
 }
 
-type PromiseProxyRecord = { then(): void; get(str: 'content'): RecordInstance | null | undefined };
+type PromiseProxyRecord = {
+  then(): void;
+  content: RecordInstance | null | undefined;
+};
 
 function extractRecordDataFromRecord(recordOrPromiseRecord: PromiseProxyRecord | RecordInstance | null) {
   if (!recordOrPromiseRecord) {
@@ -642,7 +646,7 @@ function extractRecordDataFromRecord(recordOrPromiseRecord: PromiseProxyRecord |
   }
 
   if (isPromiseRecord(recordOrPromiseRecord)) {
-    let content = recordOrPromiseRecord.get && recordOrPromiseRecord.get('content');
+    let content = recordOrPromiseRecord.content;
     assert(
       'You passed in a promise that did not originate from an EmberData relationship. You can only pass promises that come from a belongsTo or hasMany relationship to the get call.',
       content !== undefined
@@ -659,24 +663,15 @@ function isPromiseRecord(record: PromiseProxyRecord | RecordInstance): record is
 
 function anyUnloaded(store: Store, relationship: ManyRelationship) {
   let state = relationship.currentState;
+  const cache = store._instanceCache;
   const unloaded = state.find((s) => {
-    let im = store._instanceCache.getInternalModel(s);
-    return im._isDematerializing || !im.isLoaded;
+    let isLoaded = cache.recordIsLoaded(s, true);
+    return !isLoaded;
   });
 
   return unloaded || false;
 }
 
-/**
- * Flag indicating whether all inverse records are available
- *
- * true if the inverse exists and is loaded (not empty)
- * true if there is no inverse
- * false if the inverse exists and is not loaded (empty)
- *
- * @internal
- * @return {boolean}
- */
 function areAllInverseRecordsLoaded(store: Store, resource: JsonApiRelationship): boolean {
   const cache = store.identifierCache;
 
@@ -684,7 +679,7 @@ function areAllInverseRecordsLoaded(store: Store, resource: JsonApiRelationship)
     // treat as collection
     // check for unloaded records
     let hasEmptyRecords = resource.data.reduce((hasEmptyModel, resourceIdentifier) => {
-      return hasEmptyModel || internalModelForRelatedResource(store, cache, resourceIdentifier).isEmpty;
+      return hasEmptyModel || isEmpty(store, cache, resourceIdentifier);
     }, false);
 
     return !hasEmptyRecords;
@@ -693,17 +688,13 @@ function areAllInverseRecordsLoaded(store: Store, resource: JsonApiRelationship)
     if (!resource.data) {
       return true;
     } else {
-      const internalModel = internalModelForRelatedResource(store, cache, resource.data);
-      return !internalModel.isEmpty;
+      return !isEmpty(store, cache, resource.data);
     }
   }
 }
 
-function internalModelForRelatedResource(
-  store: Store,
-  cache: IdentifierCache,
-  resource: ResourceIdentifierObject
-): InternalModel {
+function isEmpty(store: Store, cache: IdentifierCache, resource: ResourceIdentifierObject): boolean {
   const identifier = cache.getOrCreateRecordIdentifier(resource);
-  return store._instanceCache._internalModelForResource(identifier);
+  const recordData = store._instanceCache.peek({ identifier, bucket: 'recordData' });
+  return !recordData || !!recordData.isEmpty?.();
 }

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

@@ -10,8 +10,8 @@ import { all } from 'rsvp';
 
 import type Store from '@ember-data/store';
 import { PromiseArray, recordDataFor } from '@ember-data/store/-private';
-import type { CreateRecordProperties } from '@ember-data/store/-private/core-store';
-import type ShimModelClass from '@ember-data/store/-private/model/shim-model-class';
+import type ShimModelClass from '@ember-data/store/-private/legacy-model-support/shim-model-class';
+import type { CreateRecordProperties } from '@ember-data/store/-private/store-service';
 import type { DSModelSchema } from '@ember-data/types/q/ds-model';
 import type { Links, PaginationLinks } from '@ember-data/types/q/ember-data-json-api';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
@@ -306,16 +306,16 @@ export default class ManyArray extends MutableArrayWithObject<StableRecordIdenti
     this._isDirty = false;
     this._isUpdating = true;
     let jsonApi = this.recordData.getHasMany(this.key);
+    const cache = this.store._instanceCache;
+    const idCache = this.store.identifierCache;
 
     let identifiers: StableRecordIdentifier[] = [];
     if (jsonApi.data) {
       for (let i = 0; i < jsonApi.data.length; i++) {
-        // TODO figure out where this state comes from
-        let im = this.store._instanceCache._internalModelForResource(jsonApi.data[i]);
-        let shouldRemove = im._isDematerializing || im.isEmpty || !im.isLoaded;
+        const identifier = idCache.getOrCreateRecordIdentifier(jsonApi.data[i]);
 
-        if (!shouldRemove) {
-          identifiers.push(im.identifier);
+        if (cache.recordIsLoaded(identifier, true)) {
+          identifiers.push(identifier);
         }
       }
     }
@@ -348,6 +348,12 @@ export default class ManyArray extends MutableArrayWithObject<StableRecordIdenti
     this._isUpdating = false;
   }
 
+  destroy() {
+    this._length = 0;
+    this.currentState = [];
+    return super.destroy();
+  }
+
   /**
     Reloads all of the records in the manyArray. If the manyArray
     holds a relationship that was originally fetched using a links url

package/addon/-private/model-for-mixin.ts

@@ -29,10 +29,8 @@ export default function modelForMixin(store: Store, normalizedModelName: string)
   let mixin = MaybeMixin && MaybeMixin.class;
   if (mixin) {
     let ModelForMixin = Model.extend(mixin);
-    ModelForMixin.reopenClass({
-      __isMixin: true,
-      __mixin: mixin,
-    });
+    ModelForMixin.__isMixin = true;
+    ModelForMixin.__mixin = mixin;
     //Cache the class as a model
     owner.register('model:' + normalizedModelName, ModelForMixin);
   }