Update type for stores

Author: xcv58

src/js/stores/AppStore.tsx

@@ -3,11 +3,16 @@ import { encodeSource, decodeSource, getHosts, setHosts } from 'libs'
 import isEqual from 'lodash.isequal'
 import sizeof from 'object-sizeof'
 import { js } from 'js-beautify'
+import Store from 'stores'
+
+type Host = { isRegex: boolean; pattern: string } | string
 
 const key = 'popup'
 const defaultSource = '// Here You can type your custom JavaScript...'
 
 export default class AppStore {
+  store: Store
+
   constructor (store) {
     this.store = store
   }
@@ -20,7 +25,7 @@ export default class AppStore {
 
   @observable saved = false
 
-  @observable hosts = []
+  @observable hosts: Host[] = []
 
   @observable enable = false
 
@@ -36,7 +41,7 @@ export default class AppStore {
 
   @observable protocol = ''
 
-  @observable matchedHost = ''
+  @observable matchedHost: Host = ''
 
   @observable loadError = null
 
@@ -61,17 +66,12 @@ export default class AppStore {
 
   @computed
   get target () {
-    if (this.isRegex) {
+    if (typeof this.matchedHost === 'object' && this.matchedHost.isRegex) {
       return this.matchedHost.pattern
     }
     return this.domain
   }
 
-  @computed
-  get isRegex () {
-    return this.matchedHost && this.matchedHost.isRegex
-  }
-
   @computed
   get differentURL () {
     return !this.tab.url.startsWith(this.domain)
@@ -101,7 +101,7 @@ export default class AppStore {
 
   @computed
   get domainKey () {
-    if (this.isRegex) {
+    if (typeof this.matchedHost === 'object' && this.matchedHost.isRegex) {
       return `${key}-${this.matchedHost.pattern}`
     }
     return `${key}-${this.domain}`
@@ -257,8 +257,9 @@ export default class AppStore {
       newHosts = this.hosts.filter(x => x !== this.domain)
     } else {
       Object.assign(message, this.matchedHost)
+      const { pattern } = this.matchedHost
       newHosts = this.hosts.filter(
-        x => !x.isRegex || x.pattern !== this.matchedHost.pattern
+        x => typeof x === 'string' || (!x.isRegex || x.pattern !== pattern)
       )
     }
     this.saveHosts(newHosts)

src/js/stores/IncludeStore.tsx

@@ -1,11 +1,14 @@
 import { action, computed, observable } from 'mobx'
+import Store from 'stores'
 
 const hint =
   '# Uncomment address of script below or type your own (one per line and must end with ;)'
 const underscore =
   '# //cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js;'
 
 export default class IncludeStore {
+  store: Store
+
   constructor (store) {
     this.store = store
   }

src/js/stores/NewPatternStore.tsx

@@ -1,6 +1,10 @@
 import { action, computed, observable } from 'mobx'
+import Store from 'stores'
 
 export default class NewPatternStore {
+  store: Store
+  re: RegExp
+
   constructor (store) {
     this.store = store
   }
@@ -33,7 +37,11 @@ export default class NewPatternStore {
       return err.message
     }
     const { hosts } = this.store.AppStore
-    if (hosts.find(x => x.isRegex && x.pattern === this.pattern)) {
+    if (
+      hosts.find(
+        x => typeof x === 'object' && (x.isRegex && x.pattern === this.pattern)
+      )
+    ) {
       return `Pattern ${this.pattern} already exists`
     }
   }