Convert backend to TypeScript (50% -> [...])

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
   "editor.formatOnSave": true,
-  "files.eol": "\n"
+  "files.eol": "\n",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

_check_ts_progress.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+cloc HEAD \
+    --git --md \
+    --include-lang=javascript,typescript \
+    --found=filelist.txt \
+    --exclude-dir=public,libraries
+
+grep -R \.js$ filelist.txt
+rm filelist.txt

bin/create-anonymization-script.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const anonymizationService = require('../src/services/anonymization.js');
+const anonymizationService = require('../src/services/anonymization');
 const fs = require('fs');
 const path = require('path');
 

bin/release.sh

@@ -26,9 +26,9 @@ jq '.version = "'$VERSION'"' package.json|sponge package.json
 
 git add package.json
 
-echo 'module.exports = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > src/services/build.js
+echo 'export = { buildDate:"'`date --iso-8601=seconds`'", buildRevision: "'`git log -1 --format="%H"`'" };' > src/services/build.ts
 
-git add src/services/build.js
+git add src/services/build.ts
 
 TAG=v$VERSION
 

db/migrations/0216__move_content_into_blobs.js

@@ -1,6 +1,6 @@
 module.exports = () => {
-    const sql = require('../../src/services/sql.js');
-    const utils = require('../../src/services/utils.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

@@ -1,9 +1,9 @@
 module.exports = () => {
-    const beccaLoader = require('../../src/becca/becca_loader.js');
-    const becca = require('../../src/becca/becca.js');
-    const cls = require('../../src/services/cls.js');
-    const log = require('../../src/services/log.js');
-    const sql = require('../../src/services/sql.js');
+    const beccaLoader = require('../../src/becca/becca_loader');
+    const becca = require('../../src/becca/becca');
+    const cls = require('../../src/services/cls');
+    const log = require('../../src/services/log');
+    const sql = require('../../src/services/sql');
 
     cls.init(() => {
         // emergency disabling of image compression since it appears to make problems in migration to 0.61
@@ -13,7 +13,7 @@ module.exports = () => {
 
         for (const note of Object.values(becca.notes)) {
             try {
-                const attachment = note.convertToParentAttachment({autoConversion: true});
+                const attachment = note.convertToParentAttachment({ autoConversion: true });
 
                 if (attachment) {
                     log.info(`Auto-converted note '${note.noteId}' into attachment '${attachment.attachmentId}'.`);

docker_healthcheck.js

@@ -1,7 +1,7 @@
 const http = require("http");
 const ini = require("ini");
 const fs = require("fs");
-const dataDir = require('./src/services/data_dir.js');
+const dataDir = require('./src/services/data_dir');
 const config = ini.parse(fs.readFileSync(dataDir.CONFIG_INI_PATH, 'utf-8'));
 
 if (config.Network.https) {
@@ -10,8 +10,8 @@ if (config.Network.https) {
     process.exit(0);
 }
 
-const port = require('./src/services/port.js');
-const host = require('./src/services/host.js');
+const port = require('./src/services/port');
+const host = require('./src/services/host');
 
 const options = { timeout: 2000 };
 

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

@@ -74,7 +74,7 @@ function dumpDocument(documentPath, targetPath, options) {
                 return;
             }
 
-            let {content} = sql.getRow("SELECT content FROM blobs WHERE blobId = ?", [noteRow.blobId]);
+            let { content } = sql.getRow("SELECT content FROM blobs WHERE blobId = ?", [noteRow.blobId]);
 
             if (content !== null && noteRow.isProtected && dataKey) {
                 content = decryptService.decrypt(dataKey, content);
@@ -108,7 +108,7 @@ function dumpDocument(documentPath, targetPath, options) {
             }
 
             try {
-                fs.mkdirSync(childTargetPath, {recursive: true});
+                fs.mkdirSync(childTargetPath, { recursive: true });
             }
             catch (e) {
                 console.error(`DUMPERROR: Creating directory ${childTargetPath} failed with error '${e.message}'`);
@@ -157,7 +157,7 @@ function validatePaths(documentPath, targetPath) {
     }
 
     if (!fs.existsSync(targetPath)) {
-        const ret = fs.mkdirSync(targetPath, {recursive: true});
+        const ret = fs.mkdirSync(targetPath, { recursive: true });
 
         if (!ret) {
             console.error(`Target path '${targetPath}' could not be created. Run with --help to see usage.`);

electron.js

@@ -1,10 +1,10 @@
 'use strict';
 
 const {app, globalShortcut, BrowserWindow} = require('electron');
-const sqlInit = require('./src/services/sql_init.js');
+const sqlInit = require('./src/services/sql_init');
 const appIconService = require('./src/services/app_icon.js');
-const windowService = require('./src/services/window.js');
-const tray = require('./src/services/tray.js');
+const windowService = require('./src/services/window');
+const tray = require('./src/services/tray');
 
 // Adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')();

nodemon.json

@@ -2,12 +2,11 @@
     "restartable": "rs",
     "ignore": [".git", "node_modules/**/node_modules", "src/public/"],
     "verbose": false,
-    "execMap": {
-        "js": "node --harmony"
-    },
+    "exec": "ts-node",
     "watch": ["src/"],
+    "signal": "SIGTERM",
     "env": {
         "NODE_ENV": "development"
     },
-    "ext": "js,json"
+    "ext": "ts,js,json"
 }