chore: recipes/request stores js => ts

5 files changed, 83 insertions, 41 deletions

diff --git a/src/models/Recipe.ts b/src/models/Recipe.ts
index 4463abe95..be889d22c 100644
--- a/src/models/Recipe.ts
+++ b/src/models/Recipe.ts
@@ -23,6 +23,7 @@ interface IRecipe {
     disablewebsecurity?: boolean;
     autoHibernate?: boolean;
     partition?: string;
+    local?: boolean;
     message?: string;
     allowFavoritesDelineationInUnreadCount?: boolean;
   };
@@ -71,6 +72,9 @@ export default class Recipe {
 
   partition: string = '';
 
+  // TODO: Is this being used?
+  local: boolean = false;
+
   // TODO: Need to reconcile which of these are optional/mandatory
   constructor(data: IRecipe) {
     if (!data) {
@@ -134,6 +138,7 @@ export default class Recipe {
       data.config.autoHibernate,
       this.autoHibernate,
     );
+    this.local = ifUndefinedBoolean(data.config.local, this.local);
     this.message = ifUndefinedString(data.config.message, this.message);
     this.allowFavoritesDelineationInUnreadCount = ifUndefinedBoolean(
       data.config.allowFavoritesDelineationInUnreadCount,
diff --git a/src/stores.types.ts b/src/stores.types.ts
index 14ae32133..b0912c463 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -161,6 +161,7 @@ interface RecipeStore {
   _reactions: any[];
   _status: () => void;
   actionStatus: () => void;
+  isInstalled: (id: string) => boolean;
   active: () => void;
   all: Recipe[];
   recipeIdForServices: () => void;
@@ -188,7 +189,16 @@ interface RouterStore {
   goBack: () => void;
   goForward: () => void;
   history: () => void;
-  location: () => void;
+  location: {
+    pathname: string;
+    search: string;
+    action: string;
+    key: string;
+    state: any;
+    query: any;
+    hash?: string;
+    basename?: string;
+  };
   push(path: string): void;
   replace: () => void;
 }
@@ -199,6 +209,7 @@ export interface ServicesStore {
   clearCacheRequest: () => void;
   createServiceRequest: () => void;
   deleteServiceRequest: () => void;
+  allServicesRequest: CachedRequest;
   filterNeedle: () => void;
   lastUsedServices: () => void;
   reorderServicesRequest: () => void;
@@ -285,11 +296,11 @@ interface UIStore {
   actions: Actions;
   api: Api;
   isOsDarkThemeActive: () => void;
-  showServicesUpdatedInfoBar: () => void;
   stores: Stores;
   _reactions: [];
   _status: () => void;
   actionStatus: () => void;
+  showServicesUpdatedInfoBar: boolean;
   isDarkThemeActive: () => void;
   isSplitModeActive: () => void;
   splitColumnsNo: () => void;
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.ts
index ef0bca430..500f69b40 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.ts
@@ -1,44 +1,58 @@
 import { action, computed, observable } from 'mobx';
+import { Actions } from 'src/actions/lib/actions';
+import { ApiInterface } from 'src/api';
+import Recipe from 'src/models/Recipe';
+import { Stores } from 'src/stores.types';
 
-import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
+import TypedStore from './lib/TypedStore';
 
-export default class RecipePreviewsStore extends Store {
+export default class RecipePreviewsStore extends TypedStore {
   @observable allRecipePreviewsRequest = new CachedRequest(
     this.api.recipePreviews,
     'all',
   );
 
-  @observable featuredRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'featured');
+  @observable featuredRecipePreviewsRequest = new CachedRequest(
+    this.api.recipePreviews,
+    'featured',
+  );
 
-  @observable searchRecipePreviewsRequest = new Request(this.api.recipePreviews, 'search');
+  @observable searchRecipePreviewsRequest = new Request(
+    this.api.recipePreviews,
+    'search',
+  );
 
-  constructor(...args) {
-    super(...args);
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
 
     // Register action handlers
     this.actions.recipePreview.search.listen(this._search.bind(this));
   }
 
-  @computed get all() {
+  async setup(): Promise<void> {
+    // Not implemented
+  }
+
+  @computed get all(): Recipe[] {
     return this.allRecipePreviewsRequest.execute().result || [];
   }
 
-  @computed get featured() {
+  @computed get featured(): Recipe[] {
     return this.featuredRecipePreviewsRequest.execute().result || [];
   }
 
-  @computed get searchResults() {
+  @computed get searchResults(): Recipe[] {
     return this.searchRecipePreviewsRequest.result || [];
   }
 
-  @computed get dev() {
+  @computed get dev(): Recipe[] {
     return this.stores.recipes.all.filter(r => r.local);
   }
 
   // Actions
-  @action _search({ needle }) {
+  @action _search({ needle }): void {
     if (needle !== '') {
       this.searchRecipePreviewsRequest.execute(needle);
     }
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.ts
index 3d3a506cc..af2aa7fb0 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.ts
@@ -2,23 +2,27 @@ import { action, computed, observable } from 'mobx';
 import { readJSONSync } from 'fs-extra';
 import semver from 'semver';
 
-import Store from './lib/Store';
+import { Stores } from 'src/stores.types';
+import { ApiInterface } from 'src/api';
+import { Actions } from 'src/actions/lib/actions';
+import Recipe from 'src/models/Recipe';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 import { asarRecipesPath } from '../helpers/asar-helpers';
+import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:RecipeStore');
 
-export default class RecipesStore extends Store {
+export default class RecipesStore extends TypedStore {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
 
   @observable installRecipeRequest = new Request(this.api.recipes, 'install');
 
   @observable getRecipeUpdatesRequest = new Request(this.api.recipes, 'update');
 
-  constructor(...args) {
-    super(...args);
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
 
     // Register action handlers
     this.actions.recipe.install.listen(this._install.bind(this));
@@ -28,11 +32,12 @@ export default class RecipesStore extends Store {
     this.registerReactions([this._checkIfRecipeIsInstalled.bind(this)]);
   }
 
-  setup() {
-    return this.all;
+  async setup(): Promise<void> {
+    // Initially load all recipes
+    this.all;
   }
 
-  @computed get all() {
+  @computed get all(): Recipe[] {
     return this.allRecipesRequest.execute().result || [];
   }
 
@@ -53,20 +58,20 @@ export default class RecipesStore extends Store {
     return null;
   }
 
-  @computed get recipeIdForServices() {
+  @computed get recipeIdForServices(): string[] {
     return this.stores.services.all.map(s => s.recipe.id);
   }
 
-  one(id) {
+  one(id: string): Recipe | undefined {
     return this.all.find(recipe => recipe.id === id);
   }
 
-  isInstalled(id) {
+  isInstalled(id: string): boolean {
     return !!this.one(id);
   }
 
   // Actions
-  async _install({ recipeId }) {
+  async _install({ recipeId }): Promise<Recipe> {
     const recipe = await this.installRecipeRequest.execute(recipeId)._promise;
     await this.allRecipesRequest.invalidate({ immediately: true })._promise;
 
@@ -82,7 +87,9 @@ export default class RecipesStore extends Store {
 
     for (const r of recipeIds) {
       const recipe = this.one(r);
-      recipes[r] = recipe.version;
+      if (recipe) {
+        recipes[r] = recipe.version;
+      }
     }
 
     if (Object.keys(recipes).length === 0) return;
@@ -93,7 +100,7 @@ export default class RecipesStore extends Store {
     // Check for local updates
     const allJsonFile = asarRecipesPath('all.json');
     const allJson = readJSONSync(allJsonFile);
-    const localUpdates = [];
+    const localUpdates: string[] = [];
 
     for (const recipe of Object.keys(recipes)) {
       const version = recipes[recipe];
@@ -134,7 +141,7 @@ export default class RecipesStore extends Store {
     }
   }
 
-  async _checkIfRecipeIsInstalled() {
+  async _checkIfRecipeIsInstalled(): Promise<void> {
     const { router } = this.stores;
 
     const match =
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.ts
index 71a5360ac..03ad2c7db 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.ts
@@ -1,27 +1,32 @@
 import { ipcRenderer } from 'electron';
 import { action, computed, observable } from 'mobx';
 import ms from 'ms';
+
+import { Actions } from 'src/actions/lib/actions';
+import { ApiInterface } from 'src/api';
+import { Stores } from 'src/stores.types';
+import CachedRequest from './lib/CachedRequest';
 import { LOCAL_PORT } from '../config';
 
-import Store from './lib/Store';
+import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:RequestsStore');
 
-export default class RequestStore extends Store {
-  @observable userInfoRequest;
+export default class RequestStore extends TypedStore {
+  @observable userInfoRequest: CachedRequest;
 
-  @observable servicesRequest;
+  @observable servicesRequest: CachedRequest;
 
   @observable showRequiredRequestsError = false;
 
   @observable localServerPort = LOCAL_PORT;
 
-  retries = 0;
+  retries: number = 0;
 
-  retryDelay = ms('2s');
+  retryDelay: number = ms('2s');
 
-  constructor(...args) {
-    super(...args);
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
 
     this.actions.requests.retryRequiredRequests.listen(
       this._retryRequiredRequests.bind(this),
@@ -30,32 +35,32 @@ export default class RequestStore extends Store {
     this.registerReactions([this._autoRetry.bind(this)]);
   }
 
-  setup() {
+  async setup(): Promise<void> {
     this.userInfoRequest = this.stores.user.getUserInfoRequest;
     this.servicesRequest = this.stores.services.allServicesRequest;
 
-    ipcRenderer.on('localServerPort', (event, data) => {
+    ipcRenderer.on('localServerPort', (_, data) => {
       if (data.port) {
         this.localServerPort = data.port;
       }
     });
   }
 
-  @computed get areRequiredRequestsSuccessful() {
+  @computed get areRequiredRequestsSuccessful(): boolean {
     return !this.userInfoRequest.isError && !this.servicesRequest.isError;
   }
 
-  @computed get areRequiredRequestsLoading() {
+  @computed get areRequiredRequestsLoading(): boolean {
     return this.userInfoRequest.isExecuting || this.servicesRequest.isExecuting;
   }
 
-  @action _retryRequiredRequests() {
+  @action _retryRequiredRequests(): void {
     this.userInfoRequest.reload();
     this.servicesRequest.reload();
   }
 
   // Reactions
-  _autoRetry() {
+  _autoRetry(): void {
     const delay = (this.retries <= 10 ? this.retries : 10) * this.retryDelay;
     if (!this.areRequiredRequestsSuccessful && this.stores.user.isLoggedIn) {
       setTimeout(() => {