diff --git a/src/errors/not_found_error.js b/src/errors/not_found_error.ts similarity index 62% rename from src/errors/not_found_error.js rename to src/errors/not_found_error.ts index af746b82c..7ceb105a9 100644 --- a/src/errors/not_found_error.js +++ b/src/errors/not_found_error.ts @@ -1,5 +1,7 @@ class NotFoundError { - constructor(message) { + message: string; + + constructor(message: string) { this.message = message; } } diff --git a/src/errors/validation_error.js b/src/errors/validation_error.ts similarity index 63% rename from src/errors/validation_error.js rename to src/errors/validation_error.ts index 1c9425669..0cabecc8e 100644 --- a/src/errors/validation_error.js +++ b/src/errors/validation_error.ts @@ -1,5 +1,7 @@ class ValidationError { - constructor(message) { + message: string; + + constructor(message: string) { this.message = message; } } diff --git a/src/routes/api/attachments.js b/src/routes/api/attachments.js index 7862534a7..1beca350e 100644 --- a/src/routes/api/attachments.js +++ b/src/routes/api/attachments.js @@ -1,6 +1,6 @@ const becca = require('../../becca/becca.js'); const blobService = require('../../services/blob.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); const imageService = require("../../services/image.js"); function getAttachmentBlob(req) { diff --git a/src/routes/api/attributes.js b/src/routes/api/attributes.js index b602aba6c..bdbab50c5 100644 --- a/src/routes/api/attributes.js +++ b/src/routes/api/attributes.js @@ -5,7 +5,7 @@ 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 ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); function getEffectiveNoteAttributes(req) { const note = becca.getNote(req.params.noteId); diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js index bca2a87a0..4149a7315 100644 --- a/src/routes/api/branches.js +++ b/src/routes/api/branches.js @@ -9,7 +9,7 @@ const becca = require('../../becca/becca.js'); const TaskContext = require('../../services/task_context.js'); const branchService = require('../../services/branches.js'); const log = require('../../services/log'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); const eventService = require("../../services/events.js"); /** diff --git a/src/routes/api/export.js b/src/routes/api/export.js index 673d7c7bf..240f2ef4c 100644 --- a/src/routes/api/export.js +++ b/src/routes/api/export.js @@ -6,7 +6,7 @@ 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'); -const NotFoundError = require('../../errors/not_found_error.js'); +const NotFoundError = require('../../errors/not_found_error'); function exportBranch(req, res) { const {branchId, type, format, version, taskId} = req.params; diff --git a/src/routes/api/files.js b/src/routes/api/files.js index 48ec7c5ea..baee239a8 100644 --- a/src/routes/api/files.js +++ b/src/routes/api/files.js @@ -10,7 +10,7 @@ const { Readable } = require('stream'); const chokidar = require('chokidar'); const ws = require('../../services/ws.js'); const becca = require('../../becca/becca.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); function updateFile(req) { const note = becca.getNoteOrThrow(req.params.noteId); diff --git a/src/routes/api/import.js b/src/routes/api/import.js index 9a29b7a7e..49dd027c4 100644 --- a/src/routes/api/import.js +++ b/src/routes/api/import.js @@ -10,7 +10,7 @@ const becca = require('../../becca/becca.js'); const beccaLoader = require('../../becca/becca_loader.js'); const log = require('../../services/log'); const TaskContext = require('../../services/task_context.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); async function importNotesToBranch(req) { const {parentNoteId} = req.params; diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js index 5a0787c27..6a3eaad25 100644 --- a/src/routes/api/notes.js +++ b/src/routes/api/notes.js @@ -8,7 +8,7 @@ const utils = require('../../services/utils'); const log = require('../../services/log'); const TaskContext = require('../../services/task_context.js'); const becca = require('../../becca/becca.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); const blobService = require('../../services/blob.js'); function getNote(req) { diff --git a/src/routes/api/options.js b/src/routes/api/options.js index 52344891a..f3e294571 100644 --- a/src/routes/api/options.js +++ b/src/routes/api/options.js @@ -3,7 +3,7 @@ const optionService = require('../../services/options.js'); const log = require('../../services/log'); const searchService = require('../../services/search/services/search.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); // options allowed to be updated directly in the Options dialog const ALLOWED_OPTIONS = new Set([ diff --git a/src/routes/api/password.js b/src/routes/api/password.js index a80d4151c..419a27aca 100644 --- a/src/routes/api/password.js +++ b/src/routes/api/password.js @@ -1,7 +1,7 @@ "use strict"; const passwordService = require('../../services/encryption/password.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); function changePassword(req) { if (passwordService.isPasswordSet()) { diff --git a/src/routes/api/search.js b/src/routes/api/search.js index 901adbb26..0c2d486ed 100644 --- a/src/routes/api/search.js +++ b/src/routes/api/search.js @@ -6,7 +6,7 @@ const searchService = require('../../services/search/services/search.js'); const bulkActionService = require('../../services/bulk_actions.js'); const cls = require('../../services/cls'); const {formatAttrForSearch} = require('../../services/attribute_formatter.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); function searchFromNote(req) { const note = becca.getNoteOrThrow(req.params.noteId); diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js index f830ed8f1..50494fced 100644 --- a/src/routes/api/tree.js +++ b/src/routes/api/tree.js @@ -2,7 +2,7 @@ const becca = require('../../becca/becca.js'); const log = require('../../services/log'); -const NotFoundError = require('../../errors/not_found_error.js'); +const NotFoundError = require('../../errors/not_found_error'); function getNotesAndBranchesAndAttributes(noteIds) { noteIds = new Set(noteIds); diff --git a/src/routes/login.js b/src/routes/login.js index 2ea84a93b..69b1ea433 100644 --- a/src/routes/login.js +++ b/src/routes/login.js @@ -7,7 +7,7 @@ const log = require('../services/log'); const passwordService = require('../services/encryption/password.js'); const assetPath = require('../services/asset_path.js'); const appPath = require('../services/app_path.js'); -const ValidationError = require('../errors/validation_error.js'); +const ValidationError = require('../errors/validation_error'); function loginPage(req, res) { res.render('login', { diff --git a/src/routes/routes.js b/src/routes/routes.js index 014d6b11d..2bc50b359 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -13,8 +13,8 @@ const csurf = require('csurf'); const { createPartialContentHandler } = require("express-partial-content"); const rateLimit = require("express-rate-limit"); const AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity.js'); -const NotFoundError = require('../errors/not_found_error.js'); -const ValidationError = require('../errors/validation_error.js'); +const NotFoundError = require('../errors/not_found_error'); +const ValidationError = require('../errors/validation_error'); // page routes const setupRoute = require('./setup.js'); diff --git a/src/services/export/zip.js b/src/services/export/zip.js index 5e2482013..e0ca9f3f2 100644 --- a/src/services/export/zip.js +++ b/src/services/export/zip.js @@ -15,7 +15,7 @@ const RESOURCE_DIR = require('../../services/resource_dir.js').RESOURCE_DIR; const archiver = require('archiver'); const log = require('../log'); const TaskContext = require('../task_context.js'); -const ValidationError = require('../../errors/validation_error.js'); +const ValidationError = require('../../errors/validation_error'); const NoteMeta = require('../meta/note_meta.js'); const AttachmentMeta = require('../meta/attachment_meta.js'); const AttributeMeta = require('../meta/attribute_meta.js'); diff --git a/src/services/notes.js b/src/services/notes.js index 27aa15f62..e73c2f706 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -18,7 +18,7 @@ const BAttribute = require('../becca/entities/battribute.js'); const BAttachment = require('../becca/entities/battachment.js'); const dayjs = require("dayjs"); const htmlSanitizer = require('./html_sanitizer.js'); -const ValidationError = require('../errors/validation_error.js'); +const ValidationError = require('../errors/validation_error'); const noteTypesService = require('./note_types.js'); const fs = require("fs"); const ws = require('./ws.js');