server-ts: log.js -> log.ts

db/migrations/0220__migrate_images_to_attachments.js

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

src/becca/becca_loader.js

@@ -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.js');
+const log = require('../services/log.ts');
 const BNote = require('./entities/bnote.js');
 const BBranch = require('./entities/bbranch.js');
 const BAttribute = require('./entities/battribute.js');

src/becca/becca_service.js

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

src/becca/entities/abstract_becca_entity.js

@@ -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.js');
+const log = require('../../services/log.ts');
 const protectedSessionService = require('../../services/protected_session.js');
 const blobService = require('../../services/blob.js');
 

src/becca/entities/battachment.js

@@ -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.js');
+const log = require('../../services/log.ts');
 
 const attachmentRoleToNoteTypeMapping = {
     'image': 'image'

src/becca/entities/bbranch.js

@@ -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.js');
+const log = require('../../services/log.ts');
 
 /**
  * Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple

src/becca/entities/bnote.js

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

src/becca/similarity.js

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

src/etapi/etapi_utils.js

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

src/routes/api/attributes.js

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

src/routes/api/autocomplete.js

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

src/routes/api/branches.js

@@ -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.js');
+const log = require('../../services/log.ts');
 const ValidationError = require('../../errors/validation_error.js');
 const eventService = require("../../services/events.js");
 

src/routes/api/clipper.js

@@ -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.js');
+const log = require('../../services/log.ts');
 const utils = require('../../services/utils.js');
 const path = require('path');
 const htmlSanitizer = require('../../services/html_sanitizer.js');

src/routes/api/database.js

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

src/routes/api/export.js

@@ -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.js');
+const log = require('../../services/log.ts');
 const NotFoundError = require('../../errors/not_found_error.js');
 
 function exportBranch(req, res) {

src/routes/api/files.js

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

src/routes/api/import.js

@@ -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.js');
+const log = require('../../services/log.ts');
 const TaskContext = require('../../services/task_context.js');
 const ValidationError = require('../../errors/validation_error.js');
 

src/routes/api/notes.js

@@ -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.js');
+const log = require('../../services/log.ts');
 const TaskContext = require('../../services/task_context.js');
 const becca = require('../../becca/becca.js');
 const ValidationError = require('../../errors/validation_error.js');

src/routes/api/options.js

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

src/routes/api/setup.js

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

src/routes/api/sync.js

@@ -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.js');
+const log = require('../../services/log.ts');
 const syncOptions = require('../../services/sync_options.js');
 const utils = require('../../services/utils.js');
 const ws = require('../../services/ws.js');

src/routes/api/tree.js

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

src/routes/custom.js

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

src/routes/error_handlers.js

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

src/routes/index.js

@@ -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.js');
+const log = require('../services/log.ts');
 const env = require('../services/env.js');
 const utils = require('../services/utils.js');
 const protectedSessionService = require('../services/protected_session.js');

src/routes/login.js

@@ -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.js');
+const log = require('../services/log.ts');
 const passwordService = require('../services/encryption/password.js');
 const assetPath = require('../services/asset_path.js');
 const appPath = require('../services/app_path.js');

src/routes/routes.js

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

src/services/app_icon.js

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

src/services/auth.js

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

src/services/backend_script_api.js

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

src/services/backup.js

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

src/services/bulk_actions.js

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

src/services/cloning.js

@@ -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.js');
+const log = require('./log.ts');
 
 function cloneNoteToParentNote(noteId, parentNoteId, prefix = null) {
     if (!(noteId in becca.notes) || !(parentNoteId in becca.notes)) {

src/services/consistency_checks.js

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

src/services/content_hash.js

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

src/services/encryption/data_encryption.js

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

src/services/entity_changes.js

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

src/services/erase.js

@@ -1,6 +1,6 @@
 const sql = require("./sql.js");
 const revisionService = require("./revisions.js");
-const log = require("./log.js");
+const log = require("./log.ts");
 const entityChangesService = require("./entity_changes.js");
 const optionService = require("./options.js");
 const dateUtils = require("./date_utils.js");

src/services/events.js

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

src/services/export/zip.js

@@ -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.js');
+const log = require('../log.ts');
 const TaskContext = require('../task_context.js');
 const ValidationError = require('../../errors/validation_error.js');
 const NoteMeta = require('../meta/note_meta.js');

src/services/hidden_subtree.js

@@ -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.js');
+const log = require('./log.ts');
 const migrationService = require('./migration.js');
 
 const LBTPL_ROOT = "_lbTplRoot";

src/services/image.js

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

src/services/import/enex.js

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

src/services/import/zip.js

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

src/services/keyboard_actions.js

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

src/services/migration.js

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

src/services/notes.js

@@ -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.js');
+const log = require('../services/log.ts');
 const utils = require('../services/utils.js');
 const revisionService = require('./revisions.js');
 const request = require('./request.js');

src/services/options_init.js

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

src/services/protected_session.js

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

src/services/request.js

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

src/services/resource_dir.js

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

src/services/revisions.js

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

src/services/scheduler.js

@@ -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.js');
+const log = require('./log.ts');
 const attributeService = require('../services/attributes.js');
 const protectedSessionService = require('../services/protected_session.js');
 const hiddenSubtreeService = require('./hidden_subtree.js');

src/services/script.js

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

src/services/search/expressions/ancestor.js

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

src/services/search/expressions/note_content_fulltext.js

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

src/services/search/services/search.js

@@ -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.js');
+const log = require('../../log.ts');
 const hoistedNoteService = require('../../hoisted_note.js');
 
 function searchFromNote(note) {

src/services/session_secret.js

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

src/services/setup.js

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

src/services/special_notes.js

@@ -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.js');
+const log = require('./log.ts');
 const hoistedNoteService = require('./hoisted_note.js');
 const searchService = require('./search/services/search.js');
 const SearchContext = require('./search/search_context.js');

src/services/sql.js

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

src/services/sql_init.js

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

src/services/sync.js

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

src/services/sync_update.js

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

src/services/tree.js

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

src/services/window.js

@@ -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.js');
+const log = require('./log.ts');
 const sqlInit = require('./sql_init.js');
 const cls = require('./cls.js');
 const keyboardActionsService = require('./keyboard_actions.js');

src/services/ws.js

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

src/share/routes.js

@@ -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.js');
+const log = require('../services/log.ts');
 
 /**
  * @param {SNote} note

src/share/shaca/shaca_loader.js

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