Chore: Migrate database/services and database/utils to TS

app/lib/database/services/Message.js → app/lib/database/services/Message.ts

@@ -1,9 +1,10 @@
 import database from '..';
+import { TAppDatabase } from '../interfaces';
 import { MESSAGES_TABLE } from '../model/Message';
 
-const getCollection = db => db.get(MESSAGES_TABLE);
+const getCollection = (db: TAppDatabase) => db.get(MESSAGES_TABLE);
 
-export const getMessageById = async messageId => {
+export const getMessageById = async (messageId: string) => {
 	const db = database.active;
 	const messageCollection = getCollection(db);
 	try {

app/lib/database/services/Subscription.js → app/lib/database/services/Subscription.ts

@@ -1,9 +1,10 @@
 import database from '..';
+import { TAppDatabase } from '../interfaces';
 import { SUBSCRIPTIONS_TABLE } from '../model/Subscription';
 
-const getCollection = db => db.get(SUBSCRIPTIONS_TABLE);
+const getCollection = (db: TAppDatabase) => db.get(SUBSCRIPTIONS_TABLE);
 
-export const getSubscriptionByRoomId = async rid => {
+export const getSubscriptionByRoomId = async (rid: string) => {
 	const db = database.active;
 	const subCollection = getCollection(db);
 	try {

app/lib/database/services/Thread.js → app/lib/database/services/Thread.ts

@@ -1,9 +1,10 @@
 import database from '..';
+import { TAppDatabase } from '../interfaces';
 import { THREADS_TABLE } from '../model/Thread';
 
-const getCollection = db => db.get(THREADS_TABLE);
+const getCollection = (db: TAppDatabase) => db.get(THREADS_TABLE);
 
-export const getThreadById = async tmid => {
+export const getThreadById = async (tmid: string) => {
 	const db = database.active;
 	const threadCollection = getCollection(db);
 	try {

app/lib/database/services/ThreadMessage.js → app/lib/database/services/ThreadMessage.ts

@@ -1,9 +1,10 @@
 import database from '..';
+import { TAppDatabase } from '../interfaces';
 import { THREAD_MESSAGES_TABLE } from '../model/ThreadMessage';
 
-const getCollection = db => db.get(THREAD_MESSAGES_TABLE);
+const getCollection = (db: TAppDatabase) => db.get(THREAD_MESSAGES_TABLE);
 
-export const getThreadMessageById = async messageId => {
+export const getThreadMessageById = async (messageId: string) => {
 	const db = database.active;
 	const threadMessageCollection = getCollection(db);
 	try {

app/lib/database/utils.test.js → app/lib/database/utils.test.ts

@@ -1,14 +1,12 @@
-/* eslint-disable no-undef */
 import * as utils from './utils';
 
 describe('sanitizeLikeStringTester', () => {
 	// example chars that shouldn't return
 	const disallowedChars = ',./;[]!@#$%^&*()_-=+~';
-	const sanitizeLikeStringTester = str =>
+	const sanitizeLikeStringTester = (str: string) =>
 		expect(utils.sanitizeLikeString(`${str}${disallowedChars}`)).toBe(`${str}${'_'.repeat(disallowedChars.length)}`);
 
 	test('render empty', () => {
-		expect(utils.sanitizeLikeString(null)).toBe(undefined);
 		expect(utils.sanitizeLikeString('')).toBe('');
 		expect(utils.sanitizeLikeString(undefined)).toBe(undefined);
 	});

app/lib/database/utils.ts

@@ -0,0 +1,7 @@
+import XRegExp from 'xregexp';
+
+// Matches letters from any alphabet and numbers
+const likeStringRegex = XRegExp('[^\\p{L}\\p{Nd}]', 'g');
+export const sanitizeLikeString = (str?: string): string | undefined => str?.replace(likeStringRegex, '_');
+
+export const sanitizer = (r: object): object => r;