fix: fixed typing issues

dereekb · Dec 4, 2022 · f59cecf · f59cecf
1 parent bf283c6
commit f59cecf
Show file tree

Hide file tree

Showing 13 changed files with 1,463 additions and 1,705 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/firebase-server/src/lib/firestore/driver.accessor.batch.ts b/packages/firebase-server/src/lib/firestore/driver.accessor.batch.ts
@@ -45,7 +45,7 @@ export class WriteBatchFirestoreDocumentDataAccessor<T> implements FirestoreDocu
     return this.update(firestoreServerIncrementUpdateToUpdateData(data), params);
   }
 
-  update(data: UpdateData<T>, params?: FirestoreDocumentUpdateParams): Promise<void> {
+  update(data: UpdateData<object>, params?: FirestoreDocumentUpdateParams): Promise<void> {
     if (params?.precondition != null) {
       this.batch.update(this.documentRef, data as FirebaseFirestore.UpdateData<T>, params?.precondition);
     } else {

diff --git a/packages/firebase-server/src/lib/firestore/driver.accessor.default.ts b/packages/firebase-server/src/lib/firestore/driver.accessor.default.ts
@@ -39,7 +39,7 @@ export class DefaultFirestoreDocumentDataAccessor<T> implements FirestoreDocumen
     return this.update(firestoreServerIncrementUpdateToUpdateData(data), params);
   }
 
-  update(data: UpdateData<T>, params?: FirestoreDocumentUpdateParams): Promise<GoogleCloudWriteResult> {
+  update(data: UpdateData<object>, params?: FirestoreDocumentUpdateParams): Promise<GoogleCloudWriteResult> {
     return params?.precondition ? this.documentRef.update(data as FirebaseFirestore.UpdateData<T>, params.precondition) : this.documentRef.update(data as FirebaseFirestore.UpdateData<T>);
   }
 }

diff --git a/packages/firebase-server/src/lib/firestore/driver.accessor.transaction.ts b/packages/firebase-server/src/lib/firestore/driver.accessor.transaction.ts
@@ -45,7 +45,7 @@ export class TransactionFirestoreDocumentDataAccessor<T> implements FirestoreDoc
     return this.update(firestoreServerIncrementUpdateToUpdateData(data), params);
   }
 
-  update(data: UpdateData<T>, params?: FirestoreDocumentUpdateParams): Promise<void> {
+  update(data: UpdateData<object>, params?: FirestoreDocumentUpdateParams): Promise<void> {
     if (params?.precondition) {
       this.transaction.update(this.documentRef, data as FirebaseFirestore.UpdateData<T>, params?.precondition);
     } else {

diff --git a/packages/firebase-server/src/lib/firestore/driver.query.ts b/packages/firebase-server/src/lib/firestore/driver.query.ts
@@ -23,7 +23,7 @@ import {
   FIRESTORE_END_AT_VALUE_QUERY_CONSTRAINT_TYPE
 } from '@dereekb/firebase';
 
-export type FirestoreServerQueryBuilder<T = unknown> = GoogleCloudQuery<T>;
+export type FirestoreServerQueryBuilder<T = any> = GoogleCloudQuery<T>;
 
 export const FIRESTORE_CLIENT_QUERY_CONSTRAINT_HANDLER_MAPPING: FullFirestoreQueryConstraintHandlersMapping<FirestoreServerQueryBuilder> = {
   [FIRESTORE_LIMIT_QUERY_CONSTRAINT_TYPE]: (builder, data) => builder.limit(data.limit),

diff --git a/packages/firebase-server/src/lib/firestore/increment.ts b/packages/firebase-server/src/lib/firestore/increment.ts
@@ -8,7 +8,7 @@ import { UpdateData, FirestoreAccessorIncrementUpdate } from '@dereekb/firebase'
  * @param input
  * @returns
  */
-export function firestoreServerIncrementUpdateToUpdateData<T>(input: FirestoreAccessorIncrementUpdate<T>): UpdateData<T> {
+export function firestoreServerIncrementUpdateToUpdateData<T extends object>(input: FirestoreAccessorIncrementUpdate<T>): UpdateData<T> {
   return mapObjectMap(input, (incrementValue) => {
     return FieldValue.increment(incrementValue ?? 0);
   }) as UpdateData<T>;

diff --git a/packages/firebase-server/test/src/lib/firebase/firebase.admin.nest.ts b/packages/firebase-server/test/src/lib/firebase/firebase.admin.nest.ts
@@ -46,10 +46,11 @@ export class FirebaseAdminNestTestContextInstance<PI extends FirebaseAdminTestCo
   get<TInput = any, TResult = TInput>(
     typeOrToken: Type<TInput> | Abstract<TInput> | string | symbol,
     options?: {
-      strict: boolean;
+      strict?: boolean | undefined;
+      each?: undefined | false;
     }
   ): TResult {
-    return this.nest.get(typeOrToken, options);
+    return options ? this.nest.get(typeOrToken, options) : this.nest.get(typeOrToken);
   }
 }
 

diff --git a/packages/firebase/src/lib/client/firestore/driver.accessor.batch.ts b/packages/firebase/src/lib/client/firestore/driver.accessor.batch.ts
@@ -21,7 +21,7 @@ export class WriteBatchFirestoreDocumentDataAccessor<T> extends DefaultFirestore
     return Promise.resolve();
   }
 
-  override update(data: UpdateData<unknown>): Promise<void> {
+  override update(data: UpdateData<object>): Promise<void> {
     assertFirestoreUpdateHasData(data);
     this.batch.update(this.documentRef, data as FirestoreUpdateData<T>);
     return Promise.resolve();

diff --git a/packages/firebase/src/lib/client/firestore/driver.accessor.default.ts b/packages/firebase/src/lib/client/firestore/driver.accessor.default.ts
@@ -40,9 +40,9 @@ export class DefaultFirestoreDocumentDataAccessor<T> implements FirestoreDocumen
     return this.update(firestoreClientIncrementUpdateToUpdateData(data));
   }
 
-  update(data: UpdateData<unknown>): Promise<void> {
+  update(data: UpdateData<object>): Promise<void> {
     assertFirestoreUpdateHasData(data);
-    return updateDoc(this.documentRef, data);
+    return updateDoc(this.documentRef, data as UpdateData<T>);
   }
 }
 

diff --git a/packages/firebase/src/lib/client/firestore/driver.accessor.transaction.ts b/packages/firebase/src/lib/client/firestore/driver.accessor.transaction.ts
@@ -45,9 +45,9 @@ export class TransactionFirestoreDocumentDataAccessor<T> implements FirestoreDoc
     return this.update(firestoreClientIncrementUpdateToUpdateData(data));
   }
 
-  update(data: UpdateData<unknown>): Promise<void> {
+  update(data: UpdateData<object>): Promise<void> {
     assertFirestoreUpdateHasData(data);
-    this.transaction.update(this.documentRef, data);
+    this.transaction.update(this.documentRef, data as UpdateData<T>);
     return Promise.resolve();
   }
 }

diff --git a/packages/firebase/src/lib/client/firestore/increment.ts b/packages/firebase/src/lib/client/firestore/increment.ts
@@ -8,7 +8,7 @@ import { FirestoreAccessorIncrementUpdate } from '../../common/firestore/accesso
  * @param input
  * @returns
  */
-export function firestoreClientIncrementUpdateToUpdateData<T>(input: FirestoreAccessorIncrementUpdate<T>): UpdateData<T> {
+export function firestoreClientIncrementUpdateToUpdateData<T extends object>(input: FirestoreAccessorIncrementUpdate<T>): UpdateData<T> {
   return mapObjectMap(input, (incrementValue) => {
     return increment(incrementValue ?? 0);
   }) as UpdateData<T>;

diff --git a/packages/firebase/src/lib/common/firestore/error.ts b/packages/firebase/src/lib/common/firestore/error.ts
@@ -12,7 +12,7 @@ export function unsupportedFirestoreDriverFunctionError(message?: string) {
  *
  * @param data
  */
-export function assertFirestoreUpdateHasData(data: UpdateData<unknown>) {
+export function assertFirestoreUpdateHasData(data: UpdateData<object>) {
   if (objectHasNoKeys(data)) {
     throw firestoreUpdateWithNoDataError();
   }

diff --git a/packages/nestjs/stripe/src/lib/stripe.type.ts b/packages/nestjs/stripe/src/lib/stripe.type.ts
@@ -6,12 +6,12 @@ declare module 'stripe' {
   namespace Stripe {
     type TypedEventDataObject<T> = T;
 
-    interface TypedEventData<T> extends Stripe.Event.Data {
+    interface TypedEventData<T extends object> extends Stripe.Event.Data {
       object: T;
       previous_attributes?: Partial<T>;
     }
 
-    interface TypedEvent<T = unknown> extends Stripe.Event {
+    interface TypedEvent<T extends object = object> extends Stripe.Event {
       data: TypedEventData<T>;
       type: Exclude<Stripe.WebhookEndpointCreateParams.EnabledEvent, '*'>;
     }