address feedback

emberjs · Nov 19, 2019 · d37a3f6 · d37a3f6
1 parent e5be474
commit d37a3f6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/packages/store/addon/-private/system/core-store.ts b/packages/store/addon/-private/system/core-store.ts
@@ -53,7 +53,7 @@ import {
   HAS_SERIALIZER_PACKAGE,
 } from '@ember-data/private-build-infra';
 
-import { RecordInstance } from '../ts-interfaces/record';
+import { RecordInstance } from '../ts-interfaces/record-instance';
 import { JsonApiRelationship } from '../ts-interfaces/record-data-json-api';
 import { ResourceIdentifierObject } from '../ts-interfaces/ember-data-json-api';
 

diff --git a/packages/store/addon/-private/system/model/internal-model.ts b/packages/store/addon/-private/system/model/internal-model.ts
@@ -19,7 +19,7 @@ import RecordArray from '../record-arrays/record-array';
 import { RecordReference, BelongsToReference, HasManyReference } from '../references';
 import RecordData from '../../ts-interfaces/record-data';
 import { JsonApiResource, JsonApiValidationError } from '../../ts-interfaces/record-data-json-api';
-import { RecordInstance } from '../../ts-interfaces/record';
+import { RecordInstance } from '../../ts-interfaces/record-instance';
 import { ConfidentDict } from '../../ts-interfaces/utils';
 import {
   IDENTIFIERS,

diff --git a/packages/store/addon/-private/system/references/record.ts b/packages/store/addon/-private/system/references/record.ts
@@ -1,6 +1,6 @@
 import RSVP, { resolve } from 'rsvp';
 import Reference from './reference';
-import { RecordInstance } from '../../ts-interfaces/record';
+import { RecordInstance } from '../../ts-interfaces/record-instance';
 import { SingleResourceDocument } from '../../ts-interfaces/ember-data-json-api';
 
 /**

diff --git a/packages/store/addon/-private/system/store/internal-model-factory.ts b/packages/store/addon/-private/system/store/internal-model-factory.ts
@@ -6,7 +6,7 @@ import { StableRecordIdentifier } from '../../ts-interfaces/identifier';
 import InternalModelMap from '../internal-model-map';
 import { isNone } from '@ember/utils';
 import { IDENTIFIERS } from '@ember-data/canary-features';
-import { RecordInstance } from '../../ts-interfaces/record';
+import { RecordInstance } from '../../ts-interfaces/record-instance';
 import {
   ResourceIdentifierObject,
   ExistingResourceObject,

diff --git a/packages/store/addon/-private/ts-interfaces/ds-model.ts b/packages/store/addon/-private/ts-interfaces/ds-model.ts
@@ -2,9 +2,10 @@ import RSVP from 'rsvp';
 import EmberObject from '@ember/object';
 import { JsonApiValidationError } from './record-data-json-api';
 import { RelationshipSchema } from './record-data-schemas';
+import { RecordInstance } from './record-instance';
 
 // Placeholder until model.js is typed
-export interface DSModel extends EmberObject {
+export interface DSModel extends RecordInstance, EmberObject {
   toString(): string;
   save(): RSVP.Promise<DSModel>;
   eachRelationship(callback: (key: string, meta: RelationshipSchema) => void): void;

diff --git a/...re/addon/-private/ts-interfaces/record.ts → ...-private/ts-interfaces/record-instance.ts b/...re/addon/-private/ts-interfaces/record.ts → ...-private/ts-interfaces/record-instance.ts
@@ -13,4 +13,4 @@
   The type belows allows for anything extending object.
 */
 
-export type RecordInstance = object;
+export type RecordInstance = Object;