use .js extension for require() as a preparation for future migration to ESM

src/routes/api/app_info.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const appInfo = require('../../services/app_info');
+const appInfo = require('../../services/app_info.js');
 
 function getAppInfo() {
     return appInfo;

src/routes/api/attachments.js

@@ -1,6 +1,6 @@
-const becca = require("../../becca/becca");
-const blobService = require("../../services/blob");
-const ValidationError = require("../../errors/validation_error");
+const becca = require('../../becca/becca.js');
+const blobService = require('../../services/blob.js');
+const ValidationError = require('../../errors/validation_error.js');
 const imageService = require("../../services/image.js");
 
 function getAttachmentBlob(req) {

src/routes/api/attributes.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const log = require('../../services/log');
-const attributeService = require('../../services/attributes');
-const BAttribute = require('../../becca/entities/battribute');
-const becca = require("../../becca/becca");
-const ValidationError = require("../../errors/validation_error");
+const sql = require('../../services/sql.js');
+const log = require('../../services/log.js');
+const attributeService = require('../../services/attributes.js');
+const BAttribute = require('../../becca/entities/battribute.js');
+const becca = require('../../becca/becca.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 function getEffectiveNoteAttributes(req) {
     const note = becca.getNote(req.params.noteId);

src/routes/api/autocomplete.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const beccaService = require('../../becca/becca_service');
-const searchService = require('../../services/search/services/search');
-const log = require('../../services/log');
-const utils = require('../../services/utils');
-const cls = require('../../services/cls');
-const becca = require("../../becca/becca");
+const beccaService = require('../../becca/becca_service.js');
+const searchService = require('../../services/search/services/search.js');
+const log = require('../../services/log.js');
+const utils = require('../../services/utils.js');
+const cls = require('../../services/cls.js');
+const becca = require('../../becca/becca.js');
 
 function getAutocomplete(req) {
     const query = req.query.query.trim();

src/routes/api/backend_log.js

@@ -1,8 +1,8 @@
 "use strict";
 
 const fs = require('fs');
-const dateUtils = require('../../services/date_utils');
-const {LOG_DIR} = require('../../services/data_dir');
+const dateUtils = require('../../services/date_utils.js');
+const {LOG_DIR} = require('../../services/data_dir.js');
 
 function getBackendLog() {
     const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`;

src/routes/api/branches.js

@@ -1,15 +1,15 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const utils = require('../../services/utils');
-const entityChangesService = require('../../services/entity_changes');
-const treeService = require('../../services/tree');
-const eraseService = require('../../services/erase');
-const becca = require('../../becca/becca');
-const TaskContext = require('../../services/task_context');
-const branchService = require("../../services/branches");
-const log = require("../../services/log");
-const ValidationError = require("../../errors/validation_error");
+const sql = require('../../services/sql.js');
+const utils = require('../../services/utils.js');
+const entityChangesService = require('../../services/entity_changes.js');
+const treeService = require('../../services/tree.js');
+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 ValidationError = require('../../errors/validation_error.js');
 const eventService = require("../../services/events.js");
 
 /**

src/routes/api/bulk_action.js

@@ -1,5 +1,5 @@
-const becca = require("../../becca/becca");
-const bulkActionService = require("../../services/bulk_actions");
+const becca = require('../../becca/becca.js');
+const bulkActionService = require('../../services/bulk_actions.js');
 
 function execute(req) {
     const {noteIds, includeDescendants} = req.body;

src/routes/api/clipper.js

@@ -1,18 +1,18 @@
 "use strict";
 
-const attributeService = require("../../services/attributes");
-const cloneService = require("../../services/cloning");
-const noteService = require('../../services/notes');
-const dateNoteService = require('../../services/date_notes');
-const dateUtils = require('../../services/date_utils');
-const imageService = require('../../services/image');
-const appInfo = require('../../services/app_info');
-const ws = require('../../services/ws');
-const log = require('../../services/log');
-const utils = require('../../services/utils');
+const attributeService = require('../../services/attributes.js');
+const cloneService = require('../../services/cloning.js');
+const noteService = require('../../services/notes.js');
+const dateNoteService = require('../../services/date_notes.js');
+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 utils = require('../../services/utils.js');
 const path = require('path');
-const htmlSanitizer = require('../../services/html_sanitizer');
-const {formatAttrForSearch} = require("../../services/attribute_formatter");
+const htmlSanitizer = require('../../services/html_sanitizer.js');
+const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
 const jsdom = require("jsdom");
 const { JSDOM } = jsdom;
 

src/routes/api/cloning.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const cloningService = require('../../services/cloning');
+const cloningService = require('../../services/cloning.js');
 
 function cloneNoteToBranch(req) {
     const {noteId, parentBranchId} = req.params;

src/routes/api/database.js

@@ -1,10 +1,10 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const log = require('../../services/log');
-const backupService = require('../../services/backup');
-const anonymizationService = require('../../services/anonymization');
-const consistencyChecksService = require('../../services/consistency_checks');
+const sql = require('../../services/sql.js');
+const log = require('../../services/log.js');
+const backupService = require('../../services/backup.js');
+const anonymizationService = require('../../services/anonymization.js');
+const consistencyChecksService = require('../../services/consistency_checks.js');
 
 function getExistingBackups() {
     return backupService.getExistingBackups();

src/routes/api/etapi_tokens.js

@@ -1,4 +1,4 @@
-const etapiTokenService = require("../../services/etapi_tokens");
+const etapiTokenService = require('../../services/etapi_tokens.js');
 
 function getTokens() {
     const tokens = etapiTokenService.getTokens();

src/routes/api/export.js

@@ -1,12 +1,12 @@
 "use strict";
 
-const zipExportService = require('../../services/export/zip');
-const singleExportService = require('../../services/export/single');
-const opmlExportService = require('../../services/export/opml');
-const becca = require('../../becca/becca');
-const TaskContext = require("../../services/task_context");
-const log = require("../../services/log");
-const NotFoundError = require("../../errors/not_found_error");
+const zipExportService = require('../../services/export/zip.js');
+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 NotFoundError = require('../../errors/not_found_error.js');
 
 function exportBranch(req, res) {
     const {branchId, type, format, version, taskId} = req.params;

src/routes/api/files.js

@@ -1,16 +1,16 @@
 "use strict";
 
-const protectedSessionService = require('../../services/protected_session');
-const utils = require('../../services/utils');
-const log = require('../../services/log');
-const noteService = require('../../services/notes');
+const protectedSessionService = require('../../services/protected_session.js');
+const utils = require('../../services/utils.js');
+const log = require('../../services/log.js');
+const noteService = require('../../services/notes.js');
 const tmp = require('tmp');
 const fs = require('fs');
 const { Readable } = require('stream');
 const chokidar = require('chokidar');
-const ws = require('../../services/ws');
-const becca = require("../../becca/becca");
-const ValidationError = require("../../errors/validation_error");
+const ws = require('../../services/ws.js');
+const becca = require('../../becca/becca.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 function updateFile(req) {
     const note = becca.getNoteOrThrow(req.params.noteId);

src/routes/api/fonts.js

@@ -1,4 +1,4 @@
-const optionService = require('../../services/options');
+const optionService = require('../../services/options.js');
 
 function getFontCss(req, res) {
     res.setHeader('Content-Type', 'text/css');

src/routes/api/image.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const imageService = require('../../services/image');
-const becca = require('../../becca/becca');
-const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
+const imageService = require('../../services/image.js');
+const becca = require('../../becca/becca.js');
+const RESOURCE_DIR = require('../../services/resource_dir.js').RESOURCE_DIR;
 const fs = require('fs');
 
 function returnImageFromNote(req, res) {

src/routes/api/import.js

@@ -1,16 +1,16 @@
 "use strict";
 
-const enexImportService = require('../../services/import/enex');
-const opmlImportService = require('../../services/import/opml');
-const zipImportService = require('../../services/import/zip');
-const singleImportService = require('../../services/import/single');
-const cls = require('../../services/cls');
+const enexImportService = require('../../services/import/enex.js');
+const opmlImportService = require('../../services/import/opml.js');
+const zipImportService = require('../../services/import/zip.js');
+const singleImportService = require('../../services/import/single.js');
+const cls = require('../../services/cls.js');
 const path = require('path');
-const becca = require('../../becca/becca');
-const beccaLoader = require('../../becca/becca_loader');
-const log = require('../../services/log');
-const TaskContext = require('../../services/task_context');
-const ValidationError = require("../../errors/validation_error");
+const becca = require('../../becca/becca.js');
+const beccaLoader = require('../../becca/becca_loader.js');
+const log = require('../../services/log.js');
+const TaskContext = require('../../services/task_context.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 async function importNotesToBranch(req) {
     const {parentNoteId} = req.params;

src/routes/api/keys.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const keyboardActions = require('../../services/keyboard_actions');
-const becca = require('../../becca/becca');
+const keyboardActions = require('../../services/keyboard_actions.js');
+const becca = require('../../becca/becca.js');
 
 function getKeyboardActions() {
     return keyboardActions.getKeyboardActions();

src/routes/api/login.js

@@ -1,17 +1,17 @@
 "use strict";
 
-const options = require('../../services/options');
-const utils = require('../../services/utils');
-const dateUtils = require('../../services/date_utils');
-const instanceId = require('../../services/instance_id');
-const passwordEncryptionService = require('../../services/encryption/password_encryption');
-const protectedSessionService = require('../../services/protected_session');
-const appInfo = require('../../services/app_info');
-const eventService = require('../../services/events');
-const sqlInit = require('../../services/sql_init');
-const sql = require('../../services/sql');
-const ws = require("../../services/ws");
-const etapiTokenService = require("../../services/etapi_tokens");
+const options = require('../../services/options.js');
+const utils = require('../../services/utils.js');
+const dateUtils = require('../../services/date_utils.js');
+const instanceId = require('../../services/instance_id.js');
+const passwordEncryptionService = require('../../services/encryption/password_encryption.js');
+const protectedSessionService = require('../../services/protected_session.js');
+const appInfo = require('../../services/app_info.js');
+const eventService = require('../../services/events.js');
+const sqlInit = require('../../services/sql_init.js');
+const sql = require('../../services/sql.js');
+const ws = require('../../services/ws.js');
+const etapiTokenService = require('../../services/etapi_tokens.js');
 
 function loginSync(req) {
     if (!sqlInit.schemaExists()) {

src/routes/api/note_map.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require("../../becca/becca");
+const becca = require('../../becca/becca.js');
 const { JSDOM } = require("jsdom");
 
 function buildDescendantCountMap(noteIdsToCount) {

src/routes/api/notes.js

@@ -1,15 +1,15 @@
 "use strict";
 
-const noteService = require('../../services/notes');
-const eraseService = require('../../services/erase');
-const treeService = require('../../services/tree');
-const sql = require('../../services/sql');
-const utils = require('../../services/utils');
-const log = require('../../services/log');
-const TaskContext = require('../../services/task_context');
-const becca = require("../../becca/becca");
-const ValidationError = require("../../errors/validation_error");
-const blobService = require("../../services/blob");
+const noteService = require('../../services/notes.js');
+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 TaskContext = require('../../services/task_context.js');
+const becca = require('../../becca/becca.js');
+const ValidationError = require('../../errors/validation_error.js');
+const blobService = require('../../services/blob.js');
 
 function getNote(req) {
     return becca.getNoteOrThrow(req.params.noteId);

src/routes/api/options.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const optionService = require('../../services/options');
-const log = require('../../services/log');
-const searchService = require('../../services/search/services/search');
-const ValidationError = require("../../errors/validation_error");
+const optionService = require('../../services/options.js');
+const log = require('../../services/log.js');
+const searchService = require('../../services/search/services/search.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 // options allowed to be updated directly in the Options dialog
 const ALLOWED_OPTIONS = new Set([

src/routes/api/other.js

@@ -1,5 +1,5 @@
-const becca = require("../../becca/becca");
-const markdownService = require("../../services/import/markdown");
+const becca = require('../../becca/becca.js');
+const markdownService = require('../../services/import/markdown.js');
 
 function getIconUsage() {
     const iconClassToCountMap = {};

src/routes/api/password.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const passwordService = require('../../services/encryption/password');
-const ValidationError = require("../../errors/validation_error");
+const passwordService = require('../../services/encryption/password.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 function changePassword(req) {
     if (passwordService.isPasswordSet()) {

src/routes/api/recent_changes.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const protectedSessionService = require('../../services/protected_session');
-const noteService = require('../../services/notes');
-const becca = require("../../becca/becca");
+const sql = require('../../services/sql.js');
+const protectedSessionService = require('../../services/protected_session.js');
+const noteService = require('../../services/notes.js');
+const becca = require('../../becca/becca.js');
 
 function getRecentChanges(req) {
     const {ancestorNoteId} = req.params;

src/routes/api/recent_notes.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const BRecentNote = require('../../becca/entities/brecent_note');
-const sql = require('../../services/sql');
-const dateUtils = require('../../services/date_utils');
+const BRecentNote = require('../../becca/entities/brecent_note.js');
+const sql = require('../../services/sql.js');
+const dateUtils = require('../../services/date_utils.js');
 
 function addRecentNote(req) {
     new BRecentNote({

src/routes/api/relation-map.js

@@ -1,5 +1,5 @@
-const becca = require("../../becca/becca");
-const sql = require("../../services/sql");
+const becca = require('../../becca/becca.js');
+const sql = require('../../services/sql.js');
 
 function getRelationMap(req) {
     const {relationMapNoteId, noteIds} = req.body;

src/routes/api/revisions.js

@@ -1,13 +1,13 @@
 "use strict";
 
-const beccaService = require('../../becca/becca_service');
-const revisionService = require('../../services/revisions');
-const utils = require('../../services/utils');
-const sql = require('../../services/sql');
-const cls = require('../../services/cls');
+const beccaService = require('../../becca/becca_service.js');
+const revisionService = require('../../services/revisions.js');
+const utils = require('../../services/utils.js');
+const sql = require('../../services/sql.js');
+const cls = require('../../services/cls.js');
 const path = require('path');
-const becca = require("../../becca/becca");
-const blobService = require("../../services/blob");
+const becca = require('../../becca/becca.js');
+const blobService = require('../../services/blob.js');
 
 function getRevisionBlob(req) {
     const preview = req.query.preview === 'true';

src/routes/api/script.js

@@ -1,10 +1,10 @@
 "use strict";
 
-const scriptService = require('../../services/script');
-const attributeService = require('../../services/attributes');
-const becca = require('../../becca/becca');
-const syncService = require('../../services/sync');
-const sql = require('../../services/sql');
+const scriptService = require('../../services/script.js');
+const attributeService = require('../../services/attributes.js');
+const becca = require('../../becca/becca.js');
+const syncService = require('../../services/sync.js');
+const sql = require('../../services/sql.js');
 
 // The async/await here is very confusing, because the body.script may, but may not be async. If it is async, then we
 // need to await it and make the complete response including metadata available in a Promise, so that the route detects

src/routes/api/search.js

@@ -1,12 +1,12 @@
 "use strict";
 
-const becca = require('../../becca/becca');
-const SearchContext = require('../../services/search/search_context');
-const searchService = require('../../services/search/services/search');
-const bulkActionService = require("../../services/bulk_actions");
-const cls = require("../../services/cls");
-const {formatAttrForSearch} = require("../../services/attribute_formatter");
-const ValidationError = require("../../errors/validation_error");
+const becca = require('../../becca/becca.js');
+const SearchContext = require('../../services/search/search_context.js');
+const searchService = require('../../services/search/services/search.js');
+const bulkActionService = require('../../services/bulk_actions.js');
+const cls = require('../../services/cls.js');
+const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 function searchFromNote(req) {
     const note = becca.getNoteOrThrow(req.params.noteId);

src/routes/api/sender.js

@@ -1,10 +1,10 @@
 "use strict";
 
 const imageType = require('image-type');
-const imageService = require('../../services/image');
-const noteService = require('../../services/notes');
-const {sanitizeAttributeName} = require("../../services/sanitize_attribute_name");
-const specialNotesService = require("../../services/special_notes");
+const imageService = require('../../services/image.js');
+const noteService = require('../../services/notes.js');
+const {sanitizeAttributeName} = require('../../services/sanitize_attribute_name.js');
+const specialNotesService = require('../../services/special_notes.js');
 
 function uploadImage(req) {
     const file = req.file;

src/routes/api/setup.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const sqlInit = require('../../services/sql_init');
-const setupService = require('../../services/setup');
-const log = require('../../services/log');
-const appInfo = require('../../services/app_info');
+const sqlInit = require('../../services/sql_init.js');
+const setupService = require('../../services/setup.js');
+const log = require('../../services/log.js');
+const appInfo = require('../../services/app_info.js');
 
 function getStatus() {
     return {

src/routes/api/similar_notes.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const similarityService = require('../../becca/similarity');
-const becca = require("../../becca/becca");
+const similarityService = require('../../becca/similarity.js');
+const becca = require('../../becca/becca.js');
 
 async function getSimilarNotes(req) {
     const noteId = req.params.noteId;

src/routes/api/special_notes.js

@@ -1,10 +1,10 @@
 "use strict";
 
-const dateNoteService = require('../../services/date_notes');
-const sql = require('../../services/sql');
-const cls = require('../../services/cls');
-const specialNotesService = require('../../services/special_notes');
-const becca = require('../../becca/becca');
+const dateNoteService = require('../../services/date_notes.js');
+const sql = require('../../services/sql.js');
+const cls = require('../../services/cls.js');
+const specialNotesService = require('../../services/special_notes.js');
+const becca = require('../../becca/becca.js');
 
 function getInboxNote(req) {
     return specialNotesService.getInboxNote(req.params.date);

src/routes/api/sql.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const becca = require("../../becca/becca");
+const sql = require('../../services/sql.js');
+const becca = require('../../becca/becca.js');
 
 function getSchema() {
     const tableNames = sql.getColumn(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name`);

src/routes/api/stats.js

@@ -1,5 +1,5 @@
-const sql = require('../../services/sql');
-const becca = require('../../becca/becca');
+const sql = require('../../services/sql.js');
+const becca = require('../../becca/becca.js');
 
 function getNoteSize(req) {
     const {noteId} = req.params;

src/routes/api/sync.js

@@ -1,16 +1,16 @@
 "use strict";
 
-const syncService = require('../../services/sync');
-const syncUpdateService = require('../../services/sync_update');
-const entityChangesService = require('../../services/entity_changes');
-const sql = require('../../services/sql');
-const sqlInit = require('../../services/sql_init');
-const optionService = require('../../services/options');
-const contentHashService = require('../../services/content_hash');
-const log = require('../../services/log');
-const syncOptions = require('../../services/sync_options');
-const utils = require('../../services/utils');
-const ws = require('../../services/ws');
+const syncService = require('../../services/sync.js');
+const syncUpdateService = require('../../services/sync_update.js');
+const entityChangesService = require('../../services/entity_changes.js');
+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 syncOptions = require('../../services/sync_options.js');
+const utils = require('../../services/utils.js');
+const ws = require('../../services/ws.js');
 
 async function testSync() {
     try {
@@ -193,7 +193,7 @@ function queueSector(req) {
 }
 
 function checkEntityChanges() {
-    require("../../services/consistency_checks").runEntityChangesChecks();
+    require('../../services/consistency_checks.js').runEntityChangesChecks();
 }
 
 module.exports = {

src/routes/api/tree.js

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