chore: update to ember-data 5

addon/adapters/cloud-firestore-modular.ts

@@ -1,10 +1,16 @@
-import { getOwner } from '@ember/application';
+import { getOwner } from '@ember/owner';
 import { inject as service } from '@ember/service';
 import Adapter from '@ember-data/adapter';
-import DS, { type ModelSchema } from 'ember-data';
-import type ModelRegistry from 'ember-data/types/registries/model';
 import RSVP from 'rsvp';
 import Store from '@ember-data/store';
+import type { ModelSchema } from '@ember-data/store/types';
+import type { Snapshot } from '@ember-data/legacy-compat/-private';
+import type { AdapterPayload } from '@ember-data/legacy-compat';
+import type { SnapshotRecordArray } from 'ember-data/-private';
+import type {
+  TypeFromInstance,
+  TypedRecordInstance,
+} from '@warp-drive/core-types/record';
 
 import {
   CollectionReference,
@@ -40,17 +46,16 @@ export interface AdapterOption {
   [key: string]: unknown;
 }
 
-interface Snapshot extends DS.Snapshot {
+interface CloudFirestoreSnapshot extends Snapshot {
   adapterOptions: AdapterOption;
 }
 
-interface SnapshotRecordArray
-  extends DS.SnapshotRecordArray<keyof ModelRegistry> {
-  adapterOptions: AdapterOption;
+interface CloudFirestoreSnapshotRecordArray extends SnapshotRecordArray {
+  adapterOptions?: AdapterOption;
 }
 
-interface BelongsToRelationshipMeta {
-  type: keyof ModelRegistry;
+interface BelongsToRelationshipMeta<T> {
+  type: TypeFromInstance<T>;
   options: { isRealtime?: boolean };
 }
 
@@ -71,8 +76,8 @@ export default class CloudFirestoreAdapter extends Adapter {
 
   protected referenceKeyName = 'referenceTo';
 
-  protected get isFastBoot(): boolean {
-    const fastboot = getOwner(this).lookup('service:fastboot');
+  protected get isFastBoot(): boolean | undefined {
+    const fastboot = getOwner(this)?.lookup('service:fastboot');
 
     return fastboot && fastboot.isFastBoot;
   }
@@ -87,22 +92,22 @@ export default class CloudFirestoreAdapter extends Adapter {
   public createRecord(
     store: Store,
     type: ModelSchema,
-    snapshot: Snapshot,
-  ): RSVP.Promise<unknown> {
+    snapshot: CloudFirestoreSnapshot,
+  ): Promise<AdapterPayload> {
     return this.updateRecord(store, type, snapshot);
   }
 
-  public updateRecord(
+  public updateRecord<T>(
     _store: Store,
-    type: ModelSchema,
-    snapshot: Snapshot,
-  ): RSVP.Promise<unknown> {
+    type: ModelSchema<T>,
+    snapshot: CloudFirestoreSnapshot,
+  ): Promise<AdapterPayload> {
     return new RSVP.Promise((resolve, reject) => {
-      const collectionRef = this.buildCollectionRef(
-        type.modelName,
+      const collectionRef = this.buildCollectionRef<T>(
+        type.modelName as TypeFromInstance<T>,
         snapshot.adapterOptions,
       );
-      const docRef = doc(collectionRef, snapshot.id);
+      const docRef = doc(collectionRef, snapshot.id!);
       const batch = this.buildWriteBatch(docRef, snapshot);
 
       batch
@@ -114,8 +119,8 @@ export default class CloudFirestoreAdapter extends Adapter {
 
           if (snapshot.adapterOptions?.isRealtime && !this.isFastBoot) {
             // Setup realtime listener for record
-            this.firestoreDataManager.findRecordRealtime(
-              type.modelName,
+            this.firestoreDataManager.findRecordRealtime<T>(
+              type.modelName as TypeFromInstance<T>,
               docRef,
             );
           }
@@ -126,18 +131,18 @@ export default class CloudFirestoreAdapter extends Adapter {
     });
   }
 
-  public deleteRecord(
+  public deleteRecord<T>(
     _store: Store,
     type: ModelSchema,
-    snapshot: Snapshot,
-  ): RSVP.Promise<unknown> {
+    snapshot: CloudFirestoreSnapshot,
+  ): Promise<AdapterPayload> {
     return new RSVP.Promise((resolve, reject) => {
       const db = getFirestore();
       const collectionRef = this.buildCollectionRef(
-        type.modelName,
+        type.modelName as TypeFromInstance<T>,
         snapshot.adapterOptions,
       );
-      const docRef = doc(collectionRef, snapshot.id);
+      const docRef = doc(collectionRef, snapshot.id!);
       const batch = writeBatch(db);
 
       batch.delete(docRef);
@@ -154,23 +159,23 @@ export default class CloudFirestoreAdapter extends Adapter {
     });
   }
 
-  public findRecord(
+  public findRecord<T extends TypedRecordInstance>(
     _store: Store,
-    type: ModelSchema,
+    type: ModelSchema<T>,
     id: string,
-    snapshot: Snapshot,
-  ): RSVP.Promise<unknown> {
+    snapshot: CloudFirestoreSnapshot,
+  ): Promise<AdapterPayload> {
     return new RSVP.Promise(async (resolve, reject) => {
       try {
-        const colRef = this.buildCollectionRef(
-          type.modelName,
+        const colRef = this.buildCollectionRef<T>(
+          type.modelName as TypeFromInstance<T>,
           snapshot.adapterOptions,
         );
         const docRef = doc(colRef, id);
         const docSnapshot =
           snapshot.adapterOptions?.isRealtime && !this.isFastBoot
             ? await this.firestoreDataManager.findRecordRealtime(
-                type.modelName,
+                type.modelName as TypeFromInstance<T>,
                 docRef,
               )
             : await getDoc(docRef);
@@ -190,23 +195,20 @@ export default class CloudFirestoreAdapter extends Adapter {
     });
   }
 
-  public findAll(
+  public findAll<T>(
     _store: Store,
-    type: ModelSchema,
-    _sinceToken: string,
-    snapshotRecordArray?: SnapshotRecordArray,
-  ): RSVP.Promise<unknown> {
+    type: ModelSchema<T>,
+    _neverSet: null,
+    snapshotRecordArray?: CloudFirestoreSnapshotRecordArray,
+  ): Promise<AdapterPayload> {
     return new RSVP.Promise(async (resolve, reject) => {
       try {
         const db = getFirestore();
-        const colRef = collection(
-          db,
-          buildCollectionName(type.modelName as string),
-        );
+        const colRef = collection(db, buildCollectionName(type.modelName));
         const querySnapshot =
           snapshotRecordArray?.adapterOptions?.isRealtime && !this.isFastBoot
-            ? await this.firestoreDataManager.findAllRealtime(
-                type.modelName,
+            ? await this.firestoreDataManager.findAllRealtime<T>(
+                type.modelName as TypeFromInstance<T>,
                 colRef,
               )
             : await getDocs(colRef);
@@ -222,26 +224,28 @@ export default class CloudFirestoreAdapter extends Adapter {
     });
   }
 
-  public query(
+  public query<T>(
     _store: Store,
-    type: ModelSchema,
+    type: ModelSchema<T>,
     queryOption: AdapterOption,
-    recordArray: DS.AdapterPopulatedRecordArray<unknown>,
-  ): RSVP.Promise<unknown> {
+  ): Promise<AdapterPayload> {
     return new RSVP.Promise(async (resolve, reject) => {
       try {
-        const colRef = this.buildCollectionRef(type.modelName, queryOption);
+        const colRef = this.buildCollectionRef<T>(
+          type.modelName as TypeFromInstance<T>,
+          queryOption,
+        );
         const queryRef = queryOption.filter?.(colRef) || colRef;
         const config = {
-          recordArray,
+          recordArray: {},
           queryRef,
-          modelName: type.modelName,
+          modelName: type.modelName as TypeFromInstance<T>,
           referenceKeyName: this.referenceKeyName,
           queryId: queryOption.queryId,
         };
         const docSnapshots =
           queryOption.isRealtime && !this.isFastBoot
-            ? await this.firestoreDataManager.queryRealtime(config)
+            ? await this.firestoreDataManager.queryRealtime<T>(config)
             : await this.firestoreDataManager.queryWithReferenceTo(
                 queryRef,
                 this.referenceKeyName,
@@ -258,12 +262,12 @@ export default class CloudFirestoreAdapter extends Adapter {
     });
   }
 
-  public findBelongsTo(
+  public findBelongsTo<T>(
     _store: Store,
     _snapshot: Snapshot,
     url: string,
-    relationship: BelongsToRelationshipMeta,
-  ): RSVP.Promise<unknown> {
+    relationship: BelongsToRelationshipMeta<T>,
+  ): Promise<unknown> {
     return new RSVP.Promise(async (resolve, reject) => {
       try {
         const urlNodes = url.split('/');
@@ -297,12 +301,12 @@ export default class CloudFirestoreAdapter extends Adapter {
     });
   }
 
-  public findHasMany(
+  public findHasMany<T>(
     store: Store,
     snapshot: Snapshot,
     url: string,
     relationship: HasManyRelationshipMeta,
-  ): RSVP.Promise<unknown> {
+  ): Promise<unknown> {
     return new RSVP.Promise(async (resolve, reject) => {
       try {
         const queryRef = this.buildHasManyCollectionRef(
@@ -313,14 +317,14 @@ export default class CloudFirestoreAdapter extends Adapter {
         );
         const config = {
           queryRef,
-          modelName: snapshot.modelName,
+          modelName: snapshot.modelName as TypeFromInstance<T>,
           id: snapshot.id,
           field: relationship.key,
           referenceKeyName: this.referenceKeyName,
         };
         const documentSnapshots =
           relationship.options.isRealtime && !this.isFastBoot
-            ? await this.firestoreDataManager.findHasManyRealtime(config)
+            ? await this.firestoreDataManager.findHasManyRealtime<T>(config)
             : await this.firestoreDataManager.queryWithReferenceTo(
                 queryRef,
                 this.referenceKeyName,
@@ -337,15 +341,15 @@ export default class CloudFirestoreAdapter extends Adapter {
     });
   }
 
-  protected buildCollectionRef(
-    modelName: keyof ModelRegistry,
+  protected buildCollectionRef<T>(
+    modelName: TypeFromInstance<T>,
     adapterOptions?: AdapterOption,
   ): CollectionReference {
     const db = getFirestore();
 
     return (
       adapterOptions?.buildReference?.(db) ||
-      collection(db, buildCollectionName(modelName as string))
+      collection(db, buildCollectionName(modelName))
     );
   }
 
@@ -435,9 +439,3 @@ export default class CloudFirestoreAdapter extends Adapter {
     );
   }
 }
-
-declare module 'ember-data/types/registries/adapter' {
-  export default interface AdapterRegistry {
-    'cloud-firestore-modular': CloudFirestoreAdapter;
-  }
-}

addon/authenticators/firebase.ts

@@ -1,4 +1,4 @@
-import { getOwner } from '@ember/application';
+import { getOwner } from '@ember/owner';
 
 import type { Auth, User, UserCredential } from 'firebase/auth';
 import BaseAuthenticator from 'ember-simple-auth/authenticators/base';

addon/serializers/cloud-firestore-modular.ts

@@ -4,9 +4,10 @@
 */
 
 import { isNone } from '@ember/utils';
-import DS, { type ModelSchema } from 'ember-data';
 import JSONSerializer from '@ember-data/serializer/json';
 import Store from '@ember-data/store';
+import type { ModelSchema } from '@ember-data/store/types';
+import type { Snapshot } from 'ember-data/-private';
 
 import {
   CollectionReference,
@@ -102,7 +103,7 @@ export default class CloudFirestoreSerializer extends JSONSerializer {
   }
 
   public serializeBelongsTo(
-    snapshot: DS.Snapshot,
+    snapshot: Snapshot,
     json: { [key: string]: string | null | DocumentReference },
     relationship: RelationshipDefinition,
   ): void {
@@ -127,7 +128,7 @@ export default class CloudFirestoreSerializer extends JSONSerializer {
   }
 
   public serialize(
-    snapshot: DS.Snapshot,
+    snapshot: Snapshot,
     options: Record<string, unknown>,
   ): Record<string, unknown> {
     const json: { [key: string]: unknown } = {
@@ -143,9 +144,3 @@ export default class CloudFirestoreSerializer extends JSONSerializer {
     return json;
   }
 }
-
-declare module 'ember-data/types/registries/serializer' {
-  export default interface SerializerRegistry {
-    'cloud-firestore-modular': CloudFirestoreSerializer;
-  }
-}