chore: make json-api cache strict (#9017)

* chore: make json-api cache strict

* fix test

.eslintrc.js

@@ -228,8 +228,6 @@ module.exports = {
         'tests/fastboot/app/config/environment.d.ts',
         'tests/fastboot/app/app.ts',
         'tests/fastboot/app/adapters/application.ts',
-        'packages/json-api/src/-private/cache.ts',
-        'packages/model/src/index.ts',
         'packages/model/src/-private/util.ts',
         'packages/model/src/-private/relationship-meta.ts',
         'packages/model/src/-private/legacy-relationships-support.ts',
@@ -240,14 +238,12 @@ module.exports = {
         'packages/adapter/types/require/index.d.ts',
         'packages/adapter/src/rest.ts',
         'packages/adapter/src/json-api.ts',
-        'packages/adapter/src/index.ts',
         'packages/adapter/src/-private/utils/serialize-query-params.ts',
         'packages/adapter/src/-private/utils/fetch.ts',
         'packages/adapter/src/-private/utils/determine-body-promise.ts',
         'packages/adapter/src/-private/utils/continue-on-reject.ts',
         'packages/adapter/src/-private/fastboot-interface.ts',
         'packages/adapter/src/-private/build-url-mixin.ts',
-        'packages/-ember-data/addon/store.ts',
         'tests/main/tests/integration/request-state-service-test.ts',
         'tests/main/tests/integration/record-data/store-wrapper-test.ts',
         'tests/main/tests/integration/record-data/record-data-test.ts',

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

@@ -10,7 +10,7 @@ import type { ModelSchema } from './ds-model';
 import type { JsonApiDocument, SingleResourceDocument } from './ember-data-json-api';
 import type { AdapterPayload } from './minimum-adapter-interface';
 
-export type OptionsHash = Record<string, unknown>;
+export type SerializerOptions = { includeId?: boolean };
 export type RequestType =
   | 'findRecord'
   | 'queryRecord'
@@ -107,7 +107,7 @@ export interface MinimumSerializerInterface {
    * @param {Snapshot} snapshot A Snapshot for the record to serialize
    * @param {object} [options]
    */
-  serialize(snapshot: Snapshot, options?: OptionsHash): JSONObject;
+  serialize(snapshot: Snapshot, options?: SerializerOptions): JSONObject;
 
   /**
    * This method is intended to normalize data into a [JSON:API Document](https://jsonapi.org/format/#document-structure)
@@ -205,7 +205,7 @@ export interface MinimumSerializerInterface {
    * @param [options]
    * @returns {void}
    */
-  serializeIntoHash?(hash: object, schema: ModelSchema, snapshot: Snapshot, options?: OptionsHash): void;
+  serializeIntoHash?(hash: object, schema: ModelSchema, snapshot: Snapshot, options?: SerializerOptions): void;
 
   /**
    * This method allows for normalization of data when `store.pushPayload` is called

packages/-ember-data/addon/store.ts

@@ -11,6 +11,7 @@ import type { Cache } from '@ember-data/types/cache/cache';
 import type { CacheCapabilitiesManager } from '@ember-data/types/q/cache-store-wrapper';
 import type { ModelSchema } from '@ember-data/types/q/ds-model';
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
+import type { SerializerOptions } from '@ember-data/types/q/minimum-serializer-interface';
 
 export default class Store extends BaseStore {
   constructor(args: Record<string, unknown>) {
@@ -34,15 +35,15 @@ export default class Store extends BaseStore {
   }
 
   teardownRecord(record: Model): void {
-    teardownRecord.call(this, record as Model);
+    teardownRecord.call(this, record);
   }
 
   modelFor(type: string): ModelSchema {
     return modelFor.call(this, type) || super.modelFor(type);
   }
 
   // TODO @runspired @deprecate records should implement their own serialization if desired
-  serializeRecord(record: unknown, options?: Record<string, unknown>): unknown {
+  serializeRecord(record: unknown, options?: SerializerOptions): unknown {
     // TODO we used to check if the record was destroyed here
     if (!this._fetchManager) {
       this._fetchManager = new FetchManager(this);

packages/adapter/src/-private/utils/serialize-into-hash.ts

@@ -4,15 +4,10 @@ import type { Snapshot } from 'ember-data/-private';
 
 import type Store from '@ember-data/store';
 import type { ModelSchema } from '@ember-data/types/q/ds-model';
-import type { MinimumSerializerInterface } from '@ember-data/types/q/minimum-serializer-interface';
+import type { MinimumSerializerInterface, SerializerOptions } from '@ember-data/types/q/minimum-serializer-interface';
 
 type SerializerWithSerializeIntoHash = MinimumSerializerInterface & {
-  serializeIntoHash?(
-    hash: object,
-    modelClass: ModelSchema,
-    snapshot: Snapshot,
-    options?: { includeId?: boolean }
-  ): void;
+  serializeIntoHash?(hash: object, modelClass: ModelSchema, snapshot: Snapshot, options?: SerializerOptions): void;
 };
 
 export default function serializeIntoHash(

packages/adapter/src/index.ts

@@ -187,6 +187,7 @@ By default when using with Ember you only need to implement this hook if you wan
   @main @ember-data/adapter
 */
 
+import { assert } from '@ember/debug';
 import EmberObject from '@ember/object';
 import { inject as service } from '@ember/service';
 
@@ -195,6 +196,7 @@ import type { Snapshot, SnapshotRecordArray } from '@ember-data/legacy-compat/-p
 import type Store from '@ember-data/store';
 import type { ModelSchema } from '@ember-data/types/q/ds-model';
 import type { AdapterPayload, MinimumAdapterInterface } from '@ember-data/types/q/minimum-adapter-interface';
+import { SerializerOptions } from '@ember-data/types/q/minimum-serializer-interface';
 
 /**
   An adapter is an object that receives requests from a store and
@@ -486,8 +488,13 @@ export default class Adapter extends EmberObject implements MinimumAdapterInterf
     @return {Object} serialized snapshot
     @public
   */
-  serialize(snapshot, options): Record<string, unknown> {
-    return snapshot.serialize(options);
+  serialize(snapshot: Snapshot, options: SerializerOptions): Record<string, unknown> {
+    const serialized = snapshot.serialize(options);
+    assert(
+      `Your adapter's serialize method must return an object, but it returned ${typeof serialized}`,
+      serialized && typeof serialized === 'object'
+    );
+    return serialized as Record<string, unknown>;
   }
 
   /**

packages/graph/src/-private.ts

@@ -1,4 +1,5 @@
 export { graphFor, peekGraph } from './-private/index';
+export { isBelongsTo } from './-private/-utils';
 
 /**
  * <p align="center">