From 8b250e4a1345f280895b9993c76da03661147590 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 17 Feb 2024 11:42:19 +0200 Subject: [PATCH] server-ts: Fix references to js files for converted files --- src/etapi/attachments.js | 2 +- src/etapi/attributes.js | 2 +- src/etapi/auth.js | 2 +- src/etapi/branches.js | 2 +- src/etapi/etapi_utils.js | 2 +- src/etapi/notes.js | 2 +- src/etapi/validators.js | 2 +- src/routes/api/attachments.js | 4 ++-- src/routes/api/attributes.js | 2 +- src/routes/api/autocomplete.js | 2 +- src/routes/api/branches.js | 2 +- src/routes/api/bulk_action.js | 2 +- src/routes/api/export.js | 2 +- src/routes/api/files.js | 2 +- src/routes/api/fonts.js | 2 +- src/routes/api/image.js | 2 +- src/routes/api/import.js | 2 +- src/routes/api/keys.js | 2 +- src/routes/api/login.js | 2 +- src/routes/api/note_map.js | 2 +- src/routes/api/notes.js | 4 ++-- src/routes/api/options.js | 2 +- src/routes/api/other.js | 2 +- src/routes/api/recent_changes.js | 2 +- src/routes/api/relation-map.js | 2 +- src/routes/api/revisions.js | 4 ++-- src/routes/api/script.js | 2 +- src/routes/api/search.js | 2 +- src/routes/api/similar_notes.js | 2 +- src/routes/api/special_notes.js | 2 +- src/routes/api/sql.js | 2 +- src/routes/api/stats.js | 2 +- src/routes/api/sync.js | 2 +- src/routes/api/tree.js | 2 +- src/routes/custom.js | 2 +- src/routes/index.js | 2 +- src/routes/login.js | 2 +- src/services/attributes.js | 2 +- src/services/backend_script_api.js | 6 +++--- src/services/backup.js | 2 +- src/services/blob.ts | 2 +- src/services/bulk_actions.js | 2 +- src/services/cloning.js | 4 ++-- src/services/cls.ts | 4 ++-- src/services/consistency_checks.js | 6 +++--- src/services/encryption/my_scrypt.ts | 2 +- src/services/encryption/password.ts | 2 +- src/services/encryption/password_encryption.ts | 2 +- src/services/entity_changes.ts | 4 ++-- src/services/erase.js | 4 ++-- src/services/etapi_tokens.js | 2 +- src/services/export/opml.js | 2 +- src/services/export/single.js | 2 +- src/services/export/zip.js | 2 +- src/services/handlers.js | 2 +- src/services/hidden_subtree.js | 2 +- src/services/hoisted_note.js | 2 +- src/services/image.js | 4 ++-- src/services/import/zip.js | 2 +- src/services/keyboard_actions.js | 2 +- src/services/notes.js | 6 +++--- src/services/options_init.js | 2 +- src/services/protected_session.ts | 2 +- src/services/script.js | 2 +- src/services/search/expressions/ancestor.js | 2 +- src/services/search/expressions/attribute_exists.js | 2 +- src/services/search/expressions/descendant_of.js | 2 +- src/services/search/expressions/label_comparison.js | 2 +- src/services/search/expressions/note_content_fulltext.js | 2 +- src/services/search/expressions/note_flat_text.js | 2 +- src/services/search/expressions/relation_where.js | 2 +- src/services/search/search_result.js | 2 +- src/services/search/services/search.js | 2 +- src/services/setup.js | 4 ++-- src/services/special_notes.js | 2 +- src/services/sql.ts | 2 +- src/services/sql_init.js | 4 ++-- src/services/sync.js | 6 +++--- src/services/sync_options.js | 2 +- src/services/sync_update.js | 2 +- src/services/tray.js | 2 +- src/services/tree.js | 4 ++-- src/services/window.js | 2 +- src/services/ws.ts | 2 +- 84 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/etapi/attachments.js b/src/etapi/attachments.js index 2c77210cc..8a3802061 100644 --- a/src/etapi/attachments.js +++ b/src/etapi/attachments.js @@ -1,4 +1,4 @@ -const becca = require('../becca/becca.js'); +const becca = require('../becca/becca'); const eu = require('./etapi_utils'); const mappers = require('./mappers.js'); const v = require('./validators.js'); diff --git a/src/etapi/attributes.js b/src/etapi/attributes.js index 692b8c05e..dca82b0ea 100644 --- a/src/etapi/attributes.js +++ b/src/etapi/attributes.js @@ -1,4 +1,4 @@ -const becca = require('../becca/becca.js'); +const becca = require('../becca/becca'); const eu = require('./etapi_utils'); const mappers = require('./mappers.js'); const attributeService = require('../services/attributes.js'); diff --git a/src/etapi/auth.js b/src/etapi/auth.js index d5cab7e15..cdb8d5f79 100644 --- a/src/etapi/auth.js +++ b/src/etapi/auth.js @@ -1,4 +1,4 @@ -const becca = require('../becca/becca.js'); +const becca = require('../becca/becca'); const eu = require('./etapi_utils'); const passwordEncryptionService = require('../services/encryption/password_encryption.js'); const etapiTokenService = require('../services/etapi_tokens.js'); diff --git a/src/etapi/branches.js b/src/etapi/branches.js index 19741b100..2206d2224 100644 --- a/src/etapi/branches.js +++ b/src/etapi/branches.js @@ -1,4 +1,4 @@ -const becca = require('../becca/becca.js'); +const becca = require('../becca/becca'); const eu = require('./etapi_utils'); const mappers = require('./mappers.js'); const BBranch = require('../becca/entities/bbranch.js'); diff --git a/src/etapi/etapi_utils.js b/src/etapi/etapi_utils.js index 41d40cf94..5fe5459fb 100644 --- a/src/etapi/etapi_utils.js +++ b/src/etapi/etapi_utils.js @@ -1,7 +1,7 @@ const cls = require('../services/cls'); const sql = require('../services/sql'); const log = require('../services/log'); -const becca = require('../becca/becca.js'); +const becca = require('../becca/becca'); const etapiTokenService = require('../services/etapi_tokens.js'); const config = require('../services/config.js'); const GENERIC_CODE = "GENERIC"; diff --git a/src/etapi/notes.js b/src/etapi/notes.js index 8acb3546e..0878f9d77 100644 --- a/src/etapi/notes.js +++ b/src/etapi/notes.js @@ -1,4 +1,4 @@ -const becca = require('../becca/becca.js'); +const becca = require('../becca/becca'); const utils = require('../services/utils'); const eu = require('./etapi_utils'); const mappers = require('./mappers.js'); diff --git a/src/etapi/validators.js b/src/etapi/validators.js index f9ca0fa6a..59ddc1675 100644 --- a/src/etapi/validators.js +++ b/src/etapi/validators.js @@ -64,7 +64,7 @@ function isNoteId(obj) { return; } - const becca = require('../becca/becca.js'); + const becca = require('../becca/becca'); if (typeof obj !== 'string') { return `'${obj}' is not a valid noteId`; diff --git a/src/routes/api/attachments.js b/src/routes/api/attachments.js index 1beca350e..09bf09376 100644 --- a/src/routes/api/attachments.js +++ b/src/routes/api/attachments.js @@ -1,5 +1,5 @@ -const becca = require('../../becca/becca.js'); -const blobService = require('../../services/blob.js'); +const becca = require('../../becca/becca'); +const blobService = require('../../services/blob'); const ValidationError = require('../../errors/validation_error'); const imageService = require("../../services/image.js"); diff --git a/src/routes/api/attributes.js b/src/routes/api/attributes.js index bdbab50c5..0471fc298 100644 --- a/src/routes/api/attributes.js +++ b/src/routes/api/attributes.js @@ -4,7 +4,7 @@ const sql = require('../../services/sql'); const log = require('../../services/log'); const attributeService = require('../../services/attributes.js'); const BAttribute = require('../../becca/entities/battribute.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const ValidationError = require('../../errors/validation_error'); function getEffectiveNoteAttributes(req) { diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js index e28ccfcdb..a3113ba62 100644 --- a/src/routes/api/autocomplete.js +++ b/src/routes/api/autocomplete.js @@ -5,7 +5,7 @@ const searchService = require('../../services/search/services/search.js'); const log = require('../../services/log'); const utils = require('../../services/utils'); const cls = require('../../services/cls'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); function getAutocomplete(req) { const query = req.query.query.trim(); diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js index 55576665e..06c81cd38 100644 --- a/src/routes/api/branches.js +++ b/src/routes/api/branches.js @@ -5,7 +5,7 @@ const utils = require('../../services/utils'); 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 becca = require('../../becca/becca'); const TaskContext = require('../../services/task_context.js'); const branchService = require('../../services/branches.js'); const log = require('../../services/log'); diff --git a/src/routes/api/bulk_action.js b/src/routes/api/bulk_action.js index 08f59df49..f04b32d61 100644 --- a/src/routes/api/bulk_action.js +++ b/src/routes/api/bulk_action.js @@ -1,4 +1,4 @@ -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const bulkActionService = require('../../services/bulk_actions.js'); function execute(req) { diff --git a/src/routes/api/export.js b/src/routes/api/export.js index 240f2ef4c..3ceaaa857 100644 --- a/src/routes/api/export.js +++ b/src/routes/api/export.js @@ -3,7 +3,7 @@ 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 becca = require('../../becca/becca'); const TaskContext = require('../../services/task_context.js'); const log = require('../../services/log'); const NotFoundError = require('../../errors/not_found_error'); diff --git a/src/routes/api/files.js b/src/routes/api/files.js index 10a1b758e..78fa9f5db 100644 --- a/src/routes/api/files.js +++ b/src/routes/api/files.js @@ -9,7 +9,7 @@ const fs = require('fs'); const { Readable } = require('stream'); const chokidar = require('chokidar'); const ws = require('../../services/ws.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const ValidationError = require('../../errors/validation_error'); function updateFile(req) { diff --git a/src/routes/api/fonts.js b/src/routes/api/fonts.js index 6e7cce87f..d21db07c8 100644 --- a/src/routes/api/fonts.js +++ b/src/routes/api/fonts.js @@ -1,4 +1,4 @@ -const optionService = require('../../services/options.js'); +const optionService = require('../../services/options'); function getFontCss(req, res) { res.setHeader('Content-Type', 'text/css'); diff --git a/src/routes/api/image.js b/src/routes/api/image.js index a48978a0d..d1c702bc7 100644 --- a/src/routes/api/image.js +++ b/src/routes/api/image.js @@ -1,7 +1,7 @@ "use strict"; const imageService = require('../../services/image.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR; const fs = require('fs'); diff --git a/src/routes/api/import.js b/src/routes/api/import.js index 49dd027c4..f3fd9e28c 100644 --- a/src/routes/api/import.js +++ b/src/routes/api/import.js @@ -6,7 +6,7 @@ const zipImportService = require('../../services/import/zip.js'); const singleImportService = require('../../services/import/single.js'); const cls = require('../../services/cls'); const path = require('path'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const beccaLoader = require('../../becca/becca_loader.js'); const log = require('../../services/log'); const TaskContext = require('../../services/task_context.js'); diff --git a/src/routes/api/keys.js b/src/routes/api/keys.js index 3f75f11a3..a2f2a0b37 100644 --- a/src/routes/api/keys.js +++ b/src/routes/api/keys.js @@ -1,7 +1,7 @@ "use strict"; const keyboardActions = require('../../services/keyboard_actions.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); function getKeyboardActions() { return keyboardActions.getKeyboardActions(); diff --git a/src/routes/api/login.js b/src/routes/api/login.js index a3491700f..30dc68189 100644 --- a/src/routes/api/login.js +++ b/src/routes/api/login.js @@ -1,6 +1,6 @@ "use strict"; -const options = require('../../services/options.js'); +const options = require('../../services/options'); const utils = require('../../services/utils'); const dateUtils = require('../../services/date_utils'); const instanceId = require('../../services/instance_id'); diff --git a/src/routes/api/note_map.js b/src/routes/api/note_map.js index 30ad771ca..2e13f6167 100644 --- a/src/routes/api/note_map.js +++ b/src/routes/api/note_map.js @@ -1,6 +1,6 @@ "use strict"; -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const { JSDOM } = require("jsdom"); function buildDescendantCountMap(noteIdsToCount) { diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js index 6a3eaad25..810659b72 100644 --- a/src/routes/api/notes.js +++ b/src/routes/api/notes.js @@ -7,9 +7,9 @@ const sql = require('../../services/sql'); const utils = require('../../services/utils'); const log = require('../../services/log'); const TaskContext = require('../../services/task_context.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const ValidationError = require('../../errors/validation_error'); -const blobService = require('../../services/blob.js'); +const blobService = require('../../services/blob'); function getNote(req) { return becca.getNoteOrThrow(req.params.noteId); diff --git a/src/routes/api/options.js b/src/routes/api/options.js index f3e294571..fd24422dc 100644 --- a/src/routes/api/options.js +++ b/src/routes/api/options.js @@ -1,6 +1,6 @@ "use strict"; -const optionService = require('../../services/options.js'); +const optionService = require('../../services/options'); const log = require('../../services/log'); const searchService = require('../../services/search/services/search.js'); const ValidationError = require('../../errors/validation_error'); diff --git a/src/routes/api/other.js b/src/routes/api/other.js index ca92e15c6..a05600a56 100644 --- a/src/routes/api/other.js +++ b/src/routes/api/other.js @@ -1,4 +1,4 @@ -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const markdownService = require('../../services/import/markdown.js'); function getIconUsage() { diff --git a/src/routes/api/recent_changes.js b/src/routes/api/recent_changes.js index 8563c41a8..6fea4a105 100644 --- a/src/routes/api/recent_changes.js +++ b/src/routes/api/recent_changes.js @@ -3,7 +3,7 @@ const sql = require('../../services/sql'); const protectedSessionService = require('../../services/protected_session'); const noteService = require('../../services/notes.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); function getRecentChanges(req) { const {ancestorNoteId} = req.params; diff --git a/src/routes/api/relation-map.js b/src/routes/api/relation-map.js index dc89ab5bb..280ed7f67 100644 --- a/src/routes/api/relation-map.js +++ b/src/routes/api/relation-map.js @@ -1,4 +1,4 @@ -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const sql = require('../../services/sql'); function getRelationMap(req) { diff --git a/src/routes/api/revisions.js b/src/routes/api/revisions.js index 6a75f98ab..e4a843016 100644 --- a/src/routes/api/revisions.js +++ b/src/routes/api/revisions.js @@ -6,8 +6,8 @@ const utils = require('../../services/utils'); const sql = require('../../services/sql'); const cls = require('../../services/cls'); const path = require('path'); -const becca = require('../../becca/becca.js'); -const blobService = require('../../services/blob.js'); +const becca = require('../../becca/becca'); +const blobService = require('../../services/blob'); const eraseService = require("../../services/erase.js"); function getRevisionBlob(req) { diff --git a/src/routes/api/script.js b/src/routes/api/script.js index 441d67e54..0dbb72f2c 100644 --- a/src/routes/api/script.js +++ b/src/routes/api/script.js @@ -2,7 +2,7 @@ const scriptService = require('../../services/script.js'); const attributeService = require('../../services/attributes.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const syncService = require('../../services/sync.js'); const sql = require('../../services/sql'); diff --git a/src/routes/api/search.js b/src/routes/api/search.js index 0c2d486ed..b98e08517 100644 --- a/src/routes/api/search.js +++ b/src/routes/api/search.js @@ -1,6 +1,6 @@ "use strict"; -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const SearchContext = require('../../services/search/search_context.js'); const searchService = require('../../services/search/services/search.js'); const bulkActionService = require('../../services/bulk_actions.js'); diff --git a/src/routes/api/similar_notes.js b/src/routes/api/similar_notes.js index 781ba0efc..3dee1d0c1 100644 --- a/src/routes/api/similar_notes.js +++ b/src/routes/api/similar_notes.js @@ -1,7 +1,7 @@ "use strict"; const similarityService = require('../../becca/similarity.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); async function getSimilarNotes(req) { const noteId = req.params.noteId; diff --git a/src/routes/api/special_notes.js b/src/routes/api/special_notes.js index 3c223f767..9c80f507f 100644 --- a/src/routes/api/special_notes.js +++ b/src/routes/api/special_notes.js @@ -4,7 +4,7 @@ const dateNoteService = require('../../services/date_notes.js'); const sql = require('../../services/sql'); const cls = require('../../services/cls'); const specialNotesService = require('../../services/special_notes.js'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); function getInboxNote(req) { return specialNotesService.getInboxNote(req.params.date); diff --git a/src/routes/api/sql.js b/src/routes/api/sql.js index 65c381f8b..4e06ed78e 100644 --- a/src/routes/api/sql.js +++ b/src/routes/api/sql.js @@ -1,7 +1,7 @@ "use strict"; const sql = require('../../services/sql'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); function getSchema() { const tableNames = sql.getColumn(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name`); diff --git a/src/routes/api/stats.js b/src/routes/api/stats.js index 4e1ad74fe..05d05d25c 100644 --- a/src/routes/api/stats.js +++ b/src/routes/api/stats.js @@ -1,5 +1,5 @@ const sql = require('../../services/sql'); -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); function getNoteSize(req) { const {noteId} = req.params; diff --git a/src/routes/api/sync.js b/src/routes/api/sync.js index 5c6dbc799..aa65da91b 100644 --- a/src/routes/api/sync.js +++ b/src/routes/api/sync.js @@ -5,7 +5,7 @@ const syncUpdateService = require('../../services/sync_update.js'); const entityChangesService = require('../../services/entity_changes.js'); const sql = require('../../services/sql'); const sqlInit = require('../../services/sql_init.js'); -const optionService = require('../../services/options.js'); +const optionService = require('../../services/options'); const contentHashService = require('../../services/content_hash.js'); const log = require('../../services/log'); const syncOptions = require('../../services/sync_options.js'); diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js index 50494fced..c8188068b 100644 --- a/src/routes/api/tree.js +++ b/src/routes/api/tree.js @@ -1,6 +1,6 @@ "use strict"; -const becca = require('../../becca/becca.js'); +const becca = require('../../becca/becca'); const log = require('../../services/log'); const NotFoundError = require('../../errors/not_found_error'); diff --git a/src/routes/custom.js b/src/routes/custom.js index 21fca8854..f566902f6 100644 --- a/src/routes/custom.js +++ b/src/routes/custom.js @@ -3,7 +3,7 @@ const fileService = require('./api/files.js'); const scriptService = require('../services/script.js'); const cls = require('../services/cls'); const sql = require('../services/sql'); -const becca = require('../becca/becca.js'); +const becca = require('../becca/becca'); function handleRequest(req, res) { // express puts content after first slash into 0 index element diff --git a/src/routes/index.js b/src/routes/index.js index 2a8a07759..f39c37852 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -3,7 +3,7 @@ const sql = require('../services/sql'); const attributeService = require('../services/attributes.js'); const config = require('../services/config.js'); -const optionService = require('../services/options.js'); +const optionService = require('../services/options'); const log = require('../services/log'); const env = require('../services/env.js'); const utils = require('../services/utils'); diff --git a/src/routes/login.js b/src/routes/login.js index 69b1ea433..83ab5f87b 100644 --- a/src/routes/login.js +++ b/src/routes/login.js @@ -1,7 +1,7 @@ "use strict"; const utils = require('../services/utils'); -const optionService = require('../services/options.js'); +const optionService = require('../services/options'); const myScryptService = require('../services/encryption/my_scrypt.js'); const log = require('../services/log'); const passwordService = require('../services/encryption/password.js'); diff --git a/src/services/attributes.js b/src/services/attributes.js index 02e0d53f4..a45a8ded3 100644 --- a/src/services/attributes.js +++ b/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'); diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js index 7a6141586..4a0218d27 100644 --- a/src/services/backend_script_api.js +++ b/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 diff --git a/src/services/backup.js b/src/services/backup.js index 772d92d55..54decedcb 100644 --- a/src/services/backup.js +++ b/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'); diff --git a/src/services/blob.ts b/src/services/blob.ts index 39b979fee..cfdd939c6 100644 --- a/src/services/blob.ts +++ b/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'); diff --git a/src/services/bulk_actions.js b/src/services/bulk_actions.js index 3536ed9a9..3a274c688 100644 --- a/src/services/bulk_actions.js +++ b/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'); diff --git a/src/services/cloning.js b/src/services/cloning.js index a715dd3a1..b942867ab 100644 --- a/src/services/cloning.js +++ b/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) { diff --git a/src/services/cls.ts b/src/services/cls.ts index 5bbffaa84..d119c8a93 100644 --- a/src/services/cls.ts +++ b/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; } diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js index 1b0990328..9e9585d19 100644 --- a/src/services/consistency_checks.js +++ b/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'); diff --git a/src/services/encryption/my_scrypt.ts b/src/services/encryption/my_scrypt.ts index 9c7774923..c80632bc0 100644 --- a/src/services/encryption/my_scrypt.ts +++ b/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) { diff --git a/src/services/encryption/password.ts b/src/services/encryption/password.ts index 07b4de85b..65c6c08c0 100644 --- a/src/services/encryption/password.ts +++ b/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'); diff --git a/src/services/encryption/password_encryption.ts b/src/services/encryption/password_encryption.ts index 939de5a9d..140ae152e 100644 --- a/src/services/encryption/password_encryption.ts +++ b/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'); diff --git a/src/services/entity_changes.ts b/src/services/entity_changes.ts index ff2754851..bc75432b0 100644 --- a/src/services/entity_changes.ts +++ b/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"; diff --git a/src/services/erase.js b/src/services/erase.js index 05719a480..4c225428b 100644 --- a/src/services/erase.js +++ b/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"); diff --git a/src/services/etapi_tokens.js b/src/services/etapi_tokens.js index 552a31ade..06302ad71 100644 --- a/src/services/etapi_tokens.js +++ b/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"); diff --git a/src/services/export/opml.js b/src/services/export/opml.js index b58bb63c1..2faa6d513 100644 --- a/src/services/export/opml.js +++ b/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)) { diff --git a/src/services/export/single.js b/src/services/export/single.js index 5fbe4ee44..5021ef3a3 100644 --- a/src/services/export/single.js +++ b/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(); diff --git a/src/services/export/zip.js b/src/services/export/zip.js index dccf4bf2f..c5609e0d9 100644 --- a/src/services/export/zip.js +++ b/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'); diff --git a/src/services/handlers.js b/src/services/handlers.js index d5a55fafe..ee04b42ae 100644 --- a/src/services/handlers.js +++ b/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'); diff --git a/src/services/hidden_subtree.js b/src/services/hidden_subtree.js index 2e00a2461..0a82e61aa 100644 --- a/src/services/hidden_subtree.js +++ b/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'); diff --git a/src/services/hoisted_note.js b/src/services/hoisted_note.js index 8a3dae18f..a75d4addc 100644 --- a/src/services/hoisted_note.js +++ b/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(); diff --git a/src/services/image.js b/src/services/image.js index ff9b5b9e9..04add20f8 100644 --- a/src/services/image.js +++ b/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'); diff --git a/src/services/import/zip.js b/src/services/import/zip.js index 17a760fdc..fd42ce3d6 100644 --- a/src/services/import/zip.js +++ b/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'); diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js index df44994ff..6ad590f07 100644 --- a/src/services/keyboard_actions.js +++ b/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'); diff --git a/src/services/notes.js b/src/services/notes.js index 214975a95..251c665cf 100644 --- a/src/services/notes.js +++ b/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'); diff --git a/src/services/options_init.js b/src/services/options_init.js index 8da0de4bf..5e7ca2f10 100644 --- a/src/services/options_init.js +++ b/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'); diff --git a/src/services/protected_session.ts b/src/services/protected_session.ts index 19d15d542..1f0e382da 100644 --- a/src/services/protected_session.ts +++ b/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 diff --git a/src/services/script.js b/src/services/script.js index 93c89ccc3..f82f50444 100644 --- a/src/services/script.js +++ b/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()) { diff --git a/src/services/search/expressions/ancestor.js b/src/services/search/expressions/ancestor.js index f7463a3ae..a3cc4bd54 100644 --- a/src/services/search/expressions/ancestor.js +++ b/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) { diff --git a/src/services/search/expressions/attribute_exists.js b/src/services/search/expressions/attribute_exists.js index f9be65689..126f524f9 100644 --- a/src/services/search/expressions/attribute_exists.js +++ b/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 { diff --git a/src/services/search/expressions/descendant_of.js b/src/services/search/expressions/descendant_of.js index fa0e50dd3..d97dd6c62 100644 --- a/src/services/search/expressions/descendant_of.js +++ b/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) { diff --git a/src/services/search/expressions/label_comparison.js b/src/services/search/expressions/label_comparison.js index 0bc27ff0c..01fe1396a 100644 --- a/src/services/search/expressions/label_comparison.js +++ b/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) { diff --git a/src/services/search/expressions/note_content_fulltext.js b/src/services/search/expressions/note_content_fulltext.js index 351d43717..0d447b7ed 100644 --- a/src/services/search/expressions/note_content_fulltext.js +++ b/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'); diff --git a/src/services/search/expressions/note_flat_text.js b/src/services/search/expressions/note_flat_text.js index 72f06cb98..f92c1808e 100644 --- a/src/services/search/expressions/note_flat_text.js +++ b/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 { diff --git a/src/services/search/expressions/relation_where.js b/src/services/search/expressions/relation_where.js index dee56b1dd..fcd0bc85c 100644 --- a/src/services/search/expressions/relation_where.js +++ b/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) { diff --git a/src/services/search/search_result.js b/src/services/search/search_result.js index 3a094bc8c..61f7d86d8 100644 --- a/src/services/search/search_result.js +++ b/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) { diff --git a/src/services/search/services/search.js b/src/services/search/services/search.js index f6b309ad3..498d31310 100644 --- a/src/services/search/services/search.js +++ b/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'); diff --git a/src/services/setup.js b/src/services/setup.js index 58736f5b8..7434659be 100644 --- a/src/services/setup.js +++ b/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'); diff --git a/src/services/special_notes.js b/src/services/special_notes.js index e57059987..fd229a876 100644 --- a/src/services/special_notes.js +++ b/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'); diff --git a/src/services/sql.ts b/src/services/sql.ts index 2b93ce263..6de5003b4 100644 --- a/src/services/sql.ts +++ b/src/services/sql.ts @@ -263,7 +263,7 @@ function transactional(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; } diff --git a/src/services/sql_init.js b/src/services/sql_init.js index 4b89ae389..c200ba58a 100644 --- a/src/services/sql_init.js +++ b/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, diff --git a/src/services/sync.js b/src/services/sync.js index bce751b5b..856101703 100644 --- a/src/services/sync.js +++ b/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; diff --git a/src/services/sync_options.js b/src/services/sync_options.js index 7cf44c06f..8f8038849 100644 --- a/src/services/sync_options.js +++ b/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'); /* diff --git a/src/services/sync_update.js b/src/services/sync_update.js index 6581066f4..96922c450 100644 --- a/src/services/sync_update.js +++ b/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'); diff --git a/src/services/tray.js b/src/services/tray.js index bb32a78bb..7d8e34e1e 100644 --- a/src/services/tray.js +++ b/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' diff --git a/src/services/tree.js b/src/services/tree.js index 7bbca25ab..bd90b784b 100644 --- a/src/services/tree.js +++ b/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)) { diff --git a/src/services/window.js b/src/services/window.js index 587dda8a4..ef26ede5c 100644 --- a/src/services/window.js +++ b/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'); diff --git a/src/services/ws.ts b/src/services/ws.ts index 086bb0d4f..64e7707c2 100644 --- a/src/services/ws.ts +++ b/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');