server-ts: Remove need for 'allowImportingTsExtensions'

This commit is contained in:
Elian Doran 2024-02-16 21:17:33 +02:00
parent 78f631373b
commit 96b6d17d77
No known key found for this signature in database
78 changed files with 80 additions and 81 deletions

View File

@ -2,7 +2,7 @@ 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.ts');
const log = require('../../src/services/log');
const sql = require('../../src/services/sql.js');
cls.init(() => {

View File

@ -1,7 +1,7 @@
const http = require("http");
const ini = require("ini");
const fs = require("fs");
const dataDir = require('./src/services/data_dir.ts');
const dataDir = require('./src/services/data_dir');
const config = ini.parse(fs.readFileSync(dataDir.CONFIG_INI_PATH, 'utf-8'));
if (config.Network.https) {

View File

@ -4,7 +4,7 @@ const sql = require('../services/sql.js');
const eventService = require('../services/events.js');
const becca = require('./becca.js');
const sqlInit = require('../services/sql_init.js');
const log = require('../services/log.ts');
const log = require('../services/log');
const BNote = require('./entities/bnote.js');
const BBranch = require('./entities/bbranch.js');
const BAttribute = require('./entities/battribute.js');

View File

@ -2,7 +2,7 @@
const becca = require('./becca.js');
const cls = require('../services/cls.js');
const log = require('../services/log.ts');
const log = require('../services/log');
function isNotePathArchived(notePath) {
const noteId = notePath[notePath.length - 1];

View File

@ -6,7 +6,7 @@ const entityChangesService = require('../../services/entity_changes.js');
const eventService = require('../../services/events.js');
const dateUtils = require('../../services/date_utils.js');
const cls = require('../../services/cls.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const protectedSessionService = require('../../services/protected_session.js');
const blobService = require('../../services/blob.js');

View File

@ -5,7 +5,7 @@ const dateUtils = require('../../services/date_utils.js');
const AbstractBeccaEntity = require('./abstract_becca_entity.js');
const sql = require('../../services/sql.js');
const protectedSessionService = require('../../services/protected_session.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const attachmentRoleToNoteTypeMapping = {
'image': 'image'

View File

@ -6,7 +6,7 @@ const dateUtils = require('../../services/date_utils.js');
const utils = require('../../services/utils.js');
const TaskContext = require('../../services/task_context.js');
const cls = require('../../services/cls.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
/**
* Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple

View File

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

View File

@ -1,5 +1,5 @@
const becca = require('./becca.js');
const log = require('../services/log.ts');
const log = require('../services/log');
const beccaService = require('./becca_service.js');
const dateUtils = require('../services/date_utils.js');
const {JSDOM} = require("jsdom");

View File

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

View File

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

View File

@ -2,7 +2,7 @@
const beccaService = require('../../becca/becca_service.js');
const searchService = require('../../services/search/services/search.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const utils = require('../../services/utils.js');
const cls = require('../../services/cls.js');
const becca = require('../../becca/becca.js');

View File

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

View File

@ -8,7 +8,7 @@ const eraseService = require('../../services/erase.js');
const becca = require('../../becca/becca.js');
const TaskContext = require('../../services/task_context.js');
const branchService = require('../../services/branches.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const ValidationError = require('../../errors/validation_error.js');
const eventService = require("../../services/events.js");

View File

@ -8,7 +8,7 @@ const dateUtils = require('../../services/date_utils.js');
const imageService = require('../../services/image.js');
const appInfo = require('../../services/app_info.js');
const ws = require('../../services/ws.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const utils = require('../../services/utils.js');
const path = require('path');
const htmlSanitizer = require('../../services/html_sanitizer.js');

View File

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

View File

@ -5,7 +5,7 @@ const singleExportService = require('../../services/export/single.js');
const opmlExportService = require('../../services/export/opml.js');
const becca = require('../../becca/becca.js');
const TaskContext = require('../../services/task_context.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const NotFoundError = require('../../errors/not_found_error.js');
function exportBranch(req, res) {

View File

@ -2,7 +2,7 @@
const protectedSessionService = require('../../services/protected_session.js');
const utils = require('../../services/utils.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const noteService = require('../../services/notes.js');
const tmp = require('tmp');
const fs = require('fs');

View File

@ -8,7 +8,7 @@ const cls = require('../../services/cls.js');
const path = require('path');
const becca = require('../../becca/becca.js');
const beccaLoader = require('../../becca/becca_loader.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const TaskContext = require('../../services/task_context.js');
const ValidationError = require('../../errors/validation_error.js');

View File

@ -5,7 +5,7 @@ const eraseService = require('../../services/erase.js');
const treeService = require('../../services/tree.js');
const sql = require('../../services/sql.js');
const utils = require('../../services/utils.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const TaskContext = require('../../services/task_context.js');
const becca = require('../../becca/becca.js');
const ValidationError = require('../../errors/validation_error.js');

View File

@ -1,7 +1,7 @@
"use strict";
const optionService = require('../../services/options.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const searchService = require('../../services/search/services/search.js');
const ValidationError = require('../../errors/validation_error.js');

View File

@ -2,7 +2,7 @@
const sqlInit = require('../../services/sql_init.js');
const setupService = require('../../services/setup.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const appInfo = require('../../services/app_info.js');
function getStatus() {

View File

@ -7,7 +7,7 @@ const sql = require('../../services/sql.js');
const sqlInit = require('../../services/sql_init.js');
const optionService = require('../../services/options.js');
const contentHashService = require('../../services/content_hash.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const syncOptions = require('../../services/sync_options.js');
const utils = require('../../services/utils.js');
const ws = require('../../services/ws.js');

View File

@ -1,7 +1,7 @@
"use strict";
const becca = require('../../becca/becca.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const NotFoundError = require('../../errors/not_found_error.js');
function getNotesAndBranchesAndAttributes(noteIds) {

View File

@ -1,4 +1,4 @@
const log = require('../services/log.ts');
const log = require('../services/log');
const fileService = require('./api/files.js');
const scriptService = require('../services/script.js');
const cls = require('../services/cls.js');

View File

@ -1,4 +1,4 @@
const log = require('../services/log.ts');
const log = require('../services/log');
function register(app) {
app.use((err, req, res, next) => {

View File

@ -4,7 +4,7 @@ const sql = require('../services/sql.js');
const attributeService = require('../services/attributes.js');
const config = require('../services/config.js');
const optionService = require('../services/options.js');
const log = require('../services/log.ts');
const log = require('../services/log');
const env = require('../services/env.js');
const utils = require('../services/utils.js');
const protectedSessionService = require('../services/protected_session.js');

View File

@ -3,7 +3,7 @@
const utils = require('../services/utils.js');
const optionService = require('../services/options.js');
const myScryptService = require('../services/encryption/my_scrypt.js');
const log = require('../services/log.ts');
const log = require('../services/log');
const passwordService = require('../services/encryption/password.js');
const assetPath = require('../services/asset_path.js');
const appPath = require('../services/app_path.js');

View File

@ -2,7 +2,7 @@
const utils = require('../services/utils.js');
const multer = require('multer');
const log = require('../services/log.ts');
const log = require('../services/log');
const express = require('express');
const router = express.Router();
const auth = require('../services/auth.js');

View File

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

View File

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

View File

@ -2,7 +2,7 @@
const path = require('path');
const {ELECTRON_APP_ROOT_DIR} = require('./resource_dir.js');
const log = require('./log.ts');
const log = require('./log');
const os = require('os');
const fs = require('fs');
const config = require('./config.js');

View File

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

View File

@ -1,7 +1,7 @@
"use strict";
const etapiTokenService = require('./etapi_tokens.js');
const log = require('./log.ts');
const log = require('./log');
const sqlInit = require('./sql_init.js');
const utils = require('./utils.js');
const passwordEncryptionService = require('./encryption/password_encryption.js');

View File

@ -1,4 +1,4 @@
const log = require('./log.ts');
const log = require('./log');
const noteService = require('./notes.js');
const sql = require('./sql.js');
const utils = require('./utils.js');

View File

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

View File

@ -1,4 +1,4 @@
const log = require('./log.ts');
const log = require('./log');
const revisionService = require('./revisions.js');
const becca = require('../becca/becca.js');
const cloningService = require('./cloning.js');

View File

@ -5,7 +5,7 @@ const eventChangesService = require('./entity_changes.js');
const treeService = require('./tree.js');
const BBranch = require('../becca/entities/bbranch.js');
const becca = require('../becca/becca.js');
const log = require('./log.ts');
const log = require('./log');
function cloneNoteToParentNote(noteId, parentNoteId, prefix = null) {
if (!(noteId in becca.notes) || !(parentNoteId in becca.notes)) {

View File

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

View File

@ -2,7 +2,7 @@
const sql = require('./sql.js');
const sqlInit = require('./sql_init.js');
const log = require('./log.ts');
const log = require('./log');
const ws = require('./ws.js');
const syncMutexService = require('./sync_mutex.js');
const cls = require('./cls.js');

View File

@ -2,7 +2,7 @@
const sql = require('./sql.js');
const utils = require('./utils.js');
const log = require('./log.ts');
const log = require('./log');
const eraseService = require('./erase.js');
function getEntityHashes() {

View File

@ -1,7 +1,7 @@
"use strict";
const crypto = require('crypto');
const log = require('../log.ts');
const log = require('../log');
function arraysIdentical(a, b) {
let i = a.length;

View File

@ -1,6 +1,6 @@
const sql = require('./sql.js');
const dateUtils = require('./date_utils.js');
const log = require('./log.ts');
const log = require('./log');
const cls = require('./cls.js');
const utils = require('./utils.js');
const instanceId = require('./instance_id.js');

View File

@ -1,4 +1,4 @@
const log = require('./log.ts');
const log = require('./log');
const NOTE_TITLE_CHANGED = "NOTE_TITLE_CHANGED";
const ENTER_PROTECTED_SESSION = "ENTER_PROTECTED_SESSION";

View File

@ -13,7 +13,7 @@ const fs = require("fs");
const becca = require('../../becca/becca.js');
const RESOURCE_DIR = require('../../services/resource_dir.js').RESOURCE_DIR;
const archiver = require('archiver');
const log = require('../log.ts');
const log = require('../log');
const TaskContext = require('../task_context.js');
const ValidationError = require('../../errors/validation_error.js');
const NoteMeta = require('../meta/note_meta.js');

View File

@ -1,7 +1,7 @@
const becca = require('../becca/becca.js');
const noteService = require('./notes.js');
const BAttribute = require('../becca/entities/battribute.js');
const log = require('./log.ts');
const log = require('./log');
const migrationService = require('./migration.js');
const LBTPL_ROOT = "_lbTplRoot";

View File

@ -1,7 +1,7 @@
"use strict";
const becca = require('../becca/becca.js');
const log = require('./log.ts');
const log = require('./log');
const protectedSessionService = require('./protected_session.js');
const noteService = require('./notes.js');
const optionService = require('./options.js');

View File

@ -1,7 +1,7 @@
const sax = require("sax");
const stream = require('stream');
const {Throttle} = require('stream-throttle');
const log = require('../log.ts');
const log = require('../log');
const utils = require('../utils.js');
const sql = require('../sql.js');
const noteService = require('../notes.js');

View File

@ -2,7 +2,7 @@
const BAttribute = require('../../becca/entities/battribute.js');
const utils = require('../../services/utils.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const noteService = require('../../services/notes.js');
const attributeService = require('../../services/attributes.js');
const BBranch = require('../../becca/entities/bbranch.js');

View File

@ -1,7 +1,7 @@
"use strict";
const optionService = require('./options.js');
const log = require('./log.ts');
const log = require('./log');
const utils = require('./utils.js');
const isMac = process.platform === "darwin";

View File

@ -2,7 +2,7 @@
import { Request, Response } from "express";
import fs = require("fs");
import dataDir = require('./data_dir.ts');
import dataDir = require('./data_dir');
import cls = require('./cls.js');
if (!fs.existsSync(dataDir.LOG_DIR)) {

View File

@ -1,7 +1,7 @@
const backupService = require('./backup.js');
const sql = require('./sql.js');
const fs = require('fs-extra');
const log = require('./log.ts');
const log = require('./log');
const utils = require('./utils.js');
const resourceDir = require('./resource_dir.js');
const appInfo = require('./app_info.js');

View File

@ -5,7 +5,7 @@ const entityChangesService = require('./entity_changes.js');
const eventService = require('./events.js');
const cls = require('../services/cls.js');
const protectedSessionService = require('../services/protected_session.js');
const log = require('../services/log.ts');
const log = require('../services/log');
const utils = require('../services/utils.js');
const revisionService = require('./revisions.js');
const request = require('./request.js');

View File

@ -1,7 +1,7 @@
const optionService = require('./options.js');
const appInfo = require('./app_info.js');
const utils = require('./utils.js');
const log = require('./log.ts');
const log = require('./log');
const dateUtils = require('./date_utils.js');
const keyboardActions = require('./keyboard_actions.js');

View File

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

View File

@ -1,6 +1,6 @@
"use strict";
const log = require('./log.ts');
const log = require('./log');
const dataEncryptionService = require('./encryption/data_encryption.js');
let dataKey = null;

View File

@ -1,7 +1,7 @@
"use strict";
const utils = require('./utils.js');
const log = require('./log.ts');
const log = require('./log');
const url = require('url');
const syncOptions = require('./sync_options.js');

View File

@ -1,4 +1,4 @@
const log = require('./log.ts');
const log = require('./log');
const path = require('path');
const fs = require('fs');

View File

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

View File

@ -2,7 +2,7 @@ const scriptService = require('./script.js');
const cls = require('./cls.js');
const sqlInit = require('./sql_init.js');
const config = require('./config.js');
const log = require('./log.ts');
const log = require('./log');
const attributeService = require('../services/attributes.js');
const protectedSessionService = require('../services/protected_session.js');
const hiddenSubtreeService = require('./hidden_subtree.js');

View File

@ -1,6 +1,6 @@
const ScriptContext = require('./script_context.js');
const cls = require('./cls.js');
const log = require('./log.ts');
const log = require('./log');
const becca = require('../becca/becca.js');
function executeNote(note, apiParams) {

View File

@ -2,7 +2,7 @@
const Expression = require('./expression.js');
const NoteSet = require('../note_set.js');
const log = require('../../log.ts');
const log = require('../../log');
const becca = require('../../../becca/becca.js');
class AncestorExp extends Expression {

View File

@ -2,7 +2,7 @@
const Expression = require('./expression.js');
const NoteSet = require('../note_set.js');
const log = require('../../log.ts');
const log = require('../../log');
const becca = require('../../../becca/becca.js');
const protectedSessionService = require('../../protected_session.js');
const striptags = require('striptags');

View File

@ -9,7 +9,7 @@ const SearchContext = require('../search_context.js');
const becca = require('../../../becca/becca.js');
const beccaService = require('../../../becca/becca_service.js');
const utils = require('../../utils.js');
const log = require('../../log.ts');
const log = require('../../log');
const hoistedNoteService = require('../../hoisted_note.js');
function searchFromNote(note) {

View File

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

View File

@ -1,5 +1,5 @@
const syncService = require('./sync.js');
const log = require('./log.ts');
const log = require('./log');
const sqlInit = require('./sql_init.js');
const optionService = require('./options.js');
const syncOptions = require('./sync_options.js');

View File

@ -3,7 +3,7 @@ const dateNoteService = require('./date_notes.js');
const becca = require('../becca/becca.js');
const noteService = require('./notes.js');
const dateUtils = require('./date_utils.js');
const log = require('./log.ts');
const log = require('./log');
const hoistedNoteService = require('./hoisted_note.js');
const searchService = require('./search/services/search.js');
const SearchContext = require('./search/search_context.js');

View File

@ -4,9 +4,9 @@
* @module sql
*/
const log = require('./log.ts');
const log = require('./log');
const Database = require('better-sqlite3');
const dataDir = require('./data_dir.ts');
const dataDir = require('./data_dir');
const cls = require('./cls.js');
const fs = require("fs-extra");

View File

@ -1,4 +1,4 @@
const log = require('./log.ts');
const log = require('./log');
const fs = require('fs');
const resourceDir = require('./resource_dir.js');
const sql = require('./sql.js');

View File

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

View File

@ -1,5 +1,5 @@
const sql = require('./sql.js');
const log = require('./log.ts');
const log = require('./log');
const entityChangesService = require('./entity_changes.js');
const eventService = require('./events.js');
const entityConstructor = require('../becca/entity_constructor.js');

View File

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

View File

@ -3,7 +3,7 @@ const url = require("url");
const port = require('./port.js');
const optionService = require('./options.js');
const env = require('./env.js');
const log = require('./log.ts');
const log = require('./log');
const sqlInit = require('./sql_init.js');
const cls = require('./cls.js');
const keyboardActionsService = require('./keyboard_actions.js');

View File

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

View File

@ -11,7 +11,7 @@ const assetPath = require('../services/asset_path.js');
const appPath = require('../services/app_path.js');
const searchService = require('../services/search/services/search.js');
const SearchContext = require('../services/search/search_context.js');
const log = require('../services/log.ts');
const log = require('../services/log');
/**
* @param {SNote} note

View File

@ -2,7 +2,7 @@
const sql = require('../sql.js');
const shaca = require('./shaca.js');
const log = require('../../services/log.ts');
const log = require('../../services/log');
const SNote = require('./entities/snote.js');
const SBranch = require('./entities/sbranch.js');
const SAttribute = require('./entities/sattribute.js');

View File

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

View File

@ -5,7 +5,6 @@
"sourceMap": true,
"outDir": "./build",
"strict": true,
"allowImportingTsExtensions": true,
"noImplicitAny": true
},
"include": [