Love of Mine (#8084)

* ill follow you into the dark

* more sanity

* fix imports

* get tests passing

* replace usage of internalModel.isHiddenFromRecordArrays

* begin move of deleteRecord logic into the store

* trim trim trim

* even more trim

* still a lot to do, but starting to take shape

* the shape of things

* fix most tests, 44 to go

* 71 test failures to go, implemente PromiseManyArray deprecation from RFC emberjs/rfcs#745

* add better debugging capabilities

* cleanup

* further rationalization

* logging improvements

* progress

* down to 36 failed tests

* down to 17 failed tests

* cleanup

* All the cleanup

* fix lint

* all the main tests fixed

* bump some deps

* make nice for deprecation stripping

* some minor cleanup

* fix some scenarios

* fix lock

* fix node14

.eslintrc.js

@@ -194,26 +194,21 @@ module.exports = {
         'ember-data-types/q/fetch-manager.ts',
         'ember-data-types/q/ember-data-json-api.ts',
         'ember-data-types/q/ds-model.ts',
-        'packages/store/addon/-private/record-data-store-wrapper.ts',
-        'packages/store/addon/-private/internal-model-factory.ts',
-        'packages/store/addon/-private/snapshot.ts',
-        'packages/store/addon/-private/snapshot-record-array.ts',
-        'packages/store/addon/-private/schema-definition-service.ts',
-        'packages/store/addon/-private/request-cache.ts',
-        'packages/store/addon/-private/references/reference.ts',
-        'packages/store/addon/-private/references/record.ts',
-        'packages/store/addon/-private/record-notification-manager.ts',
-        'packages/store/addon/-private/record-data-for.ts',
-        'packages/store/addon/-private/normalize-model-name.ts',
-        'packages/store/addon/-private/model/shim-model-class.ts',
-        'packages/store/addon/-private/model/internal-model.ts',
-        'packages/store/addon/-private/internal-model-map.ts',
-        'packages/store/addon/-private/identity-map.ts',
-        'packages/store/addon/-private/fetch-manager.ts',
-        'packages/store/addon/-private/core-store.ts',
-        'packages/store/addon/-private/coerce-id.ts',
+        'packages/store/addon/-private/managers/record-data-store-wrapper.ts',
+        'packages/store/addon/-private/network/snapshot.ts',
+        'packages/store/addon/-private/network/snapshot-record-array.ts',
+        'packages/store/addon/-private/legacy-model-support/schema-definition-service.ts',
+        'packages/store/addon/-private/network/request-cache.ts',
+        'packages/store/addon/-private/legacy-model-support/record-reference.ts',
+        'packages/store/addon/-private/managers/record-notification-manager.ts',
+        'packages/store/addon/-private/caches/record-data-for.ts',
+        'packages/store/addon/-private/utils/normalize-model-name.ts',
+        'packages/store/addon/-private/legacy-model-support/shim-model-class.ts',
+        'packages/store/addon/-private/network/fetch-manager.ts',
+        'packages/store/addon/-private/store-service.ts',
+        'packages/store/addon/-private/utils/coerce-id.ts',
         'packages/store/addon/-private/index.ts',
-        'packages/store/addon/-private/identifier-cache.ts',
+        'packages/store/addon/-private/caches/identifier-cache.ts',
         'packages/serializer/tests/dummy/app/routes/application/route.ts',
         'packages/serializer/tests/dummy/app/router.ts',
         'packages/serializer/tests/dummy/app/resolver.ts',

CHANGELOG.md

@@ -2445,10 +2445,10 @@ it should be pretty straight forward to update current code to the public
 Snapshot API:
 
 ```js
-post.get('id')           => postSnapshot.id
-post.get('title')        => postSnapshot.attr('title')
-post.get('author')       => postSnapshot.belongsTo('author')
-post.get('comments')     => postSnapshot.hasMany('comments')
+post.id           => postSnapshot.id
+post.title        => postSnapshot.attr('title')
+post.author       => postSnapshot.belongsTo('author')
+post.comments     => postSnapshot.hasMany('comments')
 post.constructor         => postSnapshot.type;
 post.constructor.typeKey => postSnapshot.typeKey
 ```
@@ -2525,7 +2525,7 @@ To access attributes you should now use the `attr` function.
 
 ```js
 // Ember Data 1.0.0-beta.14.1
-post.get('title');
+post.title;
 // Ember Data 1.0.0-beta.15
 postSnapshot.attr('title');
 ```
@@ -2534,7 +2534,7 @@ To access a belongsTo relationship you should use `.belongsTo()` method.
 
 ```js
 // Ember Data 1.0.0-beta.14.1
-post.get('author');
+post.author;
 // Ember Data 1.0.0-beta.15
 postSnapshot.belongsTo('author');
 ```
@@ -2543,7 +2543,7 @@ To access a hasMany relationship you should use `.hasMany()` method.
 
 ```js
 // Ember Data 1.0.0-beta.14.1
-post.get('comments');
+post.comments;
 // Ember Data 1.0.0-beta.15
 postSnapshot.hasMany('comments');
 ```
@@ -2619,13 +2619,13 @@ var post = store.push('post', {
   author: 'Tomster',
 });
 
-post.get('title'); // => 'Ember.js is fantastic'
-post.get('author'); // => 'Tomster'
+post.title; // => 'Ember.js is fantastic'
+post.author; // => 'Tomster'
 
 store.push('post', { id: 1, author: 'Tom Dale' });
 
-post.get('title'); // => 'Ember.js is fantastic'
-post.get('author'); // => 'Tom Dale'
+post.title; // => 'Ember.js is fantastic'
+post.author; // => 'Tom Dale'
 ```
 
 This also mean that properties missing in the payload will no longer be reset,
@@ -2698,10 +2698,10 @@ underlying array you will now need to use the `.toArray()` method.
 
 ```javascript
 // Ember Data 1.0.0-beta.12
-record.get('myHasManyRelationship').get('content').map(...);
+record.myHasManyRelationship.content.map(...);
 
 // Ember Data 1.0.0-beta.14
-record.get('myHasManyRelationship').toArray().map(...);
+record.myHasManyRelationship.toArray().map(...);
 ```
 
 Additionally if you were using the `RecordArray`'s `.addRecord()` and
@@ -2736,7 +2736,7 @@ Additionally if you were using the `RecordArray`'s `.addRecord()` and
 - [Feature thrownError] tag errorThrown from jQuery onto the jqXHR like ic-ajax does.
 - Cache relationships meta in production
 - Deprecate store.update()
-- hasMany relationships are no longer `RecordArray`, but `ManyArray`. To access the underlying array use `relationship.toArray()` instead of `relationship.get('content')`.
+- hasMany relationships are no longer `RecordArray`, but `ManyArray`. To access the underlying array use `relationship.toArray()` instead of `relationship.content`.
 
 ### Ember Data 1.0.0-beta.12 (November 25, 2014)
 
@@ -2765,7 +2765,7 @@ Ember Data's build. You should upgrade to Ember 1.8 as soon as you can.
 
 ##### Observing `data` For Changes Has Been Removed
 
-Although `model.get('data')` has been private in Ember Data for a long time, we
+Although `model.data` has been private in Ember Data for a long time, we
 have noticed users may subscribe to changes on `data` for any change to the
 model's attributes. This means that the following code:
 

ember-data-types/q/ds-model.ts

@@ -2,7 +2,6 @@ import type EmberObject from '@ember/object';
 
 import type { Errors } from '@ember-data/model/-private';
 import type Store from '@ember-data/store';
-import type InternalModel from '@ember-data/store/-private/model/internal-model';
 
 import type { JsonApiValidationError } from './record-data-json-api';
 import type { AttributeSchema, RelationshipSchema, RelationshipsSchema } from './record-data-schemas';
@@ -12,7 +11,6 @@ export interface DSModel extends EmberObject {
   constructor: DSModelSchema;
   store: Store;
   errors: Errors;
-  _internalModel: InternalModel;
   toString(): string;
   save(): Promise<DSModel>;
   eachRelationship<T>(callback: (this: T, key: string, meta: RelationshipSchema) => void, binding?: T): void;

ember-data-types/q/identifier.ts

@@ -2,7 +2,10 @@
   @module @ember-data/store
 */
 
-import { DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from '@ember-data/store/-private/identifer-debug-consts';
+import {
+  DEBUG_CLIENT_ORIGINATED,
+  DEBUG_IDENTIFIER_BUCKET,
+} from '@ember-data/store/-private/utils/identifer-debug-consts';
 
 import type { ExistingResourceObject, ResourceIdentifierObject } from './ember-data-json-api';
 

ember-data-types/q/minimum-adapter-interface.ts

@@ -1,7 +1,7 @@
 import type Store from '@ember-data/store';
+import type Snapshot from '@ember-data/store/-private/network/snapshot';
+import type SnapshotRecordArray from '@ember-data/store/-private/network/snapshot-record-array';
 import type AdapterPopulatedRecordArray from '@ember-data/store/-private/record-arrays/adapter-populated-record-array';
-import type Snapshot from '@ember-data/store/-private/snapshot';
-import type SnapshotRecordArray from '@ember-data/store/-private/snapshot-record-array';
 
 import type { ModelSchema } from './ds-model';
 import type { RelationshipSchema } from './record-data-schemas';

ember-data-types/q/minimum-serializer-interface.ts

@@ -1,7 +1,7 @@
 import type { Object as JSONObject } from 'json-typescript';
 
 import type Store from '@ember-data/store';
-import type Snapshot from '@ember-data/store/-private/snapshot';
+import type Snapshot from '@ember-data/store/-private/network/snapshot';
 
 import type { ModelSchema } from './ds-model';
 import type { JsonApiDocument, SingleResourceDocument } from './ember-data-json-api';

ember-data-types/q/record-data-record-wrapper.ts

@@ -7,7 +7,7 @@ import type { JsonApiValidationError } from './record-data-json-api';
   @module @ember-data/store
 */
 
-export interface RecordDataRecordWrapper {
+export interface RecordDataWrapper {
   rollbackAttributes(): string[];
   changedAttributes(): ChangedAttributesHash;
   hasChangedAttributes(): boolean;
@@ -16,17 +16,15 @@ export interface RecordDataRecordWrapper {
   getAttr(key: string): any;
   getHasMany(key: string): CollectionResourceRelationship;
 
-  addToHasMany(key: string, recordDatas: RecordDataRecordWrapper[], idx?: number): void;
-  removeFromHasMany(key: string, recordDatas: RecordDataRecordWrapper[]): void;
-  setDirtyHasMany(key: string, recordDatas: RecordDataRecordWrapper[]): void;
+  addToHasMany(key: string, recordDatas: RecordDataWrapper[], idx?: number): void;
+  removeFromHasMany(key: string, recordDatas: RecordDataWrapper[]): void;
+  setDirtyHasMany(key: string, recordDatas: RecordDataWrapper[]): void;
 
   getBelongsTo(key: string): SingleResourceRelationship;
 
-  setDirtyBelongsTo(name: string, recordData: RecordDataRecordWrapper | null): void;
+  setDirtyBelongsTo(name: string, recordData: RecordDataWrapper | null): void;
 
   // ----- unspecced
-  isAttrDirty(key: string): boolean;
-  removeFromInverseRelationships(): void;
   hasAttr(key: string): boolean;
 
   // new

ember-data-types/q/record-data-schemas.ts

@@ -14,7 +14,7 @@ export interface RelationshipSchema {
   key: string; // TODO @runspired remove our uses
   // TODO @runspired should RFC be updated to make this optional?
   // TODO @runspired sohuld RFC be update to enforce async and inverse are set? else internals need to know
-  // that meta came from DS.Model vs not from DS.Model as defaults should switch.
+  // that meta came from @ember-data/model vs not from @ember-data/model as defaults should switch.
   options: {
     async?: boolean; // controls inverse unloading "client side delete semantics" so we should replace that with a real flag
     polymorphic?: boolean;

ember-data-types/q/record-data.ts

@@ -45,8 +45,6 @@ export interface RecordData {
   didCommit(data: JsonApiResource | null): void;
 
   // ----- unspecced
-  isAttrDirty(key: string): boolean;
-  removeFromInverseRelationships(): void;
   hasAttr(key: string): boolean;
 
   isRecordInUse(): boolean;

ember-data-types/q/relationship-record-data.ts

@@ -16,7 +16,7 @@ export interface RelationshipRecordData extends RecordData {
   storeWrapper: RecordDataStoreWrapper;
   identifier: StableRecordIdentifier;
   id: string | null;
-  clientId: string | null;
+  lid: string | null;
   isEmpty(): boolean;
   getResourceIdentifier(): RecordIdentifier;
   getBelongsTo(key: string): DefaultSingleResourceRelationship;

packages/-ember-data/addon/-private/index.ts

@@ -4,11 +4,9 @@ export { default as DS } from './core';
 export { Errors } from '@ember-data/model/-private';
 export { Snapshot } from '@ember-data/store/-private';
 
-// `ember-data-model-fragments` relies on `InternalModel`
 // `ember-data-model-fragments' and `ember-data-change-tracker` rely on `normalizeModelName`
 export {
   AdapterPopulatedRecordArray,
-  InternalModel,
   PromiseArray,
   PromiseObject,
   RecordArray,

packages/-ember-data/addon/index.js

@@ -30,7 +30,6 @@ import {
   AdapterPopulatedRecordArray,
   DS,
   Errors,
-  InternalModel,
   ManyArray,
   PromiseArray,
   PromiseManyArray,
@@ -52,7 +51,6 @@ DS.Model = Model;
 DS.attr = attr;
 DS.Errors = Errors;
 
-DS.InternalModel = InternalModel;
 DS.Snapshot = Snapshot;
 
 DS.Adapter = Adapter;

packages/-ember-data/config/ember-try.js

@@ -14,7 +14,7 @@ module.exports = function () {
           },
           npm: {
             devDependencies: {
-              'ember-fetch': '*',
+              'ember-fetch': '^8.1.1',
               '@ember/jquery': null,
             },
           },
@@ -23,7 +23,7 @@ module.exports = function () {
           name: 'with-ember-fetch-and-jquery',
           npm: {
             devDependencies: {
-              'ember-fetch': '*',
+              'ember-fetch': '^8.1.1',
               '@ember/jquery': '^2.0.0',
             },
           },

packages/-ember-data/ember-cli-build.js

@@ -37,14 +37,22 @@ module.exports = function (defaults) {
     terserSettings.enabled = false;
   }
 
-  let app = new EmberAddon(defaults, {
-    emberData: {
-      compatWith,
+  let config = {
+    compatWith,
+    debug: {
+      LOG_NOTIFICATIONS: process.env.DEBUG_DATA ? true : false,
+      LOG_REQUEST_STATUS: process.env.DEBUG_DATA ? true : false,
+      LOG_IDENTIFIERS: process.env.DEBUG_DATA ? true : false,
+      LOG_GRAPH: process.env.DEBUG_DATA ? true : false,
+      LOG_INSTANCE_CACHE: process.env.DEBUG_DATA ? true : false,
     },
+  };
+  let app = new EmberAddon(defaults, {
+    emberData: config,
     babel: {
       // this ensures that the same build-time code stripping that is done
       // for library packages is also done for our tests and dummy app
-      plugins: [...require('@ember-data/private-build-infra/src/debug-macros')(null, isProd, compatWith)],
+      plugins: [...require('@ember-data/private-build-infra/src/debug-macros')(null, isProd, config)],
     },
     'ember-cli-babel': {
       throwUnlessParallelizable: true,

packages/-ember-data/node-tests/fixtures/expected.js

@@ -39,7 +39,6 @@ module.exports = {
     '(private) @ember-data/debug InspectorDataAdapter#watchTypeIfUnseen',
     '(private) @ember-data/model Model#_createSnapshot',
     '(private) @ember-data/model Model#_debugInfo',
-    '(private) @ember-data/model Model#_internalModel',
     '(private) @ember-data/model Model#_notifyProperties',
     '(private) @ember-data/model Model#create',
     '(private) @ember-data/model Model#currentState',
@@ -74,8 +73,6 @@ module.exports = {
     '(private) @ember-data/store IdentifierCache#_getRecordIdentifier',
     '(private) @ember-data/store IdentifierCache#_mergeRecordIdentifiers',
     '(private) @ember-data/store IdentifierCache#peekRecordIdentifier',
-    '(private) @ember-data/store InternalModelFactory#lookup',
-    '(private) @ember-data/store InternalModelFactory#peek',
     '(private) @ember-data/store ManyArray#isPolymorphic',
     '(private) @ember-data/store ManyArray#relationship',
     '(private) @ember-data/store RecordArray#_createSnapshot',
@@ -90,7 +87,6 @@ module.exports = {
     '(private) @ember-data/store Store#_push',
     '(private) @ember-data/store Store#find',
     '(private) @ember-data/store Store#init',
-    '(private) @ember-data/store Store#recordWasInvalid',
     '(public) @ember-data/adapter Adapter#coalesceFindRequests',
     '(public) @ember-data/adapter Adapter#createRecord',
     '(public) @ember-data/adapter Adapter#deleteRecord',