diff --git a/db/migrations/0220__migrate_images_to_attachments.js b/db/migrations/0220__migrate_images_to_attachments.js index 331395914..81bb84a3f 100644 --- a/db/migrations/0220__migrate_images_to_attachments.js +++ b/db/migrations/0220__migrate_images_to_attachments.js @@ -1,7 +1,7 @@ module.exports = () => { const beccaLoader = require('../../src/becca/becca_loader.js'); const becca = require('../../src/becca/becca.js'); - const cls = require('../../src/services/cls.js'); + const cls = require('../../src/services/cls'); const log = require('../../src/services/log'); const sql = require('../../src/services/sql.js'); diff --git a/src/becca/becca_loader.js b/src/becca/becca_loader.js index 98c2b700e..39989090e 100644 --- a/src/becca/becca_loader.js +++ b/src/becca/becca_loader.js @@ -10,7 +10,7 @@ const BBranch = require('./entities/bbranch.js'); const BAttribute = require('./entities/battribute.js'); const BOption = require('./entities/boption.js'); const BEtapiToken = require('./entities/betapi_token.js'); -const cls = require('../services/cls.js'); +const cls = require('../services/cls'); const entityConstructor = require('../becca/entity_constructor.js'); const beccaLoaded = new Promise((res, rej) => { diff --git a/src/becca/becca_service.js b/src/becca/becca_service.js index 936c43dcc..0d7e3193f 100644 --- a/src/becca/becca_service.js +++ b/src/becca/becca_service.js @@ -1,7 +1,7 @@ "use strict"; const becca = require('./becca.js'); -const cls = require('../services/cls.js'); +const cls = require('../services/cls'); const log = require('../services/log'); function isNotePathArchived(notePath) { diff --git a/src/becca/entities/abstract_becca_entity.js b/src/becca/entities/abstract_becca_entity.js index c6f99beb4..9cd0dad76 100644 --- a/src/becca/entities/abstract_becca_entity.js +++ b/src/becca/entities/abstract_becca_entity.js @@ -5,7 +5,7 @@ const sql = require('../../services/sql.js'); const entityChangesService = require('../../services/entity_changes.js'); const eventService = require('../../services/events.js'); const dateUtils = require('../../services/date_utils.js'); -const cls = require('../../services/cls.js'); +const cls = require('../../services/cls'); const log = require('../../services/log'); const protectedSessionService = require('../../services/protected_session.js'); const blobService = require('../../services/blob.js'); diff --git a/src/becca/entities/bbranch.js b/src/becca/entities/bbranch.js index b5120b0f2..3ee42e510 100644 --- a/src/becca/entities/bbranch.js +++ b/src/becca/entities/bbranch.js @@ -5,7 +5,7 @@ const AbstractBeccaEntity = require('./abstract_becca_entity.js'); const dateUtils = require('../../services/date_utils.js'); const utils = require('../../services/utils.js'); const TaskContext = require('../../services/task_context.js'); -const cls = require('../../services/cls.js'); +const cls = require('../../services/cls'); const log = require('../../services/log'); /** diff --git a/src/etapi/etapi_utils.js b/src/etapi/etapi_utils.js index be8df73e5..24c179a23 100644 --- a/src/etapi/etapi_utils.js +++ b/src/etapi/etapi_utils.js @@ -1,4 +1,4 @@ -const cls = require('../services/cls.js'); +const cls = require('../services/cls'); const sql = require('../services/sql.js'); const log = require('../services/log'); const becca = require('../becca/becca.js'); diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js index 3d33caa5c..983576b8c 100644 --- a/src/routes/api/autocomplete.js +++ b/src/routes/api/autocomplete.js @@ -4,7 +4,7 @@ const beccaService = require('../../becca/becca_service.js'); const searchService = require('../../services/search/services/search.js'); const log = require('../../services/log'); const utils = require('../../services/utils.js'); -const cls = require('../../services/cls.js'); +const cls = require('../../services/cls'); const becca = require('../../becca/becca.js'); function getAutocomplete(req) { diff --git a/src/routes/api/import.js b/src/routes/api/import.js index 025fb8301..9a29b7a7e 100644 --- a/src/routes/api/import.js +++ b/src/routes/api/import.js @@ -4,7 +4,7 @@ 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 cls = require('../../services/cls'); const path = require('path'); const becca = require('../../becca/becca.js'); const beccaLoader = require('../../becca/becca_loader.js'); diff --git a/src/routes/api/revisions.js b/src/routes/api/revisions.js index 72ab1ea03..9985bbbc7 100644 --- a/src/routes/api/revisions.js +++ b/src/routes/api/revisions.js @@ -4,7 +4,7 @@ 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 cls = require('../../services/cls'); const path = require('path'); const becca = require('../../becca/becca.js'); const blobService = require('../../services/blob.js'); diff --git a/src/routes/api/search.js b/src/routes/api/search.js index cf4887523..901adbb26 100644 --- a/src/routes/api/search.js +++ b/src/routes/api/search.js @@ -4,7 +4,7 @@ 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 cls = require('../../services/cls'); const {formatAttrForSearch} = require('../../services/attribute_formatter.js'); const ValidationError = require('../../errors/validation_error.js'); diff --git a/src/routes/api/special_notes.js b/src/routes/api/special_notes.js index 5f4c7933b..d39406f54 100644 --- a/src/routes/api/special_notes.js +++ b/src/routes/api/special_notes.js @@ -2,7 +2,7 @@ const dateNoteService = require('../../services/date_notes.js'); const sql = require('../../services/sql.js'); -const cls = require('../../services/cls.js'); +const cls = require('../../services/cls'); const specialNotesService = require('../../services/special_notes.js'); const becca = require('../../becca/becca.js'); diff --git a/src/routes/custom.js b/src/routes/custom.js index 7352cb7f9..1d002b964 100644 --- a/src/routes/custom.js +++ b/src/routes/custom.js @@ -1,7 +1,7 @@ const log = require('../services/log'); const fileService = require('./api/files.js'); const scriptService = require('../services/script.js'); -const cls = require('../services/cls.js'); +const cls = require('../services/cls'); const sql = require('../services/sql.js'); const becca = require('../becca/becca.js'); diff --git a/src/routes/routes.js b/src/routes/routes.js index 081a94353..d027c4fea 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -6,7 +6,7 @@ const log = require('../services/log'); const express = require('express'); const router = express.Router(); const auth = require('../services/auth.js'); -const cls = require('../services/cls.js'); +const cls = require('../services/cls'); const sql = require('../services/sql.js'); const entityChangesService = require('../services/entity_changes.js'); const csurf = require('csurf'); diff --git a/src/services/backup.js b/src/services/backup.js index 58c8570b2..14106bada 100644 --- a/src/services/backup.js +++ b/src/services/backup.js @@ -6,7 +6,7 @@ const fs = require('fs-extra'); const dataDir = require('./data_dir'); const log = require('./log'); const syncMutexService = require('./sync_mutex.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const sql = require('./sql.js'); const path = require('path'); diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js index 54ca3eed3..873212b5b 100644 --- a/src/services/consistency_checks.js +++ b/src/services/consistency_checks.js @@ -5,7 +5,7 @@ const sqlInit = require('./sql_init.js'); const log = require('./log'); const ws = require('./ws.js'); const syncMutexService = require('./sync_mutex.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const entityChangesService = require('./entity_changes.js'); const optionsService = require('./options.js'); const BBranch = require('../becca/entities/bbranch.js'); diff --git a/src/services/date_utils.js b/src/services/date_utils.js index 4eb47bdb7..cc17a9036 100644 --- a/src/services/date_utils.js +++ b/src/services/date_utils.js @@ -1,5 +1,5 @@ const dayjs = require('dayjs'); -const cls = require('./cls.js'); +const cls = require('./cls'); const LOCAL_DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ss.SSSZZ'; const UTC_DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ssZ'; diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js index dcd93d2d0..f7dd5f4d2 100644 --- a/src/services/entity_changes.js +++ b/src/services/entity_changes.js @@ -1,7 +1,7 @@ const sql = require('./sql.js'); const dateUtils = require('./date_utils.js'); const log = require('./log'); -const cls = require('./cls.js'); +const cls = require('./cls'); const utils = require('./utils.js'); const instanceId = require('./instance_id.js'); const becca = require('../becca/becca.js'); diff --git a/src/services/erase.js b/src/services/erase.js index 0a4e5ee3a..9951a83c3 100644 --- a/src/services/erase.js +++ b/src/services/erase.js @@ -5,7 +5,7 @@ const entityChangesService = require("./entity_changes.js"); const optionService = require("./options.js"); const dateUtils = require("./date_utils.js"); const sqlInit = require("./sql_init.js"); -const cls = require("./cls.js"); +const cls = require("./cls"); function eraseNotes(noteIdsToErase) { if (noteIdsToErase.length === 0) { diff --git a/src/services/hoisted_note.js b/src/services/hoisted_note.js index f3f4e5675..8a3dae18f 100644 --- a/src/services/hoisted_note.js +++ b/src/services/hoisted_note.js @@ -1,4 +1,4 @@ -const cls = require('./cls.js'); +const cls = require('./cls'); const becca = require('../becca/becca.js'); function getHoistedNoteId() { diff --git a/src/services/log.ts b/src/services/log.ts index ce59b1530..51977211f 100644 --- a/src/services/log.ts +++ b/src/services/log.ts @@ -3,7 +3,7 @@ import { Request, Response } from "express"; import fs = require("fs"); import dataDir = require('./data_dir'); -import cls = require('./cls.js'); +import cls = require('./cls'); if (!fs.existsSync(dataDir.LOG_DIR)) { fs.mkdirSync(dataDir.LOG_DIR, 0o700); diff --git a/src/services/migration.js b/src/services/migration.js index d0b48651d..b91a24069 100644 --- a/src/services/migration.js +++ b/src/services/migration.js @@ -5,7 +5,7 @@ const log = require('./log'); const utils = require('./utils.js'); const resourceDir = require('./resource_dir.js'); const appInfo = require('./app_info.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); async function migrate() { const currentDbVersion = getDbVersion(); diff --git a/src/services/notes.js b/src/services/notes.js index 977a8f4f7..15b54abdc 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -3,7 +3,7 @@ const optionService = require('./options.js'); const dateUtils = require('./date_utils.js'); const entityChangesService = require('./entity_changes.js'); const eventService = require('./events.js'); -const cls = require('../services/cls.js'); +const cls = require('../services/cls'); const protectedSessionService = require('../services/protected_session.js'); const log = require('../services/log'); const utils = require('../services/utils.js'); diff --git a/src/services/scheduler.js b/src/services/scheduler.js index 1e03a3d34..d5d9c26dd 100644 --- a/src/services/scheduler.js +++ b/src/services/scheduler.js @@ -1,5 +1,5 @@ const scriptService = require('./script.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const sqlInit = require('./sql_init.js'); const config = require('./config.js'); const log = require('./log'); diff --git a/src/services/script.js b/src/services/script.js index 24ff7f04a..93c89ccc3 100644 --- a/src/services/script.js +++ b/src/services/script.js @@ -1,5 +1,5 @@ const ScriptContext = require('./script_context.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const log = require('./log'); const becca = require('../becca/becca.js'); diff --git a/src/services/sql.js b/src/services/sql.js index 3b165d4d6..fc961b0da 100644 --- a/src/services/sql.js +++ b/src/services/sql.js @@ -7,7 +7,7 @@ const log = require('./log'); const Database = require('better-sqlite3'); const dataDir = require('./data_dir'); -const cls = require('./cls.js'); +const cls = require('./cls'); const fs = require("fs-extra"); const dbConnection = new Database(dataDir.DOCUMENT_PATH); diff --git a/src/services/sql_init.js b/src/services/sql_init.js index 7b348dd8b..2a9ffe129 100644 --- a/src/services/sql_init.js +++ b/src/services/sql_init.js @@ -8,7 +8,7 @@ const port = require('./port.js'); const BOption = require('../becca/entities/boption.js'); const TaskContext = require('./task_context.js'); const migrationService = require('./migration.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const config = require('./config.js'); const dbReady = utils.deferred(); diff --git a/src/services/sync.js b/src/services/sync.js index 8326bd1d8..e30181930 100644 --- a/src/services/sync.js +++ b/src/services/sync.js @@ -11,7 +11,7 @@ const contentHashService = require('./content_hash.js'); const appInfo = require('./app_info.js'); const syncOptions = require('./sync_options.js'); const syncMutexService = require('./sync_mutex.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const request = require('./request.js'); const ws = require('./ws.js'); const entityChangesService = require('./entity_changes.js'); diff --git a/src/services/window.js b/src/services/window.js index 8468e048c..587dda8a4 100644 --- a/src/services/window.js +++ b/src/services/window.js @@ -5,7 +5,7 @@ const optionService = require('./options.js'); const env = require('./env.js'); const log = require('./log'); const sqlInit = require('./sql_init.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const keyboardActionsService = require('./keyboard_actions.js'); const {ipcMain} = require('electron'); diff --git a/src/services/ws.js b/src/services/ws.js index 85628b235..99880112d 100644 --- a/src/services/ws.js +++ b/src/services/ws.js @@ -2,7 +2,7 @@ const WebSocket = require('ws'); const utils = require('./utils.js'); const log = require('./log'); const sql = require('./sql.js'); -const cls = require('./cls.js'); +const cls = require('./cls'); const config = require('./config.js'); const syncMutexService = require('./sync_mutex.js'); const protectedSessionService = require('./protected_session.js'); diff --git a/src/tools/generate_document.js b/src/tools/generate_document.js index 67f202a2b..844b6e0f3 100644 --- a/src/tools/generate_document.js +++ b/src/tools/generate_document.js @@ -7,7 +7,7 @@ require('../becca/entity_constructor.js'); const sqlInit = require('../services/sql_init.js'); const noteService = require('../services/notes.js'); const attributeService = require('../services/attributes.js'); -const cls = require('../services/cls.js'); +const cls = require('../services/cls'); const cloningService = require('../services/cloning.js'); const loremIpsum = require('lorem-ipsum').loremIpsum;