diff --git a/db/migrations/0220__migrate_images_to_attachments.js b/db/migrations/0220__migrate_images_to_attachments.js index 74e743613..400003514 100644 --- a/db/migrations/0220__migrate_images_to_attachments.js +++ b/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(() => { diff --git a/src/becca/becca_loader.js b/src/becca/becca_loader.js index 5d6ce6f06..75d7ec0c7 100644 --- a/src/becca/becca_loader.js +++ b/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'); diff --git a/src/becca/becca_service.js b/src/becca/becca_service.js index 0ac5c2591..cc0c02632 100644 --- a/src/becca/becca_service.js +++ b/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]; diff --git a/src/becca/entities/abstract_becca_entity.js b/src/becca/entities/abstract_becca_entity.js index 3b2e6331b..6f05dcf52 100644 --- a/src/becca/entities/abstract_becca_entity.js +++ b/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'); diff --git a/src/becca/entities/battachment.js b/src/becca/entities/battachment.js index e3e77974d..c8271e391 100644 --- a/src/becca/entities/battachment.js +++ b/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' diff --git a/src/becca/entities/bbranch.js b/src/becca/entities/bbranch.js index 94cc1b802..a8208632a 100644 --- a/src/becca/entities/bbranch.js +++ b/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 diff --git a/src/becca/entities/bnote.js b/src/becca/entities/bnote.js index 36f8ed3d4..118ff9976 100644 --- a/src/becca/entities/bnote.js +++ b/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'); diff --git a/src/becca/similarity.js b/src/becca/similarity.js index 5be56804d..9e225ddcf 100644 --- a/src/becca/similarity.js +++ b/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"); diff --git a/src/etapi/etapi_utils.js b/src/etapi/etapi_utils.js index d3699b664..662e36cbb 100644 --- a/src/etapi/etapi_utils.js +++ b/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'); diff --git a/src/routes/api/attributes.js b/src/routes/api/attributes.js index 0d9b541f1..f96330beb 100644 --- a/src/routes/api/attributes.js +++ b/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'); diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js index 4fe35a564..2ea2ca6c9 100644 --- a/src/routes/api/autocomplete.js +++ b/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'); diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js index 17f11cd01..337fdc0eb 100644 --- a/src/routes/api/branches.js +++ b/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"); diff --git a/src/routes/api/clipper.js b/src/routes/api/clipper.js index 1a7ac2e81..8c38ff72e 100644 --- a/src/routes/api/clipper.js +++ b/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'); diff --git a/src/routes/api/database.js b/src/routes/api/database.js index 5b6b4739d..a09750a45 100644 --- a/src/routes/api/database.js +++ b/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'); diff --git a/src/routes/api/export.js b/src/routes/api/export.js index 514fdf861..9a7323adb 100644 --- a/src/routes/api/export.js +++ b/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) { diff --git a/src/routes/api/files.js b/src/routes/api/files.js index 72bd0ee11..43e64760d 100644 --- a/src/routes/api/files.js +++ b/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'); diff --git a/src/routes/api/import.js b/src/routes/api/import.js index 0e27ed515..2a9d8a594 100644 --- a/src/routes/api/import.js +++ b/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'); diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js index 54cd83330..d5693c137 100644 --- a/src/routes/api/notes.js +++ b/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'); diff --git a/src/routes/api/options.js b/src/routes/api/options.js index efd70a07e..741634940 100644 --- a/src/routes/api/options.js +++ b/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'); diff --git a/src/routes/api/setup.js b/src/routes/api/setup.js index 4ed672f9d..a094b639c 100644 --- a/src/routes/api/setup.js +++ b/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() { diff --git a/src/routes/api/sync.js b/src/routes/api/sync.js index 44da3e52c..cfe1afd88 100644 --- a/src/routes/api/sync.js +++ b/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'); diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js index a5b4ad639..7162e13ba 100644 --- a/src/routes/api/tree.js +++ b/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) { diff --git a/src/routes/custom.js b/src/routes/custom.js index c76240976..1506244d3 100644 --- a/src/routes/custom.js +++ b/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'); diff --git a/src/routes/error_handlers.js b/src/routes/error_handlers.js index 1e9715ed8..441da4b67 100644 --- a/src/routes/error_handlers.js +++ b/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) => { diff --git a/src/routes/index.js b/src/routes/index.js index d57563bad..7544a8bc6 100644 --- a/src/routes/index.js +++ b/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'); diff --git a/src/routes/login.js b/src/routes/login.js index 6c4af5cdb..181eedc0d 100644 --- a/src/routes/login.js +++ b/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'); diff --git a/src/routes/routes.js b/src/routes/routes.js index fd3cf167a..3c46763c3 100644 --- a/src/routes/routes.js +++ b/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'); diff --git a/src/services/app_icon.js b/src/services/app_icon.js index 51e319113..04f9d034d 100644 --- a/src/services/app_icon.js +++ b/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'); diff --git a/src/services/auth.js b/src/services/auth.js index adb565134..cb31a9889 100644 --- a/src/services/auth.js +++ b/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'); diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js index 5abf704ed..36d1fb915 100644 --- a/src/services/backend_script_api.js +++ b/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'); diff --git a/src/services/backup.js b/src/services/backup.js index ef36d91cf..4796da0cf 100644 --- a/src/services/backup.js +++ b/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'); diff --git a/src/services/bulk_actions.js b/src/services/bulk_actions.js index 351370578..14ff03ccd 100644 --- a/src/services/bulk_actions.js +++ b/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'); diff --git a/src/services/cloning.js b/src/services/cloning.js index 4baae5de7..1181983ac 100644 --- a/src/services/cloning.js +++ b/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)) { diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js index 63f934d4f..901a54dbd 100644 --- a/src/services/consistency_checks.js +++ b/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'); diff --git a/src/services/content_hash.js b/src/services/content_hash.js index c9ca7fef6..2858b3cac 100644 --- a/src/services/content_hash.js +++ b/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() { diff --git a/src/services/encryption/data_encryption.js b/src/services/encryption/data_encryption.js index 6b81686ed..fcd5c2f36 100644 --- a/src/services/encryption/data_encryption.js +++ b/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; diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js index 0e0a8ddb3..19c154a50 100644 --- a/src/services/entity_changes.js +++ b/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'); diff --git a/src/services/erase.js b/src/services/erase.js index da65c3ebb..0a4e5ee3a 100644 --- a/src/services/erase.js +++ b/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"); diff --git a/src/services/events.js b/src/services/events.js index acb409107..849af3c52 100644 --- a/src/services/events.js +++ b/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"; diff --git a/src/services/export/zip.js b/src/services/export/zip.js index dba7338d3..87ee4d4e4 100644 --- a/src/services/export/zip.js +++ b/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'); diff --git a/src/services/hidden_subtree.js b/src/services/hidden_subtree.js index 9c2820943..d96c73b1f 100644 --- a/src/services/hidden_subtree.js +++ b/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"; diff --git a/src/services/image.js b/src/services/image.js index 5a45e85ca..ee795ebd8 100644 --- a/src/services/image.js +++ b/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'); diff --git a/src/services/import/enex.js b/src/services/import/enex.js index db0dc9d6c..73d0da225 100644 --- a/src/services/import/enex.js +++ b/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'); diff --git a/src/services/import/zip.js b/src/services/import/zip.js index 5097ba925..7b12130c8 100644 --- a/src/services/import/zip.js +++ b/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'); diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js index 694b7a1d7..bcc8b3cd9 100644 --- a/src/services/keyboard_actions.js +++ b/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"; diff --git a/src/services/log.js b/src/services/log.ts similarity index 100% rename from src/services/log.js rename to src/services/log.ts diff --git a/src/services/migration.js b/src/services/migration.js index aeb7ba217..8dce4c755 100644 --- a/src/services/migration.js +++ b/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'); diff --git a/src/services/notes.js b/src/services/notes.js index 80a3b8e84..d699502e8 100644 --- a/src/services/notes.js +++ b/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'); diff --git a/src/services/options_init.js b/src/services/options_init.js index 95514d6d6..9f3add64b 100644 --- a/src/services/options_init.js +++ b/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'); diff --git a/src/services/protected_session.js b/src/services/protected_session.js index 2ade5e338..c1d6b0986 100644 --- a/src/services/protected_session.js +++ b/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; diff --git a/src/services/request.js b/src/services/request.js index 610e44f51..696f41939 100644 --- a/src/services/request.js +++ b/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'); diff --git a/src/services/resource_dir.js b/src/services/resource_dir.js index 088a6d7d3..cbf1dea91 100644 --- a/src/services/resource_dir.js +++ b/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'); diff --git a/src/services/revisions.js b/src/services/revisions.js index 743284789..8cdff23a8 100644 --- a/src/services/revisions.js +++ b/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'); diff --git a/src/services/scheduler.js b/src/services/scheduler.js index 48a19815a..6f7dc25fb 100644 --- a/src/services/scheduler.js +++ b/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'); diff --git a/src/services/script.js b/src/services/script.js index 6119075e3..4c26a37f7 100644 --- a/src/services/script.js +++ b/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) { diff --git a/src/services/search/expressions/ancestor.js b/src/services/search/expressions/ancestor.js index 57c3adb5f..d1d93eed2 100644 --- a/src/services/search/expressions/ancestor.js +++ b/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 { diff --git a/src/services/search/expressions/note_content_fulltext.js b/src/services/search/expressions/note_content_fulltext.js index 86b08c469..b4c90005f 100644 --- a/src/services/search/expressions/note_content_fulltext.js +++ b/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'); diff --git a/src/services/search/services/search.js b/src/services/search/services/search.js index e1ceed086..68ab55226 100644 --- a/src/services/search/services/search.js +++ b/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) { diff --git a/src/services/session_secret.js b/src/services/session_secret.js index 90eaa65bc..009fae565 100644 --- a/src/services/session_secret.js +++ b/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`; diff --git a/src/services/setup.js b/src/services/setup.js index 67eb7f3ce..6c7156ebc 100644 --- a/src/services/setup.js +++ b/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'); diff --git a/src/services/special_notes.js b/src/services/special_notes.js index 60d202df0..09ce82a69 100644 --- a/src/services/special_notes.js +++ b/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'); diff --git a/src/services/sql.js b/src/services/sql.js index 38cbabe19..171030d6f 100644 --- a/src/services/sql.js +++ b/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'); diff --git a/src/services/sql_init.js b/src/services/sql_init.js index f1b4e9152..572334f13 100644 --- a/src/services/sql_init.js +++ b/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'); diff --git a/src/services/sync.js b/src/services/sync.js index fbafdfcfa..7d64cac57 100644 --- a/src/services/sync.js +++ b/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'); diff --git a/src/services/sync_update.js b/src/services/sync_update.js index 94091e9ef..3a1577971 100644 --- a/src/services/sync_update.js +++ b/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'); diff --git a/src/services/tree.js b/src/services/tree.js index 3973b0f6e..239a9ab35 100644 --- a/src/services/tree.js +++ b/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'); diff --git a/src/services/window.js b/src/services/window.js index 68f70010a..97a60db91 100644 --- a/src/services/window.js +++ b/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'); diff --git a/src/services/ws.js b/src/services/ws.js index 9dead1866..759e0823c 100644 --- a/src/services/ws.js +++ b/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'); diff --git a/src/share/routes.js b/src/share/routes.js index 2805933a8..95d6c1a9f 100644 --- a/src/share/routes.js +++ b/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 diff --git a/src/share/shaca/shaca_loader.js b/src/share/shaca/shaca_loader.js index 00ba63182..83c755e36 100644 --- a/src/share/shaca/shaca_loader.js +++ b/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');