TypeScript does not like type annotation for catch.

rebornix · rebornix · commit fd8ffa7f6695 · 2022-07-04T10:53:41.000-07:00
diff --git a/src/background.ts b/src/background.ts
@@ -289,9 +289,7 @@ async function getTotp(text: string, silent = false) {
 }
 
 function getBackupToken(service: string) {
-  if (
-    isChrome && service === "drive"
-  ) {
+  if (isChrome && service === "drive") {
     chrome.identity.getAuthToken(
       {
         interactive: true,
@@ -414,7 +412,7 @@ function getBackupToken(service: string) {
                           }
                         } catch (error) {
                           console.error(error);
-                          reject(error);
+                          reject(error as Error);
                         }
                       }
                       return;
@@ -456,7 +454,7 @@ function getBackupToken(service: string) {
                           }
                         } catch (error) {
                           console.error(error);
-                          reject(error);
+                          reject(error as Error);
                         }
                       }
                       return;
@@ -539,7 +537,7 @@ chrome.commands.onCommand.addListener(async (command: string) => {
             );
           } catch (error) {
             console.error(error);
-            return reject(error);
+            return reject(error as Error);
           }
         }
       );
diff --git a/src/browser.ts b/src/browser.ts
@@ -1,8 +1,10 @@
 const userAgent = navigator.userAgent;
 
-export const isFirefox = (userAgent.indexOf('Firefox') >= 0);
-export const isWebKit = (userAgent.indexOf('AppleWebKit') >= 0);
+export const isFirefox = userAgent.indexOf("Firefox") >= 0;
+export const isWebKit = userAgent.indexOf("AppleWebKit") >= 0;
 export const isEdge = navigator.userAgent.indexOf("Edg") >= 0;
-export const isChromium = (userAgent.indexOf('Chrome') >= 0);
-export const isSafari = (!isChromium && (userAgent.indexOf('Safari') >= 0));
-export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1 && navigator.userAgent.indexOf("Edg") === -1;
+export const isChromium = userAgent.indexOf("Chrome") >= 0;
+export const isSafari = !isChromium && userAgent.indexOf("Safari") >= 0;
+export const isChrome =
+  navigator.userAgent.indexOf("Chrome") !== -1 &&
+  navigator.userAgent.indexOf("Edg") === -1;
diff --git a/src/components/Popup/AddMethodPage.vue b/src/components/Popup/AddMethodPage.vue
@@ -30,7 +30,7 @@ export default Vue.extend({
               }
             );
           } catch (error) {
-            return reject(error);
+            return reject(error as Error);
           }
         }
       );
diff --git a/src/components/Popup/EntryComponent.vue b/src/components/Popup/EntryComponent.vue
@@ -308,7 +308,7 @@ function insertContentScript() {
         chrome.tabs.insertCSS({ file: "/css/content.css" }, resolve);
       });
     } catch (error) {
-      return reject(error);
+      return reject(error as Error);
     }
   });
 }
diff --git a/src/components/Popup/MainHeader.vue b/src/components/Popup/MainHeader.vue
@@ -174,8 +174,8 @@ export default Vue.extend({
                 chrome.tabs.insertCSS({ file: "/css/content.css" }, resolve);
               }
             );
-          } catch (error: any) {
-            return reject(error);
+          } catch (error) {
+            return reject(error as Error);
           }
         }
       );
diff --git a/src/models/backup.ts b/src/models/backup.ts
@@ -52,14 +52,14 @@ export class Dropbox implements BackupProvider {
                   resolve(false);
                 }
               } catch (error) {
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
           };
           xhr.send(backup);
         } catch (error) {
-          return reject(error);
+          return reject(error as Error);
         }
       }
     );
@@ -143,7 +143,7 @@ export class Drive implements BackupProvider {
                 }
               } catch (error) {
                 console.error(error);
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
@@ -218,7 +218,7 @@ export class Drive implements BackupProvider {
                 }
               } catch (error) {
                 console.error(error);
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
@@ -273,7 +273,7 @@ export class Drive implements BackupProvider {
                 }
               } catch (error) {
                 console.error(error);
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
@@ -311,7 +311,7 @@ export class Drive implements BackupProvider {
                 }
               } catch (error) {
                 console.error(error);
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
@@ -375,7 +375,7 @@ export class Drive implements BackupProvider {
                   resolve(false);
                 }
               } catch (error) {
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
@@ -401,7 +401,7 @@ export class Drive implements BackupProvider {
           });
           xhr.send(requestData);
         } catch (error) {
-          return reject(error);
+          return reject(error as Error);
         }
       }
     );
@@ -480,7 +480,7 @@ export class OneDrive implements BackupProvider {
                 }
               } catch (error) {
                 console.error(error);
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
@@ -528,7 +528,7 @@ export class OneDrive implements BackupProvider {
               }
             } catch (error) {
               console.error(error);
-              reject(error);
+              reject(error as Error);
             }
           }
           return;
@@ -590,14 +590,14 @@ export class OneDrive implements BackupProvider {
                   resolve(false);
                 }
               } catch (error) {
-                reject(error);
+                reject(error as Error);
               }
             }
             return;
           };
           xhr.send(backup);
         } catch (error) {
-          return reject(error);
+          return reject(error as Error);
         }
       }
     );
diff --git a/src/models/storage.ts b/src/models/storage.ts
@@ -41,7 +41,7 @@ export class BrowserStorage {
               return;
             });
           } catch (error) {
-            reject(error);
+            reject(error as Error);
             return;
           }
         });
@@ -647,8 +647,8 @@ export class EntryStorage {
             return;
           });
           return;
-        } catch (error: any) {
-          return reject(error);
+        } catch (error) {
+          return reject(error as Error);
         }
       }
     );
diff --git a/src/popup.ts b/src/popup.ts
@@ -340,7 +340,7 @@ export function syncTimeWithGoogle() {
         };
         xhr.send();
       } catch (error) {
-        return reject(error);
+        return reject(error as Error);
       }
     }
   );
diff --git a/src/test/test.ts.disabled b/src/test/test.ts.disabled
@@ -248,7 +248,7 @@ async function clear() {
     try {
       chrome.storage.sync.clear(resolve);
     } catch (error) {
-      reject(error);
+      reject(error as Error);
     }
   });
 }
@@ -262,7 +262,7 @@ async function get<T>() {
       try {
         chrome.storage.sync.get(resolve);
       } catch (error) {
-        reject(error);
+        reject(error as Error);
       }
     }
   );
@@ -274,7 +274,7 @@ async function set(items: { [key: string]: {} }) {
     try {
       chrome.storage.sync.set(items, resolve);
     } catch (error) {
-      reject(error);
+      reject(error as Error);
     }
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -289,9 +289,7 @@ async function getTotp(text: string, silent = false) {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`function getBackupToken(service: string) {`
`292`		`- if (`
`293`		`- isChrome && service === "drive"`
`294`		`- ) {`
	`292`	`+ if (isChrome && service === "drive") {`
`295`	`293`	`chrome.identity.getAuthToken(`
`296`	`294`	`{`
`297`	`295`	`interactive: true,`
`@@ -414,7 +412,7 @@ function getBackupToken(service: string) {`
`414`	`412`	`}`
`415`	`413`	`} catch (error) {`
`416`	`414`	`console.error(error);`
`417`		`- reject(error);`
	`415`	`+ reject(error as Error);`
`418`	`416`	`}`
`419`	`417`	`}`
`420`	`418`	`return;`
`@@ -456,7 +454,7 @@ function getBackupToken(service: string) {`
`456`	`454`	`}`
`457`	`455`	`} catch (error) {`
`458`	`456`	`console.error(error);`
`459`		`- reject(error);`
	`457`	`+ reject(error as Error);`
`460`	`458`	`}`
`461`	`459`	`}`
`462`	`460`	`return;`
`@@ -539,7 +537,7 @@ chrome.commands.onCommand.addListener(async (command: string) => {`
`539`	`537`	`);`
`540`	`538`	`} catch (error) {`
`541`	`539`	`console.error(error);`
`542`		`- return reject(error);`
	`540`	`+ return reject(error as Error);`
`543`	`541`	`}`
`544`	`542`	`}`
`545`	`543`	`);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export default Vue.extend({`
`30`	`30`	`}`
`31`	`31`	`);`
`32`	`32`	`} catch (error) {`
`33`		`- return reject(error);`
	`33`	`+ return reject(error as Error);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`);`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ function insertContentScript() {`
`308`	`308`	`chrome.tabs.insertCSS({ file: "/css/content.css" }, resolve);`
`309`	`309`	`});`
`310`	`310`	`} catch (error) {`
`311`		`- return reject(error);`
	`311`	`+ return reject(error as Error);`
`312`	`312`	`}`
`313`	`313`	`});`
`314`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,8 @@ export default Vue.extend({`
`174`	`174`	`chrome.tabs.insertCSS({ file: "/css/content.css" }, resolve);`
`175`	`175`	`}`
`176`	`176`	`);`
`177`		`- } catch (error: any) {`
`178`		`- return reject(error);`
	`177`	`+ } catch (error) {`
	`178`	`+ return reject(error as Error);`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`);`
Original file line number	Diff line number	Diff line change
`@@ -52,14 +52,14 @@ export class Dropbox implements BackupProvider {`
`52`	`52`	`resolve(false);`
`53`	`53`	`}`
`54`	`54`	`} catch (error) {`
`55`		`- reject(error);`
	`55`	`+ reject(error as Error);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`return;`
`59`	`59`	`};`
`60`	`60`	`xhr.send(backup);`
`61`	`61`	`} catch (error) {`
`62`		`- return reject(error);`
	`62`	`+ return reject(error as Error);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`);`
`@@ -143,7 +143,7 @@ export class Drive implements BackupProvider {`
`143`	`143`	`}`
`144`	`144`	`} catch (error) {`
`145`	`145`	`console.error(error);`
`146`		`- reject(error);`
	`146`	`+ reject(error as Error);`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`return;`
`@@ -218,7 +218,7 @@ export class Drive implements BackupProvider {`
`218`	`218`	`}`
`219`	`219`	`} catch (error) {`
`220`	`220`	`console.error(error);`
`221`		`- reject(error);`
	`221`	`+ reject(error as Error);`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`return;`
`@@ -273,7 +273,7 @@ export class Drive implements BackupProvider {`
`273`	`273`	`}`
`274`	`274`	`} catch (error) {`
`275`	`275`	`console.error(error);`
`276`		`- reject(error);`
	`276`	`+ reject(error as Error);`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`	`return;`
`@@ -311,7 +311,7 @@ export class Drive implements BackupProvider {`
`311`	`311`	`}`
`312`	`312`	`} catch (error) {`
`313`	`313`	`console.error(error);`
`314`		`- reject(error);`
	`314`	`+ reject(error as Error);`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`	`return;`
`@@ -375,7 +375,7 @@ export class Drive implements BackupProvider {`
`375`	`375`	`resolve(false);`
`376`	`376`	`}`
`377`	`377`	`} catch (error) {`
`378`		`- reject(error);`
	`378`	`+ reject(error as Error);`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`	`return;`
`@@ -401,7 +401,7 @@ export class Drive implements BackupProvider {`
`401`	`401`	`});`
`402`	`402`	`xhr.send(requestData);`
`403`	`403`	`} catch (error) {`
`404`		`- return reject(error);`
	`404`	`+ return reject(error as Error);`
`405`	`405`	`}`
`406`	`406`	`}`
`407`	`407`	`);`
`@@ -480,7 +480,7 @@ export class OneDrive implements BackupProvider {`
`480`	`480`	`}`
`481`	`481`	`} catch (error) {`
`482`	`482`	`console.error(error);`
`483`		`- reject(error);`
	`483`	`+ reject(error as Error);`
`484`	`484`	`}`
`485`	`485`	`}`
`486`	`486`	`return;`
`@@ -528,7 +528,7 @@ export class OneDrive implements BackupProvider {`
`528`	`528`	`}`
`529`	`529`	`} catch (error) {`
`530`	`530`	`console.error(error);`
`531`		`- reject(error);`
	`531`	`+ reject(error as Error);`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`	`return;`
`@@ -590,14 +590,14 @@ export class OneDrive implements BackupProvider {`
`590`	`590`	`resolve(false);`
`591`	`591`	`}`
`592`	`592`	`} catch (error) {`
`593`		`- reject(error);`
	`593`	`+ reject(error as Error);`
`594`	`594`	`}`
`595`	`595`	`}`
`596`	`596`	`return;`
`597`	`597`	`};`
`598`	`598`	`xhr.send(backup);`
`599`	`599`	`} catch (error) {`
`600`		`- return reject(error);`
	`600`	`+ return reject(error as Error);`
`601`	`601`	`}`
`602`	`602`	`}`
`603`	`603`	`);`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export class BrowserStorage {`
`41`	`41`	`return;`
`42`	`42`	`});`
`43`	`43`	`} catch (error) {`
`44`		`- reject(error);`
	`44`	`+ reject(error as Error);`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`	`});`
`@@ -647,8 +647,8 @@ export class EntryStorage {`
`647`	`647`	`return;`
`648`	`648`	`});`
`649`	`649`	`return;`
`650`		`- } catch (error: any) {`
`651`		`- return reject(error);`
	`650`	`+ } catch (error) {`
	`651`	`+ return reject(error as Error);`
`652`	`652`	`}`
`653`	`653`	`}`
`654`	`654`	`);`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ export function syncTimeWithGoogle() {`
`340`	`340`	`};`
`341`	`341`	`xhr.send();`
`342`	`342`	`} catch (error) {`
`343`		`- return reject(error);`
	`343`	`+ return reject(error as Error);`
`344`	`344`	`}`
`345`	`345`	`}`
`346`	`346`	`);`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ async function clear() {`
`248`	`248`	`try {`
`249`	`249`	`chrome.storage.sync.clear(resolve);`
`250`	`250`	`} catch (error) {`
`251`		`- reject(error);`
	`251`	`+ reject(error as Error);`
`252`	`252`	`}`
`253`	`253`	`});`
`254`	`254`	`}`
`@@ -262,7 +262,7 @@ async function get<T>() {`
`262`	`262`	`try {`
`263`	`263`	`chrome.storage.sync.get(resolve);`
`264`	`264`	`} catch (error) {`
`265`		`- reject(error);`
	`265`	`+ reject(error as Error);`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`	`);`
`@@ -274,7 +274,7 @@ async function set(items: { [key: string]: {} }) {`
`274`	`274`	`try {`
`275`	`275`	`chrome.storage.sync.set(items, resolve);`
`276`	`276`	`} catch (error) {`
`277`		`- reject(error);`
	`277`	`+ reject(error as Error);`
`278`	`278`	`}`
`279`	`279`	`});`
`280`	`280`	`}`