server-ts: data_dir.js -> data_dir.ts

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.ts');
 const config = ini.parse(fs.readFileSync(dataDir.CONFIG_INI_PATH, 'utf-8'));
 
 if (config.Network.https) {

src/routes/api/backend_log.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const dateUtils = require('../../services/date_utils.js');
-const {LOG_DIR} = require('../../services/data_dir.js');
+const {LOG_DIR} = require('../../services/data_dir.ts');
 
 function getBackendLog() {
     const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`;

src/routes/session_parser.js

@@ -1,6 +1,6 @@
 const session = require("express-session");
 const sessionSecret = require('../services/session_secret.js');
-const dataDir = require('../services/data_dir.js');
+const dataDir = require('../services/data_dir.ts');
 const FileStore = require('session-file-store')(session);
 
 const sessionParser = session({

src/services/anonymization.js

@@ -1,6 +1,6 @@
 const BUILTIN_ATTRIBUTES = require('./builtin_attributes.js');
 const fs = require("fs-extra");
-const dataDir = require('./data_dir.js');
+const dataDir = require('./data_dir.ts');
 const dateUtils = require('./date_utils.js');
 const Database = require("better-sqlite3");
 const sql = require('./sql.js');

src/services/app_info.js

@@ -2,7 +2,7 @@
 
 const build = require('./build.js');
 const packageJson = require('../../package.json');
-const {TRILIUM_DATA_DIR} = require('./data_dir.js');
+const {TRILIUM_DATA_DIR} = require('./data_dir.ts');
 
 const APP_DB_VERSION = 228;
 const SYNC_VERSION = 32;

src/services/backup.js

@@ -3,7 +3,7 @@
 const dateUtils = require('./date_utils.js');
 const optionService = require('./options.js');
 const fs = require('fs-extra');
-const dataDir = require('./data_dir.js');
+const dataDir = require('./data_dir.ts');
 const log = require('./log.ts');
 const syncMutexService = require('./sync_mutex.js');
 const cls = require('./cls.js');

src/services/config.js

@@ -2,7 +2,7 @@
 
 const ini = require('ini');
 const fs = require('fs');
-const dataDir = require('./data_dir.js');
+const dataDir = require('./data_dir.ts');
 const path = require('path');
 const resourceDir = require('./resource_dir.js');
 

src/services/data_dir.ts

@@ -8,14 +8,14 @@
  * - as a fallback if the previous step fails, we'll use home dir
  */
 
-const os = require('os');
+import os = require('os');
-const fs = require('fs');
+import fs = require('fs');
-const path = require('path');
+import path = require('path');
 
 function getAppDataDir() {
     let appDataDir = os.homedir(); // fallback if OS is not recognized
 
-    if (os.platform() === 'win32') {
+    if (os.platform() === 'win32' && process.env.APPDATA) {
         appDataDir = process.env.APPDATA;
     }
     else if (os.platform() === 'linux') {

src/services/log.ts

@@ -1,9 +1,9 @@
 "use strict";
 
 import { Request, Response } from "express";
-import * as fs from "fs";
+import fs = require("fs");
-const dataDir = require('./data_dir.js');
+import dataDir = require('./data_dir.ts');
-const cls = require('./cls.js');
+import cls = require('./cls.js');
 
 if (!fs.existsSync(dataDir.LOG_DIR)) {
     fs.mkdirSync(dataDir.LOG_DIR, 0o700);

src/services/port.js

@@ -1,7 +1,7 @@
 const config = require('./config.js');
 const utils = require('./utils.js');
 const env = require('./env.js');
-const dataDir = require('./data_dir.js');
+const dataDir = require('./data_dir.ts');
 
 function parseAndValidate(portStr, source) {
     const portNum = parseInt(portStr);

src/services/session_secret.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const crypto = require('crypto');
-const dataDir = require('./data_dir.js');
+const dataDir = require('./data_dir.ts');
 const log = require('./log.ts');
 
 const sessionSecretPath = `${dataDir.TRILIUM_DATA_DIR}/session_secret.txt`;

src/services/sql.js

@@ -6,7 +6,7 @@
 
 const log = require('./log.ts');
 const Database = require('better-sqlite3');
-const dataDir = require('./data_dir.js');
+const dataDir = require('./data_dir.ts');
 const cls = require('./cls.js');
 const fs = require("fs-extra");
 

src/share/sql.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Database = require('better-sqlite3');
-const dataDir = require('../services/data_dir.js');
+const dataDir = require('../services/data_dir.ts');
 
 const dbConnection = new Database(dataDir.DOCUMENT_PATH, { readonly: true });
 

tsconfig.json

@@ -4,7 +4,9 @@
 	  "declaration": true,
 	  "sourceMap": true,
 	  "outDir": "./build",
-	  "strict": true
+	  "strict": true,
+	  "allowImportingTsExtensions": true,
+	  "noImplicitAny": true
 	},
 	"include": [
       "./src/**/*.js",