chore: typescript conversion of some minor utilities

Also removed 'targz' unused package from runtime.

11 files changed, 21 insertions, 22 deletions

diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.ts
index 644f15b93..71721bb0f 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.ts
@@ -8,9 +8,9 @@ const debug = require('debug')('Ferdi:LocalApi');
 
 export default class LocalApi {
   // Settings
-  getAppSettings(type) {
+  getAppSettings(type: any) {
     return new Promise(resolve => {
-      ipcRenderer.once('appSettings', (event, resp) => {
+      ipcRenderer.once('appSettings', (_event, resp) => {
         debug('LocalApi::getAppSettings resolves', resp.type, resp.data);
         resolve(resp);
       });
@@ -19,7 +19,7 @@ export default class LocalApi {
     });
   }
 
-  async updateAppSettings(type, data) {
+  async updateAppSettings(type: any, data: any) {
     debug('LocalApi::updateAppSettings resolves', type, data);
     ipcRenderer.send('updateAppSettings', {
       type,
@@ -31,7 +31,7 @@ export default class LocalApi {
   async getAppCacheSize() {
     const partitionsDir = getServicePartitionsDirectory();
     return new Promise((resolve, reject) => {
-      du(partitionsDir, (err, size) => {
+      du(partitionsDir, (err: Error | null, size?: number | undefined) => {
         if (err) reject(err);
 
         debug('LocalApi::getAppCacheSize resolves', size);
@@ -40,7 +40,7 @@ export default class LocalApi {
     });
   }
 
-  async clearCache(serviceId = null) {
+  async clearCache(serviceId: string | null = null) {
     const s = serviceId
       ? session.fromPartition(`persist:service-${serviceId}`)
       : session.defaultSession;
diff --git a/src/helpers/array-helpers.js b/src/helpers/array-helpers.ts
index 5e592b7f7..ae5d8d99f 100644
--- a/src/helpers/array-helpers.js
+++ b/src/helpers/array-helpers.ts
@@ -1,4 +1,4 @@
-export const shuffleArray = (arr) => arr
+export const shuffleArray = (arr: any[]) => arr
   .map((a) => [Math.random(), a])
   .sort((a, b) => a[0] - b[0])
   .map((a) => a[1]);
diff --git a/src/helpers/asar-helpers.js b/src/helpers/asar-helpers.ts
index 9e4380c06..3d9f0d941 100644
--- a/src/helpers/asar-helpers.js
+++ b/src/helpers/asar-helpers.ts
@@ -1,3 +1,3 @@
-export function asarPath(dir = '') {
+export function asarPath(dir: string = '') {
   return dir.replace('app.asar', 'app.asar.unpacked');
 }
diff --git a/src/helpers/async-helpers.js b/src/helpers/async-helpers.ts
index c6c57e28e..aae3c3928 100644
--- a/src/helpers/async-helpers.js
+++ b/src/helpers/async-helpers.ts
@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
 
-export function sleep(ms = 0) {
+export function sleep(ms: number = 0) {
   return new Promise((r) => setTimeout(r, ms));
 }
diff --git a/src/helpers/i18n-helpers.js b/src/helpers/i18n-helpers.ts
index 807b9066e..c1f18f446 100644
--- a/src/helpers/i18n-helpers.js
+++ b/src/helpers/i18n-helpers.ts
@@ -3,7 +3,7 @@ export function getLocale({
 }) {
   let localeStr = locale;
   if (locales[locale] === undefined) {
-    let localeFuzzy;
+    let localeFuzzy: string | undefined;
     Object.keys(locales).forEach((localStr) => {
       if (locales && Object.hasOwnProperty.call(locales, localStr)) {
         if (locale.substring(0, 2) === localStr.substring(0, 2)) {
@@ -31,7 +31,7 @@ export function getLocale({
 export function getSelectOptions({
   locales, resetToDefaultText = '', automaticDetectionText = '', sort = true,
 }) {
-  const options = [];
+  const options: object[] = [];
 
   if (resetToDefaultText) {
     options.push(
diff --git a/src/helpers/password-helpers.js b/src/helpers/password-helpers.ts
index cf461e4f7..89c75c752 100644
--- a/src/helpers/password-helpers.js
+++ b/src/helpers/password-helpers.ts
@@ -1,10 +1,10 @@
 import crypto from 'crypto';
 
-export function hash(password) {
+export function hash(password: crypto.BinaryLike) {
   return crypto.createHash('sha256').update(password).digest('base64');
 }
 
-export function scorePassword(password) {
+export function scorePassword(password: string) {
   let score = 0;
   if (!password) {
     return score;
@@ -32,5 +32,5 @@ export function scorePassword(password) {
 
   score += (variationCount - 1) * 10;
 
-  return parseInt(score, 10);
+  return parseInt(score.toString(), 10);
 }
diff --git a/src/helpers/recipe-helpers.js b/src/helpers/recipe-helpers.ts
index 7e4bfa85a..965429210 100644
--- a/src/helpers/recipe-helpers.js
+++ b/src/helpers/recipe-helpers.ts
@@ -1,15 +1,15 @@
 import { parse } from 'path';
 import { userDataRecipesPath } from '../environment';
 
-export function getRecipeDirectory(id = '') {
+export function getRecipeDirectory(id: string = ''): string {
   return userDataRecipesPath(id);
 }
 
-export function getDevRecipeDirectory(id = '') {
+export function getDevRecipeDirectory(id: string = ''): string {
   return userDataRecipesPath('dev', id);
 }
 
-export function loadRecipeConfig(recipeId) {
+export function loadRecipeConfig(recipeId: string) {
   try {
     const configPath = `${recipeId}/package.json`;
     // Delete module from cache
diff --git a/src/helpers/routing-helpers.js b/src/helpers/routing-helpers.js
deleted file mode 100644
index 14922ebf3..000000000
--- a/src/helpers/routing-helpers.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import RouteParser from 'route-parser';
-
-// eslint-disable-next-line
-export const matchRoute = (pattern, path) => new RouteParser(pattern).match(path);
diff --git a/src/helpers/routing-helpers.ts b/src/helpers/routing-helpers.ts
new file mode 100644
index 000000000..18169f01b
--- /dev/null
+++ b/src/helpers/routing-helpers.ts
@@ -0,0 +1,3 @@
+import RouteParser from 'route-parser';
+
+export const matchRoute = (pattern: string, path: string) => new RouteParser(pattern).match(path);
diff --git a/src/helpers/schedule-helpers.js b/src/helpers/schedule-helpers.ts
index a3020cad6..754fd5556 100644
--- a/src/helpers/schedule-helpers.js
+++ b/src/helpers/schedule-helpers.ts
@@ -1,6 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 
-export function isInTimeframe(start, end) {
+export function isInTimeframe(start: string, end: string) {
   const [
     startHourStr,
     startMinuteStr,
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.ts
index ede5e6dc4..73c8bfd03 100644
--- a/src/helpers/userAgent-helpers.js
+++ b/src/helpers/userAgent-helpers.ts
@@ -6,7 +6,7 @@ import {
 } from '../environment';
 
 function macOS() {
-  const version = macosVersion();
+  const version = macosVersion() || '';
   let cpuName = os.cpus()[0].model.split(' ')[0];
   if (cpuName && cpuName.match(/\(/)) {
     cpuName = cpuName.split('(')[0];