server-ts: Fix references to js files for converted files

src/services/attributes.js

@@ -2,7 +2,7 @@
 
 const searchService = require('./search/services/search.js');
 const sql = require('./sql');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const BAttribute = require('../becca/entities/battribute.js');
 const {formatAttrForSearch} = require('./attribute_formatter.js');
 const BUILTIN_ATTRIBUTES = require('./builtin_attributes.js');

src/services/backend_script_api.js

@@ -13,7 +13,7 @@ const cloningService = require('./cloning.js');
 const appInfo = require('./app_info.js');
 const searchService = require('./search/services/search.js');
 const SearchContext = require('./search/search_context.js');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const ws = require('./ws.js');
 const SpacedUpdate = require('./spaced_update.js');
 const specialNotesService = require('./special_notes.js');
@@ -21,7 +21,7 @@ const branchService = require('./branches.js');
 const exportService = require('./export/zip.js');
 const syncMutex = require('./sync_mutex.js');
 const backupService = require('./backup.js');
-const optionsService = require('./options.js');
+const optionsService = require('./options');
 
 
 /**
@@ -678,7 +678,7 @@ function BackendScriptApi(currentNote, apiParams) {
     /**
      * This object contains "at your risk" and "no BC guarantees" objects for advanced use cases.
      *
-     * @property {Becca} becca - provides access to the backend in-memory object graph, see {@link https://github.com/zadam/trilium/blob/master/src/becca/becca.js}
+     * @property {Becca} becca - provides access to the backend in-memory object graph, see {@link https://github.com/zadam/trilium/blob/master/src/becca/becca}
      */
     this.__private = {
         becca

src/services/backup.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const dateUtils = require('./date_utils');
-const optionService = require('./options.js');
+const optionService = require('./options');
 const fs = require('fs-extra');
 const dataDir = require('./data_dir');
 const log = require('./log');

src/services/blob.ts

@@ -1,4 +1,4 @@
-import becca = require('../becca/becca.js');
+import becca = require('../becca/becca');
 import NotFoundError = require('../errors/not_found_error');
 import protectedSessionService = require('./protected_session');
 import utils = require('./utils');

src/services/bulk_actions.js

@@ -1,6 +1,6 @@
 const log = require('./log');
 const revisionService = require('./revisions.js');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const cloningService = require('./cloning.js');
 const branchService = require('./branches.js');
 const utils = require('./utils');

src/services/cloning.js

@@ -1,10 +1,10 @@
 "use strict";
 
 const sql = require('./sql');
-const eventChangesService = require('./entity_changes.js');
+const eventChangesService = require('./entity_changes');
 const treeService = require('./tree.js');
 const BBranch = require('../becca/entities/bbranch.js');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const log = require('./log');
 
 function cloneNoteToParentNote(noteId, parentNoteId, prefix = null) {

src/services/cls.ts

@@ -1,5 +1,5 @@
 import clsHooked = require('cls-hooked');
-import type entity_changes = require('./entity_changes');
+import { EntityChange } from './entity_changes_interface';
 const namespace = clsHooked.createNamespace("trilium");
 
 type Callback = (...args: any[]) => any;
@@ -75,7 +75,7 @@ function getAndClearEntityChangeIds() {
     return entityChangeIds;
 }
 
-function putEntityChange(entityChange: entity_changes.EntityChange) {
+function putEntityChange(entityChange: EntityChange) {
     if (namespace.get('ignoreEntityChangeIds')) {
         return;
     }

src/services/consistency_checks.js

@@ -6,11 +6,11 @@ const log = require('./log');
 const ws = require('./ws.js');
 const syncMutexService = require('./sync_mutex.js');
 const cls = require('./cls');
-const entityChangesService = require('./entity_changes.js');
-const optionsService = require('./options.js');
+const entityChangesService = require('./entity_changes');
+const optionsService = require('./options');
 const BBranch = require('../becca/entities/bbranch.js');
 const revisionService = require('./revisions.js');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const utils = require('../services/utils');
 const eraseService = require('../services/erase.js');
 const {sanitizeAttributeName} = require('./sanitize_attribute_name.js');

src/services/encryption/my_scrypt.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import optionService = require('../options.js');
+import optionService = require('../options');
 import crypto = require('crypto');
 
 function getVerificationHash(password: crypto.BinaryLike) {

src/services/encryption/password.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import sql = require('../sql');
-import optionService = require('../options.js');
+import optionService = require('../options');
 import myScryptService = require('./my_scrypt.js');
 import utils = require('../utils');
 import passwordEncryptionService = require('./password_encryption.js');

src/services/encryption/password_encryption.ts

@@ -1,4 +1,4 @@
-import optionService = require('../options.js');
+import optionService = require('../options');
 import myScryptService = require('./my_scrypt.js');
 import utils = require('../utils');
 import dataEncryptionService = require('./data_encryption.js');

src/services/entity_changes.ts

@@ -4,8 +4,8 @@ import log = require('./log');
 import cls = require('./cls');
 import utils = require('./utils');
 import instanceId = require('./instance_id');
-import becca = require('../becca/becca.js');
-import blobService = require('../services/blob.js');
+import becca = require('../becca/becca');
+import blobService = require('../services/blob');
 import { EntityChange } from './entity_changes_interface';
 import type { Blob } from "./blob-interface";
 

src/services/erase.js

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

src/services/etapi_tokens.js

@@ -1,4 +1,4 @@
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const utils = require('./utils');
 const BEtapiToken = require('../becca/entities/betapi_token.js');
 const crypto = require("crypto");

src/services/export/opml.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require('../utils');
-const becca = require('../../becca/becca.js');
+const becca = require('../../becca/becca');
 
 function exportToOpml(taskContext, branch, version, res) {
     if (!['1.0', '2.0'].includes(version)) {

src/services/export/single.js

@@ -4,7 +4,7 @@ const mimeTypes = require('mime-types');
 const html = require('html');
 const utils = require('../utils');
 const mdService = require('./md.js');
-const becca = require('../../becca/becca.js');
+const becca = require('../../becca/becca');
 
 function exportSingleNote(taskContext, branch, format, res) {
     const note = branch.getNote();

src/services/export/zip.js

@@ -10,7 +10,7 @@ const utils = require('../utils');
 const protectedSessionService = require('../protected_session');
 const sanitize = require("sanitize-filename");
 const fs = require("fs");
-const becca = require('../../becca/becca.js');
+const becca = require('../../becca/becca');
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
 const archiver = require('archiver');
 const log = require('../log');

src/services/handlers.js

@@ -2,7 +2,7 @@ const eventService = require('./events');
 const scriptService = require('./script.js');
 const treeService = require('./tree.js');
 const noteService = require('./notes.js');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const BAttribute = require('../becca/entities/battribute.js');
 const hiddenSubtreeService = require('./hidden_subtree.js');
 const oneTimeTimer = require('./one_time_timer.js');

src/services/hidden_subtree.js

@@ -1,4 +1,4 @@
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const noteService = require('./notes.js');
 const BAttribute = require('../becca/entities/battribute.js');
 const log = require('./log');

src/services/hoisted_note.js

@@ -1,5 +1,5 @@
 const cls = require('./cls');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 
 function getHoistedNoteId() {
     return cls.getHoistedNoteId();

src/services/image.js

@@ -1,10 +1,10 @@
 "use strict";
 
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const log = require('./log');
 const protectedSessionService = require('./protected_session');
 const noteService = require('./notes.js');
-const optionService = require('./options.js');
+const optionService = require('./options');
 const sql = require('./sql');
 const jimp = require('jimp');
 const imageType = require('image-type');

src/services/import/zip.js

@@ -12,7 +12,7 @@ const mimeService = require('./mime.js');
 const treeService = require('../tree.js');
 const yauzl = require("yauzl");
 const htmlSanitizer = require('../html_sanitizer.js');
-const becca = require('../../becca/becca.js');
+const becca = require('../../becca/becca');
 const BAttachment = require('../../becca/entities/battachment.js');
 const markdownService = require('./markdown.js');
 

src/services/keyboard_actions.js

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

src/services/notes.js

@@ -1,7 +1,7 @@
 const sql = require('./sql');
-const optionService = require('./options.js');
+const optionService = require('./options');
 const dateUtils = require('./date_utils');
-const entityChangesService = require('./entity_changes.js');
+const entityChangesService = require('./entity_changes');
 const eventService = require('./events');
 const cls = require('../services/cls');
 const protectedSessionService = require('../services/protected_session');
@@ -11,7 +11,7 @@ const revisionService = require('./revisions.js');
 const request = require('./request.js');
 const path = require('path');
 const url = require('url');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const BBranch = require('../becca/entities/bbranch.js');
 const BNote = require('../becca/entities/bnote.js');
 const BAttribute = require('../becca/entities/battribute.js');

src/services/options_init.js

@@ -1,4 +1,4 @@
-const optionService = require('./options.js');
+const optionService = require('./options');
 const appInfo = require('./app_info.js');
 const utils = require('./utils');
 const log = require('./log');

src/services/protected_session.ts

@@ -56,7 +56,7 @@ function touchProtectedSession() {
 }
 
 function checkProtectedSessionExpiration() {
-    const options = require('./options.js');
+    const options = require('./options');
     const protectedSessionTimeout = options.getOptionInt('protectedSessionTimeout');
     if (isProtectedSessionAvailable()
         && lastProtectedSessionOperationDate

src/services/script.js

@@ -1,7 +1,7 @@
 const ScriptContext = require('./script_context.js');
 const cls = require('./cls');
 const log = require('./log');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 
 function executeNote(note, apiParams) {
     if (!note.isJavaScript() || note.getScriptEnv() !== 'backend' || !note.isContentAvailable()) {

src/services/search/expressions/ancestor.js

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

src/services/search/expressions/attribute_exists.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const NoteSet = require('../note_set.js');
-const becca = require('../../../becca/becca.js');
+const becca = require('../../../becca/becca');
 const Expression = require('./expression.js');
 
 class AttributeExistsExp extends Expression {

src/services/search/expressions/descendant_of.js

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

src/services/search/expressions/label_comparison.js

@@ -2,7 +2,7 @@
 
 const Expression = require('./expression.js');
 const NoteSet = require('../note_set.js');
-const becca = require('../../../becca/becca.js');
+const becca = require('../../../becca/becca');
 
 class LabelComparisonExp extends Expression {
     constructor(attributeType, attributeName, comparator) {

src/services/search/expressions/note_content_fulltext.js

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

src/services/search/expressions/note_flat_text.js

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

src/services/search/expressions/relation_where.js

@@ -2,7 +2,7 @@
 
 const Expression = require('./expression.js');
 const NoteSet = require('../note_set.js');
-const becca = require('../../../becca/becca.js');
+const becca = require('../../../becca/becca');
 
 class RelationWhereExp extends Expression {
     constructor(relationName, subExpression) {

src/services/search/search_result.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const beccaService = require('../../becca/becca_service.js');
-const becca = require('../../becca/becca.js');
+const becca = require('../../becca/becca');
 
 class SearchResult {
     constructor(notePathArray) {

src/services/search/services/search.js

@@ -6,7 +6,7 @@ const handleParens = require('./handle_parens.js');
 const parse = require('./parse.js');
 const SearchResult = require('../search_result.js');
 const SearchContext = require('../search_context.js');
-const becca = require('../../../becca/becca.js');
+const becca = require('../../../becca/becca');
 const beccaService = require('../../../becca/becca_service.js');
 const utils = require('../../utils');
 const log = require('../../log');

src/services/setup.js

@@ -1,12 +1,12 @@
 const syncService = require('./sync.js');
 const log = require('./log');
 const sqlInit = require('./sql_init.js');
-const optionService = require('./options.js');
+const optionService = require('./options');
 const syncOptions = require('./sync_options.js');
 const request = require('./request.js');
 const appInfo = require('./app_info.js');
 const utils = require('./utils');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 
 async function hasSyncServerSchemaAndSeed() {
     const response = await requestToSyncServer('GET', '/api/setup/status');

src/services/special_notes.js

@@ -1,6 +1,6 @@
 const attributeService = require('./attributes.js');
 const dateNoteService = require('./date_notes.js');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 const noteService = require('./notes.js');
 const dateUtils = require('./date_utils');
 const log = require('./log');

src/services/sql.ts

@@ -263,7 +263,7 @@ function transactional<T>(func: (statement: Statement) => T) {
         }
 
         // the maxEntityChangeId has been incremented during failed transaction, need to recalculate
-        require('./entity_changes.js').recalculateMaxEntityChangeId();
+        require('./entity_changes').recalculateMaxEntityChangeId();
 
         throw e;
     }

src/services/sql_init.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const resourceDir = require('./resource_dir');
 const sql = require('./sql');
 const utils = require('./utils');
-const optionService = require('./options.js');
+const optionService = require('./options');
 const port = require('./port.js');
 const BOption = require('../becca/entities/boption.js');
 const TaskContext = require('./task_context.js');
@@ -105,7 +105,7 @@ async function createInitialDatabase() {
 
         const startNoteId = sql.getValue("SELECT noteId FROM branches WHERE parentNoteId = 'root' AND isDeleted = 0 ORDER BY notePosition");
 
-        const optionService = require('./options.js');
+        const optionService = require('./options');
         optionService.setOption('openNoteContexts', JSON.stringify([
             {
                 notePath: startNoteId,

src/services/sync.js

@@ -2,7 +2,7 @@
 
 const log = require('./log');
 const sql = require('./sql');
-const optionService = require('./options.js');
+const optionService = require('./options');
 const utils = require('./utils');
 const instanceId = require('./instance_id');
 const dateUtils = require('./date_utils');
@@ -14,9 +14,9 @@ const syncMutexService = require('./sync_mutex.js');
 const cls = require('./cls');
 const request = require('./request.js');
 const ws = require('./ws.js');
-const entityChangesService = require('./entity_changes.js');
+const entityChangesService = require('./entity_changes');
 const entityConstructor = require('../becca/entity_constructor.js');
-const becca = require('../becca/becca.js');
+const becca = require('../becca/becca');
 
 let proxyToggle = true;
 

src/services/sync_options.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const optionService = require('./options.js');
+const optionService = require('./options');
 const config = require('./config.js');
 
 /*

src/services/sync_update.js

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

src/services/tray.js

@@ -1,7 +1,7 @@
 const { Menu, Tray } = require('electron');
 const path = require('path');
 const windowService = require('./window.js');
-const optionService = require('./options.js');
+const optionService = require('./options');
 
 const UPDATE_TRAY_EVENTS = [
     'minimize', 'maximize', 'show', 'hide'

src/services/tree.js

@@ -3,8 +3,8 @@
 const sql = require('./sql');
 const log = require('./log');
 const BBranch = require('../becca/entities/bbranch.js');
-const entityChangesService = require('./entity_changes.js');
-const becca = require('../becca/becca.js');
+const entityChangesService = require('./entity_changes');
+const becca = require('../becca/becca');
 
 function validateParentChild(parentNoteId, childNoteId, branchId = null) {
     if (['root', '_hidden', '_share', '_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers'].includes(childNoteId)) {

src/services/window.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const url = require("url");
 const port = require('./port.js');
-const optionService = require('./options.js');
+const optionService = require('./options');
 const env = require('./env.js');
 const log = require('./log');
 const sqlInit = require('./sql_init.js');

src/services/ws.ts

@@ -6,7 +6,7 @@ import cls = require('./cls');
 import config = require('./config');
 import syncMutexService = require('./sync_mutex.js');
 import protectedSessionService = require('./protected_session');
-import becca = require('../becca/becca.js');
+import becca = require('../becca/becca');
 import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity.js');
 
 import env = require('./env');