Update error handling for TS v4.4 unknown vars

dwyfrequency · dwyfrequency · commit f9361ff31780 · 2022-06-07T01:10:03.000-04:00
diff --git a/packages/analytics/src/index.ts b/packages/analytics/src/index.ts
@@ -82,7 +82,7 @@ function registerAnalytics(): void {
       };
     } catch (e) {
       throw ERROR_FACTORY.create(AnalyticsError.INTEROP_COMPONENT_REG_FAILED, {
-        reason: e
+       reason: (e as Error)
       });
     }
   }
diff --git a/packages/auth/src/core/auth/middleware.ts b/packages/auth/src/core/auth/middleware.ts
@@ -87,7 +87,7 @@ export class AuthMiddlewareQueue {
       }
 
       throw this.auth._errorFactory.create(
-        AuthErrorCode.LOGIN_BLOCKED, { originalMessage: e.message });
+        AuthErrorCode.LOGIN_BLOCKED, { originalMessage: (e as Error)?.message });
     }
   }
-}
+}
diff --git a/packages/auth/test/integration/flows/phone.test.ts b/packages/auth/test/integration/flows/phone.test.ts
@@ -294,7 +294,7 @@ describe('Integration test: phone auth', () => {
           )
         );
       } catch (e) {
-        error = e;
+         error = e as FirebaseError;
       }
 
       expect(error!.customData!.phoneNumber).to.eq(PHONE_A.phoneNumber);
diff --git a/packages/firestore-compat/src/api/database.ts b/packages/firestore-compat/src/api/database.ts
@@ -297,15 +297,15 @@ export class Firestore
         collection(this._delegate, pathString)
       );
     } catch (e) {
-      throw replaceFunctionName(e, 'collection()', 'Firestore.collection()');
+      throw replaceFunctionName(e as Error, 'collection()', 'Firestore.collection()');
     }
   }
 
   doc(pathString: string): PublicDocumentReference {
     try {
       return new DocumentReference(this, doc(this._delegate, pathString));
     } catch (e) {
-      throw replaceFunctionName(e, 'doc()', 'Firestore.doc()');
+      throw replaceFunctionName(e as Error, 'doc()', 'Firestore.doc()');
     }
   }
 
@@ -314,7 +314,7 @@ export class Firestore
       return new Query(this, collectionGroup(this._delegate, collectionId));
     } catch (e) {
       throw replaceFunctionName(
-        e,
+       e as Error,
         'collectionGroup()',
         'Firestore.collectionGroup()'
       );
@@ -687,7 +687,7 @@ export class DocumentReference<T = PublicDocumentData>
       );
     } catch (e) {
       throw replaceFunctionName(
-        e,
+        e as Error,
         'collection()',
         'DocumentReference.collection()'
       );
@@ -718,7 +718,7 @@ export class DocumentReference<T = PublicDocumentData>
         return setDoc(this._delegate, value as WithFieldValue<T>);
       }
     } catch (e) {
-      throw replaceFunctionName(e, 'setDoc()', 'DocumentReference.set()');
+      throw replaceFunctionName(e as Error, 'setDoc()', 'DocumentReference.set()');
     }
   }
 
@@ -745,7 +745,7 @@ export class DocumentReference<T = PublicDocumentData>
         );
       }
     } catch (e) {
-      throw replaceFunctionName(e, 'updateDoc()', 'DocumentReference.update()');
+      throw replaceFunctionName(e as Error, 'updateDoc()', 'DocumentReference.update()');
     }
   }
 
@@ -991,7 +991,7 @@ export class Query<T = PublicDocumentData>
         query(this._delegate, where(fieldPath as string, opStr, value))
       );
     } catch (e) {
-      throw replaceFunctionName(e, /(orderBy|where)\(\)/, 'Query.$1()');
+      throw replaceFunctionName(e as Error, /(orderBy|where)\(\)/, 'Query.$1()');
     }
   }
 
@@ -1008,15 +1008,15 @@ export class Query<T = PublicDocumentData>
         query(this._delegate, orderBy(fieldPath as string, directionStr))
       );
     } catch (e) {
-      throw replaceFunctionName(e, /(orderBy|where)\(\)/, 'Query.$1()');
+      throw replaceFunctionName(e as Error, /(orderBy|where)\(\)/, 'Query.$1()');
     }
   }
 
   limit(n: number): Query<T> {
     try {
       return new Query<T>(this.firestore, query(this._delegate, limit(n)));
     } catch (e) {
-      throw replaceFunctionName(e, 'limit()', 'Query.limit()');
+      throw replaceFunctionName(e as Error, 'limit()', 'Query.limit()');
     }
   }
 
@@ -1027,15 +1027,15 @@ export class Query<T = PublicDocumentData>
         query(this._delegate, limitToLast(n))
       );
     } catch (e) {
-      throw replaceFunctionName(e, 'limitToLast()', 'Query.limitToLast()');
+      throw replaceFunctionName(e as Error, 'limitToLast()', 'Query.limitToLast()');
     }
   }
 
   startAt(...args: any[]): Query<T> {
     try {
       return new Query(this.firestore, query(this._delegate, startAt(...args)));
     } catch (e) {
-      throw replaceFunctionName(e, 'startAt()', 'Query.startAt()');
+      throw replaceFunctionName(e as Error, 'startAt()', 'Query.startAt()');
     }
   }
 
@@ -1046,7 +1046,7 @@ export class Query<T = PublicDocumentData>
         query(this._delegate, startAfter(...args))
       );
     } catch (e) {
-      throw replaceFunctionName(e, 'startAfter()', 'Query.startAfter()');
+      throw replaceFunctionName(e as Error, 'startAfter()', 'Query.startAfter()');
     }
   }
 
@@ -1057,15 +1057,15 @@ export class Query<T = PublicDocumentData>
         query(this._delegate, endBefore(...args))
       );
     } catch (e) {
-      throw replaceFunctionName(e, 'endBefore()', 'Query.endBefore()');
+      throw replaceFunctionName(e as Error, 'endBefore()', 'Query.endBefore()');
     }
   }
 
   endAt(...args: any[]): Query<T> {
     try {
       return new Query(this.firestore, query(this._delegate, endAt(...args)));
     } catch (e) {
-      throw replaceFunctionName(e, 'endAt()', 'Query.endAt()');
+      throw replaceFunctionName(e as Error, 'endAt()', 'Query.endAt()');
     }
   }
 
@@ -1265,7 +1265,7 @@ export class CollectionReference<T = PublicDocumentData>
         );
       }
     } catch (e) {
-      throw replaceFunctionName(e, 'doc()', 'CollectionReference.doc()');
+      throw replaceFunctionName(e as Error, 'doc()', 'CollectionReference.doc()');
     }
   }
 
diff --git a/packages/firestore/src/core/event_manager.ts b/packages/firestore/src/core/event_manager.ts
@@ -97,7 +97,7 @@ export async function eventManagerListen(
       queryInfo.viewSnap = await eventManagerImpl.onListen(query);
     } catch (e) {
       const firestoreError = wrapInUserErrorIfRecoverable(
-        e,
+        e as Error,
         `Initialization of query '${stringifyQuery(listener.query)}' failed`
       );
       listener.onError(firestoreError);
diff --git a/packages/messaging/src/helpers/registerDefaultSw.ts b/packages/messaging/src/helpers/registerDefaultSw.ts
@@ -41,7 +41,7 @@ export async function registerDefaultSw(
     });
   } catch (e) {
     throw ERROR_FACTORY.create(ErrorCode.FAILED_DEFAULT_REGISTRATION, {
-      browserErrorMessage: e.message
+      browserErrorMessage: (e as Error)?.message
     });
   }
 }
diff --git a/repo-scripts/api-documenter/src/plugin/PluginLoader.ts b/repo-scripts/api-documenter/src/plugin/PluginLoader.ts
@@ -124,7 +124,7 @@ export class PluginLoader {
               );
             } catch (e) {
               throw new Error(
-                `Failed to construct feature subclass:\n` + e.toString()
+                `Failed to construct feature subclass:\n` + (e as Error)?.toString()
               );
             }
             if (
@@ -140,7 +140,7 @@ export class PluginLoader {
             } catch (e) {
               throw new Error(
                 'Error occurred during the onInitialized() event: ' +
-                  e.toString()
+                 (e as Error)?.toString()
               );
             }
 
@@ -153,7 +153,7 @@ export class PluginLoader {
         }
       } catch (e) {
         throw new Error(
-          `Error loading plugin ${configPlugin.packageName}: ` + e.message
+          `Error loading plugin ${configPlugin.packageName}: ` + (e as Error)?.message
         );
       }
     }
diff --git a/scripts/ci/check_changeset.ts b/scripts/ci/check_changeset.ts
@@ -126,10 +126,11 @@ async function main() {
     await exec(`yarn changeset status`);
     console.log(`::set-output name=BLOCKING_FAILURE::false`);
   } catch (e) {
-    if (e.message.match('No changesets present')) {
+    const error = e as Error;
+    if (error.message.match('No changesets present')) {
       console.log(`::set-output name=BLOCKING_FAILURE::false`);
     } else {
-      const messageLines = e.message.replace(/🦋  error /g, '').split('\n');
+      const messageLines = error.message.replace(/🦋  error /g, '').split('\n');
       let formattedStatusError =
         '- Changeset formatting error in following file:%0A';
       formattedStatusError += '    ```%0A';

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ function registerAnalytics(): void {`
`82`	`82`	`};`
`83`	`83`	`} catch (e) {`
`84`	`84`	`throw ERROR_FACTORY.create(AnalyticsError.INTEROP_COMPONENT_REG_FAILED, {`
`85`		`- reason: e`
	`85`	`+ reason: (e as Error)`
`86`	`86`	`});`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ export class AuthMiddlewareQueue {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`throw this.auth._errorFactory.create(`
`90`		`- AuthErrorCode.LOGIN_BLOCKED, { originalMessage: e.message });`
	`90`	`+ AuthErrorCode.LOGIN_BLOCKED, { originalMessage: (e as Error)?.message });`
`91`	`91`	`}`
`92`	`92`	`}`
`93`		`-}`
	`93`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ describe('Integration test: phone auth', () => {`
`294`	`294`	`)`
`295`	`295`	`);`
`296`	`296`	`} catch (e) {`
`297`		`- error = e;`
	`297`	`+ error = e as FirebaseError;`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`expect(error!.customData!.phoneNumber).to.eq(PHONE_A.phoneNumber);`
Original file line number	Diff line number	Diff line change
`@@ -297,15 +297,15 @@ export class Firestore`
`297`	`297`	`collection(this._delegate, pathString)`
`298`	`298`	`);`
`299`	`299`	`} catch (e) {`
`300`		`- throw replaceFunctionName(e, 'collection()', 'Firestore.collection()');`
	`300`	`+ throw replaceFunctionName(e as Error, 'collection()', 'Firestore.collection()');`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`doc(pathString: string): PublicDocumentReference {`
`305`	`305`	`try {`
`306`	`306`	`return new DocumentReference(this, doc(this._delegate, pathString));`
`307`	`307`	`} catch (e) {`
`308`		`- throw replaceFunctionName(e, 'doc()', 'Firestore.doc()');`
	`308`	`+ throw replaceFunctionName(e as Error, 'doc()', 'Firestore.doc()');`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`
`@@ -314,7 +314,7 @@ export class Firestore`
`314`	`314`	`return new Query(this, collectionGroup(this._delegate, collectionId));`
`315`	`315`	`} catch (e) {`
`316`	`316`	`throw replaceFunctionName(`
`317`		`- e,`
	`317`	`+ e as Error,`
`318`	`318`	`'collectionGroup()',`
`319`	`319`	`'Firestore.collectionGroup()'`
`320`	`320`	`);`
`@@ -687,7 +687,7 @@ export class DocumentReference<T = PublicDocumentData>`
`687`	`687`	`);`
`688`	`688`	`} catch (e) {`
`689`	`689`	`throw replaceFunctionName(`
`690`		`- e,`
	`690`	`+ e as Error,`
`691`	`691`	`'collection()',`
`692`	`692`	`'DocumentReference.collection()'`
`693`	`693`	`);`
`@@ -718,7 +718,7 @@ export class DocumentReference<T = PublicDocumentData>`
`718`	`718`	`return setDoc(this._delegate, value as WithFieldValue<T>);`
`719`	`719`	`}`
`720`	`720`	`} catch (e) {`
`721`		`- throw replaceFunctionName(e, 'setDoc()', 'DocumentReference.set()');`
	`721`	`+ throw replaceFunctionName(e as Error, 'setDoc()', 'DocumentReference.set()');`
`722`	`722`	`}`
`723`	`723`	`}`
`724`	`724`
`@@ -745,7 +745,7 @@ export class DocumentReference<T = PublicDocumentData>`
`745`	`745`	`);`
`746`	`746`	`}`
`747`	`747`	`} catch (e) {`
`748`		`- throw replaceFunctionName(e, 'updateDoc()', 'DocumentReference.update()');`
	`748`	`+ throw replaceFunctionName(e as Error, 'updateDoc()', 'DocumentReference.update()');`
`749`	`749`	`}`
`750`	`750`	`}`
`751`	`751`
`@@ -991,7 +991,7 @@ export class Query<T = PublicDocumentData>`
`991`	`991`	`query(this._delegate, where(fieldPath as string, opStr, value))`
`992`	`992`	`);`
`993`	`993`	`} catch (e) {`
`994`		`- throw replaceFunctionName(e, /(orderBy\|where)\(\)/, 'Query.$1()');`
	`994`	`+ throw replaceFunctionName(e as Error, /(orderBy\|where)\(\)/, 'Query.$1()');`
`995`	`995`	`}`
`996`	`996`	`}`
`997`	`997`
`@@ -1008,15 +1008,15 @@ export class Query<T = PublicDocumentData>`
`1008`	`1008`	`query(this._delegate, orderBy(fieldPath as string, directionStr))`
`1009`	`1009`	`);`
`1010`	`1010`	`} catch (e) {`
`1011`		`- throw replaceFunctionName(e, /(orderBy\|where)\(\)/, 'Query.$1()');`
	`1011`	`+ throw replaceFunctionName(e as Error, /(orderBy\|where)\(\)/, 'Query.$1()');`
`1012`	`1012`	`}`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`	`1015`	`limit(n: number): Query<T> {`
`1016`	`1016`	`try {`
`1017`	`1017`	`return new Query<T>(this.firestore, query(this._delegate, limit(n)));`
`1018`	`1018`	`} catch (e) {`
`1019`		`- throw replaceFunctionName(e, 'limit()', 'Query.limit()');`
	`1019`	`+ throw replaceFunctionName(e as Error, 'limit()', 'Query.limit()');`
`1020`	`1020`	`}`
`1021`	`1021`	`}`
`1022`	`1022`
`@@ -1027,15 +1027,15 @@ export class Query<T = PublicDocumentData>`
`1027`	`1027`	`query(this._delegate, limitToLast(n))`
`1028`	`1028`	`);`
`1029`	`1029`	`} catch (e) {`
`1030`		`- throw replaceFunctionName(e, 'limitToLast()', 'Query.limitToLast()');`
	`1030`	`+ throw replaceFunctionName(e as Error, 'limitToLast()', 'Query.limitToLast()');`
`1031`	`1031`	`}`
`1032`	`1032`	`}`
`1033`	`1033`
`1034`	`1034`	`startAt(...args: any[]): Query<T> {`
`1035`	`1035`	`try {`
`1036`	`1036`	`return new Query(this.firestore, query(this._delegate, startAt(...args)));`
`1037`	`1037`	`} catch (e) {`
`1038`		`- throw replaceFunctionName(e, 'startAt()', 'Query.startAt()');`
	`1038`	`+ throw replaceFunctionName(e as Error, 'startAt()', 'Query.startAt()');`
`1039`	`1039`	`}`
`1040`	`1040`	`}`
`1041`	`1041`
`@@ -1046,7 +1046,7 @@ export class Query<T = PublicDocumentData>`
`1046`	`1046`	`query(this._delegate, startAfter(...args))`
`1047`	`1047`	`);`
`1048`	`1048`	`} catch (e) {`
`1049`		`- throw replaceFunctionName(e, 'startAfter()', 'Query.startAfter()');`
	`1049`	`+ throw replaceFunctionName(e as Error, 'startAfter()', 'Query.startAfter()');`
`1050`	`1050`	`}`
`1051`	`1051`	`}`
`1052`	`1052`
`@@ -1057,15 +1057,15 @@ export class Query<T = PublicDocumentData>`
`1057`	`1057`	`query(this._delegate, endBefore(...args))`
`1058`	`1058`	`);`
`1059`	`1059`	`} catch (e) {`
`1060`		`- throw replaceFunctionName(e, 'endBefore()', 'Query.endBefore()');`
	`1060`	`+ throw replaceFunctionName(e as Error, 'endBefore()', 'Query.endBefore()');`
`1061`	`1061`	`}`
`1062`	`1062`	`}`
`1063`	`1063`
`1064`	`1064`	`endAt(...args: any[]): Query<T> {`
`1065`	`1065`	`try {`
`1066`	`1066`	`return new Query(this.firestore, query(this._delegate, endAt(...args)));`
`1067`	`1067`	`} catch (e) {`
`1068`		`- throw replaceFunctionName(e, 'endAt()', 'Query.endAt()');`
	`1068`	`+ throw replaceFunctionName(e as Error, 'endAt()', 'Query.endAt()');`
`1069`	`1069`	`}`
`1070`	`1070`	`}`
`1071`	`1071`
`@@ -1265,7 +1265,7 @@ export class CollectionReference<T = PublicDocumentData>`
`1265`	`1265`	`);`
`1266`	`1266`	`}`
`1267`	`1267`	`} catch (e) {`
`1268`		`- throw replaceFunctionName(e, 'doc()', 'CollectionReference.doc()');`
	`1268`	`+ throw replaceFunctionName(e as Error, 'doc()', 'CollectionReference.doc()');`
`1269`	`1269`	`}`
`1270`	`1270`	`}`
`1271`	`1271`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export async function registerDefaultSw(`
`41`	`41`	`});`
`42`	`42`	`} catch (e) {`
`43`	`43`	`throw ERROR_FACTORY.create(ErrorCode.FAILED_DEFAULT_REGISTRATION, {`
`44`		`- browserErrorMessage: e.message`
	`44`	`+ browserErrorMessage: (e as Error)?.message`
`45`	`45`	`});`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ export class PluginLoader {`
`124`	`124`	`);`
`125`	`125`	`} catch (e) {`
`126`	`126`	`throw new Error(`
`127`		- `Failed to construct feature subclass:\n` + e.toString()
	`127`	+ `Failed to construct feature subclass:\n` + (e as Error)?.toString()
`128`	`128`	`);`
`129`	`129`	`}`
`130`	`130`	`if (`
`@@ -140,7 +140,7 @@ export class PluginLoader {`
`140`	`140`	`} catch (e) {`
`141`	`141`	`throw new Error(`
`142`	`142`	`'Error occurred during the onInitialized() event: ' +`
`143`		`- e.toString()`
	`143`	`+ (e as Error)?.toString()`
`144`	`144`	`);`
`145`	`145`	`}`
`146`	`146`
`@@ -153,7 +153,7 @@ export class PluginLoader {`
`153`	`153`	`}`
`154`	`154`	`} catch (e) {`
`155`	`155`	`throw new Error(`
`156`		- `Error loading plugin ${configPlugin.packageName}: ` + e.message
	`156`	+ `Error loading plugin ${configPlugin.packageName}: ` + (e as Error)?.message
`157`	`157`	`);`
`158`	`158`	`}`
`159`	`159`	`}`