server-ts: sql.js -> sql.ts

db/migrations/0216__move_content_into_blobs.js

@@ -1,5 +1,5 @@
 module.exports = () => {
-    const sql = require('../../src/services/sql.js');
+    const sql = require('../../src/services/sql');
     const utils = require('../../src/services/utils');
 
     const existingBlobIds = new Set();

db/migrations/0220__migrate_images_to_attachments.js

@@ -3,7 +3,7 @@ module.exports = () => {
     const becca = require('../../src/becca/becca.js');
     const cls = require('../../src/services/cls');
     const log = require('../../src/services/log');
-    const sql = require('../../src/services/sql.js');
+    const sql = require('../../src/services/sql');
 
     cls.init(() => {
         // emergency disabling of image compression since it appears to make problems in migration to 0.61

dump-db/inc/data_key.js

@@ -1,5 +1,5 @@
 const crypto = require("crypto");
-const sql = require('./sql.js');
+const sql = require('./sql');
 const decryptService = require('./decrypt.js');
 
 function getDataKey(password) {

dump-db/inc/dump.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const sanitize = require("sanitize-filename");
-const sql = require('./sql.js');
+const sql = require('./sql');
 const decryptService = require('./decrypt.js');
 const dataKeyService = require('./data_key.js');
 const extensionService = require('./extension.js');

package-lock.json

@@ -89,6 +89,7 @@
         "trilium": "src/www.js"
       },
       "devDependencies": {
+        "@types/better-sqlite3": "^7.6.9",
         "@types/escape-html": "^1.0.4",
         "@types/express": "^4.17.21",
         "@types/mime-types": "^2.1.4",
@@ -1284,6 +1285,15 @@
       "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-21.0.0.tgz",
       "integrity": "sha512-qVfOiFh0U8ZSkLgA6tf7kj2MciqRbSCWaJZRwftVO7UbtVDNsZAXpWXqvCDtIefvjC83UJB+vHTDOGm5ibXjEA=="
     },
+    "node_modules/@types/better-sqlite3": {
+      "version": "7.6.9",
+      "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.9.tgz",
+      "integrity": "sha512-FvktcujPDj9XKMJQWFcl2vVl7OdRIqsSRX9b0acWwTmwLK9CF2eqo/FRcmMLNpugKoX/avA6pb7TorDLmpgTnQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/body-parser": {
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
@@ -15917,6 +15927,15 @@
       "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-21.0.0.tgz",
       "integrity": "sha512-qVfOiFh0U8ZSkLgA6tf7kj2MciqRbSCWaJZRwftVO7UbtVDNsZAXpWXqvCDtIefvjC83UJB+vHTDOGm5ibXjEA=="
     },
+    "@types/better-sqlite3": {
+      "version": "7.6.9",
+      "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.9.tgz",
+      "integrity": "sha512-FvktcujPDj9XKMJQWFcl2vVl7OdRIqsSRX9b0acWwTmwLK9CF2eqo/FRcmMLNpugKoX/avA6pb7TorDLmpgTnQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/body-parser": {
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",

package.json

@@ -112,6 +112,7 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
+    "@types/better-sqlite3": "^7.6.9",
     "@types/escape-html": "^1.0.4",
     "@types/express": "^4.17.21",
     "@types/mime-types": "^2.1.4",

src/becca/becca.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../services/sql.js');
+const sql = require('../services/sql');
 const NoteSet = require('../services/search/note_set.js');
 const NotFoundError = require('../errors/not_found_error.js');
 

src/becca/becca_loader.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../services/sql.js');
+const sql = require('../services/sql');
 const eventService = require('../services/events.js');
 const becca = require('./becca.js');
 const sqlInit = require('../services/sql_init.js');

src/becca/entities/abstract_becca_entity.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require('../../services/utils');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const entityChangesService = require('../../services/entity_changes.js');
 const eventService = require('../../services/events.js');
 const dateUtils = require('../../services/date_utils');

src/becca/entities/battachment.js

@@ -3,7 +3,7 @@
 const utils = require('../../services/utils');
 const dateUtils = require('../../services/date_utils');
 const AbstractBeccaEntity = require('./abstract_becca_entity.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const protectedSessionService = require('../../services/protected_session.js');
 const log = require('../../services/log');
 

src/becca/entities/battribute.js

@@ -2,7 +2,7 @@
 
 const BNote = require('./bnote.js');
 const AbstractBeccaEntity = require('./abstract_becca_entity.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const dateUtils = require('../../services/date_utils');
 const promotedAttributeDefinitionParser = require('../../services/promoted_attribute_definition_parser.js');
 const {sanitizeAttributeName} = require('../../services/sanitize_attribute_name.js');

src/becca/entities/bnote.js

@@ -2,7 +2,7 @@
 
 const protectedSessionService = require('../../services/protected_session.js');
 const log = require('../../services/log');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const utils = require('../../services/utils');
 const dateUtils = require('../../services/date_utils');
 const AbstractBeccaEntity = require('./abstract_becca_entity.js');

src/becca/entities/brevision.js

@@ -5,7 +5,7 @@ const utils = require('../../services/utils');
 const dateUtils = require('../../services/date_utils');
 const becca = require('../becca.js');
 const AbstractBeccaEntity = require('./abstract_becca_entity.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const BAttachment = require('./battachment.js');
 
 /**

src/etapi/etapi_utils.js

@@ -1,5 +1,5 @@
 const cls = require('../services/cls');
-const sql = require('../services/sql.js');
+const sql = require('../services/sql');
 const log = require('../services/log');
 const becca = require('../becca/becca.js');
 const etapiTokenService = require('../services/etapi_tokens.js');

src/routes/api/attributes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const log = require('../../services/log');
 const attributeService = require('../../services/attributes.js');
 const BAttribute = require('../../becca/entities/battribute.js');

src/routes/api/branches.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const utils = require('../../services/utils');
 const entityChangesService = require('../../services/entity_changes.js');
 const treeService = require('../../services/tree.js');

src/routes/api/database.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const log = require('../../services/log');
 const backupService = require('../../services/backup.js');
 const anonymizationService = require('../../services/anonymization.js');

src/routes/api/login.js

@@ -9,7 +9,7 @@ const protectedSessionService = require('../../services/protected_session.js');
 const appInfo = require('../../services/app_info.js');
 const eventService = require('../../services/events.js');
 const sqlInit = require('../../services/sql_init.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const ws = require('../../services/ws.js');
 const etapiTokenService = require('../../services/etapi_tokens.js');
 

src/routes/api/notes.js

@@ -3,7 +3,7 @@
 const noteService = require('../../services/notes.js');
 const eraseService = require('../../services/erase.js');
 const treeService = require('../../services/tree.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const utils = require('../../services/utils');
 const log = require('../../services/log');
 const TaskContext = require('../../services/task_context.js');

src/routes/api/recent_changes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const protectedSessionService = require('../../services/protected_session.js');
 const noteService = require('../../services/notes.js');
 const becca = require('../../becca/becca.js');

src/routes/api/recent_notes.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const BRecentNote = require('../../becca/entities/brecent_note.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const dateUtils = require('../../services/date_utils');
 
 function addRecentNote(req) {

src/routes/api/relation-map.js

@@ -1,5 +1,5 @@
 const becca = require('../../becca/becca.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 
 function getRelationMap(req) {
     const {relationMapNoteId, noteIds} = req.body;

src/routes/api/revisions.js

@@ -3,7 +3,7 @@
 const beccaService = require('../../becca/becca_service.js');
 const revisionService = require('../../services/revisions.js');
 const utils = require('../../services/utils');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const cls = require('../../services/cls');
 const path = require('path');
 const becca = require('../../becca/becca.js');

src/routes/api/script.js

@@ -4,7 +4,7 @@ const scriptService = require('../../services/script.js');
 const attributeService = require('../../services/attributes.js');
 const becca = require('../../becca/becca.js');
 const syncService = require('../../services/sync.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 
 // The async/await here is very confusing, because the body.script may, but may not be async. If it is async, then we
 // need to await it and make the complete response including metadata available in a Promise, so that the route detects

src/routes/api/special_notes.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const dateNoteService = require('../../services/date_notes.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const cls = require('../../services/cls');
 const specialNotesService = require('../../services/special_notes.js');
 const becca = require('../../becca/becca.js');

src/routes/api/sql.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const becca = require('../../becca/becca.js');
 
 function getSchema() {

src/routes/api/stats.js

@@ -1,4 +1,4 @@
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const becca = require('../../becca/becca.js');
 
 function getNoteSize(req) {

src/routes/api/sync.js

@@ -3,7 +3,7 @@
 const syncService = require('../../services/sync.js');
 const syncUpdateService = require('../../services/sync_update.js');
 const entityChangesService = require('../../services/entity_changes.js');
-const sql = require('../../services/sql.js');
+const sql = require('../../services/sql');
 const sqlInit = require('../../services/sql_init.js');
 const optionService = require('../../services/options.js');
 const contentHashService = require('../../services/content_hash.js');

src/routes/custom.js

@@ -2,7 +2,7 @@ const log = require('../services/log');
 const fileService = require('./api/files.js');
 const scriptService = require('../services/script.js');
 const cls = require('../services/cls');
-const sql = require('../services/sql.js');
+const sql = require('../services/sql');
 const becca = require('../becca/becca.js');
 
 function handleRequest(req, res) {

src/routes/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../services/sql.js');
+const sql = require('../services/sql');
 const attributeService = require('../services/attributes.js');
 const config = require('../services/config.js');
 const optionService = require('../services/options.js');

src/routes/routes.js

@@ -7,7 +7,7 @@ const express = require('express');
 const router = express.Router();
 const auth = require('../services/auth.js');
 const cls = require('../services/cls');
-const sql = require('../services/sql.js');
+const sql = require('../services/sql');
 const entityChangesService = require('../services/entity_changes.js');
 const csurf = require('csurf');
 const { createPartialContentHandler } = require("express-partial-content");
@@ -39,7 +39,7 @@ const appInfoRoute = require('./api/app_info.js');
 const exportRoute = require('./api/export.js');
 const importRoute = require('./api/import.js');
 const setupApiRoute = require('./api/setup.js');
-const sqlRoute = require('./api/sql.js');
+const sqlRoute = require('./api/sql');
 const databaseRoute = require('./api/database.js');
 const imageRoute = require('./api/image.js');
 const attributesRoute = require('./api/attributes.js');

src/services/anonymization.js

@@ -3,7 +3,7 @@ const fs = require("fs-extra");
 const dataDir = require('./data_dir');
 const dateUtils = require('./date_utils');
 const Database = require("better-sqlite3");
-const sql = require('./sql.js');
+const sql = require('./sql');
 const path = require("path");
 
 function getFullAnonymizationScript() {

src/services/attributes.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const searchService = require('./search/services/search.js');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const becca = require('../becca/becca.js');
 const BAttribute = require('../becca/entities/battribute.js');
 const {formatAttrForSearch} = require('./attribute_formatter.js');

src/services/backend_script_api.js

@@ -1,6 +1,6 @@
 const log = require('./log');
 const noteService = require('./notes.js');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const utils = require('./utils');
 const attributeService = require('./attributes.js');
 const dateNoteService = require('./date_notes.js');

src/services/backup.js

@@ -7,7 +7,7 @@ const dataDir = require('./data_dir');
 const log = require('./log');
 const syncMutexService = require('./sync_mutex.js');
 const cls = require('./cls');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const path = require('path');
 
 function getExistingBackups() {

src/services/branches.js

@@ -1,5 +1,5 @@
 const treeService = require('./tree.js');
-const sql = require('./sql.js');
+const sql = require('./sql');
 
 function moveBranchToNote(branchToMove, targetParentNoteId) {
     if (branchToMove.parentNoteId === targetParentNoteId) {

src/services/cloning.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('./sql.js');
+const sql = require('./sql');
 const eventChangesService = require('./entity_changes.js');
 const treeService = require('./tree.js');
 const BBranch = require('../becca/entities/bbranch.js');

src/services/consistency_checks.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('./sql.js');
+const sql = require('./sql');
 const sqlInit = require('./sql_init.js');
 const log = require('./log');
 const ws = require('./ws.js');

src/services/content_hash.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('./sql.js');
+const sql = require('./sql');
 const utils = require('./utils');
 const log = require('./log');
 const eraseService = require('./erase.js');

src/services/date_notes.js

@@ -3,7 +3,7 @@
 const noteService = require('./notes.js');
 const attributeService = require('./attributes.js');
 const dateUtils = require('./date_utils');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const protectedSessionService = require('./protected_session.js');
 const searchService = require('../services/search/services/search.js');
 const SearchContext = require('../services/search/search_context.js');

src/services/encryption/password.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../sql.js');
+const sql = require('../sql');
 const optionService = require('../options.js');
 const myScryptService = require('./my_scrypt.js');
 const utils = require('../utils');

src/services/entity_changes.js

@@ -1,4 +1,4 @@
-const sql = require('./sql.js');
+const sql = require('./sql');
 const dateUtils = require('./date_utils');
 const log = require('./log');
 const cls = require('./cls');

src/services/erase.js

@@ -1,4 +1,4 @@
-const sql = require("./sql.js");
+const sql = require("./sql");
 const revisionService = require("./revisions.js");
 const log = require("./log.ts");
 const entityChangesService = require("./entity_changes.js");

src/services/image.js

@@ -5,7 +5,7 @@ const log = require('./log');
 const protectedSessionService = require('./protected_session.js');
 const noteService = require('./notes.js');
 const optionService = require('./options.js');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const jimp = require('jimp');
 const imageType = require('image-type');
 const sanitizeFilename = require('sanitize-filename');

src/services/import/enex.js

@@ -3,7 +3,7 @@ const stream = require('stream');
 const {Throttle} = require('stream-throttle');
 const log = require('../log');
 const utils = require('../utils');
-const sql = require('../sql.js');
+const sql = require('../sql');
 const noteService = require('../notes.js');
 const imageService = require('../image.js');
 const protectedSessionService = require('../protected_session.js');

src/services/migration.js

@@ -1,5 +1,5 @@
 const backupService = require('./backup.js');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const fs = require('fs-extra');
 const log = require('./log');
 const utils = require('./utils');

src/services/notes.js

@@ -1,4 +1,4 @@
-const sql = require('./sql.js');
+const sql = require('./sql');
 const optionService = require('./options.js');
 const dateUtils = require('./date_utils');
 const entityChangesService = require('./entity_changes.js');

src/services/options.js

@@ -1,5 +1,5 @@
 const becca = require('../becca/becca.js');
-const sql = require('./sql.js');
+const sql = require('./sql');
 
 /** @returns {string|null} */
 function getOptionOrNull(name) {

src/services/revisions.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const log = require('./log');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const protectedSessionService = require('./protected_session.js');
 const dateUtils = require('./date_utils');
 

src/services/search/expressions/note_content_fulltext.js

@@ -38,7 +38,7 @@ class NoteContentFulltextExp extends Expression {
         }
 
         const resultNoteSet = new NoteSet();
-        const sql = require('../../sql.js');
+        const sql = require('../../sql');
 
         for (const row of sql.iterateRows(`
                 SELECT noteId, type, mime, content, isProtected

src/services/search/services/search.js

@@ -90,7 +90,7 @@ function searchFromRelation(note, relationName) {
 }
 
 function loadNeededInfoFromDatabase() {
-    const sql = require('../../sql.js');
+    const sql = require('../../sql');
 
     /**
      * This complex structure is needed to calculate total occupied space by a note. Several object instances

src/services/sql.ts

@@ -4,17 +4,19 @@
  * @module sql
  */
 
-const log = require('./log');
-const Database = require('better-sqlite3');
-const dataDir = require('./data_dir');
-const cls = require('./cls');
-const fs = require("fs-extra");
+import log = require('./log');
+import Database = require('better-sqlite3');
+import dataDir = require('./data_dir');
+import cls = require('./cls');
+import fs = require("fs-extra");
 
 const dbConnection = new Database(dataDir.DOCUMENT_PATH);
 dbConnection.pragma('journal_mode = WAL');
 
 const LOG_ALL_QUERIES = false;
 
+type Params = any;
+
 [`exit`, `SIGINT`, `SIGUSR1`, `SIGUSR2`, `SIGTERM`].forEach(eventType => {
     process.on(eventType, () => {
         if (dbConnection) {
@@ -25,7 +27,7 @@ const LOG_ALL_QUERIES = false;
     });
 });
 
-function insert(tableName, rec, replace = false) {
+function insert<T extends {}>(tableName: string, rec: T, replace = false) {
     const keys = Object.keys(rec || {});
     if (keys.length === 0) {
         log.error(`Can't insert empty object into table ${tableName}`);
@@ -48,11 +50,11 @@ function insert(tableName, rec, replace = false) {
     return res ? res.lastInsertRowid : null;
 }
 
-function replace(tableName, rec) {
+function replace<T extends {}>(tableName: string, rec: T) {
     return insert(tableName, rec, true);
 }
 
-function upsert(tableName, primaryKey, rec) {
+function upsert<T extends {}>(tableName: string, primaryKey: string, rec: T) {
     const keys = Object.keys(rec || {});
     if (keys.length === 0) {
         log.error(`Can't upsert empty object into table ${tableName}`);
@@ -70,16 +72,16 @@ function upsert(tableName, primaryKey, rec) {
 
     for (const idx in rec) {
         if (rec[idx] === true || rec[idx] === false) {
-            rec[idx] = rec[idx] ? 1 : 0;
+            (rec as any)[idx] = rec[idx] ? 1 : 0;
         }
     }
 
     execute(query, rec);
 }
 
-const statementCache = {};
+const statementCache: Record<string, Database.Statement> = {};
 
-function stmt(sql) {
+function stmt(sql: string) {
     if (!(sql in statementCache)) {
         statementCache[sql] = dbConnection.prepare(sql);
     }
@@ -87,31 +89,34 @@ function stmt(sql) {
     return statementCache[sql];
 }
 
-function getRow(query, params = []) {
-    return wrap(query, s => s.get(params));
+function getRow<T>(query: string, params: Params = []): T {
+    return wrap(query, s => s.get(params)) as T;
 }
 
-function getRowOrNull(query, params = []) {
+function getRowOrNull<T>(query: string, params: Params = []): T | null {
     const all = getRows(query, params);
+    if (!all) {
+        return null;
+    }
 
-    return all.length > 0 ? all[0] : null;
+    return (all.length > 0 ? all[0] : null) as (T | null);
 }
 
-function getValue(query, params = []) {
+function getValue(query: string, params: Params = []) {
     return wrap(query, s => s.pluck().get(params));
 }
 
 // smaller values can result in better performance due to better usage of statement cache
 const PARAM_LIMIT = 100;
 
-function getManyRows(query, params) {
-    let results = [];
+function getManyRows(query: string, params: Params) {
+    let results: unknown[] = [];
 
     while (params.length > 0) {
         const curParams = params.slice(0, Math.min(params.length, PARAM_LIMIT));
         params = params.slice(curParams.length);
 
-        const curParamsObj = {};
+        const curParamsObj: Record<string, any> = {};
 
         let j = 1;
         for (const param of curParams) {
@@ -133,15 +138,15 @@ function getManyRows(query, params) {
     return results;
 }
 
-function getRows(query, params = []) {
-    return wrap(query, s => s.all(params));
+function getRows(query: string, params: Params = []): unknown[] {
+    return wrap(query, s => s.all(params)) as unknown[];
 }
 
-function getRawRows(query, params = []) {
-    return wrap(query, s => s.raw().all(params));
+function getRawRows<T extends {} | unknown[]>(query: string, params: Params = []): T[] | null {
+    return wrap(query, s => s.raw().all(params)) as T[] | null;
 }
 
-function iterateRows(query, params = []) {
+function iterateRows(query: string, params: Params = []) {
     if (LOG_ALL_QUERIES) {
         console.log(query);
     }
@@ -149,26 +154,26 @@ function iterateRows(query, params = []) {
     return stmt(query).iterate(params);
 }
 
-function getMap(query, params = []) {
-    const map = {};
-    const results = getRawRows(query, params);
+function getMap<K extends string | number | symbol, V>(query: string, params: Params = []) {
+    const map: Record<K, V> = {} as Record<K, V>;
+    const results = getRawRows<any>(query, params);
 
-    for (const row of results) {
-        map[row[0]] = row[1];
+    for (const row of results || []) {
+        map[row[0] as K] = row[1];
     }
 
     return map;
 }
 
-function getColumn(query, params = []) {
+function getColumn(query: string, params: Params = []) {
     return wrap(query, s => s.pluck().all(params));
 }
 
-function execute(query, params = []) {
-    return wrap(query, s => s.run(params));
+function execute(query: string, params: Params = []): Database.RunResult {
+    return wrap(query, s => s.run(params)) as Database.RunResult;
 }
 
-function executeMany(query, params) {
+function executeMany(query: string, params: Params) {
     if (LOG_ALL_QUERIES) {
         console.log(query);
     }
@@ -177,7 +182,7 @@ function executeMany(query, params) {
         const curParams = params.slice(0, Math.min(params.length, PARAM_LIMIT));
         params = params.slice(curParams.length);
 
-        const curParamsObj = {};
+        const curParamsObj: Record<string, any> = {};
 
         let j = 1;
         for (const param of curParams) {
@@ -192,7 +197,7 @@ function executeMany(query, params) {
     }
 }
 
-function executeScript(query) {
+function executeScript(query: string) {
     if (LOG_ALL_QUERIES) {
         console.log(query);
     }
@@ -200,7 +205,7 @@ function executeScript(query) {
     return dbConnection.exec(query);
 }
 
-function wrap(query, func) {
+function wrap(query: string, func: (statement: Database.Statement) => unknown): unknown {
     const startTimestamp = Date.now();
     let result;
 
@@ -211,7 +216,7 @@ function wrap(query, func) {
     try {
         result = func(stmt(query));
     }
-    catch (e) {
+    catch (e: any) {
         if (e.message.includes("The database connection is not open")) {
             // this often happens on killing the app which puts these alerts in front of user
             // in these cases error should be simply ignored.
@@ -237,9 +242,9 @@ function wrap(query, func) {
     return result;
 }
 
-function transactional(func) {
+function transactional<T>(func: (statement: Database.Statement) => T) {
     try {
-        const ret = dbConnection.transaction(func).deferred();
+        const ret = (dbConnection.transaction(func) as any).deferred();
 
         if (!dbConnection.inTransaction) { // i.e. transaction was really committed (and not just savepoint released)
             require('./ws.js').sendTransactionEntityChangesToAllClients();
@@ -263,7 +268,7 @@ function transactional(func) {
     }
 }
 
-function fillParamList(paramIds, truncate = true) {
+function fillParamList(paramIds: string[], truncate = true) {
     if (paramIds.length === 0) {
         return;
     }
@@ -286,7 +291,7 @@ function fillParamList(paramIds, truncate = true) {
     s.run(paramIds);
 }
 
-async function copyDatabase(targetFilePath) {
+async function copyDatabase(targetFilePath: string) {
     try {
         fs.unlinkSync(targetFilePath);
     } catch (e) {
@@ -295,7 +300,7 @@ async function copyDatabase(targetFilePath) {
     await dbConnection.backup(targetFilePath);
 }
 
-function disableSlowQueryLogging(cb) {
+function disableSlowQueryLogging<T>(cb: () => T) {
     const orig = cls.isSlowQueryLoggingDisabled();
 
     try {

src/services/sql_init.js

@@ -1,7 +1,7 @@
 const log = require('./log');
 const fs = require('fs');
 const resourceDir = require('./resource_dir.js');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const utils = require('./utils');
 const optionService = require('./options.js');
 const port = require('./port.js');

src/services/sync.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const log = require('./log');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const optionService = require('./options.js');
 const utils = require('./utils');
 const instanceId = require('./instance_id.js');

src/services/sync_update.js

@@ -1,4 +1,4 @@
-const sql = require('./sql.js');
+const sql = require('./sql');
 const log = require('./log');
 const entityChangesService = require('./entity_changes.js');
 const eventService = require('./events.js');

src/services/tree.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('./sql.js');
+const sql = require('./sql');
 const log = require('./log');
 const BBranch = require('../becca/entities/bbranch.js');
 const entityChangesService = require('./entity_changes.js');

src/services/ws.js

@@ -1,7 +1,7 @@
 const WebSocket = require('ws');
 const utils = require('./utils');
 const log = require('./log');
-const sql = require('./sql.js');
+const sql = require('./sql');
 const cls = require('./cls');
 const config = require('./config.js');
 const syncMutexService = require('./sync_mutex.js');

src/share/shaca/entities/sattachment.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../../sql.js');
+const sql = require('../../sql');
 const utils = require('../../../services/utils');
 const AbstractShacaEntity = require('./abstract_shaca_entity.js');
 

src/share/shaca/entities/snote.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../../sql.js');
+const sql = require('../../sql');
 const utils = require('../../../services/utils');
 const AbstractShacaEntity = require('./abstract_shaca_entity.js');
 const escape = require('escape-html');

src/share/shaca/shaca_loader.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const sql = require('../sql.js');
+const sql = require('../sql');
 const shaca = require('./shaca.js');
 const log = require('../../services/log');
 const SNote = require('./entities/snote.js');